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

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index d55ce6b176f54db818d54b0c2ad74ee639d69d0a..6b71727043919bbe9ea0911ff3aa05ab8ffe723c 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -12667,7 +12667,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 5005afa546552a88b8de4bfaa98fe9df2397ddf0..6a23573b9c073b1d2b669daa80b932e2261ed95b 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -5808,7 +5808,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;
     }
@@ -5923,7 +5923,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 a4f48b0338a62f225c9251a68aee83e6b28fceb1..4d8ac5251e3d604b639a44517fbb56b3e2afa7a5 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -2273,7 +2273,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;