don't mention disk controllers in generic controller errors

The controller element supports non-disk controller types too.

https://bugzilla.redhat.com/show_bug.cgi?id=960958
(cherry picked from commit c075f89fa291478e5244d64cf528ca3e80705d26)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index f3fca7f3a5b6e72074002a63637566df3ab54621..84089ea5287de34a95b2514047c3f8222f3d5911 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -12026,7 +12026,7 @@ virDomainDefCheckABIStability(virDomainDefPtr src,
 
     if (src->ncontrollers != dst->ncontrollers) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                       _("Target domain disk controller count %zu "
+                       _("Target domain controller count %zu "
                          "does not match source %zu"),
                        dst->ncontrollers, src->ncontrollers);
         return false;

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 87117a389609c11adc65ca12914c56f4ee397978..b6a5139c3f1fa324b35b5ffc4108c7466ffa6c55 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -5861,7 +5861,7 @@ qemuDomainAttachDeviceControllerLive(virQEMUDriverPtr driver,
         break;
     default:
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                       _("disk controller bus '%s' cannot be hotplugged."),
+                       _("'%s' controller cannot be hotplugged."),
                        virDomainControllerTypeToString(cont->type));
         break;
     }
@@ -5976,7 +5976,7 @@ qemuDomainDetachDeviceControllerLive(virQEMUDriverPtr driver,
         break;
     default :
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                       _("disk controller bus '%s' cannot be hotunplugged."),
+                       _("'%s' controller cannot be hotunplugged."),
                        virDomainControllerTypeToString(cont->type));
     }
     return ret;

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 5baf901e7d59325ad74b65b7c3f3d8c346ffb4ac..5c9345dd80efa130bcf42c565d8ffa8efc03ea25 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -2301,7 +2301,7 @@ int qemuDomainDetachPciControllerDevice(virQEMUDriverPtr driver,
                                        dev->data.controller->type,
                                        dev->data.controller->idx)) < 0) {
         virReportError(VIR_ERR_OPERATION_FAILED,
-                       _("disk controller %s:%d not found"),
+                       _("controller %s:%d not found"),
                        virDomainControllerTypeToString(dev->data.controller->type),
                        dev->data.controller->idx);
         goto cleanup;