|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH 10 of 13 RFC] libxl: execute hotplug scripts directly from libxl
# HG changeset patch
# User Roger Pau Monne <roger.pau@xxxxxxxxxxxxx>
# Date 1317386335 -7200
# Node ID 70359826f535461fedbbd86c18c772117030bc91
# Parent b5d63cf90d4ef8d222ae282e279b90b7f73f18c3
libxl: execute hotplug scripts directly from libxl.
Added the necessary handlers to execute hotplug scripts when necessary
from libxl. Split NetBSD and Linux hotplug calls into two separate
files, because parameters for hotplug scripts are different. This
patch adds the necessary functions to call hotplug scripts, but the
implementation of those functions is left empty and will be filled in
future patches.
Signed-off-by: Roger Pau Monne <roger.pau@xxxxxxxxxxxxx>
diff -r b5d63cf90d4e -r 70359826f535 tools/libxl/libxl.c
--- a/tools/libxl/libxl.c Mon Jan 16 16:41:12 2012 +0100
+++ b/tools/libxl/libxl.c Fri Sep 30 14:38:55 2011 +0200
@@ -1060,6 +1060,11 @@ int libxl_device_disk_add(libxl_ctx *ctx
flexarray_append(back, "params");
flexarray_append(back, dev);
+ flexarray_append(back, "script");
+ flexarray_append(back, libxl__sprintf(gc, "%s/%s",
+ libxl_xen_script_dir_path(),
+ "block"));
+
assert(device.backend_kind == LIBXL__DEVICE_KIND_VBD);
break;
case LIBXL_DISK_BACKEND_TAP:
@@ -1072,6 +1077,10 @@ int libxl_device_disk_add(libxl_ctx *ctx
flexarray_append(back, libxl__sprintf(gc, "%s:%s",
libxl__device_disk_string_of_format(disk->format),
disk->pdev_path));
+ flexarray_append(back, "script");
+ flexarray_append(back, libxl__sprintf(gc, "%s/%s",
+ libxl_xen_script_dir_path(),
+ "blktap"));
/* now create a phy device to export the device to the guest */
goto do_backend_phy;
@@ -1140,6 +1149,16 @@ int libxl_device_disk_add(libxl_ctx *ctx
}
}
}
+
+ /* Call hotplug scripts to attach device */
+ if (libxl__device_hotplug(gc, &device, CONNECT) < 0) {
+ LIBXL__LOG(ctx, LIBXL__LOG_ERROR,
+ "unable to execute hotplug script for disk: %s",
+ disk->pdev_path);
+ rc = -1;
+ goto out_free;
+ }
+
rc = 0;
out_free:
@@ -1608,6 +1627,16 @@ int libxl_device_nic_add(libxl_ctx *ctx,
goto out_free;
}
}
+
+ /* Call hotplug scripts to attach device */
+ if (libxl__device_hotplug(gc, &device, CONNECT) < 0) {
+ LIBXL__LOG(ctx, LIBXL__LOG_ERROR,
+ "unable to execute hotplug script for nic: %s\n",
+ nic->ifname);
+ rc = -1;
+ goto out_free;
+ }
+
rc = 0;
out_free:
diff -r b5d63cf90d4e -r 70359826f535 tools/libxl/libxl_device.c
--- a/tools/libxl/libxl_device.c Mon Jan 16 16:41:12 2012 +0100
+++ b/tools/libxl/libxl_device.c Fri Sep 30 14:38:55 2011 +0200
@@ -456,10 +456,16 @@ static int destroy_device(libxl__gc *gc,
goto out;
}
+ rc = libxl__device_hotplug(gc, &dev, DISCONNECT);
+ if (rc < 0) {
+ LIBXL__LOG(ctx, LIBXL__LOG_ERROR,
+ "failed to execute hotplug script for "
+ "device with backend path %s", l1[0]);
+ goto out;
+ }
+
libxl__device_cleanup(gc, &dev);
- LIBXL__LOG(ctx, LIBXL__LOG_DEBUG,
- "Destroyed device backend at %s",
- l1[XS_WATCH_TOKEN]);
+
rc = 0;
out:
return rc;
@@ -488,6 +494,12 @@ retry_transaction:
}
if (atoi(state) != 4) {
xs_transaction_end(ctx->xsh, t, 0);
+ rc = libxl__device_hotplug(gc, dev, DISCONNECT);
+ if (rc < 0) {
+ LIBXL__LOG(ctx, LIBXL__LOG_ERROR,
+ "failed to execute hotplug script for "
+ "device with backend path %s", be_path);
+ }
libxl__device_destroy_tapdisk(gc, be_path);
libxl__device_cleanup(gc, dev);
goto out;
@@ -533,13 +545,16 @@ int libxl__device_destroy(libxl__gc *gc,
libxl_ctx *ctx = libxl__gc_owner(gc);
char *be_path = libxl__device_backend_path(gc, dev);
char *fe_path = libxl__device_frontend_path(gc, dev);
+ int rc;
+ xs_rm(ctx->xsh, XBT_NULL, fe_path);
+ /* Wait for backend status to disconnect */
+ rc = libxl__device_remove(gc, dev);
libxl__device_cleanup(gc, dev);
- xs_rm(ctx->xsh, XBT_NULL, fe_path);
libxl__device_destroy_tapdisk(gc, be_path);
- return 0;
+ return rc;
}
int libxl__devices_destroy(libxl__gc *gc, uint32_t domid)
diff -r b5d63cf90d4e -r 70359826f535 tools/libxl/libxl_internal.h
--- a/tools/libxl/libxl_internal.h Mon Jan 16 16:41:12 2012 +0100
+++ b/tools/libxl/libxl_internal.h Fri Sep 30 14:38:55 2011 +0200
@@ -319,6 +319,25 @@ _hidden int libxl__device_cleanup(libxl_
*/
_hidden int libxl__try_phy_backend(mode_t st_mode);
+/* hotplug functions */
+
+/* Action to pass to hotplug caller functions */
+typedef enum {
+ CONNECT = 1,
+ DISCONNECT = 2
+} libxl__hotplug_action;
+
+/*
+ * libxl__device_hotplug - generic function to execute hotplug scripts
+ * gc: allocation pool
+ * dev: reference to the device that executes the hotplug scripts
+ * action: action to execute
+ *
+ * Returns 0 on success, and < 0 on error.
+ */
+_hidden int libxl__device_hotplug(libxl__gc *gc, libxl__device *dev,
+ libxl__hotplug_action action);
+
/* from libxl_pci */
_hidden int libxl__device_pci_add(libxl__gc *gc, uint32_t domid,
libxl_device_pci *pcidev, int starting);
diff -r b5d63cf90d4e -r 70359826f535 tools/libxl/libxl_linux.c
--- a/tools/libxl/libxl_linux.c Mon Jan 16 16:41:12 2012 +0100
+++ b/tools/libxl/libxl_linux.c Fri Sep 30 14:38:55 2011 +0200
@@ -25,3 +25,11 @@ int libxl__try_phy_backend(mode_t st_mod
return 1;
}
+
+/* Hotplug scripts caller functions */
+
+int libxl__device_hotplug(libxl__gc *gc, libxl__device *dev,
+ libxl__hotplug_action action)
+{
+ return 0;
+}
diff -r b5d63cf90d4e -r 70359826f535 tools/libxl/libxl_netbsd.c
--- a/tools/libxl/libxl_netbsd.c Mon Jan 16 16:41:12 2012 +0100
+++ b/tools/libxl/libxl_netbsd.c Fri Sep 30 14:38:55 2011 +0200
@@ -14,6 +14,7 @@
*/
#include <sys/stat.h>
+#include <sys/wait.h>
#include "libxl_internal.h"
@@ -24,3 +25,11 @@ int libxl__try_phy_backend(mode_t st_mod
return 0;
}
+
+/* Hotplug scripts call function */
+
+int libxl__device_hotplug(libxl__gc *gc, libxl__device *dev,
+ libxl__hotplug_action action)
+{
+ return 0;
+}
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |