From patchwork Wed Sep 19 14:31:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 185069 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 88A262C00C7 for ; Thu, 20 Sep 2012 00:50:33 +1000 (EST) Received: from localhost ([::1]:52849 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TELbj-0004E4-Cn for incoming@patchwork.ozlabs.org; Wed, 19 Sep 2012 10:50:31 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46548) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TELKA-0000qe-Sl for qemu-devel@nongnu.org; Wed, 19 Sep 2012 10:32:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TELK5-0005T5-B0 for qemu-devel@nongnu.org; Wed, 19 Sep 2012 10:32:22 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:50022) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TELK5-0005F9-4U for qemu-devel@nongnu.org; Wed, 19 Sep 2012 10:32:17 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp12so2588440pbb.4 for ; Wed, 19 Sep 2012 07:32:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=2T8gig7n/Kk3IVCd80u7+jNQy8ClHPcRcxGo9MsMZ4k=; b=ncb2bx9Kjv2p5MnnF8kKOuz3g4SqYbVDWFQUAGtxHl941FCg+MoHyCKQWc/e88GsMN s2hqJAujd5IfEDcOyOUmzeIzahh1xDlqAI+rOGn2oPGW3/QIRGVKYKvazVTGpMmsaQZH /xeClZfuYAE17W0liMK30AwzxyAnVGPgPDU5aAASeUvplFmqIXNk1+VxzkFdHCKHRJVp n00Hbsrb4vNaQlA2pgAtdjk5MojeDlCXSHEz41AFUtpnM5XRNZm+daeT657u7W8BXftC d4Lnv9qxPe9IVvZy6K2OWflFiaX0Co078KA9z+q8KYuKNAqSkf3Sm/py+UG9Z35zIH7O Xe+w== Received: by 10.68.220.201 with SMTP id py9mr7849650pbc.137.1348065136800; Wed, 19 Sep 2012 07:32:16 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-169-1.ip50.fastwebnet.it. [93.34.169.1]) by mx.google.com with ESMTPS id it5sm1939572pbc.10.2012.09.19.07.32.13 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 19 Sep 2012 07:32:15 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 19 Sep 2012 16:31:13 +0200 Message-Id: <1348065078-5139-11-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12 In-Reply-To: <1348065078-5139-1-git-send-email-pbonzini@redhat.com> References: <1348065078-5139-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH 10/12] qemu-sockets: move block from QemuOpts to arguments X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This option is not accessible from anywhere in the command-line, so it need not be a QemuOpt. Make it a separate argument, which will be the same convention used by socket_connect. Signed-off-by: Paolo Bonzini --- qemu-char.c | 2 +- qemu-sockets.c | 12 ++---------- qemu_socket.h | 2 +- 3 file modificati, 4 inserzioni(+), 12 rimozioni(-) diff --git a/qemu-char.c b/qemu-char.c index b886f3b..b33bdaa 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2459,7 +2459,7 @@ static CharDriverState *qemu_chr_open_socket(QemuOpts *opts) if (is_listen) { fd = inet_listen_opts(opts, 0, NULL); } else { - fd = inet_connect_opts(opts, NULL, NULL); + fd = inet_connect_opts(opts, false, NULL, NULL); } } if (fd < 0) { diff --git a/qemu-sockets.c b/qemu-sockets.c index c213cc8..8a7c5d4 100644 --- a/qemu-sockets.c +++ b/qemu-sockets.c @@ -54,9 +54,6 @@ static QemuOptsList dummy_opts = { },{ .name = "ipv6", .type = QEMU_OPT_BOOL, - },{ - .name = "block", - .type = QEMU_OPT_BOOL, }, { /* end if list */ } }, @@ -209,7 +206,7 @@ listen: return slisten; } -int inet_connect_opts(QemuOpts *opts, bool *in_progress, Error **errp) +int inet_connect_opts(QemuOpts *opts, bool block, bool *in_progress, Error **errp) { struct addrinfo ai,*res,*e; const char *addr; @@ -217,7 +214,6 @@ int inet_connect_opts(QemuOpts *opts, bool *in_progress, Error **errp) char uaddr[INET6_ADDRSTRLEN+1]; char uport[33]; int sock,rc; - bool block; memset(&ai,0, sizeof(ai)); ai.ai_flags = AI_CANONNAME | AI_ADDRCONFIG; @@ -230,7 +226,6 @@ int inet_connect_opts(QemuOpts *opts, bool *in_progress, Error **errp) addr = qemu_opt_get(opts, "host"); port = qemu_opt_get(opts, "port"); - block = qemu_opt_get_bool(opts, "block", 0); if (addr == NULL || port == NULL) { fprintf(stderr, "inet_connect: host and/or port not specified\n"); error_set(errp, QERR_SOCKET_CREATE_FAILED); @@ -536,10 +531,7 @@ int inet_connect(const char *str, bool block, bool *in_progress, Error **errp) opts = qemu_opts_create(&dummy_opts, NULL, 0, NULL); inet_addr_to_opts(opts, addr); qapi_free_IPSocketAddress(addr); - if (block) { - qemu_opt_set(opts, "block", "on"); - } - sock = inet_connect_opts(opts, in_progress, errp); + sock = inet_connect_opts(opts, block, in_progress, errp); qemu_opts_del(opts); } return sock; diff --git a/qemu_socket.h b/qemu_socket.h index 6e06982..ad9e342 100644 --- a/qemu_socket.h +++ b/qemu_socket.h @@ -42,7 +42,7 @@ int send_all(int fd, const void *buf, int len1); int inet_listen_opts(QemuOpts *opts, int port_offset, Error **errp); int inet_listen(const char *str, char *ostr, int olen, int socktype, int port_offset, Error **errp); -int inet_connect_opts(QemuOpts *opts, bool *in_progress, Error **errp); +int inet_connect_opts(QemuOpts *opts, bool block, bool *in_progress, Error **errp); int inet_connect(const char *str, bool block, bool *in_progress, Error **errp); int inet_dgram_opts(QemuOpts *opts); const char *inet_strfamily(int family);