From patchwork Fri Mar 8 12:39:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 10844595 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D57E51390 for ; Fri, 8 Mar 2019 12:41:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C36672DA93 for ; Fri, 8 Mar 2019 12:41:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C1EFE2E00F; Fri, 8 Mar 2019 12:41:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3C7AF2DA93 for ; Fri, 8 Mar 2019 12:41:41 +0000 (UTC) Received: from localhost ([127.0.0.1]:42434 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2Eol-0002hb-Fs for patchwork-qemu-devel@patchwork.kernel.org; Fri, 08 Mar 2019 07:41:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53433) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2EnD-0001MC-76 for qemu-devel@nongnu.org; Fri, 08 Mar 2019 07:40:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h2En6-0004kO-Ou for qemu-devel@nongnu.org; Fri, 08 Mar 2019 07:40:01 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48156) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h2En5-0003V2-U4 for qemu-devel@nongnu.org; Fri, 08 Mar 2019 07:39:56 -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 C1651308A9BE; Fri, 8 Mar 2019 12:39:42 +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 6031A4141; Fri, 8 Mar 2019 12:39:38 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 652A817515; Fri, 8 Mar 2019 13:39:37 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Fri, 8 Mar 2019 13:39:36 +0100 Message-Id: <20190308123937.2346-5-kraxel@redhat.com> In-Reply-To: <20190308123937.2346-1-kraxel@redhat.com> References: <20190308123937.2346-1-kraxel@redhat.com> MIME-Version: 1.0 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.41]); Fri, 08 Mar 2019 12:39:42 +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] [PULL 4/5] 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: "Michael S. Tsirkin" , Aleksandar Rikalo , Gerd Hoffmann , Aleksandar Markovic , Paolo Bonzini , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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=1597621 Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Michael S. Tsirkin Message-id: 20190307080244.9011-3-kraxel@redhat.com --- 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) typedef struct VirtIOVGA { VirtIOPCIProxy parent_obj; @@ -20,6 +24,11 @@ typedef struct VirtIOVGA { MemoryRegion vga_mrs[3]; } VirtIOVGA; +typedef struct VirtIOVGAClass { + VirtioPCIClass parent_class; + DeviceReset parent_reset; +} VirtIOVGAClass; + static void virtio_vga_invalidate_display(void *opaque) { VirtIOVGA *vvga = opaque; @@ -168,10 +177,11 @@ static void virtio_vga_realize(VirtIOPCIProxy *vpci_dev, Error **errp) static void virtio_vga_reset(DeviceState *dev) { + VirtIOVGAClass *klass = VIRTIO_VGA_GET_CLASS(dev); VirtIOVGA *vvga = VIRTIO_VGA(dev); /* reset virtio-gpu */ - virtio_gpu_reset(VIRTIO_DEVICE(&vvga->vdev)); + klass->parent_reset(dev); /* reset vga */ vga_common_reset(&vvga->vga); @@ -187,13 +197,15 @@ static void virtio_vga_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); VirtioPCIClass *k = VIRTIO_PCI_CLASS(klass); + VirtIOVGAClass *v = VIRTIO_VGA_CLASS(klass); PCIDeviceClass *pcidev_k = PCI_DEVICE_CLASS(klass); set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories); dc->props = virtio_vga_properties; - dc->reset = virtio_vga_reset; dc->vmsd = &vmstate_virtio_vga; dc->hotpluggable = false; + device_class_set_parent_reset(dc, virtio_vga_reset, + &v->parent_reset); k->realize = virtio_vga_realize; pcidev_k->romfile = "vgabios-virtio.bin"; @@ -212,6 +224,7 @@ static VirtioPCIDeviceTypeInfo virtio_vga_info = { .generic_name = TYPE_VIRTIO_VGA, .instance_size = sizeof(struct VirtIOVGA), .instance_init = virtio_vga_inst_initfn, + .class_size = sizeof(struct VirtIOVGAClass), .class_init = virtio_vga_class_init, };