From patchwork Tue Feb 1 10:58:48 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jes Sorensen X-Patchwork-Id: 81300 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2E851B7106 for ; Tue, 1 Feb 2011 22:00:54 +1100 (EST) Received: from localhost ([127.0.0.1]:52466 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PkDyc-0002Gk-O1 for incoming@patchwork.ozlabs.org; Tue, 01 Feb 2011 06:00:50 -0500 Received: from [140.186.70.92] (port=42530 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PkDwn-0002En-Gf for qemu-devel@nongnu.org; Tue, 01 Feb 2011 05:58:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PkDwl-000679-KH for qemu-devel@nongnu.org; Tue, 01 Feb 2011 05:58:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48383) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PkDwl-00066u-5j for qemu-devel@nongnu.org; Tue, 01 Feb 2011 05:58:55 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id p11AwqrK012268 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 1 Feb 2011 05:58:52 -0500 Received: from red-feather.redhat.com (ovpn-113-98.phx2.redhat.com [10.3.113.98]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p11AwmEN025980; Tue, 1 Feb 2011 05:58:51 -0500 From: Jes.Sorensen@redhat.com To: qemu-devel@nongnu.org Date: Tue, 1 Feb 2011 11:58:48 +0100 Message-Id: <1296557928-30019-3-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1296557928-30019-1-git-send-email-Jes.Sorensen@redhat.com> References: <1296557928-30019-1-git-send-email-Jes.Sorensen@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: mdroth@linux.vnet.ibm.com, agl@us.ibm.com Subject: [Qemu-devel] [PATCH 2/2] Add monitor commands for fsfreeze support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Jes Sorensen This patch adds the following monitor commands: agent_fsfreeze: - Freezes all local file systems in the guest. Command will print the number of file systems that were frozen. agent_fsthaw: - Thaws all local file systems in the guest. Command will print the number of file systems that were thawed. agent_fsstatus: - Prints the current status of file systems in the guest: Thawed, frozen, thaw in progress, freeze in progress, error. Signed-off-by: Jes Sorensen --- hmp-commands.hx | 48 +++++++++++ virtagent-common.h | 1 + virtagent.c | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++ virtagent.h | 9 ++ 4 files changed, 293 insertions(+), 0 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index 9c7ac0b..f4150da 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1310,6 +1310,54 @@ STEXI Fetch and re-negotiate guest agent capabilties ETEXI + { + .name = "agent_fsfreeze", + .args_type = "", + .params = "", + .help = "Freeze all local file systems mounted in the guest", + .user_print = do_agent_fsfreeze_print, + .mhandler.cmd_async = do_agent_fsfreeze, + .flags = MONITOR_CMD_ASYNC, + }, + +STEXI +@item agent_fsfreeze +@findex agent_fsfreeze +Freeze all local mounted file systems in guest +ETEXI + + { + .name = "agent_fsthaw", + .args_type = "", + .params = "", + .help = "Thaw all local file systems mounted in the guest", + .user_print = do_agent_fsthaw_print, + .mhandler.cmd_async = do_agent_fsthaw, + .flags = MONITOR_CMD_ASYNC, + }, + +STEXI +@item agent_fsthaw +@findex agent_fsthaw +Thaw all local mounted file systems in guest +ETEXI + + { + .name = "agent_fsstatus", + .args_type = "", + .params = "", + .help = "Display status of file system freeze progress in guest", + .user_print = do_agent_fsstatus_print, + .mhandler.cmd_async = do_agent_fsstatus, + .flags = MONITOR_CMD_ASYNC, + }, + +STEXI +@item agent_fsstatus +@findex agent_fsstatus +Get status of file system freeze in guest +ETEXI + STEXI @end table ETEXI diff --git a/virtagent-common.h b/virtagent-common.h index 220a4b6..383de84 100644 --- a/virtagent-common.h +++ b/virtagent-common.h @@ -24,6 +24,7 @@ #include "monitor.h" #include "virtagent-server.h" #include "virtagent.h" +#include "qint.h" #define DEBUG_VA diff --git a/virtagent.c b/virtagent.c index b5e7944..4277802 100644 --- a/virtagent.c +++ b/virtagent.c @@ -640,3 +640,238 @@ int va_send_hello(void) xmlrpc_DECREF(params); return ret; } + +void do_agent_fsfreeze_print(Monitor *mon, const QObject *data) +{ + TRACE("called"); + + monitor_printf(mon, "File systems frozen: %" PRId64 "\n", + qint_get_int((qobject_to_qint(data)))); +} + +static void do_agent_fsfreeze_cb(const char *resp_data, + size_t resp_data_len, + MonitorCompletion *mon_cb, + void *mon_data) +{ + xmlrpc_value *resp = NULL; + xmlrpc_env env; + xmlrpc_int32 retval = 0; + QInt *qint; + + TRACE("called"); + + if (resp_data == NULL) { + LOG("error handling RPC request"); + return; + } + + xmlrpc_env_init(&env); + resp = xmlrpc_parse_response(&env, resp_data, resp_data_len); + if (va_rpc_has_error(&env)) { + LOG("error parsing RPC response"); + return; + } + + xmlrpc_parse_value(&env, resp, "i", &retval); + if (va_rpc_has_error(&env)) { + retval = -1; + goto out; + } + +out: + qint = qint_from_int(retval); + xmlrpc_DECREF(resp); + if (mon_cb) { + mon_cb(mon_data, QOBJECT(qint)); + } + qobject_decref(QOBJECT(qint)); +} + +int do_agent_fsfreeze(Monitor *mon, const QDict *mon_params, + MonitorCompletion cb, void *opaque) +{ + xmlrpc_env env; + xmlrpc_value *params; + int ret; + + TRACE("called"); + + xmlrpc_env_init(&env); + params = xmlrpc_build_value(&env, "()"); + if (va_rpc_has_error(&env)) { + return -1; + } + + ret = va_do_rpc(&env, "va.fsfreeze", params, do_agent_fsfreeze_cb, + cb, opaque); + if (ret) { + qerror_report(QERR_VA_FAILED, ret, strerror(ret)); + } + xmlrpc_DECREF(params); + return ret; +} + +void do_agent_fsthaw_print(Monitor *mon, const QObject *data) +{ + TRACE("called"); + + monitor_printf(mon, "File systems thawed: %" PRId64 "\n", + qint_get_int((qobject_to_qint(data)))); +} + +static void do_agent_fsthaw_cb(const char *resp_data, + size_t resp_data_len, + MonitorCompletion *mon_cb, + void *mon_data) +{ + xmlrpc_value *resp = NULL; + xmlrpc_env env; + xmlrpc_int32 retval = 0; + QInt *qint; + + TRACE("called"); + + if (resp_data == NULL) { + LOG("error handling RPC request"); + return; + } + + xmlrpc_env_init(&env); + resp = xmlrpc_parse_response(&env, resp_data, resp_data_len); + if (va_rpc_has_error(&env)) { + LOG("error parsing RPC response"); + return; + } + + xmlrpc_parse_value(&env, resp, "i", &retval); + if (va_rpc_has_error(&env)) { + retval = -1; + goto out; + } + +out: + qint = qint_from_int(retval); + xmlrpc_DECREF(resp); + if (mon_cb) { + mon_cb(mon_data, QOBJECT(qint)); + } + qobject_decref(QOBJECT(qint)); +} + +int do_agent_fsthaw(Monitor *mon, const QDict *mon_params, + MonitorCompletion cb, void *opaque) +{ + xmlrpc_env env; + xmlrpc_value *params; + int ret; + + TRACE("called"); + + xmlrpc_env_init(&env); + params = xmlrpc_build_value(&env, "()"); + if (va_rpc_has_error(&env)) { + return -1; + } + + ret = va_do_rpc(&env, "va.fsthaw", params, do_agent_fsthaw_cb, cb, opaque); + if (ret) { + qerror_report(QERR_VA_FAILED, ret, strerror(ret)); + } + xmlrpc_DECREF(params); + return ret; +} + +void do_agent_fsstatus_print(Monitor *mon, const QObject *data) +{ + int64_t fsstatus; + TRACE("called"); + + fsstatus = qint_get_int((qobject_to_qint(data))); + + monitor_printf(mon, "File systems freeze status: "); + switch(fsstatus) { + case FREEZE_THAWED: + monitor_printf(mon, "Thawed"); + break; + case FREEZE_INPROGRESS: + monitor_printf(mon, "Freeze in progress"); + break; + case FREEZE_THAWINPROGRESS: + monitor_printf(mon, "Thaw in progress"); + break; + case FREEZE_FROZEN: + monitor_printf(mon, "Frozen"); + break; + case FREEZE_ERROR: + monitor_printf(mon, "Error"); + break; + default: + monitor_printf(mon, "unknown"); + } + + monitor_printf(mon, "\n"); +} + +static void do_agent_fsstatus_cb(const char *resp_data, + size_t resp_data_len, + MonitorCompletion *mon_cb, + void *mon_data) +{ + xmlrpc_value *resp = NULL; + xmlrpc_env env; + xmlrpc_int32 retval = 0; + QInt *qint; + + TRACE("called"); + + if (resp_data == NULL) { + LOG("error handling RPC request"); + return; + } + + xmlrpc_env_init(&env); + resp = xmlrpc_parse_response(&env, resp_data, resp_data_len); + if (va_rpc_has_error(&env)) { + LOG("error parsing RPC response"); + return; + } + + xmlrpc_parse_value(&env, resp, "i", &retval); + if (va_rpc_has_error(&env)) { + retval = -1; + goto out; + } + +out: + qint = qint_from_int(retval); + xmlrpc_DECREF(resp); + if (mon_cb) { + mon_cb(mon_data, QOBJECT(qint)); + } + qobject_decref(QOBJECT(qint)); +} + +int do_agent_fsstatus(Monitor *mon, const QDict *mon_params, + MonitorCompletion cb, void *opaque) +{ + xmlrpc_env env; + xmlrpc_value *params; + int ret; + + TRACE("called"); + + xmlrpc_env_init(&env); + params = xmlrpc_build_value(&env, "()"); + if (va_rpc_has_error(&env)) { + return -1; + } + + ret = va_do_rpc(&env, "va.fsstatus", params, do_agent_fsstatus_cb, + cb, opaque); + if (ret) { + qerror_report(QERR_VA_FAILED, ret, strerror(ret)); + } + xmlrpc_DECREF(params); + return ret; +} diff --git a/virtagent.h b/virtagent.h index dba90d0..0d7575d 100644 --- a/virtagent.h +++ b/virtagent.h @@ -46,5 +46,14 @@ int do_agent_capabilities(Monitor *mon, const QDict *mon_params, MonitorCompletion cb, void *opaque); int va_client_init_capabilities(void); int va_send_hello(void); +void do_agent_fsfreeze_print(Monitor *mon, const QObject *qobject); +int do_agent_fsfreeze(Monitor *mon, const QDict *mon_params, + MonitorCompletion cb, void *opaque); +void do_agent_fsthaw_print(Monitor *mon, const QObject *qobject); +int do_agent_fsthaw(Monitor *mon, const QDict *mon_params, + MonitorCompletion cb, void *opaque); +void do_agent_fsstatus_print(Monitor *mon, const QObject *qobject); +int do_agent_fsstatus(Monitor *mon, const QDict *mon_params, + MonitorCompletion cb, void *opaque); #endif /* VIRTAGENT_H */