diff options
| author | Roger Pau Monne <roger.pau@citrix.com> | 2013-03-05 17:06:29 +0000 |
|---|---|---|
| committer | Ian Jackson <Ian.Jackson@eu.citrix.com> | 2013-03-13 14:40:23 +0000 |
| commit | ec398660e89ca18bb8d061d5047d682bd383778a (patch) | |
| tree | bb956756b2e740f5da0118754c5de14c57b89135 /tools | |
| parent | b1c231b12aae6de7521bed69b41dcb07c8349cc7 (diff) | |
| download | xen-ec398660e89ca18bb8d061d5047d682bd383778a.tar.gz xen-ec398660e89ca18bb8d061d5047d682bd383778a.tar.bz2 xen-ec398660e89ca18bb8d061d5047d682bd383778a.zip | |
libxl: don't launch more than one tapdisk process for each disk
When adding a disk don't launch multiple tapdisk instances for the
same disk, if transaction fails in device_disk_add reuse the same
tapdisk for further tries instead of creating a new instance each
time a transaction fails.
Reported-by: Darren Shepherd <darren.s.shepherd@gmail.com>
Signed-off-by: Roger Pau Monne <roger.pau@citrix.com>
Tested-by: Darren Shepherd <darren.s.shepherd@gmail.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/libxl/libxl.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 73e0dc312d..345d88b83f 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -2032,7 +2032,7 @@ static void device_disk_add(libxl__egc *egc, uint32_t domid, STATE_AO_GC(aodev->ao); flexarray_t *front = NULL; flexarray_t *back = NULL; - char *dev, *script; + char *dev = NULL, *script; libxl__device *device; int rc; libxl_ctx *ctx = gc->owner; @@ -2095,12 +2095,15 @@ static void device_disk_add(libxl__egc *egc, uint32_t domid, break; case LIBXL_DISK_BACKEND_TAP: - dev = libxl__blktap_devpath(gc, disk->pdev_path, disk->format); - if (!dev) { - LOG(ERROR, "failed to get blktap devpath for %p\n", - disk->pdev_path); - rc = ERROR_FAIL; - goto out; + if (dev == NULL) { + dev = libxl__blktap_devpath(gc, disk->pdev_path, + disk->format); + if (!dev) { + LOG(ERROR, "failed to get blktap devpath for %p\n", + disk->pdev_path); + rc = ERROR_FAIL; + goto out; + } } flexarray_append(back, "tapdisk-params"); flexarray_append(back, libxl__sprintf(gc, "%s:%s", |