From b722f36e92f11a6a062fe6a977ace7b611533ad7 Mon Sep 17 00:00:00 2001 From: Lee Yarwood Date: Mon, 14 Jun 2021 11:18:37 +0100 Subject: [PATCH] qemu_hotplug: Report VIR_ERR_DEVICE_MISSING when device is not found 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 Reviewed-by: Peter Krempa --- src/qemu/qemu_hotplug.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 8f7ac30114..ddc797afae 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -5317,7 +5317,7 @@ qemuDomainDetachPrepDisk(virDomainObj *vm, int idx; if ((idx = qemuFindDisk(vm->def, match->dst)) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, + virReportError(VIR_ERR_DEVICE_MISSING, _("disk %s not found"), match->dst); return -1; } @@ -5814,7 +5814,7 @@ qemuDomainDetachPrepInput(virDomainObj *vm, int idx; if ((idx = virDomainInputDefFind(vm->def, match)) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, "%s", + virReportError(VIR_ERR_DEVICE_MISSING, "%s", _("matching input device not found")); return -1; } @@ -5850,7 +5850,7 @@ qemuDomainDetachPrepVsock(virDomainObj *vm, *detach = vsock = vm->def->vsock; if (!vsock || !virDomainVsockDefEquals(match, vsock)) { - virReportError(VIR_ERR_OPERATION_FAILED, "%s", + virReportError(VIR_ERR_DEVICE_MISSING, "%s", _("matching vsock device not found")); return -1; }