From patchwork Fri Nov 25 22:05:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 9448159 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 90A2A60235 for ; Fri, 25 Nov 2016 22:16:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7F7ED204C0 for ; Fri, 25 Nov 2016 22:16:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 733202808F; Fri, 25 Nov 2016 22:16:20 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D94FC204C0 for ; Fri, 25 Nov 2016 22:16:19 +0000 (UTC) Received: from localhost ([::1]:48136 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cAOn4-0005jM-VO for patchwork-qemu-devel@patchwork.kernel.org; Fri, 25 Nov 2016 17:16:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50585) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cAOdW-0006TK-Ik for qemu-devel@nongnu.org; Fri, 25 Nov 2016 17:06:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cAOdV-0008Te-Ed for qemu-devel@nongnu.org; Fri, 25 Nov 2016 17:06:26 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36006) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cAOdV-0008Rh-6Z for qemu-devel@nongnu.org; Fri, 25 Nov 2016 17:06:25 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6C2EA1555C; Fri, 25 Nov 2016 22:06:24 +0000 (UTC) Received: from localhost (ovpn-116-207.phx2.redhat.com [10.3.116.207]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uAPM6N48009207; Fri, 25 Nov 2016 17:06:23 -0500 From: Eduardo Habkost To: qemu-devel@nongnu.org, Markus Armbruster , Marcel Apfelbaum , "Michael S. Tsirkin" Date: Fri, 25 Nov 2016 20:05:44 -0200 Message-Id: <1480111556-32586-9-git-send-email-ehabkost@redhat.com> In-Reply-To: <1480111556-32586-1-git-send-email-ehabkost@redhat.com> References: <1480111556-32586-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 25 Nov 2016 22:06:24 +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] [RFC v2 08/20] virtio-pci: Set PCIDeviceClass::is_express=1 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: Shmulik Ladkani Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP virtio-pci has a custom DeviceClass::realize method to ensure QEMU_PCI_CAP_EXPRESS is set before pci_qdev_realize() is called. This is done because setting the QEMU_PCI_CAP_EXPRESS flag too late can crash QEMU due to the PCI config space allocation logic. Clearing QEMU_PCI_CAP_EXPRESS later, on the other hand, is already safe, because the existing virtio-pci and vfio-pci code already do that inside their PCIDeviceClass::realize methods. But they are inconsistent: virtio-pci has is_express=0, and vfio-pci has is_express=1. To make all devices consistent, we can just set PCIDeviceClass::is_express=1, and clear QEMU_PCI_CAP_EXPRESS on virtio_pci_realize() if necessary. This makes the device code simpler, and make the PCIDeviceClass::is_express field reflect the fact that virtio-pci can be a PCIe device. Cc: Shmulik Ladkani Cc: Michael S. Tsirkin Cc: Marcel Apfelbaum Signed-off-by: Eduardo Habkost --- Changes series v1 -> v2: * (new patch added to series) --- hw/virtio/virtio-pci.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 521ba0b..df2b26a 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -1723,6 +1723,11 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp) bool pcie_port = pci_bus_is_express(pci_dev->bus) && !pci_bus_is_root(pci_dev->bus); + if ((proxy->flags & VIRTIO_PCI_FLAG_DISABLE_PCIE) || + !virtio_pci_modern(proxy)) { + pci_dev->cap_present &= ~QEMU_PCI_CAP_EXPRESS; + } + if (!kvm_has_many_ioeventfds()) { proxy->flags &= ~VIRTIO_PCI_FLAG_USE_IOEVENTFD; } @@ -1855,25 +1860,10 @@ static Property virtio_pci_properties[] = { DEFINE_PROP_END_OF_LIST(), }; -static void virtio_pci_dc_realize(DeviceState *qdev, Error **errp) -{ - VirtioPCIClass *vpciklass = VIRTIO_PCI_GET_CLASS(qdev); - VirtIOPCIProxy *proxy = VIRTIO_PCI(qdev); - PCIDevice *pci_dev = &proxy->pci_dev; - - if (!(proxy->flags & VIRTIO_PCI_FLAG_DISABLE_PCIE) && - virtio_pci_modern(proxy)) { - pci_dev->cap_present |= QEMU_PCI_CAP_EXPRESS; - } - - vpciklass->parent_dc_realize(qdev, errp); -} - static void virtio_pci_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); - VirtioPCIClass *vpciklass = VIRTIO_PCI_CLASS(klass); dc->props = virtio_pci_properties; k->realize = virtio_pci_realize; @@ -1881,8 +1871,7 @@ static void virtio_pci_class_init(ObjectClass *klass, void *data) k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET; k->revision = VIRTIO_PCI_ABI_VERSION; k->class_id = PCI_CLASS_OTHERS; - vpciklass->parent_dc_realize = dc->realize; - dc->realize = virtio_pci_dc_realize; + k->is_express = 1; dc->reset = virtio_pci_reset; }