From patchwork Thu Jul 9 19:42:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 1326173 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=BjhGlp0o; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B2mnG2r5tz9sRk for ; Fri, 10 Jul 2020 05:43:30 +1000 (AEST) Received: from localhost ([::1]:45232 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jtcS8-0005gr-36 for incoming@patchwork.ozlabs.org; Thu, 09 Jul 2020 15:43:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58214) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jtcRe-0005fR-1l for qemu-devel@nongnu.org; Thu, 09 Jul 2020 15:42:58 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:23201 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jtcRb-0000L6-Fv for qemu-devel@nongnu.org; Thu, 09 Jul 2020 15:42:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594323774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UZcJrarPJgGm1jV7/efWRXPgvu2LKpJ/mvxKN0TDqE4=; b=BjhGlp0oTQnukoCFPGbG/J0Rn8uVVQw4dXkohS+xELag2mrmBclS0p8EHc8sA2qabClEjY T1OA8iqgaGDjK6I4v1XImqvWEVQwUwWCep8TK3AO0vikBuPug7yh7jIo+IAdBrYbi9vi28 1GZ6SQyublDPp7rCzVZSe88JICiO1DE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-98-Jj0fLsdFOyiIaWgSmdr-hQ-1; Thu, 09 Jul 2020 15:42:51 -0400 X-MC-Unique: Jj0fLsdFOyiIaWgSmdr-hQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C5FD11B18BC0; Thu, 9 Jul 2020 19:42:49 +0000 (UTC) Received: from localhost (unknown [10.36.110.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id DFB825C1C3; Thu, 9 Jul 2020 19:42:45 +0000 (UTC) From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= To: qemu-devel@nongnu.org Subject: [PATCH 01/13] uri: add g_auto macros for URI & QueryParams Date: Thu, 9 Jul 2020 23:42:22 +0400 Message-Id: <20200709194234.2117650-2-marcandre.lureau@redhat.com> In-Reply-To: <20200709194234.2117650-1-marcandre.lureau@redhat.com> References: <20200709194234.2117650-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.120; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/09 11:25:17 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , integration@gluster.org, sheepdog@lists.wpkg.org, qemu-block@nongnu.org, Peter Lieven , "Richard W.M. Jones" , Max Reitz , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Liu Yuan Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Marc-André Lureau --- include/qemu/uri.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/qemu/uri.h b/include/qemu/uri.h index d201c61260d..b246a59449b 100644 --- a/include/qemu/uri.h +++ b/include/qemu/uri.h @@ -105,6 +105,9 @@ struct QueryParams *query_params_new (int init_alloc); extern QueryParams *query_params_parse (const char *query); extern void query_params_free (QueryParams *ps); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(URI, uri_free) +G_DEFINE_AUTOPTR_CLEANUP_FUNC(QueryParams, query_params_free) + #ifdef __cplusplus } #endif From patchwork Thu Jul 9 19:42:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 1326174 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=A8RI5pv7; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B2mnX0Kd7z9sRk for ; Fri, 10 Jul 2020 05:43:44 +1000 (AEST) Received: from localhost ([::1]:46132 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jtcSL-00064A-MY for incoming@patchwork.ozlabs.org; Thu, 09 Jul 2020 15:43:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58280) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jtcRk-0005p7-TF for qemu-devel@nongnu.org; Thu, 09 Jul 2020 15:43:04 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:31261 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jtcRj-0000Ls-DT for qemu-devel@nongnu.org; Thu, 09 Jul 2020 15:43:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594323782; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=te6tqsuUblZeB+laI3sr13z1brb8lvD5tZ2Ty4GUvwY=; b=A8RI5pv7JVpkg5pwcDgfjMcmG4NZod7px0JK+nKbmSgK9Ahkx9yljhcHP2EtTMvWdN9ssF LanNFnOcyJCfEQ6HWQVinCotgnTXVC92zuEpHb3Y7uRErJYkt/LgJM43b3he7/h5CGaTOU +h07aTlNOFj4fdnwPLaEJI5xJZGwsbU= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-246-1Kj6Rd5yOd2B7XflZL25dA-1; Thu, 09 Jul 2020 15:42:58 -0400 X-MC-Unique: 1Kj6Rd5yOd2B7XflZL25dA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 887101B18BC1; Thu, 9 Jul 2020 19:42:57 +0000 (UTC) Received: from localhost (unknown [10.36.110.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8F98619D7C; Thu, 9 Jul 2020 19:42:53 +0000 (UTC) From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= To: qemu-devel@nongnu.org Subject: [PATCH 02/13] block/nbd: auto-ify URI parsing variables Date: Thu, 9 Jul 2020 23:42:23 +0400 Message-Id: <20200709194234.2117650-3-marcandre.lureau@redhat.com> In-Reply-To: <20200709194234.2117650-1-marcandre.lureau@redhat.com> References: <20200709194234.2117650-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.120; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/09 11:25:17 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , integration@gluster.org, sheepdog@lists.wpkg.org, qemu-block@nongnu.org, Peter Lieven , "Richard W.M. Jones" , Max Reitz , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Liu Yuan Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Marc-André Lureau --- block/nbd.c | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index eed160c5cda..faadcab442b 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -1516,10 +1516,9 @@ static int nbd_client_connect(BlockDriverState *bs, Error **errp) static int nbd_parse_uri(const char *filename, QDict *options) { - URI *uri; + g_autoptr(URI) uri = NULL; + g_autoptr(QueryParams) qp = NULL; const char *p; - QueryParams *qp = NULL; - int ret = 0; bool is_unix; uri = uri_parse(filename); @@ -1535,8 +1534,7 @@ static int nbd_parse_uri(const char *filename, QDict *options) } else if (!g_strcmp0(uri->scheme, "nbd+unix")) { is_unix = true; } else { - ret = -EINVAL; - goto out; + return -EINVAL; } p = uri->path ? uri->path : ""; @@ -1549,26 +1547,23 @@ static int nbd_parse_uri(const char *filename, QDict *options) qp = query_params_parse(uri->query); if (qp->n > 1 || (is_unix && !qp->n) || (!is_unix && qp->n)) { - ret = -EINVAL; - goto out; + return -EINVAL; } if (is_unix) { /* nbd+unix:///export?socket=path */ if (uri->server || uri->port || strcmp(qp->p[0].name, "socket")) { - ret = -EINVAL; - goto out; + return -EINVAL; } qdict_put_str(options, "server.type", "unix"); qdict_put_str(options, "server.path", qp->p[0].value); } else { QString *host; - char *port_str; + g_autofree char *port_str = NULL; /* nbd[+tcp]://host[:port]/export */ if (!uri->server) { - ret = -EINVAL; - goto out; + return -EINVAL; } /* strip braces from literal IPv6 address */ @@ -1584,15 +1579,9 @@ static int nbd_parse_uri(const char *filename, QDict *options) port_str = g_strdup_printf("%d", uri->port ?: NBD_DEFAULT_PORT); qdict_put_str(options, "server.port", port_str); - g_free(port_str); } -out: - if (qp) { - query_params_free(qp); - } - uri_free(uri); - return ret; + return 0; } static bool nbd_has_filename_options_conflict(QDict *options, Error **errp) From patchwork Thu Jul 9 19:42:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 1326178 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=H2iOH26v; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B2mpk6x1Rz9sRk for ; Fri, 10 Jul 2020 05:44:46 +1000 (AEST) Received: from localhost ([::1]:52404 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jtcTM-0000Df-KE for incoming@patchwork.ozlabs.org; Thu, 09 Jul 2020 15:44:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58334) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jtcRr-0005yW-LL for qemu-devel@nongnu.org; Thu, 09 Jul 2020 15:43:11 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:58561 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jtcRq-0000MU-2v for qemu-devel@nongnu.org; Thu, 09 Jul 2020 15:43:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594323789; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7oIY682DeEuaCbUEJmw3MHm6R2Ne5vdY+4EdtReIoGY=; b=H2iOH26vAt4jpIfVNgzwliSU2K51oX22khy68QaQvdzamvsXlK7L67LVxpUwqCIVy3l7+p 76j9Kktth42QaskHFDWYo3q5ClFCf2AJ0jSo4RVPgJWD1BBj4rn3+JjNn59nWg18e5G4AH RcaZ5bJDLLpTRjd3rXXpDB31vnezaUI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-196-LIN7KR14OAWIIdVRKeizgw-1; Thu, 09 Jul 2020 15:43:07 -0400 X-MC-Unique: LIN7KR14OAWIIdVRKeizgw-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 32A06C7466; Thu, 9 Jul 2020 19:43:06 +0000 (UTC) Received: from localhost (unknown [10.36.110.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8CE677981F; Thu, 9 Jul 2020 19:43:02 +0000 (UTC) From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= To: qemu-devel@nongnu.org Subject: [PATCH 03/13] block/vxhs: auto-ify URI parsing variables Date: Thu, 9 Jul 2020 23:42:24 +0400 Message-Id: <20200709194234.2117650-4-marcandre.lureau@redhat.com> In-Reply-To: <20200709194234.2117650-1-marcandre.lureau@redhat.com> References: <20200709194234.2117650-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.120; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/09 11:25:17 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , integration@gluster.org, sheepdog@lists.wpkg.org, qemu-block@nongnu.org, Peter Lieven , "Richard W.M. Jones" , Max Reitz , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Liu Yuan Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Marc-André Lureau --- block/vxhs.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/block/vxhs.c b/block/vxhs.c index d79fc97df66..5d61cfb7548 100644 --- a/block/vxhs.c +++ b/block/vxhs.c @@ -174,14 +174,12 @@ static QemuOptsList runtime_tcp_opts = { */ static int vxhs_parse_uri(const char *filename, QDict *options) { - URI *uri = NULL; - char *port; - int ret = 0; + g_autoptr(URI) uri = NULL; + g_autofree char *port = NULL; trace_vxhs_parse_uri_filename(filename); uri = uri_parse(filename); if (!uri || !uri->server || !uri->path) { - uri_free(uri); return -EINVAL; } @@ -190,15 +188,13 @@ static int vxhs_parse_uri(const char *filename, QDict *options) if (uri->port) { port = g_strdup_printf("%d", uri->port); qdict_put_str(options, VXHS_OPT_SERVER ".port", port); - g_free(port); } qdict_put_str(options, "vdisk-id", uri->path); trace_vxhs_parse_uri_hostinfo(uri->server, uri->port); - uri_free(uri); - return ret; + return 0; } static void vxhs_parse_filename(const char *filename, QDict *options, From patchwork Thu Jul 9 19:42:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 1326182 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=JgmrPsOg; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B2mrg5SL6z9sRk for ; Fri, 10 Jul 2020 05:46:27 +1000 (AEST) Received: from localhost ([::1]:60918 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jtcUz-0003tR-EV for incoming@patchwork.ozlabs.org; Thu, 09 Jul 2020 15:46:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58388) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jtcS1-00069y-NM for qemu-devel@nongnu.org; Thu, 09 Jul 2020 15:43:21 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:51697 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jtcS0-0000OY-15 for qemu-devel@nongnu.org; Thu, 09 Jul 2020 15:43:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594323799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nmjlxskDCNemjY9i5T2AIdzGVyyu8NbAXBMJEbycPOk=; b=JgmrPsOgPkWsH12KaRIpyVRrexd0E7K3xM3hcl119SY/0OtNDRo582CSqFf/SqT6nYAGty K83l6jtATFpB716XiCeWzAcKEfOR6lODoy13cK/UBJJUxfjCgfISziPsqeVb6TuHFzrN+3 hY8y8CnkTI/U2ft4sKA49dzikhseJ2U= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-380-M8iumT7oN4qMotzwYR6COg-1; Thu, 09 Jul 2020 15:43:15 -0400 X-MC-Unique: M8iumT7oN4qMotzwYR6COg-1 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 730DCC7465; Thu, 9 Jul 2020 19:43:14 +0000 (UTC) Received: from localhost (unknown [10.36.110.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 460F160C80; Thu, 9 Jul 2020 19:43:09 +0000 (UTC) From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= To: qemu-devel@nongnu.org Subject: [PATCH 04/13] block/sheepdog: auto-ify URI parsing variables Date: Thu, 9 Jul 2020 23:42:25 +0400 Message-Id: <20200709194234.2117650-5-marcandre.lureau@redhat.com> In-Reply-To: <20200709194234.2117650-1-marcandre.lureau@redhat.com> References: <20200709194234.2117650-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.61; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/09 10:34:01 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , integration@gluster.org, sheepdog@lists.wpkg.org, qemu-block@nongnu.org, Peter Lieven , "Richard W.M. Jones" , Max Reitz , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Liu Yuan Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Since we are going to introduce URI parsing alternative, I changed the way SheepdogConfig takes care of host/path & URI/QueryParams lifetimes. Signed-off-by: Marc-André Lureau --- block/sheepdog.c | 72 ++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 42 deletions(-) diff --git a/block/sheepdog.c b/block/sheepdog.c index 27a30d17f4c..3403adfc2cd 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -986,39 +986,33 @@ static bool sd_parse_snapid_or_tag(const char *str, } typedef struct { - const char *path; /* non-null iff transport is tcp */ - const char *host; /* valid when transport is tcp */ + char *path; /* non-null iff transport is tcp */ + char *host; /* valid when transport is tcp */ int port; /* valid when transport is tcp */ char vdi[SD_MAX_VDI_LEN]; char tag[SD_MAX_VDI_TAG_LEN]; uint32_t snap_id; - /* Remainder is only for sd_config_done() */ - URI *uri; - QueryParams *qp; } SheepdogConfig; static void sd_config_done(SheepdogConfig *cfg) { - if (cfg->qp) { - query_params_free(cfg->qp); - } - uri_free(cfg->uri); + g_clear_pointer(&cfg->host, g_free); + g_clear_pointer(&cfg->path, g_free); } static void sd_parse_uri(SheepdogConfig *cfg, const char *filename, Error **errp) { - Error *err = NULL; - QueryParams *qp = NULL; + g_autoptr(QueryParams) qp = NULL; + g_autoptr(URI) uri = NULL; bool is_unix; - URI *uri; memset(cfg, 0, sizeof(*cfg)); - cfg->uri = uri = uri_parse(filename); + uri = uri_parse(filename); if (!uri) { - error_setg(&err, "invalid URI '%s'", filename); - goto out; + error_setg(errp, "invalid URI '%s'", filename); + return; } /* transport */ @@ -1029,48 +1023,48 @@ static void sd_parse_uri(SheepdogConfig *cfg, const char *filename, } else if (!g_strcmp0(uri->scheme, "sheepdog+unix")) { is_unix = true; } else { - error_setg(&err, "URI scheme must be 'sheepdog', 'sheepdog+tcp'," + error_setg(errp, "URI scheme must be 'sheepdog', 'sheepdog+tcp'," " or 'sheepdog+unix'"); - goto out; + return; } if (uri->path == NULL || !strcmp(uri->path, "/")) { - error_setg(&err, "missing file path in URI"); - goto out; + error_setg(errp, "missing file path in URI"); + return; } if (g_strlcpy(cfg->vdi, uri->path + 1, SD_MAX_VDI_LEN) >= SD_MAX_VDI_LEN) { - error_setg(&err, "VDI name is too long"); - goto out; + error_setg(errp, "VDI name is too long"); + return; } - cfg->qp = qp = query_params_parse(uri->query); + qp = query_params_parse(uri->query); if (is_unix) { /* sheepdog+unix:///vdiname?socket=path */ if (uri->server || uri->port) { - error_setg(&err, "URI scheme %s doesn't accept a server address", + error_setg(errp, "URI scheme %s doesn't accept a server address", uri->scheme); - goto out; + return; } if (!qp->n) { - error_setg(&err, + error_setg(errp, "URI scheme %s requires query parameter 'socket'", uri->scheme); - goto out; + return; } if (qp->n != 1 || strcmp(qp->p[0].name, "socket")) { - error_setg(&err, "unexpected query parameters"); - goto out; + error_setg(errp, "unexpected query parameters"); + return; } - cfg->path = qp->p[0].value; + cfg->path = g_strdup(qp->p[0].value); } else { /* sheepdog[+tcp]://[host:port]/vdiname */ if (qp->n) { - error_setg(&err, "unexpected query parameters"); - goto out; + error_setg(errp, "unexpected query parameters"); + return; } - cfg->host = uri->server; + cfg->host = g_strdup(uri->server); cfg->port = uri->port; } @@ -1078,19 +1072,13 @@ static void sd_parse_uri(SheepdogConfig *cfg, const char *filename, if (uri->fragment) { if (!sd_parse_snapid_or_tag(uri->fragment, &cfg->snap_id, cfg->tag)) { - error_setg(&err, "'%s' is not a valid snapshot ID", + error_setg(errp, "'%s' is not a valid snapshot ID", uri->fragment); - goto out; + return; } } else { cfg->snap_id = CURRENT_VDI_ID; /* search current vdi */ } - -out: - if (err) { - error_propagate(errp, err); - sd_config_done(cfg); - } } /* @@ -1184,7 +1172,7 @@ static void sd_parse_filename(const char *filename, QDict *options, } if (err) { error_propagate(errp, err); - return; + goto end; } if (cfg.path) { @@ -1203,7 +1191,7 @@ static void sd_parse_filename(const char *filename, QDict *options, snprintf(buf, sizeof(buf), "%d", cfg.snap_id); qdict_set_default_str(options, "snap-id", buf); } - +end: sd_config_done(&cfg); } From patchwork Thu Jul 9 19:42:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 1326175 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=TV3LKpem; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B2mnn3GW8z9sSd for ; Fri, 10 Jul 2020 05:43:57 +1000 (AEST) Received: from localhost ([::1]:47098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jtcSZ-0006TI-5J for incoming@patchwork.ozlabs.org; Thu, 09 Jul 2020 15:43:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58430) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jtcS9-0006PA-3r for qemu-devel@nongnu.org; Thu, 09 Jul 2020 15:43:29 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:35392 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jtcS7-0000P4-1l for qemu-devel@nongnu.org; Thu, 09 Jul 2020 15:43:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594323806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nlDr7m50Avem+YD/KNfppD5uwE9lQQqI2yaQRTjmWAY=; b=TV3LKpemyusQbzQjRTOasLMNPGPg/Sw9WgThWwPhkADIq2ebInUsX/TRWBKe75CzRASyCA 76H/nVinI//IpG1hNl1g8vqV10B/JNSzveEd27uJAIeCpPGvHa6Axdtpv+7ZXredGk16Fi DCdu1R00Dyva9HoRjtEJ7v3D5jYIL1U= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-320-D4Xzcr0EMwGvc-MaSAIWdA-1; Thu, 09 Jul 2020 15:43:24 -0400 X-MC-Unique: D4Xzcr0EMwGvc-MaSAIWdA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 43AC3102C7ED; Thu, 9 Jul 2020 19:43:23 +0000 (UTC) Received: from localhost (unknown [10.36.110.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2C9631972D; Thu, 9 Jul 2020 19:43:18 +0000 (UTC) From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= To: qemu-devel@nongnu.org Subject: [PATCH 05/13] block/ssh: auto-ify URI parsing variables Date: Thu, 9 Jul 2020 23:42:26 +0400 Message-Id: <20200709194234.2117650-6-marcandre.lureau@redhat.com> In-Reply-To: <20200709194234.2117650-1-marcandre.lureau@redhat.com> References: <20200709194234.2117650-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.120; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/09 11:25:17 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , integration@gluster.org, sheepdog@lists.wpkg.org, qemu-block@nongnu.org, Peter Lieven , "Richard W.M. Jones" , Max Reitz , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Liu Yuan Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Marc-André Lureau --- block/ssh.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/block/ssh.c b/block/ssh.c index 098dbe03c15..c8f6ad79e3c 100644 --- a/block/ssh.c +++ b/block/ssh.c @@ -180,9 +180,9 @@ static void sftp_error_trace(BDRVSSHState *s, const char *op) static int parse_uri(const char *filename, QDict *options, Error **errp) { - URI *uri = NULL; - QueryParams *qp; - char *port_str; + g_autoptr(URI) uri = NULL; + g_autoptr(QueryParams) qp = NULL; + g_autofree char *port_str = NULL; int i; uri = uri_parse(filename); @@ -192,23 +192,23 @@ static int parse_uri(const char *filename, QDict *options, Error **errp) if (g_strcmp0(uri->scheme, "ssh") != 0) { error_setg(errp, "URI scheme must be 'ssh'"); - goto err; + return -EINVAL; } if (!uri->server || strcmp(uri->server, "") == 0) { error_setg(errp, "missing hostname in URI"); - goto err; + return -EINVAL; } if (!uri->path || strcmp(uri->path, "") == 0) { error_setg(errp, "missing remote path in URI"); - goto err; + return -EINVAL; } qp = query_params_parse(uri->query); if (!qp) { error_setg(errp, "could not parse query parameters"); - goto err; + return -EINVAL; } if(uri->user && strcmp(uri->user, "") != 0) { @@ -219,7 +219,6 @@ static int parse_uri(const char *filename, QDict *options, Error **errp) port_str = g_strdup_printf("%d", uri->port ?: 22); qdict_put_str(options, "server.port", port_str); - g_free(port_str); qdict_put_str(options, "path", uri->path); @@ -232,15 +231,7 @@ static int parse_uri(const char *filename, QDict *options, Error **errp) } } - query_params_free(qp); - uri_free(uri); return 0; - - err: - if (uri) { - uri_free(uri); - } - return -EINVAL; } static bool ssh_has_filename_options_conflict(QDict *options, Error **errp) From patchwork Thu Jul 9 19:42:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 1326184 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=UQv0JRl4; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B2mtJ15GVz9sRk for ; Fri, 10 Jul 2020 05:47:52 +1000 (AEST) Received: from localhost ([::1]:38666 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jtcWL-0006NR-TA for incoming@patchwork.ozlabs.org; Thu, 09 Jul 2020 15:47:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58482) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jtcSJ-0006oF-Dq for qemu-devel@nongnu.org; Thu, 09 Jul 2020 15:43:39 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:50725 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jtcSG-0000Pb-O2 for qemu-devel@nongnu.org; Thu, 09 Jul 2020 15:43:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594323816; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=t+IbM3xwYAY/VI4dtaY7g+fX5XhriWiuxxDy+v1AUxs=; b=UQv0JRl4IBsy98n+Jtf/7hb21GfdEH/OxsTkP0slByVjWnIKw14LpPHjUmp7aS6mHlHjc/ ALegtpD/WzAgITdbz9MGkv8YG/98qCsU5TXu592YU0Z3IsIMgRwrDfGo+nC8tVX1VEkIaV ZDve3VKHc8UodH8v1lTOEL1FKQpwEFo= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-98-r6WXM9-JPSy09rGqassihQ-1; Thu, 09 Jul 2020 15:43:32 -0400 X-MC-Unique: r6WXM9-JPSy09rGqassihQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E934780040A; Thu, 9 Jul 2020 19:43:30 +0000 (UTC) Received: from localhost (unknown [10.36.110.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2CC8F7F8A5; Thu, 9 Jul 2020 19:43:26 +0000 (UTC) From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= To: qemu-devel@nongnu.org Subject: [PATCH 06/13] block/nfs: auto-ify URI parsing variables Date: Thu, 9 Jul 2020 23:42:27 +0400 Message-Id: <20200709194234.2117650-7-marcandre.lureau@redhat.com> In-Reply-To: <20200709194234.2117650-1-marcandre.lureau@redhat.com> References: <20200709194234.2117650-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.61; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/09 10:34:01 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , integration@gluster.org, sheepdog@lists.wpkg.org, qemu-block@nongnu.org, Peter Lieven , "Richard W.M. Jones" , Max Reitz , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Liu Yuan Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Marc-André Lureau --- block/nfs.c | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/block/nfs.c b/block/nfs.c index b1718d125a4..93d719551d2 100644 --- a/block/nfs.c +++ b/block/nfs.c @@ -77,34 +77,34 @@ typedef struct NFSRPC { static int nfs_parse_uri(const char *filename, QDict *options, Error **errp) { - URI *uri = NULL; - QueryParams *qp = NULL; - int ret = -EINVAL, i; + g_autoptr(URI) uri = NULL; + g_autoptr(QueryParams) qp = NULL; + int i; uri = uri_parse(filename); if (!uri) { error_setg(errp, "Invalid URI specified"); - goto out; + return -EINVAL; } if (g_strcmp0(uri->scheme, "nfs") != 0) { error_setg(errp, "URI scheme must be 'nfs'"); - goto out; + return -EINVAL; } if (!uri->server) { error_setg(errp, "missing hostname in URI"); - goto out; + return -EINVAL; } if (!uri->path) { error_setg(errp, "missing file path in URI"); - goto out; + return -EINVAL; } qp = query_params_parse(uri->query); if (!qp) { error_setg(errp, "could not parse query parameters"); - goto out; + return -EINVAL; } qdict_put_str(options, "server.host", uri->server); @@ -116,12 +116,12 @@ static int nfs_parse_uri(const char *filename, QDict *options, Error **errp) if (!qp->p[i].value) { error_setg(errp, "Value for NFS parameter expected: %s", qp->p[i].name); - goto out; + return -EINVAL; } if (parse_uint_full(qp->p[i].value, &val, 0)) { error_setg(errp, "Illegal value for NFS parameter: %s", qp->p[i].name); - goto out; + return -EINVAL; } if (!strcmp(qp->p[i].name, "uid")) { qdict_put_str(options, "user", qp->p[i].value); @@ -138,18 +138,10 @@ static int nfs_parse_uri(const char *filename, QDict *options, Error **errp) } else { error_setg(errp, "Unknown NFS parameter name: %s", qp->p[i].name); - goto out; + return -EINVAL; } } - ret = 0; -out: - if (qp) { - query_params_free(qp); - } - if (uri) { - uri_free(uri); - } - return ret; + return 0; } static bool nfs_has_filename_options_conflict(QDict *options, Error **errp) From patchwork Thu Jul 9 19:42:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 1326180 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=hahLgtQ1; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B2mqJ49rFz9sSJ for ; Fri, 10 Jul 2020 05:45:16 +1000 (AEST) Received: from localhost ([::1]:55570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jtcTq-0001Y9-8f for incoming@patchwork.ozlabs.org; Thu, 09 Jul 2020 15:45:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58504) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jtcSL-0006sg-7g for qemu-devel@nongnu.org; Thu, 09 Jul 2020 15:43:41 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:29928 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jtcSJ-0000Pz-O1 for qemu-devel@nongnu.org; Thu, 09 Jul 2020 15:43:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594323819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=w3v0OvPrnRzLS4tBxGtk+XVFvBiWN7UBLmvU5flzVSY=; b=hahLgtQ1jMS+XMNCCWyB05PYl4cXRgYmKsc6uEVaXHxpa6BgKF1w1Ip0ZkMm1gaTwd7VRB X9ktDK1qwEpZCqHQrN3tZQUOfyvHnk5twqTZu7dBu3HSXbvQgdLHgElsC/jwt5EDyi9OHd cFkNu8+V8lrKUuT9lz231MuJjRh4QLc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-508-W90mSXxtNdGPkMnrsun0fA-1; Thu, 09 Jul 2020 15:43:37 -0400 X-MC-Unique: W90mSXxtNdGPkMnrsun0fA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DECAD80BCB2; Thu, 9 Jul 2020 19:43:35 +0000 (UTC) Received: from localhost (unknown [10.36.110.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 081B87F8A5; Thu, 9 Jul 2020 19:43:34 +0000 (UTC) From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= To: qemu-devel@nongnu.org Subject: [PATCH 07/13] block/gluster: auto-ify URI parsing variables Date: Thu, 9 Jul 2020 23:42:28 +0400 Message-Id: <20200709194234.2117650-8-marcandre.lureau@redhat.com> In-Reply-To: <20200709194234.2117650-1-marcandre.lureau@redhat.com> References: <20200709194234.2117650-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.120; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/09 11:25:17 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , integration@gluster.org, sheepdog@lists.wpkg.org, qemu-block@nongnu.org, Peter Lieven , "Richard W.M. Jones" , Max Reitz , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Liu Yuan Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Marc-André Lureau --- block/gluster.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/block/gluster.c b/block/gluster.c index 31233cac696..c06eca1c12f 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -349,10 +349,10 @@ static int qemu_gluster_parse_uri(BlockdevOptionsGluster *gconf, const char *filename) { SocketAddress *gsconf; - URI *uri; - QueryParams *qp = NULL; + g_autoptr(URI) uri = NULL; + g_autoptr(QueryParams) qp = NULL; bool is_unix = false; - int ret = 0; + int ret; uri = uri_parse(filename); if (!uri) { @@ -374,29 +374,25 @@ static int qemu_gluster_parse_uri(BlockdevOptionsGluster *gconf, gsconf->type = SOCKET_ADDRESS_TYPE_INET; warn_report("rdma feature is not supported, falling back to tcp"); } else { - ret = -EINVAL; - goto out; + return -EINVAL; } ret = parse_volume_options(gconf, uri->path); if (ret < 0) { - goto out; + return ret; } qp = query_params_parse(uri->query); if (qp->n > 1 || (is_unix && !qp->n) || (!is_unix && qp->n)) { - ret = -EINVAL; - goto out; + return -EINVAL; } if (is_unix) { if (uri->server || uri->port) { - ret = -EINVAL; - goto out; + return -EINVAL; } if (strcmp(qp->p[0].name, "socket")) { - ret = -EINVAL; - goto out; + return -EINVAL; } gsconf->u.q_unix.path = g_strdup(qp->p[0].value); } else { @@ -408,12 +404,7 @@ static int qemu_gluster_parse_uri(BlockdevOptionsGluster *gconf, } } -out: - if (qp) { - query_params_free(qp); - } - uri_free(uri); - return ret; + return 0; } static struct glfs *qemu_gluster_glfs_init(BlockdevOptionsGluster *gconf, From patchwork Thu Jul 9 19:42:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 1326183 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=MW7/6ptE; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B2msP72VFz9sRk for ; Fri, 10 Jul 2020 05:47:05 +1000 (AEST) Received: from localhost ([::1]:35882 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jtcVb-0005Eg-L4 for incoming@patchwork.ozlabs.org; Thu, 09 Jul 2020 15:47:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58558) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jtcSV-0007Hn-2I for qemu-devel@nongnu.org; Thu, 09 Jul 2020 15:43:51 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:44413 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jtcST-0000RD-JL for qemu-devel@nongnu.org; Thu, 09 Jul 2020 15:43:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594323828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Bkl7cwOb2a8P7fMe9noZEIdXMC9VahbQOXgtqu+JrC0=; b=MW7/6ptETNuSt7nue31edwWeFMgq/tCiCZLXQs/8WWdH+K+amStAvst5vh78C+ri6lYqNE TGr2OXZ7OwR0e0INigjnSFdJnkbkJhlGZhRjRM/9+U0wENcFbRGCkH7LN7dc4HN8PDvfhr JKvD8LHBsUxFgly1JggduZZm3f6/PdA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-459-pClpXKNPOVa8L_p8CTyH_g-1; Thu, 09 Jul 2020 15:43:45 -0400 X-MC-Unique: pClpXKNPOVa8L_p8CTyH_g-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BA6EB1086; Thu, 9 Jul 2020 19:43:43 +0000 (UTC) Received: from localhost (unknown [10.36.110.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id D8FCF79CE6; Thu, 9 Jul 2020 19:43:39 +0000 (UTC) From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= To: qemu-devel@nongnu.org Subject: [PATCH 08/13] build-sys: add HAVE_GLIB_GURI Date: Thu, 9 Jul 2020 23:42:29 +0400 Message-Id: <20200709194234.2117650-9-marcandre.lureau@redhat.com> In-Reply-To: <20200709194234.2117650-1-marcandre.lureau@redhat.com> References: <20200709194234.2117650-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=207.211.31.120; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/09 11:02:45 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , integration@gluster.org, sheepdog@lists.wpkg.org, qemu-block@nongnu.org, Peter Lieven , "Richard W.M. Jones" , Max Reitz , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Liu Yuan Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Marc-André Lureau --- configure | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/configure b/configure index ee6c3c6792a..cd2fc120aed 100755 --- a/configure +++ b/configure @@ -3924,6 +3924,10 @@ if $pkg_config --atleast-version=$glib_req_ver gio-unix-2.0; then gio_libs="$gio_libs $($pkg_config --libs gio-unix-2.0)" fi +if $pkg_config --atleast-version=2.65.0 glib-2.0; then + glib_guri=yes +fi + # Sanity check that the current size_t matches the # size that glib thinks it should be. This catches # problems on multi-arch where people try to build @@ -7377,6 +7381,9 @@ if test "$gio" = "yes" ; then echo "GIO_LIBS=$gio_libs" >> $config_host_mak echo "GDBUS_CODEGEN=$gdbus_codegen" >> $config_host_mak fi +if test "$glib_guri" = "yes" ; then + echo "HAVE_GLIB_GURI=y" >> $config_host_mak +fi echo "CONFIG_TLS_PRIORITY=\"$tls_priority\"" >> $config_host_mak if test "$gnutls" = "yes" ; then echo "CONFIG_GNUTLS=y" >> $config_host_mak From patchwork Thu Jul 9 19:42:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 1326187 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=fo1RCabv; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B2mtw39Vgz9sSd for ; Fri, 10 Jul 2020 05:48:23 +1000 (AEST) Received: from localhost ([::1]:40438 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jtcWq-00077B-2z for incoming@patchwork.ozlabs.org; Thu, 09 Jul 2020 15:48:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58634) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jtcSd-0007dU-6M for qemu-devel@nongnu.org; Thu, 09 Jul 2020 15:43:59 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:37184 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jtcSb-0000SU-Jt for qemu-devel@nongnu.org; Thu, 09 Jul 2020 15:43:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594323836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Pk3jIQFr9iRGsjTDLaCnZKtMC1NMpbKjg4fliRW6U+4=; b=fo1RCabvnpBMAbik8YsJjBs/frH4sfaNt64uCtxtIRXaDdg1EDS4MTj0Va3pumLKiS93xK Vyh8FnO8sqB5bKTS2oHzH23q8gU0MtZeJSbaWYqErFwp0VjKwubk4DMHOynltPqye6OerF fSYKSTEfXEYyHUcMZ1pS/d7NURlF/xY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-313-TmxEc6QKOAmjWnysWdc2uw-1; Thu, 09 Jul 2020 15:43:53 -0400 X-MC-Unique: TmxEc6QKOAmjWnysWdc2uw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0FB80100A8E7; Thu, 9 Jul 2020 19:43:52 +0000 (UTC) Received: from localhost (unknown [10.36.110.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0901E5C1C3; Thu, 9 Jul 2020 19:43:47 +0000 (UTC) From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= To: qemu-devel@nongnu.org Subject: [PATCH 09/13] nbd: add GUri-based URI parsing version Date: Thu, 9 Jul 2020 23:42:30 +0400 Message-Id: <20200709194234.2117650-10-marcandre.lureau@redhat.com> In-Reply-To: <20200709194234.2117650-1-marcandre.lureau@redhat.com> References: <20200709194234.2117650-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=207.211.31.120; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/09 11:02:45 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , integration@gluster.org, sheepdog@lists.wpkg.org, qemu-block@nongnu.org, Peter Lieven , "Richard W.M. Jones" , Max Reitz , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Liu Yuan Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Marc-André Lureau --- block/nbd.c | 86 +++++++++++++++++++++++++++++++++++----------- util/Makefile.objs | 2 +- 2 files changed, 66 insertions(+), 22 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index faadcab442b..fdc4a53a98f 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -31,7 +31,10 @@ #include "qemu/osdep.h" #include "trace.h" +#ifndef HAVE_GLIB_GURI #include "qemu/uri.h" +#endif +#include "qemu/error-report.h" #include "qemu/option.h" #include "qemu/cutils.h" #include "qemu/main-loop.h" @@ -1513,71 +1516,112 @@ static int nbd_client_connect(BlockDriverState *bs, Error **errp) /* * Parse nbd_open options */ - static int nbd_parse_uri(const char *filename, QDict *options) { + const char *p, *scheme, *server, *socket = NULL; + int port; + bool is_unix; + +#ifdef HAVE_GLIB_GURI + g_autoptr(GUri) uri = NULL; + g_autoptr(GHashTable) params = NULL; + g_autoptr(GError) err = NULL; + + uri = g_uri_parse(filename, G_URI_FLAGS_ENCODED_QUERY, &err); + if (!uri) { + error_report("Failed to parse NBD URI: %s", err->message); + return -EINVAL; + } + + p = g_uri_get_path(uri); + scheme = g_uri_get_scheme(uri); + server = g_uri_get_host(uri); + port = g_uri_get_port(uri); +#else g_autoptr(URI) uri = NULL; g_autoptr(QueryParams) qp = NULL; - const char *p; - bool is_unix; uri = uri_parse(filename); if (!uri) { return -EINVAL; } + p = uri->path ? uri->path : ""; + scheme = uri->scheme; + server = uri->server; + port = uri->port; +#endif /* transport */ - if (!g_strcmp0(uri->scheme, "nbd")) { + if (!g_strcmp0(scheme, "nbd")) { is_unix = false; - } else if (!g_strcmp0(uri->scheme, "nbd+tcp")) { + } else if (!g_strcmp0(scheme, "nbd+tcp")) { is_unix = false; - } else if (!g_strcmp0(uri->scheme, "nbd+unix")) { + } else if (!g_strcmp0(scheme, "nbd+unix")) { is_unix = true; } else { return -EINVAL; } - - p = uri->path ? uri->path : ""; - if (p[0] == '/') { - p++; +#ifdef HAVE_GLIB_GURI + params = g_uri_parse_params(g_uri_get_query(uri), -1, + "&;", G_URI_PARAMS_NONE, &err); + if (err) { + error_report("Failed to parse NBD URI query: %s", err->message); + return -EINVAL; } - if (p[0]) { - qdict_put_str(options, "export", p); + if ((is_unix && g_hash_table_size(params) != 1) || + (!is_unix && g_hash_table_size(params) != 0)) { + return -EINVAL; } - + if (is_unix) { + socket = g_hash_table_lookup(params, "socket"); + } +#else qp = query_params_parse(uri->query); if (qp->n > 1 || (is_unix && !qp->n) || (!is_unix && qp->n)) { return -EINVAL; } + if (is_unix) { + if (!g_str_equal(qp->p[0].name, "socket")) { + return -EINVAL; + } + socket = qp->p[0].value; + } +#endif + if (p[0] == '/') { + p++; + } + if (p[0]) { + qdict_put_str(options, "export", p); + } if (is_unix) { /* nbd+unix:///export?socket=path */ - if (uri->server || uri->port || strcmp(qp->p[0].name, "socket")) { + if (server || port > 0) { return -EINVAL; } qdict_put_str(options, "server.type", "unix"); - qdict_put_str(options, "server.path", qp->p[0].value); + qdict_put_str(options, "server.path", socket); } else { QString *host; g_autofree char *port_str = NULL; /* nbd[+tcp]://host[:port]/export */ - if (!uri->server) { + if (!server) { return -EINVAL; } /* strip braces from literal IPv6 address */ - if (uri->server[0] == '[') { - host = qstring_from_substr(uri->server, 1, - strlen(uri->server) - 1); + if (server[0] == '[') { + host = qstring_from_substr(server, 1, + strlen(server) - 1); } else { - host = qstring_from_str(uri->server); + host = qstring_from_str(server); } qdict_put_str(options, "server.type", "inet"); qdict_put(options, "server.host", host); - port_str = g_strdup_printf("%d", uri->port ?: NBD_DEFAULT_PORT); + port_str = g_strdup_printf("%d", port > 0 ? port : NBD_DEFAULT_PORT); qdict_put_str(options, "server.port", port_str); } diff --git a/util/Makefile.objs b/util/Makefile.objs index cc5e37177af..5a162178ae9 100644 --- a/util/Makefile.objs +++ b/util/Makefile.objs @@ -73,7 +73,7 @@ util-obj-y += qemu-timer.o util-obj-y += thread-pool.o util-obj-y += throttle.o util-obj-y += timed-average.o -util-obj-y += uri.o +util-obj-$(call lnot,$(HAVE_GLIB_GURI)) += uri.o util-obj-$(CONFIG_LINUX) += vfio-helpers.o util-obj-$(CONFIG_INOTIFY1) += filemonitor-inotify.o From patchwork Thu Jul 9 19:42:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 1326189 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=GF7To2tG; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B2mwT2pk4z9sRk for ; Fri, 10 Jul 2020 05:49:45 +1000 (AEST) Received: from localhost ([::1]:45718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jtcYB-0000qw-3S for incoming@patchwork.ozlabs.org; Thu, 09 Jul 2020 15:49:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58710) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jtcSk-0007xD-LO for qemu-devel@nongnu.org; Thu, 09 Jul 2020 15:44:06 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:55909 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jtcSh-0000UE-N6 for qemu-devel@nongnu.org; Thu, 09 Jul 2020 15:44:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594323843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=orucUJs9BYwbheLQH90BU619ZShw7HpU2oMyGQO+ISQ=; b=GF7To2tGppuvQ63kun5952sbZiEM3H3q2Loa5RQa1X+VupkPnxaHm3cU+onnrRAuuJDPjZ 9gYUtYFqyGoctbkUmfS5cFTMigcVeoqjU+BmGEMcYBPhH+m4PVWdD4TfcBXVCeSgJI6PEs 2uUjL8xlDA/cJ57djDK1nryk6QdeTec= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-404-SMNxH5eBM9mvJOnUQYAfdQ-1; Thu, 09 Jul 2020 15:44:01 -0400 X-MC-Unique: SMNxH5eBM9mvJOnUQYAfdQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 22B2F1B18BC0; Thu, 9 Jul 2020 19:44:00 +0000 (UTC) Received: from localhost (unknown [10.36.110.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0E3F410013D4; Thu, 9 Jul 2020 19:43:55 +0000 (UTC) From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= To: qemu-devel@nongnu.org Subject: [PATCH 10/13] sheepdog: add GUri-based URI parsing Date: Thu, 9 Jul 2020 23:42:31 +0400 Message-Id: <20200709194234.2117650-11-marcandre.lureau@redhat.com> In-Reply-To: <20200709194234.2117650-1-marcandre.lureau@redhat.com> References: <20200709194234.2117650-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.61; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/09 10:34:01 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , integration@gluster.org, sheepdog@lists.wpkg.org, qemu-block@nongnu.org, Peter Lieven , "Richard W.M. Jones" , Max Reitz , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Liu Yuan Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Marc-André Lureau --- block/sheepdog.c | 99 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 71 insertions(+), 28 deletions(-) diff --git a/block/sheepdog.c b/block/sheepdog.c index 3403adfc2cd..3f3f5b7dba9 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -1003,24 +1003,48 @@ static void sd_config_done(SheepdogConfig *cfg) static void sd_parse_uri(SheepdogConfig *cfg, const char *filename, Error **errp) { - g_autoptr(QueryParams) qp = NULL; - g_autoptr(URI) uri = NULL; + const char *scheme, *server, *path, *fragment, *socket = NULL; + int port; bool is_unix; - memset(cfg, 0, sizeof(*cfg)); +#ifdef HAVE_GLIB_GURI + g_autoptr(GUri) uri = NULL; + g_autoptr(GHashTable) params = NULL; + g_autoptr(GError) err = NULL; + + uri = g_uri_parse(filename, G_URI_FLAGS_ENCODED_QUERY, &err); + if (!uri) { + error_report("Failed to parse sheepdog URI: %s", err->message); + return; + } + scheme = g_uri_get_scheme(uri); + server = g_uri_get_host(uri); + port = g_uri_get_port(uri); + path = g_uri_get_path(uri); + fragment = g_uri_get_fragment(uri); +#else + g_autoptr(QueryParams) qp = NULL; + g_autoptr(URI) uri = NULL; uri = uri_parse(filename); if (!uri) { error_setg(errp, "invalid URI '%s'", filename); return; } + scheme = uri->scheme; + server = uri->server; + port = uri->port; + path = uri->path; + fragment = uri->fragment; +#endif + memset(cfg, 0, sizeof(*cfg)); /* transport */ - if (!g_strcmp0(uri->scheme, "sheepdog")) { + if (!g_strcmp0(scheme, "sheepdog")) { is_unix = false; - } else if (!g_strcmp0(uri->scheme, "sheepdog+tcp")) { + } else if (!g_strcmp0(scheme, "sheepdog+tcp")) { is_unix = false; - } else if (!g_strcmp0(uri->scheme, "sheepdog+unix")) { + } else if (!g_strcmp0(scheme, "sheepdog+unix")) { is_unix = true; } else { error_setg(errp, "URI scheme must be 'sheepdog', 'sheepdog+tcp'," @@ -1028,52 +1052,71 @@ static void sd_parse_uri(SheepdogConfig *cfg, const char *filename, return; } - if (uri->path == NULL || !strcmp(uri->path, "/")) { +#ifdef HAVE_GLIB_GURI + params = g_uri_parse_params(g_uri_get_query(uri), -1, + "&;", G_URI_PARAMS_NONE, &err); + if (err) { + error_report("Failed to parse sheepdog URI query: %s", err->message); + return; + } + if ((is_unix && g_hash_table_size(params) != 1) || + (!is_unix && g_hash_table_size(params) != 0)) { + error_setg(errp, "unexpected query parameters"); + return; + } + if (is_unix) { + socket = g_hash_table_lookup(params, "socket"); + } +#else + qp = query_params_parse(uri->query); + if (qp->n > 1 || (is_unix && !qp->n) || (!is_unix && qp->n)) { + error_setg(errp, "unexpected query parameters"); + return; + } + if (is_unix) { + if (!g_str_equal(qp->p[0].name, "socket")) { + error_setg(errp, "unexpected query parameters"); + return; + } + socket = qp->p[0].value; + } +#endif + if (path == NULL || !strcmp(path, "/")) { error_setg(errp, "missing file path in URI"); return; } - if (g_strlcpy(cfg->vdi, uri->path + 1, SD_MAX_VDI_LEN) + if (g_strlcpy(cfg->vdi, path + 1, SD_MAX_VDI_LEN) >= SD_MAX_VDI_LEN) { error_setg(errp, "VDI name is too long"); return; } - qp = query_params_parse(uri->query); - if (is_unix) { /* sheepdog+unix:///vdiname?socket=path */ - if (uri->server || uri->port) { + if (server || port > 0) { error_setg(errp, "URI scheme %s doesn't accept a server address", - uri->scheme); + scheme); return; } - if (!qp->n) { + if (!socket) { error_setg(errp, "URI scheme %s requires query parameter 'socket'", - uri->scheme); - return; - } - if (qp->n != 1 || strcmp(qp->p[0].name, "socket")) { - error_setg(errp, "unexpected query parameters"); + scheme); return; } - cfg->path = g_strdup(qp->p[0].value); + cfg->path = g_strdup(socket); } else { /* sheepdog[+tcp]://[host:port]/vdiname */ - if (qp->n) { - error_setg(errp, "unexpected query parameters"); - return; - } - cfg->host = g_strdup(uri->server); - cfg->port = uri->port; + cfg->host = g_strdup(server); + cfg->port = port; } /* snapshot tag */ - if (uri->fragment) { - if (!sd_parse_snapid_or_tag(uri->fragment, + if (fragment) { + if (!sd_parse_snapid_or_tag(fragment, &cfg->snap_id, cfg->tag)) { error_setg(errp, "'%s' is not a valid snapshot ID", - uri->fragment); + fragment); return; } } else { From patchwork Thu Jul 9 19:42:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 1326179 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=FpqFdxvL; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B2mq21HCbz9sRk for ; Fri, 10 Jul 2020 05:45:02 +1000 (AEST) Received: from localhost ([::1]:54164 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jtcTb-0000zl-RZ for incoming@patchwork.ozlabs.org; Thu, 09 Jul 2020 15:44:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58760) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jtcSs-0008Gy-1E for qemu-devel@nongnu.org; Thu, 09 Jul 2020 15:44:14 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:35571 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jtcSq-0000VI-Ar for qemu-devel@nongnu.org; Thu, 09 Jul 2020 15:44:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594323851; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4nWAkxL+6X+c3wT2WAkpUYykog4EA/234RQqsdrw+6k=; b=FpqFdxvLog40xdlOX3OrC38EY+WJ2wz3fa5JjE3n6GEqWqy/o8z6A5it7Aaya2MpMETw09 LRTA2+yHy0H2iyoPew5JTkKXnJsk5FCORpTvUQ3EbRifJ5f6GQVWgA6TDYHR7eSdXB+dC8 yA7fMzBbEGQxLlBTyIO3u8kjYgaF7hE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-377-c1oawY6qOZ6IkrNwIHI7Ig-1; Thu, 09 Jul 2020 15:44:09 -0400 X-MC-Unique: c1oawY6qOZ6IkrNwIHI7Ig-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 82E5D100A8E9; Thu, 9 Jul 2020 19:44:08 +0000 (UTC) Received: from localhost (unknown [10.36.110.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5414079CF4; Thu, 9 Jul 2020 19:44:03 +0000 (UTC) From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= To: qemu-devel@nongnu.org Subject: [PATCH 11/13] nfs: add GUri-based URI parsing Date: Thu, 9 Jul 2020 23:42:32 +0400 Message-Id: <20200709194234.2117650-12-marcandre.lureau@redhat.com> In-Reply-To: <20200709194234.2117650-1-marcandre.lureau@redhat.com> References: <20200709194234.2117650-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=207.211.31.120; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/09 11:02:45 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , integration@gluster.org, sheepdog@lists.wpkg.org, qemu-block@nongnu.org, Peter Lieven , "Richard W.M. Jones" , Max Reitz , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Liu Yuan Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Marc-André Lureau --- block/nfs.c | 96 ++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 65 insertions(+), 31 deletions(-) diff --git a/block/nfs.c b/block/nfs.c index 93d719551d2..0b24044535d 100644 --- a/block/nfs.c +++ b/block/nfs.c @@ -77,6 +77,31 @@ typedef struct NFSRPC { static int nfs_parse_uri(const char *filename, QDict *options, Error **errp) { + const char *scheme, *server, *path, *key, *value; + +#ifdef HAVE_GLIB_GURI + g_autoptr(GUri) uri = NULL; + g_autoptr(GHashTable) params = NULL; + g_autoptr(GError) err = NULL; + GHashTableIter iter; + + uri = g_uri_parse(filename, G_URI_FLAGS_ENCODED_QUERY, &err); + if (!uri) { + error_setg(errp, "Failed to parse NFS URI: %s", err->message); + return -EINVAL; + } + + params = g_uri_parse_params(g_uri_get_query(uri), -1, + "&;", G_URI_PARAMS_NONE, &err); + if (err) { + error_report("Failed to parse NFS URI query: %s", err->message); + return -EINVAL; + } + + scheme = g_uri_get_scheme(uri); + server = g_uri_get_host(uri); + path = g_uri_get_path(uri); +#else g_autoptr(URI) uri = NULL; g_autoptr(QueryParams) qp = NULL; int i; @@ -86,58 +111,67 @@ static int nfs_parse_uri(const char *filename, QDict *options, Error **errp) error_setg(errp, "Invalid URI specified"); return -EINVAL; } - if (g_strcmp0(uri->scheme, "nfs") != 0) { - error_setg(errp, "URI scheme must be 'nfs'"); + + qp = query_params_parse(uri->query); + if (!qp) { + error_setg(errp, "could not parse query parameters"); return -EINVAL; } - if (!uri->server) { - error_setg(errp, "missing hostname in URI"); + scheme = uri->scheme; + server = uri->server; + path = uri->path; +#endif + if (g_strcmp0(scheme, "nfs") != 0) { + error_setg(errp, "URI scheme must be 'nfs'"); return -EINVAL; } - if (!uri->path) { - error_setg(errp, "missing file path in URI"); + if (!server) { + error_setg(errp, "missing hostname in URI"); return -EINVAL; } - qp = query_params_parse(uri->query); - if (!qp) { - error_setg(errp, "could not parse query parameters"); + if (!path) { + error_setg(errp, "missing file path in URI"); return -EINVAL; } - qdict_put_str(options, "server.host", uri->server); + qdict_put_str(options, "server.host", server); qdict_put_str(options, "server.type", "inet"); - qdict_put_str(options, "path", uri->path); + qdict_put_str(options, "path", path); +#ifdef HAVE_GLIB_GURI + g_hash_table_iter_init(&iter, params); + while (g_hash_table_iter_next(&iter, (void **)&key, (void **)&value)) { +#else for (i = 0; i < qp->n; i++) { + key = qp->p[i].name; + value = qp->p[i].value; +#endif unsigned long long val; - if (!qp->p[i].value) { - error_setg(errp, "Value for NFS parameter expected: %s", - qp->p[i].name); + if (!value) { + error_setg(errp, "Value for NFS parameter expected: %s", key); return -EINVAL; } - if (parse_uint_full(qp->p[i].value, &val, 0)) { - error_setg(errp, "Illegal value for NFS parameter: %s", - qp->p[i].name); + if (parse_uint_full(value, &val, 0)) { + error_setg(errp, "Illegal value for NFS parameter: %s", key); return -EINVAL; } - if (!strcmp(qp->p[i].name, "uid")) { - qdict_put_str(options, "user", qp->p[i].value); - } else if (!strcmp(qp->p[i].name, "gid")) { - qdict_put_str(options, "group", qp->p[i].value); - } else if (!strcmp(qp->p[i].name, "tcp-syncnt")) { - qdict_put_str(options, "tcp-syn-count", qp->p[i].value); - } else if (!strcmp(qp->p[i].name, "readahead")) { - qdict_put_str(options, "readahead-size", qp->p[i].value); - } else if (!strcmp(qp->p[i].name, "pagecache")) { - qdict_put_str(options, "page-cache-size", qp->p[i].value); - } else if (!strcmp(qp->p[i].name, "debug")) { - qdict_put_str(options, "debug", qp->p[i].value); + if (!strcmp(key, "uid")) { + qdict_put_str(options, "user", value); + } else if (!strcmp(key, "gid")) { + qdict_put_str(options, "group", value); + } else if (!strcmp(key, "tcp-syncnt")) { + qdict_put_str(options, "tcp-syn-count", value); + } else if (!strcmp(key, "readahead")) { + qdict_put_str(options, "readahead-size", value); + } else if (!strcmp(key, "pagecache")) { + qdict_put_str(options, "page-cache-size", value); + } else if (!strcmp(key, "debug")) { + qdict_put_str(options, "debug", value); } else { - error_setg(errp, "Unknown NFS parameter name: %s", - qp->p[i].name); + error_setg(errp, "Unknown NFS parameter name: %s", key); return -EINVAL; } } From patchwork Thu Jul 9 19:42:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 1326190 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=IV+RFwxX; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B2mwW6Jrwz9sSJ for ; Fri, 10 Jul 2020 05:49:47 +1000 (AEST) Received: from localhost ([::1]:45952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jtcYD-0000wg-JP for incoming@patchwork.ozlabs.org; Thu, 09 Jul 2020 15:49:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58812) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jtcT2-0000HH-7H for qemu-devel@nongnu.org; Thu, 09 Jul 2020 15:44:24 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:37399 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jtcT0-0000XV-IE for qemu-devel@nongnu.org; Thu, 09 Jul 2020 15:44:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594323862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EJsT5VH/Fb9a2nmYSvMGERjEPViTxmPmNzcRqMVTJYo=; b=IV+RFwxX59z6P5+gnn3zMvY0cJXa5/5FJFbrO/SlHfTVjiS5MkduW2ZOgCCbJzJLBekyHE dZD5G9rj9Na+OCBeqpflHk+Ze+ZbUnsAFqpf0ZwrGpiYpUpk0908XmFfHxSqShJna7/Ztu vqhRYtlnl/8JJ1ADN3Bdm/lDFQe0HYQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-514-_anDUwDIMlWwwH5XofTC3Q-1; Thu, 09 Jul 2020 15:44:18 -0400 X-MC-Unique: _anDUwDIMlWwwH5XofTC3Q-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C3FB0107ACCA; Thu, 9 Jul 2020 19:44:16 +0000 (UTC) Received: from localhost (unknown [10.36.110.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9DF946FEE5; Thu, 9 Jul 2020 19:44:12 +0000 (UTC) From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= To: qemu-devel@nongnu.org Subject: [PATCH 12/13] gluster: add GUri-based URI parsing Date: Thu, 9 Jul 2020 23:42:33 +0400 Message-Id: <20200709194234.2117650-13-marcandre.lureau@redhat.com> In-Reply-To: <20200709194234.2117650-1-marcandre.lureau@redhat.com> References: <20200709194234.2117650-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.61; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/09 10:34:01 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , integration@gluster.org, sheepdog@lists.wpkg.org, qemu-block@nongnu.org, Peter Lieven , "Richard W.M. Jones" , Max Reitz , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Liu Yuan Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Marc-André Lureau --- block/gluster.c | 81 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 61 insertions(+), 20 deletions(-) diff --git a/block/gluster.c b/block/gluster.c index c06eca1c12f..2cad76deabf 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -288,9 +288,9 @@ static void glfs_clear_preopened(glfs_t *fs) } } -static int parse_volume_options(BlockdevOptionsGluster *gconf, char *path) +static int parse_volume_options(BlockdevOptionsGluster *gconf, const char *path) { - char *p, *q; + const char *p, *q; if (!path) { return -EINVAL; @@ -349,56 +349,97 @@ static int qemu_gluster_parse_uri(BlockdevOptionsGluster *gconf, const char *filename) { SocketAddress *gsconf; + bool is_unix = false; + int ret, port; + const char *scheme, *server, *path, *key = NULL, *value = NULL; + size_t nparams; + +#ifdef HAVE_GLIB_GURI + g_autoptr(GUri) uri = NULL; + g_autoptr(GHashTable) params = NULL; + g_autoptr(GError) err = NULL; + + uri = g_uri_parse(filename, G_URI_FLAGS_ENCODED_QUERY, &err); + if (!uri) { + error_report("Failed to parse gluster URI: %s", err->message); + return -EINVAL; + } + + params = g_uri_parse_params(g_uri_get_query(uri), -1, + "&;", G_URI_PARAMS_NONE, &err); + if (err) { + error_report("Failed to parse gluster URI query: %s", err->message); + return -EINVAL; + } + + scheme = g_uri_get_scheme(uri); + server = g_uri_get_host(uri); + port = g_uri_get_port(uri); + path = g_uri_get_path(uri); + nparams = g_hash_table_size(params); + g_hash_table_lookup_extended(params, "socket", + (void **)&key, (void **)&value); +#else g_autoptr(URI) uri = NULL; g_autoptr(QueryParams) qp = NULL; - bool is_unix = false; - int ret; uri = uri_parse(filename); if (!uri) { return -EINVAL; } + qp = query_params_parse(uri->query); + + scheme = uri->scheme; + server = uri->server; + port = uri->port; + path = uri->path; + nparams = qp->n; + if (nparams > 0) { + key = qp->p[0].name; + value = qp->p[0].value; + } +#endif + + if (nparams > 1 || (is_unix && !nparams) || (!is_unix && nparams)) { + return -EINVAL; + } + gconf->server = g_new0(SocketAddressList, 1); gconf->server->value = gsconf = g_new0(SocketAddress, 1); /* transport */ - if (!uri->scheme || !strcmp(uri->scheme, "gluster")) { + if (!scheme || !strcmp(scheme, "gluster")) { gsconf->type = SOCKET_ADDRESS_TYPE_INET; - } else if (!strcmp(uri->scheme, "gluster+tcp")) { + } else if (!strcmp(scheme, "gluster+tcp")) { gsconf->type = SOCKET_ADDRESS_TYPE_INET; - } else if (!strcmp(uri->scheme, "gluster+unix")) { + } else if (!strcmp(scheme, "gluster+unix")) { gsconf->type = SOCKET_ADDRESS_TYPE_UNIX; is_unix = true; - } else if (!strcmp(uri->scheme, "gluster+rdma")) { + } else if (!strcmp(scheme, "gluster+rdma")) { gsconf->type = SOCKET_ADDRESS_TYPE_INET; warn_report("rdma feature is not supported, falling back to tcp"); } else { return -EINVAL; } - ret = parse_volume_options(gconf, uri->path); + ret = parse_volume_options(gconf, path); if (ret < 0) { return ret; } - qp = query_params_parse(uri->query); - if (qp->n > 1 || (is_unix && !qp->n) || (!is_unix && qp->n)) { - return -EINVAL; - } - if (is_unix) { - if (uri->server || uri->port) { + if (server || port) { return -EINVAL; } - if (strcmp(qp->p[0].name, "socket")) { + if (g_strcmp0(key, "socket")) { return -EINVAL; } - gsconf->u.q_unix.path = g_strdup(qp->p[0].value); + gsconf->u.q_unix.path = g_strdup(value); } else { - gsconf->u.inet.host = g_strdup(uri->server ? uri->server : "localhost"); - if (uri->port) { - gsconf->u.inet.port = g_strdup_printf("%d", uri->port); + gsconf->u.inet.host = g_strdup(server ? server : "localhost"); + if (port) { + gsconf->u.inet.port = g_strdup_printf("%d", port); } else { gsconf->u.inet.port = g_strdup_printf("%d", GLUSTER_DEFAULT_PORT); } From patchwork Thu Jul 9 19:42:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 1326181 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=L6Dfo7bF; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B2mqk3H8Jz9sSJ for ; Fri, 10 Jul 2020 05:45:38 +1000 (AEST) Received: from localhost ([::1]:56948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jtcUC-000295-48 for incoming@patchwork.ozlabs.org; Thu, 09 Jul 2020 15:45:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58870) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jtcTA-0000hJ-Iz for qemu-devel@nongnu.org; Thu, 09 Jul 2020 15:44:32 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:32723 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jtcT8-0000Y6-TM for qemu-devel@nongnu.org; Thu, 09 Jul 2020 15:44:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594323868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tmQOmzoXNPFy7lvbkX3U0bBsr3nZbOM0fdmkkek9Xik=; b=L6Dfo7bFrpgwLoJsGchw0vEJfCYsCZCN9m1hMqCAeoOpzcq6HVdUFf/4wjURftJmXbZwS6 tvbA1zTsgeyHsknqJxc8Jv7gubL8A0X6atTLtzz0P12gfriF502O0PDlh4a3TZ3y31s5nO edGO9rLXB1+Ia4rsjbq0Abse9W05pPc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-449-gX9a53mlOiyRFrluW6_zJQ-1; Thu, 09 Jul 2020 15:44:26 -0400 X-MC-Unique: gX9a53mlOiyRFrluW6_zJQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 825DF100A8E7; Thu, 9 Jul 2020 19:44:25 +0000 (UTC) Received: from localhost (unknown [10.36.110.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3385C5D9C9; Thu, 9 Jul 2020 19:44:20 +0000 (UTC) From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= To: qemu-devel@nongnu.org Subject: [PATCH 13/13] ssh: add GUri-based URI parsing Date: Thu, 9 Jul 2020 23:42:34 +0400 Message-Id: <20200709194234.2117650-14-marcandre.lureau@redhat.com> In-Reply-To: <20200709194234.2117650-1-marcandre.lureau@redhat.com> References: <20200709194234.2117650-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=207.211.31.81; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/09 11:02:51 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , integration@gluster.org, sheepdog@lists.wpkg.org, qemu-block@nongnu.org, Peter Lieven , "Richard W.M. Jones" , Max Reitz , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Liu Yuan Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Marc-André Lureau --- block/ssh.c | 75 +++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 58 insertions(+), 17 deletions(-) diff --git a/block/ssh.c b/block/ssh.c index c8f6ad79e3c..d2bc6277613 100644 --- a/block/ssh.c +++ b/block/ssh.c @@ -180,9 +180,37 @@ static void sftp_error_trace(BDRVSSHState *s, const char *op) static int parse_uri(const char *filename, QDict *options, Error **errp) { + g_autofree char *port_str = NULL; + const char *scheme, *server, *path, *user, *key, *value; + gint port; + +#ifdef HAVE_GLIB_GURI + g_autoptr(GUri) uri = NULL; + g_autoptr(GHashTable) params = NULL; + g_autoptr(GError) err = NULL; + GHashTableIter iter; + + uri = g_uri_parse(filename, G_URI_FLAGS_ENCODED_QUERY, &err); + if (!uri) { + error_setg(errp, "Failed to parse SSH URI: %s", err->message); + return -EINVAL; + } + + params = g_uri_parse_params(g_uri_get_query(uri), -1, + "&;", G_URI_PARAMS_NONE, &err); + if (err) { + error_report("Failed to parse SSH URI query: %s", err->message); + return -EINVAL; + } + + scheme = g_uri_get_scheme(uri); + user = g_uri_get_user(uri); + server = g_uri_get_host(uri); + path = g_uri_get_path(uri); + port = g_uri_get_port(uri); +#else g_autoptr(URI) uri = NULL; g_autoptr(QueryParams) qp = NULL; - g_autofree char *port_str = NULL; int i; uri = uri_parse(filename); @@ -190,44 +218,57 @@ static int parse_uri(const char *filename, QDict *options, Error **errp) return -EINVAL; } - if (g_strcmp0(uri->scheme, "ssh") != 0) { - error_setg(errp, "URI scheme must be 'ssh'"); + qp = query_params_parse(uri->query); + if (!qp) { + error_setg(errp, "could not parse query parameters"); return -EINVAL; } - if (!uri->server || strcmp(uri->server, "") == 0) { - error_setg(errp, "missing hostname in URI"); + scheme = uri->scheme; + user = uri->user; + server = uri->server; + path = uri->path; + port = uri->port; +#endif + if (g_strcmp0(scheme, "ssh") != 0) { + error_setg(errp, "URI scheme must be 'ssh'"); return -EINVAL; } - if (!uri->path || strcmp(uri->path, "") == 0) { - error_setg(errp, "missing remote path in URI"); + if (!server || strcmp(server, "") == 0) { + error_setg(errp, "missing hostname in URI"); return -EINVAL; } - qp = query_params_parse(uri->query); - if (!qp) { - error_setg(errp, "could not parse query parameters"); + if (!path || strcmp(path, "") == 0) { + error_setg(errp, "missing remote path in URI"); return -EINVAL; } - if(uri->user && strcmp(uri->user, "") != 0) { - qdict_put_str(options, "user", uri->user); + if (user && strcmp(user, "") != 0) { + qdict_put_str(options, "user", user); } - qdict_put_str(options, "server.host", uri->server); + qdict_put_str(options, "server.host", server); - port_str = g_strdup_printf("%d", uri->port ?: 22); + port_str = g_strdup_printf("%d", port ?: 22); qdict_put_str(options, "server.port", port_str); - qdict_put_str(options, "path", uri->path); + qdict_put_str(options, "path", path); /* Pick out any query parameters that we understand, and ignore * the rest. */ +#ifdef HAVE_GLIB_GURI + g_hash_table_iter_init(&iter, params); + while (g_hash_table_iter_next(&iter, (void **)&key, (void **)&value)) { +#else for (i = 0; i < qp->n; ++i) { - if (strcmp(qp->p[i].name, "host_key_check") == 0) { - qdict_put_str(options, "host_key_check", qp->p[i].value); + key = qp->p[i].name; + value = qp->p[i].value; +#endif + if (g_strcmp0(key, "host_key_check") == 0) { + qdict_put_str(options, "host_key_check", value); } }