summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2018-07-02 18:33:44 +0200
committerGerd Hoffmann <kraxel@redhat.com>2018-07-03 11:19:49 +0200
commit1fcfdc435a3e25ab9037f6f7b8ab4bdf89ba1269 (patch)
tree847436a641f4365a151eb77405fa106fb0b62f5b /include
parent1fccd7c5a9a722a9cbf1bc91693f4618034f01ac (diff)
vga: disable global_vmstate for 3.0+ machine types
Move global_vmstate from vga_common_init() parameter to VGACommonState field. Set global_vmstate to true for isa vga devices, so nothing changes here. virtio-vga and secondary-vga already set global_vmstate to false so no change here either. All other pci vga devices get a new global-vmstate property, defaulting to false. A compat property flips it to true for older machine types. With this in place you don't get a vmstate section naming conflict any more when adding multiple pci vga devices to your vm. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Message-Id: <20180702163345.17892-1-kraxel@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/hw/compat.h16
1 files changed, 16 insertions, 0 deletions
diff --git a/include/hw/compat.h b/include/hw/compat.h
index 44d5964060..c08f4040bb 100644
--- a/include/hw/compat.h
+++ b/include/hw/compat.h
@@ -10,6 +10,22 @@
.driver = "hda-audio",\
.property = "use-timer",\
.value = "false",\
+ },{\
+ .driver = "cirrus-vga",\
+ .property = "global-vmstate",\
+ .value = "true",\
+ },{\
+ .driver = "VGA",\
+ .property = "global-vmstate",\
+ .value = "true",\
+ },{\
+ .driver = "vmware-svga",\
+ .property = "global-vmstate",\
+ .value = "true",\
+ },{\
+ .driver = "qxl-vga",\
+ .property = "global-vmstate",\
+ .value = "true",\
},
#define HW_COMPAT_2_11 \