diff options
| author | Ján Tomko <jtomko@redhat.com> | 2013-05-09 11:39:21 +0200 |
|---|---|---|
| committer | Ján Tomko <jtomko@redhat.com> | 2013-05-09 15:56:08 +0200 |
| commit | 8e2d8d19bd3a6ab1ebc75f1ab03674c1b7cd22cd (patch) | |
| tree | 8058db4be2e3b6a7a96241c3437e3ee8675647db | |
| parent | be563bcfe6c2a4fed37cdd8a016bffd9052b77e9 (diff) | |
| download | libvirt-8e2d8d19bd3a6ab1ebc75f1ab03674c1b7cd22cd.tar.gz | |
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)
| -rw-r--r-- | src/conf/domain_conf.c | 2 | ||||
| -rw-r--r-- | src/qemu/qemu_driver.c | 4 | ||||
| -rw-r--r-- | src/qemu/qemu_hotplug.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9c96cf1af0..5b0e25d5e8 100644 --- 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 b19f4976f6..a9482ee55e 100644 --- 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 e5e7fbdc42..29a0573caf 100644 --- 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; |