conf: move/rename hostdev PCI driver type enum to device_conf.h

Currently this enum is defined in domain_conf.h and named
virDomainHostdevSubsysPCIDriverType. I want to use it in parts of the
network and networkport config, so am moving its definition to
device_conf.h which is / can be included by all interested parties,
and renaming it to match the name of the corresponding XML attribute
("driver name"). The name change (which includes enum values) does cause a
lot of churn, but it's all mechanical.

Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c
index f3d977f2b7d8eecd642a2a05b24db9e1aaabcdd3..a80b90121474309081da572f8dce0cc1d41007ff 100644 (file)
--- a/src/conf/device_conf.c
+++ b/src/conf/device_conf.c
@@ -29,6 +29,15 @@
 
 #define VIR_FROM_THIS VIR_FROM_DEVICE
 
+VIR_ENUM_IMPL(virDeviceHostdevPCIDriverName,
+              VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_LAST,
+              "default",
+              "kvm",
+              "vfio",
+              "xen",
+);
+
+
 VIR_ENUM_IMPL(virDomainDeviceAddress,
               VIR_DOMAIN_DEVICE_ADDRESS_TYPE_LAST,
               "none",

diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h
index a83377417a1d87c8dc1e74c4335cc6e0a0b177fd..18aa4125fa8af045dd6cbf768ed3fe92988e9f5c 100644 (file)
--- a/src/conf/device_conf.h
+++ b/src/conf/device_conf.h
@@ -31,6 +31,18 @@
 #include "virnetdev.h"
 #include "virenum.h"
 
+/* the backend driver used for PCI hostdev devices */
+typedef enum {
+    VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_DEFAULT = 0, /* detect automatically, prefer VFIO */
+    VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_KVM,    /* force legacy kvm style */
+    VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO,   /* force vfio */
+    VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_XEN,    /* force legacy xen style, use pciback */
+
+    VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_LAST
+} virDeviceHostdevPCIDriverName;
+
+VIR_ENUM_DECL(virDeviceHostdevPCIDriverName);
+
 typedef enum {
     VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE = 0,
     VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI,

diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c
index f6e09dc5848fd339af8644f9db2915e4dcb8b3a6..68eb3c97974daa2fdabfe801871cf2864b3692b8 100644 (file)
--- a/src/conf/domain_capabilities.c
+++ b/src/conf/domain_capabilities.c
@@ -524,7 +524,7 @@ virDomainCapsDeviceHostdevFormat(virBuffer *buf,
     ENUM_PROCESS(hostdev, startupPolicy, virDomainStartupPolicyTypeToString);
     ENUM_PROCESS(hostdev, subsysType, virDomainHostdevSubsysTypeToString);
     ENUM_PROCESS(hostdev, capsType, virDomainHostdevCapsTypeToString);
-    ENUM_PROCESS(hostdev, pciBackend, virDomainHostdevSubsysPCIBackendTypeToString);
+    ENUM_PROCESS(hostdev, pciBackend, virDeviceHostdevPCIDriverNameTypeToString);
 
     FORMAT_EPILOGUE(hostdev);
 }

diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h
index 01bcfa2e395d470b15ab39c9023f099458219a96..fadc30cdd747c9dcf3a9567094d5a17991907d4b 100644 (file)
--- a/src/conf/domain_capabilities.h
+++ b/src/conf/domain_capabilities.h
@@ -99,7 +99,7 @@ STATIC_ASSERT_ENUM(VIR_DOMAIN_HOSTDEV_MODE_LAST);
 STATIC_ASSERT_ENUM(VIR_DOMAIN_STARTUP_POLICY_LAST);
 STATIC_ASSERT_ENUM(VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST);
 STATIC_ASSERT_ENUM(VIR_DOMAIN_HOSTDEV_CAPS_TYPE_LAST);
-STATIC_ASSERT_ENUM(VIR_DOMAIN_HOSTDEV_PCI_BACKEND_TYPE_LAST);
+STATIC_ASSERT_ENUM(VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_LAST);
 typedef struct _virDomainCapsDeviceHostdev virDomainCapsDeviceHostdev;
 struct _virDomainCapsDeviceHostdev {
     virTristateBool supported;

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 39e9879a8ada55f604091a8a766805266ed43070..f0e131797a72bbc18b7519cbea5ae992c99ffac3 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -1054,13 +1054,6 @@ VIR_ENUM_IMPL(virDomainHostdevSubsys,
               "mdev",
 );
 
-VIR_ENUM_IMPL(virDomainHostdevSubsysPCIBackend,
-              VIR_DOMAIN_HOSTDEV_PCI_BACKEND_TYPE_LAST,
-              "default",
-              "kvm",
-              "vfio",
-              "xen",
-);
 
 VIR_ENUM_IMPL(virDomainHostdevSubsysSCSIProtocol,
               VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_LAST,
@@ -6292,7 +6285,7 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
 
         driver_node = virXPathNode("./driver", ctxt);
         if (virXMLPropEnum(driver_node, "name",
-                           virDomainHostdevSubsysPCIBackendTypeFromString,
+                           virDeviceHostdevPCIDriverNameTypeFromString,
                            VIR_XML_PROP_NONZERO,
                            &pcisrc->backend) < 0)
             return -1;
@@ -23438,8 +23431,8 @@ virDomainHostdevDefFormatSubsysPCI(virBuffer *buf,
             virBufferAsprintf(&sourceAttrBuf, " writeFiltering='%s'",
                               virTristateBoolTypeToString(def->writeFiltering));
 
-    if (pcisrc->backend != VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT) {
-        const char *backend = virDomainHostdevSubsysPCIBackendTypeToString(pcisrc->backend);
+    if (pcisrc->backend != VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_DEFAULT) {
+        const char *backend = virDeviceHostdevPCIDriverNameTypeToString(pcisrc->backend);
 
         if (!backend) {
             virReportError(VIR_ERR_INTERNAL_ERROR,
@@ -29970,18 +29963,15 @@ virDomainNetDefActualFromNetworkPort(virDomainNetDef *iface,
         actual->data.hostdev.def.source.subsys.u.pci.addr = port->plug.hostdevpci.addr;
         switch ((virNetworkForwardDriverNameType)port->plug.hostdevpci.driver) {
         case VIR_NETWORK_FORWARD_DRIVER_NAME_DEFAULT:
-            actual->data.hostdev.def.source.subsys.u.pci.backend =
-                VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT;
+            actual->data.hostdev.def.source.subsys.u.pci.backend = VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_DEFAULT;
             break;
 
         case VIR_NETWORK_FORWARD_DRIVER_NAME_KVM:
-            actual->data.hostdev.def.source.subsys.u.pci.backend =
-                VIR_DOMAIN_HOSTDEV_PCI_BACKEND_KVM;
+            actual->data.hostdev.def.source.subsys.u.pci.backend = VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_KVM;
             break;
 
         case VIR_NETWORK_FORWARD_DRIVER_NAME_VFIO:
-            actual->data.hostdev.def.source.subsys.u.pci.backend =
-                VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO;
+            actual->data.hostdev.def.source.subsys.u.pci.backend = VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO;
             break;
 
         case VIR_NETWORK_FORWARD_DRIVER_NAME_LAST:
@@ -30092,26 +30082,26 @@ virDomainNetDefActualToNetworkPort(virDomainDef *dom,
         port->plug.hostdevpci.managed = virTristateBoolFromBool(actual->data.hostdev.def.managed);
         port->plug.hostdevpci.addr = actual->data.hostdev.def.source.subsys.u.pci.addr;
         switch (actual->data.hostdev.def.source.subsys.u.pci.backend) {
-        case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT:
+        case VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_DEFAULT:
             port->plug.hostdevpci.driver = VIR_NETWORK_FORWARD_DRIVER_NAME_DEFAULT;
             break;
 
-        case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_KVM:
+        case VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_KVM:
             port->plug.hostdevpci.driver = VIR_NETWORK_FORWARD_DRIVER_NAME_KVM;
             break;
 
-        case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO:
+        case VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO:
             port->plug.hostdevpci.driver = VIR_NETWORK_FORWARD_DRIVER_NAME_VFIO;
             break;
 
-        case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_XEN:
+        case VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_XEN:
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                            _("Unexpected PCI backend 'xen'"));
             break;
 
-        case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_TYPE_LAST:
+        case VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_LAST:
         default:
-            virReportEnumRangeError(virDomainHostdevSubsysPCIBackendType,
+            virReportEnumRangeError(virDeviceHostdevPCIDriverName,
                                     actual->data.hostdev.def.source.subsys.u.pci.backend);
             return NULL;
         }
@@ -31056,7 +31046,7 @@ virHostdevIsVFIODevice(const virDomainHostdevDef *hostdev)
 {
     return hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
         hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI &&
-        hostdev->source.subsys.u.pci.backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO;
+        hostdev->source.subsys.u.pci.backend == VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO;
 }
 
 

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 58b2c92f4cd19a8cb201707107a13e7628f490c5..0c6a57c9a2c8de09404480ca55e653bba3e27adf 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -201,18 +201,6 @@ typedef enum {
     VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST
 } virDomainHostdevSubsysType;
 
-/* the backend driver used for PCI hostdev devices */
-typedef enum {
-    VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT = 0, /* detect automatically, prefer VFIO */
-    VIR_DOMAIN_HOSTDEV_PCI_BACKEND_KVM,    /* force legacy kvm style */
-    VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO,   /* force vfio */
-    VIR_DOMAIN_HOSTDEV_PCI_BACKEND_XEN,    /* force legacy xen style, use pciback */
-
-    VIR_DOMAIN_HOSTDEV_PCI_BACKEND_TYPE_LAST
-} virDomainHostdevSubsysPCIBackendType;
-
-VIR_ENUM_DECL(virDomainHostdevSubsysPCIBackend);
-
 typedef enum {
     VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_NONE,
     VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI,
@@ -247,7 +235,7 @@ struct _virDomainHostdevSubsysUSB {
 
 struct _virDomainHostdevSubsysPCI {
     virPCIDeviceAddress addr; /* host address */
-    virDomainHostdevSubsysPCIBackendType backend;
+    virDeviceHostdevPCIDriverName backend;
 
     virBitmap *origstates;
 };

diff --git a/src/hypervisor/virhostdev.c b/src/hypervisor/virhostdev.c
index 4672bd8785357787a8d037ce66ea3212b0bf846a..26c9ac3c28e8d056507160a713845cb7d570980e 100644 (file)
--- a/src/hypervisor/virhostdev.c
+++ b/src/hypervisor/virhostdev.c
@@ -243,14 +243,14 @@ virHostdevGetPCIHostDevice(const virDomainHostdevDef *hostdev,
 
     virPCIDeviceSetManaged(actual, hostdev->managed);
 
-    if (pcisrc->backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) {
+    if (pcisrc->backend == VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO) {
         virPCIDeviceSetStubDriverType(actual, VIR_PCI_STUB_DRIVER_VFIO);
-    } else if (pcisrc->backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_XEN) {
+    } else if (pcisrc->backend == VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_XEN) {
         virPCIDeviceSetStubDriverType(actual, VIR_PCI_STUB_DRIVER_XEN);
     } else {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                       _("pci backend driver '%1$s' is not supported"),
-                       virDomainHostdevSubsysPCIBackendTypeToString(pcisrc->backend));
+                       _("pci backend driver type '%1$s' is not supported"),
+                       virDeviceHostdevPCIDriverNameTypeToString(pcisrc->backend));
         return -1;
     }
 

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 6efaf3114d2595e4362fb9ec67568f6f320fdf75..3e70725e8722c5686139b6794b5d0fd74b5d5ff8 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -126,6 +126,7 @@ virCPUModeTypeToString;
 
 # conf/device_conf.h
 virCCWDeviceAddressParseXML;
+virDeviceHostdevPCIDriverNameTypeToString;
 virDeviceInfoPCIAddressExtensionIsPresent;
 virDeviceInfoPCIAddressExtensionIsWanted;
 virDeviceInfoPCIAddressIsPresent;
@@ -467,7 +468,6 @@ virDomainHostdevInsert;
 virDomainHostdevMatch;
 virDomainHostdevModeTypeToString;
 virDomainHostdevRemove;
-virDomainHostdevSubsysPCIBackendTypeToString;
 virDomainHostdevSubsysSCSIVHostModelTypeFromString;
 virDomainHostdevSubsysSCSIVHostModelTypeToString;
 virDomainHostdevSubsysTypeToString;

diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c
index fc502f8ccff9caf98aecac26e1d3cf67f54ebe93..dfb602ca2fc754359fe28c28a6c06589482b9c25 100644 (file)
--- a/src/libxl/libxl_capabilities.c
+++ b/src/libxl/libxl_capabilities.c
@@ -623,8 +623,7 @@ libxlMakeDomainDeviceHostdevCaps(virDomainCapsDeviceHostdev *dev)
     virDomainCapsEnumClear(&dev->capsType);
 
     virDomainCapsEnumClear(&dev->pciBackend);
-    VIR_DOMAIN_CAPS_ENUM_SET(dev->pciBackend,
-                             VIR_DOMAIN_HOSTDEV_PCI_BACKEND_XEN);
+    VIR_DOMAIN_CAPS_ENUM_SET(dev->pciBackend, VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_XEN);
     return 0;
 }
 

diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
index 0c4beffd6a6944c1a60f23664d5e0d653f6ec7d6..88d977e79b12fd2b14c8e08a916dd38d6e9247fd 100644 (file)
--- a/src/libxl/libxl_domain.c
+++ b/src/libxl/libxl_domain.c
@@ -160,8 +160,8 @@ libxlDomainDeviceDefPostParse(virDomainDeviceDef *dev,
 
         if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
             hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI &&
-            pcisrc->backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT)
-            pcisrc->backend = VIR_DOMAIN_HOSTDEV_PCI_BACKEND_XEN;
+            pcisrc->backend == VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_DEFAULT)
+            pcisrc->backend = VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_XEN;
     }
 
     if (dev->type == VIR_DOMAIN_DEVICE_VIDEO) {
@@ -997,7 +997,7 @@ libxlNetworkPrepareDevices(virDomainDef *def)
 
             if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
                 hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
-                pcisrc->backend = VIR_DOMAIN_HOSTDEV_PCI_BACKEND_XEN;
+                pcisrc->backend = VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_XEN;
 
             if (virDomainHostdevInsert(def, hostdev) < 0)
                 return -1;

diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index c98d2d737affbc3597a4c0caacc26d732e272654..d7f79089c3179473895289723f500dcc41dcab6e 100644 (file)
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -3398,12 +3398,12 @@ libxlDomainAttachNetDevice(libxlDriverPrivate *driver,
         virDomainHostdevSubsysPCI *pcisrc = &hostdev->source.subsys.u.pci;
 
         /* For those just allocated from a network pool whose backend is
-         * still VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT, we need to set
+         * still VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_DEFAULT, we need to set
          * backend correctly.
          */
         if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
             hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
-            pcisrc->backend = VIR_DOMAIN_HOSTDEV_PCI_BACKEND_XEN;
+            pcisrc->backend = VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_XEN;
 
         /* This is really a "smart hostdev", so it should be attached
          * as a hostdev (the hostdev code will reach over into the

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index eb6b345906c55add108bd7b48867b83bdccc1218..515a491a30812348d1b5ff77be44a8675be8ded4 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -6351,8 +6351,8 @@ virQEMUCapsFillDomainDeviceHostdevCaps(virQEMUCaps *qemuCaps,
     if (supportsPassthroughVFIO &&
         virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VFIO_PCI)) {
         VIR_DOMAIN_CAPS_ENUM_SET(hostdev->pciBackend,
-                                 VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT,
-                                 VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO);
+                                 VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_DEFAULT,
+                                 VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO);
     }
 }
 

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index bc285c0b6fdc9a95bbb1ac53e01fc1433dcdc03e..73c80339c04e7dd7941dd8aa5cb661858b0112a7 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -4709,16 +4709,16 @@ qemuBuildPCIHostdevDevProps(const virDomainDef *def,
 
     /* caller has to assign proper passthrough backend type */
     switch (pcisrc->backend) {
-    case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO:
+    case VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO:
         break;
 
-    case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_KVM:
-    case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT:
-    case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_XEN:
-    case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_TYPE_LAST:
+    case VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_KVM:
+    case VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_DEFAULT:
+    case VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_XEN:
+    case VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_LAST:
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("invalid PCI passthrough type '%1$s'"),
-                       virDomainHostdevSubsysPCIBackendTypeToString(pcisrc->backend));
+                       virDeviceHostdevPCIDriverNameTypeToString(pcisrc->backend));
         return NULL;
     }
 

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index a7a813518f7e45c1f469659de48b28d78819ffff..0bda1699d5618e60ca448d3f5a740210f16c9aa6 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -10534,7 +10534,7 @@ qemuDomainGetHostdevPath(virDomainHostdevDef *dev,
     case VIR_DOMAIN_HOSTDEV_MODE_SUBSYS:
         switch (dev->source.subsys.type) {
         case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI:
-            if (pcisrc->backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) {
+            if (pcisrc->backend == VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO) {
                 if (!(tmpPath = virPCIDeviceAddressGetIOMMUGroupDev(&pcisrc->addr)))
                     return -1;
 
@@ -11305,14 +11305,14 @@ qemuDomainPrepareHostdevPCI(virDomainHostdevDef *hostdev,
                             virQEMUCaps *qemuCaps)
 {
     bool supportsPassthroughVFIO = qemuHostdevHostSupportsPassthroughVFIO();
-    virDomainHostdevSubsysPCIBackendType *backend = &hostdev->source.subsys.u.pci.backend;
+    virDeviceHostdevPCIDriverName *driverName = &hostdev->source.subsys.u.pci.backend;
 
     /* assign defaults for hostdev passthrough */
-    switch (*backend) {
-    case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT:
+    switch (*driverName) {
+    case VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_DEFAULT:
         if (supportsPassthroughVFIO) {
             if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VFIO_PCI)) {
-                *backend = VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO;
+                *driverName = VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO;
             } else {
                 virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                                _("VFIO PCI device assignment is not supported by this version of QEMU"));
@@ -11325,7 +11325,7 @@ qemuDomainPrepareHostdevPCI(virDomainHostdevDef *hostdev,
         }
         break;
 
-    case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO:
+    case VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO:
         if (!supportsPassthroughVFIO) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                            _("host doesn't support VFIO PCI passthrough"));
@@ -11333,20 +11333,20 @@ qemuDomainPrepareHostdevPCI(virDomainHostdevDef *hostdev,
         }
         break;
 
-    case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_KVM:
+    case VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_KVM:
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                        _("host doesn't support legacy PCI passthrough"));
         return false;
 
-    case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_XEN:
+    case VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_XEN:
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                        _("QEMU does not support device assignment mode '%1$s'"),
-                       virDomainHostdevSubsysPCIBackendTypeToString(*backend));
+                       virDeviceHostdevPCIDriverNameTypeToString(*driverName));
         return false;
 
     default:
-    case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_TYPE_LAST:
-        virReportEnumRangeError(virDomainHostdevSubsysPCIBackendType, *backend);
+    case VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_LAST:
+        virReportEnumRangeError(virDeviceHostdevPCIDriverName, *driverName);
         break;
     }
 

diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index 9e50c2f45bbc40d3cd7fb39be475c2d5d31ef9fe..a10ab03cb28754d16ef84b21cf7b005dae81f927 100644 (file)
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -2464,7 +2464,7 @@ qemuValidateDomainDeviceDefHostdev(const virDomainHostdevDef *hostdev,
         case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI:
             backend = hostdev->source.subsys.u.pci.backend;
 
-            if (backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) {
+            if (backend == VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO) {
                 if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VFIO_PCI)) {
                     virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                                    _("VFIO PCI device assignment is not supported by this version of qemu"));

diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c
index 6fd0aedacf2b41ef5fd2c74e96965df4d78539af..a1cbbc77e90d829b0100df3d11dc2622d8f54da1 100644 (file)
--- a/src/security/security_apparmor.c
+++ b/src/security/security_apparmor.c
@@ -869,7 +869,7 @@ AppArmorSetSecurityHostdevLabel(virSecurityManager *mgr,
         if (!pci)
             goto done;
 
-        if (pcisrc->backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) {
+        if (pcisrc->backend == VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO) {
             char *vfioGroupDev = virPCIDeviceGetIOMMUGroupDev(pci);
 
             if (!vfioGroupDev) {

diff --git a/src/security/security_dac.c b/src/security/security_dac.c
index c07e488db7fad6e822f610b7c34e6d26d5f59e69..cb8b72b2894733117820e505c7c8c673871eceb5 100644 (file)
--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
@@ -1257,7 +1257,7 @@ virSecurityDACSetHostdevLabel(virSecurityManager *mgr,
         if (!pci)
             return -1;
 
-        if (pcisrc->backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) {
+        if (pcisrc->backend == VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO) {
             g_autofree char *vfioGroupDev = virPCIDeviceGetIOMMUGroupDev(pci);
 
             if (!vfioGroupDev)
@@ -1418,7 +1418,7 @@ virSecurityDACRestoreHostdevLabel(virSecurityManager *mgr,
         if (!pci)
             return -1;
 
-        if (pcisrc->backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) {
+        if (pcisrc->backend == VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO) {
             g_autofree char *vfioGroupDev = virPCIDeviceGetIOMMUGroupDev(pci);
 
             if (!vfioGroupDev)

diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index 84c5ce75ed8ecb40f9b62f8fbea974580411ee0a..2ee542f6a4f0698b34f262989bf365f05caf921d 100644 (file)
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -2201,7 +2201,7 @@ virSecuritySELinuxSetHostdevSubsysLabel(virSecurityManager *mgr,
         if (!pci)
             return -1;
 
-        if (pcisrc->backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) {
+        if (pcisrc->backend == VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO) {
             g_autofree char *vfioGroupDev = virPCIDeviceGetIOMMUGroupDev(pci);
 
             if (!vfioGroupDev)
@@ -2437,7 +2437,7 @@ virSecuritySELinuxRestoreHostdevSubsysLabel(virSecurityManager *mgr,
         if (!pci)
             return -1;
 
-        if (pcisrc->backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) {
+        if (pcisrc->backend == VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO) {
             g_autofree char *vfioGroupDev = virPCIDeviceGetIOMMUGroupDev(pci);
 
             if (!vfioGroupDev)

diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index be13979cefc4f41ed71e999fcccd656920de7661..d01df8710d5e127e9152ffa14f0f848a88719d62 100644 (file)
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -1092,9 +1092,10 @@ get_files(vahControl * ctl)
             case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: {
                 virPCIDevice *pci = virPCIDeviceNew(&dev->source.subsys.u.pci.addr);
 
-                virDomainHostdevSubsysPCIBackendType backend = dev->source.subsys.u.pci.backend;
-                if (backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO ||
-                        backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT) {
+                virDeviceHostdevPCIDriverName driverName = dev->source.subsys.u.pci.backend;
+
+                if (driverName == VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO ||
+                    driverName == VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_DEFAULT) {
                     needsVfio = true;
                 }
 

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 67f8e75296283ea289f512a2934a8f0ddda79cd4..63e1f743c3d331f3fc879a0f00abd93f67a018ae 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -10045,16 +10045,16 @@ testDomainAttachHostPCIDevice(testDriver *driver G_GNUC_UNUSED,
     int backend = hostdev->source.subsys.u.pci.backend;
 
     switch (backend) {
-    case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO:
-    case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT:
-    case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_KVM:
+    case VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO:
+    case VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_DEFAULT:
+    case VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_KVM:
         break;
 
-    case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_XEN:
-    case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_TYPE_LAST:
+    case VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_XEN:
+    case VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_LAST:
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                        _("test hypervisor does not support device assignment mode '%1$s'"),
-                       virDomainHostdevSubsysPCIBackendTypeToString(backend));
+                       virDeviceHostdevPCIDriverNameTypeToString(backend));
         return -1;
     }
 
@@ -10080,7 +10080,7 @@ testDomainAttachHostDevice(testDriver *driver,
     if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                        _("hotplug is not supported for hostdev subsys type '%1$s'"),
-                       virDomainHostdevSubsysTypeToString(hostdev->source.subsys.type));
+                       virDeviceHostdevPCIDriverNameTypeToString(hostdev->source.subsys.type));
         return -1;
     }
 

diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c
index c4a45084301ff8051532cbeac4de748ee1fce596..97b306f6524c2c3b607fb40dc36a54a00796f1cd 100644 (file)
--- a/tests/domaincapstest.c
+++ b/tests/domaincapstest.c
@@ -109,8 +109,8 @@ fillQemuCaps(virDomainCaps *domCaps,
      * successfully mocked as they are not exposed as internal APIs. Therefore,
      * instead of mocking set the expected values here by hand. */
     VIR_DOMAIN_CAPS_ENUM_SET(domCaps->hostdev.pciBackend,
-                             VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT,
-                             VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO);
+                             VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_DEFAULT,
+                             VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO);
 
     /* As of f05b6a918e28 we are expecting to see OVMF_CODE.fd file which
      * may not exists everywhere. */

diff --git a/tests/virhostdevtest.c b/tests/virhostdevtest.c
index 04e6c0090817c38013677b9ed9906f8c0a68af9b..89b4fb5e7c561f098dcf3fd9a655afdc863ef1ec 100644 (file)
--- a/tests/virhostdevtest.c
+++ b/tests/virhostdevtest.c
@@ -134,7 +134,7 @@ myInit(void)
         subsys->u.pci.addr.bus = 0;
         subsys->u.pci.addr.slot = i + 1;
         subsys->u.pci.addr.function = 0;
-        subsys->u.pci.backend = VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO;
+        subsys->u.pci.backend = VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO;
     }
 
     for (i = 0; i < nhostdevs; i++) {

diff --git a/tools/virsh-completer-nodedev.c b/tools/virsh-completer-nodedev.c
index d743df460e6bd4946e194a2cb7b690bf728f02be..72951a54f67eadd11ac161d9e95fe254e30b988f 100644 (file)
--- a/tools/virsh-completer-nodedev.c
+++ b/tools/virsh-completer-nodedev.c
@@ -110,6 +110,6 @@ virshNodeDevicePCIBackendCompleter(vshControl *ctl G_GNUC_UNUSED,
 {
     virCheckFlags(0, NULL);
 
-    return virshEnumComplete(VIR_DOMAIN_HOSTDEV_PCI_BACKEND_TYPE_LAST,
-                             virDomainHostdevSubsysPCIBackendTypeToString);
+    return virshEnumComplete(VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_LAST,
+                             virDeviceHostdevPCIDriverNameTypeToString);
 }