Commit 53744e0a authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/ehabkost/tags/x86-for-3.1-pull-request' into staging 



pc-*-3.1 machine-types

# gpg: Signature made Tue 20 Nov 2018 13:43:24 GMT
# gpg:                using RSA key 2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/x86-for-3.1-pull-request:
  hw/i386: add pc-i440fx-3.1 & pc-q35-3.1

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 46cabfb4 4a93722f

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);

}