Commit 4a93722f authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Eduardo Habkost
Browse files

hw/i386: add pc-i440fx-3.1 & pc-q35-3.1 

We have a couple of PC_COMPAT_3_0, so we should have 3.1 PC machines,
and update the 3.0 machines to make use of those.

Fixes a "Known issue" from https://wiki.qemu.org/Planning/3.1

.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Message-Id: <20181120132604.22854-1-marcandre.lureau@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 46cabfb4

hw/i386/pc_piix.c

+12 −3
Original line number Diff line number Diff line
@@ -428,21 +428,30 @@ static void pc_i440fx_machine_options(MachineClass *m) 
    machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE);

}



static void pc_i440fx_3_0_machine_options(MachineClass *m)

static void pc_i440fx_3_1_machine_options(MachineClass *m)

{

    pc_i440fx_machine_options(m);

    m->alias = "pc";

    m->is_default = 1;

}



DEFINE_I440FX_MACHINE(v3_1, "pc-i440fx-3.1", NULL,

                      pc_i440fx_3_1_machine_options);



static void pc_i440fx_3_0_machine_options(MachineClass *m)

{

    pc_i440fx_3_1_machine_options(m);

    m->is_default = 0;

    m->alias = NULL;

    SET_MACHINE_COMPAT(m, PC_COMPAT_3_0);

}



DEFINE_I440FX_MACHINE(v3_0, "pc-i440fx-3.0", NULL,

                      pc_i440fx_3_0_machine_options);



static void pc_i440fx_2_12_machine_options(MachineClass *m)

{

    pc_i440fx_3_0_machine_options(m);

    m->is_default = 0;

    m->alias = NULL;

    SET_MACHINE_COMPAT(m, PC_COMPAT_2_12);

}

hw/i386/pc_q35.c

+11 −2
Original line number Diff line number Diff line
@@ -311,19 +311,28 @@ static void pc_q35_machine_options(MachineClass *m) 
    m->max_cpus = 288;

}



static void pc_q35_3_0_machine_options(MachineClass *m)

static void pc_q35_3_1_machine_options(MachineClass *m)

{

    pc_q35_machine_options(m);

    m->alias = "q35";

}



DEFINE_Q35_MACHINE(v3_1, "pc-q35-3.1", NULL,

                   pc_q35_3_1_machine_options);



static void pc_q35_3_0_machine_options(MachineClass *m)

{

    pc_q35_3_1_machine_options(m);

    m->alias = NULL;

    SET_MACHINE_COMPAT(m, PC_COMPAT_3_0);

}



DEFINE_Q35_MACHINE(v3_0, "pc-q35-3.0", NULL,

                    pc_q35_3_0_machine_options);



static void pc_q35_2_12_machine_options(MachineClass *m)

{

    pc_q35_3_0_machine_options(m);

    m->alias = NULL;

    SET_MACHINE_COMPAT(m, PC_COMPAT_2_12);

}