From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43917) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V9FKH-0004sF-Kk for qemu-devel@nongnu.org; Tue, 13 Aug 2013 10:12:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V9FK6-00057Z-NN for qemu-devel@nongnu.org; Tue, 13 Aug 2013 10:11:57 -0400 Received: from e7.ny.us.ibm.com ([32.97.182.137]:53831) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V9FK6-00057S-J2 for qemu-devel@nongnu.org; Tue, 13 Aug 2013 10:11:46 -0400 Received: from /spool/local by e7.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 13 Aug 2013 10:11:46 -0400 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by d01dlp03.pok.ibm.com (Postfix) with ESMTP id CF068C90026 for ; Tue, 13 Aug 2013 10:11:41 -0400 (EDT) Received: from d01av05.pok.ibm.com (d01av05.pok.ibm.com [9.56.224.195]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r7DEBfZj104116 for ; Tue, 13 Aug 2013 10:11:42 -0400 Received: from d01av05.pok.ibm.com (loopback [127.0.0.1]) by d01av05.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r7DEBJCc027169 for ; Tue, 13 Aug 2013 10:11:19 -0400 From: Anthony Liguori In-Reply-To: <20130813125349.GA28317@redhat.com> References: <20130813125349.GA28317@redhat.com> Date: Tue, 13 Aug 2013 09:11:16 -0500 Message-ID: <87a9klllyz.fsf@codemonkey.ws> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: Re: [Qemu-devel] [PATCH for-1.6] pc: fix up pc initialization List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" , qemu-devel@nongnu.org Cc: Paolo Bonzini , Igor Mammedov , Gerd Hoffmann , Andreas =?utf-8?Q?F=C3=A4rber?= , marcel.a@redhat.com "Michael S. Tsirkin" writes: > commit 7f3e341a008c585deed174eaf1f826c88c67948a > hw/misc: don't create pvpanic device by default > was mismerged: as a result, pvpanic is enabled in 1.6 > > Fix this up, clean up a trivial code duplication > and add a comment explaining why we special-case 1.5 > with respect to pvpanic. > > Reported-by: Markus Armbruster > Signed-off-by: Michael S. Tsirkin Thanks for catching this. I'm a little disturbed by this. I use git-am --3way specifically to avoid problems from fuzzing but I guess merge artifacts are possible. > --- > hw/i386/pc_piix.c | 6 +++--- > hw/i386/pc_q35.c | 6 +++--- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 55c24f2..c58f0f4 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -252,12 +252,12 @@ static void pc_init_pci(QEMUMachineInitArgs *args) > static void pc_init_pci_1_6(QEMUMachineInitArgs *args) > { > has_pci_info = false; > - has_pvpanic = true; > pc_init_pci(args); > } > > static void pc_init_pci_1_5(QEMUMachineInitArgs *args) > { > + has_pvpanic = true; > pc_init_pci_1_6(args); > } I'd prefer we stick to the minimal fix. If you want to refactor the code lets do it separately. I just sent a patch fixing the merge problem. Regards, Anthony Liguori > > @@ -265,8 +265,8 @@ static void pc_init_pci_1_4(QEMUMachineInitArgs *args) > { > x86_cpu_compat_set_features("n270", FEAT_1_ECX, 0, CPUID_EXT_MOVBE); > x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_PCLMULQDQ); > - has_pci_info = false; > - pc_init_pci(args); > + /* 1.5 was special as it has pvpanic as a builtin */ > + pc_init_pci_1_6(args); > } > > static void pc_init_pci_1_3(QEMUMachineInitArgs *args) > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index bd25071..968b22b 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -221,12 +221,12 @@ static void pc_q35_init(QEMUMachineInitArgs *args) > static void pc_q35_init_1_6(QEMUMachineInitArgs *args) > { > has_pci_info = false; > - has_pvpanic = true; > pc_q35_init(args); > } > > static void pc_q35_init_1_5(QEMUMachineInitArgs *args) > { > + has_pvpanic = true; > pc_q35_init_1_6(args); > } > > @@ -234,8 +234,8 @@ static void pc_q35_init_1_4(QEMUMachineInitArgs *args) > { > x86_cpu_compat_set_features("n270", FEAT_1_ECX, 0, CPUID_EXT_MOVBE); > x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_PCLMULQDQ); > - has_pci_info = false; > - pc_q35_init(args); > + /* 1.5 was special as it has pvpanic as a builtin */ > + pc_q35_init_1_6(args); > } > > static QEMUMachine pc_q35_machine_v1_6 = { > -- > MST