From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:58577) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDd8V-00036X-Sg for qemu-devel@nongnu.org; Mon, 17 Sep 2012 11:21:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TDd8P-0000sx-KH for qemu-devel@nongnu.org; Mon, 17 Sep 2012 11:21:23 -0400 Received: from e28smtp02.in.ibm.com ([122.248.162.2]:46234) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDd8O-0000md-NS for qemu-devel@nongnu.org; Mon, 17 Sep 2012 11:21:17 -0400 Received: from /spool/local by e28smtp02.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 17 Sep 2012 20:51:12 +0530 Received: from d28av05.in.ibm.com (d28av05.in.ibm.com [9.184.220.67]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q8HFKuju66388096 for ; Mon, 17 Sep 2012 20:50:56 +0530 Received: from d28av05.in.ibm.com (loopback [127.0.0.1]) by d28av05.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q8HFKtH0031220 for ; Tue, 18 Sep 2012 01:20:56 +1000 Date: Mon, 17 Sep 2012 20:52:49 +0530 From: Bharata B Rao Message-ID: <20120917152249.GC6879@in.ibm.com> References: <20120917152149.GB6879@in.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20120917152149.GB6879@in.ibm.com> Subject: [Qemu-devel] [PATCH v7 1/5] sockets: Make inet_parse() non static. Reply-To: bharata@linux.vnet.ibm.com List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Anthony Liguori , Anand Avati , Vijay Bellur , Stefan Hajnoczi , Amar Tumballi , Markus Armbruster , Blue Swirl , Avi Kivity , Paolo Bonzini sockets: Make inet_parse() non static. From: Bharata B Rao Make inet_parse() non-static so that other subsystems like gluster can use it to parse inet addresses. As a pre-requisite, define and globalize the qemu_inet_opts. Signed-off-by: Bharata B Rao --- Makefile.objs | 2 +- qemu-config.c | 31 +++++++++++++++++++++++++++++++ qemu-sockets.c | 42 ++++++------------------------------------ qemu_socket.h | 1 + 4 files changed, 39 insertions(+), 37 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 4412757..447371f 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -230,7 +230,7 @@ universal-obj-y += $(qapi-obj-y) qga-obj-y = qga/ qemu-ga.o module.o qga-obj-$(CONFIG_WIN32) += oslib-win32.o -qga-obj-$(CONFIG_POSIX) += oslib-posix.o qemu-sockets.o qemu-option.o +qga-obj-$(CONFIG_POSIX) += oslib-posix.o qemu-config.o qemu-sockets.o qemu-option.o vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS) diff --git a/qemu-config.c b/qemu-config.c index eba977e..d3d36b6 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -646,6 +646,36 @@ QemuOptsList qemu_boot_opts = { }, }; +QemuOptsList qemu_inet_opts = { + .name = "inet", + .head = QTAILQ_HEAD_INITIALIZER(qemu_inet_opts.head), + .desc = { + { + .name = "path", + .type = QEMU_OPT_STRING, + },{ + .name = "host", + .type = QEMU_OPT_STRING, + },{ + .name = "port", + .type = QEMU_OPT_STRING, + },{ + .name = "to", + .type = QEMU_OPT_NUMBER, + },{ + .name = "ipv4", + .type = QEMU_OPT_BOOL, + },{ + .name = "ipv6", + .type = QEMU_OPT_BOOL, + },{ + .name = "block", + .type = QEMU_OPT_BOOL, + }, + { /* end if list */ } + }, +}; + static QemuOptsList *vm_config_groups[32] = { &qemu_drive_opts, &qemu_chardev_opts, @@ -662,6 +692,7 @@ static QemuOptsList *vm_config_groups[32] = { &qemu_boot_opts, &qemu_iscsi_opts, &qemu_sandbox_opts, + &qemu_inet_opts, NULL, }; diff --git a/qemu-sockets.c b/qemu-sockets.c index 361d890..c330fc5 100644 --- a/qemu-sockets.c +++ b/qemu-sockets.c @@ -24,6 +24,7 @@ #include "qemu_socket.h" #include "qemu-common.h" /* for qemu_isdigit */ +#include "qemu-config.h" #ifndef AI_ADDRCONFIG # define AI_ADDRCONFIG 0 @@ -31,37 +32,6 @@ static const int on=1, off=0; -/* used temporarely until all users are converted to QemuOpts */ -static QemuOptsList dummy_opts = { - .name = "dummy", - .head = QTAILQ_HEAD_INITIALIZER(dummy_opts.head), - .desc = { - { - .name = "path", - .type = QEMU_OPT_STRING, - },{ - .name = "host", - .type = QEMU_OPT_STRING, - },{ - .name = "port", - .type = QEMU_OPT_STRING, - },{ - .name = "to", - .type = QEMU_OPT_NUMBER, - },{ - .name = "ipv4", - .type = QEMU_OPT_BOOL, - },{ - .name = "ipv6", - .type = QEMU_OPT_BOOL, - },{ - .name = "block", - .type = QEMU_OPT_BOOL, - }, - { /* end if list */ } - }, -}; - static int inet_getport(struct addrinfo *e) { struct sockaddr_in *i4; @@ -407,7 +377,7 @@ err: } /* compatibility wrapper */ -static int inet_parse(QemuOpts *opts, const char *str) +int inet_parse(QemuOpts *opts, const char *str) { const char *optstr, *h; char addr[64]; @@ -469,7 +439,7 @@ int inet_listen(const char *str, char *ostr, int olen, char *optstr; int sock = -1; - opts = qemu_opts_create(&dummy_opts, NULL, 0, NULL); + opts = qemu_opts_create(qemu_find_opts("inet"), NULL, 0, NULL); if (inet_parse(opts, str) == 0) { sock = inet_listen_opts(opts, port_offset, errp); if (sock != -1 && ostr) { @@ -498,7 +468,7 @@ int inet_connect(const char *str, bool block, bool *in_progress, Error **errp) QemuOpts *opts; int sock = -1; - opts = qemu_opts_create(&dummy_opts, NULL, 0, NULL); + opts = qemu_opts_create(qemu_find_opts("inet"), NULL, 0, NULL); if (inet_parse(opts, str) == 0) { if (block) { qemu_opt_set(opts, "block", "on"); @@ -597,7 +567,7 @@ int unix_listen(const char *str, char *ostr, int olen) char *path, *optstr; int sock, len; - opts = qemu_opts_create(&dummy_opts, NULL, 0, NULL); + opts = qemu_opts_create(qemu_find_opts("inet"), NULL, 0, NULL); optstr = strchr(str, ','); if (optstr) { @@ -625,7 +595,7 @@ int unix_connect(const char *path) QemuOpts *opts; int sock; - opts = qemu_opts_create(&dummy_opts, NULL, 0, NULL); + opts = qemu_opts_create(qemu_find_opts("inet"), NULL, 0, NULL); qemu_opt_set(opts, "path", path); sock = unix_connect_opts(opts); qemu_opts_del(opts); diff --git a/qemu_socket.h b/qemu_socket.h index 30ae6af..bd4d281 100644 --- a/qemu_socket.h +++ b/qemu_socket.h @@ -46,6 +46,7 @@ int inet_connect_opts(QemuOpts *opts, 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); +int inet_parse(QemuOpts *opts, const char *str); int unix_listen_opts(QemuOpts *opts); int unix_listen(const char *path, char *ostr, int olen);