From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40979) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V8uX8-0007fv-G9 for qemu-devel@nongnu.org; Mon, 12 Aug 2013 11:59:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V8uX2-0004HU-R9 for qemu-devel@nongnu.org; Mon, 12 Aug 2013 11:59:50 -0400 Received: from cantor2.suse.de ([195.135.220.15]:42004 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V8uX2-0004HI-L4 for qemu-devel@nongnu.org; Mon, 12 Aug 2013 11:59:44 -0400 Message-ID: <5209066B.3010703@suse.de> Date: Mon, 12 Aug 2013 17:59:39 +0200 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1376233843-19410-1-git-send-email-marcel.a@redhat.com> <1376233843-19410-2-git-send-email-marcel.a@redhat.com> In-Reply-To: <1376233843-19410-2-git-send-email-marcel.a@redhat.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH for-1.6 V2 1/2] hw/misc: don't create pvpanic device by default List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Marcel Apfelbaum , aliguori@us.ibm.com Cc: gleb@redhat.com, mst@redhat.com, hutao@cn.fujitsu.com, qemu-devel@nongnu.org, kraxel@redhat.com, pbonzini@redhat.com, vrozenfe@redhat.com Am 11.08.2013 17:10, schrieb Marcel Apfelbaum: > This patch is based on Hu Tao's: > http://lists.nongnu.org/archive/html/qemu-devel/2013-08/msg00124.html >=20 > No need to hard-code pvpanic as part of the machine. > It can be added with "-device pvpanic" from command line (The next patc= h). > Anyway, for backport compatibility it is still part of 1.5 > machine. >=20 > Signed-off-by: Marcel Apfelbaum > --- > Changes from v1: > - Keep pvpanic device enabled by default for 1.5 > for backport compatibility >=20 > hw/i386/pc_piix.c | 9 ++++----- > hw/i386/pc_q35.c | 7 ++++--- > 2 files changed, 8 insertions(+), 8 deletions(-) Reviewed-by: Andreas F=E4rber Anthony, note that my pending CPU pull adds a line to the two _1_4 functions, so that they trivially conflict. Andreas --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg