summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Levy <alevy@redhat.com>2011-09-21 19:43:38 +0300
committerAlon Levy <alevy@redhat.com>2011-09-21 19:43:38 +0300
commit5a501d836b8be485cfdd96bc5d3d43f60821da1c (patch)
treeb072bc8cbe16c36a5b7bcc7d1f10856f3d27174f
parent4193a81b9bfe860dff907b2cd4c627720546b0b3 (diff)
qmp: open chardev as ipv4
-rwxr-xr-xspice26
1 files changed, 5 insertions, 1 deletions
diff --git a/spice2 b/spice2
index dbe773a..954de50 100755
--- a/spice2
+++ b/spice2
@@ -219,6 +219,8 @@ def set_title(x):
sys.stdout.write("\033]0;%s\007" % str(x))
def file_in_use(x):
+ print "not calling lsof -t %s" % x
+ return False
return not subprocess.call(['lsof', '-t', x],
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -477,8 +479,10 @@ def build_qemu_cmdline_and_env(args):
str(args.memory),
"-cpu", str(args.cpu)] + build_spice_option(args)
if args.qmp_port:
+ # TODO - make it both ipv6 and ipv4? didn't test, but if no ipv4 is given
+ # the socket may only be ipv6, which complicates a lot of python code needlessly.
cmdline.extend(["-chardev",
- "socket,id=qmpmon,host=localhost,port=%s,server,nowait" % args.qmp_port,
+ "socket,id=qmpmon,host=localhost,port=%s,server,nowait,ipv4" % args.qmp_port,
"-mon", "chardev=qmpmon,mode=control"])
if args.snapshot:
cmdline.append("-snapshot")