From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33031) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xj49S-0002eW-Bm for qemu-devel@nongnu.org; Tue, 28 Oct 2014 06:37:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xj49M-00073V-7X for qemu-devel@nongnu.org; Tue, 28 Oct 2014 06:37:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44536) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xj49M-00073R-0C for qemu-devel@nongnu.org; Tue, 28 Oct 2014 06:37:16 -0400 Date: Tue, 28 Oct 2014 10:37:10 +0000 From: "Dr. David Alan Gilbert" Message-ID: <20141028103709.GB2544@work-vm> References: <1414487352-6027-1-git-send-email-kraxel@redhat.com> <1414487352-6027-3-git-send-email-kraxel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1414487352-6027-3-git-send-email-kraxel@redhat.com> Subject: Re: [Qemu-devel] [PATCH 2/2] vga: flip qemu 2.2 pc machine types from cirrus to stdvga List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gerd Hoffmann Cc: ajax@redhat.com, qemu-devel@nongnu.org, Anthony Liguori , "Michael S. Tsirkin" * Gerd Hoffmann (kraxel@redhat.com) wrote: > This patch switches the default display from cirrus to vga > for the new (qemu 2.2+) machine types. Old machines types > stay as-is for compatibility reasons. > > Signed-off-by: Gerd Hoffmann > --- > hw/i386/pc_piix.c | 7 +++++-- > hw/i386/pc_q35.c | 7 +++++-- > 2 files changed, 10 insertions(+), 4 deletions(-) > > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 91a20cb..8637246 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -456,7 +456,8 @@ static void pc_xen_hvm_init(MachineState *machine) > > #define PC_I440FX_2_2_MACHINE_OPTIONS \ > PC_I440FX_MACHINE_OPTIONS, \ > - .default_machine_opts = "firmware=bios-256k.bin" > + .default_machine_opts = "firmware=bios-256k.bin", \ > + .default_display = "std" > > static QEMUMachine pc_i440fx_machine_v2_2 = { > PC_I440FX_2_2_MACHINE_OPTIONS, > @@ -466,7 +467,9 @@ static QEMUMachine pc_i440fx_machine_v2_2 = { > .is_default = 1, > }; > > -#define PC_I440FX_2_1_MACHINE_OPTIONS PC_I440FX_2_2_MACHINE_OPTIONS > +#define PC_I440FX_2_1_MACHINE_OPTIONS \ > + PC_I440FX_MACHINE_OPTIONS, \ > + .default_machine_opts = "firmware=bios-256k.bin" I think the normal way to do this is the opposite of this; i.e. make the display defaults be the new behaviour, then add the .default_display = "cirrus" to the v2_1 machine type, and everything below it will automatically inherit it, and everything newer will just use the new default. Dave > > static QEMUMachine pc_i440fx_machine_v2_1 = { > PC_I440FX_2_1_MACHINE_OPTIONS, > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index e225c6d..9fdb3fa 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -353,7 +353,8 @@ static void pc_q35_init_1_4(MachineState *machine) > > #define PC_Q35_2_2_MACHINE_OPTIONS \ > PC_Q35_MACHINE_OPTIONS, \ > - .default_machine_opts = "firmware=bios-256k.bin" > + .default_machine_opts = "firmware=bios-256k.bin", \ > + .default_display = "std" > > static QEMUMachine pc_q35_machine_v2_2 = { > PC_Q35_2_2_MACHINE_OPTIONS, > @@ -362,7 +363,9 @@ static QEMUMachine pc_q35_machine_v2_2 = { > .init = pc_q35_init, > }; > > -#define PC_Q35_2_1_MACHINE_OPTIONS PC_Q35_2_2_MACHINE_OPTIONS > +#define PC_Q35_2_1_MACHINE_OPTIONS \ > + PC_Q35_MACHINE_OPTIONS, \ > + .default_machine_opts = "firmware=bios-256k.bin" > > static QEMUMachine pc_q35_machine_v2_1 = { > PC_Q35_2_1_MACHINE_OPTIONS, > -- > 1.8.3.1 > > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK