From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:36810)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <stefanha@gmail.com>) id 1QZhsA-0000Ky-4y
	for qemu-devel@nongnu.org; Thu, 23 Jun 2011 07:14:59 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <stefanha@gmail.com>) id 1QZhs8-0000Qe-OX
	for qemu-devel@nongnu.org; Thu, 23 Jun 2011 07:14:58 -0400
Received: from mail-yi0-f45.google.com ([209.85.218.45]:50666)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <stefanha@gmail.com>) id 1QZhs8-0000QP-Co
	for qemu-devel@nongnu.org; Thu, 23 Jun 2011 07:14:56 -0400
Received: by yia25 with SMTP id 25so867214yia.4
	for <qemu-devel@nongnu.org>; Thu, 23 Jun 2011 04:14:55 -0700 (PDT)
MIME-Version: 1.0
In-Reply-To: <4E030F6B.7040301@web.de>
References: <4E030501.3040105@linux.vnet.ibm.com>
	<4E030F6B.7040301@web.de>
Date: Thu, 23 Jun 2011 12:14:54 +0100
Message-ID: <BANLkTin_95kskBprYirVSjfctOnKw5kUGQ@mail.gmail.com>
From: Stefan Hajnoczi <stefanha@gmail.com>
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: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Wayne Xia <xiawenc@linux.vnet.ibm.com>
Cc: Anthony Liguori <aliguori@us.ibm.com>, Jan Kiszka <jan.kiszka@web.de>, qemu-devel@nongnu.org

2011/6/23 Jan Kiszka <jan.kiszka@web.de>:
> On 2011-06-23 11:18, Wayne Xia wrote:
>> Hi,
>> =A0 =A0 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

Stefan