From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:33988) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QZj6V-0006Fr-Cp for qemu-devel@nongnu.org; Thu, 23 Jun 2011 08:33:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QZj6T-00083u-Hg for qemu-devel@nongnu.org; Thu, 23 Jun 2011 08:33:51 -0400 Received: from mail-vw0-f45.google.com ([209.85.212.45]:42010) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QZj6T-00083k-4d for qemu-devel@nongnu.org; Thu, 23 Jun 2011 08:33:49 -0400 Received: by vws17 with SMTP id 17so1427270vws.4 for ; Thu, 23 Jun 2011 05:33:48 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <4E0320E1.3030902@web.de> References: <4E030501.3040105@linux.vnet.ibm.com> <4E030F6B.7040301@web.de> <4E0320E1.3030902@web.de> Date: Thu, 23 Jun 2011 13:33:47 +0100 Message-ID: From: Stefan Hajnoczi Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 0/3] kvm:showing a splash picture when start List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jan Kiszka Cc: Avi Kivity , Anthony Liguori , Marcelo Tosatti , Wayne Xia , qemu-devel@nongnu.org On Thu, Jun 23, 2011 at 12:17 PM, Jan Kiszka wrote: > On 2011-06-23 13:14, Stefan Hajnoczi wrote: >> 2011/6/23 Jan Kiszka : >>> On 2011-06-23 11:18, Wayne Xia wrote: >>>> Hi, >>>> =A0 =A0 these 3 patch simply enable qemu-kvm to show a logo picture wh= en it >>> >>> You are posting on qemu-devel (which is correct for this topic), so you= r >>> patches must target that tree. Patch 1 eg. does not and needs rebasing. >> >> More specifically, develop code against qemu.git as a default. =A0 Much >> of the development that goes into qemu-kvm actually comes via >> qemu.git. =A0If 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