diff options
author | Ian Jackson <Ian.Jackson@eu.citrix.com> | 2012-08-06 12:24:46 +0100 |
---|---|---|
committer | Ian Jackson <Ian.Jackson@eu.citrix.com> | 2012-08-06 12:24:46 +0100 |
commit | 6390110d62f80d487730de9bdb1152f2764ffc16 (patch) | |
tree | aea202fded5b97b2884b543310e27b6f03bf761b /tools/libxl/libxl_device.c | |
parent | 1a3e84bd85c6804668fe32f83c0c2912956b9ff6 (diff) | |
download | xen-6390110d62f80d487730de9bdb1152f2764ffc16.tar.gz xen-6390110d62f80d487730de9bdb1152f2764ffc16.tar.bz2 xen-6390110d62f80d487730de9bdb1152f2764ffc16.zip |
Backed out changeset a8d708fcb347
25727:a8d708fcb347 was mangled during commit. Back it out so that we
can commit it properly.
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/libxl/libxl_device.c')
-rw-r--r-- | tools/libxl/libxl_device.c | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index 6d8e562e9e..df8ccf416f 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -147,26 +147,18 @@ typedef struct { } disk_try_backend_args; static int disk_try_backend(disk_try_backend_args *a, - libxl_disk_backend backend) - { - libxl__gc *gc = a->gc; + libxl_disk_backend backend) { /* returns 0 (ie, DISK_BACKEND_UNKNOWN) on failure, or * backend on success */ - libxl_ctx *ctx = libxl__gc_owner(gc); - + libxl_ctx *ctx = libxl__gc_owner(a->gc); switch (backend) { + case LIBXL_DISK_BACKEND_PHY: if (!(a->disk->format == LIBXL_DISK_FORMAT_RAW || a->disk->format == LIBXL_DISK_FORMAT_EMPTY)) { goto bad_format; } - if (a->disk->script) { - LOG(DEBUG, "Disk vdev=%s, uses script=... assuming phy backend", - a->disk->vdev); - return backend; - } - if (libxl__try_phy_backend(a->stab.st_mode)) return backend; @@ -176,8 +168,6 @@ static int disk_try_backend(disk_try_backend_args *a, return 0; case LIBXL_DISK_BACKEND_TAP: - if (a->disk->script) goto bad_script; - if (!libxl__blktap_enabled(a->gc)) { LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Disk vdev=%s, backend tap" " unsuitable because blktap not available", @@ -191,7 +181,6 @@ static int disk_try_backend(disk_try_backend_args *a, return backend; case LIBXL_DISK_BACKEND_QDISK: - if (a->disk->script) goto bad_script; return backend; default: @@ -209,11 +198,6 @@ static int disk_try_backend(disk_try_backend_args *a, libxl_disk_backend_to_string(backend), libxl_disk_format_to_string(a->disk->format)); return 0; - - bad_script: - LOG(DEBUG, "Disk vdev=%s, backend %s not compatible with script=...", - a->disk->vdev, libxl_disk_backend_to_string(backend)); - return 0; } int libxl__device_disk_set_backend(libxl__gc *gc, libxl_device_disk *disk) { @@ -236,7 +220,7 @@ int libxl__device_disk_set_backend(libxl__gc *gc, libxl_device_disk *disk) { return ERROR_INVAL; } memset(&a.stab, 0, sizeof(a.stab)); - } else if (!disk->script) { + } else { if (stat(disk->pdev_path, &a.stab)) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Disk vdev=%s " "failed to stat: %s", |