From ead9e445bceb3f96fc68873a9cb1fa62798159b4 Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Date: Wed, 1 Feb 2012 16:04:52 +0100
Subject: [PATCH] dom0/qvm-tools: change qvm-run --pass_io to --pass-io

---
 dom0/pm-utils/01qubes-suspend-netvm | 4 ++--
 dom0/qvm-tools/qvm-dom0-update      | 2 +-
 dom0/qvm-tools/qvm-grow-private     | 2 +-
 dom0/qvm-tools/qvm-run              | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dom0/pm-utils/01qubes-suspend-netvm b/dom0/pm-utils/01qubes-suspend-netvm
index 264c8faa..0d0f6fa7 100755
--- a/dom0/pm-utils/01qubes-suspend-netvm
+++ b/dom0/pm-utils/01qubes-suspend-netvm
@@ -16,7 +16,7 @@ get_running_netvms() {
 suspend_net()
 {
     for VM in `get_running_netvms`; do
-        qvm-run -u root --pass_io $VM 'service NetworkManager stop; for if in `ls /sys/class/net|grep -v "lo\|vif"`; do ip l s $if down; done; modprobe -r uhci_hcd ehci_hcd'
+        qvm-run -u root --pass-io $VM 'service NetworkManager stop; for if in `ls /sys/class/net|grep -v "lo\|vif"`; do ip l s $if down; done; modprobe -r uhci_hcd ehci_hcd'
     done
     # Ignore exit status from netvm...
     return 0
@@ -25,7 +25,7 @@ suspend_net()
 resume_net()
 {
     for VM in `get_running_netvms`; do
-        qvm-run -u root --pass_io $VM "modprobe ehci_hcd; modprobe uhci_hcd; [ -x /bin/systemctl ] && systemctl start NetworkManager.service || service qubes_core_netvm start"
+        qvm-run -u root --pass-io $VM "modprobe ehci_hcd; modprobe uhci_hcd; [ -x /bin/systemctl ] && systemctl start NetworkManager.service || service qubes_core_netvm start"
     done
     # Ignore exit status from netvm...
     return 0
diff --git a/dom0/qvm-tools/qvm-dom0-update b/dom0/qvm-tools/qvm-dom0-update
index e0da7500..fdf30094 100755
--- a/dom0/qvm-tools/qvm-dom0-update
+++ b/dom0/qvm-tools/qvm-dom0-update
@@ -75,7 +75,7 @@ qvm-run -a $UPDATEVM true || exit 1
 
 /usr/lib/qubes/qrexec_client -d "$UPDATEVM" -l 'tar c /var/lib/rpm /etc/yum.repos.d /etc/yum.conf 2>/dev/null' 'user:tar x -C /var/lib/qubes/dom0-updates'
 
-qvm-run --pass_io $UPDATEVM "/usr/lib/qubes/qubes_download_dom0_updates.sh --doit --nogui $ALL_OPTS"
+qvm-run --pass-io $UPDATEVM "/usr/lib/qubes/qubes_download_dom0_updates.sh --doit --nogui $ALL_OPTS"
 RETCODE=$?
 if [ "$CHECK_ONLY" == "1" ]; then
     exit $RETCODE
diff --git a/dom0/qvm-tools/qvm-grow-private b/dom0/qvm-tools/qvm-grow-private
index cb6fff44..ffa114ae 100755
--- a/dom0/qvm-tools/qvm-grow-private
+++ b/dom0/qvm-tools/qvm-grow-private
@@ -99,7 +99,7 @@ def main():
         # resize loop device
         retcode = subprocess.check_call(["losetup", "--set-capacity", loop_dev])
 
-        retcode = subprocess.check_call([qvm_run_path, "-uroot", "--pass_io", vmname, 
+        retcode = subprocess.check_call([qvm_run_path, "-uroot", "--pass-io", vmname, 
                 "while [ \"`blockdev --getsize64 /dev/xvdb`\" -lt {0} ]; do sleep 0.2; done; resize2fs /dev/xvdb".format(size_bytes) ])
     else:
         retcode = subprocess.check_call(["resize2fs", "-f", vm.private_img])
diff --git a/dom0/qvm-tools/qvm-run b/dom0/qvm-tools/qvm-run
index 47761495..6de98fc4 100755
--- a/dom0/qvm-tools/qvm-run
+++ b/dom0/qvm-tools/qvm-run
@@ -120,11 +120,11 @@ def main():
     parser.add_option ("--unpause", action="store_true", dest="unpause", default=False,
                       help="Do 'xl unpause' for the VM(s) (can be combined this with --all and --wait)")
 
-    parser.add_option ("-p", "--pass_io", action="store_true", dest="passio", default=False,
+    parser.add_option ("-p", "--pass-io", action="store_true", dest="passio", default=False,
                       help="Pass stdin/stdout/stderr from remote program")
 
     parser.add_option ("--localcmd", action="store", dest="localcmd", default=None,
-                      help="With --pass_io, pass stdin/stdout/stderr to the given program")
+                      help="With --pass-io, pass stdin/stdout/stderr to the given program")
 
     parser.add_option ("--force", action="store_true", dest="force", default=False,
                       help="Force operation, even if may damage other VMs (eg shutdown of NetVM)")