From nobody Sat May 18 14:10:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1637263232; cv=none; d=zohomail.com; s=zohoarc; b=NvyfL5dhue9HhnVTJwi1+THJf/mci78jpa2fDRtE6nn4J0dJ0dbscWGeC49UDwklFgkoHCnm/5cwY+nGWAbLcWs6R6DP8mA6OwLvefQcD3ukcuC0qssrTn0Mg5AZVaVPORKWM7qDxxntixiKvwpNX0uF7mkE2rRn6cMHti/cIxw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1637263232; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=jpwc1njUDX9WFQ9m4sbdQwM8ZWsmcA+LTfVamkkDYw8=; b=bOgXHfeyMxGE/XjbvaFdnVDT/WnLQVeZeJ3+Azo5XhWhTdAmjbN6pGPfifqIl1dxYdpQelscB6TpnupWBTiTkiHsmqeHUnKPKiWOXlaIvdj9EfntXSvuNpcJqejfB7sD6UPDo3O+I18D6nFy92Dwhia1YuY+AVRdTy6kkhBjshM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1637263232276987.8029343154676; Thu, 18 Nov 2021 11:20:32 -0800 (PST) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-547-CbMF53W-Nb2x2UdwAPzZ3Q-1; Thu, 18 Nov 2021 14:20:30 -0500 Received: by mail-wr1-f69.google.com with SMTP id y10-20020adffa4a000000b0017eea6cb05dso1297863wrr.6 for ; Thu, 18 Nov 2021 11:20:29 -0800 (PST) Return-Path: Return-Path: Received: from x1w.. (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id h13sm693837wrx.82.2021.11.18.11.20.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Nov 2021 11:20:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637263231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jpwc1njUDX9WFQ9m4sbdQwM8ZWsmcA+LTfVamkkDYw8=; b=bCBQKwaTIfVwms8+lJE7/+Xo8Vg9oxqUM0cWaboZvmbUR7plXu81aXpQk4e7U0BQXshuhU bS86iJ7OY3SavoUxN7otSFrQVwxN816vS1hw5G3tYYcyQsNVygAH3I4LnIM+WVkLVz/5x1 fz9mRPK6626ZRNvl3Hjw1F6m9nR1Z1s= X-MC-Unique: CbMF53W-Nb2x2UdwAPzZ3Q-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jpwc1njUDX9WFQ9m4sbdQwM8ZWsmcA+LTfVamkkDYw8=; b=ro1s/yNI/kTvpDSXiBlw/1hyciuvn5YqC1Kbqfu4zhOrbN8joZrCnmjA8jGf7k68y6 ORWAWC0NbLg7HWXmoZhiguhEXX+wHoOHW72xsu5M4plVirLUBKF54VjVC0Fm99YqQ43i J/MD9J/ZFOM3tgQehH8sgbNZfufoW/ftK8IqRwJFO6u+Nm3W73LhBhTujFhtPSwlj/vK FnUQf9PkRfOd9N7T5bY7wnelcMUaVX/GITzdEJNOXFPfuI6tT7/ZWkA9WXW9prjxxZon rJg4vfBGY7SALcSbocIPjNkCA6KXyNJIbxfLqlOJNiUYp6NKG/UKLFTKRJEkH1pVFT/q KCdQ== X-Gm-Message-State: AOAM533gFVgwvEk0/rIBNlBZs6Orsd+2hQgYkjFn1etMyHOmW5MCID6q 7vhCDJMrZWFpM3cB48Nop6P+5HjJu+E2xryDp06QU4pYjbeO5OMejBvb2wA9o+X3xWBdkKl29tD 6d94PoMlXBlfRfw== X-Received: by 2002:a1c:f416:: with SMTP id z22mr13418578wma.121.1637263227648; Thu, 18 Nov 2021 11:20:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJwmDTEBhR/CAMDNlUfC7jrP22ptSXJQeEhhe99lMJj3i1mF1yRQibbMwEQd1RamjtlOmMIEnQ== X-Received: by 2002:a1c:f416:: with SMTP id z22mr13418546wma.121.1637263227469; Thu, 18 Nov 2021 11:20:27 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , "Jose R . Ziviani" , John Snow , "Michael S. Tsirkin" , Gerd Hoffmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-6.2 1/2] hw/display: Add Error* handle to vga_common_init() Date: Thu, 18 Nov 2021 20:20:19 +0100 Message-Id: <20211118192020.61245-2-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211118192020.61245-1-philmd@redhat.com> References: <20211118192020.61245-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1637263233045100001 We want vga_common_init() to fail gracefully, therefore allow it to take an Error* handle. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/vga_int.h | 2 +- hw/display/ati.c | 4 +++- hw/display/cirrus_vga.c | 4 +++- hw/display/cirrus_vga_isa.c | 4 +++- hw/display/qxl.c | 4 +++- hw/display/vga-isa-mm.c | 3 ++- hw/display/vga-isa.c | 4 +++- hw/display/vga-pci.c | 8 ++++++-- hw/display/vga.c | 4 +++- hw/display/virtio-vga.c | 4 +++- hw/display/vmware_vga.c | 2 +- 11 files changed, 31 insertions(+), 12 deletions(-) diff --git a/hw/display/vga_int.h b/hw/display/vga_int.h index 847e784ca6a..305e700014d 100644 --- a/hw/display/vga_int.h +++ b/hw/display/vga_int.h @@ -156,7 +156,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 vga_common_init(VGACommonState *s, Object *obj, Error **errp); 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/hw/display/ati.c b/hw/display/ati.c index 31f22754dce..6e38e005022 100644 --- a/hw/display/ati.c +++ b/hw/display/ati.c @@ -955,7 +955,9 @@ static void ati_vga_realize(PCIDevice *dev, Error **err= p) } =20 /* init vga bits */ - vga_common_init(vga, OBJECT(s)); + if (!vga_common_init(vga, OBJECT(s), errp)) { + return; + } vga_init(vga, OBJECT(s), pci_address_space(dev), pci_address_space_io(dev), true); vga->con =3D graphic_console_init(DEVICE(s), 0, s->vga.hw_ops, &s->vga= ); diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c index fdca6ca659f..5a7ddb84ff0 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c @@ -2954,7 +2954,9 @@ static void pci_cirrus_vga_realize(PCIDevice *dev, Er= ror **errp) return; } /* setup VGA */ - vga_common_init(&s->vga, OBJECT(dev)); + if (!vga_common_init(&s->vga, OBJECT(dev), errp)) { + return; + } 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); diff --git a/hw/display/cirrus_vga_isa.c b/hw/display/cirrus_vga_isa.c index 4f6fb1af3bd..96144bd6906 100644 --- a/hw/display/cirrus_vga_isa.c +++ b/hw/display/cirrus_vga_isa.c @@ -56,7 +56,9 @@ static void isa_cirrus_vga_realizefn(DeviceState *dev, Er= ror **errp) return; } s->global_vmstate =3D true; - vga_common_init(s, OBJECT(dev)); + if (!vga_common_init(s, OBJECT(dev), errp)) { + return; + } cirrus_init_common(&d->cirrus_vga, OBJECT(dev), CIRRUS_ID_CLGD5430, 0, isa_address_space(isadev), isa_address_space_io(isadev)); diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 29c80b4289b..16eb98c25d8 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -2198,7 +2198,9 @@ 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 / MiB; - vga_common_init(vga, OBJECT(dev)); + if (!vga_common_init(vga, OBJECT(dev), errp)) { + return; + } 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, diff --git a/hw/display/vga-isa-mm.c b/hw/display/vga-isa-mm.c index 7321b7a06d5..420da1d7467 100644 --- a/hw/display/vga-isa-mm.c +++ b/hw/display/vga-isa-mm.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "qemu/bitops.h" #include "qemu/units.h" +#include "qapi/error.h" #include "migration/vmstate.h" #include "hw/display/vga.h" #include "vga_int.h" @@ -101,7 +102,7 @@ int isa_vga_mm_init(hwaddr vram_base, =20 s->vga.vram_size_mb =3D VGA_RAM_SIZE / MiB; s->vga.global_vmstate =3D true; - vga_common_init(&s->vga, NULL); + vga_common_init(&s->vga, NULL, &error_fatal); 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 8cea84f2bea..2782012196a 100644 --- a/hw/display/vga-isa.c +++ b/hw/display/vga-isa.c @@ -72,7 +72,9 @@ static void vga_isa_realizefn(DeviceState *dev, Error **e= rrp) } =20 s->global_vmstate =3D true; - vga_common_init(s, OBJECT(dev)); + if (!vga_common_init(s, OBJECT(dev), errp)) { + return; + } 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 62fb5c38c1f..3e5bc259f7a 100644 --- a/hw/display/vga-pci.c +++ b/hw/display/vga-pci.c @@ -239,7 +239,9 @@ static void pci_std_vga_realize(PCIDevice *dev, Error *= *errp) bool edid =3D false; =20 /* vga + console init */ - vga_common_init(s, OBJECT(dev)); + if (!vga_common_init(s, OBJECT(dev), errp)) { + return; + } vga_init(s, OBJECT(dev), pci_address_space(dev), pci_address_space_io(= dev), true); =20 @@ -275,7 +277,9 @@ static void pci_secondary_vga_realize(PCIDevice *dev, E= rror **errp) bool edid =3D false; =20 /* vga + console init */ - vga_common_init(s, OBJECT(dev)); + if (!vga_common_init(s, OBJECT(dev), errp)) { + return; + } s->con =3D graphic_console_init(DEVICE(dev), 0, s->hw_ops, s); =20 /* mmio bar */ diff --git a/hw/display/vga.c b/hw/display/vga.c index 9d1f66af402..a6759c7e934 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -2168,7 +2168,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 vga_common_init(VGACommonState *s, Object *obj, Error **errp) { int i, j, v, b; =20 @@ -2237,6 +2237,8 @@ void vga_common_init(VGACommonState *s, Object *obj) s->default_endian_fb =3D false; #endif vga_dirty_log_start(s); + + return true; } =20 static const MemoryRegionPortio vga_portio_list[] =3D { diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c index 9e57f61e9ed..d89735d7301 100644 --- a/hw/display/virtio-vga.c +++ b/hw/display/virtio-vga.c @@ -119,7 +119,9 @@ static void virtio_vga_base_realize(VirtIOPCIProxy *vpc= i_dev, Error **errp) =20 /* init vga compat bits */ vga->vram_size_mb =3D 8; - vga_common_init(vga, OBJECT(vpci_dev)); + if (!vga_common_init(vga, OBJECT(vpci_dev), errp)) { + return; + } 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 e2969a6c81c..d67318e6e46 100644 --- a/hw/display/vmware_vga.c +++ b/hw/display/vmware_vga.c @@ -1248,7 +1248,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)); + vga_common_init(&s->vga, OBJECT(dev), &error_fatal); vga_init(&s->vga, OBJECT(dev), address_space, io, true); vmstate_register(NULL, 0, &vmstate_vga_common, &s->vga); s->new_depth =3D 32; --=20 2.31.1 From nobody Sat May 18 14:10:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1637263236; cv=none; d=zohomail.com; s=zohoarc; b=JxJ8r5PcYf5zD80YMQoxwx5TpMi09MeA2T5mCOG+vPbPEzBfK/1hoAb6S4fs1vv61pMEPIeflh3Ka+qc8MoNPJp60X37PNav0M7aLB+DN8b64Ngv3smy9XYXtEPqvEWGf3a4JCKfw+VzjdXs+gWrErVVbj0+QdkRB/uGj1nCJC4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1637263236; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=BS3zUsplw/cddARHJF9KyG2TRGK5Hoy8tUIn5HvjRk8=; b=l+JonL2Da9na03jh+1VFftGvkIGjvWxkl57kL0+uiErrbru8hs4IwyRQSz0cGig93dJs/kH3iC1HrLaHoEChWkVwHMn+NiMO1aAomxN4m/HHAdld5kwLAZa3r/oFZ/ftVVu3s6GDILwFrbcJu/KOOTVG078t54cqpfylHwdObww= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1637263236486284.2253427038668; Thu, 18 Nov 2021 11:20:36 -0800 (PST) Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-161-iGRsMNpIOzWwBSnfzC_Jew-1; Thu, 18 Nov 2021 14:20:34 -0500 Received: by mail-wm1-f70.google.com with SMTP id o18-20020a05600c511200b00332fa17a02eso3593124wms.5 for ; Thu, 18 Nov 2021 11:20:33 -0800 (PST) Return-Path: Return-Path: Received: from x1w.. (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id u14sm679584wrt.49.2021.11.18.11.20.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Nov 2021 11:20:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637263235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BS3zUsplw/cddARHJF9KyG2TRGK5Hoy8tUIn5HvjRk8=; b=Zjd1q4GRxj4XNUjWvj6RO1sTiBN/7f5ISiW1yX80K1R8yPB078/NQtztv8rHkZZsxLaoGb TLD5MKg7wmo1gHEhJ1J5fu0uXKVdshlcxgvK7x8OSL3x2riUvnwY6p7HFdk5ZZCGgDJFrl SGKgn+1A/9QkjbZOOicVMgmG4FYoK20= X-MC-Unique: iGRsMNpIOzWwBSnfzC_Jew-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BS3zUsplw/cddARHJF9KyG2TRGK5Hoy8tUIn5HvjRk8=; b=tEm10FFAdvlsksKjEm1/Hy2MnTl9elrchHSdyTdszDOk+/Nu6YKJrTYBXYyKeSm4u5 7QuEiGfdNVUQPtIP2PUqAxIM1pti78du9InmYkcwkTMBqIYlxABWS3R19N4xlqhaY3dK NqOkBLo0L1r8Gr1xwEQN45ZECAldgqkhQRVz1uxE+d8PaPSLx3q0HQgK21lPkdIICKcH 8KlUB4s7H2Kgh1AV2g0Ex9ypzXu+78WEb9NoXyDQlqFcTDQYafw1TnQFradviWwf5iUP wyskfQtOpZvrALk//bKRfYZWaqIwTG2Hb07WiKBXhBSRkKwSV+HxBCSmqE4spIMGL4pM dZQQ== X-Gm-Message-State: AOAM532VcIlNwe+Q0xpZRh7pW+/z0jwy7r+Yu1uXN9QdmxHQt8OGn2KH F360MetB1adW02WEJOfzcBDBoYe2sQvRlR5pLOBsguJagEA6NYERl8/jxtID0UZNpoH/d4gngYs tVK+NOO3VzrbcLw== X-Received: by 2002:a05:600c:2252:: with SMTP id a18mr13369583wmm.133.1637263232416; Thu, 18 Nov 2021 11:20:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJwbiH+GAbOugjqSDdjSe0fk3jnOexxhrCeIIdpHsw4Ix0UwugXHk8a2HHULKDh34nPUn7UDjA== X-Received: by 2002:a05:600c:2252:: with SMTP id a18mr13369561wmm.133.1637263232276; Thu, 18 Nov 2021 11:20:32 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , "Jose R . Ziviani" , John Snow , "Michael S. Tsirkin" , Gerd Hoffmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-6.2 2/2] hw/display: Do not allow multiple identical VGA devices Date: Thu, 18 Nov 2021 20:20:20 +0100 Message-Id: <20211118192020.61245-3-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211118192020.61245-1-philmd@redhat.com> References: <20211118192020.61245-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1637263237817100001 vga_common_init() create a MemoryRegion named "vga.vram", used as a singleton for the device class. When creating the same device type multiple times, we get: $ qemu-system-mips64 -M pica61 -device isa-cirrus-vga RAMBlock "vga.vram" already registered, abort! Aborted (core dumped) Commit 7852a77f598 ("vga: don't abort when adding a duplicate isa-vga device") added a check for a single device, generalize it to all VGA devices which call vga_common_init(): $ qemu-system-mips64 -M pica61 -device isa-cirrus-vga qemu-system-mips64: -device isa-cirrus-vga: at most one isa-cirrus-vga de= vice is permitted Reported-by: John Snow Resolves: https://gitlab.com/qemu-project/qemu/-/issues/44 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/vga-isa.c | 9 --------- hw/display/vga.c | 13 +++++++++++++ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c index 2782012196a..b930c8d2667 100644 --- a/hw/display/vga-isa.c +++ b/hw/display/vga-isa.c @@ -62,15 +62,6 @@ static void vga_isa_realizefn(DeviceState *dev, Error **= errp) MemoryRegion *vga_io_memory; const MemoryRegionPortio *vga_ports, *vbe_ports; =20 - /* - * make sure this device is not being added twice, if so - * exit without crashing qemu - */ - if (object_resolve_path_type("", TYPE_ISA_VGA, NULL)) { - error_setg(errp, "at most one %s device is permitted", TYPE_ISA_VG= A); - return; - } - s->global_vmstate =3D true; if (!vga_common_init(s, OBJECT(dev), errp)) { return; diff --git a/hw/display/vga.c b/hw/display/vga.c index a6759c7e934..8f0d5cc9019 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -2172,6 +2172,19 @@ bool vga_common_init(VGACommonState *s, Object *obj,= Error **errp) { int i, j, v, b; =20 + if (obj) { + const char *typename =3D object_get_typename(obj); + + /* + * make sure this device is not being added twice, + * if so exit without crashing qemu + */ + if (object_resolve_path_type("", typename, NULL)) { + error_setg(errp, "at most one %s device is permitted", typenam= e); + return false; + } + } + for(i =3D 0;i < 256; i++) { v =3D 0; for(j =3D 0; j < 8; j++) { --=20 2.31.1