From 678b0c42ebc26cb7d23bd580a93eb2a2c490533b Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 5 Apr 2011 17:23:51 +0100 Subject: [PATCH] libxl: return raw disk and partition number from libxl__device_disk_dev_number Optional parameters, caller to follow. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- tools/libxl/libxl.c | 9 +++++---- tools/libxl/libxl_device.c | 8 +++++++- tools/libxl/libxl_internal.h | 3 ++- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 41a0af9a6e..38616f7a34 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -602,7 +602,8 @@ int libxl_wait_for_disk_ejects(libxl_ctx *ctx, uint32_t guest_domid, libxl_devic for (i = 0; i < num_disks; i++) { if (asprintf(&(waiter[i].path), "%s/device/vbd/%d/eject", libxl__xs_get_dompath(&gc, domid), - libxl__device_disk_dev_number(disks[i].vdev)) < 0) + libxl__device_disk_dev_number(disks[i].vdev, + NULL, NULL)) < 0) goto out; if (asprintf(&(waiter[i].token), "%d", LIBXL_EVENT_DISK_EJECT) < 0) goto out; @@ -956,7 +957,7 @@ int libxl_device_disk_add(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *dis } backend_type = libxl__device_disk_string_of_backend(disk->backend); - devid = libxl__device_disk_dev_number(disk->vdev); + devid = libxl__device_disk_dev_number(disk->vdev, NULL, NULL); if (devid==-1) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Invalid or unsupported" " virtual disk identifier %s", disk->vdev); @@ -1072,7 +1073,7 @@ int libxl_device_disk_del(libxl_ctx *ctx, libxl__device device; int devid, rc; - devid = libxl__device_disk_dev_number(disk->vdev); + devid = libxl__device_disk_dev_number(disk->vdev, NULL, NULL); device.backend_domid = disk->backend_domid; device.backend_devid = devid; device.backend_kind = @@ -1807,7 +1808,7 @@ int libxl_device_disk_getinfo(libxl_ctx *ctx, uint32_t domid, char *val; dompath = libxl__xs_get_dompath(&gc, domid); - diskinfo->devid = libxl__device_disk_dev_number(disk->vdev); + diskinfo->devid = libxl__device_disk_dev_number(disk->vdev, NULL, NULL); /* tap devices entries in xenstore are written as vbd devices. */ diskpath = libxl__sprintf(&gc, "%s/device/vbd/%d", dompath, diskinfo->devid); diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index d7b2a09579..4d460967b1 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -200,7 +200,7 @@ static int device_virtdisk_matches(const char *virtpath, const char *devtype, return 1; } -int libxl__device_disk_dev_number(char *virtpath) +int libxl__device_disk_dev_number(char *virtpath, int *pdisk, int *ppartition) { int disk, partition; char *ep; @@ -214,6 +214,8 @@ int libxl__device_disk_dev_number(char *virtpath) device_virtdisk_matches(virtpath, "xvd", &disk, (1<<20)-1, &partition, 255)) { + if (pdisk) *pdisk = disk; + if (ppartition) *ppartition = partition; if (disk <= 15 && partition <= 15) return (202 << 8) | (disk << 4) | partition; else @@ -228,11 +230,15 @@ int libxl__device_disk_dev_number(char *virtpath) if (device_virtdisk_matches(virtpath, "hd", &disk, 3, &partition, 63)) { + if (pdisk) *pdisk = disk; + if (ppartition) *ppartition = partition; return ((disk<2 ? 3 : 22) << 8) | ((disk & 1) << 6) | partition; } if (device_virtdisk_matches(virtpath, "sd", &disk, 15, &partition, 15)) { + if (pdisk) *pdisk = disk; + if (ppartition) *ppartition = partition; return (8 << 8) | (disk << 4) | partition; } return -1; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 3f8aee8119..d0ddf081bc 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -186,7 +186,8 @@ _hidden char *libxl__device_disk_string_of_backend(libxl_disk_backend backend); _hidden char *libxl__device_disk_string_of_format(libxl_disk_format format); _hidden int libxl__device_physdisk_major_minor(const char *physpath, int *major, int *minor); -_hidden int libxl__device_disk_dev_number(char *virtpath); +_hidden int libxl__device_disk_dev_number(char *virtpath, + int *pdisk, int *ppartition); _hidden int libxl__device_generic_add(libxl__gc *gc, libxl__device *device, char **bents, char **fents); -- 2.39.5