Skip to content
Browse files

Xen 4.1: fix qemu params

Signed-off-by: Gianni Tedesco <gianni.tedesco@citrix.com>
Signed-off-by: Zheng Li <zheng.li@eu.citrix.com>
  • Loading branch information...
1 parent ccdc4f4 commit 56731b4d371a1fe4fadf9b8460a6948aad87847d @zli zli committed Mar 14, 2011
Showing with 4 additions and 3 deletions.
  1. +3 −2 ocaml/xapi/vmops.ml
  2. +1 −1 scripts/qemu-dm-wrapper
View
5 ocaml/xapi/vmops.ml
@@ -1074,8 +1074,9 @@ let start_paused ?(progress_cb = fun _ -> ()) ~pcidevs ~__context ~vm ~snapshot
debug "creating kernel";
create_kernel ~__context ~xc ~xs ~self:vm domid snapshot;
progress_cb 0.35;
- if Xapi_globs.xenclient_enabled then
- Domain.cpuid_apply ~xc ~hvm domid;
+
+ Domain.cpuid_apply ~xc ~hvm domid;
+
(* Attach and activate reqd vdis: if exn occurs then we do best
effort cleanup -- that is detach and deactivate -- and then
propogate original exception. We need an exn handler around
View
2 scripts/qemu-dm-wrapper
@@ -108,7 +108,7 @@ if SQUASH_VNC:
except ValueError, IndexError:
pass
else:
- qemu_args.append("-vnclisten")
+ qemu_args.append("-vnc")
qemu_args.append("127.0.0.1:1")
def vm_uuid_from_dom_id(domid):

0 comments on commit 56731b4

Please sign in to comment.
Something went wrong with that request. Please try again.