External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-02 09:55:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu_hotplug: Report VIR_ERR_DEVICE_MISSING when device is not found

Browse Source 
126db34a81bc9f9f9710408f88cceaa1e34bbbd7 had previously switched various
flows over to this from VIR_ERR_OPERATION_FAILED.

This change simply does the same for qemuDomainDetachPrepDisk,
qemuDomainDetachPrepInput and qemuDomainDetachPrepVsock to allow
management apps to centralise their error handling on just
VIR_ERR_DEVICE_MISSING for missing devices during a detach.

Signed-off-by: Lee Yarwood <lyarwood@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Lee Yarwood 2021-06-14 11:18:37 +01:00 committed by Peter Krempa
parent 16c43b2d49
commit b722f36e92
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/qemu/qemu_hotplug.c
View File

@ -5317,7 +5317,7 @@ qemuDomainDetachPrepDisk(virDomainObj *vm,
int idx; int idx;
if ((idx = qemuFindDisk(vm->def, match->dst)) < 0) { if ((idx = qemuFindDisk(vm->def, match->dst)) < 0) {
virReportError(VIR_ERR_OPERATION_FAILED, virReportError(VIR_ERR_DEVICE_MISSING,
_("disk %s not found"), match->dst); _("disk %s not found"), match->dst);
return -1; return -1;
} }
@ -5814,7 +5814,7 @@ qemuDomainDetachPrepInput(virDomainObj *vm,
int idx; int idx;
if ((idx = virDomainInputDefFind(vm->def, match)) < 0) { if ((idx = virDomainInputDefFind(vm->def, match)) < 0) {
virReportError(VIR_ERR_OPERATION_FAILED, "%s", virReportError(VIR_ERR_DEVICE_MISSING, "%s",
_("matching input device not found")); _("matching input device not found"));
return -1; return -1;
} }
@ -5850,7 +5850,7 @@ qemuDomainDetachPrepVsock(virDomainObj *vm,
*detach = vsock = vm->def->vsock; *detach = vsock = vm->def->vsock;
if (!vsock || if (!vsock ||
!virDomainVsockDefEquals(match, vsock)) { !virDomainVsockDefEquals(match, vsock)) {
virReportError(VIR_ERR_OPERATION_FAILED, "%s", virReportError(VIR_ERR_DEVICE_MISSING, "%s",
_("matching vsock device not found")); _("matching vsock device not found"));
return -1; return -1;
} }