mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pc: Add pc-*-2.6 machine classes

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

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Eduardo Habkost 2015-11-30 12:56:36 -02:00 committed by Michael S. Tsirkin
parent 1e37b7149a
commit 240240d5da
4 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/i386/pc_piix.c
View File

@ -418,13 +418,25 @@ static void pc_i440fx_machine_options(MachineClass *m)
m->default_display = "std"; 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); pc_i440fx_machine_options(m);
m->alias = "pc"; m->alias = "pc";
m->is_default = 1; 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, DEFINE_I440FX_MACHINE(v2_5, "pc-i440fx-2.5", NULL,
pc_i440fx_2_5_machine_options); 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); PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
pc_i440fx_2_5_machine_options(m); pc_i440fx_2_5_machine_options(m);
m->hw_version = "2.4.0"; m->hw_version = "2.4.0";
m->alias = NULL;
m->is_default = 0;
pcmc->broken_reserved_end = true; pcmc->broken_reserved_end = true;
SET_MACHINE_COMPAT(m, PC_COMPAT_2_4); SET_MACHINE_COMPAT(m, PC_COMPAT_2_4);
} }

13
hw/i386/pc_q35.c
View File

@ -349,12 +349,22 @@ static void pc_q35_machine_options(MachineClass *m)
m->no_tco = 0; 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); pc_q35_machine_options(m);
m->alias = "q35"; 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, DEFINE_Q35_MACHINE(v2_5, "pc-q35-2.5", NULL,
pc_q35_2_5_machine_options); 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); PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
pc_q35_2_5_machine_options(m); pc_q35_2_5_machine_options(m);
m->hw_version = "2.4.0"; m->hw_version = "2.4.0";
m->alias = NULL;
pcmc->broken_reserved_end = true; pcmc->broken_reserved_end = true;
SET_MACHINE_COMPAT(m, PC_COMPAT_2_4); SET_MACHINE_COMPAT(m, PC_COMPAT_2_4);
} }

3
include/hw/compat.h
View File

@ -1,6 +1,9 @@
#ifndef HW_COMPAT_H #ifndef HW_COMPAT_H
#define HW_COMPAT_H #define HW_COMPAT_H
#define HW_COMPAT_2_5 \
/* empty */
#define HW_COMPAT_2_4 \ #define HW_COMPAT_2_4 \
{\ {\
.driver = "virtio-blk-device",\ .driver = "virtio-blk-device",\

4
include/hw/i386/pc.h
View File

@ -350,7 +350,11 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t);
int e820_get_num_entries(void); int e820_get_num_entries(void);
bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); 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 \ #define PC_COMPAT_2_4 \
PC_COMPAT_2_5 \
HW_COMPAT_2_4 \ HW_COMPAT_2_4 \
{\ {\
.driver = "Haswell-" TYPE_X86_CPU,\ .driver = "Haswell-" TYPE_X86_CPU,\