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 694740e42f28c7b272a175e7b7a4297f2db0aa8a..6995d2ae2a9285cca75807401c060cb26fc91729 100644 (file)
--- 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 ef41cb0cfa6b5b589c870bf03191570fdfbf9316..a562c00f3800a6aebf91cd4e4c615bfab70f7130 100644 (file)
--- 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();