[Xen-changelog] [xen-unstable] xl: Clarify 'xend is running' error message

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User George Dunlap <george.dunlap@xxxxxxxxxxxxx>
# Date 1340987810 -3600
# Node ID 165eb54e57c0b14c211fda12fb53c80490aae32c
# Parent  08930e14bc97a6da52ac6115d5755f07ef684c9e
xl: Clarify 'xend is running' error message

* Give reason for check (unpredictable results)
* Give a better recommendation (shut down xend)
* Make it clear that -f is overriding a safety check.

Signed-off-by: George Dunlap <george.dunlap@xxxxxxxxxxxxx>
Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---


diff -r 08930e14bc97 -r 165eb54e57c0 tools/libxl/xl.c
--- a/tools/libxl/xl.c  Fri Jun 29 17:32:20 2012 +0100
+++ b/tools/libxl/xl.c  Fri Jun 29 17:36:50 2012 +0100
@@ -251,9 +251,9 @@ int main(int argc, char **argv)
             for (int i = 0; i < sizeof(locks)/sizeof(locks[0]); i++) {
                 if (!access(locks[i], F_OK) && !force_execution) {
                     fprintf(stderr,
-"xend is running, which prevents xl from working correctly.\n"
-"If you still want to force the execution of xl please use the -f\n"
-"option.\n"
+"xend is running, which may cause unpredictable results when using\n"
+"this xl command.  Please shut down xend before continuing.\n\n"
+"(This check can be overridden with the -f option.)\n"
                             );
                     ret = 1;
                     goto xit;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog