Commit 240240d5 authored by Eduardo Habkost's avatar Eduardo Habkost Committed by Michael S. Tsirkin
Browse files

pc: Add pc-*-2.6 machine classes 



Add pc-i440fx-2.6 and pc-q35-2.6 machine classes.

Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarMarcel Apfelbaum <marcel@redhat.com>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
parent 1e37b714

hw/i386/pc_piix.c

+13 −3
Original line number Diff line number Diff line
@@ -418,13 +418,25 @@ static void pc_i440fx_machine_options(MachineClass *m) 
    m->default_display = "std";

}



static void pc_i440fx_2_5_machine_options(MachineClass *m)

static void pc_i440fx_2_6_machine_options(MachineClass *m)

{

    pc_i440fx_machine_options(m);

    m->alias = "pc";

    m->is_default = 1;

}



DEFINE_I440FX_MACHINE(v2_6, "pc-i440fx-2.6", NULL,

                      pc_i440fx_2_6_machine_options);





static void pc_i440fx_2_5_machine_options(MachineClass *m)

{

    pc_i440fx_2_6_machine_options(m);

    m->alias = NULL;

    m->is_default = 0;

    SET_MACHINE_COMPAT(m, PC_COMPAT_2_5);

}



DEFINE_I440FX_MACHINE(v2_5, "pc-i440fx-2.5", NULL,

                      pc_i440fx_2_5_machine_options);
@@ -434,8 +446,6 @@ static void pc_i440fx_2_4_machine_options(MachineClass *m) 
    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);

    pc_i440fx_2_5_machine_options(m);

    m->hw_version = "2.4.0";

    m->alias = NULL;

    m->is_default = 0;

    pcmc->broken_reserved_end = true;

    SET_MACHINE_COMPAT(m, PC_COMPAT_2_4);

}

hw/i386/pc_q35.c

+11 −2
Original line number Diff line number Diff line
@@ -349,12 +349,22 @@ static void pc_q35_machine_options(MachineClass *m) 
    m->no_tco = 0;

}



static void pc_q35_2_5_machine_options(MachineClass *m)

static void pc_q35_2_6_machine_options(MachineClass *m)

{

    pc_q35_machine_options(m);

    m->alias = "q35";

}



DEFINE_Q35_MACHINE(v2_6, "pc-q35-2.6", NULL,

                   pc_q35_2_6_machine_options);



static void pc_q35_2_5_machine_options(MachineClass *m)

{

    pc_q35_2_6_machine_options(m);

    m->alias = NULL;

    SET_MACHINE_COMPAT(m, PC_COMPAT_2_5);

}



DEFINE_Q35_MACHINE(v2_5, "pc-q35-2.5", NULL,

                   pc_q35_2_5_machine_options);
@@ -363,7 +373,6 @@ static void pc_q35_2_4_machine_options(MachineClass *m) 
    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);

    pc_q35_2_5_machine_options(m);

    m->hw_version = "2.4.0";

    m->alias = NULL;

    pcmc->broken_reserved_end = true;

    SET_MACHINE_COMPAT(m, PC_COMPAT_2_4);

}

include/hw/compat.h

+3 −0
Original line number Diff line number Diff line 
#ifndef HW_COMPAT_H

#define HW_COMPAT_H



#define HW_COMPAT_2_5 \

    /* empty */



#define HW_COMPAT_2_4 \

        {\

            .driver   = "virtio-blk-device",\

include/hw/i386/pc.h

+4 −0
Original line number Diff line number Diff line
@@ -350,7 +350,11 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t); 
int e820_get_num_entries(void);

bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);



#define PC_COMPAT_2_5 \

    HW_COMPAT_2_5



#define PC_COMPAT_2_4 \

        PC_COMPAT_2_5 \

        HW_COMPAT_2_4 \

        {\

            .driver   = "Haswell-" TYPE_X86_CPU,\