[PATCH 2/4] conf: Rename virDomainDefHasUSB() to virDomainDefHasUSBControllers()

[Andrea Bolognani via Devel]

The new name more accurately describes what the function actually
does.

Signed-off-by: Andrea Bolognani <abolo...@redhat.com>
---
 src/conf/domain_conf.c         | 4 ++--
 src/conf/domain_conf.h         | 2 +-
 src/conf/domain_validate.c     | 2 +-
 src/libvirt_private.syms       | 2 +-
 src/qemu/qemu_domain_address.c | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 9ca5c2450c..e7fa4cd769 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -5413,7 +5413,7 @@ virDomainSCSIDriveAddressIsUsed(const virDomainDef *def,
 
 
 bool
-virDomainDefHasUSB(const virDomainDef *def)
+virDomainDefHasUSBControllers(const virDomainDef *def)
 {
     size_t i;
 
@@ -29921,7 +29921,7 @@ virDomainDefCompatibleDevice(virDomainDef *def,
         }
     }
 
-    if (!virDomainDefHasUSB(def) &&
+    if (!virDomainDefHasUSBControllers(def) &&
         def->os.type != VIR_DOMAIN_OSTYPE_EXE &&
         virDomainDeviceIsUSB(dev, false)) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index cb35ff06bd..a2684ea78d 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3682,7 +3682,7 @@ bool
 virDomainSCSIDriveAddressIsUsed(const virDomainDef *def,
                                 const virDomainDeviceDriveAddress *addr);
 
-bool virDomainDefHasUSB(const virDomainDef *def);
+bool virDomainDefHasUSBControllers(const virDomainDef *def);
 
 bool virDomainDeviceAliasIsUserAlias(const char *aliasStr);
 
diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
index 7346a61731..647cb23b19 100644
--- a/src/conf/domain_validate.c
+++ b/src/conf/domain_validate.c
@@ -1166,7 +1166,7 @@ virDomainRedirdevDefValidate(const virDomainDef *def,
                              const virDomainRedirdevDef *redirdev)
 {
     if (redirdev->bus == VIR_DOMAIN_REDIRDEV_BUS_USB &&
-        !virDomainDefHasUSB(def)) {
+        !virDomainDefHasUSBControllers(def)) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                        _("cannot add redirected USB device: USB is disabled 
for this domain"));
         return -1;
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 4e57e4a8f6..3fc97bd124 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -349,7 +349,7 @@ virDomainDefHasOldStyleROUEFI;
 virDomainDefHasOldStyleUEFI;
 virDomainDefHasPCIHostdev;
 virDomainDefHasTimer;
-virDomainDefHasUSB;
+virDomainDefHasUSBControllers;
 virDomainDefHasVcpusOffline;
 virDomainDefHasVDPANet;
 virDomainDefIDsParseString;
diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index 7233df888c..e835266f40 100644
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -3038,7 +3038,7 @@ qemuDomainUSBAddressAddHubs(virDomainDef *def)
                                               &data,
                                               false));
 
-    if (data.count > 0 && !virDomainDefHasUSB(def)) {
+    if (data.count > 0 && !virDomainDefHasUSBControllers(def)) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                        _("USB is disabled for this domain, but USB devices are 
present in the domain XML"));
         return -1;
-- 
2.52.0