mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 10:11:27 +01:00
Keir Fraser
0aef8a0311
This is a corrected version of a patch commited as c/s 19250 and reverted by c/s 19314. Thanks to "trap sigerr ERR" in xen-hotplug-common.sh the xen-hotplug-cleanup would exit when reading /local/domain/ID/vm fails thus skipping all the xenstore-rm lines in the rest of the script. Change deviceDestroy behavior to remove /vm/UUID/device/... path only when force was used (as it already does so for both frontend and backend) and do the removing from xen-hotplug-cleanup script when we are sure the device is really not attached to the guest any more. Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
37 lines
1.2 KiB
Bash
37 lines
1.2 KiB
Bash
#! /bin/bash
|
|
|
|
dir=$(dirname "$0")
|
|
. "$dir/xen-hotplug-common.sh"
|
|
|
|
# Claim the lock protecting /etc/xen/scripts/block. This stops a race whereby
|
|
# paths in the store would disappear underneath that script as it attempted to
|
|
# read from the store checking for device sharing.
|
|
# Any other scripts that do similar things will have to have their lock
|
|
# claimed too.
|
|
# This is pretty horrible, but there's not really a nicer way of solving this.
|
|
claim_lock "block"
|
|
|
|
# split backend/DEVCLASS/VMID/DEVID on slashes
|
|
path_array=( ${XENBUS_PATH//\// } )
|
|
# get /vm/UUID path
|
|
vm=$(xenstore_read_default "/local/domain/${path_array[2]}/vm" "")
|
|
# construct /vm/UUID/device/DEVCLASS/DEVID
|
|
if [ "$vm" != "" ]; then
|
|
vm_dev="$vm/device/${path_array[1]}/${path_array[3]}"
|
|
else
|
|
vm_dev=
|
|
fi
|
|
|
|
# remove device frontend store entries
|
|
xenstore-rm -t \
|
|
$(xenstore-read "$XENBUS_PATH/frontend" 2>/dev/null) 2>/dev/null || true
|
|
|
|
# remove device backend store entries
|
|
xenstore-rm -t "$XENBUS_PATH" 2>/dev/null || true
|
|
xenstore-rm -t "error/$XENBUS_PATH" 2>/dev/null || true
|
|
|
|
# remove device path from /vm/UUID
|
|
[ "$vm_dev" != "" ] && xenstore-rm -t "$vm_dev" 2>/dev/null || true
|
|
|
|
release_lock "block"
|