From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Egger Subject: Re: [PATCH 4/6] libxl: portiblity fixes Date: Wed, 28 Jul 2010 13:50:44 +0200 Message-ID: <201007281350.44601.Christoph.Egger@amd.com> References: <201007201831.21416.Christoph.Egger@amd.com> <201007271418.52038.Christoph.Egger@amd.com> <19535.4146.981024.743455@mariner.uk.xensource.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary-00=_UmBUMzu5/wwVAud" Return-path: In-Reply-To: <19535.4146.981024.743455@mariner.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Ian Jackson Cc: "xen-devel@lists.xensource.com" , Stefano Stabellini List-Id: xen-devel@lists.xenproject.org --Boundary-00=_UmBUMzu5/wwVAud Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline 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 -- ---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 --Boundary-00=_UmBUMzu5/wwVAud Content-Type: text/x-diff; charset="iso 8859-15"; name="xen_tools_libxl4.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="xen_tools_libxl4.diff" 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 + * + * 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; +} --Boundary-00=_UmBUMzu5/wwVAud Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --Boundary-00=_UmBUMzu5/wwVAud--