6:54 a.m.
libxlNodeDeviceGetPCIInfo() and qemuNodeDeviceGetPCIInfo() are equal.
Let's move the logic to a new virDomainDriverNodeDeviceGetPCIInfo()
info to be used by libxl_driver.c and qemu_driver.c.
Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com>
---
src/hypervisor/domain_driver.c | 33 +++++++++++++++++++++++++++++
src/hypervisor/domain_driver.h | 7 +++++++
src/libvirt_private.syms | 1 +
src/libxl/libxl_driver.c | 38 ++++------------------------------
src/qemu/qemu_driver.c | 37 +++------------------------------
5 files changed, 48 insertions(+), 68 deletions(-)
diff --git a/src/hypervisor/domain_driver.c b/src/hypervisor/domain_driver.c
index 8dc5870a61..68dbf10ac6 100644
--- a/src/hypervisor/domain_driver.c
+++ b/src/hypervisor/domain_driver.c
@@ -21,6 +21,7 @@
#include <config.h>
#include "domain_driver.h"
+#include "node_device_conf.h"
#include "viralloc.h"
#include "virstring.h"
#include "vircrypto.h"
@@ -336,3 +337,35 @@ virDomainDriverSetupPersistentDefBlkioParams(virDomainDefPtr
persistentDef,
return ret;
}
+
+
+int
+virDomainDriverNodeDeviceGetPCIInfo(virNodeDeviceDefPtr def,
+ unsigned *domain,
+ unsigned *bus,
+ unsigned *slot,
+ unsigned *function)
+{
+ virNodeDevCapsDefPtr cap;
+
+ cap = def->caps;
+ while (cap) {
+ if (cap->data.type == VIR_NODE_DEV_CAP_PCI_DEV) {
+ *domain = cap->data.pci_dev.domain;
+ *bus = cap->data.pci_dev.bus;
+ *slot = cap->data.pci_dev.slot;
+ *function = cap->data.pci_dev.function;
+ break;
+ }
+
+ cap = cap->next;
+ }
+
+ if (!cap) {
+ virReportError(VIR_ERR_INVALID_ARG,
+ _("device %s is not a PCI device"), def->name);
+ return -1;
+ }
+
+ return 0;
+}
diff --git a/src/hypervisor/domain_driver.h b/src/hypervisor/domain_driver.h
index b66ae2d421..2bb053d559 100644
--- a/src/hypervisor/domain_driver.h
+++ b/src/hypervisor/domain_driver.h
@@ -21,6 +21,7 @@
#pragma once
#include "domain_conf.h"
+#include "node_device_conf.h"
char *
virDomainDriverGenerateRootHash(const char *drivername,
@@ -45,3 +46,9 @@ int virDomainDriverParseBlkioDeviceStr(char *blkioDeviceStr, const char
*type,
int virDomainDriverSetupPersistentDefBlkioParams(virDomainDefPtr persistentDef,
virTypedParameterPtr params,
int nparams);
+
+int virDomainDriverNodeDeviceGetPCIInfo(virNodeDeviceDefPtr def,
+ unsigned *domain,
+ unsigned *bus,
+ unsigned *slot,
+ unsigned *function);
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 583fc5800e..fe4ee25f3a 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1445,6 +1445,7 @@ virDomainCgroupSetupMemtune;
virDomainDriverGenerateMachineName;
virDomainDriverGenerateRootHash;
virDomainDriverMergeBlkioDevice;
+virDomainDriverNodeDeviceGetPCIInfo;
virDomainDriverParseBlkioDeviceStr;
virDomainDriverSetupPersistentDefBlkioParams;
diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index d58af1a869..ac2564a563 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -56,6 +56,7 @@
#include "cpu/cpu.h"
#include "virutil.h"
#include "domain_validate.h"
+#include "domain_driver.h"
#define VIR_FROM_THIS VIR_FROM_LIBXL
@@ -5779,37 +5780,6 @@ libxlConnectSupportsFeature(virConnectPtr conn, int feature)
}
}
-static int
-libxlNodeDeviceGetPCIInfo(virNodeDeviceDefPtr def,
- unsigned *domain,
- unsigned *bus,
- unsigned *slot,
- unsigned *function)
-{
- virNodeDevCapsDefPtr cap;
-
- cap = def->caps;
- while (cap) {
- if (cap->data.type == VIR_NODE_DEV_CAP_PCI_DEV) {
- *domain = cap->data.pci_dev.domain;
- *bus = cap->data.pci_dev.bus;
- *slot = cap->data.pci_dev.slot;
- *function = cap->data.pci_dev.function;
- break;
- }
-
- cap = cap->next;
- }
-
- if (!cap) {
- virReportError(VIR_ERR_INVALID_ARG,
- _("device %s is not a PCI device"), def->name);
- return -1;
- }
-
- return 0;
-}
-
static int
libxlNodeDeviceDetachFlags(virNodeDevicePtr dev,
const char *driverName,
@@ -5851,7 +5821,7 @@ libxlNodeDeviceDetachFlags(virNodeDevicePtr dev,
if (virNodeDeviceDetachFlagsEnsureACL(dev->conn, def) < 0)
goto cleanup;
- if (libxlNodeDeviceGetPCIInfo(def, &domain, &bus, &slot, &function)
< 0)
+ if (virDomainDriverNodeDeviceGetPCIInfo(def, &domain, &bus, &slot,
&function) < 0)
goto cleanup;
pci = virPCIDeviceNew(domain, bus, slot, function);
@@ -5922,7 +5892,7 @@ libxlNodeDeviceReAttach(virNodeDevicePtr dev)
if (virNodeDeviceReAttachEnsureACL(dev->conn, def) < 0)
goto cleanup;
- if (libxlNodeDeviceGetPCIInfo(def, &domain, &bus, &slot, &function)
< 0)
+ if (virDomainDriverNodeDeviceGetPCIInfo(def, &domain, &bus, &slot,
&function) < 0)
goto cleanup;
pci = virPCIDeviceNew(domain, bus, slot, function);
@@ -5980,7 +5950,7 @@ libxlNodeDeviceReset(virNodeDevicePtr dev)
if (virNodeDeviceResetEnsureACL(dev->conn, def) < 0)
goto cleanup;
- if (libxlNodeDeviceGetPCIInfo(def, &domain, &bus, &slot, &function)
< 0)
+ if (virDomainDriverNodeDeviceGetPCIInfo(def, &domain, &bus, &slot,
&function) < 0)
goto cleanup;
pci = virPCIDeviceNew(domain, bus, slot, function);
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 62b0852c33..6c09d95164 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -11951,37 +11951,6 @@ qemuDomainMigrateConfirm3Params(virDomainPtr domain,
}
-static int
-qemuNodeDeviceGetPCIInfo(virNodeDeviceDefPtr def,
- unsigned *domain,
- unsigned *bus,
- unsigned *slot,
- unsigned *function)
-{
- virNodeDevCapsDefPtr cap;
-
- cap = def->caps;
- while (cap) {
- if (cap->data.type == VIR_NODE_DEV_CAP_PCI_DEV) {
- *domain = cap->data.pci_dev.domain;
- *bus = cap->data.pci_dev.bus;
- *slot = cap->data.pci_dev.slot;
- *function = cap->data.pci_dev.function;
- break;
- }
-
- cap = cap->next;
- }
-
- if (!cap) {
- virReportError(VIR_ERR_INVALID_ARG,
- _("device %s is not a PCI device"), def->name);
- return -1;
- }
-
- return 0;
-}
-
static int
qemuNodeDeviceDetachFlags(virNodeDevicePtr dev,
const char *driverName,
@@ -12024,7 +11993,7 @@ qemuNodeDeviceDetachFlags(virNodeDevicePtr dev,
if (virNodeDeviceDetachFlagsEnsureACL(dev->conn, def) < 0)
goto cleanup;
- if (qemuNodeDeviceGetPCIInfo(def, &domain, &bus, &slot, &function)
< 0)
+ if (virDomainDriverNodeDeviceGetPCIInfo(def, &domain, &bus, &slot,
&function) < 0)
goto cleanup;
pci = virPCIDeviceNew(domain, bus, slot, function);
@@ -12105,7 +12074,7 @@ qemuNodeDeviceReAttach(virNodeDevicePtr dev)
if (virNodeDeviceReAttachEnsureACL(dev->conn, def) < 0)
goto cleanup;
- if (qemuNodeDeviceGetPCIInfo(def, &domain, &bus, &slot, &function)
< 0)
+ if (virDomainDriverNodeDeviceGetPCIInfo(def, &domain, &bus, &slot,
&function) < 0)
goto cleanup;
pci = virPCIDeviceNew(domain, bus, slot, function);
@@ -12159,7 +12128,7 @@ qemuNodeDeviceReset(virNodeDevicePtr dev)
if (virNodeDeviceResetEnsureACL(dev->conn, def) < 0)
goto cleanup;
- if (qemuNodeDeviceGetPCIInfo(def, &domain, &bus, &slot, &function)
< 0)
+ if (virDomainDriverNodeDeviceGetPCIInfo(def, &domain, &bus, &slot,
&function) < 0)
goto cleanup;
pci = virPCIDeviceNew(domain, bus, slot, function);
--
2.26.2