aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@citrix.com>2011-08-30 16:57:05 +0100
committerIan Campbell <ian.campbell@citrix.com>2011-08-30 16:57:05 +0100
commita4141cdc781445314189874771929a6bd1dc89b0 (patch)
treec40eabe25bfb3806ce77df037ce2ab6cd4100bf9
parent02cc104d6590682b627dc7e216f23d26b6d158ae (diff)
downloadxen-a4141cdc781445314189874771929a6bd1dc89b0.tar.gz
xen-a4141cdc781445314189874771929a6bd1dc89b0.tar.bz2
xen-a4141cdc781445314189874771929a6bd1dc89b0.zip
xl: print sxp on dry-run of create.
The help text for xm create's --dry-run says "Dry run - prints the resulting configuration in SXP but does not create the domain." so update xl implementation to match. At least the xendomains initscript relies on this (for better or worse). Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Tested-by: Carsten Schiers <carsten@schiers.de> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com> xen-unstable changeset: 23467:2ae357405850 Backport-requested: Carsten Schiers <carsten@schiers.de> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
-rw-r--r--tools/libxl/xl_cmdimpl.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index 4eba7a61ec..2df96b82c4 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -1471,10 +1471,6 @@ static int create_domain(struct domain_create *dom_info)
parse_config_data(config_file, config_data, config_len, &d_config, &d_config.dm_info);
- ret = 0;
- if (dom_info->dryrun)
- goto out;
-
if (migrate_fd >= 0) {
if (d_config.c_info.name) {
/* when we receive a domain we get its name from the config
@@ -1493,9 +1489,13 @@ static int create_domain(struct domain_create *dom_info)
}
}
- if (debug)
+ if (debug || dom_info->dryrun)
printf_info(-1, &d_config, &d_config.dm_info);
+ ret = 0;
+ if (dom_info->dryrun)
+ goto out;
+
start:
domid = -1;