# HG changeset patch
# User Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
# Date 1279908809 -3600
# Node ID fa96fbfcac0c7c7410d3d8b4feea1d388d1cdf29
# Parent 8b3bfc4f0bdd3b7a5532ec43635b9f68b30e99f8
tools/libxl: Revert broken NetBSD portability patches
Revert
df9d8319bd37 Fix blktap2 NetBSD build and also revert broken change
e76befc7fe2d portability fixes from tools/console
24277e3237ca Fix linking error when creating the xl binary.
Now it builds again.
---
tools/libxl/libxl_linux.c | 50 -----------------------------------
tools/libxl/libxl_netbsd.c | 28 --------------------
tools/Rules.mk | 5 ---
tools/libxl/Makefile | 4 --
tools/libxl/libxl.c | 57 +++++++++++++++++++++++++++++------------
tools/libxl/libxl_bootloader.c | 9 ------
tools/libxl/libxl_device.c | 2 -
tools/libxl/libxl_internal.h | 2 -
tools/libxl/libxl_osdeps.h | 21 ---------------
9 files changed, 45 insertions(+), 133 deletions(-)
diff -r 8b3bfc4f0bdd -r fa96fbfcac0c tools/Rules.mk
--- a/tools/Rules.mk Fri Jul 23 18:50:30 2010 +0100
+++ b/tools/Rules.mk Fri Jul 23 19:13:29 2010 +0100
@@ -26,13 +26,8 @@ CFLAGS_libxenstore = -I$(XEN_XENSTORE) $
CFLAGS_libxenstore = -I$(XEN_XENSTORE) $(CFLAGS_include)
LDFLAGS_libxenstore = -L$(XEN_XENSTORE) -lxenstore
-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
X11_LDPATH = -L/usr/X11R6/$(LIBLEAFDIR)
diff -r 8b3bfc4f0bdd -r fa96fbfcac0c tools/libxl/Makefile
--- a/tools/libxl/Makefile Fri Jul 23 18:50:30 2010 +0100
+++ b/tools/libxl/Makefile Fri Jul 23 19:13:29 2010 +0100
@@ -15,11 +15,9 @@ CFLAGS += -I. -fPIC
CFLAGS += -I. -fPIC
CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore)
$(CFLAGS_libblktapctl)
-LIBS = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) $(LDFLAGS_libxenstore)
$(LDFLAGS_libblktapctl) $(UTIL_LIBS)
+LIBS = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) $(LDFLAGS_libxenstore)
$(LDFLAGS_libblktapctl) -lutil
LIBXL_OBJS-y = osdeps.o libxl_paths.o libxl_bootloader.o
-LIBXL_OBJS-$(CONFIG_Linux) += libxl_linux.o
-LIBXL_OBJS-$(CONFIG_NetBSD) += libxl_netbsd.o
LIBXL_OBJS = flexarray.o libxl.o libxl_dom.o libxl_exec.o libxl_xshelp.o
libxl_device.o libxl_internal.o xenguest.o libxl_utils.o $(LIBXL_OBJS-y)
AUTOINCS= libxlu_cfg_y.h libxlu_cfg_l.h
diff -r 8b3bfc4f0bdd -r fa96fbfcac0c tools/libxl/libxl.c
--- a/tools/libxl/libxl.c Fri Jul 23 18:50:30 2010 +0100
+++ b/tools/libxl/libxl.c Fri Jul 23 19:13:29 2010 +0100
@@ -34,6 +34,7 @@
#include "libxl_utils.h"
#include "libxl_internal.h"
#include "flexarray.h"
+#include "tap-ctl.h"
#define PAGE_TO_MEMKB(pages) ((pages) * 4)
@@ -1390,6 +1391,27 @@ int libxl_confirm_device_model_startup(s
/******************************************************************************/
+static char *get_blktap2_device(struct libxl_ctx *ctx,
+ const char *name, const char *type)
+{
+ int minor = tap_ctl_find_minor(type, name);
+ if (minor < 0)
+ return NULL;
+ return libxl_sprintf(ctx, "/dev/xen/blktap-2/tapdev%d", minor);
+}
+
+static char *make_blktap2_device(struct libxl_ctx *ctx,
+ const char *name, const char *type)
+{
+ char *params, *devname = NULL;
+ int err;
+ params = libxl_sprintf(ctx, "%s:%s", type, name);
+ err = tap_ctl_create(params, &devname);
+ if (!err)
+ libxl_ptr_add(ctx, devname);
+ return err ? NULL : devname;
+}
+
int libxl_device_disk_add(struct libxl_ctx *ctx, uint32_t domid,
libxl_device_disk *disk)
{
flexarray_t *front;
@@ -1438,13 +1460,14 @@ int libxl_device_disk_add(struct libxl_c
case PHYSTYPE_FILE:
/* let's pretend is tap:aio for the moment */
disk->phystype = PHYSTYPE_AIO;
- case PHYSTYPE_AIO:
- case PHYSTYPE_QCOW:
- case PHYSTYPE_QCOW2:
- case PHYSTYPE_VHD:
- if (libxl_blktap_enabled(ctx)) {
- const char *dev = libxl_blktap_devpath(ctx,
- disk->physpath, disk->phystype);
+ case PHYSTYPE_AIO: case PHYSTYPE_QCOW: case PHYSTYPE_QCOW2: case
PHYSTYPE_VHD: {
+ const char *msg;
+ if (!tap_ctl_check(&msg)) {
+ const char *type =
device_disk_string_of_phystype(disk->phystype);
+ char *dev;
+ dev = get_blktap2_device(ctx, disk->physpath, type);
+ if (!dev)
+ dev = make_blktap2_device(ctx, disk->physpath, type);
if (!dev)
return ERROR_FAIL;
flexarray_set(back, boffset++, "tapdisk-params");
@@ -1465,7 +1488,7 @@ int libxl_device_disk_add(struct libxl_c
device.backend_kind = DEVICE_TAP;
break;
-
+ }
default:
XL_LOG(ctx, XL_LOG_ERROR, "unrecognized disk physical type: %d\n",
disk->phystype);
return ERROR_INVAL;
@@ -1529,7 +1552,7 @@ int libxl_device_disk_del(struct libxl_c
const char * libxl_device_disk_local_attach(struct libxl_ctx *ctx,
libxl_device_disk *disk)
{
- const char *dev = NULL;
+ char *dev = NULL;
int phystype = disk->phystype;
switch (phystype) {
case PHYSTYPE_PHY: {
@@ -1540,14 +1563,16 @@ const char * libxl_device_disk_local_att
case PHYSTYPE_FILE:
/* let's pretend is tap:aio for the moment */
phystype = PHYSTYPE_AIO;
- case PHYSTYPE_AIO:
- case PHYSTYPE_QCOW:
- case PHYSTYPE_QCOW2:
- case PHYSTYPE_VHD:
- if (libxl_blktap_enabled(ctx))
- dev = libxl_blktap_devpath(ctx, disk->physpath, phystype);
+ case PHYSTYPE_AIO: case PHYSTYPE_QCOW: case PHYSTYPE_QCOW2: case
PHYSTYPE_VHD: {
+ const char *msg;
+ if (!tap_ctl_check(&msg)) {
+ const char *type = device_disk_string_of_phystype(phystype);
+ dev = get_blktap2_device(ctx, disk->physpath, type);
+ if (!dev)
+ dev = make_blktap2_device(ctx, disk->physpath, type);
+ }
break;
-
+ }
default:
XL_LOG(ctx, XL_LOG_ERROR, "unrecognized disk physical type: %d\n",
phystype);
break;
diff -r 8b3bfc4f0bdd -r fa96fbfcac0c tools/libxl/libxl_bootloader.c
--- a/tools/libxl/libxl_bootloader.c Fri Jul 23 18:50:30 2010 +0100
+++ b/tools/libxl/libxl_bootloader.c Fri Jul 23 19:13:29 2010 +0100
@@ -15,16 +15,9 @@
#include "libxl_osdeps.h"
#include <string.h>
+#include <pty.h>
#include <unistd.h>
#include <fcntl.h>
-#include <termios.h>
-#if defined(__NetBSD__) || defined(__OpenBSD__)
-#include <util.h>
-#elif defined(__linux__)
-#include <pty.h>
-#elif defined(__sun__)
-#include <stropts.h>
-#endif
#include <sys/stat.h>
#include <sys/types.h>
diff -r 8b3bfc4f0bdd -r fa96fbfcac0c tools/libxl/libxl_device.c
--- a/tools/libxl/libxl_device.c Fri Jul 23 18:50:30 2010 +0100
+++ b/tools/libxl/libxl_device.c Fri Jul 23 19:13:29 2010 +0100
@@ -123,7 +123,7 @@ char *device_disk_backend_type_of_physty
}
}
-int device_physdisk_major_minor(const char *physpath, int *major, int *minor)
+int device_physdisk_major_minor(char *physpath, int *major, int *minor)
{
struct stat buf;
if (stat(physpath, &buf) < 0)
diff -r 8b3bfc4f0bdd -r fa96fbfcac0c tools/libxl/libxl_internal.h
--- a/tools/libxl/libxl_internal.h Fri Jul 23 18:50:30 2010 +0100
+++ b/tools/libxl/libxl_internal.h Fri Jul 23 19:13:29 2010 +0100
@@ -149,7 +149,7 @@ char *device_disk_backend_type_of_physty
char *device_disk_backend_type_of_phystype(libxl_disk_phystype phystype);
char *device_disk_string_of_phystype(libxl_disk_phystype phystype);
-int device_physdisk_major_minor(const char *physpath, int *major, int *minor);
+int device_physdisk_major_minor(char *physpath, int *major, int *minor);
int device_disk_dev_number(char *virtpath);
int libxl_device_generic_add(struct libxl_ctx *ctx, libxl_device *device,
diff -r 8b3bfc4f0bdd -r fa96fbfcac0c tools/libxl/libxl_linux.c
--- a/tools/libxl/libxl_linux.c Fri Jul 23 18:50:30 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2010 Advanced Micro Devices
- * Author Christoph Egger <Christoph.Egger@xxxxxxx>
- *
- * 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 "tap-ctl.h"
-
-int libxl_blktap_enabled(struct libxl_ctx *ctx)
-{
- const char *msg;
- return !tap_ctl_check(&msg);
-}
-
-const char *libxl_blktap_devpath(struct libxl_ctx *ctx,
- const char *disk,
- libxl_disk_phystype phystype)
-{
- const char *type, *devname;
- char *params;
- int minor, err;
-
- type = device_disk_string_of_type(phystype);
- minor = tap_ctl_find_minor(type, disk);
- if (minor >= 0) {
- devname = libxl_sprintf(ctx, "/dev/xen/blktap-2/tapdev%d", minor);
- if (devname)
- return devname;
- }
-
- params = libxl_sprintf(ctx, "%s:%s", type, disk);
- err = tap_ctl_create(params, &devname);
- if (!err) {
- libxl_ptr_add(ctx, devname);
- return devname;
- }
-
- return NULL;
-}
diff -r 8b3bfc4f0bdd -r fa96fbfcac0c tools/libxl/libxl_netbsd.c
--- a/tools/libxl/libxl_netbsd.c Fri Jul 23 18:50:30 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2010 Advanced Micro Devices
- * Author Christoph Egger <Christoph.Egger@xxxxxxx>
- *
- * 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"
-
-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;
-}
diff -r 8b3bfc4f0bdd -r fa96fbfcac0c tools/libxl/libxl_osdeps.h
--- a/tools/libxl/libxl_osdeps.h Fri Jul 23 18:50:30 2010 +0100
+++ b/tools/libxl/libxl_osdeps.h Fri Jul 23 19:13:29 2010 +0100
@@ -23,8 +23,6 @@
#define _GNU_SOURCE
-#include <libxl_internal.h>
-
#ifdef NEED_OWN_ASPRINTF
#include <stdarg.h>
@@ -32,23 +30,4 @@ int vasprintf(char **buffer, const char
int vasprintf(char **buffer, const char *fmt, va_list ap);
#endif /*NEED_OWN_ASPRINTF*/
-/*
- * blktap2 support
- */
-
-/* libxl_blktap_enabled:
- * return true if blktap/blktap2 support is available.
- */
-int libxl_blktap_enabled(struct libxl_ctx *ctx);
-
-/* libxl_blktap_devpath:
- * Argument: path and disk image as specified in config file.
- * The type specifies whether this is aio, qcow, qcow2, etc.
- * returns device path xenstore wants to have. returns NULL
- * if no device corresponds to the disk.
- */
-const char *libxl_blktap_devpath(struct libxl_ctx *ctx,
- const char *disk,
- libxl_disk_phystype phystype);
-
#endif
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home