From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=56643 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PGMBs-0007lM-L4 for qemu-devel@nongnu.org; Wed, 10 Nov 2010 20:43:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PGM6x-0000Gg-7w for qemu-devel@nongnu.org; Wed, 10 Nov 2010 20:38:26 -0500 Received: from e7.ny.us.ibm.com ([32.97.182.137]:47764) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PGM6x-0000GH-5D for qemu-devel@nongnu.org; Wed, 10 Nov 2010 20:37:59 -0500 Received: from d01relay06.pok.ibm.com (d01relay06.pok.ibm.com [9.56.227.116]) by e7.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id oAB1LMj2030608 for ; Wed, 10 Nov 2010 20:21:22 -0500 Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay06.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id oAB1bwYk1773588 for ; Wed, 10 Nov 2010 20:37:58 -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 oAB1buiM010748 for ; Wed, 10 Nov 2010 20:37:57 -0500 From: Michael Roth Date: Wed, 10 Nov 2010 19:37:28 -0600 Message-Id: <1289439450-23556-10-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1289439450-23556-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1289439450-23556-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [RFC][PATCH v3 09/11] virtagent: qemu-vp integration, use virtagent init functions List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: agl@linux.vnet.ibm.com, abeekhof@redhat.com, mdroth@linux.vnet.ibm.com, root , aliguori@linux.vnet.ibm.com, ryanh@us.ibm.com, amit.shah@redhat.com From: root Invoke virtagent client/server instances via their init functions. Signed-off-by: Michael Roth --- qemu-vp.c | 61 ++++++++++++++++++++----------------------------------------- 1 files changed, 20 insertions(+), 41 deletions(-) diff --git a/qemu-vp.c b/qemu-vp.c index fe06e07..2fde670 100644 --- a/qemu-vp.c +++ b/qemu-vp.c @@ -37,6 +37,7 @@ #include "qemu-option.h" #include "qemu_socket.h" #include "virtproxy.h" +#include "virtagent.h" #include "virtagent-daemon.h" static bool verbose_enabled = 0; @@ -255,8 +256,6 @@ static void usage(const char *cmd) "\n" " -c, --channel channel options of the form:\n" " ::[:channel_id]\n" -" -p, --host-agent host rpc server, options of the form:\n" -" [channel_id]\n" " -g, --guest-agent guest rpc server, options of the form:\n" " [channel_id]\n" " -o, --oforward oforward options of the form:\n" @@ -538,23 +537,32 @@ static int init_iforwards(void) { return 0; } -static int init_agent(const VPData *agent_iforward, bool is_host) { +static int init_agent(const VPData *agent_iforward) { QemuOpts *opts = agent_iforward->opts; - int listen_fd, ret; + VPDriver *drv; + int ret, index; INFO("initializing agent..."); if (verbose_enabled) { qemu_opts_print(opts, NULL); } - /* create unix socket pair that agent http/rpc daemon will listen on */ - listen_fd = unix_listen_opts(agent_iforward->opts); - if (listen_fd < 0) { - return -1; + index = qemu_opt_get_number(agent_iforward->opts, "index", 0); + drv = get_channel_drv(index); + if (drv == NULL) { + warnx("unable to find channel with index: %d", index); + goto err; } - /* start RPC server */ - ret = va_server_start(listen_fd, is_host); + /* outbound RPCs */ + ret = va_client_init(drv, false); + if (ret) { + warnx("error starting RPC server"); + goto err; + } + + /* start guest RPC server */ + ret = va_server_init(drv, false); if (ret != 0) { warnx("error starting RPC server"); goto err; @@ -563,7 +571,6 @@ static int init_agent(const VPData *agent_iforward, bool is_host) { return 0; err: - closesocket(listen_fd); return -1; } @@ -586,7 +593,6 @@ int main(int argc, char **argv) QTAILQ_INIT(&oforwards); QTAILQ_INIT(&channels); VPData *guest_agent_iforward = NULL; - VPData *host_agent_iforward = NULL; while ((ch = getopt_long(argc, argv, sopt, lopt, &opt_ind)) != -1) { QemuOpts *opts; @@ -645,28 +651,6 @@ int main(int argc, char **argv) QTAILQ_INSERT_TAIL(&iforwards, data, next); guest_agent_iforward = data; break; - case 'p': - /* create pre-baked iforward for host agent */ - if (host_agent_iforward) { - errx(EXIT_FAILURE, "only one --host-agent argument allowed"); - } - opts = qemu_opts_create(&vp_opts, NULL, 0); - if (optarg == 0) { - sprintf(optarg_tmp, "%s:%s:-", HOST_AGENT_SERVICE_ID, - HOST_AGENT_PATH); - } else { - sprintf(optarg_tmp, "%s:%s:-:%d", HOST_AGENT_SERVICE_ID, - HOST_AGENT_PATH, atoi(optarg)); - } - ret = vp_parse(opts, optarg_tmp, 0); - if (ret) { - errx(EXIT_FAILURE, "error parsing arg: %s", optarg); - } - data = qemu_mallocz(sizeof(VPData)); - data->opts = opts; - QTAILQ_INSERT_TAIL(&iforwards, data, next); - host_agent_iforward = data; - break; case 'v': verbose_enabled = 1; break; @@ -696,18 +680,13 @@ int main(int argc, char **argv) "error initializing service mappings for incoming connections"); } + if (guest_agent_iforward) { - ret = init_agent(guest_agent_iforward, false); + ret = init_agent(guest_agent_iforward); if (ret) { errx(EXIT_FAILURE, "error initializing guest agent"); } - } else if (host_agent_iforward) { - ret = init_agent(host_agent_iforward, true); - if (ret) { - errx(EXIT_FAILURE, - "error initializing host agent"); - } } /* main i/o loop */ -- 1.7.0.4