mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 10:40:03 +01:00
Ian Campbell
4f6dda6a14
We pass be_path to tapdisk_destroy but we've already deleted it so it fails to read tapdisk-params. However it appears that we need to destroy the tap device after tearing down xenstore, to avoid the leak reported by Greg Wettstein in <201207312141.q6VLfJje012656@wind.enjellic.com>. So read the tapdisk-params in the cleanup transaction, before the remove, and pass that down to destroy_tapdisk instead. tapdisk-params may of course be NULL if the device isn't a tap device. There is no need to tear down the tap device from libxl__initiate_device_remove since this ultimately calls libxl__device_destroy. Propagate and log errors from libxl__device_destroy_tapdisk. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
94 lines
2.3 KiB
C
94 lines
2.3 KiB
C
/*
|
|
* 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_osdeps.h" /* must come before any other headers */
|
|
#include "libxl_internal.h"
|
|
|
|
#include "tap-ctl.h"
|
|
|
|
int libxl__blktap_enabled(libxl__gc *gc)
|
|
{
|
|
const char *msg;
|
|
return !tap_ctl_check(&msg);
|
|
}
|
|
|
|
char *libxl__blktap_devpath(libxl__gc *gc,
|
|
const char *disk,
|
|
libxl_disk_format format)
|
|
{
|
|
const char *type;
|
|
char *params, *devname = NULL;
|
|
tap_list_t tap;
|
|
int err;
|
|
|
|
type = libxl__device_disk_string_of_format(format);
|
|
err = tap_ctl_find(type, disk, &tap);
|
|
if (err == 0) {
|
|
devname = libxl__sprintf(gc, "/dev/xen/blktap-2/tapdev%d", tap.minor);
|
|
if (devname)
|
|
return devname;
|
|
}
|
|
|
|
params = libxl__sprintf(gc, "%s:%s", type, disk);
|
|
err = tap_ctl_create(params, &devname);
|
|
if (!err) {
|
|
libxl__ptr_add(gc, devname);
|
|
return devname;
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
|
|
int libxl__device_destroy_tapdisk(libxl__gc *gc, const char *params)
|
|
{
|
|
char *type, *disk;
|
|
int err;
|
|
tap_list_t tap;
|
|
|
|
type = libxl__strdup(gc, params);
|
|
|
|
disk = strchr(type, ':');
|
|
if (!disk) {
|
|
LOG(ERROR, "Unable to parse params %s", params);
|
|
return ERROR_INVAL;
|
|
}
|
|
|
|
*disk++ = '\0';
|
|
|
|
err = tap_ctl_find(type, disk, &tap);
|
|
if (err < 0) {
|
|
/* returns -errno */
|
|
LOGEV(ERROR, -err, "Unable to find type %s disk %s", type, disk);
|
|
return ERROR_FAIL;
|
|
}
|
|
|
|
err = tap_ctl_destroy(tap.id, tap.minor);
|
|
if (err < 0) {
|
|
LOGEV(ERROR, -err, "Failed to destroy tap device id %d minor %d",
|
|
tap.id, tap.minor);
|
|
return ERROR_FAIL;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* Local variables:
|
|
* mode: C
|
|
* c-basic-offset: 4
|
|
* indent-tabs-mode: nil
|
|
* End:
|
|
*/
|