From 67defe8da694482ce054fe2fbd933feefd99749d Mon Sep 17 00:00:00 2001 From: Anton Todorov Date: Wed, 19 Feb 2020 12:45:18 +0200 Subject: [PATCH] B #4164: Use xmllint to test disk target device (#4168) Signed-off-by: Anton Todorov (cherry picked from commit 4b17b1f6e81fb598733ef3038f53985698798749) --- src/vmm_mad/remotes/kvm/detach_disk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/vmm_mad/remotes/kvm/detach_disk b/src/vmm_mad/remotes/kvm/detach_disk index 02d569409b..968b00bd9a 100755 --- a/src/vmm_mad/remotes/kvm/detach_disk +++ b/src/vmm_mad/remotes/kvm/detach_disk @@ -29,9 +29,10 @@ DETACH_PARAMS="--domain $DOMAIN --target $TARGET" exec_and_log "virsh --connect $LIBVIRT_URI detach-disk $DETACH_PARAMS" \ "Could not detach $TARGET from $DOMAIN" -virsh --connect $LIBVIRT_URI dumpxml $DOMAIN | grep $TARGET > /dev/null 2>&1 +virsh --connect $LIBVIRT_URI dumpxml $DOMAIN | \ + xmllint -xpath "//disk/target[@dev='$TARGET']" - >/dev/null 2>&1 -if [ $? -eq 0 ] ; then +if [ $? -ne 0 ] ; then error_message "Could not detach $TARGET from $DOMAIN" exit -1 fi