Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751593AbcJJKDv (ORCPT ); Mon, 10 Oct 2016 06:03:51 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:16439 "EHLO SMTP02.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751264AbcJJKDu (ORCPT ); Mon, 10 Oct 2016 06:03:50 -0400 X-IronPort-AV: E=Sophos;i="5.31,471,1473120000"; d="scan'208";a="391564563" From: Paul Durrant To: , CC: Paul Durrant , Boris Ostrovsky , David Vrabel , "Juergen Gross" Subject: [PATCH v2] xenbus: advertize control feature flags Date: Mon, 10 Oct 2016 10:43:45 +0100 Message-ID: <1476092625-14616-1-git-send-email-paul.durrant@citrix.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Content-Type: text/plain X-DLP: MIA1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2631 Lines: 97 The Xen docs specify several flags which a guest can set to advertize which values of the xenstore control/shutdown key it will recognize. This patch adds code to write all the relevant feature-flag keys. Signed-off-by: Paul Durrant Cc: Boris Ostrovsky Cc: David Vrabel Cc: Juergen Gross --- v2: - Fix flag logic inversion - Use kasprintf() --- drivers/xen/manage.c | 38 ++++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c index e12bd36..0671b98 100644 --- a/drivers/xen/manage.c +++ b/drivers/xen/manage.c @@ -170,6 +170,7 @@ out: struct shutdown_handler { const char *command; void (*cb)(void); + bool flag; }; static int poweroff_nb(struct notifier_block *cb, unsigned long code, void *unused) @@ -206,21 +207,22 @@ static void do_reboot(void) ctrl_alt_del(); } +static struct shutdown_handler shutdown_handlers[] = { + { "poweroff", do_poweroff, true }, + { "halt", do_poweroff, false }, + { "reboot", do_reboot, true }, +#ifdef CONFIG_HIBERNATE_CALLBACKS + { "suspend", do_suspend, true }, +#endif + {NULL, NULL, false }, +}; + static void shutdown_handler(struct xenbus_watch *watch, const char **vec, unsigned int len) { char *str; struct xenbus_transaction xbt; int err; - static struct shutdown_handler handlers[] = { - { "poweroff", do_poweroff }, - { "halt", do_poweroff }, - { "reboot", do_reboot }, -#ifdef CONFIG_HIBERNATE_CALLBACKS - { "suspend", do_suspend }, -#endif - {NULL, NULL}, - }; static struct shutdown_handler *handler; if (shutting_down != SHUTDOWN_INVALID) @@ -238,7 +240,7 @@ static void shutdown_handler(struct xenbus_watch *watch, return; } - for (handler = &handlers[0]; handler->command; handler++) { + for (handler = &shutdown_handlers[0]; handler->command; handler++) { if (strcmp(str, handler->command) == 0) break; } @@ -309,8 +311,24 @@ static struct notifier_block xen_reboot_nb = { static int setup_shutdown_watcher(void) { + static struct shutdown_handler *handler; int err; + for (handler = &shutdown_handlers[0]; handler->command; handler++) { + char *node; + + node = kasprintf(GFP_KERNEL, "feature-%s", + handler->command); + if (!node) { + pr_err("Failed to allocate feature flag\n"); + return -ENOMEM; + } + + xenbus_printf(XBT_NIL, "control", node, "%u", 1); + + kfree(node); + } + err = register_xenbus_watch(&shutdown_watch); if (err) { pr_err("Failed to set shutdown watcher\n"); -- 2.1.4