[Xen-changelog] [xen-unstable] libxl: Introduce libxl__arch_domain_create (x86 version)

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
# Date 1338364671 -3600
# Node ID 3a4a9a7d17562f323d50d3c179a1b40c8cfe944e
# Parent  04f188ef58278e290975d7e964e895199f809958
libxl: Introduce libxl__arch_domain_create (x86 version)

Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
Acked-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
Acked-by: Ian Campbell <Ian.Campbell@xxxxxxxxxx>
Committed-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---


diff -r 04f188ef5827 -r 3a4a9a7d1756 tools/libxl/Makefile
--- a/tools/libxl/Makefile      Wed May 30 08:57:50 2012 +0100
+++ b/tools/libxl/Makefile      Wed May 30 08:57:51 2012 +0100
@@ -34,7 +34,7 @@ LIBXL_OBJS-y += libxl_blktap2.o
 else
 LIBXL_OBJS-y += libxl_noblktap2.o
 endif
-LIBXL_OBJS-$(CONFIG_X86) += libxl_cpuid.o libxl_noarch.o
+LIBXL_OBJS-$(CONFIG_X86) += libxl_cpuid.o libxl_x86.o
 LIBXL_OBJS-$(CONFIG_IA64) += libxl_nocpuid.o libxl_noarch.o
 LIBXL_OBJS-$(CONFIG_ARM) += libxl_nocpuid.o libxl_noarch.o
 
diff -r 04f188ef5827 -r 3a4a9a7d1756 tools/libxl/libxl_create.c
--- a/tools/libxl/libxl_create.c        Wed May 30 08:57:50 2012 +0100
+++ b/tools/libxl/libxl_create.c        Wed May 30 08:57:51 2012 +0100
@@ -18,6 +18,7 @@
 #include "libxl_osdeps.h" /* must come before any other headers */
 
 #include "libxl_internal.h"
+#include "libxl_arch.h"
 
 #include <xc_dom.h>
 #include <xenguest.h>
@@ -835,16 +836,7 @@ static void domcreate_devmodel_started(l
         }
     }
 
-    if (d_config->c_info.type == LIBXL_DOMAIN_TYPE_PV &&
-        libxl_defbool_val(d_config->b_info.u.pv.e820_host)) {
-        ret = libxl__e820_alloc(gc, domid, d_config);
-        if (ret) {
-            LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR,
-                      "Failed while collecting E820 with: %d (errno:%d)\n",
-                      ret, errno);
-            goto error_out;
-        }
-    }
+    libxl__arch_domain_create(gc, d_config, domid);
     domcreate_console_available(egc, dcs);
 
     domcreate_complete(egc, dcs, 0);
diff -r 04f188ef5827 -r 3a4a9a7d1756 tools/libxl/libxl_x86.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/libxl/libxl_x86.c   Wed May 30 08:57:51 2012 +0100
@@ -0,0 +1,19 @@
+#include "libxl_internal.h"
+#include "libxl_arch.h"
+
+int libxl__arch_domain_create(libxl__gc *gc, libxl_domain_config *d_config,
+        uint32_t domid)
+{
+    int ret = 0;
+    if (d_config->c_info.type == LIBXL_DOMAIN_TYPE_PV &&
+            libxl_defbool_val(d_config->b_info.u.pv.e820_host)) {
+        ret = libxl__e820_alloc(gc, domid, d_config);
+        if (ret) {
+            LIBXL__LOG_ERRNO(gc->owner, LIBXL__LOG_ERROR,
+                    "Failed while collecting E820 with: %d (errno:%d)\n",
+                    ret, errno);
+        }
+    }
+
+    return ret;
+}

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog