From nobody Sun Nov 9 20:21:50 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.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 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551945984792415.5435675525274; Thu, 7 Mar 2019 00:06:24 -0800 (PST) Received: from localhost ([127.0.0.1]:47204 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1o2m-0007Bb-QC for importer@patchew.org; Thu, 07 Mar 2019 03:06:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40594) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1nzU-0004aQ-00 for qemu-devel@nongnu.org; Thu, 07 Mar 2019 03:02:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1nzS-0002Ph-4c for qemu-devel@nongnu.org; Thu, 07 Mar 2019 03:02:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49262) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1nzQ-0002OG-7V for qemu-devel@nongnu.org; Thu, 07 Mar 2019 03:02:52 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8226F8762B for ; Thu, 7 Mar 2019 08:02:50 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-211.ams2.redhat.com [10.36.116.211]) by smtp.corp.redhat.com (Postfix) with ESMTP id F14B260141; Thu, 7 Mar 2019 08:02:45 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 0AAFA17475; Thu, 7 Mar 2019 09:02:45 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 09:02:42 +0100 Message-Id: <20190307080244.9011-2-kraxel@redhat.com> In-Reply-To: <20190307080244.9011-1-kraxel@redhat.com> References: <20190307080244.9011-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 07 Mar 2019 08:02:50 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/3] virtio: add class_size to VirtioPCIDeviceTypeInfo 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" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Needed when VirtioPCIClass subclasses have their own class struct with some extra fields. Signed-off-by: Gerd Hoffmann Reviewed-by: Michael S. Tsirkin Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/virtio/virtio-pci.h | 1 + hw/virtio/virtio-pci.c | 1 + 2 files changed, 2 insertions(+) diff --git a/hw/virtio/virtio-pci.h b/hw/virtio/virtio-pci.h index bd223a6e3b0b..18581854cae1 100644 --- a/hw/virtio/virtio-pci.h +++ b/hw/virtio/virtio-pci.h @@ -230,6 +230,7 @@ typedef struct VirtioPCIDeviceTypeInfo { =20 /* Same as TypeInfo fields: */ size_t instance_size; + size_t class_size; void (*instance_init)(Object *obj); void (*class_init)(ObjectClass *klass, void *data); } VirtioPCIDeviceTypeInfo; diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index e978bfe76048..cb44e19b6789 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -1935,6 +1935,7 @@ void virtio_pci_types_register(const VirtioPCIDeviceT= ypeInfo *t) .parent =3D t->parent ? t->parent : TYPE_VIRTIO_PCI, .instance_size =3D t->instance_size, .instance_init =3D t->instance_init, + .class_size =3D t->class_size, .class_init =3D virtio_pci_base_class_init, .class_data =3D (void *)t, .abstract =3D true, --=20 2.18.1 From nobody Sun Nov 9 20:21:50 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.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 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551945888886509.0460588725648; Thu, 7 Mar 2019 00:04:48 -0800 (PST) Received: from localhost ([127.0.0.1]:47159 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1o19-0005YJ-OE for importer@patchew.org; Thu, 07 Mar 2019 03:04:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40592) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1nzU-0004aP-00 for qemu-devel@nongnu.org; Thu, 07 Mar 2019 03:02:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1nzS-0002Pq-4w for qemu-devel@nongnu.org; Thu, 07 Mar 2019 03:02:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34968) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1nzQ-0002Nx-6Z for qemu-devel@nongnu.org; Thu, 07 Mar 2019 03:02:52 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4E2A88763A for ; Thu, 7 Mar 2019 08:02:50 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-211.ams2.redhat.com [10.36.116.211]) by smtp.corp.redhat.com (Postfix) with ESMTP id F10E8413B; Thu, 7 Mar 2019 08:02:45 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 12E6417476; Thu, 7 Mar 2019 09:02:45 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 09:02:43 +0100 Message-Id: <20190307080244.9011-3-kraxel@redhat.com> In-Reply-To: <20190307080244.9011-1-kraxel@redhat.com> References: <20190307080244.9011-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 07 Mar 2019 08:02:50 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/3] virtio-vga: fix reset. 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" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Store reset handler of the parent class and just call that for a complete virtio reset. When taking the shortcut and calling virtio_gpu_reset() directly the generic virtio reset code (for virtqueues etc) will not be executed. Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=3D1597621 Signed-off-by: Gerd Hoffmann Reviewed-by: Michael S. Tsirkin Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/virtio-vga.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c index 1e48009b74a6..a2b803b75f94 100644 --- a/hw/display/virtio-vga.c +++ b/hw/display/virtio-vga.c @@ -12,6 +12,10 @@ #define TYPE_VIRTIO_VGA "virtio-vga" #define VIRTIO_VGA(obj) \ OBJECT_CHECK(VirtIOVGA, (obj), TYPE_VIRTIO_VGA) +#define VIRTIO_VGA_GET_CLASS(obj) \ + OBJECT_GET_CLASS(VirtIOVGAClass, obj, TYPE_VIRTIO_VGA) +#define VIRTIO_VGA_CLASS(klass) \ + OBJECT_CLASS_CHECK(VirtIOVGAClass, klass, TYPE_VIRTIO_VGA) =20 typedef struct VirtIOVGA { VirtIOPCIProxy parent_obj; @@ -20,6 +24,11 @@ typedef struct VirtIOVGA { MemoryRegion vga_mrs[3]; } VirtIOVGA; =20 +typedef struct VirtIOVGAClass { + VirtioPCIClass parent_class; + DeviceReset parent_reset; +} VirtIOVGAClass; + static void virtio_vga_invalidate_display(void *opaque) { VirtIOVGA *vvga =3D opaque; @@ -168,10 +177,11 @@ static void virtio_vga_realize(VirtIOPCIProxy *vpci_d= ev, Error **errp) =20 static void virtio_vga_reset(DeviceState *dev) { + VirtIOVGAClass *klass =3D VIRTIO_VGA_GET_CLASS(dev); VirtIOVGA *vvga =3D VIRTIO_VGA(dev); =20 /* reset virtio-gpu */ - virtio_gpu_reset(VIRTIO_DEVICE(&vvga->vdev)); + klass->parent_reset(dev); =20 /* reset vga */ vga_common_reset(&vvga->vga); @@ -187,13 +197,15 @@ static void virtio_vga_class_init(ObjectClass *klass,= void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); VirtioPCIClass *k =3D VIRTIO_PCI_CLASS(klass); + VirtIOVGAClass *v =3D VIRTIO_VGA_CLASS(klass); PCIDeviceClass *pcidev_k =3D PCI_DEVICE_CLASS(klass); =20 set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories); dc->props =3D virtio_vga_properties; - dc->reset =3D virtio_vga_reset; dc->vmsd =3D &vmstate_virtio_vga; dc->hotpluggable =3D false; + device_class_set_parent_reset(dc, virtio_vga_reset, + &v->parent_reset); =20 k->realize =3D virtio_vga_realize; pcidev_k->romfile =3D "vgabios-virtio.bin"; @@ -212,6 +224,7 @@ static VirtioPCIDeviceTypeInfo virtio_vga_info =3D { .generic_name =3D TYPE_VIRTIO_VGA, .instance_size =3D sizeof(struct VirtIOVGA), .instance_init =3D virtio_vga_inst_initfn, + .class_size =3D sizeof(struct VirtIOVGAClass), .class_init =3D virtio_vga_class_init, }; =20 --=20 2.18.1 From nobody Sun Nov 9 20:21:50 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.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 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551945895231610.5732127356929; Thu, 7 Mar 2019 00:04:55 -0800 (PST) Received: from localhost ([127.0.0.1]:47164 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1o1K-0005fd-8Q for importer@patchew.org; Thu, 07 Mar 2019 03:04:50 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40614) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1nzV-0004az-Rt for qemu-devel@nongnu.org; Thu, 07 Mar 2019 03:03:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1nzT-0002Qh-VR for qemu-devel@nongnu.org; Thu, 07 Mar 2019 03:02:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33804) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1nzS-0002P2-3S for qemu-devel@nongnu.org; Thu, 07 Mar 2019 03:02:54 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 957C630718D4 for ; Thu, 7 Mar 2019 08:02:52 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-211.ams2.redhat.com [10.36.116.211]) by smtp.corp.redhat.com (Postfix) with ESMTP id F118719C68; Thu, 7 Mar 2019 08:02:45 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 1C34517514; Thu, 7 Mar 2019 09:02:45 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 09:02:44 +0100 Message-Id: <20190307080244.9011-4-kraxel@redhat.com> In-Reply-To: <20190307080244.9011-1-kraxel@redhat.com> References: <20190307080244.9011-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Thu, 07 Mar 2019 08:02:52 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 3/3] virtio-gpu: make virtio_gpu_reset static 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" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Gerd Hoffmann Reviewed-by: Michael S. Tsirkin Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/virtio/virtio-gpu.h | 1 - hw/display/virtio-gpu.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h index 98504f907583..ce0ca7217175 100644 --- a/include/hw/virtio/virtio-gpu.h +++ b/include/hw/virtio/virtio-gpu.h @@ -148,7 +148,6 @@ extern const GraphicHwOps virtio_gpu_ops; } while (0) =20 /* virtio-gpu.c */ -void virtio_gpu_reset(VirtIODevice *vdev); void virtio_gpu_ctrl_response(VirtIOGPU *g, struct virtio_gpu_ctrl_command *cmd, struct virtio_gpu_ctrl_hdr *resp, diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index a3627f58a9dd..4dbf48e42482 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -1346,7 +1346,7 @@ static void virtio_gpu_instance_init(Object *obj) { } =20 -void virtio_gpu_reset(VirtIODevice *vdev) +static void virtio_gpu_reset(VirtIODevice *vdev) { VirtIOGPU *g =3D VIRTIO_GPU(vdev); struct virtio_gpu_simple_resource *res, *tmp; --=20 2.18.1