From nobody Mon May 6 12:03:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1557407196; cv=none; d=zoho.com; s=zohoarc; b=ULrJTjkyU6xrVNcfuI1Fnrhs2YFsbPY8fz//K01h6Qzp8RGU7Gu/w6ilZXpoTOQcJaJmsmoifzaKDA8myX6VshiBW70hWgVIdXEJIFDV5dqGh50o16KlDmNKmjcVVv7CNbiej+g8cOU3+8XG1hkQV7AHm9H5w3h8AzxaU54Lt3E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557407196; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=kz5O9CSav5yN/Zl2NrGwvhRmlc9tOzBBK++C4uQfIkU=; b=R2h7lEy6wL8MMdg8pUODmIkY/BdQ69qesfjqEydoM0bV2BedPMKr3+V8P92/rr/ykbuBw7p035WQkFDIHyZss9INeKa9YLhlejdZxmROJk/xZeQH/4UF1BM9fWphGzW4FBa0/1suLKTG24fGT4+6IyS93p8bVA6BjRyOFZjgo4M= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1557407196711357.41205345348806; Thu, 9 May 2019 06:06:36 -0700 (PDT) Received: from localhost ([127.0.0.1]:54292 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOikk-0000wx-Lq for importer@patchew.org; Thu, 09 May 2019 09:06:26 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43704) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOiie-0007fd-Fs for qemu-devel@nongnu.org; Thu, 09 May 2019 09:04:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOiid-0007fM-Gt for qemu-devel@nongnu.org; Thu, 09 May 2019 09:04:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59016) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hOiid-0007M6-C0 for qemu-devel@nongnu.org; Thu, 09 May 2019 09:04:15 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0386C3079B66 for ; Thu, 9 May 2019 13:03:53 +0000 (UTC) Received: from steredhat.redhat.com (ovpn-116-227.ams2.redhat.com [10.36.116.227]) by smtp.corp.redhat.com (Postfix) with ESMTP id AC5DA60F8A; Thu, 9 May 2019 13:03:49 +0000 (UTC) From: Stefano Garzarella To: qemu-devel@nongnu.org Date: Thu, 9 May 2019 15:03:42 +0200 Message-Id: <20190509130345.227526-2-sgarzare@redhat.com> In-Reply-To: <20190509130345.227526-1-sgarzare@redhat.com> References: <20190509130345.227526-1-sgarzare@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Thu, 09 May 2019 13:03:53 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 1/4] net: fix assertion failure when ipv6-prefixlen is not a number X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jason Wang , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" If 'ipv6-prefixlen' is not a number, the current behaviour produces an assertion failure: $ qemu-system-x86_64 -net user,ipv6-net=3Dfeca::0/a qemu-system-x86_64: qemu/util/qemu-option.c:1175: qemu_opts_foreach: Assertion `!errp || !*errp' failed. Aborted (core dumped) This patch fixes it, jumping to the end of the function when 'ipv6-prefixlen' is not a number, and printing the more friendly message: $ qemu-system-x86_64 -net user,ipv6-net=3Dfeca::0/a qemu-system-x86_64: Parameter 'ipv6-prefixlen' expects a number Signed-off-by: Stefano Garzarella Reviewed-by: Markus Armbruster --- net/net.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/net/net.c b/net/net.c index f3a3c5444c..d5071e49e2 100644 --- a/net/net.c +++ b/net/net.c @@ -1134,11 +1134,11 @@ static int net_client_init(QemuOpts *opts, bool is_= netdev, Error **errp) =20 if (err) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, - "ipv6-prefix", "a number"); - } else { - qemu_opt_set_number(opts, "ipv6-prefixlen", len, - &error_abort); + "ipv6-prefixlen", "a number"); + goto out; } + + qemu_opt_set_number(opts, "ipv6-prefixlen", len, &error_ab= ort); } qemu_opt_unset(opts, "ipv6-net"); } @@ -1160,6 +1160,7 @@ static int net_client_init(QemuOpts *opts, bool is_ne= tdev, Error **errp) qapi_free_NetLegacy(object); } =20 +out: error_propagate(errp, err); visit_free(v); return ret; --=20 2.20.1 From nobody Mon May 6 12:03:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1557407294; cv=none; d=zoho.com; s=zohoarc; b=F9N+la8nDFQEbQNS8PQ0Ig8dzODzdp60E+19wXToG6oAwETvlY82RaI76h5XyAofdQazHON0BQYhHuJybl40gKfwpvsqCUdD2jHyr/E3KvqKqFm697vhC7fzKh/dTpVGvBssnQZ3Ma4ARYMK7bmvkcYZVW8Ci1U4PfWtdLcy4gY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557407294; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=IdqWBXEXkoRWTNDm+MO2rwhUKDiaT6Qci9o49QOvFqE=; b=emBM+K0X2FdffrxqEgts7rFRoUol/GuSpyAC+s99yHos/jgkQ+1dUtuZ/7XryOmOJrDh1t0e7QEwdckv9Wf+TfVeL3AmtNs97jBZXjpDW5SWOfxSswgTQNowijVVLSx523cXmMx/7rwwrl0iez77tZ0BM//R4bfFCLFy7LLgffc= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1557407294008910.7024294744633; Thu, 9 May 2019 06:08:14 -0700 (PDT) Received: from localhost ([127.0.0.1]:54314 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOimO-0002e8-BU for importer@patchew.org; Thu, 09 May 2019 09:08:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43716) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOiii-0007j4-W9 for qemu-devel@nongnu.org; Thu, 09 May 2019 09:04:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOiih-0007hj-7M for qemu-devel@nongnu.org; Thu, 09 May 2019 09:04:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:28752) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hOiig-0007Rv-W8 for qemu-devel@nongnu.org; Thu, 09 May 2019 09:04:19 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9FAE0306D329 for ; Thu, 9 May 2019 13:03:54 +0000 (UTC) Received: from steredhat.redhat.com (ovpn-116-227.ams2.redhat.com [10.36.116.227]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5FF4460E37; Thu, 9 May 2019 13:03:53 +0000 (UTC) From: Stefano Garzarella To: qemu-devel@nongnu.org Date: Thu, 9 May 2019 15:03:43 +0200 Message-Id: <20190509130345.227526-3-sgarzare@redhat.com> In-Reply-To: <20190509130345.227526-1-sgarzare@redhat.com> References: <20190509130345.227526-1-sgarzare@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Thu, 09 May 2019 13:03:54 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 2/4] net: avoid using variable length array in net_client_init() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jason Wang , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" net_client_init() uses a variable length array to store the prefix of 'ipv6-net' parameter (e.g. if ipv6-net=3Dfec0::0/64, the prefix is 'fec0::0'). This patch introduces g_strsplit() to split the 'ipv6-net' parameter, so we can remove the variable length array. Suggested-by: Markus Armbruster Signed-off-by: Stefano Garzarella Reviewed-by: Markus Armbruster --- net/net.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/net/net.c b/net/net.c index d5071e49e2..932fa5abb5 100644 --- a/net/net.c +++ b/net/net.c @@ -1118,29 +1118,38 @@ static int net_client_init(QemuOpts *opts, bool is_= netdev, Error **errp) const char *ip6_net =3D qemu_opt_get(opts, "ipv6-net"); =20 if (ip6_net) { - char buf[strlen(ip6_net) + 1]; + gchar **substrings; + char *prefix_addr; + unsigned long prefix_len =3D 64; /* Default 64bit prefix lengt= h. */ =20 - if (get_str_sep(buf, sizeof(buf), &ip6_net, '/') < 0) { - /* Default 64bit prefix length. */ - qemu_opt_set(opts, "ipv6-prefix", ip6_net, &error_abort); - qemu_opt_set_number(opts, "ipv6-prefixlen", 64, &error_abo= rt); - } else { + substrings =3D g_strsplit(ip6_net, "/", 2); + if (!substrings || !substrings[0]) { + error_setg(errp, QERR_INVALID_PARAMETER_VALUE, + "ipv6-net", "a valid IPv6 prefix"); + g_strfreev(substrings); + goto out; + } + + *prefix_addr =3D substrings[0]; + + if (substrings[1]) { /* User-specified prefix length. */ - unsigned long len; int err; =20 - qemu_opt_set(opts, "ipv6-prefix", buf, &error_abort); - err =3D qemu_strtoul(ip6_net, NULL, 10, &len); - + err =3D qemu_strtoul(substrings[1], NULL, 10, &prefix_len); if (err) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "ipv6-prefixlen", "a number"); + g_strfreev(substrings); goto out; } - - qemu_opt_set_number(opts, "ipv6-prefixlen", len, &error_ab= ort); } + + qemu_opt_set(opts, "ipv6-prefix", prefix_addr, &error_abort); + qemu_opt_set_number(opts, "ipv6-prefixlen", prefix_len, + &error_abort); qemu_opt_unset(opts, "ipv6-net"); + g_strfreev(substrings); } } =20 --=20 2.20.1 From nobody Mon May 6 12:03:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1557407202; cv=none; d=zoho.com; s=zohoarc; b=OP+3FFfQFVwKPkptkdsdsnQRDFyNoeJo4Yygvjimz7EXRRkj2whaS4dz3f2f75PqOs41mjoUFvipefD0W2iuiD8KawxRrZeqk2XMPcWTa1ttmdhJ28TILYLNH4FRdHx6jnvSiSjj+LtPfvSLnqobuLyrD1M6atJNMMTaFz/FTq8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557407202; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=TdYg52C0ZG87jKLnSHdEU0pkRVdedUmrL3uonaEAAPo=; b=hRRWhM+LT3oLo6UUlQK5ibxRqT9uh2Bw8000trl0lf11RozuSPetDnKhpPIl7ulpIfmA6FqAj9aGFAWCxfa/dCPepcuK0bwGStUkOV5Low2O4cw8FV9xHmf3UNad183cbCafkFXDY5Cq5q9d9jFomXDzsntGsMbS53OdvaxyoaU= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1557407202583958.1088825674453; Thu, 9 May 2019 06:06:42 -0700 (PDT) Received: from localhost ([127.0.0.1]:54296 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOikt-0001AW-Ey for importer@patchew.org; Thu, 09 May 2019 09:06:35 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43741) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOiin-0007pY-Ns for qemu-devel@nongnu.org; Thu, 09 May 2019 09:04:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOiim-0007lb-Ou for qemu-devel@nongnu.org; Thu, 09 May 2019 09:04:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41264) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hOiik-0007TT-ND for qemu-devel@nongnu.org; Thu, 09 May 2019 09:04:23 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A9D9D307DAAA for ; Thu, 9 May 2019 13:03:56 +0000 (UTC) Received: from steredhat.redhat.com (ovpn-116-227.ams2.redhat.com [10.36.116.227]) by smtp.corp.redhat.com (Postfix) with ESMTP id 06EEF60F8A; Thu, 9 May 2019 13:03:54 +0000 (UTC) From: Stefano Garzarella To: qemu-devel@nongnu.org Date: Thu, 9 May 2019 15:03:44 +0200 Message-Id: <20190509130345.227526-4-sgarzare@redhat.com> In-Reply-To: <20190509130345.227526-1-sgarzare@redhat.com> References: <20190509130345.227526-1-sgarzare@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Thu, 09 May 2019 13:03:56 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 3/4] net: use g_strsplit() for parsing host address and port X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jason Wang , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Use the glib function to split host address and port in the parse_host_port() function. Suggested-by: Markus Armbruster Signed-off-by: Stefano Garzarella Reviewed-by: Markus Armbruster --- net/net.c | 43 +++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/net/net.c b/net/net.c index 932fa5abb5..570e093c4f 100644 --- a/net/net.c +++ b/net/net.c @@ -86,32 +86,39 @@ static int get_str_sep(char *buf, int buf_size, const c= har **pp, int sep) int parse_host_port(struct sockaddr_in *saddr, const char *str, Error **errp) { - char buf[512]; + gchar **substrings; struct hostent *he; - const char *p, *r; - int port; + const char *addr, *p, *r; + int port, ret =3D 0; =20 - p =3D str; - if (get_str_sep(buf, sizeof(buf), &p, ':') < 0) { + substrings =3D g_strsplit(str, ":", 2); + if (!substrings || !substrings[0] || !substrings[1]) { error_setg(errp, "host address '%s' doesn't contain ':' " "separating host from port", str); - return -1; + ret =3D -1; + goto out; } + + addr =3D substrings[0]; + p =3D substrings[1]; + saddr->sin_family =3D AF_INET; - if (buf[0] =3D=3D '\0') { + if (addr[0] =3D=3D '\0') { saddr->sin_addr.s_addr =3D 0; } else { - if (qemu_isdigit(buf[0])) { - if (!inet_aton(buf, &saddr->sin_addr)) { + if (qemu_isdigit(addr[0])) { + if (!inet_aton(addr, &saddr->sin_addr)) { error_setg(errp, "host address '%s' is not a valid " - "IPv4 address", buf); - return -1; + "IPv4 address", addr); + ret =3D -1; + goto out; } } else { - he =3D gethostbyname(buf); + he =3D gethostbyname(addr); if (he =3D=3D NULL) { - error_setg(errp, "can't resolve host address '%s'", buf); - return - 1; + error_setg(errp, "can't resolve host address '%s'", addr); + ret =3D -1; + goto out; } saddr->sin_addr =3D *(struct in_addr *)he->h_addr; } @@ -119,10 +126,14 @@ int parse_host_port(struct sockaddr_in *saddr, const = char *str, port =3D strtol(p, (char **)&r, 0); if (r =3D=3D p) { error_setg(errp, "port number '%s' is invalid", p); - return -1; + ret =3D -1; + goto out; } saddr->sin_port =3D htons(port); - return 0; + +out: + g_strfreev(substrings); + return ret; } =20 char *qemu_mac_strdup_printf(const uint8_t *macaddr) --=20 2.20.1 From nobody Mon May 6 12:03:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1557407161; cv=none; d=zoho.com; s=zohoarc; b=Zk17/UeZuiVsiG9/PT3f2wsu8+qV0PuqKu4/72YRKq0Bv2XEGjqPyKSe8SrlVMCXPbNaK+fuVXPTv4fnGDehBVWEqx7V2mulHHPRfBvGZQMJ3ynSX93FDayFXqePeT8Kh1V2RWjORUsXDguSVpAW9UVn6pdmnIEMYgFnFMrjpPk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557407161; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=Sa8Q9zE5konU5MogbSX3mRvKX6bpA/nIn5xNseQLuTM=; b=VYfMnpDiqeFZojxROR5lf3YxRxtR/p2NmSojuTURcG9Nc8mr7sx5G5vwEG6m+TO1qS4kypAY8f3iHx04PeJdlbbRDI27jG55+ZnVBpDYTuHpxH+D1BIU2XdoayjBFko3MaHfSADZ+IAnl/2nV5WKQ1RN70xfG3YNKJFyNVr4/o0= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1557407161013466.54036057342046; Thu, 9 May 2019 06:06:01 -0700 (PDT) Received: from localhost ([127.0.0.1]:54287 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOikG-0000NK-W4 for importer@patchew.org; Thu, 09 May 2019 09:05:57 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43674) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOiiW-0007YL-Sx for qemu-devel@nongnu.org; Thu, 09 May 2019 09:04:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOiiV-0007Z5-Mf for qemu-devel@nongnu.org; Thu, 09 May 2019 09:04:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38618) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hOiiV-0007Qb-G7 for qemu-devel@nongnu.org; Thu, 09 May 2019 09:04:07 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 52B7681F12 for ; Thu, 9 May 2019 13:03:58 +0000 (UTC) Received: from steredhat.redhat.com (ovpn-116-227.ams2.redhat.com [10.36.116.227]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1424960F8A; Thu, 9 May 2019 13:03:56 +0000 (UTC) From: Stefano Garzarella To: qemu-devel@nongnu.org Date: Thu, 9 May 2019 15:03:45 +0200 Message-Id: <20190509130345.227526-5-sgarzare@redhat.com> In-Reply-To: <20190509130345.227526-1-sgarzare@redhat.com> References: <20190509130345.227526-1-sgarzare@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 09 May 2019 13:03:58 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 4/4] net: remove unused get_str_sep() function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jason Wang , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Since the get_str_sep() function is no longer used in net/net.c, we can remove it. Signed-off-by: Stefano Garzarella Reviewed-by: Markus Armbruster --- net/net.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/net/net.c b/net/net.c index 570e093c4f..52496caca5 100644 --- a/net/net.c +++ b/net/net.c @@ -63,26 +63,6 @@ static QTAILQ_HEAD(, NetClientState) net_clients; /***********************************************************/ /* network device redirectors */ =20 -static int get_str_sep(char *buf, int buf_size, const char **pp, int sep) -{ - const char *p, *p1; - int len; - p =3D *pp; - p1 =3D strchr(p, sep); - if (!p1) - return -1; - len =3D p1 - p; - p1++; - if (buf_size > 0) { - if (len > buf_size - 1) - len =3D buf_size - 1; - memcpy(buf, p, len); - buf[len] =3D '\0'; - } - *pp =3D p1; - return 0; -} - int parse_host_port(struct sockaddr_in *saddr, const char *str, Error **errp) { --=20 2.20.1