From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37622) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZaUiW-0003pg-Rq for qemu-devel@nongnu.org; Fri, 11 Sep 2015 16:14:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZaUiW-0004Ls-1r for qemu-devel@nongnu.org; Fri, 11 Sep 2015 16:14:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42269) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZaUiV-0004Lg-Ta for qemu-devel@nongnu.org; Fri, 11 Sep 2015 16:14:40 -0400 From: Eduardo Habkost Date: Fri, 11 Sep 2015 17:14:24 -0300 Message-Id: <1442002465-31466-3-git-send-email-ehabkost@redhat.com> In-Reply-To: <1442002465-31466-1-git-send-email-ehabkost@redhat.com> References: <1442002465-31466-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH v2 2/3] q35: Move options common to all classes to pc_i440fx_machine_options() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Igor Mammedov , Richard Henderson , Jason Wang , "Michael S. Tsirkin" The existing default_machine_opts and default_display settings will still apply to future machine classes. So it makes sense to move them to pc_i440fx_machine_options() instead of keeping them in a version-specific machine_options function. Signed-off-by: Eduardo Habkost --- hw/i386/pc_piix.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 3f925b2..2d9df7c 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -460,6 +460,8 @@ static void pc_i440fx_machine_options(MachineClass *m) m->family = "pc_piix"; m->desc = "Standard PC (i440FX + PIIX, 1996)"; m->hot_add_cpu = pc_hot_add_cpu; + m->default_machine_opts = "firmware=bios-256k.bin"; + m->default_display = "std"; } static void pc_i440fx_2_4_machine_options(MachineClass *m) @@ -467,8 +469,6 @@ static void pc_i440fx_2_4_machine_options(MachineClass *m) PCMachineClass *pcmc = PC_MACHINE_CLASS(m); pc_i440fx_machine_options(m); pcmc->broken_reserved_end = true; - m->default_machine_opts = "firmware=bios-256k.bin"; - m->default_display = "std"; m->alias = "pc"; m->is_default = 1; } -- 2.1.0