Received: from eggs.gnu.org ([2001:4830:134:3::10]:44569) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZV39z-0002JY-45 for qemu-devel@nongnu.org; Thu, 27 Aug 2015 15:48:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZV39v-0008RL-Tz for qemu-devel@nongnu.org; Thu, 27 Aug 2015 15:48:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47890) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZV39v-0008R2-Od for qemu-devel@nongnu.org; Thu, 27 Aug 2015 15:48:27 -0400 From: Eduardo Habkost Date: Thu, 27 Aug 2015 16:48:11 -0300 Message-Id: <1440704893-24664-2-git-send-email-ehabkost@redhat.com> In-Reply-To: <1440704893-24664-1-git-send-email-ehabkost@redhat.com> References: <1440704893-24664-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 1/3] q35: Move options common to all classes to pc_q35_machine_options() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Jason Wang , Richard Henderson , "Michael S. Tsirkin" The existing default_machine_opts, default_display, no_floppy, and no_tco settings will still apply to future machine classes. So it makes sense to move them to pc_q35_machine_options() instead of keeping them in a version-specific machine_options function. Signed-off-by: Eduardo Habkost --- hw/i386/pc_q35.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index c07d65b..baae402 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -365,15 +365,15 @@ static void pc_q35_machine_options(MachineClass *m) m->desc = "Standard PC (Q35 + ICH9, 2009)"; m->hot_add_cpu = pc_hot_add_cpu; m->units_per_default_bus = 1; + m->default_machine_opts = "firmware=bios-256k.bin"; + m->default_display = "std"; + m->no_floppy = 1; + m->no_tco = 0; } static void pc_q35_2_4_machine_options(MachineClass *m) { pc_q35_machine_options(m); - m->default_machine_opts = "firmware=bios-256k.bin"; - m->default_display = "std"; - m->no_floppy = 1; - m->no_tco = 0; m->alias = "q35"; } -- 2.1.0