From 8f46b1cb99fe519ac39d10d0796c6be37fb1d178 Mon Sep 17 00:00:00 2001 From: George Dunlap Date: Fri, 5 Jul 2013 12:13:54 +0100 Subject: libxl: Allow network driver domains when run_hotplug_scritps is set MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As of commit 05bfd984dfe7014f1f5ea1133608b9bab589c120, hotplug scripts are not run if backend_domid != LIBXL_TOOSTACK_DOMID; so there is no reason to restrict this for network driver domains any more. This is a candidate for backporting to 4.3. Signed-off-by: George Dunlap Acked-by: Roger Pau Monné CC: Ian Campbell CC: Ian Jackson CC: Jan Beulich --- docs/misc/xl-network-configuration.markdown | 6 ++---- tools/libxl/libxl.c | 7 ------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/docs/misc/xl-network-configuration.markdown b/docs/misc/xl-network-configuration.markdown index e0d3d2ada8..3c439d4162 100644 --- a/docs/misc/xl-network-configuration.markdown +++ b/docs/misc/xl-network-configuration.markdown @@ -131,10 +131,8 @@ specified IP address to be used by the guest (blocking all others). ### backend Specifies the backend domain which this device should attach to. This -defaults to domain 0. This option does not work if `run_hotplug_scripts` -is not disabled in xl.conf (see xl.conf(5) man page for more information -on this option). Specifying another domain requires setting up a driver -domain which is outside the scope of this document. +defaults to domain 0. Specifying another domain requires setting up a +driver domain which is outside the scope of this document. ### rate diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index bd63a305d7..81785dff4f 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -2820,13 +2820,6 @@ int libxl__device_nic_setdefault(libxl__gc *gc, libxl_device_nic *nic, rc = libxl__resolve_domid(gc, nic->backend_domname, &nic->backend_domid); if (rc < 0) return rc; - if (nic->backend_domid != LIBXL_TOOLSTACK_DOMID && run_hotplug_scripts) { - LOG(ERROR, "cannot use a backend domain different than %d if" - "hotplug scripts are executed from libxl", - LIBXL_TOOLSTACK_DOMID); - return ERROR_FAIL; - } - switch (libxl__domain_type(gc, domid)) { case LIBXL_DOMAIN_TYPE_HVM: if (!nic->nictype) -- cgit v1.2.3