aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2011-01-25 18:39:16 +0100
committerAndreas Schneider <asn@cryptomilk.org>2011-01-25 18:39:16 +0100
commit51f13d20fdad1f4a28429f8b4394b2e8e65f7be1 (patch)
treea5dd67057c8294a539c6e41c0cefc3a3e05c54e7
parentf715d3b12eb7794040b43dae3b0ee54f1fe5950d (diff)
downloadvmexec-51f13d20fdad1f4a28429f8b4394b2e8e65f7be1.tar.gz
vmexec-51f13d20fdad1f4a28429f8b4394b2e8e65f7be1.tar.xz
vmexec-51f13d20fdad1f4a28429f8b4394b2e8e65f7be1.zip
vmexec: Renamed kvm to qemu.
-rwxr-xr-xvmexec21
1 files changed, 14 insertions, 7 deletions
diff --git a/vmexec b/vmexec
index a32767e..c623eb9 100755
--- a/vmexec
+++ b/vmexec
@@ -48,6 +48,7 @@ class VMExecOpts
@options.net = "virtio"
@options.blk = "virtio"
@options.snp = false
+ @options.qemu = String.new
@options.args = []
@options.wait = 20
@@ -153,11 +154,17 @@ class VMExecOpts
@options.snp = snapshot
end
- opts.on("--kvm-args=OPT", String,
- "Pass additional option OPT to kvm. Specify multiple times",
+ opts.on("--qemu-args=OPT", String,
+ "Pass additional option OPT to qemu. Specify multiple times",
"to pass more than one option. For example",
- "vmexec --kvm-args=-cdrom mycd.iso ...") do |kargs|
- @options.args = kargs.split
+ "vmexec --qemu-args='-cdrom mycd.iso'") do |qargs|
+ @options.args = qargs.split
+ end
+
+ opts.on("--qemu=BIN", String,
+ "The qemu binary to use. The by default we search for a kvm",
+ "binary: kvm, qemu-kvm") do |qemu|
+ @options.qemu = qemu
end
opts.on("--wait=SECS", Integer,
@@ -191,9 +198,9 @@ class VMExecOpts
end
opts.on("-l", "--logfile=FILE", String,
- "File to redirect the output from kvm into. This includes",
- "any (error) messages from kvm, and also includes anything",
- "the guest writes to the kvm emulated serial port (it can",
+ "File to redirect the output from qemu into. This includes",
+ "any (error) messages from qemu, and also includes anything",
+ "the guest writes to the qemu emulated serial port (it can",
"be useful to set the guest to send boot loader and kernel",
"messages to the serial console and log them with this",
"option). Default is to not log this output anywhere.") do |log|