OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

pc: add compatibility machine types for 1.4 

Adds both pc-i440fx-1.4 and pc-q35-1.4.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Paolo Bonzini 2013-02-08 14:06:15 +01:00 committed by Kevin Wolf
parent 215e47b9ea
commit bf3caa3dc1
3 changed files with 63 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
hw/pc.h
View File

@ -187,4 +187,35 @@ void pc_system_firmware_init(MemoryRegion *rom_memory);
int e820_add_entry(uint64_t, uint64_t, uint32_t); int e820_add_entry(uint64_t, uint64_t, uint32_t);
#define PC_COMPAT_1_4 \
{\
.driver = "scsi-hd",\
.property = "discard_granularity",\
.value = stringify(0),\
},{\
.driver = "scsi-cd",\
.property = "discard_granularity",\
.value = stringify(0),\
},{\
.driver = "scsi-disk",\
.property = "discard_granularity",\
.value = stringify(0),\
},{\
.driver = "ide-hd",\
.property = "discard_granularity",\
.value = stringify(0),\
},{\
.driver = "ide-cd",\
.property = "discard_granularity",\
.value = stringify(0),\
},{\
.driver = "ide-drive",\
.property = "discard_granularity",\
.value = stringify(0),\
},{\
.driver = "virtio-blk-pci",\
.property = "discard_granularity",\
.value = stringify(0),\
}
#endif #endif

18
hw/pc_piix.c
View File

@ -294,8 +294,8 @@ static void pc_xen_hvm_init(QEMUMachineInitArgs *args)
} }
#endif #endif
static QEMUMachine pc_i440fx_machine_v1_4 = { static QEMUMachine pc_i440fx_machine_v1_5 = {
.name = "pc-i440fx-1.4", .name = "pc-i440fx-1.5",
.alias = "pc", .alias = "pc",
.desc = "Standard PC (i440FX + PIIX, 1996)", .desc = "Standard PC (i440FX + PIIX, 1996)",
.init = pc_init_pci, .init = pc_init_pci,
@ -304,7 +304,20 @@ static QEMUMachine pc_i440fx_machine_v1_4 = {
DEFAULT_MACHINE_OPTIONS, DEFAULT_MACHINE_OPTIONS,
}; };
static QEMUMachine pc_i440fx_machine_v1_4 = {
.name = "pc-i440fx-1.4",
.desc = "Standard PC (i440FX + PIIX, 1996)",
.init = pc_init_pci,
.max_cpus = 255,
.compat_props = (GlobalProperty[]) {
PC_COMPAT_1_4,
{ /* end of list */ }
},
DEFAULT_MACHINE_OPTIONS,
};
#define PC_COMPAT_1_3 \ #define PC_COMPAT_1_3 \
PC_COMPAT_1_4, \
{\ {\
.driver = "usb-tablet",\ .driver = "usb-tablet",\
.property = "usb_version",\ .property = "usb_version",\
@ -679,6 +692,7 @@ static QEMUMachine xenfv_machine = {
static void pc_machine_init(void) static void pc_machine_init(void)
{ {
qemu_register_machine(&pc_i440fx_machine_v1_5);
qemu_register_machine(&pc_i440fx_machine_v1_4); qemu_register_machine(&pc_i440fx_machine_v1_4);
qemu_register_machine(&pc_machine_v1_3); qemu_register_machine(&pc_machine_v1_3);
qemu_register_machine(&pc_machine_v1_2); qemu_register_machine(&pc_machine_v1_2);

19
hw/pc_q35.c
View File

@ -209,8 +209,8 @@ static void pc_q35_init(QEMUMachineInitArgs *args)
} }
} }
static QEMUMachine pc_q35_machine = { static QEMUMachine pc_q35_machine_v1_5 = {
.name = "pc-q35-1.4", .name = "pc-q35-1.5",
.alias = "q35", .alias = "q35",
.desc = "Standard PC (Q35 + ICH9, 2009)", .desc = "Standard PC (Q35 + ICH9, 2009)",
.init = pc_q35_init, .init = pc_q35_init,
@ -218,9 +218,22 @@ static QEMUMachine pc_q35_machine = {
DEFAULT_MACHINE_OPTIONS, DEFAULT_MACHINE_OPTIONS,
}; };
static QEMUMachine pc_q35_machine_v1_4 = {
.name = "pc-q35-1.4",
.desc = "Standard PC (Q35 + ICH9, 2009)",
.init = pc_q35_init,
.max_cpus = 255,
.compat_props = (GlobalProperty[]) {
PC_COMPAT_1_4,
{ /* end of list */ }
},
DEFAULT_MACHINE_OPTIONS,
};
static void pc_q35_machine_init(void) static void pc_q35_machine_init(void)
{ {
qemu_register_machine(&pc_q35_machine); qemu_register_machine(&pc_q35_machine_v1_5);
qemu_register_machine(&pc_q35_machine_v1_4);
} }
machine_init(pc_q35_machine_init); machine_init(pc_q35_machine_init);