On Thu, Jun 23, 2011 at 12:17 PM, Jan Kiszka <jan.kis...@web.de> wrote: > On 2011-06-23 13:14, Stefan Hajnoczi wrote: >> 2011/6/23 Jan Kiszka <jan.kis...@web.de>: >>> On 2011-06-23 11:18, Wayne Xia wrote: >>>> Hi, >>>> these 3 patch simply enable qemu-kvm to show a logo picture when it >>> >>> You are posting on qemu-devel (which is correct for this topic), so your >>> patches must target that tree. Patch 1 eg. does not and needs rebasing. >> >> More specifically, develop code against qemu.git as a default. Much >> of the development that goes into qemu-kvm actually comes via >> qemu.git. If you need to do qemu-kvm.git specific stuff, you'll know. >> >> Additional info: >> "The QEMU codebase is known as qemu.git. That's the git repository >> that holds the QEMU source code history. The KVM codebase is known as >> qemu-kvm.git, the git repository that holds the KVM source code >> history. >> >> The relationship between qemu.git and qemu-kvm.git is as follows. >> qemu-kvm.git is a fork of qemu.git and periodically merges updates >> from qemu.git back into qemu-kvm.git. A lot of code changes are merged >> into qemu.git and become available in qemu-kvm.git after the next >> periodic merge. KVM-specific enhancements may be merged into >> qemu-kvm.git and may be sent back upstream to qemu.git. >> >> Efforts are underway to completely merge qemu-kvm.git into qemu.git. >> This will make qemu-kvm.git obsolete and result in a single codebase. >> In the future there may only be a qemu package." >> >> http://blog.vmsplice.net/2011/03/should-i-use-qemu-or-kvm.html > > BTW, do we have such information in the linux-kvm.org and maybe also > qemu.org wikis? If not, I guess it would help, in some cases at least.
I have added the following: "If you want to contribute code, please develop against qemu.git and submit patches to qemu-devel@nongnu.org. The qemu-kvm.git tree regularly gets changes from qemu.git and patches against qemu-kvm.git should be minimized." http://www.linux-kvm.org/page/Code Avi and Marcelo: hope you are okay with this wiki change, please revert or reword if you feel the wording should be improved. Stefan
