qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: John Levon <john.levon@nutanix.com>
To: qemu-devel@nongnu.org
Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com>,
	"Cédric Le Goater" <clg@redhat.com>,
	"Daniel P. Berrangé" <berrange@redhat.com>,
	"John Levon" <john.levon@nutanix.com>,
	"Thanos Makatos" <thanos.makatos@nutanix.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Alex Williamson" <alex.williamson@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"John Johnson" <john.g.johnson@oracle.com>,
	"Elena Ufimtseva" <elena.ufimtseva@oracle.com>,
	"Jagannathan Raman" <jag.raman@oracle.com>
Subject: [PATCH v5 12/19] vfio-user: implement VFIO_USER_DEVICE_RESET
Date: Wed, 25 Jun 2025 20:30:04 +0100	[thread overview]
Message-ID: <20250625193012.2316242-13-john.levon@nutanix.com> (raw)
In-Reply-To: <20250625193012.2316242-1-john.levon@nutanix.com>

Hook this call up to the legacy reset handler for vfio-user-pci.

Originally-by: John Johnson <john.g.johnson@oracle.com>
Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
Signed-off-by: John Levon <john.levon@nutanix.com>
---
 hw/vfio-user/device.h |  2 ++
 hw/vfio-user/device.c | 18 ++++++++++++++++++
 hw/vfio-user/pci.c    | 15 +++++++++++++++
 3 files changed, 35 insertions(+)

diff --git a/hw/vfio-user/device.h b/hw/vfio-user/device.h
index 619c0f3140..d183a3950e 100644
--- a/hw/vfio-user/device.h
+++ b/hw/vfio-user/device.h
@@ -17,6 +17,8 @@
 bool vfio_user_get_device_info(VFIOUserProxy *proxy,
                                struct vfio_device_info *info, Error **errp);
 
+void vfio_user_device_reset(VFIOUserProxy *proxy);
+
 extern VFIODeviceIOOps vfio_user_device_io_ops_sock;
 
 #endif /* VFIO_USER_DEVICE_H */
diff --git a/hw/vfio-user/device.c b/hw/vfio-user/device.c
index f01b3925c5..3a118e7361 100644
--- a/hw/vfio-user/device.c
+++ b/hw/vfio-user/device.c
@@ -54,6 +54,24 @@ bool vfio_user_get_device_info(VFIOUserProxy *proxy,
     return true;
 }
 
+void vfio_user_device_reset(VFIOUserProxy *proxy)
+{
+    Error *local_err = NULL;
+    VFIOUserHdr hdr;
+
+    vfio_user_request_msg(&hdr, VFIO_USER_DEVICE_RESET, sizeof(hdr), 0);
+
+    if (!vfio_user_send_wait(proxy, &hdr, NULL, 0, &local_err)) {
+        error_prepend(&local_err, "%s: ", __func__);
+        error_report_err(local_err);
+        return;
+    }
+
+    if (hdr.flags & VFIO_USER_ERROR) {
+        error_printf("reset reply error %d\n", hdr.error_reply);
+    }
+}
+
 static int vfio_user_get_region_info(VFIOUserProxy *proxy,
                                      struct vfio_region_info *info,
                                      VFIOUserFDs *fds)
diff --git a/hw/vfio-user/pci.c b/hw/vfio-user/pci.c
index c0f00f15b1..49d12763ab 100644
--- a/hw/vfio-user/pci.c
+++ b/hw/vfio-user/pci.c
@@ -263,6 +263,20 @@ static void vfio_user_instance_finalize(Object *obj)
     }
 }
 
+static void vfio_user_pci_reset(DeviceState *dev)
+{
+    VFIOPCIDevice *vdev = VFIO_PCI_BASE(dev);
+    VFIODevice *vbasedev = &vdev->vbasedev;
+
+    vfio_pci_pre_reset(vdev);
+
+    if (vbasedev->reset_works) {
+        vfio_user_device_reset(vbasedev->proxy);
+    }
+
+    vfio_pci_post_reset(vdev);
+}
+
 static const Property vfio_user_pci_dev_properties[] = {
     DEFINE_PROP_UINT32("x-pci-vendor-id", VFIOPCIDevice,
                        vendor_id, PCI_ANY_ID),
@@ -310,6 +324,7 @@ static void vfio_user_pci_dev_class_init(ObjectClass *klass, const void *data)
     DeviceClass *dc = DEVICE_CLASS(klass);
     PCIDeviceClass *pdc = PCI_DEVICE_CLASS(klass);
 
+    device_class_set_legacy_reset(dc, vfio_user_pci_reset);
     device_class_set_props(dc, vfio_user_pci_dev_properties);
 
     object_class_property_add(klass, "socket", "SocketAddress", NULL,
-- 
2.43.0



  parent reply	other threads:[~2025-06-25 19:34 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-06-25 19:29 [PATCH v5 00/19] vfio-user client John Levon
2025-06-25 19:29 ` [PATCH v5 01/19] vfio-user: add vfio-user class and container John Levon
2025-06-26  6:32   ` Cédric Le Goater
2025-07-02  9:40   ` Cédric Le Goater
2025-06-25 19:29 ` [PATCH v5 02/19] vfio-user: connect vfio proxy to remote server John Levon
2025-06-26  6:32   ` Cédric Le Goater
2025-06-25 19:29 ` [PATCH v5 03/19] vfio-user: implement message receive infrastructure John Levon
2025-06-26  6:34   ` Cédric Le Goater
2025-06-25 19:29 ` [PATCH v5 04/19] vfio-user: implement message send infrastructure John Levon
2025-06-26  6:35   ` Cédric Le Goater
2025-06-25 19:29 ` [PATCH v5 05/19] vfio-user: implement VFIO_USER_DEVICE_GET_INFO John Levon
2025-06-26  6:35   ` Cédric Le Goater
2025-06-25 19:29 ` [PATCH v5 06/19] vfio-user: implement VFIO_USER_DEVICE_GET_REGION_INFO John Levon
2025-06-26  6:35   ` Cédric Le Goater
2025-06-25 19:29 ` [PATCH v5 07/19] vfio-user: implement VFIO_USER_REGION_READ/WRITE John Levon
2025-06-26  6:37   ` Cédric Le Goater
2025-06-25 19:30 ` [PATCH v5 08/19] vfio-user: set up PCI in vfio_user_pci_realize() John Levon
2025-06-26  6:37   ` Cédric Le Goater
2025-06-25 19:30 ` [PATCH v5 09/19] vfio-user: implement VFIO_USER_DEVICE_GET/SET_IRQ* John Levon
2025-06-26  6:38   ` Cédric Le Goater
2025-06-25 19:30 ` [PATCH v5 10/19] vfio-user: forward MSI-X PBA BAR accesses to server John Levon
2025-06-26  6:40   ` Cédric Le Goater
2025-06-25 19:30 ` [PATCH v5 11/19] vfio-user: set up container access to the proxy John Levon
2025-06-26  6:40   ` Cédric Le Goater
2025-06-25 19:30 ` John Levon [this message]
2025-06-26  6:41   ` [PATCH v5 12/19] vfio-user: implement VFIO_USER_DEVICE_RESET Cédric Le Goater
2025-06-25 19:30 ` [PATCH v5 13/19] vfio-user: implement VFIO_USER_DMA_MAP/UNMAP John Levon
2025-06-26  6:41   ` Cédric Le Goater
2025-06-25 19:30 ` [PATCH v5 14/19] vfio-user: implement VFIO_USER_DMA_READ/WRITE John Levon
2025-06-26  6:41   ` Cédric Le Goater
2025-06-25 19:30 ` [PATCH v5 15/19] vfio-user: add 'x-msg-timeout' option John Levon
2025-06-26  6:41   ` Cédric Le Goater
2025-06-25 19:30 ` [PATCH v5 16/19] vfio-user: support posted writes John Levon
2025-06-26  6:41   ` Cédric Le Goater
2025-06-25 19:30 ` [PATCH v5 17/19] vfio-user: add coalesced " John Levon
2025-06-26  6:41   ` Cédric Le Goater
2025-06-25 19:30 ` [PATCH v5 18/19] docs: add vfio-user documentation John Levon
2025-06-26  6:42   ` Cédric Le Goater
2025-06-25 19:30 ` [PATCH v5 19/19] vfio-user: introduce vfio-user protocol specification John Levon
2025-06-26  6:42   ` Cédric Le Goater
2025-06-26  7:12 ` [PATCH v5 00/19] vfio-user client Cédric Le Goater

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250625193012.2316242-13-john.levon@nutanix.com \
    --to=john.levon@nutanix.com \
    --cc=alex.williamson@redhat.com \
    --cc=berrange@redhat.com \
    --cc=clg@redhat.com \
    --cc=elena.ufimtseva@oracle.com \
    --cc=jag.raman@oracle.com \
    --cc=john.g.johnson@oracle.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=thanos.makatos@nutanix.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).