diff options
| author | Eduardo Habkost | 2015-11-30 15:56:36 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin | 2015-12-22 17:39:19 +0100 |
| commit | 240240d5da54eb13745285d02fd215683c8f03c9 (patch) | |
| tree | 0c3cb06a58782337eecb7f2ddccd4cdcd4cc5edc /include | |
| parent | pc: Remove redundant code from pc-*-2.3 machine classes (diff) | |
| download | qemu-240240d5da54eb13745285d02fd215683c8f03c9.tar.gz qemu-240240d5da54eb13745285d02fd215683c8f03c9.tar.xz qemu-240240d5da54eb13745285d02fd215683c8f03c9.zip | |
pc: Add pc-*-2.6 machine classes
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/compat.h | 3 | ||||
| -rw-r--r-- | include/hw/i386/pc.h | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/include/hw/compat.h b/include/hw/compat.h index bcb36ef836..eaf5ab47ba 100644 --- a/include/hw/compat.h +++ b/include/hw/compat.h @@ -1,6 +1,9 @@ #ifndef HW_COMPAT_H #define HW_COMPAT_H +#define HW_COMPAT_2_5 \ + /* empty */ + #define HW_COMPAT_2_4 \ {\ .driver = "virtio-blk-device",\ diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index e5eb15c35e..e2a42db43b 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -350,7 +350,11 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t); int e820_get_num_entries(void); 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 \ + PC_COMPAT_2_5 \ HW_COMPAT_2_4 \ {\ .driver = "Haswell-" TYPE_X86_CPU,\ |