External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: Add some more details for hotplug errors when device not found

Browse Source 
More proper/detail error messages updated.

Signed-off-by: Chen Hanxiao <chenhanxiao@gmail.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
Chen Hanxiao 2018-01-23 12:24:42 +08:00 committed by John Ferlan
parent 90161710b9
commit f0f2a5ec21
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libvirt_private.syms
View File

@ -203,6 +203,7 @@ virDomainChrConsoleTargetTypeToString;
virDomainChrDefForeach; virDomainChrDefForeach;
virDomainChrDefFree; virDomainChrDefFree;
virDomainChrDefNew; virDomainChrDefNew;
virDomainChrDeviceTypeToString;
virDomainChrEquals; virDomainChrEquals;
virDomainChrFind; virDomainChrFind;
virDomainChrGetDomainPtrs; virDomainChrGetDomainPtrs;
@ -427,6 +428,7 @@ virDomainMemoryDefFree;
virDomainMemoryFindByDef; virDomainMemoryFindByDef;
virDomainMemoryFindInactiveByDef; virDomainMemoryFindInactiveByDef;
virDomainMemoryInsert; virDomainMemoryInsert;
virDomainMemoryModelTypeToString;
virDomainMemoryRemove; virDomainMemoryRemove;
virDomainMemorySourceTypeFromString; virDomainMemorySourceTypeFromString;
virDomainMemorySourceTypeToString; virDomainMemorySourceTypeToString;

35
src/qemu/qemu_hotplug.c
View File

@ -3518,8 +3518,9 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver,
int ret = -1; int ret = -1;
if (!olddev) { if (!olddev) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR,
_("cannot find existing graphics device to modify")); _("cannot find existing graphics device to modify of "
"type '%s'"), type);
goto cleanup; goto cleanup;
} }
@ -5105,8 +5106,10 @@ qemuDomainDetachShmemDevice(virQEMUDriverPtr driver,
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
if ((idx = virDomainShmemDefFind(vm->def, dev)) < 0) { if ((idx = virDomainShmemDefFind(vm->def, dev)) < 0) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s", virReportError(VIR_ERR_OPERATION_INVALID,
_("device not present in domain configuration")); _("model '%s' shmem device not present "
"in domain configuration"),
virDomainShmemModelTypeToString(dev->model));
return -1; return -1;
} }
@ -5162,8 +5165,10 @@ qemuDomainDetachWatchdog(virQEMUDriverPtr driver,
watchdog->model == dev->model && watchdog->model == dev->model &&
watchdog->action == dev->action && watchdog->action == dev->action &&
virDomainDeviceInfoAddressIsEqual(&dev->info, &watchdog->info))) { virDomainDeviceInfoAddressIsEqual(&dev->info, &watchdog->info))) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s", virReportError(VIR_ERR_OPERATION_INVALID,
_("watchdog device not present in domain configuration")); _("model '%s' watchdog device not present "
"in domain configuration"),
virDomainWatchdogModelTypeToString(watchdog->model));
return -1; return -1;
} }
@ -5433,8 +5438,10 @@ int qemuDomainDetachChrDevice(virQEMUDriverPtr driver,
char *devstr = NULL; char *devstr = NULL;
if (!(tmpChr = virDomainChrFind(vmdef, chr))) { if (!(tmpChr = virDomainChrFind(vmdef, chr))) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s", virReportError(VIR_ERR_OPERATION_INVALID,
_("device not present in domain configuration")); _("chr type '%s' device not present "
"in domain configuration"),
virDomainChrDeviceTypeToString(chr->deviceType));
goto cleanup; goto cleanup;
} }
@ -5480,8 +5487,10 @@ qemuDomainDetachRNGDevice(virQEMUDriverPtr driver,
int ret = -1; int ret = -1;
if ((idx = virDomainRNGFind(vm->def, rng)) < 0) { if ((idx = virDomainRNGFind(vm->def, rng)) < 0) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s", virReportError(VIR_ERR_OPERATION_INVALID,
_("device not present in domain configuration")); _("model '%s' RNG device not present "
"in domain configuration"),
virDomainRNGBackendTypeToString(rng->model));
return -1; return -1;
} }
@ -5523,8 +5532,10 @@ qemuDomainDetachMemoryDevice(virQEMUDriverPtr driver,
qemuDomainMemoryDeviceAlignSize(vm->def, memdef); qemuDomainMemoryDeviceAlignSize(vm->def, memdef);
if ((idx = virDomainMemoryFindByDef(vm->def, memdef)) < 0) { if ((idx = virDomainMemoryFindByDef(vm->def, memdef)) < 0) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s", virReportError(VIR_ERR_OPERATION_INVALID,
_("device not present in domain configuration")); _("model '%s' memory device not present "
"in the domain configuration"),
virDomainMemoryModelTypeToString(memdef->model));
return -1; return -1;
} }