From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44767) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZEcm1-0001gf-AQ for qemu-devel@nongnu.org; Mon, 13 Jul 2015 08:23:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZEcm0-0006It-E2 for qemu-devel@nongnu.org; Mon, 13 Jul 2015 08:23:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57038) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZEcm0-0006Ij-9D for qemu-devel@nongnu.org; Mon, 13 Jul 2015 08:23:52 -0400 Date: Mon, 13 Jul 2015 15:23:48 +0300 From: "Michael S. Tsirkin" Message-ID: <1436790197-18666-5-git-send-email-mst@redhat.com> References: <1436790197-18666-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1436790197-18666-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 4/4] pc: fix reuse of pc-i440fx-2.4 in pc-i440fx-2.3 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Eduardo Habkost , Michael Roth , "Dr. David Alan Gilbert" , Paolo Bonzini , Laszlo Ersek , Richard Henderson From: Eduardo Habkost commit fddd179ab962f6f78a8493742e1068d6a620e059, "pc: Convert *_MACHINE_OPTIONS macros into functions" 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 Signed-off-by: Michael Roth Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Laszlo Ersek --- 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 0f99fdc..916d626 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -490,7 +490,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); -- MST