diff options
| author | Eduardo Habkost | 2015-05-14 20:53:10 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin | 2015-05-31 16:26:41 +0200 |
| commit | f6d5a0bad276ea97fac4e0efb0f41f54a3f1ac84 (patch) | |
| tree | ae7533d9100e0dbc265366d0447d4c6c09bb8ca1 /hw/i386/pc_piix.c | |
| parent | piix: Move pc-0.1[23] rombar compat props to PC_COMPAT_0_13 (diff) | |
| download | qemu-f6d5a0bad276ea97fac4e0efb0f41f54a3f1ac84.tar.gz qemu-f6d5a0bad276ea97fac4e0efb0f41f54a3f1ac84.tar.xz qemu-f6d5a0bad276ea97fac4e0efb0f41f54a3f1ac84.zip | |
piix: Define PC_COMPAT_0_10
Move compat_props from pc-0.10 to the macro, to make it consistent with
the other machines.
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>
Diffstat (limited to 'hw/i386/pc_piix.c')
| -rw-r--r-- | hw/i386/pc_piix.c | 47 |
1 files changed, 25 insertions, 22 deletions
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index ac98af12d7..6734c62df7 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -930,32 +930,35 @@ static QEMUMachine pc_machine_v0_11 = { .hw_version = "0.11", }; +#define PC_COMPAT_0_10 \ + PC_COMPAT_0_11 \ + {\ + .driver = "virtio-blk-pci",\ + .property = "class",\ + .value = stringify(PCI_CLASS_STORAGE_OTHER),\ + },{\ + .driver = "virtio-serial-pci",\ + .property = "class",\ + .value = stringify(PCI_CLASS_DISPLAY_OTHER),\ + },{\ + .driver = "virtio-net-pci",\ + .property = "vectors",\ + .value = stringify(0),\ + },{\ + .driver = "ide-drive",\ + .property = "ver",\ + .value = "0.10",\ + },{\ + .driver = "scsi-disk",\ + .property = "ver",\ + .value = "0.10",\ + }, + static QEMUMachine pc_machine_v0_10 = { PC_I440FX_0_13_MACHINE_OPTIONS, .name = "pc-0.10", .compat_props = (GlobalProperty[]) { - PC_COMPAT_0_11 - { - .driver = "virtio-blk-pci", - .property = "class", - .value = stringify(PCI_CLASS_STORAGE_OTHER), - },{ - .driver = "virtio-serial-pci", - .property = "class", - .value = stringify(PCI_CLASS_DISPLAY_OTHER), - },{ - .driver = "virtio-net-pci", - .property = "vectors", - .value = stringify(0), - },{ - .driver = "ide-drive", - .property = "ver", - .value = "0.10", - },{ - .driver = "scsi-disk", - .property = "ver", - .value = "0.10", - }, + PC_COMPAT_0_10 { /* end of list */ } }, .hw_version = "0.10", |