From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46540) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbTsS-0005go-Co for qemu-devel@nongnu.org; Mon, 14 Sep 2015 09:33:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZbTsO-0003xT-CI for qemu-devel@nongnu.org; Mon, 14 Sep 2015 09:33:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52385) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbTsO-0003xN-6m for qemu-devel@nongnu.org; Mon, 14 Sep 2015 09:32:56 -0400 Date: Mon, 14 Sep 2015 15:32:53 +0200 From: Igor Mammedov Message-ID: <20150914153253.641c7fe7@nial.brq.redhat.com> In-Reply-To: <1442002465-31466-2-git-send-email-ehabkost@redhat.com> References: <1442002465-31466-1-git-send-email-ehabkost@redhat.com> <1442002465-31466-2-git-send-email-ehabkost@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 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: Eduardo Habkost Cc: Paolo Bonzini , Jason Wang , "Michael S. Tsirkin" , qemu-devel@nongnu.org, Richard Henderson On Fri, 11 Sep 2015 17:14:23 -0300 Eduardo Habkost wrote: > 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 Reviewed-by: Igor Mammedov > --- > 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 11601ab..966eedb 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -364,6 +364,10 @@ 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) > @@ -371,10 +375,6 @@ static void pc_q35_2_4_machine_options(MachineClass *m) > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_q35_machine_options(m); > pcmc->broken_reserved_end = true; > - m->default_machine_opts = "firmware=bios-256k.bin"; > - m->default_display = "std"; > - m->no_floppy = 1; > - m->no_tco = 0; > m->alias = "q35"; > } >