From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43184) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZWyg3-0007A7-OX for qemu-devel@nongnu.org; Tue, 01 Sep 2015 23:25:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZWyfz-0006g5-Cx for qemu-devel@nongnu.org; Tue, 01 Sep 2015 23:25:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43954) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZWyfz-0006g1-8j for qemu-devel@nongnu.org; Tue, 01 Sep 2015 23:25:31 -0400 From: Jason Wang Date: Wed, 2 Sep 2015 11:25:18 +0800 Message-Id: <1441164325-14417-2-git-send-email-jasowang@redhat.com> In-Reply-To: <1441164325-14417-1-git-send-email-jasowang@redhat.com> References: <1441164325-14417-1-git-send-email-jasowang@redhat.com> Subject: [Qemu-devel] [PATCH V2 1/8] 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: cornelia.huck@de.ibm.com, Eduardo Habkost , mst@redhat.com From: Eduardo Habkost 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.4