Commit d43f0d64 authored by Gerd Hoffmann's avatar Gerd Hoffmann Committed by Michael S. Tsirkin
Browse files

vga: flip qemu 2.2 pc machine types from cirrus to stdvga 



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: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 6f00494a

hw/i386/pc_piix.c

+5 −2
Original line number Diff line number Diff line
@@ -470,7 +470,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,
@@ -480,7 +481,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"



static QEMUMachine pc_i440fx_machine_v2_1 = {

    PC_I440FX_2_1_MACHINE_OPTIONS,

hw/i386/pc_q35.c

+5 −2
Original line number Diff line number Diff line
@@ -368,7 +368,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,
@@ -377,7 +378,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,