From nobody Tue Feb 10 17:08:25 2026 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.zoho.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; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494579029046560.0286505884129; Fri, 12 May 2017 01:50:29 -0700 (PDT) Received: from localhost ([::1]:52108 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d96HL-0004ud-Hb for importer@patchew.org; Fri, 12 May 2017 04:50:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45021) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d9691-0005sF-Dp for qemu-devel@nongnu.org; Fri, 12 May 2017 04:41:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d9690-00025D-Ha for qemu-devel@nongnu.org; Fri, 12 May 2017 04:41:51 -0400 Received: from mga11.intel.com ([192.55.52.93]:62480) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d9690-0001je-8t for qemu-devel@nongnu.org; Fri, 12 May 2017 04:41:50 -0400 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 May 2017 01:41:49 -0700 Received: from devel-ww.sh.intel.com ([10.239.48.105]) by orsmga003.jf.intel.com with ESMTP; 12 May 2017 01:41:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.38,328,1491289200"; d="scan'208";a="967616313" From: Wei Wang To: stefanha@gmail.com, marcandre.lureau@gmail.com, mst@redhat.com, jasowang@redhat.com, pbonzini@redhat.com, virtio-dev@lists.oasis-open.org, qemu-devel@nongnu.org Date: Fri, 12 May 2017 16:35:46 +0800 Message-Id: <1494578148-102868-15-git-send-email-wei.w.wang@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494578148-102868-1-git-send-email-wei.w.wang@intel.com> References: <1494578148-102868-1-git-send-email-wei.w.wang@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.93 Subject: [Qemu-devel] [PATCH v2 14/16] vhost-pci-slave: add support to delete a vhost-pci device 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: Wei Wang 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" Signed-off-by: Wei Wang --- hw/virtio/vhost-pci-slave.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/hw/virtio/vhost-pci-slave.c b/hw/virtio/vhost-pci-slave.c index a7d3c8d..cde122c 100644 --- a/hw/virtio/vhost-pci-slave.c +++ b/hw/virtio/vhost-pci-slave.c @@ -139,6 +139,42 @@ static int vp_slave_send_u64(int request, uint64_t u64) return 0; } =20 +static DeviceState *virtio_to_pci_dev(VirtIODevice *vdev, uint16_t virtio_= id) +{ + DeviceState *qdev =3D NULL; + VhostPCINet *vpnet; + VhostPCINetPCI *netpci; + + if (!vdev) { + return NULL; + } + + switch (virtio_id) { + case VIRTIO_ID_NET: + vpnet =3D VHOST_PCI_NET(vdev); + netpci =3D container_of(vpnet, VhostPCINetPCI, vdev); + qdev =3D &netpci->parent_obj.pci_dev.qdev; + break; + default: + error_report("virtio_to_pci_dev: device type %d not supported", + virtio_id); + } + + return qdev; +} + +static void vp_slave_device_del(VirtIODevice *vdev) +{ + Error *errp =3D NULL; + VhostPCIDev *vp_dev =3D vp_slave->vp_dev; + DeviceState *qdev =3D virtio_to_pci_dev(vdev, vp_dev->dev_type); + + if (qdev !=3D NULL) { + qdev_unplug(qdev, &errp); + vp_dev_cleanup(); + } +} + int vp_slave_send_feature_bits(uint64_t features) { return vp_slave_send_u64(VHOST_USER_SET_FEATURES, features); @@ -146,10 +182,13 @@ int vp_slave_send_feature_bits(uint64_t features) =20 static void vp_slave_event(void *opaque, int event) { + VhostPCIDev *vp_dev =3D vp_slave->vp_dev; + switch (event) { case CHR_EVENT_OPENED: break; case CHR_EVENT_CLOSED: + vp_slave_device_del(vp_dev->vdev); break; } } @@ -416,6 +455,8 @@ static int vp_slave_set_vhost_pci(VhostUserMsg *msg) } break; case VHOST_USER_SET_VHOST_PCI_STOP: + vp_slave_device_del(vp_dev->vdev); + ret =3D 0; break; default: error_report("%s: cmd %d not supported", __func__, cmd); --=20 2.7.4