From: Ian Jackson <iwj@mariner.uk.xensource.com>
Date: Wed, 18 Jun 2008 13:10:19 +0000 (+0100)
Subject: Initialise xc_handle; get rid of some xen-useless stuff in initialisation
X-Git-Tag: xen-3.3.0-rc1~70
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1c51e66079aa02e7572baf718e1a93b2f29df637;p=qemu-xen-3.3-testing.git

Initialise xc_handle; get rid of some xen-useless stuff in initialisation
---

diff --git a/i386-dm/helper2.c b/i386-dm/helper2.c
index 694740e4..6995d2ae 100644
--- a/i386-dm/helper2.c
+++ b/i386-dm/helper2.c
@@ -78,7 +78,7 @@ _syscall3(int, modify_ldt, int, func, void *, ptr, unsigned long, bytecount)
 int domid = -1;
 int vcpus = 1;
 
-int xc_handle;
+int xc_handle = -1;
 
 char domain_name[64] = "Xen-no-name";
 int domid;
diff --git a/vl.c b/vl.c
index ef41cb0c..a562c00f 100644
--- a/vl.c
+++ b/vl.c
@@ -8598,7 +8598,6 @@ int main(int argc, char **argv)
 	    exit(1);
 	}
     }
-#endif
 
     /* init the memory */
     phys_ram_size = machine->ram_require & ~RAMSIZE_FIXED;
@@ -8626,6 +8625,10 @@ int main(int argc, char **argv)
         fprintf(stderr, "Could not allocate physical memory\n");
         exit(1);
     }
+#endif
+
+    xc_handle = xc_interface_open();
+    xenstore_parse_domain_config(domid);
 
     bdrv_init();