ia64/xen-unstable

changeset 1332:60e0bd84bf4d

bitkeeper revision 1.879.1.8 (40927c76fBFYWVkMyT4Hhbq-SCO6rA)

Fix a mismerge.
author kaf24@scramble.cl.cam.ac.uk
date Fri Apr 30 16:19:02 2004 +0000 (2004-04-30)
parents 975d97ad562f
children b4a9837c89b1
files tools/examples/xc_dom_create.py
line diff
     1.1 --- a/tools/examples/xc_dom_create.py	Fri Apr 30 16:05:31 2004 +0000
     1.2 +++ b/tools/examples/xc_dom_create.py	Fri Apr 30 16:19:02 2004 +0000
     1.3 @@ -261,7 +261,7 @@ def make_domain():
     1.4              sys.exit()
     1.5      else:
     1.6  
     1.7 -        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) )
     1.8 +        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) )
     1.9          if ret < 0:
    1.10              print "Error building Linux guest OS: "
    1.11              print "Return code = " + str(ret)