From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47882) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7S01-000494-GE for qemu-devel@nongnu.org; Tue, 23 Jun 2015 13:28:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z7S00-0004FK-Jo for qemu-devel@nongnu.org; Tue, 23 Jun 2015 13:28:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38500) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7S00-0004F8-A4 for qemu-devel@nongnu.org; Tue, 23 Jun 2015 13:28:40 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id D9AD3B1FA5 for ; Tue, 23 Jun 2015 17:28:39 +0000 (UTC) Date: Tue, 23 Jun 2015 18:28:35 +0100 From: "Dr. David Alan Gilbert" Message-ID: <20150623172835.GF2167@work-vm> References: <1435078851-10380-1-git-send-email-ehabkost@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1435078851-10380-1-git-send-email-ehabkost@redhat.com> Subject: Re: [Qemu-devel] [PATCH] pc: Fix resue of pc-i440fx-2.4 on pc-i440fx-2.3 machine_options List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost Cc: Laszlo Ersek , qemu-devel@nongnu.org, "Michael S. Tsirkin" * Eduardo Habkost (ehabkost@redhat.com) wrote: > On commit fddd179ab962f6f78a8493742e1068d6a620e059, I broke the chaining of > *_machine_options() functions on pc-i440fx-2.3, at: > > -#define PC_I440FX_2_3_MACHINE_OPTIONS \ > - PC_I440FX_2_4_MACHINE_OPTIONS, \ > - .alias = NULL, \ > - .is_default = 0 > +static void pc_i440fx_2_3_machine_options(QEMUMachine *m) > +{ > + pc_i440fx_machine_options(m); > + m->alias = NULL; > + m->is_default = 0; > +} > > I have replaced PC_I440FX_2_4_MACHINE_OPTIONS with a > pc_i440fx_machine_options() call, instead of calling > pc_i440fx_2_4_machine_options(). This broke the setting of default_machine_opts > and default_display on pc-i440fx-{2.0,2,1,2.2,2.3}. > > Fix this by making pc_i440fx_2_3_machine_options() reuse > pc_i440fx_2_4_machine_options(). > > Reported-by: "Dr. David Alan Gilbert" > Signed-off-by: Eduardo Habkost Thanks, that does solve that one. (Unfortunately VGA memory size is still incompatible somewhere between 2.1 and head by default; but I think that's separate). Dave > --- > hw/i386/pc_piix.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index e142f75..b335856 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -486,7 +486,7 @@ DEFINE_I440FX_MACHINE(v2_4, "pc-i440fx-2.4", NULL, > > static void pc_i440fx_2_3_machine_options(MachineClass *m) > { > - pc_i440fx_machine_options(m); > + pc_i440fx_2_4_machine_options(m); > m->alias = NULL; > m->is_default = 0; > SET_MACHINE_COMPAT(m, PC_COMPAT_2_3); > -- > 2.1.0 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK