openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Ján Tomko 2013-05-09 11:39:21 +02:00
parent 413274f63b
commit c075f89fa2
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/conf/domain_conf.c
View File

@ -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;

4
src/qemu/qemu_driver.c
View File

@ -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;

2
src/qemu/qemu_hotplug.c
View File

@ -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;