diff options
| author | George Dunlap <george.dunlap@eu.citrix.com> | 2013-07-05 12:13:54 +0100 |
|---|---|---|
| committer | Ian Jackson <Ian.Jackson@eu.citrix.com> | 2013-07-17 12:18:25 +0100 |
| commit | 8f46b1cb99fe519ac39d10d0796c6be37fb1d178 (patch) | |
| tree | 99959e6024e7acfc17a9a52d8fd6e4c438b74a96 | |
| parent | 4816f9a7d47f985dfa796dc632771201b10858e8 (diff) | |
| download | xen-8f46b1cb99fe519ac39d10d0796c6be37fb1d178.tar.gz xen-8f46b1cb99fe519ac39d10d0796c6be37fb1d178.tar.bz2 xen-8f46b1cb99fe519ac39d10d0796c6be37fb1d178.zip | |
libxl: Allow network driver domains when run_hotplug_scritps is set
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 <george.dunlap@eu.citrix.com>
Acked-by: Roger Pau Monné <roger.pau@citrix.com>
CC: Ian Campbell <ian.campbell@citrix.com>
CC: Ian Jackson <ian.jackson@citrix.com>
CC: Jan Beulich <jbeulich@suse.com>
| -rw-r--r-- | docs/misc/xl-network-configuration.markdown | 6 | ||||
| -rw-r--r-- | 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) |