mirror of
https://git.proxmox.com/git/qemu
synced 2025-07-17 22:49:43 +00:00
pc: add machine type for 0.12
Add a new machine type for qemu 0.12. Also fixup the 0.11 machine type: msi for virtio-blk-pci was enabled after the 0.11 release, so turn it off in the 0.11 machine type. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
bfe4e17242
commit
2cae6f5e34
18
hw/pc.c
18
hw/pc.c
@ -1065,7 +1065,7 @@ void cmos_set_s3_resume(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static QEMUMachine pc_machine = {
|
static QEMUMachine pc_machine = {
|
||||||
.name = "pc-0.11",
|
.name = "pc-0.12",
|
||||||
.alias = "pc",
|
.alias = "pc",
|
||||||
.desc = "Standard PC",
|
.desc = "Standard PC",
|
||||||
.init = pc_init_pci,
|
.init = pc_init_pci,
|
||||||
@ -1073,6 +1073,21 @@ static QEMUMachine pc_machine = {
|
|||||||
.is_default = 1,
|
.is_default = 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static QEMUMachine pc_machine_v0_11 = {
|
||||||
|
.name = "pc-0.11",
|
||||||
|
.desc = "Standard PC, qemu 0.11",
|
||||||
|
.init = pc_init_pci,
|
||||||
|
.max_cpus = 255,
|
||||||
|
.compat_props = (GlobalProperty[]) {
|
||||||
|
{
|
||||||
|
.driver = "virtio-blk-pci",
|
||||||
|
.property = "vectors",
|
||||||
|
.value = stringify(0),
|
||||||
|
},
|
||||||
|
{ /* end of list */ }
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
static QEMUMachine pc_machine_v0_10 = {
|
static QEMUMachine pc_machine_v0_10 = {
|
||||||
.name = "pc-0.10",
|
.name = "pc-0.10",
|
||||||
.desc = "Standard PC, qemu 0.10",
|
.desc = "Standard PC, qemu 0.10",
|
||||||
@ -1110,6 +1125,7 @@ static QEMUMachine isapc_machine = {
|
|||||||
static void pc_machine_init(void)
|
static void pc_machine_init(void)
|
||||||
{
|
{
|
||||||
qemu_register_machine(&pc_machine);
|
qemu_register_machine(&pc_machine);
|
||||||
|
qemu_register_machine(&pc_machine_v0_11);
|
||||||
qemu_register_machine(&pc_machine_v0_10);
|
qemu_register_machine(&pc_machine_v0_10);
|
||||||
qemu_register_machine(&isapc_machine);
|
qemu_register_machine(&isapc_machine);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user