|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen-unstable] libxl: add option to choose who executes hotplug scripts
# HG changeset patch
# User Roger Pau Monne <roger.pau@xxxxxxxxxx>
# Date 1343317652 -3600
# Node ID 2e21281b2c10074256f4f964f28ec851baff4244
# Parent 69a0fa5473d379845a486feb538f3fea2b450c53
libxl: add option to choose who executes hotplug scripts
Add and option to xl.conf file to decide if hotplug scripts are
executed from the toolstack (xl) or from udev as it used to be in the
past.
This option is only introduced in this patch, but it has no effect
since the code to call hotplug scripts from libxl is introduced in a
latter patch.
This choice will be saved in "libxl/disable_udev", as specified in the
DISABLE_UDEV_PATH constant.
Signed-off-by: Roger Pau Monne <roger.pau@xxxxxxxxxx>
Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Committed-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
diff -r 69a0fa5473d3 -r 2e21281b2c10 docs/man/xl.conf.pod.5
--- a/docs/man/xl.conf.pod.5 Thu Jul 26 16:47:31 2012 +0100
+++ b/docs/man/xl.conf.pod.5 Thu Jul 26 16:47:32 2012 +0100
@@ -55,6 +55,14 @@ default.
Default: C<1>
+=item B<run_hotplug_scripts=BOOLEAN>
+
+If disabled hotplug scripts will be called from udev, as it used to
+be in the previous releases. With the default option, hotplug scripts
+will be launched by xl directly.
+
+Default: C<1>
+
=item B<lockfile="PATH">
Sets the path to the lock file used by xl to serialise certain
diff -r 69a0fa5473d3 -r 2e21281b2c10 tools/examples/xl.conf
--- a/tools/examples/xl.conf Thu Jul 26 16:47:31 2012 +0100
+++ b/tools/examples/xl.conf Thu Jul 26 16:47:32 2012 +0100
@@ -15,3 +15,8 @@
# first block device to be used for temporary VM disk mounts
#blkdev_start="xvda"
+
+# default option to run hotplug scripts from xl
+# if disabled the old behaviour will be used, and hotplug scripts will be
+# launched by udev.
+#run_hotplug_scripts=1
diff -r 69a0fa5473d3 -r 2e21281b2c10 tools/libxl/libxl_create.c
--- a/tools/libxl/libxl_create.c Thu Jul 26 16:47:31 2012 +0100
+++ b/tools/libxl/libxl_create.c Thu Jul 26 16:47:32 2012 +0100
@@ -70,6 +70,8 @@ int libxl__domain_create_info_setdefault
libxl_defbool_setdefault(&c_info->oos, true);
}
+ libxl_defbool_setdefault(&c_info->run_hotplug_scripts, true);
+
return 0;
}
@@ -384,7 +386,7 @@ int libxl__domain_make(libxl__gc *gc, li
uint32_t *domid)
{
libxl_ctx *ctx = libxl__gc_owner(gc);
- int flags, ret, rc;
+ int flags, ret, rc, nb_vm;
char *uuid_string;
char *dom_path, *vm_path, *libxl_path;
struct xs_permissions roperm[2];
@@ -392,6 +394,7 @@ int libxl__domain_make(libxl__gc *gc, li
struct xs_permissions noperm[1];
xs_transaction_t t = 0;
xen_domain_handle_t handle;
+ libxl_vminfo *vm_list;
assert(!libxl_domid_valid_guest(*domid));
@@ -505,6 +508,41 @@ retry_transaction:
libxl__sprintf(gc, "%s/hvmloader/generation-id-address", dom_path),
rwperm, ARRAY_SIZE(rwperm));
+ vm_list = libxl_list_vm(ctx, &nb_vm);
+ if (!vm_list) {
+ LOG(ERROR, "cannot get number of running guests");
+ rc = ERROR_FAIL;
+ goto out;
+ }
+ libxl_vminfo_list_free(vm_list, nb_vm);
+ int hotplug_setting = libxl__hotplug_settings(gc, t);
+ if (hotplug_setting < 0) {
+ LOG(ERROR, "unable to get current hotplug scripts execution setting");
+ rc = ERROR_FAIL;
+ goto out;
+ }
+ if (libxl_defbool_val(info->run_hotplug_scripts) != hotplug_setting &&
+ (nb_vm - 1)) {
+ LOG(ERROR, "cannot change hotplug execution option once set, "
+ "please shutdown all guests before changing it");
+ rc = ERROR_FAIL;
+ goto out;
+ }
+
+ if (libxl_defbool_val(info->run_hotplug_scripts)) {
+ rc = libxl__xs_write_checked(gc, t, DISABLE_UDEV_PATH, "1");
+ if (rc) {
+ LOGE(ERROR, "unable to write %s = 1", DISABLE_UDEV_PATH);
+ goto out;
+ }
+ } else {
+ rc = libxl__xs_rm_checked(gc, t, DISABLE_UDEV_PATH);
+ if (rc) {
+ LOGE(ERROR, "unable to delete %s", DISABLE_UDEV_PATH);
+ goto out;
+ }
+ }
+
xs_write(ctx->xsh, t, libxl__sprintf(gc, "%s/uuid", vm_path), uuid_string,
strlen(uuid_string));
xs_write(ctx->xsh, t, libxl__sprintf(gc, "%s/name", vm_path), info->name,
strlen(info->name));
diff -r 69a0fa5473d3 -r 2e21281b2c10 tools/libxl/libxl_dm.c
--- a/tools/libxl/libxl_dm.c Thu Jul 26 16:47:31 2012 +0100
+++ b/tools/libxl/libxl_dm.c Thu Jul 26 16:47:32 2012 +0100
@@ -785,6 +785,9 @@ void libxl__spawn_stub_dm(libxl__egc *eg
libxl__dm_vifs_from_hvm_guest_config(gc, guest_config, dm_config);
+ dm_config->c_info.run_hotplug_scripts =
+ guest_config->c_info.run_hotplug_scripts;
+
ret = libxl__domain_create_info_setdefault(gc, &dm_config->c_info);
if (ret) goto out;
ret = libxl__domain_build_info_setdefault(gc, &dm_config->b_info);
diff -r 69a0fa5473d3 -r 2e21281b2c10 tools/libxl/libxl_internal.c
--- a/tools/libxl/libxl_internal.c Thu Jul 26 16:47:31 2012 +0100
+++ b/tools/libxl/libxl_internal.c Thu Jul 26 16:47:32 2012 +0100
@@ -352,6 +352,25 @@ int libxl__device_model_version_running(
return value;
}
+int libxl__hotplug_settings(libxl__gc *gc, xs_transaction_t t)
+{
+ int rc = 0;
+ char *val;
+
+ val = libxl__xs_read(gc, t, DISABLE_UDEV_PATH);
+ if (!val && errno != ENOENT) {
+ LOGE(ERROR, "cannot read %s from xenstore", DISABLE_UDEV_PATH);
+ rc = ERROR_FAIL;
+ goto out;
+ }
+ if (!val) val = "0";
+
+ rc = !!atoi(val);
+
+out:
+ return rc;
+}
+
/*
* Local variables:
* mode: C
diff -r 69a0fa5473d3 -r 2e21281b2c10 tools/libxl/libxl_internal.h
--- a/tools/libxl/libxl_internal.h Thu Jul 26 16:47:31 2012 +0100
+++ b/tools/libxl/libxl_internal.h Thu Jul 26 16:47:32 2012 +0100
@@ -91,6 +91,7 @@
#define STUBDOM_CONSOLE_SERIAL 3
#define STUBDOM_SPECIAL_CONSOLES 3
#define TAP_DEVICE_SUFFIX "-emu"
+#define DISABLE_UDEV_PATH "libxl/disable_udev"
#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
@@ -1510,6 +1511,8 @@ _hidden libxl__json_object *libxl__json_
* default is qemu xen traditional */
_hidden int libxl__device_model_version_running(libxl__gc *gc, uint32_t domid);
+/* Check how executes hotplug script currently */
+int libxl__hotplug_settings(libxl__gc *gc, xs_transaction_t t);
/*
* Calling context and GC for event-generating functions:
diff -r 69a0fa5473d3 -r 2e21281b2c10 tools/libxl/libxl_types.idl
--- a/tools/libxl/libxl_types.idl Thu Jul 26 16:47:31 2012 +0100
+++ b/tools/libxl/libxl_types.idl Thu Jul 26 16:47:32 2012 +0100
@@ -231,6 +231,7 @@ libxl_domain_create_info = Struct("domai
("xsdata", libxl_key_value_list),
("platformdata", libxl_key_value_list),
("poolid", uint32),
+ ("run_hotplug_scripts",libxl_defbool),
], dir=DIR_IN)
MemKB = UInt(64, init_val = "LIBXL_MEMKB_DEFAULT")
diff -r 69a0fa5473d3 -r 2e21281b2c10 tools/libxl/xl.c
--- a/tools/libxl/xl.c Thu Jul 26 16:47:31 2012 +0100
+++ b/tools/libxl/xl.c Thu Jul 26 16:47:32 2012 +0100
@@ -39,6 +39,7 @@ int dryrun_only;
int force_execution;
int autoballoon = 1;
char *blkdev_start;
+int run_hotplug_scripts = 1;
char *lockfile;
char *default_vifscript = NULL;
char *default_bridge = NULL;
@@ -70,6 +71,9 @@ static void parse_global_config(const ch
if (!xlu_cfg_get_long (config, "autoballoon", &l, 0))
autoballoon = l;
+ if (!xlu_cfg_get_long (config, "run_hotplug_scripts", &l, 0))
+ run_hotplug_scripts = l;
+
if (!xlu_cfg_get_string (config, "lockfile", &buf, 0))
lockfile = strdup(buf);
else {
diff -r 69a0fa5473d3 -r 2e21281b2c10 tools/libxl/xl.h
--- a/tools/libxl/xl.h Thu Jul 26 16:47:31 2012 +0100
+++ b/tools/libxl/xl.h Thu Jul 26 16:47:32 2012 +0100
@@ -140,6 +140,7 @@ int xl_child_pid(xlchildnum); /* returns
/* global options */
extern int autoballoon;
+extern int run_hotplug_scripts;
extern int dryrun_only;
extern char *lockfile;
extern char *default_vifscript;
diff -r 69a0fa5473d3 -r 2e21281b2c10 tools/libxl/xl_cmdimpl.c
--- a/tools/libxl/xl_cmdimpl.c Thu Jul 26 16:47:31 2012 +0100
+++ b/tools/libxl/xl_cmdimpl.c Thu Jul 26 16:47:32 2012 +0100
@@ -595,6 +595,7 @@ static void parse_config_data(const char
}
}
+ libxl_defbool_set(&c_info->run_hotplug_scripts, run_hotplug_scripts);
c_info->type = LIBXL_DOMAIN_TYPE_PV;
if (!xlu_cfg_get_string (config, "builder", &buf, 0) &&
!strncmp(buf, "hvm", strlen(buf)))
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |