Re: [PATCH 4/6] libxl: portiblity fixes

[Christoph Egger <Christoph.Egger@amd.com>]

[-- Attachment #1: Type: text/plain, Size: 930 bytes --]

On Tuesday 27 July 2010 18:58:26 Ian Jackson wrote:
> Christoph Egger writes ("[Xen-devel] [PATCH 4/6] libxl: portiblity fixes"):
> > +ifeq ($(CONFIG_Linux),y)
> >  CFLAGS_libblktapctl = -I$(XEN_BLKTAP2)/control -I$(XEN_BLKTAP2)/include
> > $(CFLAGS_include) LDFLAGS_libblktapctl = -L$(XEN_BLKTAP2)/control
> > -lblktapctl
> > +else
> > +CFLAGS_libblktapctl =
> > +LDFLAGS_libblktapctl =
> > +endif
>
> I think this should be in the same patch as provides the stub
> implementation of the blktap functions for non-blktap systems.

Done.

Attached patch adds the stub implementations for
non-blktap systems.

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>


-- 
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach b. Muenchen
Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632

[-- Attachment #2: xen_tools_libxl4.diff --]
[-- Type: text/x-diff, Size: 2328 bytes --]

diff -r 9ea1cf03ef55 tools/Rules.mk
--- a/tools/Rules.mk	Wed Jul 28 13:35:25 2010 +0200
+++ b/tools/Rules.mk	Wed Jul 28 13:48:07 2010 +0200
@@ -26,10 +26,19 @@ LDFLAGS_libxenguest = -L$(XEN_LIBXC) -lx
 CFLAGS_libxenstore = -I$(XEN_XENSTORE) $(CFLAGS_include)
 LDFLAGS_libxenstore = -L$(XEN_XENSTORE) -lxenstore
 
+ifeq ($(CONFIG_Linux),y)
 LIBXL_BLKTAP = y
+else
+LIBXL_BLKTAP = n
+endif
 
+ifeq ($(LIBXL_BLKTAP),y)
 CFLAGS_libblktapctl = -I$(XEN_BLKTAP2)/control -I$(XEN_BLKTAP2)/include $(CFLAGS_include)
 LDFLAGS_libblktapctl = -L$(XEN_BLKTAP2)/control -lblktapctl
+else
+CFLAGS_libblktapctl =
+LDFLAGS_libblktapctl =
+endif
 
 X11_LDPATH = -L/usr/X11R6/$(LIBLEAFDIR)
 
diff -r 9ea1cf03ef55 tools/libxl/Makefile
--- a/tools/libxl/Makefile	Wed Jul 28 13:35:25 2010 +0200
+++ b/tools/libxl/Makefile	Wed Jul 28 13:48:07 2010 +0200
@@ -20,6 +20,8 @@ LIBS = $(LDFLAGS_libxenctrl) $(LDFLAGS_l
 LIBXL_OBJS-y = osdeps.o libxl_paths.o libxl_bootloader.o
 ifeq ($(LIBXL_BLKTAP),y)
 LIBXL_OBJS-y += libxl_blktap2.c
+else
+LIBXL_OBJS-y += libxl_noblktap2.c
 endif
 
 LIBXL_OBJS = flexarray.o libxl.o libxl_pci.o libxl_dom.o libxl_exec.o libxl_xshelp.o libxl_device.o libxl_internal.o xenguest.o libxl_utils.o $(LIBXL_OBJS-y)
diff -r 9ea1cf03ef55 tools/libxl/libxl_noblktap2.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/libxl/libxl_noblktap2.c	Wed Jul 28 13:48:07 2010 +0200
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2010      Advanced Micro Devices
+ * Author Christoph Egger <Christoph.Egger@amd.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; version 2.1 only.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+
+#include "libxl.h"
+#include "libxl_osdeps.h"
+#include "libxl_internal.h"
+
+int libxl_blktap_enabled(struct libxl_ctx *ctx)
+{
+    return 0;
+}
+
+const char *libxl_blktap_devpath(struct libxl_ctx *ctx,
+                                 const char *disk,
+                                 libxl_disk_phystype phystype)
+{
+    return NULL;
+}

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

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