From patchwork Fri Dec 3 18:03:17 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 74181 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 B616BB6F14 for ; Sat, 4 Dec 2010 05:15:24 +1100 (EST) Received: from localhost ([127.0.0.1]:51505 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1POaAB-0006PE-S3 for incoming@patchwork.ozlabs.org; Fri, 03 Dec 2010 13:15:20 -0500 Received: from [140.186.70.92] (port=44872 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1POZzZ-0002Ei-KW for qemu-devel@nongnu.org; Fri, 03 Dec 2010 13:04:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1POZzW-0003LX-6A for qemu-devel@nongnu.org; Fri, 03 Dec 2010 13:04:20 -0500 Received: from e9.ny.us.ibm.com ([32.97.182.139]:39234) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1POZzW-0003LK-1d for qemu-devel@nongnu.org; Fri, 03 Dec 2010 13:04:18 -0500 Received: from d01dlp01.pok.ibm.com (d01dlp01.pok.ibm.com [9.56.224.56]) by e9.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id oB3Hfspx007843 for ; Fri, 3 Dec 2010 12:41:55 -0500 Received: from d01relay07.pok.ibm.com (d01relay07.pok.ibm.com [9.56.227.147]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id 20BCF728065 for ; Fri, 3 Dec 2010 13:04:17 -0500 (EST) Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay07.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id oB3I4AWZ1773650 for ; Fri, 3 Dec 2010 13:04:10 -0500 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id oB3I48RA014655 for ; Fri, 3 Dec 2010 13:04:10 -0500 Received: from localhost.localdomain (sig-9-65-101-53.mts.ibm.com [9.65.101.53]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id oB3I3S9n011647; Fri, 3 Dec 2010 13:04:07 -0500 From: Michael Roth To: qemu-devel@nongnu.org Date: Fri, 3 Dec 2010 12:03:17 -0600 Message-Id: <1291399402-20366-17-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1291399402-20366-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1291399402-20366-1-git-send-email-mdroth@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: agl@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com, Jes.Sorensen@redhat.com, mdroth@linux.vnet.ibm.com, aliguori@linux.vnet.ibm.com, ryanh@us.ibm.com, abeekhof@redhat.com Subject: [Qemu-devel] [RFC][PATCH v5 16/21] virtagent: add client capabilities init function 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 Non-monitor version of agent_capabilities monitor function. This is called by the local RPC server when it gets a "hello" from the guest agent to re-negotiate guest agent capabilities. Signed-off-by: Michael Roth --- virtagent.c | 18 ++++++++++++++++++ virtagent.h | 1 + 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/virtagent.c b/virtagent.c index 269bbcd..887ad02 100644 --- a/virtagent.c +++ b/virtagent.c @@ -558,3 +558,21 @@ int do_agent_capabilities(Monitor *mon, const QDict *mon_params, xmlrpc_DECREF(params); return ret; } + +/* non-HMP/QMP RPC client functions */ + +int va_client_init_capabilities(void) +{ + xmlrpc_env env; + xmlrpc_value *params; + + xmlrpc_env_init(&env); + + params = xmlrpc_build_value(&env, "()"); + if (va_rpc_has_error(&env)) { + return -1; + } + + return va_do_rpc(&env, "system.listMethods", params, + do_agent_capabilities_cb, NULL, NULL); +} diff --git a/virtagent.h b/virtagent.h index 8443c6f..440fe6d 100644 --- a/virtagent.h +++ b/virtagent.h @@ -42,5 +42,6 @@ int do_agent_ping(Monitor *mon, const QDict *mon_params, void do_agent_capabilities_print(Monitor *mon, const QObject *qobject); int do_agent_capabilities(Monitor *mon, const QDict *mon_params, MonitorCompletion cb, void *opaque); +int va_client_init_capabilities(void); #endif /* VIRTAGENT_H */