Commit aeca6e8d authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

add pc-{i440fx,q35}-2.0 machine types 



Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 7dc65c02

hw/i386/pc_piix.c

+12 −2
Original line number Diff line number Diff line
@@ -339,13 +339,22 @@ static void pc_xen_hvm_init(QEMUMachineInitArgs *args) 
    .desc = "Standard PC (i440FX + PIIX, 1996)", \

    .hot_add_cpu = pc_hot_add_cpu



#define PC_I440FX_2_0_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS



static QEMUMachine pc_i440fx_machine_v2_0 = {

    PC_I440FX_2_0_MACHINE_OPTIONS,

    .name = "pc-i440fx-2.0",

    .alias = "pc",

    .init = pc_init_pci,

    .is_default = 1,

};



#define PC_I440FX_1_7_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS



static QEMUMachine pc_i440fx_machine_v1_7 = {

    PC_I440FX_1_7_MACHINE_OPTIONS,

    .name = "pc-i440fx-1.7",

    .alias = "pc",

    .init = pc_init_pci,

    .is_default = 1,

};



#define PC_I440FX_1_6_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS
@@ -747,6 +756,7 @@ static QEMUMachine xenfv_machine = { 


static void pc_machine_init(void)

{

    qemu_register_machine(&pc_i440fx_machine_v2_0);

    qemu_register_machine(&pc_i440fx_machine_v1_7);

    qemu_register_machine(&pc_i440fx_machine_v1_6);

    qemu_register_machine(&pc_i440fx_machine_v1_5);

hw/i386/pc_q35.c

+10 −1
Original line number Diff line number Diff line
@@ -259,12 +259,20 @@ static void pc_q35_init_1_4(QEMUMachineInitArgs *args) 
    .desc = "Standard PC (Q35 + ICH9, 2009)", \

    .hot_add_cpu = pc_hot_add_cpu



#define PC_Q35_2_0_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS



static QEMUMachine pc_q35_machine_v2_0 = {

    PC_Q35_2_0_MACHINE_OPTIONS,

    .name = "pc-q35-2.0",

    .alias = "q35",

    .init = pc_q35_init,

};



#define PC_Q35_1_7_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS



static QEMUMachine pc_q35_machine_v1_7 = {

    PC_Q35_1_7_MACHINE_OPTIONS,

    .name = "pc-q35-1.7",

    .alias = "q35",

    .init = pc_q35_init,

};
@@ -306,6 +314,7 @@ static QEMUMachine pc_q35_machine_v1_4 = { 


static void pc_q35_machine_init(void)

{

    qemu_register_machine(&pc_q35_machine_v2_0);

    qemu_register_machine(&pc_q35_machine_v1_7);

    qemu_register_machine(&pc_q35_machine_v1_6);

    qemu_register_machine(&pc_q35_machine_v1_5);