diff options
author | Roger Pau Monne <roger.pau@citrix.com> | 2012-09-14 10:02:49 +0100 |
---|---|---|
committer | Roger Pau Monne <roger.pau@citrix.com> | 2012-09-14 10:02:49 +0100 |
commit | 3c73d5f9473dfa897201dc03dc719bd1ccf8b77b (patch) | |
tree | f424d8d787b9c4fbe2d4ba5fdaa333ddccb8e671 | |
parent | 02fcb500405cb90d722d9c7e5d0b06f665812a37 (diff) | |
download | xen-3c73d5f9473dfa897201dc03dc719bd1ccf8b77b.tar.gz xen-3c73d5f9473dfa897201dc03dc719bd1ccf8b77b.tar.bz2 xen-3c73d5f9473dfa897201dc03dc719bd1ccf8b77b.zip |
xl: error if vif backend!=0 is used with run_hotplug_scripts
Print an error and exit if backend!=0 is used in conjunction with
run_hotplug_scripts. Currently libxl can only execute hotplug scripts
from the toolstack domain (the same domain xl is running from).
Added a description and workaround of this issue on
xl-network-configuration.
Signed-off-by: Roger Pau Monne <roger.pau@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
-rw-r--r-- | docs/misc/xl-network-configuration.markdown | 6 | ||||
-rw-r--r-- | tools/libxl/xl_cmdimpl.c | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/docs/misc/xl-network-configuration.markdown b/docs/misc/xl-network-configuration.markdown index 650926cb03..5e2f049477 100644 --- a/docs/misc/xl-network-configuration.markdown +++ b/docs/misc/xl-network-configuration.markdown @@ -122,8 +122,10 @@ 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. Specifying another domain requires setting up a -driver domain which is outside the scope of this document. +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. ### rate diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 2d6ab97298..5b59dd0847 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1096,6 +1096,13 @@ static void parse_config_data(const char *config_source, fprintf(stderr, "Specified backend domain does not exist, defaulting to Dom0\n"); nic->backend_domid = 0; } + if (nic->backend_domid != 0 && run_hotplug_scripts) { + fprintf(stderr, "ERROR: the vif 'backend=' option " + "cannot be used in conjunction with " + "run_hotplug_scripts, please set " + "run_hotplug_scripts to 0 in xl.conf\n"); + exit(EXIT_FAILURE); + } } else if (!strcmp(p, "rate")) { parse_vif_rate(&config, (p2 + 1), nic); } else if (!strcmp(p, "accel")) { |