|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [Xen-devel] [xen-unstable test] 11601: tolerable FAIL
On Thu, 2012-01-26 at 06:16 +0000, xen.org wrote:
[...]
> Tests which did not succeed, but are not blocking:
> test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never
> pass
> test-amd64-amd64-xl-win 13 guest-stop fail never
> pass
> test-i386-i386-xl-win 13 guest-stop fail never
> pass
> test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never
> pass
> test-amd64-i386-xl-win7-amd64 13 guest-stop fail never
> pass
> test-i386-i386-xl-winxpsp3 13 guest-stop fail never
> pass
> test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never
> pass
> test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never
> pass
These are all:
2012-01-26 03:35:19 Z executing ssh ... root@xxxxxxxxxxxxx xl shutdown
-w win.guest.osstest
PV control interface not available: external graceful shutdown not
possible.
Use "xl button-press <dom> power" or "xl destroy <dom>".
shutdown failed (rc=-10)
If you are not amenable to having the harness fallback to xl
button-press/trigger power automatically how about something like the
following patch with the proviso that it is up to the harness to ensure
that a guest is configured appropriately such that ACPI power and reset
events map to shutdown and reboot respectively?
(patch applies on top of my updated"libxl: remove libxl_button_press in
favour of libxl_send_trigger" patch from earlier in the week)
Ian.
8<-------------------------------------------------------------------------------
# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1327569659 0
# Node ID c1aeef6cd4c832ddb97a7160be7ab6cb1037d3b8
# Parent a7776e38447d4e633a45b926295f7923c046fbc9
xl: allow enable automatic fallback to ACPI events if PV control not available.
Add a -F (fallbacks) option to xl destroy|reboot to cause an ACPI shutdown or
reset event to be sent to the guest in the event that the guest does not
support the PV control interface.
This is not the default because the response to these triggers is an
guest-internal configuration.
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
diff -r a7776e38447d -r c1aeef6cd4c8 docs/man/xl.pod.1
--- a/docs/man/xl.pod.1 Wed Jan 25 16:55:08 2012 +0000
+++ b/docs/man/xl.pod.1 Thu Jan 26 09:20:59 2012 +0000
@@ -365,13 +365,28 @@ domain actually reboots.
For HVM domains this requires PV drivers to be installed in your guest
OS. If PV drivers are not present but you have configured the guest OS
-to behave appropriately you may be able to use the I<button-press>
-subcommand to trigger a power button press.
+to behave appropriately you may be able to use the I<-F> option
+trigger a reset button press.
The behavior of what happens to a domain when it reboots is set by the
B<on_reboot> parameter of the domain configuration file when the
domain was created.
+B<OPTIONS>
+
+=over 4
+
+=item B<-F>
+
+If the guest does not support PV reboot control then fallback to
+sending an ACPI power event (equivalent to the I<reset> option to
+I<trigger>.
+
+You should ensure that the guest is configured to behave as expected
+in response to this event.
+
+=back
+
=item B<restore> [I<OPTIONS>] [I<ConfigFile>] I<CheckpointFile>
Build a domain from an B<xl save> state file. See B<save> for more info.
@@ -422,8 +437,8 @@ services must be shutdown in the domain.
For HVM domains this requires PV drivers to be installed in your guest
OS. If PV drivers are not present but you have configured the guest OS
-to behave appropriately you may be able to use the I<button-press>
-subcommand to trigger a power button press.
+to behave appropriately you may be able to use the I<-F> option
+trigger a power button press.
The command returns immediately after signally the domain unless that
B<-w> flag is used.
@@ -440,6 +455,15 @@ B<OPTIONS>
Wait for the domain to complete shutdown before returning.
+=item B<-F>
+
+If the guest does not support PV shutdown control then fallback to
+sending an ACPI power event (equivalent to the I<power> option to
+I<trigger>.
+
+You should ensure that the guest is configured to behave as expected
+in response to this event.
+
=back
=item B<sysrq> I<domain-id> I<letter>
diff -r a7776e38447d -r c1aeef6cd4c8 tools/libxl/xl_cmdimpl.c
--- a/tools/libxl/xl_cmdimpl.c Wed Jan 25 16:55:08 2012 +0000
+++ b/tools/libxl/xl_cmdimpl.c Thu Jan 26 09:20:59 2012 +0000
@@ -2259,19 +2259,24 @@ static void destroy_domain(const char *p
if (rc) { fprintf(stderr,"destroy failed (rc=%d)\n",rc); exit(-1); }
}
-static void shutdown_domain(const char *p, int wait)
+static void shutdown_domain(const char *p, int wait, int fallback_trigger)
{
int rc;
find_domain(p);
rc=libxl_domain_shutdown(ctx, domid);
- if (rc) {
- if (rc == ERROR_NOPARAVIRT) {
+ if (rc == ERROR_NOPARAVIRT) {
+ if (fallback_trigger) {
+ fprintf(stderr, "PV control interface not available:"
+ " sending ACPI power button event.\n");
+ rc = libxl_send_trigger(ctx, domid, LIBXL_TRIGGER_POWER, 0);
+ } else {
fprintf(stderr, "PV control interface not available:"
" external graceful shutdown not possible.\n");
- fprintf(stderr, "Use \"xl button-press <dom> power\" or"
- " \"xl destroy <dom>\".\n");
+ fprintf(stderr, "Use \"-F\" to fallback to ACPI power event.\n");
}
+ }
+ if (rc) {
fprintf(stderr,"shutdown failed (rc=%d)\n",rc);exit(-1);
}
@@ -2310,19 +2315,25 @@ static void shutdown_domain(const char *
}
}
-static void reboot_domain(const char *p)
+static void reboot_domain(const char *p, int fallback_trigger)
{
int rc;
find_domain(p);
rc=libxl_domain_reboot(ctx, domid);
- if (rc) {
- if (rc == ERROR_NOPARAVIRT) {
+ if (rc == ERROR_NOPARAVIRT) {
+ if (fallback_trigger) {
+ fprintf(stderr, "PV control interface not available:"
+ " sending ACPI reset button event.\n");
+ rc = libxl_send_trigger(ctx, domid, LIBXL_TRIGGER_RESET, 0);
+ } else {
fprintf(stderr, "PV control interface not available:"
" external graceful reboot not possible.\n");
- fprintf(stderr, "Use \"xl button-press <dom> power\" or"
- " \"xl destroy <dom>\".\n");
+ fprintf(stderr, "Use \"-F\" to fallback to ACPI reset event.\n");
}
- fprintf(stderr,"reboot failed (rc=%d)\n",rc);exit(-1); }
+ }
+ if (rc) {
+ fprintf(stderr,"reboot failed (rc=%d)\n",rc);exit(-1);
+ }
}
static void list_domains_details(const libxl_dominfo *info, int nb_domain)
@@ -3106,29 +3117,41 @@ int main_shutdown(int argc, char **argv)
{
int opt;
int wait = 0;
-
- while ((opt = def_getopt(argc, argv, "w", "shutdown", 1)) != -1) {
+ int fallback_trigger = 0;
+
+ while ((opt = def_getopt(argc, argv, "wF", "shutdown", 1)) != -1) {
switch (opt) {
case 0: case 2:
return opt;
case 'w':
wait = 1;
break;
+ case 'F':
+ fallback_trigger = 1;
+ break;
}
}
- shutdown_domain(argv[optind], wait);
+ shutdown_domain(argv[optind], wait, fallback_trigger);
return 0;
}
int main_reboot(int argc, char **argv)
{
int opt;
-
- if ((opt = def_getopt(argc, argv, "", "reboot", 1)) != -1)
- return opt;
-
- reboot_domain(argv[optind]);
+ int fallback_trigger = 0;
+
+ while ((opt = def_getopt(argc, argv, "F", "reboot", 1)) != -1) {
+ switch (opt) {
+ case 0: case 2:
+ return opt;
+ case 'F':
+ fallback_trigger = 1;
+ break;
+ }
+ }
+
+ reboot_domain(argv[optind], fallback_trigger);
return 0;
}
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |