ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pc: add compat_props placeholder for 2.0 machine type 

Add the "boilerplate" necessary for subsequent patches to
simply drop in compat_props for pc machines 2.0 and older.

This patch contains no functional changes.

Signed-off-by: Gabriel Somlo <somlo@cmu.edu>
Acked-by: Alexander Graf <agraf@suse.de>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Gabriel L. Somlo 2014-05-05 10:52:50 -04:00 committed by Michael S. Tsirkin
parent 8cbad670ce
commit 9df11c9f08
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/i386/pc_piix.c
View File

@ -414,6 +414,10 @@ static QEMUMachine pc_i440fx_machine_v2_0 = {
PC_I440FX_2_0_MACHINE_OPTIONS, PC_I440FX_2_0_MACHINE_OPTIONS,
.name = "pc-i440fx-2.0", .name = "pc-i440fx-2.0",
.init = pc_init_pci_2_0, .init = pc_init_pci_2_0,
.compat_props = (GlobalProperty[]) {
PC_COMPAT_2_0,
{ /* end of list */ }
},
}; };
#define PC_I440FX_1_7_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS #define PC_I440FX_1_7_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS

4
hw/i386/pc_q35.c
View File

@ -327,6 +327,10 @@ static QEMUMachine pc_q35_machine_v2_0 = {
PC_Q35_2_0_MACHINE_OPTIONS, PC_Q35_2_0_MACHINE_OPTIONS,
.name = "pc-q35-2.0", .name = "pc-q35-2.0",
.init = pc_q35_init_2_0, .init = pc_q35_init_2_0,
.compat_props = (GlobalProperty[]) {
PC_Q35_COMPAT_2_0,
{ /* end of list */ }
},
}; };
#define PC_Q35_1_7_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS #define PC_Q35_1_7_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS

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

@ -242,8 +242,12 @@ 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_Q35_COMPAT_2_0 \
PC_COMPAT_2_0
#define PC_Q35_COMPAT_1_7 \ #define PC_Q35_COMPAT_1_7 \
PC_COMPAT_1_7, \ PC_COMPAT_1_7, \
PC_Q35_COMPAT_2_0, \
{\ {\
.driver = "hpet",\ .driver = "hpet",\
.property = HPET_INTCAP,\ .property = HPET_INTCAP,\
@ -262,7 +266,12 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
PC_COMPAT_1_4, \ PC_COMPAT_1_4, \
PC_Q35_COMPAT_1_5 PC_Q35_COMPAT_1_5
#define PC_COMPAT_2_0 \
{\
}
#define PC_COMPAT_1_7 \ #define PC_COMPAT_1_7 \
PC_COMPAT_2_0, \
{\ {\
.driver = TYPE_USB_DEVICE,\ .driver = TYPE_USB_DEVICE,\
.property = "msos-desc",\ .property = "msos-desc",\