diff --git a/share/scripts/im/kvm.d/kvm.rb b/share/scripts/im/kvm.d/kvm.rb index 0b7c664d7b..6228de8c43 100755 --- a/share/scripts/im/kvm.d/kvm.rb +++ b/share/scripts/im/kvm.d/kvm.rb @@ -21,7 +21,7 @@ # TODO : use virsh freecell when available ###### -nodeinfo_text = `virsh -c qemu:///system nodeinfo` +nodeinfo_text = `virsh -c qemu:///system nodeinfo --readonly` nodeinfo_text.split(/\n/).each{|line| if line.match('^CPU\(s\)') diff --git a/share/scripts/vmm/kvm/poll b/share/scripts/vmm/kvm/poll index 98259ff197..33ec0a44f0 100755 --- a/share/scripts/vmm/kvm/poll +++ b/share/scripts/vmm/kvm/poll @@ -18,9 +18,6 @@ source $(dirname $0)/kvmrc -# Execution example -# virsh dominfo one-108 | awk "`cat poll.awk`" | tr '\n' ' ' - AWK_SCRIPT=' BEGIN { FS=":" }; @@ -48,15 +45,9 @@ $1=="State" { deploy_id=$1 -virsh_cmd="virsh dominfo $deploy_id" +virsh_cmd="virsh --connect $LIBVIRT_URI --readonly dominfo $deploy_id" awk_cmd="awk \'$AWK_SCRIPT\'" info=`$virsh_cmd 2>/dev/null | awk "$AWK_SCRIPT"` echo $info - - -#virsh_info=`virsh dominfo $deploy_id` - - - diff --git a/share/scripts/vmm/kvm/shutdown b/share/scripts/vmm/kvm/shutdown index 393c587382..53d84d25d1 100755 --- a/share/scripts/vmm/kvm/shutdown +++ b/share/scripts/vmm/kvm/shutdown @@ -32,7 +32,7 @@ if [ "$exit_code" != "0" ]; then fi count=0 -while [ $(virsh --connect $LIBVIRT_URI dominfo $deploy_id > /dev/null 2>&1; echo $?) = "0" ] +while [ $(virsh --connect $LIBVIRT_URI --readonly dominfo $deploy_id > /dev/null 2>&1; echo $?) = "0" ] do sleep $POLL_INTERVAL if [ "$count" -gt "$TIMEOUT" ]