From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43180) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZWyg3-0007A5-JB 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 1ZWyg1-0006gE-Gv for qemu-devel@nongnu.org; Tue, 01 Sep 2015 23:25:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33947) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZWyg1-0006gA-BH for qemu-devel@nongnu.org; Tue, 01 Sep 2015 23:25:33 -0400 From: Jason Wang Date: Wed, 2 Sep 2015 11:25:19 +0800 Message-Id: <1441164325-14417-3-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 2/8] 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: cornelia.huck@de.ibm.com, Eduardo Habkost , mst@redhat.com From: Eduardo Habkost 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 9558467..7ca3fcf 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -446,13 +446,13 @@ 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) { pc_i440fx_machine_options(m); - m->default_machine_opts = "firmware=bios-256k.bin"; - m->default_display = "std"; m->alias = "pc"; m->is_default = 1; } -- 2.1.4