summaryrefslogtreecommitdiffstats
path: root/include/hw/i386
diff options
context:
space:
mode:
authorCornelia Huck2019-07-24 12:35:24 +0200
committerDavid Gibson2019-08-21 03:32:11 +0200
commit9aec2e52ce9d9632a86be2d1d0dd493722d2e7be (patch)
tree6a5d0393924d973a74b9ddf430c294acef42e11c /include/hw/i386
parentspapr_iommu: Fix xlate trace to print translated address (diff)
downloadqemu-9aec2e52ce9d9632a86be2d1d0dd493722d2e7be.tar.gz
qemu-9aec2e52ce9d9632a86be2d1d0dd493722d2e7be.tar.xz
qemu-9aec2e52ce9d9632a86be2d1d0dd493722d2e7be.zip
hw: add compat machines for 4.2
Add 4.2 machine types for arm/i440fx/q35/s390x/spapr. For i440fx and q35, unversioned cpu models are still translated to -v1, as 0788a56bd1ae ("i386: Make unversioned CPU models be aliases") states this should only transition to the latest cpu model version in 4.3 (or later). Signed-off-by: Cornelia Huck <cohuck@redhat.com> Message-Id: <20190724103524.20916-1-cohuck@redhat.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'include/hw/i386')
-rw-r--r--include/hw/i386/pc.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 4bb9e29114..ec538df9b7 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -301,6 +301,9 @@ 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 *);
+extern GlobalProperty pc_compat_4_1[];
+extern const size_t pc_compat_4_1_len;
+
extern GlobalProperty pc_compat_4_0[];
extern const size_t pc_compat_4_0_len;