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 9c96cf1af0f2437cc26a04097fbb1081210e4ead..5b0e25d5e89824fd87cdf6a6e18bbf80a62f1f64 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -11829,7 +11829,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 b19f4976f6fe71cd27ca045d8d7329ba9ee527b8..a9482ee55e5b0f43df20249b7155b8afdae02d7f 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -5853,7 +5853,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;
     }
@@ -5968,7 +5968,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 e5e7fbdc422b55ab145dfcee83d904dea58da862..29a0573cafe825da064c6fde7b2373d5f99f406e 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -2251,7 +2251,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;