diff options
author | Ian Jackson <Ian.Jackson@eu.citrix.com> | 2010-07-23 19:13:29 +0100 |
---|---|---|
committer | Ian Jackson <Ian.Jackson@eu.citrix.com> | 2010-07-23 19:13:29 +0100 |
commit | a438f9140ab532c229a14be5bc45e2702cc0b36b (patch) | |
tree | c4b53a4dcd1a8796365faa6fca80959775a19bf5 /tools/libxl/libxl_linux.c | |
parent | c8f6739e2e2491832238e784535d2f964734a162 (diff) | |
download | xen-a438f9140ab532c229a14be5bc45e2702cc0b36b.tar.gz xen-a438f9140ab532c229a14be5bc45e2702cc0b36b.tar.bz2 xen-a438f9140ab532c229a14be5bc45e2702cc0b36b.zip |
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.
Diffstat (limited to 'tools/libxl/libxl_linux.c')
-rw-r--r-- | tools/libxl/libxl_linux.c | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/tools/libxl/libxl_linux.c b/tools/libxl/libxl_linux.c deleted file mode 100644 index 369cabd396..0000000000 --- a/tools/libxl/libxl_linux.c +++ /dev/null @@ -1,50 +0,0 @@ -/* - * 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 "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; -} |