bitkeeper revision 1.879.1.8 (40927c76fBFYWVkMyT4Hhbq-SCO6rA)

Fix a mismerge.

diff --git a/tools/examples/xc_dom_create.py b/tools/examples/xc_dom_create.py
index 91fe53217e83a8e3ee62fb8311a15fc1fd32e937..0fae2b251bcd8e10f3109fb7650fde15a781a186 100755 (executable)
--- a/tools/examples/xc_dom_create.py
+++ b/tools/examples/xc_dom_create.py
@@ -261,7 +261,7 @@ def make_domain():
             sys.exit()
     else:
 
-        ret = eval('xc.%s_build ( dom=id, image=image, ramdisk=ramdisk, cmdline=cmdline, control_evtchn=xend_response["remote_port"], io_priv=%d )' % (builder_fn, io_priv) )
+        ret = eval('xc.%s_build ( dom=id, image=image, ramdisk=ramdisk, cmdline=cmdline, control_evtchn=cons_response["remote_port"], io_priv=%d )' % (builder_fn, io_priv) )
         if ret < 0:
             print "Error building Linux guest OS: "
             print "Return code = " + str(ret)