[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/12] vfio: refine function vfio_pci_host_match
From: |
Zhou Jie |
Subject: |
[Qemu-devel] [PATCH 05/12] vfio: refine function vfio_pci_host_match |
Date: |
Wed, 18 May 2016 11:31:03 +0800 |
From: Chen Fan <address@hidden>
Signed-off-by: Chen Fan <address@hidden>
---
hw/vfio/pci.c | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 0516d94..5b23a86 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -2060,14 +2060,27 @@ static void vfio_pci_post_reset(VFIOPCIDevice *vdev)
vfio_intx_enable(vdev);
}
+static int vfio_pci_name_to_addr(const char *name, PCIHostDeviceAddress *addr)
+{
+ if (strlen(name) != 12 ||
+ sscanf(name, "%04x:%02x:%02x.%1x", &addr->domain,
+ &addr->bus, &addr->slot, &addr->function) != 4) {
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
static bool vfio_pci_host_match(PCIHostDeviceAddress *addr, const char *name)
{
- char tmp[13];
+ PCIHostDeviceAddress tmp;
- sprintf(tmp, "%04x:%02x:%02x.%1x", addr->domain,
- addr->bus, addr->slot, addr->function);
+ if (vfio_pci_name_to_addr(name, &tmp)) {
+ return false;
+ }
- return (strcmp(tmp, name) == 0);
+ return (tmp.domain == addr->domain && tmp.bus == addr->bus &&
+ tmp.slot == addr->slot && tmp.function == addr->function);
}
static int vfio_pci_hot_reset(VFIOPCIDevice *vdev, bool single)
--
1.8.3.1
- [Qemu-devel] [PATCH v7 00/12] vfio-pci: pass the aer error to guest, Zhou Jie, 2016/05/17
- [Qemu-devel] [PATCH 05/12] vfio: refine function vfio_pci_host_match,
Zhou Jie <=
- [Qemu-devel] [PATCH 02/12] vfio: squeeze out vfio_pci_do_hot_reset for support bus reset, Zhou Jie, 2016/05/17
- [Qemu-devel] [PATCH 07/12] pci: add a pci_function_is_valid callback to check function if valid, Zhou Jie, 2016/05/17
- [Qemu-devel] [PATCH 01/12] vfio: extract vfio_get_hot_reset_info as a single function, Zhou Jie, 2016/05/17
- [Qemu-devel] [PATCH 03/12] vfio: add pcie extended capability support, Zhou Jie, 2016/05/17
- [Qemu-devel] [PATCH 08/12] vfio: add check aer functionality for hotplug device, Zhou Jie, 2016/05/17
- [Qemu-devel] [PATCH 04/12] vfio: add aer support for vfio device, Zhou Jie, 2016/05/17
- [Qemu-devel] [PATCH 09/12] vfio: vote the function 0 to do host bus reset when aer occurred, Zhou Jie, 2016/05/17
- [Qemu-devel] [PATCH 11/12] vfio: register aer resume notification handler for aer resume, Zhou Jie, 2016/05/17