From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51844) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TB4rI-0005wG-MU for qemu-devel@nongnu.org; Mon, 10 Sep 2012 10:21:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TB4rH-0002Ky-He for qemu-devel@nongnu.org; Mon, 10 Sep 2012 10:21:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64472) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TB4rH-0002Kn-8o for qemu-devel@nongnu.org; Mon, 10 Sep 2012 10:21:03 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q8AEL2a6014066 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 10 Sep 2012 10:21:02 -0400 From: Gerd Hoffmann Date: Mon, 10 Sep 2012 16:21:00 +0200 Message-Id: <1347286860-22918-5-git-send-email-kraxel@redhat.com> In-Reply-To: <1347286860-22918-1-git-send-email-kraxel@redhat.com> References: <1347286860-22918-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 4/4] fbdev: add monitor command to enable/disable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann This patch adds a fbdev monitor command to enable/disable the fbdev display at runtime to both qmp and hmp. qmp: fbdev enable=on|off hmp: fbdev on|off --- hmp-commands.hx | 15 +++++++++++++++ hmp.c | 9 +++++++++ hmp.h | 1 + qapi-schema.json | 15 +++++++++++++++ qmp-commands.hx | 6 ++++++ qmp.c | 17 +++++++++++++++++ 6 files changed, 63 insertions(+), 0 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index f6104b0..1ef372b 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1378,6 +1378,21 @@ passed since 1970, i.e. unix epoch. ETEXI { + .name = "fbdev", + .args_type = "enable:b", + .params = "on|off", + .help = "enable/disable fbdev", + .mhandler.cmd = hmp_fbdev, + }, + +STEXI +@item fbdev on | off +@findex fbdev + +enable/disable fbdev +ETEXI + + { .name = "info", .args_type = "item:s?", .params = "[subcommand]", diff --git a/hmp.c b/hmp.c index 81c8acb..a7f9ecb 100644 --- a/hmp.c +++ b/hmp.c @@ -1102,3 +1102,12 @@ void hmp_closefd(Monitor *mon, const QDict *qdict) qmp_closefd(fdname, &errp); hmp_handle_error(mon, &errp); } + +void hmp_fbdev(Monitor *mon, const QDict *qdict) +{ + int enable = qdict_get_bool(qdict, "enable"); + Error *errp = NULL; + + qmp_fbdev(enable, &errp); + hmp_handle_error(mon, &errp); +} diff --git a/hmp.h b/hmp.h index 7dd93bf..1eb02aa 100644 --- a/hmp.h +++ b/hmp.h @@ -71,5 +71,6 @@ void hmp_netdev_add(Monitor *mon, const QDict *qdict); void hmp_netdev_del(Monitor *mon, const QDict *qdict); void hmp_getfd(Monitor *mon, const QDict *qdict); void hmp_closefd(Monitor *mon, const QDict *qdict); +void hmp_fbdev(Monitor *mon, const QDict *qdict); #endif diff --git a/qapi-schema.json b/qapi-schema.json index bd8ad74..d83ee2b 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -2493,3 +2493,18 @@ # Since: 1.2.0 ## { 'command': 'query-target', 'returns': 'TargetInfo' } + +## +# @fbdev: +# +# Enable/disable fbdev. +# +# @enable: true to set the link status to be up +# +# Returns: Nothing on success +# If @name is not a valid network device, DeviceNotFound +# +# Since: 1.3 +# +## +{ 'command': 'fbdev', 'data': {'enable': 'bool'} } diff --git a/qmp-commands.hx b/qmp-commands.hx index 3745a21..8382020 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -2514,3 +2514,9 @@ EQMP .args_type = "", .mhandler.cmd_new = qmp_marshal_input_query_target, }, + + { + .name = "fbdev", + .args_type = "enable:b", + .mhandler.cmd_new = qmp_marshal_input_fbdev, + }, diff --git a/qmp.c b/qmp.c index 8463922..d7306ab 100644 --- a/qmp.c +++ b/qmp.c @@ -391,6 +391,23 @@ void qmp_change(const char *device, const char *target, } } +void qmp_fbdev(bool enable, Error **errp) +{ +#if defined(CONFIG_LINUX) + DisplayState *ds = get_displaystate(); + + if (enable) { + if (fbdev_display_init(ds, NULL) != 0) { + error_set(errp, QERR_UNDEFINED_ERROR); + } + } else { + fbdev_display_uninit(ds); + } +#else + error_set(errp, QERR_FEATURE_DISABLED, "fbdev"); +#endif +} + static void qom_list_types_tramp(ObjectClass *klass, void *data) { ObjectTypeInfoList *e, **pret = data; -- 1.7.1