|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen-unstable] xl: allow enable automatic fallback to ACPI events if PV control not available.
# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1328027679 0
# Node ID a91aa7a582fb0e13b0782f7d17c249d4b89dddc7
# Parent 1d063727559851f6950583c33d201f786327657f
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>
Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Committed-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
---
diff -r 1d0637275598 -r a91aa7a582fb docs/man/xl.pod.1
--- a/docs/man/xl.pod.1 Tue Jan 31 16:34:39 2012 +0000
+++ b/docs/man/xl.pod.1 Tue Jan 31 16:34:39 2012 +0000
@@ -365,13 +365,28 @@
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.
@@ -435,8 +450,8 @@
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.
@@ -453,6 +468,15 @@
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 1d0637275598 -r a91aa7a582fb tools/libxl/xl_cmdimpl.c
--- a/tools/libxl/xl_cmdimpl.c Tue Jan 31 16:34:39 2012 +0000
+++ b/tools/libxl/xl_cmdimpl.c Tue Jan 31 16:34:39 2012 +0000
@@ -2427,20 +2427,25 @@
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;
libxl_event *event;
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);
}
@@ -2481,19 +2486,25 @@
}
}
-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)
@@ -3277,29 +3288,41 @@
{
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-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |