From nobody Tue Nov 4 18:29:24 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530611487599640.7794442277612; Tue, 3 Jul 2018 02:51:27 -0700 (PDT) Received: from localhost ([::1]:39254 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faHy2-0005gF-Tv for importer@patchew.org; Tue, 03 Jul 2018 05:51:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36900) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faHs8-0001k7-9U for qemu-devel@nongnu.org; Tue, 03 Jul 2018 05:45:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faHs5-0004yA-1Q for qemu-devel@nongnu.org; Tue, 03 Jul 2018 05:45:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42146) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1faHs4-0004xh-PE for qemu-devel@nongnu.org; Tue, 03 Jul 2018 05:45:16 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BEA06308626D for ; Tue, 3 Jul 2018 09:45:15 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-220.phx2.redhat.com [10.3.116.220]) by smtp.corp.redhat.com (Postfix) with ESMTP id 385B160BE7; Tue, 3 Jul 2018 09:45:10 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 1BB901FCEE; Tue, 3 Jul 2018 11:45:09 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 3 Jul 2018 11:45:08 +0200 Message-Id: <20180703094508.25987-5-kraxel@redhat.com> In-Reply-To: <20180703094508.25987-1-kraxel@redhat.com> References: <20180703094508.25987-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Tue, 03 Jul 2018 09:45:15 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 4/4] vga: disable global_vmstate for 3.0+ machine types X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 Message-Id: <20180702163345.17892-1-kraxel@redhat.com> --- hw/display/vga_int.h | 3 ++- include/hw/compat.h | 16 ++++++++++++++++ hw/display/cirrus_vga.c | 9 ++++++--- hw/display/qxl.c | 3 ++- hw/display/vga-isa-mm.c | 3 ++- hw/display/vga-isa.c | 3 ++- hw/display/vga-pci.c | 5 +++-- hw/display/vga.c | 4 ++-- hw/display/virtio-vga.c | 2 +- hw/display/vmware_vga.c | 4 +++- 10 files changed, 39 insertions(+), 13 deletions(-) diff --git a/hw/display/vga_int.h b/hw/display/vga_int.h index f8fcf62a56..339661bc01 100644 --- a/hw/display/vga_int.h +++ b/hw/display/vga_int.h @@ -133,6 +133,7 @@ typedef struct VGACommonState { bool full_update_gfx; bool big_endian_fb; bool default_endian_fb; + bool global_vmstate; /* hardware mouse cursor support */ uint32_t invalidated_y_table[VGA_MAX_HEIGHT / 32]; uint32_t hw_cursor_x; @@ -157,7 +158,7 @@ static inline int c6_to_8(int v) return (v << 2) | (b << 1) | b; } =20 -void vga_common_init(VGACommonState *s, Object *obj, bool global_vmstate); +void vga_common_init(VGACommonState *s, Object *obj); void vga_init(VGACommonState *s, Object *obj, MemoryRegion *address_space, MemoryRegion *address_space_io, bool init_vga_ports); MemoryRegion *vga_init_io(VGACommonState *s, Object *obj, 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 =3D "hda-audio",\ .property =3D "use-timer",\ .value =3D "false",\ + },{\ + .driver =3D "cirrus-vga",\ + .property =3D "global-vmstate",\ + .value =3D "true",\ + },{\ + .driver =3D "VGA",\ + .property =3D "global-vmstate",\ + .value =3D "true",\ + },{\ + .driver =3D "vmware-svga",\ + .property =3D "global-vmstate",\ + .value =3D "true",\ + },{\ + .driver =3D "qxl-vga",\ + .property =3D "global-vmstate",\ + .value =3D "true",\ }, =20 #define HW_COMPAT_2_11 \ diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c index 138ae961b9..1d050621f1 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c @@ -3048,7 +3048,8 @@ static void isa_cirrus_vga_realizefn(DeviceState *dev= , Error **errp) s->vram_size_mb); return; } - vga_common_init(s, OBJECT(dev), true); + s->global_vmstate =3D true; + vga_common_init(s, OBJECT(dev)); cirrus_init_common(&d->cirrus_vga, OBJECT(dev), CIRRUS_ID_CLGD5430, 0, isa_address_space(isadev), isa_address_space_io(isadev)); @@ -3062,7 +3063,7 @@ static Property isa_cirrus_vga_properties[] =3D { DEFINE_PROP_UINT32("vgamem_mb", struct ISACirrusVGAState, cirrus_vga.vga.vram_size_mb, 4), DEFINE_PROP_BOOL("blitter", struct ISACirrusVGAState, - cirrus_vga.enable_blitter, true), + cirrus_vga.enable_blitter, true), DEFINE_PROP_END_OF_LIST(), }; =20 @@ -3105,7 +3106,7 @@ static void pci_cirrus_vga_realize(PCIDevice *dev, Er= ror **errp) return; } /* setup VGA */ - vga_common_init(&s->vga, OBJECT(dev), true); + vga_common_init(&s->vga, OBJECT(dev)); cirrus_init_common(s, OBJECT(dev), device_id, 1, pci_address_space(de= v), pci_address_space_io(dev)); s->vga.con =3D graphic_console_init(DEVICE(dev), 0, s->vga.hw_ops, &s= ->vga); @@ -3134,6 +3135,8 @@ static Property pci_vga_cirrus_properties[] =3D { cirrus_vga.vga.vram_size_mb, 4), DEFINE_PROP_BOOL("blitter", struct PCICirrusVGAState, cirrus_vga.enable_blitter, true), + DEFINE_PROP_BOOL("global-vmstate", struct PCICirrusVGAState, + cirrus_vga.vga.global_vmstate, false), DEFINE_PROP_END_OF_LIST(), }; =20 diff --git a/hw/display/qxl.c b/hw/display/qxl.c index a71714ccb4..3f740d7aa3 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -2168,7 +2168,7 @@ static void qxl_realize_primary(PCIDevice *dev, Error= **errp) qxl_init_ramsize(qxl); vga->vbe_size =3D qxl->vgamem_size; vga->vram_size_mb =3D qxl->vga.vram_size >> 20; - vga_common_init(vga, OBJECT(dev), true); + vga_common_init(vga, OBJECT(dev)); vga_init(vga, OBJECT(dev), pci_address_space(dev), pci_address_space_io(dev), false); portio_list_init(&qxl->vga_port_list, OBJECT(dev), qxl_vga_portio_list, @@ -2410,6 +2410,7 @@ static Property qxl_properties[] =3D { #endif DEFINE_PROP_UINT32("xres", PCIQXLDevice, xres, 0), DEFINE_PROP_UINT32("yres", PCIQXLDevice, yres, 0), + DEFINE_PROP_BOOL("global-vmstate", PCIQXLDevice, vga.global_vmstat= e, false), DEFINE_PROP_END_OF_LIST(), }; =20 diff --git a/hw/display/vga-isa-mm.c b/hw/display/vga-isa-mm.c index e887b45651..d2d6b32abf 100644 --- a/hw/display/vga-isa-mm.c +++ b/hw/display/vga-isa-mm.c @@ -131,7 +131,8 @@ int isa_vga_mm_init(hwaddr vram_base, s =3D g_malloc0(sizeof(*s)); =20 s->vga.vram_size_mb =3D VGA_RAM_SIZE >> 20; - vga_common_init(&s->vga, NULL, true); + s->vga.global_vmstate =3D true; + vga_common_init(&s->vga, NULL); vga_mm_init(s, vram_base, ctrl_base, it_shift, address_space); =20 s->vga.con =3D graphic_console_init(NULL, 0, s->vga.hw_ops, s); diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c index 469834add5..fa44242e0d 100644 --- a/hw/display/vga-isa.c +++ b/hw/display/vga-isa.c @@ -58,7 +58,8 @@ static void vga_isa_realizefn(DeviceState *dev, Error **e= rrp) MemoryRegion *vga_io_memory; const MemoryRegionPortio *vga_ports, *vbe_ports; =20 - vga_common_init(s, OBJECT(dev), true); + s->global_vmstate =3D true; + vga_common_init(s, OBJECT(dev)); s->legacy_address_space =3D isa_address_space(isadev); vga_io_memory =3D vga_init_io(s, OBJECT(dev), &vga_ports, &vbe_ports); isa_register_portio_list(isadev, &d->portio_vga, diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c index 1ea559762a..e9e62eac70 100644 --- a/hw/display/vga-pci.c +++ b/hw/display/vga-pci.c @@ -222,7 +222,7 @@ static void pci_std_vga_realize(PCIDevice *dev, Error *= *errp) bool qext =3D false; =20 /* vga + console init */ - vga_common_init(s, OBJECT(dev), true); + vga_common_init(s, OBJECT(dev)); vga_init(s, OBJECT(dev), pci_address_space(dev), pci_address_space_io(= dev), true); =20 @@ -265,7 +265,7 @@ static void pci_secondary_vga_realize(PCIDevice *dev, E= rror **errp) bool qext =3D false; =20 /* vga + console init */ - vga_common_init(s, OBJECT(dev), false); + vga_common_init(s, OBJECT(dev)); s->con =3D graphic_console_init(DEVICE(dev), 0, s->hw_ops, s); =20 /* mmio bar */ @@ -308,6 +308,7 @@ static Property vga_pci_properties[] =3D { DEFINE_PROP_BIT("mmio", PCIVGAState, flags, PCI_VGA_FLAG_ENABLE_MMIO, = true), DEFINE_PROP_BIT("qemu-extended-regs", PCIVGAState, flags, PCI_VGA_FLAG_ENABLE_QEXT, true), + DEFINE_PROP_BOOL("global-vmstate", PCIVGAState, vga.global_vmstate, fa= lse), DEFINE_PROP_END_OF_LIST(), }; =20 diff --git a/hw/display/vga.c b/hw/display/vga.c index ed476e4e80..c82e6d240a 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -2163,7 +2163,7 @@ static inline uint32_t uint_clamp(uint32_t val, uint3= 2_t vmin, uint32_t vmax) return val; } =20 -void vga_common_init(VGACommonState *s, Object *obj, bool global_vmstate) +void vga_common_init(VGACommonState *s, Object *obj) { int i, j, v, b; =20 @@ -2202,7 +2202,7 @@ void vga_common_init(VGACommonState *s, Object *obj, = bool global_vmstate) s->is_vbe_vmstate =3D 1; memory_region_init_ram_nomigrate(&s->vram, obj, "vga.vram", s->vram_si= ze, &error_fatal); - vmstate_register_ram(&s->vram, global_vmstate ? NULL : DEVICE(obj)); + vmstate_register_ram(&s->vram, s->global_vmstate ? NULL : DEVICE(obj)); xen_register_framebuffer(&s->vram); s->vram_ptr =3D memory_region_get_ram_ptr(&s->vram); s->get_bpp =3D vga_get_bpp; diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c index 97db6c3372..8d3d9e14a7 100644 --- a/hw/display/virtio-vga.c +++ b/hw/display/virtio-vga.c @@ -106,7 +106,7 @@ static void virtio_vga_realize(VirtIOPCIProxy *vpci_dev= , Error **errp) =20 /* init vga compat bits */ vga->vram_size_mb =3D 8; - vga_common_init(vga, OBJECT(vpci_dev), false); + vga_common_init(vga, OBJECT(vpci_dev)); vga_init(vga, OBJECT(vpci_dev), pci_address_space(&vpci_dev->pci_dev), pci_address_space_io(&vpci_dev->pci_dev), true); pci_register_bar(&vpci_dev->pci_dev, 0, diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c index bd3e8b3586..39f4d40801 100644 --- a/hw/display/vmware_vga.c +++ b/hw/display/vmware_vga.c @@ -1241,7 +1241,7 @@ static void vmsvga_init(DeviceState *dev, struct vmsv= ga_state_s *s, &error_fatal); s->fifo_ptr =3D memory_region_get_ram_ptr(&s->fifo_ram); =20 - vga_common_init(&s->vga, OBJECT(dev), true); + vga_common_init(&s->vga, OBJECT(dev)); vga_init(&s->vga, OBJECT(dev), address_space, io, true); vmstate_register(NULL, 0, &vmstate_vga_common, &s->vga); s->new_depth =3D 32; @@ -1321,6 +1321,8 @@ static void pci_vmsvga_realize(PCIDevice *dev, Error = **errp) static Property vga_vmware_properties[] =3D { DEFINE_PROP_UINT32("vgamem_mb", struct pci_vmsvga_state_s, chip.vga.vram_size_mb, 16), + DEFINE_PROP_BOOL("global-vmstate", struct pci_vmsvga_state_s, + chip.vga.global_vmstate, false), DEFINE_PROP_END_OF_LIST(), }; =20 --=20 2.9.3