From nobody Mon Apr 29 19:13:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1596473894; cv=none; d=zohomail.com; s=zohoarc; b=MWVs7AQn/8KBveFK/2M8OEphRtFSmrfdqh8tiqZNAMTkDvvvhpgvd2h/LsnFL30PnJhs1YQinpf7tHbq69I+2I7yrGHHK1jlDRERMQ63ELVxg6zqeGbjFvdcLo1W08M5kaPrlp9NFKAFfgL1ctNtYZ3ElpkYL/Ni2d4Cqm80Vmc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596473894; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=K/5cH2JaOKzeqoMcbzof1NE0092GZvAEhI3CnsQpJ40=; b=ZJorh9K7ELUDeg/kOrA+qdJ39cnK4wnA2/f2ZeoIr4ejefyXbsy+WjMYepQJkaV/ihwBmh0XzdxqSBLeUYmLPjAWCVJeD3zh4G8sySl9fIT9In4ujtpFdSeqycZOHVcX7021oyrmLMZoSrT2b8h963X+2aHknbX9/gYZ+dDjtv8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1596473894685892.9775552096825; Mon, 3 Aug 2020 09:58:14 -0700 (PDT) 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-501-r6ly6VbsM0m1cNQZbCMN3w-1; Mon, 03 Aug 2020 12:57:21 -0400 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 96DDD8064AC; Mon, 3 Aug 2020 16:57:15 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 74C698FA30; Mon, 3 Aug 2020 16:57:15 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 432521800B70; Mon, 3 Aug 2020 16:57:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 073Gv4g4007630 for ; Mon, 3 Aug 2020 12:57:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id 14EEC71771; Mon, 3 Aug 2020 16:57:04 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5932671770 for ; Mon, 3 Aug 2020 16:57:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596473893; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=K/5cH2JaOKzeqoMcbzof1NE0092GZvAEhI3CnsQpJ40=; b=eqPPCh9H4gBg0gC9aLGhxLWPblal70NmRCqFLUM7o/2hFgteOZsmVRPplnfpaUZdy1/BiE PGaO7jj3OfipZEABmIPJzIByvC3yPg4emVHN6jbcw1OK7I0HofjSWWNPmXr/FQc072Q9yi SdFtwLg4p3Q/2D9cn9p6YLD8wVcyWMg= X-MC-Unique: r6ly6VbsM0m1cNQZbCMN3w-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 01/19] util: virRandomInt: remove temporary variable Date: Mon, 3 Aug 2020 18:56:38 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/util/virrandom.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/util/virrandom.c b/src/util/virrandom.c index 0487b4e70b..6417232e3a 100644 --- a/src/util/virrandom.c +++ b/src/util/virrandom.c @@ -92,8 +92,7 @@ uint32_t virRandomInt(uint32_t max) if ((max & (max - 1)) =3D=3D 0) return virRandomBits(__builtin_ffs(max) - 1); =20 - double val =3D virRandom(); - return val * max; + return virRandom() * max; } =20 =20 --=20 2.26.2 From nobody Mon Apr 29 19:13:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1596474013; cv=none; d=zohomail.com; s=zohoarc; b=h8G1hnz9D2XAgGHRuFPQKXAczqShiK0w+TlelHZArPVEoe8vwju9auMSkBlwzpmJWvfNyvrHkDFmsdppMmdsy7Qp9/OSwYk1nMD/TjKuaU9zBkQY9ttCzekmq+arrRTzA9UTivz7lmitqPZl0RVuKRZFxT8s/YyR8XSMMmDmCPU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596474013; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wH9TMmCsTzUSYjDX0n/jAnh1nkDPtyHDIB+PK3mAVhs=; b=g1eJaxt9y4jvVF3N7glxClJA0+v6WDSwd8tH02OCvBfCigOW98FUrccq1HrhnSWBT0d+s5nDH53QJ6u1PZsx5XIRmxNxJTqtSiaqRWr0mXyR9a020j+R15QBbDsKjuDF72B5NArcUMnqtQtH2Xw9qsAOrEJizAR1gandlwSoJ7g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 159647401117083.45590535640986; Mon, 3 Aug 2020 10:00:11 -0700 (PDT) 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-NeRqaKKwOxOHRwGWG3s5qQ-1; Mon, 03 Aug 2020 12:57:16 -0400 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 55A041902EBC; Mon, 3 Aug 2020 16:57:11 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0A0D671767; Mon, 3 Aug 2020 16:57:11 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id E5DDF1809561; Mon, 3 Aug 2020 16:57:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 073Gv56G007639 for ; Mon, 3 Aug 2020 12:57:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id 322B971770; Mon, 3 Aug 2020 16:57:05 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8257D71775 for ; Mon, 3 Aug 2020 16:57:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596474009; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=wH9TMmCsTzUSYjDX0n/jAnh1nkDPtyHDIB+PK3mAVhs=; b=Hb0Imut0cTuhfzh1Q0r1afHWTkTpfdTi4/RoL48Ij8kHWjRoBACNlWvSRl6b/fypBhLO+s kNDiipjn4MpmPzeLTEgAgRLSA5HSL9sQM9t+JDYd2SVLAQ6y0rHbIS5z0FBkhXTJu3efW5 VpVWrmA/Y/wHMC/KpzWLD8yxv4Ietjw= X-MC-Unique: NeRqaKKwOxOHRwGWG3s5qQ-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 02/19] util: virHostMemSetParameters: remove pointless variable Date: Mon, 3 Aug 2020 18:56:39 +0200 Message-Id: <965c75e18d655dde0643186742d86e6ebd3577b5.1596473604.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) It is only used inside the condition. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/util/virhostmem.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/util/virhostmem.c b/src/util/virhostmem.c index 2f60e2a250..7d1871610c 100644 --- a/src/util/virhostmem.c +++ b/src/util/virhostmem.c @@ -363,7 +363,6 @@ virHostMemSetParameters(virTypedParameterPtr params G_G= NUC_UNUSED, =20 #ifdef __linux__ size_t i; - int rc; =20 if (virTypedParamsValidate(params, nparams, VIR_NODE_MEMORY_SHARED_PAGES_TO_SCAN, @@ -379,9 +378,7 @@ virHostMemSetParameters(virTypedParameterPtr params G_G= NUC_UNUSED, return -1; =20 for (i =3D 0; i < nparams; i++) { - rc =3D virHostMemSetParameterValue(¶ms[i]); - - if (rc < 0) + if (virHostMemSetParameterValue(¶ms[i]) < 0) return -1; } =20 --=20 2.26.2 From nobody Mon Apr 29 19:13:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1596473909; cv=none; d=zohomail.com; s=zohoarc; b=ZrLa0dbH4FP4wM3LBHwHFFjkGTM77N17ZmIuruw4i4ONnngjB0ZnUOf7Td9UbhpkRDspWE+bTcS4d6cXe93cR840lR4EtsJe7GmWMKMtmkXuYXP78RS8u+JhlH/SXknB0CZJ2WoGFZLqe3uRVa8VGAjTgs4WgefShXodIpagTX0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596473909; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=uzk+OaO8OeKv5jqZ0vGFIogTkV0BgJIZDFaaSucvNoI=; b=JJJnlgj3IB6g6mGDoaAqpjkcVQy4fpwZoBKk1H+Qu8luphOMVjwIv5hqRgC7mWPxHCs24vdyEUoClHJdDvQbLH/rjZih15aKHEeh12GpK0KU559YI/0Wz7cfTaC3/ZAyPQ551K3M5mBhnw8Ko5ql7hbuGqJOVNf2obQmrdL8iuU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1596473909961949.906011096047; Mon, 3 Aug 2020 09:58:29 -0700 (PDT) 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-429-0fgfPMLZMfqFT0P6AsX0tg-1; Mon, 03 Aug 2020 12:58:26 -0400 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 46F08107BEFA; Mon, 3 Aug 2020 16:58:21 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 28B9771781; Mon, 3 Aug 2020 16:58:21 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id A0F661809554; Mon, 3 Aug 2020 16:58:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 073Gv62g007649 for ; Mon, 3 Aug 2020 12:57:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6A54971773; Mon, 3 Aug 2020 16:57:06 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id B020571770 for ; Mon, 3 Aug 2020 16:57:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596473908; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=uzk+OaO8OeKv5jqZ0vGFIogTkV0BgJIZDFaaSucvNoI=; b=RXXpHgZF/KwKhEzd6nTiuXnpzZPG22WfykwJlk9uhKyAmYcNAb3wZu8qMagpJrMvGuy03v eqB1pcir7A/j0Cs7KGXbAjxIYvSnMh5E3nZa9fOLZNDPz9N/fzoz99uoIN6OAC+ef9VJtq R9djf37iDxDJBeUaULGKMiL2POGb+XY= X-MC-Unique: 0fgfPMLZMfqFT0P6AsX0tg-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 03/19] util: virHostMem*Parameters: split out non-Linux stubs Date: Mon, 3 Aug 2020 18:56:40 +0200 Message-Id: <04296864c2687f940c3efbec74fcf1df0f9b7b85.1596473604.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Repeat the whole function header instead of mixing #ifdefs in the code. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/util/virhostmem.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/src/util/virhostmem.c b/src/util/virhostmem.c index 7d1871610c..27f192dc24 100644 --- a/src/util/virhostmem.c +++ b/src/util/virhostmem.c @@ -354,16 +354,16 @@ virHostMemParametersAreAllSupported(virTypedParameter= Ptr params, } #endif =20 +#ifdef __linux__ int virHostMemSetParameters(virTypedParameterPtr params G_GNUC_UNUSED, int nparams G_GNUC_UNUSED, unsigned int flags) { - virCheckFlags(0, -1); - -#ifdef __linux__ size_t i; =20 + virCheckFlags(0, -1); + if (virTypedParamsValidate(params, nparams, VIR_NODE_MEMORY_SHARED_PAGES_TO_SCAN, VIR_TYPED_PARAM_UINT, @@ -383,13 +383,21 @@ virHostMemSetParameters(virTypedParameterPtr params G= _GNUC_UNUSED, } =20 return 0; +} #else +int +virHostMemSetParameters(virTypedParameterPtr params G_GNUC_UNUSED, + int nparams G_GNUC_UNUSED, + unsigned int flags) +{ + virCheckFlags(0, -1); + virReportError(VIR_ERR_NO_SUPPORT, "%s", _("node set memory parameters not implemented" " on this platform")); return -1; -#endif } +#endif =20 #ifdef __linux__ static int @@ -434,14 +442,12 @@ virHostMemGetParameterValue(const char *field, #endif =20 #define NODE_MEMORY_PARAMETERS_NUM 8 +#ifdef __linux__ int virHostMemGetParameters(virTypedParameterPtr params G_GNUC_UNUSED, int *nparams G_GNUC_UNUSED, unsigned int flags) { - virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1); - -#ifdef __linux__ unsigned int pages_to_scan; unsigned int sleep_millisecs; unsigned int merge_across_nodes; @@ -453,6 +459,8 @@ virHostMemGetParameters(virTypedParameterPtr params G_G= NUC_UNUSED, size_t i; int ret; =20 + virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1); + if ((*nparams) =3D=3D 0) { *nparams =3D NODE_MEMORY_PARAMETERS_NUM; return 0; @@ -569,13 +577,21 @@ virHostMemGetParameters(virTypedParameterPtr params G= _GNUC_UNUSED, } =20 return 0; +} #else +int +virHostMemGetParameters(virTypedParameterPtr params G_GNUC_UNUSED, + int *nparams G_GNUC_UNUSED, + unsigned int flags) +{ + virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1); + virReportError(VIR_ERR_NO_SUPPORT, "%s", _("node get memory parameters not implemented" " on this platform")); return -1; -#endif } +#endif =20 =20 #ifdef WIN32 --=20 2.26.2 From nobody Mon Apr 29 19:13:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1596473913; cv=none; d=zohomail.com; s=zohoarc; b=A+dqyoa+DGhbe7hNvS61CXQdnGzTNcx0dW9vWSMPGtHYB9Z6oW1R0IgujNkQUcvk/MVfMC3605HQ7d/nHiko6VhrHgVr9/8s1IzJSgV8E9WhXEc11lxrzUmgMB/IQUBwOP1EEpPIdHQae2pOXniPlCtEr9fN9pBW2io2CTl4x4M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596473913; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WqyN3LxIrT/xwKkLfQzPmz1HeepSbAYd2xMaO1584YU=; b=CQpN/SDSOojGYJeO75zMzzF74aP+/DvaOXJAJI9oGUonv8auPdYxUmUN9JJIL3wOjc5jRTOx5lqRe6R9Hds6EE8IoUCmwTCuIslQUnmFlSwa+EYfDIH7TTIRaXPmU7yldnT5WWLBtjHfu5H+DYileT/NFq72ydhBGPIzINCB27I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1596473913911929.4052350281988; Mon, 3 Aug 2020 09:58:33 -0700 (PDT) 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-161-oupz6_6GN1uuXShspCOPoA-1; Mon, 03 Aug 2020 12:58:30 -0400 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 5F8061902EA0; Mon, 3 Aug 2020 16:58:23 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3AF1D1010404; Mon, 3 Aug 2020 16:58:23 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 0B14A1800B71; Mon, 3 Aug 2020 16:58:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 073Gv71M007659 for ; Mon, 3 Aug 2020 12:57:07 -0400 Received: by smtp.corp.redhat.com (Postfix) id 89CAA71775; Mon, 3 Aug 2020 16:57:07 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id D8C3671770 for ; Mon, 3 Aug 2020 16:57:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596473912; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=WqyN3LxIrT/xwKkLfQzPmz1HeepSbAYd2xMaO1584YU=; b=G1UBcmtSEj2wU6sL3Q/5NweyezFXI3MrGCVD41C5dTUoqxRfs9yjWTKt2MoRJAVpZiz3HO otAhaarPL646CJ7LgvIw+evq2/ZlP2OTnENSwNCjnNN2N9ty2XCbTUJ+RS3h8sHlXI1xDf qpVq+pU68rYLJS1lPzXd1tkoU3HptOo= X-MC-Unique: oupz6_6GN1uuXShspCOPoA-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 04/19] util: move declarations in virStorageFileChainLookup Date: Mon, 3 Aug 2020 18:56:41 +0200 Message-Id: <1d5aef9fe56014fb01f64f042cf40ded88acf713.1596473604.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Use g_autofree and move the declarations to the beginning of the block. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/util/virstoragefile.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 00d8e16ef9..f529f0faf3 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1597,7 +1597,6 @@ virStorageFileChainLookup(virStorageSourcePtr chain, { virStorageSourcePtr prev; const char *start =3D chain->path; - char *parentDir =3D NULL; bool nameIsFile =3D virStorageIsFile(name); =20 if (!parent) @@ -1626,15 +1625,16 @@ virStorageFileChainLookup(virStorageSourcePtr chain, break; =20 if (nameIsFile && virStorageSourceIsLocalStorage(chain)) { + g_autofree char *parentDir =3D NULL; + int result; + if (*parent && virStorageSourceIsLocalStorage(*parent)) parentDir =3D g_path_get_dirname((*parent)->path); else parentDir =3D g_strdup("."); =20 - int result =3D virFileRelLinkPointsTo(parentDir, name, - chain->path); - - VIR_FREE(parentDir); + result =3D virFileRelLinkPointsTo(parentDir, name, + chain->path); =20 if (result < 0) goto error; --=20 2.26.2 From nobody Mon Apr 29 19:13:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1596473848; cv=none; d=zohomail.com; s=zohoarc; b=Wsz7oBPfbNivdSh8nD6KaZdBq4XE5q4ExNDQfX/yyhFeQPPx5Lops6ElSmK2mdnZ16msQ9FQy8AYMxwUbN4QiEice5CHFp7aqgndtfI6dYvXvr890mN6RAqESRD+K1Y5m5e2LHM76khZ8KiZykTie0Qau4dGye8BtrYfHlctL50= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596473848; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dRMAGWKj62fFik2F0mFY1hLFtZMFroX+zL0F5z77M/k=; b=S5PrvtL00at/ICAwD72N8ErQf5dYTgdAxhfz7hs2uidmDHsAUvEIdZLfpO0UY9LGqRDZkScPQMCtKEyAxPX2/MaODTeXv7J1KTvFLQ8kcEWptRXv46uDD5M3erLaShOjoro00hVcWd1li8F0q52cPJ5qd/F+EKXxkXbzc2RXrFY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1596473848610537.9583508925011; Mon, 3 Aug 2020 09:57:28 -0700 (PDT) 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-287-0edn0MKXMmKp8zu62Ksb5g-1; Mon, 03 Aug 2020 12:57:24 -0400 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 07B77800470; Mon, 3 Aug 2020 16:57:18 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D7B6F1002397; Mon, 3 Aug 2020 16:57:17 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id A3CC79A115; Mon, 3 Aug 2020 16:57:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 073GvB5S007691 for ; Mon, 3 Aug 2020 12:57:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1758A71765; Mon, 3 Aug 2020 16:57:11 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 189617190D for ; Mon, 3 Aug 2020 16:57:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596473847; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=dRMAGWKj62fFik2F0mFY1hLFtZMFroX+zL0F5z77M/k=; b=ZiyKC3zCtLFdE0WL6b6ZnMpjUCKpxeaIaNiWVR6YQzTugil9yz5kz1C60V98qUWIWK1L+j PG4HF5MENHjRYw6jhGUa6pXyxSamLKRbjbQFk83csJunBuFs0WOarV7jaXj4CKS/B4XYNA Gl0em9TuWzAJa4Sh/fo6EvbkDrIm8yE= X-MC-Unique: 0edn0MKXMmKp8zu62Ksb5g-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 05/19] Move declarations before statements Date: Mon, 3 Aug 2020 18:56:42 +0200 Message-Id: <4afd4316c05fa502849603b7a8ce6abfbc28760e.1596473604.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/bhyve/bhyve_parse_command.c | 3 ++- src/conf/domain_conf.c | 9 ++++++--- src/conf/network_conf.c | 3 ++- src/conf/virstorageobj.c | 3 ++- src/nwfilter/nwfilter_learnipaddr.c | 2 +- src/openvz/openvz_conf.c | 12 ++++++------ src/qemu/qemu_process.c | 5 +++-- src/remote/remote_driver.c | 3 +-- src/storage/storage_util.c | 2 +- src/util/virdbus.c | 2 +- src/util/virqemu.c | 2 +- src/vbox/vbox_common.c | 21 +++++++++++---------- src/vbox/vbox_snapshot_conf.c | 8 ++++++-- src/vz/vz_driver.c | 10 +++++----- tests/commandhelper.c | 5 ++--- tests/eventtest.c | 5 +++-- tests/vircgroupmock.c | 8 ++++++-- tools/virsh-domain.c | 4 +++- tools/virsh-interface.c | 3 ++- tools/virsh-network.c | 3 ++- tools/virsh-nodedev.c | 2 +- tools/virsh-util.c | 3 ++- tools/virt-host-validate-common.c | 3 ++- 23 files changed, 71 insertions(+), 50 deletions(-) diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_comman= d.c index b2d2280872..67ca0ddfa3 100644 --- a/src/bhyve/bhyve_parse_command.c +++ b/src/bhyve/bhyve_parse_command.c @@ -171,12 +171,13 @@ bhyveCommandLineToArgv(const char *nativeConfig, } =20 for (i =3D 0; i < line_count; i++) { - curr =3D lines[i]; size_t j; char **arglist =3D NULL; size_t args_count =3D 0; size_t args_alloc =3D 0; =20 + curr =3D lines[i]; + /* iterate over each line, splitting on sequences of ' '. This cod= e is * adapted from qemu/qemu_parse_command.c. */ while (curr && *curr !=3D '\0') { diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 69e0439e7e..570812cefb 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2845,12 +2845,13 @@ void virDomainSoundCodecDefFree(virDomainSoundCodec= DefPtr def) =20 void virDomainSoundDefFree(virDomainSoundDefPtr def) { + size_t i; + if (!def) return; =20 virDomainDeviceInfoClear(&def->info); =20 - size_t i; for (i =3D 0; i < def->ncodecs; i++) virDomainSoundCodecDefFree(def->codecs[i]); VIR_FREE(def->codecs); @@ -3222,10 +3223,11 @@ void virDomainDeviceDefFree(virDomainDeviceDefPtr d= ef) static void virDomainClockDefClear(virDomainClockDefPtr def) { + size_t i; + if (def->offset =3D=3D VIR_DOMAIN_CLOCK_OFFSET_TIMEZONE) VIR_FREE(def->data.timezone); =20 - size_t i; for (i =3D 0; i < def->ntimers; i++) VIR_FREE(def->timers[i]); VIR_FREE(def->timers); @@ -16585,9 +16587,10 @@ virDomainMemorySourceDefParseXML(xmlNodePtr node, virDomainMemoryDefPtr def) { VIR_XPATH_NODE_AUTORESTORE(ctxt); - ctxt->node =3D node; g_autofree char *nodemask =3D NULL; =20 + ctxt->node =3D node; + switch ((virDomainMemoryModel) def->model) { case VIR_DOMAIN_MEMORY_MODEL_DIMM: if (virDomainParseMemory("./pagesize", "./pagesize/@unit", ctxt, diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 4221623c37..cd708e654f 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -2534,9 +2534,10 @@ virNetworkDefFormatBuf(virBufferPtr buf, =20 if (def->forward.type !=3D VIR_NETWORK_FORWARD_NONE) { const char *dev =3D NULL; + const char *mode =3D virNetworkForwardTypeToString(def->forward.ty= pe); + if (!def->forward.npfs) dev =3D virNetworkDefForwardIf(def, 0); - const char *mode =3D virNetworkForwardTypeToString(def->forward.ty= pe); =20 if (!mode) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index f3c54d0c52..1c7d615a7a 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -1114,9 +1114,10 @@ virStoragePoolObjIsDuplicate(virStoragePoolObjListPt= r pools, /* UUID does not match, but if a name matches, refuse it */ obj =3D virStoragePoolObjFindByNameLocked(pools, def->name); if (obj) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virObjectLock(obj); =20 - char uuidstr[VIR_UUID_STRING_BUFLEN]; virUUIDFormat(obj->def->uuid, uuidstr); virReportError(VIR_ERR_OPERATION_FAILED, _("pool '%s' already exists with uuid %s"), diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_le= arnipaddr.c index c6497450eb..c28b12f2f0 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -626,12 +626,12 @@ learnIPAddressThread(void *arg) pcap_close(handle); =20 if (req->status =3D=3D 0) { + g_autofree char *inetaddr =3D NULL; int ret; virSocketAddr sa; sa.len =3D sizeof(sa.data.inet4); sa.data.inet4.sin_family =3D AF_INET; sa.data.inet4.sin_addr.s_addr =3D vmaddr; - g_autofree char *inetaddr =3D NULL; =20 /* It is necessary to unlock interface here to avoid updateMutex a= nd * interface ordering deadlocks. Otherwise we are going to diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index db3df5ed5a..6d54123a35 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -233,16 +233,16 @@ openvzReadNetworkConf(virDomainDefPtr def, } else if (ret > 0) { token =3D strtok_r(temp, ";", &saveptr); while (token !=3D NULL) { - /* add new device to list */ - if (VIR_ALLOC(net) < 0) - goto error; - - net->type =3D VIR_DOMAIN_NET_TYPE_BRIDGE; - char *p =3D token; char cpy_temp[32]; int len; =20 + /* add new device to list */ + if (VIR_ALLOC(net) < 0) + goto error; + + net->type =3D VIR_DOMAIN_NET_TYPE_BRIDGE; + /* parse string */ do { char *next =3D strchr(p, ','); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 812220769d..7c312efd8b 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -522,9 +522,10 @@ qemuProcessShutdownOrReboot(virQEMUDriverPtr driver, =20 if (priv->fakeReboot) { g_autofree char *name =3D g_strdup_printf("reboot-%s", vm->def->na= me); - qemuDomainSetFakeReboot(driver, vm, false); - virObjectRef(vm); virThread th; + + qemuDomainSetFakeReboot(driver, vm, false); + virObjectRef(vm); if (virThreadCreateFull(&th, false, qemuProcessFakeReboot, diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 0331060a2d..2402f73475 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -957,6 +957,7 @@ doRemoteOpen(virConnectPtr conn, bool tty =3D true; #endif int mode; + size_t i; =20 if (inside_daemon && !conn->uri->server) { mode =3D REMOTE_DRIVER_MODE_DIRECT; @@ -1014,8 +1015,6 @@ doRemoteOpen(virConnectPtr conn, * feasibly it might contain variables needed by the real driver, * although that won't be the case for now). */ - size_t i; - if (conn->uri) { for (i =3D 0; i < conn->uri->paramsCount; i++) { virURIParamPtr var =3D &conn->uri->params[i]; diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index f7c09e3375..4752ab78a3 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -192,8 +192,8 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol, * blocks */ amtleft =3D amtread; do { - interval =3D ((wbytes > amtleft) ? amtleft : wbytes); int offset =3D amtread - amtleft; + interval =3D ((wbytes > amtleft) ? amtleft : wbytes); =20 if (want_sparse && memcmp(buf+offset, zerobuf, interval) =3D= =3D 0) { if (lseek(fd, interval, SEEK_CUR) < 0) { diff --git a/src/util/virdbus.c b/src/util/virdbus.c index 77691cd2b0..f512031b42 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -999,6 +999,7 @@ virDBusMessageIterDecode(DBusMessageIter *rootiter, case DBUS_TYPE_SIGNATURE: do { char **x; + char *s; if (arrayref) { char ***xptrptr =3D arrayptr; if (VIR_EXPAND_N(*xptrptr, *narrayptr, 1) < 0) @@ -1008,7 +1009,6 @@ virDBusMessageIterDecode(DBusMessageIter *rootiter, } else { x =3D (char **)va_arg(args, char **); } - char *s; dbus_message_iter_get_basic(iter, &s); *x =3D g_strdup(s); VIR_DEBUG("Read basic type 'char *' varg 'char **'" diff --git a/src/util/virqemu.c b/src/util/virqemu.c index 20cb09d878..25d6fd35c5 100644 --- a/src/util/virqemu.c +++ b/src/util/virqemu.c @@ -94,9 +94,9 @@ virQEMUBuildCommandLineJSONArrayNumbered(const char *key, size_t i; =20 for (i =3D 0; i < virJSONValueArraySize(array); i++) { - member =3D virJSONValueArrayGet((virJSONValuePtr) array, i); g_autofree char *prefix =3D NULL; =20 + member =3D virJSONValueArrayGet((virJSONValuePtr) array, i); prefix =3D g_strdup_printf("%s.%zu", key, i); =20 if (virQEMUBuildCommandLineJSONRecurse(prefix, member, buf, skipKe= y, onOff, diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 1adafa1e70..bae62f6967 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -653,6 +653,7 @@ static int vboxConnectGetMaxVcpus(virConnectPtr conn, const char *type G_GNUC_UNUSED) { vboxDriverPtr data =3D conn->privateData; + ISystemProperties *systemProperties =3D NULL; PRUint32 maxCPUCount =3D 0; int ret =3D -1; =20 @@ -662,7 +663,6 @@ vboxConnectGetMaxVcpus(virConnectPtr conn, const char *= type G_GNUC_UNUSED) /* VirtualBox Supports only hvm and thus the type passed to it * has no meaning, setting it to G_GNUC_UNUSED */ - ISystemProperties *systemProperties =3D NULL; =20 gVBoxAPI.UIVirtualBox.GetSystemProperties(data->vboxObj, &systemProper= ties); if (!systemProperties) @@ -4603,6 +4603,7 @@ vboxSnapshotRedefine(virDomainPtr dom, char *nameTmpUse =3D NULL; bool snapshotFileExists =3D false; bool needToChangeStorageController =3D false; + char uuidtmp[VIR_UUID_STRING_BUFLEN]; int ret =3D -1; =20 if (!data->vboxObj) @@ -4782,6 +4783,7 @@ vboxSnapshotRedefine(virDomainPtr dom, char *parentUuid =3D NULL; virVBoxSnapshotConfHardDiskPtr readOnlyDisk =3D NULL; vboxIID iid, parentiid; + IMedium *parentReadOnlyMedium =3D NULL; =20 VBOX_IID_INITIALIZE(&iid); VBOX_IID_INITIALIZE(&parentiid); @@ -4831,7 +4833,6 @@ vboxSnapshotRedefine(virDomainPtr dom, VBOX_UTF16_FREE(formatUtf); =20 /* This disk is already in the media registry */ - IMedium *parentReadOnlyMedium =3D NULL; rc =3D gVBoxAPI.UIMedium.GetParent(readOnlyMedium, &parentReadOnly= Medium); if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -4965,7 +4966,6 @@ vboxSnapshotRedefine(virDomainPtr dom, if (virUUIDGenerate(snapshotUuid) < 0) goto cleanup; =20 - char uuidtmp[VIR_UUID_STRING_BUFLEN]; virUUIDFormat(snapshotUuid, uuidtmp); newSnapshotPtr->uuid =3D g_strdup(uuidtmp); =20 @@ -5176,6 +5176,7 @@ vboxSnapshotRedefine(virDomainPtr dom, } } } else { + char *snapshotContent; /* Create a "fake" disk to avoid corrupting children snapshot disk= s. */ for (it =3D 0; it < def->parent.dom->ndisks; it++) { IMedium *medium =3D NULL; @@ -5190,6 +5191,8 @@ vboxSnapshotRedefine(virDomainPtr dom, char *format =3D NULL; char *tmp =3D NULL; vboxIID iid, parentiid; + IProgress *progress =3D NULL; + PRUint32 tab[1]; =20 VBOX_IID_INITIALIZE(&iid); VBOX_IID_INITIALIZE(&parentiid); @@ -5235,8 +5238,6 @@ vboxSnapshotRedefine(virDomainPtr dom, goto cleanup; } =20 - IProgress *progress =3D NULL; - PRUint32 tab[1]; tab[0] =3D MediumVariant_Diff; gVBoxAPI.UIMedium.CreateDiffStorage(medium, newMedium, 1, tab,= &progress); =20 @@ -5320,9 +5321,9 @@ vboxSnapshotRedefine(virDomainPtr dom, VIR_FREE(currentSnapshotXmlFilePath); currentSnapshotXmlFilePath =3D g_strdup_printf("%s%s.xml", machineLocationPath, = snapshotMachineDesc->currentSnapshot); - char *snapshotContent =3D virDomainSnapshotDefFormat(NULL, def, - data->xmlopt, - VIR_DOMAIN_SNAP= SHOT_FORMAT_SECURE); + snapshotContent =3D virDomainSnapshotDefFormat(NULL, def, + data->xmlopt, + VIR_DOMAIN_SNAPSHOT_F= ORMAT_SECURE); if (snapshotContent =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unable to get snapshot content")); @@ -6947,6 +6948,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapsho= tPtr snapshot) char *tmp =3D NULL; vboxIID iid, parentiid; resultCodeUnion resultCode; + PRUint32 tab[1]; =20 VBOX_IID_INITIALIZE(&iid); VBOX_IID_INITIALIZE(&parentiid); @@ -7004,7 +7006,6 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapsho= tPtr snapshot) VBOX_UTF16_FREE(formatUtf16); VBOX_UTF16_FREE(newLocation); =20 - PRUint32 tab[1]; tab[0] =3D MediumVariant_Diff; gVBoxAPI.UIMedium.CreateDiffStorage(medium, newMedium, 1, = tab, &progress); =20 @@ -7536,12 +7537,12 @@ vboxConnectListAllDomains(virConnectPtr conn, =20 for (i =3D 0; i < machines.count; i++) { IMachine *machine =3D machines.items[i]; + PRBool isAccessible =3D PR_FALSE; int id =3D -1; =20 if (!machine) continue; =20 - PRBool isAccessible =3D PR_FALSE; gVBoxAPI.UIMachine.GetAccessible(machine, &isAccessible); =20 if (!isAccessible) diff --git a/src/vbox/vbox_snapshot_conf.c b/src/vbox/vbox_snapshot_conf.c index 6b95311328..ee644e1e2d 100644 --- a/src/vbox/vbox_snapshot_conf.c +++ b/src/vbox/vbox_snapshot_conf.c @@ -1286,8 +1286,10 @@ virVBoxSnapshotConfGetRWDisksPathsFromLibvirtXML(con= st char *filePath, =20 for (i =3D 0; i < nodeSize; i++) { xmlNodePtr node =3D nodes[i]; + xmlNodePtr sourceNode; + xPathContext->node =3D node; - xmlNodePtr sourceNode =3D virXPathNode("./source", xPathContext); + sourceNode =3D virXPathNode("./source", xPathContext); if (sourceNode) ret[i] =3D virXMLPropString(sourceNode, "file"); } @@ -1347,8 +1349,10 @@ virVBoxSnapshotConfGetRODisksPathsFromLibvirtXML(con= st char *filePath, =20 for (i =3D 0; i < nodeSize; i++) { xmlNodePtr node =3D nodes[i]; + xmlNodePtr sourceNode; + xPathContext->node =3D node; - xmlNodePtr sourceNode =3D virXPathNode("./source", xPathContext); + sourceNode =3D virXPathNode("./source", xPathContext); if (sourceNode) ret[i] =3D virXMLPropString(sourceNode, "file"); } diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 1f9c4c79c0..40b1828eb2 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -112,6 +112,8 @@ vzBuildCapabilities(void) }; size_t i, j, k; =20 + G_STATIC_ASSERT(G_N_ELEMENTS(archs) =3D=3D G_N_ELEMENTS(emulators)); + if ((caps =3D virCapabilitiesNew(virArchFromHost(), false, false)) =3D=3D NULL) return NULL; @@ -122,8 +124,6 @@ vzBuildCapabilities(void) if (virCapabilitiesInitCaches(caps) < 0) goto error; =20 - G_STATIC_ASSERT(G_N_ELEMENTS(archs) =3D=3D G_N_ELEMENTS(emulators)); - for (i =3D 0; i < G_N_ELEMENTS(ostypes); i++) for (j =3D 0; j < G_N_ELEMENTS(archs); j++) for (k =3D 0; k < G_N_ELEMENTS(emulators); k++) @@ -220,12 +220,12 @@ vzConnectGetCapabilities(virConnectPtr conn) static int vzDomainDefAddDefaultInputDevices(virDomainDefPtr def) { - if (def->ngraphics =3D=3D 0) - return 0; - int bus =3D IS_CT(def) ? VIR_DOMAIN_INPUT_BUS_PARALLELS : VIR_DOMAIN_INPUT_BUS_PS2; =20 + if (def->ngraphics =3D=3D 0) + return 0; + if (virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_MOUSE, bus) < 0) diff --git a/tests/commandhelper.c b/tests/commandhelper.c index b366483771..05f577730f 100644 --- a/tests/commandhelper.c +++ b/tests/commandhelper.c @@ -74,6 +74,8 @@ int main(int argc, char **argv) { char c; bool daemonize_check =3D false; size_t daemonize_retries =3D 3; + char buf[1024]; + ssize_t got; =20 if (!log) return ret; @@ -167,9 +169,6 @@ int main(int argc, char **argv) { usleep(100*1000); } =20 - char buf[1024]; - ssize_t got; - fprintf(stdout, "BEGIN STDOUT\n"); fflush(stdout); fprintf(stderr, "BEGIN STDERR\n"); diff --git a/tests/eventtest.c b/tests/eventtest.c index 06b5e7b20c..4a23bd6e62 100644 --- a/tests/eventtest.c +++ b/tests/eventtest.c @@ -89,10 +89,11 @@ G_GNUC_PRINTF(3, 4) testEventReport(const char *name, bool failed, const char *msg, ...) { va_list vargs; - va_start(vargs, msg); char *str =3D NULL; struct testEventResultData data; =20 + va_start(vargs, msg); + if (msg) str =3D g_strdup_vprintf(msg, vargs); =20 @@ -325,6 +326,7 @@ mymain(void) size_t i; pthread_t eventThread; char one =3D '1'; + char *debugEnv =3D getenv("LIBVIRT_DEBUG"); =20 for (i =3D 0; i < NUM_FDS; i++) { if (virPipeQuiet(handles[i].pipeFD) < 0) { @@ -333,7 +335,6 @@ mymain(void) } } =20 - char *debugEnv =3D getenv("LIBVIRT_DEBUG"); if (debugEnv && *debugEnv && (virLogSetDefaultPriority(virLogParseDefaultPriority(debugEnv)) < = 0)) { fprintf(stderr, "Invalid log level setting.\n"); diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c index 66b8c01852..2da60f886a 100644 --- a/tests/vircgroupmock.c +++ b/tests/vircgroupmock.c @@ -467,8 +467,10 @@ int access(const char *path, int mode) init_syms(); =20 if (STRPREFIX(path, SYSFS_CGROUP_PREFIX)) { - init_sysfs(); char *newpath; + + init_sysfs(); + if (asprintf(&newpath, "%s%s", fakesysfscgroupdir, path + strlen(SYSFS_CGROUP_PREFIX)) < 0) { @@ -534,8 +536,10 @@ int mkdir(const char *path, mode_t mode) init_syms(); =20 if (STRPREFIX(path, SYSFS_CGROUP_PREFIX)) { - init_sysfs(); char *newpath; + + init_sysfs(); + if (asprintf(&newpath, "%s%s", fakesysfscgroupdir, path + strlen(SYSFS_CGROUP_PREFIX)) < 0) { diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 286cf79671..7ce848f92e 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -3794,8 +3794,10 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) goto error; =20 for (i =3D 0; i < nvol_nodes; i++) { - ctxt->node =3D vol_nodes[i]; virshUndefineVolume vol; + + ctxt->node =3D vol_nodes[i]; + VIR_FREE(source); VIR_FREE(target); VIR_FREE(pool); diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c index b8e424091d..a6b52726c9 100644 --- a/tools/virsh-interface.c +++ b/tools/virsh-interface.c @@ -49,8 +49,9 @@ virshCommandOptInterfaceBy(vshControl *ctl, const vshCmd = *cmd, const char *n =3D NULL; bool is_mac =3D false; virMacAddr dummy; + virshControlPtr priv =3D ctl->privData; + virCheckFlags(VIRSH_BYNAME | VIRSH_BYMAC, NULL); - virshControlPtr priv =3D ctl->privData; =20 if (!optname) optname =3D "interface"; diff --git a/tools/virsh-network.c b/tools/virsh-network.c index f2a5d09732..f0f5358625 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -69,8 +69,9 @@ virshCommandOptNetworkBy(vshControl *ctl, const vshCmd *c= md, virNetworkPtr network =3D NULL; const char *n =3D NULL; const char *optname =3D "network"; + virshControlPtr priv =3D ctl->privData; + virCheckFlags(VIRSH_BYUUID | VIRSH_BYNAME, NULL); - virshControlPtr priv =3D ctl->privData; =20 if (vshCommandOptStringReq(ctl, cmd, optname, &n) < 0) return NULL; diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c index e576b3c847..e9414f429f 100644 --- a/tools/virsh-nodedev.c +++ b/tools/virsh-nodedev.c @@ -285,6 +285,7 @@ virshNodeDeviceListCollect(vshControl *ctl, char **caps =3D NULL; int ncaps =3D 0; bool match =3D false; + size_t j, k; =20 device =3D list->devices[i]; =20 @@ -305,7 +306,6 @@ virshNodeDeviceListCollect(vshControl *ctl, /* Check if the device's capability matches with provided * capabilities. */ - size_t j, k; for (j =3D 0; j < ncaps; j++) { for (k =3D 0; k < ncapnames; k++) { if (STREQ(caps[j], capnames[k])) { diff --git a/tools/virsh-util.c b/tools/virsh-util.c index 932d6d0849..3b375c60f1 100644 --- a/tools/virsh-util.c +++ b/tools/virsh-util.c @@ -32,8 +32,9 @@ virshLookupDomainInternal(vshControl *ctl, { virDomainPtr dom =3D NULL; int id; + virshControlPtr priv =3D ctl->privData; + virCheckFlags(VIRSH_BYID | VIRSH_BYUUID | VIRSH_BYNAME, NULL); - virshControlPtr priv =3D ctl->privData; =20 /* try it by ID */ if (flags & VIRSH_BYID) { diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-c= ommon.c index f68c9c7c96..e0e22a133a 100644 --- a/tools/virt-host-validate-common.c +++ b/tools/virt-host-validate-common.c @@ -172,9 +172,10 @@ int virHostValidateNamespace(const char *hvname, virHostValidateLevel level, const char *hint) { - virHostMsgCheck(hvname, "for namespace %s", ns_name); char nspath[100]; =20 + virHostMsgCheck(hvname, "for namespace %s", ns_name); + g_snprintf(nspath, sizeof(nspath), "/proc/self/ns/%s", ns_name); =20 if (access(nspath, F_OK) < 0) { --=20 2.26.2 From nobody Mon Apr 29 19:13:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1596473956; cv=none; d=zohomail.com; s=zohoarc; b=njhUB1BPhtzfmrx14ZUsyC6Jn6sRDq2PLQ5JVllot5gGLAW6YsFriVp/pm7OKRiyxCkjC/oSHHUoQ+oIl3VKwUKhVr0Fcp1V8poR/Ddk2ka4WH22t9LYlG5Z2KGw1dlfo28JxcRCpmwQBZxBr2/UCBlYF/VhdRy9RU3awaSVNMo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596473956; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CMnDvAls0MUBDUADKVD7SmRGYgSWDRgDcOOA0KrwEbM=; b=PAEzP/NaJfPCFXJb3II1PJlyoVWBakRTb+gs+G+29XxoM+zStBXu8A4bw3kI7sBe8pXMXeRRA5/KPIB/nYoUWRkAjuZ5NHDwgaM1TCsg9qW9DVRP0j2YKwAklDjwsa+THXwVYmoR/KKbbFdcVV+ETQhYp3wfTiXzhOTObciXtyc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 159647395639271.03860091093611; Mon, 3 Aug 2020 09:59:16 -0700 (PDT) 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-304-A1D3iJl9NlGHlrp2E_mhZw-1; Mon, 03 Aug 2020 12:58:35 -0400 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 B50331DFF; Mon, 3 Aug 2020 16:58:25 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 93CE471782; Mon, 3 Aug 2020 16:58:25 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 645AE9A11E; Mon, 3 Aug 2020 16:58:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 073GvEqf007709 for ; Mon, 3 Aug 2020 12:57:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id D827671770; Mon, 3 Aug 2020 16:57:14 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id EA45D7176F for ; Mon, 3 Aug 2020 16:57:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596473955; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=CMnDvAls0MUBDUADKVD7SmRGYgSWDRgDcOOA0KrwEbM=; b=IKSvEgeeeNS7pc8sU7ZbALG7VaVD8bVBWU/3UItwC7X8TAo3blJuVGTOA4ocBsNMTyNjEs JiEfz1oiDchTWbwvRtDqIJLX82haHniISYmtrXMAJtjhxjL77BVFIGECN8n1pfZrb9JFBH iU8QbdNT7GaVMAGFp0Et+AUTDkhwB0M= X-MC-Unique: A1D3iJl9NlGHlrp2E_mhZw-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 06/19] Split declarations from initializations Date: Mon, 3 Aug 2020 18:56:43 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Split those initializations that depend on a statement above them. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/conf/network_conf.c | 4 +++- src/conf/nwfilter_conf.c | 5 ++++- src/lxc/lxc_controller.c | 6 ++++-- src/lxc/lxc_driver.c | 5 +++-- src/qemu/qemu_command.c | 8 ++++++-- src/qemu/qemu_process.c | 5 +++-- src/rpc/virnetmessage.c | 4 +++- src/rpc/virnetsocket.c | 9 ++++++--- src/util/virdaemon.c | 4 +++- src/util/virerror.c | 3 ++- src/util/virfile.c | 14 ++++++++++---- src/util/virkeycode.c | 4 +++- src/util/virnetlink.c | 10 +++++++--- src/util/virutil.c | 8 +++++--- tests/nodedevmdevctltest.c | 3 ++- tests/sockettest.c | 8 +++++--- tests/virrotatingfiletest.c | 7 +++++-- tools/virsh-domain.c | 8 +++++--- tools/virsh-volume.c | 5 +++-- tools/wireshark/src/packet-libvirt.c | 3 ++- 20 files changed, 84 insertions(+), 39 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index cd708e654f..d9a198a372 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1932,11 +1932,13 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, addrMatch =3D false; for (j =3D 0; j < nips; j++) { virNetworkIPDefPtr def2 =3D &def->ips[j]; + int prefix; + if (VIR_SOCKET_ADDR_FAMILY(gateway) !=3D VIR_SOCKET_ADDR_FAMILY(&def2->address)) { continue; } - int prefix =3D virNetworkIPDefPrefix(def2); + prefix =3D virNetworkIPDefPrefix(def2); virSocketAddrMaskByPrefix(&def2->address, prefix, &testAdd= r); virSocketAddrMaskByPrefix(gateway, prefix, &testGw); if (VIR_SOCKET_ADDR_VALID(&testAddr) && diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 02722abc32..779da3dddb 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2864,10 +2864,13 @@ virNWFilterRuleDefDetailsFormat(virBufferPtr buf, nwItemDesc *item; =20 while (att[i].name) { + virNWFilterEntryItemFlags flags; + VIR_WARNINGS_NO_CAST_ALIGN item =3D (nwItemDesc *)((char *)def + att[i].dataIdx); VIR_WARNINGS_RESET - virNWFilterEntryItemFlags flags =3D item->flags; + + flags =3D item->flags; if ((flags & NWFILTER_ENTRY_ITEM_FLAG_EXISTS)) { if (!typeShown) { virBufferAsprintf(buf, "<%s", type); diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index ae6b737b60..0a496fb788 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -1490,11 +1490,12 @@ static int virLXCControllerPopulateDevices(virLXCCo= ntrollerPtr ctrl) /* Populate /dev/ with a few important bits */ for (i =3D 0; i < G_N_ELEMENTS(devs); i++) { g_autofree char *path =3D NULL; + dev_t dev; =20 path =3D g_strdup_printf("/%s/%s.dev/%s", LXC_STATE_DIR, ctrl->def= ->name, devs[i].path); =20 - dev_t dev =3D makedev(devs[i].maj, devs[i].min); + dev =3D makedev(devs[i].maj, devs[i].min); if (mknod(path, S_IFCHR, dev) < 0 || chmod(path, devs[i].mode)) { virReportSystemError(errno, @@ -1990,11 +1991,12 @@ static int virLXCControllerMoveInterfaces(virLXCCon= trollerPtr ctrl) =20 for (i =3D 0; i < def->nhostdevs; i ++) { virDomainHostdevDefPtr hdev =3D def->hostdevs[i]; + virDomainHostdevCaps hdcaps; =20 if (hdev->mode !=3D VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES) continue; =20 - virDomainHostdevCaps hdcaps =3D hdev->source.caps; + hdcaps =3D hdev->source.caps; =20 if (hdcaps.type !=3D VIR_DOMAIN_HOSTDEV_CAPS_TYPE_NET) continue; diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 1cdd6ee455..a530488dd2 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1440,6 +1440,7 @@ static virSecurityManagerPtr lxcSecurityInit(virLXCDriverConfigPtr cfg) { unsigned int flags =3D VIR_SECURITY_MANAGER_PRIVILEGED; + virSecurityManagerPtr mgr; =20 VIR_INFO("lxcSecurityInit %s", cfg->securityDriverName); =20 @@ -1448,8 +1449,8 @@ lxcSecurityInit(virLXCDriverConfigPtr cfg) if (cfg->securityRequireConfined) flags |=3D VIR_SECURITY_MANAGER_REQUIRE_CONFINED; =20 - virSecurityManagerPtr mgr =3D virSecurityManagerNew(cfg->securityDrive= rName, - LXC_DRIVER_NAME, fla= gs); + mgr =3D virSecurityManagerNew(cfg->securityDriverName, + LXC_DRIVER_NAME, flags); if (!mgr) goto error; =20 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0655d8359d..fa33c4ab28 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4232,7 +4232,9 @@ qemuBuildVgaVideoCommand(virCommandPtr cmd, virDomainVideoDefPtr video, virQEMUCapsPtr qemuCaps) { + const char *dev; const char *vgastr =3D qemuVideoTypeToString(video->type); + if (!vgastr || STREQ(vgastr, "")) { virReportError(VIR_ERR_INTERNAL_ERROR, _("invalid model for video type '%s'"), @@ -4253,7 +4255,7 @@ qemuBuildVgaVideoCommand(virCommandPtr cmd, * See 'Graphics Devices' section in docs/qdev-device-use.txt in * QEMU repository. */ - const char *dev =3D qemuDeviceVideoTypeToString(video->type); + dev =3D qemuDeviceVideoTypeToString(video->type); =20 if (video->type =3D=3D VIR_DOMAIN_VIDEO_TYPE_QXL && (video->vram || video->ram)) { @@ -4935,9 +4937,11 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, if (dev->data.nix.listen && (flags & QEMU_BUILD_CHARDEV_UNIX_FD_PASS) && virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS)) { + int fd; + if (qemuSecuritySetSocketLabel(secManager, (virDomainDefPtr)de= f) < 0) return NULL; - int fd =3D qemuOpenChrChardevUNIXSocket(dev); + fd =3D qemuOpenChrChardevUNIXSocket(dev); if (qemuSecurityClearSocketLabel(secManager, (virDomainDefPtr)= def) < 0) { VIR_FORCE_CLOSE(fd); return NULL; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7c312efd8b..ad4f190b7e 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5018,11 +5018,12 @@ qemuProcessSetupRawIO(virQEMUDriverPtr driver, /* If rawio not already set, check hostdevs as well */ if (!rawio) { for (i =3D 0; i < vm->def->nhostdevs; i++) { + virDomainHostdevSubsysSCSIPtr scsisrc; + if (!virHostdevIsSCSIDevice(vm->def->hostdevs[i])) continue; =20 - virDomainHostdevSubsysSCSIPtr scsisrc =3D - &vm->def->hostdevs[i]->source.subsys.u.scsi; + scsisrc =3D &vm->def->hostdevs[i]->source.subsys.u.scsi; if (scsisrc->rawio =3D=3D VIR_TRISTATE_BOOL_YES) { rawio =3D true; break; diff --git a/src/rpc/virnetmessage.c b/src/rpc/virnetmessage.c index 9d2a8a6d7d..c4ddafc01d 100644 --- a/src/rpc/virnetmessage.c +++ b/src/rpc/virnetmessage.c @@ -511,6 +511,8 @@ int virNetMessageEncodePayloadEmpty(virNetMessagePtr ms= g) =20 void virNetMessageSaveError(virNetMessageErrorPtr rerr) { + virErrorPtr verr; + /* This func may be called several times & the first * error is the one we want because we don't want * cleanup code overwriting the first one. @@ -519,7 +521,7 @@ void virNetMessageSaveError(virNetMessageErrorPtr rerr) return; =20 memset(rerr, 0, sizeof(*rerr)); - virErrorPtr verr =3D virGetLastError(); + verr =3D virGetLastError(); if (verr) { rerr->code =3D verr->code; rerr->domain =3D verr->domain; diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 977d2875fe..f3aba01fd5 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -325,6 +325,8 @@ int virNetSocketNewListenTCP(const char *nodename, int bindErrno =3D 0; virSocketAddr tmp_addr; int port =3D 0; + int e; + struct addrinfo *runp; =20 *retsocks =3D NULL; *nretsocks =3D 0; @@ -346,7 +348,7 @@ int virNetSocketNewListenTCP(const char *nodename, virSocketAddrIsWildcard(&tmp_addr))) hints.ai_flags |=3D AI_ADDRCONFIG; =20 - int e =3D getaddrinfo(nodename, service, &hints, &ai); + e =3D getaddrinfo(nodename, service, &hints, &ai); if (e !=3D 0) { virReportError(VIR_ERR_SYSTEM_ERROR, _("Unable to resolve address '%s' service '%s': %s"= ), @@ -354,7 +356,7 @@ int virNetSocketNewListenTCP(const char *nodename, return -1; } =20 - struct addrinfo *runp =3D ai; + runp =3D ai; while (runp) { virSocketAddr addr; =20 @@ -587,6 +589,7 @@ int virNetSocketNewConnectTCP(const char *nodename, virSocketAddr remoteAddr; struct addrinfo *runp; int savedErrno =3D ENOENT; + int e; =20 *retsock =3D NULL; =20 @@ -598,7 +601,7 @@ int virNetSocketNewConnectTCP(const char *nodename, hints.ai_flags =3D AI_PASSIVE | AI_ADDRCONFIG | AI_V4MAPPED; hints.ai_socktype =3D SOCK_STREAM; =20 - int e =3D getaddrinfo(nodename, service, &hints, &ai); + e =3D getaddrinfo(nodename, service, &hints, &ai); if (e !=3D 0) { virReportError(VIR_ERR_SYSTEM_ERROR, _("Unable to resolve address '%s' service '%s': %s"= ), diff --git a/src/util/virdaemon.c b/src/util/virdaemon.c index 31cc24e703..a02665dce8 100644 --- a/src/util/virdaemon.c +++ b/src/util/virdaemon.c @@ -43,10 +43,12 @@ int virDaemonForkIntoBackground(const char *argv0) { int statuspipe[2]; + pid_t pid; + if (virPipeQuiet(statuspipe) < 0) return -1; =20 - pid_t pid =3D fork(); + pid =3D fork(); switch (pid) { case 0: { diff --git a/src/util/virerror.c b/src/util/virerror.c index 774c36bca3..507a29f50f 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -1335,13 +1335,14 @@ void virReportSystemErrorFull(int domcode, =20 if (fmt) { va_list args; + size_t len; int n; =20 va_start(args, fmt); n =3D g_vsnprintf(msgDetailBuf, sizeof(msgDetailBuf), fmt, args); va_end(args); =20 - size_t len =3D strlen(errnoDetail); + len =3D strlen(errnoDetail); if (0 <=3D n && n + 2 + len < sizeof(msgDetailBuf)) { strcpy(msgDetailBuf + n, ": "); n +=3D 2; diff --git a/src/util/virfile.c b/src/util/virfile.c index 6ada3a708c..59bdbc121b 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1412,13 +1412,16 @@ virFileReadLimFD(int fd, int maxlen, char **buf) int virFileReadAll(const char *path, int maxlen, char **buf) { - int fd =3D open(path, O_RDONLY); + int fd; + int len; + + fd =3D open(path, O_RDONLY); if (fd < 0) { virReportSystemError(errno, _("Failed to open file '%s'"), path); return -1; } =20 - int len =3D virFileReadLimFD(fd, maxlen, buf); + len =3D virFileReadLimFD(fd, maxlen, buf); VIR_FORCE_CLOSE(fd); if (len < 0) { virReportSystemError(errno, _("Failed to read file '%s'"), path); @@ -1431,11 +1434,14 @@ virFileReadAll(const char *path, int maxlen, char *= *buf) int virFileReadAllQuiet(const char *path, int maxlen, char **buf) { - int fd =3D open(path, O_RDONLY); + int fd; + int len; + + fd =3D open(path, O_RDONLY); if (fd < 0) return -errno; =20 - int len =3D virFileReadLimFD(fd, maxlen, buf); + len =3D virFileReadLimFD(fd, maxlen, buf); VIR_FORCE_CLOSE(fd); if (len < 0) return -errno; diff --git a/src/util/virkeycode.c b/src/util/virkeycode.c index 1475f69b84..8ca1b573d3 100644 --- a/src/util/virkeycode.c +++ b/src/util/virkeycode.c @@ -88,11 +88,13 @@ int virKeycodeValueFromString(virKeycodeSet codeset, size_t i; =20 for (i =3D 0; i < VIR_KEYMAP_ENTRY_MAX; i++) { + const char *name; + if (!virKeymapNames[codeset] || !virKeymapValues[codeset]) continue; =20 - const char *name =3D virKeymapNames[codeset][i]; + name =3D virKeymapNames[codeset][i]; =20 if (name && STREQ_NULLABLE(name, keyname)) return virKeymapValues[codeset][i]; diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index d23ed95b78..652ed2c1c6 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -817,10 +817,12 @@ virNetlinkEventServerUnlock(virNetlinkEventSrvPrivate= Ptr driver) static int virNetlinkEventRemoveClientPrimitive(size_t i, unsigned int protocol) { + virNetlinkEventRemoveCallback removeCB; + if (protocol >=3D MAX_LINKS) return -EINVAL; =20 - virNetlinkEventRemoveCallback removeCB =3D server[protocol]->handles[i= ].removeCB; + removeCB =3D server[protocol]->handles[i].removeCB; =20 if (removeCB) { (removeCB)(server[protocol]->handles[i].watch, @@ -890,11 +892,13 @@ virNetlinkEventCallback(int watch, int virNetlinkEventServiceStop(unsigned int protocol) { + virNetlinkEventSrvPrivatePtr srv; + size_t i; + if (protocol >=3D MAX_LINKS) return -EINVAL; =20 - virNetlinkEventSrvPrivatePtr srv =3D server[protocol]; - size_t i; + srv =3D server[protocol]; =20 VIR_INFO("stopping netlink event service"); =20 diff --git a/src/util/virutil.c b/src/util/virutil.c index ff664ea778..8639176fdc 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -371,6 +371,7 @@ int virDiskNameParse(const char *name, int *disk, int *= partition) int idx =3D 0; static char const* const drive_prefix[] =3D {"fd", "hd", "vd", "sd", "= xvd", "ubd"}; size_t i; + size_t n_digits; =20 for (i =3D 0; i < G_N_ELEMENTS(drive_prefix); i++) { if (STRPREFIX(name, drive_prefix[i])) { @@ -391,8 +392,8 @@ int virDiskNameParse(const char *name, int *disk, int *= partition) ptr++; } =20 - /* Count the trailing digits. */ - size_t n_digits =3D strspn(ptr, "0123456789"); + /* Count the trailing digits */ + n_digits =3D strspn(ptr, "0123456789"); if (ptr[n_digits] !=3D '\0') return -1; =20 @@ -1911,10 +1912,11 @@ static int virPipeImpl(int fds[2], bool nonblock, bool errreport) { #ifdef HAVE_PIPE2 + int rv; int flags =3D O_CLOEXEC; if (nonblock) flags |=3D O_NONBLOCK; - int rv =3D pipe2(fds, flags); + rv =3D pipe2(fds, flags); #else /* !HAVE_PIPE2 */ # ifdef WIN32 int rv =3D _pipe(fds, 4096, _O_BINARY); diff --git a/tests/nodedevmdevctltest.c b/tests/nodedevmdevctltest.c index 9780553a3a..57c1ad4f46 100644 --- a/tests/nodedevmdevctltest.c +++ b/tests/nodedevmdevctltest.c @@ -203,10 +203,11 @@ fakeParentDevice(void) static int addDevice(virNodeDeviceDefPtr def) { + virNodeDeviceObjPtr obj; if (!def) return -1; =20 - virNodeDeviceObjPtr obj =3D virNodeDeviceObjListAssignDef(driver->devs= , def); + obj =3D virNodeDeviceObjListAssignDef(driver->devs, def); =20 if (!obj) { virNodeDeviceDefFree(def); diff --git a/tests/sockettest.c b/tests/sockettest.c index 29a565de40..a3c27421fc 100644 --- a/tests/sockettest.c +++ b/tests/sockettest.c @@ -90,6 +90,7 @@ testRange(const char *saddrstr, const char *eaddrstr, virSocketAddr saddr; virSocketAddr eaddr; virSocketAddr netaddr; + int gotsize; =20 if (virSocketAddrParse(&saddr, saddrstr, AF_UNSPEC) < 0) return -1; @@ -98,8 +99,8 @@ testRange(const char *saddrstr, const char *eaddrstr, if (netstr && virSocketAddrParse(&netaddr, netstr, AF_UNSPEC) < 0) return -1; =20 - int gotsize =3D virSocketAddrGetRange(&saddr, &eaddr, - netstr ? &netaddr : NULL, prefix); + gotsize =3D virSocketAddrGetRange(&saddr, &eaddr, + netstr ? &netaddr : NULL, prefix); VIR_DEBUG("Size want %d vs got %d", size, gotsize); if (pass) { /* fail if virSocketAddrGetRange returns failure, or unexpected si= ze */ @@ -136,6 +137,7 @@ static int testNetmask(const char *addr1str, const char= *addr2str, virSocketAddr addr1; virSocketAddr addr2; virSocketAddr netmask; + int ret; =20 if (virSocketAddrParse(&addr1, addr1str, AF_UNSPEC) < 0) return -1; @@ -144,7 +146,7 @@ static int testNetmask(const char *addr1str, const char= *addr2str, if (virSocketAddrParse(&netmask, netmaskstr, AF_UNSPEC) < 0) return -1; =20 - int ret =3D virSocketAddrCheckNetmask(&addr1, &addr2, &netmask); + ret =3D virSocketAddrCheckNetmask(&addr1, &addr2, &netmask); =20 if (ret <=3D 0) { return pass ? -1 : 0; diff --git a/tests/virrotatingfiletest.c b/tests/virrotatingfiletest.c index df392f374e..f8dd7daefe 100644 --- a/tests/virrotatingfiletest.c +++ b/tests/virrotatingfiletest.c @@ -124,9 +124,12 @@ static int testRotatingFileInitOne(const char *filenam= e, VIR_DEBUG("Deleting %s", filename); unlink(filename); } else { - VIR_DEBUG("Creating %s size %zu", filename, (size_t)size); char buf[1024]; - int fd =3D open(filename, O_WRONLY|O_CREAT|O_TRUNC, 0700); + int fd; + + VIR_DEBUG("Creating %s size %zu", filename, (size_t)size); + + fd =3D open(filename, O_WRONLY|O_CREAT|O_TRUNC, 0700); if (fd < 0) { fprintf(stderr, "Cannot create %s\n", filename); return -1; diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 7ce848f92e..29fa3f607e 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1757,6 +1757,7 @@ virshBlockJobWaitInit(vshControl *ctl, unsigned int timeout, bool async_abort) { + virConnectDomainEventGenericCallback cb; virshBlockJobWaitDataPtr ret; virshControlPtr priv =3D ctl->privData; =20 @@ -1774,8 +1775,7 @@ virshBlockJobWaitInit(vshControl *ctl, =20 ret->status =3D -1; =20 - virConnectDomainEventGenericCallback cb =3D - VIR_DOMAIN_EVENT_CALLBACK(virshBlockJobStatusHandler); + cb =3D VIR_DOMAIN_EVENT_CALLBACK(virshBlockJobStatusHandler); =20 if ((ret->cb_id =3D virConnectDomainEventRegisterAny(priv->conn, dom, VIR_DOMAIN_EVENT_ID= _BLOCK_JOB, @@ -7117,12 +7117,14 @@ virshParseCPUList(vshControl *ctl, int *cpumaplen, return NULL; virBitmapSetAll(map); } else { + int lastcpu; + if (virBitmapParse(cpulist, &map, 1024) < 0 || virBitmapIsAllClear(map)) { vshError(ctl, _("Invalid cpulist '%s'"), cpulist); goto cleanup; } - int lastcpu =3D virBitmapLastSetBit(map); + lastcpu =3D virBitmapLastSetBit(map); if (lastcpu >=3D maxcpu) { vshError(ctl, _("CPU %d in cpulist '%s' exceed the maxcpu %d"), lastcpu, cpulist, maxcpu); diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index e04e2db096..ae7c643d3b 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -275,12 +275,14 @@ cmdVolCreateAs(vshControl *ctl, const vshCmd *cmd) =20 /* Convert the snapshot parameters into backingStore XML */ if (snapshotStrVol) { + virStorageVolPtr snapVol; + char *snapshotStrVolPath; /* Lookup snapshot backing volume. Try the backing-vol * parameter as a name */ vshDebug(ctl, VSH_ERR_DEBUG, "%s: Look up backing store volume '%s' as name\n", cmd->def->name, snapshotStrVol); - virStorageVolPtr snapVol =3D virStorageVolLookupByName(pool, snaps= hotStrVol); + snapVol =3D virStorageVolLookupByName(pool, snapshotStrVol); if (snapVol) vshDebug(ctl, VSH_ERR_DEBUG, "%s: Backing store volume found using '%s' as nam= e\n", @@ -315,7 +317,6 @@ cmdVolCreateAs(vshControl *ctl, const vshCmd *cmd) goto cleanup; } =20 - char *snapshotStrVolPath; if ((snapshotStrVolPath =3D virStorageVolGetPath(snapVol)) =3D=3D = NULL) { virStorageVolFree(snapVol); goto cleanup; diff --git a/tools/wireshark/src/packet-libvirt.c b/tools/wireshark/src/pac= ket-libvirt.c index 2b499d2cf2..89dd18080e 100644 --- a/tools/wireshark/src/packet-libvirt.c +++ b/tools/wireshark/src/packet-libvirt.c @@ -428,11 +428,12 @@ dissect_libvirt_payload(tvbuff_t *tvb, proto_tree *tr= ee, if (status =3D=3D VIR_NET_OK) { const vir_dissector_index_t *pds =3D get_program_data(prog, VIR_PR= OGRAM_DISSECTORS); const gsize *len =3D get_program_data(prog, VIR_PROGRAM_DISSECTORS= _LEN); + vir_xdr_dissector_t xd; =20 if (!len) goto unknown; =20 - vir_xdr_dissector_t xd =3D find_payload_dissector(proc, type, pds,= *len); + xd =3D find_payload_dissector(proc, type, pds, *len); if (xd =3D=3D NULL) goto unknown; dissect_libvirt_payload_xdr_data(tvb, tree, payload_length, status= , xd); --=20 2.26.2 From nobody Mon Apr 29 19:13:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1596473854; cv=none; d=zohomail.com; s=zohoarc; b=lqED+mEXlK7g4ryXAX6mEFK6fMtLgYm8sKylXreBTGDqwd0Vp93PS3d5BjpymJHbAT1QjvMqIw3LrJlw3hnLUtJGO5pHYSs+xc70JvslW3spPKw4r3ie8vbqpULTyTPaplLx9q8MQfjur08J70HG9Xdzp/go+XB25i+XL78HL6w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596473854; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SElWkzHmp/owBmaC+b98RKKSvwybzMKthTzyyd6xcgw=; b=CpLcOzBcm29CXyFwazNVrKeipJUDVrUlQ03xjGotkqK9au/pChxt/dZ8DH2DNtLCOcX9+zuk16PWSKnr/1txBCHOteIQVfWt6QnYZWH8P83kRUqbiZdc05h09ZCQZ52xrL0fCZ5t3LjMsp5nGCiT4JB6t7o5yGXjuCQ0cl+j8vQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1596473854305640.4078451873366; Mon, 3 Aug 2020 09:57:34 -0700 (PDT) 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-182-0QtymlRRPICK4amfzWnacQ-1; Mon, 03 Aug 2020 12:57:27 -0400 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 7557280183C; Mon, 3 Aug 2020 16:57:20 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4F1DB10023A5; Mon, 3 Aug 2020 16:57:20 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 1CE041800B71; Mon, 3 Aug 2020 16:57:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 073GvGOX007722 for ; Mon, 3 Aug 2020 12:57:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4200A7176F; Mon, 3 Aug 2020 16:57:16 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5572371778 for ; Mon, 3 Aug 2020 16:57:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596473852; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=SElWkzHmp/owBmaC+b98RKKSvwybzMKthTzyyd6xcgw=; b=iiAJrNAigIqc8VvKVlaskfkY0XW4nBi2nRjXbk79mTsRqX2uJ9IBHnfV5De0KSK9qCBJcf Wj1eD07151nG7g65hNoZwhI6wiHOgDW77ISuUwqfgvZqett6W1VjJVTuwMFwWL1EY4rk1s sMGZ0m5ducySXgMpGV8ftP6IiIyGMCc= X-MC-Unique: 0QtymlRRPICK4amfzWnacQ-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 07/19] Move debug statements after declarations Date: Mon, 3 Aug 2020 18:56:44 +0200 Message-Id: <91e7e19e2401810cf7c91744e350461cef94c369.1596473604.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Many of our functions start with a DEBUG statement. Move the statements after declarations to appease our coding style. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/lxc/lxc_container.c | 4 +++- src/nwfilter/nwfilter_ebiptables_driver.c | 8 ++++++-- src/qemu/qemu_domain.c | 6 ++++-- src/qemu/qemu_monitor.c | 9 ++++++--- src/remote/remote_daemon_dispatch.c | 6 +++--- src/remote/remote_daemon_stream.c | 13 ++++++++----- src/remote/remote_driver.c | 21 ++++++++++++--------- src/rpc/virnetclient.c | 4 +++- src/storage/storage_backend_disk.c | 2 +- src/storage/storage_file_fs.c | 3 ++- src/util/virdbus.c | 2 +- src/util/virfirewall.c | 3 ++- src/util/virnetdevip.c | 4 +++- src/util/virobject.c | 5 +++-- src/util/virprocess.c | 3 ++- src/util/virstoragefile.c | 8 ++++---- 16 files changed, 63 insertions(+), 38 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 6e98f133a9..ede419c275 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -291,8 +291,10 @@ static int lxcContainerSetupFDs(int *ttyfd, */ for (j =3D i + 1; j < npassFDs; j++) { if (passFDs[j] =3D=3D wantfd) { - VIR_DEBUG("Clash %zu", j); int newfd =3D dup(passFDs[j]); + + VIR_DEBUG("Clash %zu", j); + if (newfd < 0) { virReportSystemError(errno, _("Cannot move fd %d out of the w= ay"), diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfil= ter_ebiptables_driver.c index 6aefbe226b..e73aa82eb4 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -2655,8 +2655,10 @@ ebtablesRemoveSubChainsQuery(virFirewallPtr fw, const char *chainprefixes =3D opaque; =20 for (i =3D 0; lines[i] !=3D NULL; i++) { - VIR_DEBUG("Considering '%s'", lines[i]); char *tmp =3D strstr(lines[i], "-j "); + + VIR_DEBUG("Considering '%s'", lines[i]); + if (!tmp) continue; tmp =3D tmp + 3; @@ -2757,8 +2759,10 @@ ebtablesRenameTmpSubAndRootChainsQuery(virFirewallPt= r fw, char newchain[MAX_CHAINNAME_LENGTH]; =20 for (i =3D 0; lines[i] !=3D NULL; i++) { - VIR_DEBUG("Considering '%s'", lines[i]); char *tmp =3D strstr(lines[i], "-j "); + + VIR_DEBUG("Considering '%s'", lines[i]); + if (!tmp) continue; tmp =3D tmp + 3; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e5d6430a89..56999c2c46 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6222,12 +6222,14 @@ int qemuDomainLogContextWrite(qemuDomainLogContextP= tr ctxt, ssize_t qemuDomainLogContextRead(qemuDomainLogContextPtr ctxt, char **msg) { + char *buf; + size_t buflen; + VIR_DEBUG("Context read %p manager=3D%p inode=3D%llu pos=3D%llu", ctxt, ctxt->manager, (unsigned long long)ctxt->inode, (unsigned long long)ctxt->pos); - char *buf; - size_t buflen; + if (ctxt->manager) { buf =3D virLogManagerDomainReadLogFile(ctxt->manager, ctxt->path, diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 637361d24d..718ac50c08 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2838,8 +2838,9 @@ qemuMonitorAddDeviceWithFd(qemuMonitorPtr mon, int fd, const char *fdname) { + int ret; + VIR_DEBUG("device=3D%s fd=3D%d fdname=3D%s", devicestr, fd, NULLSTR(fd= name)); - int ret; =20 QEMU_CHECK_MONITOR(mon); =20 @@ -3458,9 +3459,10 @@ qemuMonitorOpenGraphics(qemuMonitorPtr mon, const char *fdname, bool skipauth) { + int ret; + VIR_DEBUG("protocol=3D%s fd=3D%d fdname=3D%s skipauth=3D%d", protocol, fd, NULLSTR(fdname), skipauth); - int ret; =20 QEMU_CHECK_MONITOR(mon); =20 @@ -4168,8 +4170,9 @@ int qemuMonitorGetMemoryDeviceInfo(qemuMonitorPtr mon, virHashTablePtr *info) { + int ret; + VIR_DEBUG("info=3D%p", info); - int ret; =20 *info =3D NULL; =20 diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon= _dispatch.c index c91b5d3293..404712e7c8 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -1621,10 +1621,10 @@ static void remoteRelayConnectionClosedEvent(virConnectPtr conn G_GNUC_UNUSED, in= t reason, void *opaque) { virNetServerClientPtr client =3D opaque; - - VIR_DEBUG("Relaying connection closed event, reason %d", reason); - remote_connect_event_connection_closed_msg msg =3D { reason }; + + VIR_DEBUG("Relaying connection closed event, reason %d", reason); + remoteDispatchObjectEventSend(client, remoteProgram, REMOTE_PROC_CONNECT_EVENT_CONNECTION_CLO= SED, (xdrproc_t)xdr_remote_connect_event_conn= ection_closed_msg, diff --git a/src/remote/remote_daemon_stream.c b/src/remote/remote_daemon_s= tream.c index 73e4d7befb..9a62189cd6 100644 --- a/src/remote/remote_daemon_stream.c +++ b/src/remote/remote_daemon_stream.c @@ -434,9 +434,10 @@ int daemonAddClientStream(virNetServerClientPtr client, daemonClientStream *stream, bool transmit) { + daemonClientPrivatePtr priv =3D virNetServerClientGetPrivateData(clien= t); + VIR_DEBUG("client=3D%p, proc=3D%d, serial=3D%u, st=3D%p, transmit=3D%d= ", client, stream->procedure, stream->serial, stream->st, trans= mit); - daemonClientPrivatePtr priv =3D virNetServerClientGetPrivateData(clien= t); =20 if (stream->filterID !=3D -1) { VIR_WARN("Filter already added to client %p", client); @@ -484,12 +485,13 @@ int daemonRemoveClientStream(virNetServerClientPtr client, daemonClientStream *stream) { - VIR_DEBUG("client=3D%p, proc=3D%d, serial=3D%u, st=3D%p", - client, stream->procedure, stream->serial, stream->st); daemonClientPrivatePtr priv =3D virNetServerClientGetPrivateData(clien= t); daemonClientStream *curr =3D priv->streams; daemonClientStream *prev =3D NULL; =20 + VIR_DEBUG("client=3D%p, proc=3D%d, serial=3D%u, st=3D%p", + client, stream->procedure, stream->serial, stream->st); + if (stream->filterID !=3D -1) { virNetServerClientRemoveFilter(client, stream->filterID); @@ -648,11 +650,12 @@ daemonStreamHandleAbort(virNetServerClientPtr client, daemonClientStream *stream, virNetMessagePtr msg) { - VIR_DEBUG("client=3D%p, stream=3D%p, proc=3D%d, serial=3D%u", - client, stream, msg->header.proc, msg->header.serial); int ret; bool raise_error =3D false; =20 + VIR_DEBUG("client=3D%p, stream=3D%p, proc=3D%d, serial=3D%u", + client, stream, msg->header.proc, msg->header.serial); + stream->closed =3D true; virStreamEventRemoveCallback(stream->st); ret =3D virStreamAbort(stream->st); diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 2402f73475..8654046b8d 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -5691,10 +5691,11 @@ remoteStreamSend(virStreamPtr st, const char *data, size_t nbytes) { + struct private_data *priv =3D st->conn->privateData; + virNetClientStreamPtr privst =3D st->privateData; + int rv; + VIR_DEBUG("st=3D%p data=3D%p nbytes=3D%zu", st, data, nbytes); - struct private_data *priv =3D st->conn->privateData; - virNetClientStreamPtr privst =3D st->privateData; - int rv; =20 remoteDriverLock(priv); priv->localUses++; @@ -5719,11 +5720,12 @@ remoteStreamRecvFlags(virStreamPtr st, size_t nbytes, unsigned int flags) { + struct private_data *priv =3D st->conn->privateData; + virNetClientStreamPtr privst =3D st->privateData; + int rv; + VIR_DEBUG("st=3D%p data=3D%p nbytes=3D%zu flags=3D0x%x", st, data, nbytes, flags); - struct private_data *priv =3D st->conn->privateData; - virNetClientStreamPtr privst =3D st->privateData; - int rv; =20 virCheckFlags(VIR_STREAM_RECV_STOP_AT_HOLE, -1); =20 @@ -5760,11 +5762,12 @@ remoteStreamSendHole(virStreamPtr st, long long length, unsigned int flags) { + struct private_data *priv =3D st->conn->privateData; + virNetClientStreamPtr privst =3D st->privateData; + int rv; + VIR_DEBUG("st=3D%p length=3D%lld flags=3D0x%x", st, length, flags); - struct private_data *priv =3D st->conn->privateData; - virNetClientStreamPtr privst =3D st->privateData; - int rv; =20 remoteDriverLock(priv); priv->localUses++; diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 441f1502a6..42703664fe 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -1556,8 +1556,10 @@ static void virNetClientIOEventLoopPassTheBuck(virNetClientPtr client, virNetClientCallPtr thiscall) { - VIR_DEBUG("Giving up the buck %p", thiscall); virNetClientCallPtr tmp =3D client->waitDispatch; + + VIR_DEBUG("Giving up the buck %p", thiscall); + /* See if someone else is still waiting * and if so, then pass the buck ! */ while (tmp) { diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backe= nd_disk.c index eae23ec24a..a6d4e41220 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -673,10 +673,10 @@ virStorageBackendDiskPartBoundaries(virStoragePoolObj= Ptr pool, virStoragePoolSourceDevicePtr dev =3D &def->source.devices[0]; unsigned long long cylinderSize =3D (unsigned long long)dev->geometry.= heads * dev->geometry.sectors * SECTOR_SIZE; + int partType =3D virStorageBackendDiskPartTypeToCreate(pool); =20 VIR_DEBUG("find free area: allocation %llu, cyl size %llu", allocation, cylinderSize); - int partType =3D virStorageBackendDiskPartTypeToCreate(pool); =20 /* how many extra bytes we have since we allocate aligned to the cylinder boundary */ diff --git a/src/storage/storage_file_fs.c b/src/storage/storage_file_fs.c index 8aafd58992..8d9023bead 100644 --- a/src/storage/storage_file_fs.c +++ b/src/storage/storage_file_fs.c @@ -51,11 +51,12 @@ struct _virStorageFileBackendFsPriv { static void virStorageFileBackendFileDeinit(virStorageSourcePtr src) { + virStorageFileBackendFsPrivPtr priv =3D src->drv->priv; + VIR_DEBUG("deinitializing FS storage file %p (%s:%s)", src, virStorageTypeToString(virStorageSourceGetActualType(src)), src->path); =20 - virStorageFileBackendFsPrivPtr priv =3D src->drv->priv; =20 VIR_FREE(priv->canonpath); VIR_FREE(priv); diff --git a/src/util/virdbus.c b/src/util/virdbus.c index f512031b42..fbfc09c949 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -862,8 +862,8 @@ virDBusMessageIterEncode(DBusMessageIter *rootiter, dbustype *x =3D (dbustype *)&v.member; \ vargtype *y; \ if (arrayref) { \ - VIR_DEBUG("Use arrayref"); \ vargtype **xptrptr =3D arrayptr; \ + VIR_DEBUG("Use arrayref"); \ if (VIR_EXPAND_N(*xptrptr, *narrayptr, 1) < 0) \ goto cleanup; \ y =3D (*xptrptr + (*narrayptr - 1)); \ diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index 12905165d4..22e717bce4 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -830,10 +830,11 @@ virFirewallApply(virFirewallPtr firewall) VIR_DEBUG("Applying groups for %p", firewall); for (i =3D 0; i < firewall->ngroups; i++) { if (virFirewallApplyGroup(firewall, i) < 0) { - VIR_DEBUG("Rolling back groups up to %zu for %p", i, firewall); size_t first =3D i; virErrorPtr saved_error; =20 + VIR_DEBUG("Rolling back groups up to %zu for %p", i, firewall); + virErrorPreserveLast(&saved_error); =20 /* diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c index 409f062c5c..8c66baa884 100644 --- a/src/util/virnetdevip.c +++ b/src/util/virnetdevip.c @@ -296,8 +296,10 @@ virNetDevIPRouteAdd(const char *ifname, =20 /* If we have no valid network address, then use the default one */ if (!addr || !VIR_SOCKET_ADDR_VALID(addr)) { - VIR_DEBUG("computing default address"); int family =3D VIR_SOCKET_ADDR_FAMILY(gateway); + + VIR_DEBUG("computing default address"); + if (family =3D=3D AF_INET) { if (virSocketAddrParseIPv4(&defaultAddr, VIR_SOCKET_ADDR_IPV4_= ALL) < 0) return -1; diff --git a/src/util/virobject.c b/src/util/virobject.c index 3f0bcc38ea..a6305354c3 100644 --- a/src/util/virobject.c +++ b/src/util/virobject.c @@ -315,11 +315,12 @@ virObjectRWLockableNew(virClassPtr klass) =20 static void vir_object_finalize(GObject *gobj) { - PROBE(OBJECT_DISPOSE, "obj=3D%p", gobj); virObjectPtr obj =3D VIR_OBJECT(gobj); virObjectPrivate *priv =3D vir_object_get_instance_private(obj); - virClassPtr klass =3D priv->klass; + + PROBE(OBJECT_DISPOSE, "obj=3D%p", gobj); + while (klass) { if (klass->dispose) klass->dispose(obj); diff --git a/src/util/virprocess.c b/src/util/virprocess.c index a9afa2e665..6f03627c42 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -444,11 +444,12 @@ int virProcessKillPainfully(pid_t pid, bool force) int virProcessSetAffinity(pid_t pid, virBitmapPtr map) { size_t i; - VIR_DEBUG("Set process affinity on %lld", (long long)pid); int numcpus =3D 1024; size_t masklen; cpu_set_t *mask; =20 + VIR_DEBUG("Set process affinity on %lld", (long long)pid); + /* Not only may the statically allocated cpu_set_t be too small, * but there is no way to ask the kernel what size is large enough. * So you have no option but to pick a size, try, catch EINVAL, diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index f529f0faf3..51037c691f 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -5335,14 +5335,14 @@ virStorageFileGetMetadata(virStorageSourcePtr src, uid_t uid, gid_t gid, bool report_broken) { + virHashTablePtr cycle =3D NULL; + virStorageType actualType =3D virStorageSourceGetActualType(src); + int ret =3D -1; + VIR_DEBUG("path=3D%s format=3D%d uid=3D%u gid=3D%u report_broken=3D%d", src->path, src->format, (unsigned int)uid, (unsigned int)gid, report_broken); =20 - virHashTablePtr cycle =3D NULL; - virStorageType actualType =3D virStorageSourceGetActualType(src); - int ret =3D -1; - if (!(cycle =3D virHashCreate(5, NULL))) return -1; =20 --=20 2.26.2 From nobody Mon Apr 29 19:13:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1596473852; cv=none; d=zohomail.com; s=zohoarc; b=IpAZ8/biZi3nSgvLhzKV6ORhZRoFqXSqHyUVIq53EgFQOgBX1p/WXg9cgQsnS4xPoCG22F+zIQYg+wC1r6Hqv8nIvamnwKd2a/dhxY0hT/eiNtp+3AfQp+v0nUqOE7gZwNAayYuXvAswgd6nd2VBZ63a3+d7jZLTYEJENSzhODg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596473852; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=N15WhHt7rDyNvou6MmQVs7JxZOvGzucyGEhdD3PCOvQ=; b=Nbq5Sb01ApTUEjZL7kkr1P4LpIpSGdXoJnskoy7m8lsBmnruXghr87JAhC59cAWGo69mLJC8EKb4JbE3FUgUC6empcuHSzgHLr16IdPwZXxvAfUPoyC7kelRifv6bhVBpHyRiZPhX3mj+5Npw1KbQFUTKr9OvmAaW9Tb1n+Etd4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1596473852930451.795777956218; Mon, 3 Aug 2020 09:57:32 -0700 (PDT) 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-243-Gnc_UHj3NrayqgSNSiJkZQ-1; Mon, 03 Aug 2020 12:57:29 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E28CA101C8AD; Mon, 3 Aug 2020 16:57:22 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BBA7360CC0; Mon, 3 Aug 2020 16:57:22 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 87FB61806B0C; Mon, 3 Aug 2020 16:57:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 073GvHtJ007733 for ; Mon, 3 Aug 2020 12:57:17 -0400 Received: by smtp.corp.redhat.com (Postfix) id 60D3171779; Mon, 3 Aug 2020 16:57:17 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id A5D0B71770 for ; Mon, 3 Aug 2020 16:57:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596473851; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=N15WhHt7rDyNvou6MmQVs7JxZOvGzucyGEhdD3PCOvQ=; b=Sx7uhXwFp1VAtkVJzJpVM9f28JdqzlRcZ2fOG2QZAy3z134gVhZnWr/hWkdmkd2Go0rqZB JlYv1tGi7IleDitoQVAdD2yp90r1C49HXOf9P5ozMEhTb/zrf46Ilk8gEos9d5oC1HWcqh 98C0JNrVhEn2O92KTHwW47qHxPPQARI= X-MC-Unique: Gnc_UHj3NrayqgSNSiJkZQ-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 08/19] rpc: move lock after declaration Date: Mon, 3 Aug 2020 18:56:45 +0200 Message-Id: <10bda23fc84076d0606bda617d8f2276b3d0da8f.1596473604.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) virNetClientRemoveStream starts by calling a lock. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/rpc/virnetclient.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 42703664fe..2e0aa9ca7c 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -1043,8 +1043,10 @@ int virNetClientAddStream(virNetClientPtr client, void virNetClientRemoveStream(virNetClientPtr client, virNetClientStreamPtr st) { - virObjectLock(client); size_t i; + + virObjectLock(client); + for (i =3D 0; i < client->nstreams; i++) { if (client->streams[i] =3D=3D st) break; --=20 2.26.2 From nobody Mon Apr 29 19:13:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1596473921; cv=none; d=zohomail.com; s=zohoarc; b=cXP4XgFAIn0oRcnhqHluOzpnhjD4nOCGK5BnQe4+wgRsRlkJgPWrCyuuQGTmPeIsRc+s8tdSjuKw+mfyfd6gmuZZdCNADsZgw28P9E7RG4bIJgYJkj1rayg+WLGPTVIFkIAg87HLXvedp7w51rUR2yDXQ/fa54M4ZGYfU/PfgUw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596473921; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JSkgs1/emByiIOqeK2qKP8nHUoU0uEKh5y4OJG8+3ns=; b=DGxgso9rLbNQx4ahhb+MyiK8RQoxU9WsYkJH0ZEyQ9oTKBnfFHI8263sW/LKZ76WWlAAPMpF+neM9NQV9Ew0J34x4s3MEDNrkvjPlYqMhYih1UeZBE3M7LIn8SamfA5IY04VXRnWO9rSlXmcVlHMDBcURyvadZV/XDaWFa3E9fM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1596473921905375.78935777356503; Mon, 3 Aug 2020 09:58:41 -0700 (PDT) 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-238-GqGEmSoYNpiYIDsSRLa5Zw-1; Mon, 03 Aug 2020 12:58:37 -0400 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 7BC83107BF04; Mon, 3 Aug 2020 16:58:28 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5F11969333; Mon, 3 Aug 2020 16:58:28 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 3159B9A11E; Mon, 3 Aug 2020 16:58:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 073GvIEj007745 for ; Mon, 3 Aug 2020 12:57:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id 977B471779; Mon, 3 Aug 2020 16:57:18 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id DD04E71770 for ; Mon, 3 Aug 2020 16:57:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596473920; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=JSkgs1/emByiIOqeK2qKP8nHUoU0uEKh5y4OJG8+3ns=; b=H/gmrcLTTzqf9YeefQ7xrXxdarnqMZMuFoXVPvsNX6TdXSp9+h2PCjNMEaQ9r18KGP1EhR t1zJ1upwe2R5raf+lrupmYy5waYRjNyydbGHWjTHDpUXPm26FY9tytvOw54CoJt5m5G+Fp eE7Bz5sx6rppKh79bWlY6xxVC6wZ9bs= X-MC-Unique: GqGEmSoYNpiYIDsSRLa5Zw-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 09/19] security: move chardevData declaration Date: Mon, 3 Aug 2020 18:56:46 +0200 Message-Id: <73d6a1fc9362142ea93e127184d79e9a5f3ce128.1596473604.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Declare it at the beginning of the function instead of right before use. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/security/security_dac.c | 20 ++++++++++---------- src/security/security_selinux.c | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/security/security_dac.c b/src/security/security_dac.c index dd701ef28b..d9d4cda159 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -1945,6 +1945,11 @@ virSecurityDACRestoreAllLabel(virSecurityManagerPtr = mgr, size_t i; int rc =3D 0; =20 + struct _virSecuritySELinuxChardevCallbackData chardevData =3D { + .mgr =3D mgr, + .chardevStdioLogd =3D chardevStdioLogd, + }; + secdef =3D virDomainDefGetSecurityLabelDef(def, SECURITY_DAC_NAME); =20 if (!priv->dynamicOwnership || (secdef && !secdef->relabel)) @@ -1986,11 +1991,6 @@ virSecurityDACRestoreAllLabel(virSecurityManagerPtr = mgr, rc =3D -1; } =20 - struct _virSecuritySELinuxChardevCallbackData chardevData =3D { - .mgr =3D mgr, - .chardevStdioLogd =3D chardevStdioLogd, - }; - if (virDomainChrDefForeach(def, false, virSecurityDACRestoreChardevCallback, @@ -2152,6 +2152,11 @@ virSecurityDACSetAllLabel(virSecurityManagerPtr mgr, uid_t user; gid_t group; =20 + struct _virSecuritySELinuxChardevCallbackData chardevData =3D { + .mgr =3D mgr, + .chardevStdioLogd =3D chardevStdioLogd, + }; + secdef =3D virDomainDefGetSecurityLabelDef(def, SECURITY_DAC_NAME); =20 if (!priv->dynamicOwnership || (secdef && !secdef->relabel)) @@ -2192,11 +2197,6 @@ virSecurityDACSetAllLabel(virSecurityManagerPtr mgr, return -1; } =20 - struct _virSecuritySELinuxChardevCallbackData chardevData =3D { - .mgr =3D mgr, - .chardevStdioLogd =3D chardevStdioLogd, - }; - if (virDomainChrDefForeach(def, true, virSecurityDACSetChardevCallback, diff --git a/src/security/security_selinux.c b/src/security/security_selinu= x.c index cc8fb1099c..87741d6dad 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -2767,6 +2767,11 @@ virSecuritySELinuxRestoreAllLabel(virSecurityManager= Ptr mgr, size_t i; int rc =3D 0; =20 + struct _virSecuritySELinuxChardevCallbackData chardevData =3D { + .mgr =3D mgr, + .chardevStdioLogd =3D chardevStdioLogd + }; + VIR_DEBUG("Restoring security label on %s migrated=3D%d", def->name, m= igrated); =20 secdef =3D virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); @@ -2805,11 +2810,6 @@ virSecuritySELinuxRestoreAllLabel(virSecurityManager= Ptr mgr, rc =3D -1; } =20 - struct _virSecuritySELinuxChardevCallbackData chardevData =3D { - .mgr =3D mgr, - .chardevStdioLogd =3D chardevStdioLogd - }; - if (virDomainChrDefForeach(def, false, virSecuritySELinuxRestoreSecurityChardevCal= lback, @@ -3165,6 +3165,11 @@ virSecuritySELinuxSetAllLabel(virSecurityManagerPtr = mgr, virSecuritySELinuxDataPtr data =3D virSecurityManagerGetPrivateData(mg= r); virSecurityLabelDefPtr secdef; =20 + struct _virSecuritySELinuxChardevCallbackData chardevData =3D { + .mgr =3D mgr, + .chardevStdioLogd =3D chardevStdioLogd + }; + secdef =3D virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); =20 if (!secdef || !secdef->relabel || data->skipAllLabel) @@ -3208,11 +3213,6 @@ virSecuritySELinuxSetAllLabel(virSecurityManagerPtr = mgr, return -1; } =20 - struct _virSecuritySELinuxChardevCallbackData chardevData =3D { - .mgr =3D mgr, - .chardevStdioLogd =3D chardevStdioLogd - }; - if (virDomainChrDefForeach(def, true, virSecuritySELinuxSetSecurityChardevCallbac= k, --=20 2.26.2 From nobody Mon Apr 29 19:13:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1596473921; cv=none; d=zohomail.com; s=zohoarc; b=l6hjzjhtiovLjNtIW7PTON893hg+VxVIuRk5pKJ6isC/GSt/Kyt2cnMHD9Rqc6484ETxSPfPgB2UKmXKN3bRWZxS+rHSUpmS8EdK1Rda8JwG1wrKG4yfDZfK7g15d4o1idw02wTPPCXydS+T694klGwgEwXZNbI9pqO+LyAAqyw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596473921; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cYDnvgvjBgHxYQJuIQLZkyQoIXP2Ulume4WFa3PC6o8=; b=HcZ4NqGXoavStZAWcULxR0aNsDT2R+RMuiAh+N8+QajFjk+f4fkMEHWCmjuNO2Q2Odlcbm6oQ1Di1wIS8hG1Sn0l7IoOG2pwYTI9j6Spn91H9eagUwWUDaRGzoFcjEP+uAd39hRAHCqMsFTtp8piuZRnYUqMPXPtTNi6Fu0yp04= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 159647392164532.53608227115501; Mon, 3 Aug 2020 09:58:41 -0700 (PDT) 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-346-S2hcL9gKMHOqEIq1_7hE4g-1; Mon, 03 Aug 2020 12:58:37 -0400 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 C0A201DE6; Mon, 3 Aug 2020 16:58:30 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9DE001002391; Mon, 3 Aug 2020 16:58:30 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 6C9F51809554; Mon, 3 Aug 2020 16:58:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 073GvMjH007773 for ; Mon, 3 Aug 2020 12:57:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id E23177177A; Mon, 3 Aug 2020 16:57:22 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F91C71775 for ; Mon, 3 Aug 2020 16:57:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596473920; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=cYDnvgvjBgHxYQJuIQLZkyQoIXP2Ulume4WFa3PC6o8=; b=TwMNeEDkHdd4/fSAGhqIj1ub8KYKnDIRMIDL5KvK+3saBAyVFmt0vMKehfEVKREx40YV8H j5b4liA/jGHFiEPl72RVzX6njyRPzzl2JfjAiqHoYeup2Y/uzCPl1+Rlj1AzhnsO147dGn rr+1n8AJ5PIEpZAnda4p8xvOaIlkepM= X-MC-Unique: S2hcL9gKMHOqEIq1_7hE4g-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 10/19] util: virNetDevBridgeSet: split declarations Date: Mon, 3 Aug 2020 18:56:47 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Declare the variables at the beginning of the function, then fill them up. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/util/virnetdevbridge.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c index e1ba119b8b..8ce1a07c41 100644 --- a/src/util/virnetdevbridge.c +++ b/src/util/virnetdevbridge.c @@ -119,6 +119,8 @@ static int virNetDevBridgeSet(const char *brname, struct ifreq *ifr) /* pre-filled bridge= name */ { g_autofree char *path =3D NULL; + unsigned long args[] =3D { 0, value, 0, 0 }; + unsigned long paramid; =20 path =3D g_strdup_printf(SYSFS_NET_DIR "%s/bridge/%s", brname, paramna= me); =20 @@ -129,7 +131,6 @@ static int virNetDevBridgeSet(const char *brname, VIR_DEBUG("Unable to set bridge %s %s via sysfs", brname, paramnam= e); } =20 - unsigned long paramid; if (STREQ(paramname, "stp_state")) { paramid =3D BRCTL_SET_BRIDGE_STP_STATE; } else if (STREQ(paramname, "forward_delay")) { @@ -140,7 +141,8 @@ static int virNetDevBridgeSet(const char *brname, brname, paramname); return -1; } - unsigned long args[] =3D { paramid, value, 0, 0 }; + + args[0] =3D paramid; ifr->ifr_data =3D (char*)&args; if (ioctl(fd, SIOCDEVPRIVATE, ifr) < 0) { virReportSystemError(errno, --=20 2.26.2 From nobody Mon Apr 29 19:13:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1596473926; cv=none; d=zohomail.com; s=zohoarc; b=KP8rwt2ZKAe780zRxfIAyqa5FGERAyRN6CqbLifmFwfgGA8Qn5JJece1RqTS+rXRoMkdRYf8pAS3Y8wamXaEgRN00q9vNWOc0/kTkaQZAm21T5WxAMyheOaFKfkiBHMb9AXqDysCaSiZHKPUzCpkTBs3ShcyXDzi2lKcCGmWGZw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596473926; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ebfz0SgLhcTq/5WJLfwQv+ZfRBwxZwV/7eBtQdF6LYQ=; b=MomRqLqo2FLMnmO/JRS5VQ9NJsYZK+U9X5fmGeT5j4j36FfZ1JJiW55OUWFPwt+R0kCuRAa8zPIPJk2DnpAkMca2H6fYGupW/UCBWz2kKtspHzUuAFz3gRtbB26CjEoqV2H4vWUg4cEi7VIA1HuYSe2k+lUwTs6jwqhIfkcM8Ag= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1596473926724537.9296079223362; Mon, 3 Aug 2020 09:58:46 -0700 (PDT) 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-209-ZCnnzl85OMitesI5KcIX6A-1; Mon, 03 Aug 2020 12:58:39 -0400 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 36BC11902EA8; Mon, 3 Aug 2020 16:58:33 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1543669329; Mon, 3 Aug 2020 16:58:33 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D3A9B1800FEE; Mon, 3 Aug 2020 16:58:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 073GvNJK007784 for ; Mon, 3 Aug 2020 12:57:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id E743171779; Mon, 3 Aug 2020 16:57:23 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5156C71778 for ; Mon, 3 Aug 2020 16:57:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596473925; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ebfz0SgLhcTq/5WJLfwQv+ZfRBwxZwV/7eBtQdF6LYQ=; b=Jz0kqeafzqvbgDxeAewehssIkD4rsIpCfGKfLS6gj1Ohq5r1CHtiIbINsV4OytM7GcSKTu OqBJQtfxdFfS0NPoRGMvN+9gODDeIn4ft3Zmq621qZBz49i1tZgIKDVkSPOJmjSk63+wY6 7db5g5KJRAIi4z3jxDYtWZINpFLIVzs= X-MC-Unique: ZCnnzl85OMitesI5KcIX6A-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 11/19] tests: sockettest: move declarations Date: Mon, 3 Aug 2020 18:56:48 +0200 Message-Id: <5b2684234b2e6dbc17902ba23ae33a605a5e228a.1596473604.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Declare the structs: at the beginning of the block. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- tests/sockettest.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/sockettest.c b/tests/sockettest.c index a3c27421fc..3183ca523f 100644 --- a/tests/sockettest.c +++ b/tests/sockettest.c @@ -277,11 +277,11 @@ mymain(void) do { \ virSocketAddr addr; \ struct testParseData data =3D { &addr, addrstr, family, pass }; \ - memset(&addr, 0, sizeof(addr)); \ - if (virTestRun("Test parse " addrstr " family " #family, \ - testParseHelper, &data) < 0) \ - ret =3D -1; \ struct testFormatData data2 =3D { &addr, addrstr, pass }; \ + memset(&addr, 0, sizeof(addr)); \ + if (virTestRun("Test parse " addrstr " family " #family, \ + testParseHelper, &data) < 0) \ + ret =3D -1; \ if (virTestRun("Test format " addrstr " family " #family, \ testFormatHelper, &data2) < 0) \ ret =3D -1; \ @@ -291,11 +291,11 @@ mymain(void) do { \ virSocketAddr addr; \ struct testParseData data =3D { &addr, addrstr, family, true}; \ - memset(&addr, 0, sizeof(addr)); \ - if (virTestRun("Test parse " addrstr " family " #family, \ - testParseHelper, &data) < 0) \ - ret =3D -1; \ struct testFormatData data2 =3D { &addr, addrformated, pass }; \ + memset(&addr, 0, sizeof(addr)); \ + if (virTestRun("Test parse " addrstr " family " #family, \ + testParseHelper, &data) < 0) \ + ret =3D -1; \ if (virTestRun("Test format " addrstr " family " #family, \ testFormatHelper, &data2) < 0) \ ret =3D -1; \ --=20 2.26.2 From nobody Mon Apr 29 19:13:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1596473857; cv=none; d=zohomail.com; s=zohoarc; b=IwQ/9DSGEknjzmuJ3klNdr7hjAFoIuc0YkuDCezHJoeoAsKtBnCp48l1YZVLCpQAzs/X0rRz2CjErQC1XAHX5cjGcPtrdS8P2Ka20fTfvh+A+yC4VwRyRcbw+DTUbEQRbXKouUjebL7qyAfnPF4r5MlbzES2eaOR9QdDlDHQ/vk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596473857; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pyddKKLQFMTh+ly6+/EC5uviCuQObGNUeo/oRxjwdYk=; b=GsuanpTQjb3N53asNWjPoe40jiTWyG27Unh2V84vNPThogYyI2GMNzKEsxby8IWA829rjDPaVzl6ngW/LLcE1OR5+LYlg7Mbwb5ORxxjBKGNGw/LJPkTdBkLKFHjAH+5L4DPl28HXFq4AOI0njM9sC/gtCY2iPLKH0nPueXbUSA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1596473857703739.6743855838206; Mon, 3 Aug 2020 09:57:37 -0700 (PDT) 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-255-PT5c0DK9POCyr32oGPEQWQ-1; Mon, 03 Aug 2020 12:57:33 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 82DC4101C8A0; Mon, 3 Aug 2020 16:57:26 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5FC3E60F96; Mon, 3 Aug 2020 16:57:26 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 2DE829A117; Mon, 3 Aug 2020 16:57:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 073GvO9G007794 for ; Mon, 3 Aug 2020 12:57:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id EDBB27177A; Mon, 3 Aug 2020 16:57:24 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6155D71778 for ; Mon, 3 Aug 2020 16:57:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596473856; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=pyddKKLQFMTh+ly6+/EC5uviCuQObGNUeo/oRxjwdYk=; b=Ro2e+gVjgIeemE+QBvIcXgJSf3dxIntvzHwo4F7PrY5a4Ir0+/f0gHiKXIQNSJFV+rVYF9 f/kyZTWiVFSpjAOU0d3YkkUsL4ewT7hU9R8hizLrKJxieF1BPE0EtxUf89ObVey2Iqk0IY cISLzdCtDdqSshgW3M1OVQGtTqD8DZo= X-MC-Unique: PT5c0DK9POCyr32oGPEQWQ-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 12/19] tests: authconfigtest: move declarations Date: Mon, 3 Aug 2020 18:56:49 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- tests/virauthconfigtest.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/virauthconfigtest.c b/tests/virauthconfigtest.c index a88b453543..1bff3debb0 100644 --- a/tests/virauthconfigtest.c +++ b/tests/virauthconfigtest.c @@ -84,20 +84,6 @@ mymain(void) =20 virAuthConfigPtr config; =20 -#ifndef WIN32 - signal(SIGPIPE, SIG_IGN); -#endif /* WIN32 */ - -#define TEST_LOOKUP(config, hostname, service, credname, expect) \ - do { \ - const struct ConfigLookupData data =3D { \ - config, hostname, service, credname, expect \ - }; \ - if (virTestRun("Test Lookup " hostname "-" service "-" credname, \ - testAuthLookup, &data) < 0) \ - ret =3D -1; \ - } while (0) - const char *confdata =3D "[credentials-test]\n" "username=3Dfred\n" @@ -119,6 +105,20 @@ mymain(void) "[auth-libvirt-prod1.example.com]\n" "credentials=3Dprod\n"; =20 +#define TEST_LOOKUP(config, hostname, service, credname, expect) \ + do { \ + const struct ConfigLookupData data =3D { \ + config, hostname, service, credname, expect \ + }; \ + if (virTestRun("Test Lookup " hostname "-" service "-" credname, \ + testAuthLookup, &data) < 0) \ + ret =3D -1; \ + } while (0) + +#ifndef WIN32 + signal(SIGPIPE, SIG_IGN); +#endif /* WIN32 */ + if (!(config =3D virAuthConfigNewData("auth.conf", confdata, strlen(co= nfdata)))) return EXIT_FAILURE; =20 --=20 2.26.2 From nobody Mon Apr 29 19:13:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1596473945; cv=none; d=zohomail.com; s=zohoarc; b=KGCycxX3fMaWffz4AUBVYJd2u4O/IyURIggHx+bLjIgJcbcmDbsoHoHBoZeO4Wc2DsMQoUkIWQM/uxcO5QzPbEsQNGPM/7zbhZdPAF+Q2F4P2wFxRieWNTottdXk0drxGrXsojwstA4/XwkozRWkpJD4LXv5d2r5ULWWCtFplQ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596473945; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=w+bhKKX5kLHoDDQ7TsAWe0mW4kPpLzZ0DLjhI2KbubU=; b=VpaZ/I6NhqjYQnaaGrC15tFP8Wd4AQCXZ9PRItJnXbCdhBDwpl1Au9YdITwH/X9kkkFvlePcmaw2qSfEsI63uhq87KnroU+TOgeiKz017NYDyJkQ9lxhx1kyY7j2LI1LVgA8A4j14DcdzYgzmrO7sGcQ5XVzaSAcxRhyr+9dvdM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1596473945536125.09480746085137; Mon, 3 Aug 2020 09:59:05 -0700 (PDT) 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-502-Bw5sXbohMaiAv3prYhf24w-1; Mon, 03 Aug 2020 12:58:44 -0400 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 E731B101C8A7; Mon, 3 Aug 2020 16:58:35 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CAD6871771; Mon, 3 Aug 2020 16:58:35 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 9D1409A109; Mon, 3 Aug 2020 16:58:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 073GvQDq007805 for ; Mon, 3 Aug 2020 12:57:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1832371770; Mon, 3 Aug 2020 16:57:26 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5D58D71778 for ; Mon, 3 Aug 2020 16:57:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596473944; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=w+bhKKX5kLHoDDQ7TsAWe0mW4kPpLzZ0DLjhI2KbubU=; b=ieR1JaSS6LBHcT+izi3H3nyVTV30DG0E8y5M5mL8XaNDLIzSvHhoejkn1Yp19z+1ab9EFu QjGf6GBTypReRIGBYDv7pmE8Lfh5VClwOd357XP6h0O+6bsxfmERZhk/cszMsvYHe8wh8q yqps82nNYDSJN9Sk5u2vEi0/B/hxpGk= X-MC-Unique: Bw5sXbohMaiAv3prYhf24w-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 13/19] util: cgroup: wrap BACKEND_CALL macro in a block Date: Mon, 3 Aug 2020 18:56:50 +0200 Message-Id: <6a67653a3cc8c7f11ab552bfb4d6b719edd5c3fb.1596473604.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) VIR_CGROUP_BACKEND_CALL is exclusively used at the end of a function, but it declares a variable. Wrap it in a do..while block. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/util/vircgroupbackend.h | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h index e12a2e8b9d..bcbe435d78 100644 --- a/src/util/vircgroupbackend.h +++ b/src/util/vircgroupbackend.h @@ -452,15 +452,17 @@ virCgroupBackendForController(virCgroupPtr group, unsigned int controller); =20 #define VIR_CGROUP_BACKEND_CALL(group, controller, func, ret, ...) \ - virCgroupBackendPtr backend =3D virCgroupBackendForController(group, c= ontroller); \ - if (!backend) { \ - virReportError(VIR_ERR_INTERNAL_ERROR, \ - _("failed to get cgroup backend for '%s'"), #func);= \ - return ret; \ - } \ - if (!backend->func) { \ - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, \ - _("operation '%s' not supported"), #func); \ - return ret; \ - } \ - return backend->func(group, ##__VA_ARGS__); + do { \ + virCgroupBackendPtr backend =3D virCgroupBackendForController(grou= p, controller); \ + if (!backend) { \ + virReportError(VIR_ERR_INTERNAL_ERROR, \ + _("failed to get cgroup backend for '%s'"), #fu= nc); \ + return ret; \ + } \ + if (!backend->func) { \ + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, \ + _("operation '%s' not supported"), #func); \ + return ret; \ + } \ + return backend->func(group, ##__VA_ARGS__); \ + } while (0) --=20 2.26.2 From nobody Mon Apr 29 19:13:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1596473902; cv=none; d=zohomail.com; s=zohoarc; b=dcXR3ryFSRmMck57zIuHulwYqbqofDa6hVjec96Q9cVMASowg0YsznyFMd6QJ7+UoVCZXP1dPjRhiNHaTcPBl8++bwgQ84HLbpnJBaRhdkPTFiQo01yqqQ/DEl2+BdVdpdzU3EvFtkcovtNYEWk8qH5ulDObIoyFaz3U1PqB5Ns= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596473902; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6TDS00FccgTQZAfizWKYt78aF4srwoAX/QAJKaMvZHo=; b=CQ23lgCzoZbynNkBpdfvXuXIWjw99qhe/7l6qDBRoUWneiCSR63t68sM0KpN2CF0N9O3gqCwGfNyNORRCqgE2MG2FawnpfRuoBpam5/IITqN7nlUxb8MQU8pctq83/wKazHe/kYhwktvoHdTYq7In08o6jCSFyQN1a1owYpDoMo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1596473902277423.8111667450115; Mon, 3 Aug 2020 09:58:22 -0700 (PDT) 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-367-L5tg26Y-M_CHPzVwMsmjBQ-1; Mon, 03 Aug 2020 12:57:37 -0400 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 67981101C8AE; Mon, 3 Aug 2020 16:57:29 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 443AD277C0; Mon, 3 Aug 2020 16:57:29 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 162A39A11B; Mon, 3 Aug 2020 16:57:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 073GvRs9007817 for ; Mon, 3 Aug 2020 12:57:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3649971770; Mon, 3 Aug 2020 16:57:27 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8579D71775 for ; Mon, 3 Aug 2020 16:57:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596473901; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=6TDS00FccgTQZAfizWKYt78aF4srwoAX/QAJKaMvZHo=; b=Vlk7yT87O6+uDEK/esVpWXA/rmwzUR13R40U/Lz9PiVF209Eb1ltVohMj33EKzvlOtvzWU Qef3Wt0SbSHNBACmvs4GAcLDfAeG7WRL87mZ6YLDP5PLIw3a3WdV554CuzYHIvVkAwQxow 6S986HisnolAfSSNE4gOHn+9On2nDVA= X-MC-Unique: L5tg26Y-M_CHPzVwMsmjBQ-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 14/19] tests: iscsitest: split out testISCSIScanTargetsTests Date: Mon, 3 Aug 2020 18:56:51 +0200 Message-Id: <763c14794b340366da048373a622468cb5edf381.1596473604.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) The ScanTargets testing code declares some variables in the middle of main. Split it out into a separate function. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- tests/viriscsitest.c | 47 ++++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/tests/viriscsitest.c b/tests/viriscsitest.c index 76f0aa2946..e86d3970b6 100644 --- a/tests/viriscsitest.c +++ b/tests/viriscsitest.c @@ -311,26 +311,8 @@ testISCSIConnectionLogin(const void *data) =20 =20 static int -mymain(void) +testISCSIScanTargetsTests(void) { - int rv =3D 0; - -# define DO_SESSION_TEST(name, session) \ - do { \ - struct testSessionInfo info =3D {name, false, session}; \ - if (virTestRun("ISCSI get session test" name, \ - testISCSIGetSession, &info) < 0) \ - rv =3D -1; \ - info.output_version =3D true; \ - if (virTestRun("ISCSI get (non-flash) session test" name, \ - testISCSIGetSession, &info) < 0) \ - rv =3D -1; \ - } while (0) - - DO_SESSION_TEST("iqn.2004-06.example:example1:iscsi.test", "1"); - DO_SESSION_TEST("iqn.2009-04.example:example1:iscsi.seven", "7"); - DO_SESSION_TEST("iqn.2009-04.example:example1:iscsi.eight", NULL); - const char *targets[] =3D { "iqn.2004-06.example:example1:iscsi.test", "iqn.2005-05.example:example1:iscsi.hello", @@ -346,6 +328,33 @@ mymain(void) .nexpected =3D G_N_ELEMENTS(targets), }; if (virTestRun("ISCSI scan targets", testISCSIScanTargets, &infoTarget= s) < 0) + return -1; + return 0; +} + + +static int +mymain(void) +{ + int rv =3D 0; + +# define DO_SESSION_TEST(name, session) \ + do { \ + struct testSessionInfo info =3D {name, false, session}; \ + if (virTestRun("ISCSI get session test" name, \ + testISCSIGetSession, &info) < 0) \ + rv =3D -1; \ + info.output_version =3D true; \ + if (virTestRun("ISCSI get (non-flash) session test" name, \ + testISCSIGetSession, &info) < 0) \ + rv =3D -1; \ + } while (0) + + DO_SESSION_TEST("iqn.2004-06.example:example1:iscsi.test", "1"); + DO_SESSION_TEST("iqn.2009-04.example:example1:iscsi.seven", "7"); + DO_SESSION_TEST("iqn.2009-04.example:example1:iscsi.eight", NULL); + + if (testISCSIScanTargetsTests() < 0) rv =3D -1; =20 # define DO_LOGIN_TEST(portal, iqn, target) \ --=20 2.26.2 From nobody Mon Apr 29 19:13:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1596473862; cv=none; d=zohomail.com; s=zohoarc; b=QoOZOggsFNWbJVAlyaMPQ7D/5TkiOkJZNE8adGoG4xkHWw82ytoKrbOuoaAnJnVLfDwE6Zo9NmeXdVkfEuo8nqCovIPSgQnppg06f/Tp42jx2MrzMhYZHigvQBcw2hJOs7BPs/pPPlQxvK27N+vtbgRKXdZtLgBWXZs7GSoqqg8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596473862; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=MrrOxXXTmZC166hOzEMuXnDh3gDdBpQ/XM8eWs9LThU=; b=Ujv9m/xxKzLAq/3sDD+AtQed5aBL48hqjAwtkskeYYtCGg0IXuHmRh857oJNy35ysBq4fqA/dnPuDgS+SFPy49B5tXGr7uTdvUz4SqK5UTIRS+mOgn+Rp2q8+Z8DCKYt5dKI6VFYj76Cw9KjkzXYVg2q0og+eEPRmNmNv9EJtDE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1596473862681743.8364311859035; Mon, 3 Aug 2020 09:57:42 -0700 (PDT) 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-381-Nptl4zZ_Pe6-RNiJ1tBlHw-1; Mon, 03 Aug 2020 12:57:38 -0400 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 BF45A8017FB; Mon, 3 Aug 2020 16:57:31 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9C8F4100E870; Mon, 3 Aug 2020 16:57:31 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 68A2C9A11E; Mon, 3 Aug 2020 16:57:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 073GvS4N007833 for ; Mon, 3 Aug 2020 12:57:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id 54D4F71773; Mon, 3 Aug 2020 16:57:28 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9AEC571770 for ; Mon, 3 Aug 2020 16:57:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596473861; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=MrrOxXXTmZC166hOzEMuXnDh3gDdBpQ/XM8eWs9LThU=; b=aDYosDMAGxTRKWr/hmT/Y7z2ewAoz9F+NUe5dz3R824xtWJMTt0huw2EU17TWMq3/wFiIk IW+CSwampDoUBFz2ezixzso2AYDHrr+/YyrFZBPvC2lx7q4RdNKG2kRMuOzzqKuRhHGrG2 p/G9wAFVEUjjy52Rcp3JXl7hNMQAWHs= X-MC-Unique: Nptl4zZ_Pe6-RNiJ1tBlHw-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH RFC 15/19] util: xml: use pragma in VIR_XPATH_NODE_AUTORESTORE Date: Mon, 3 Aug 2020 18:56:52 +0200 Message-Id: <367d920825d55cff3201b69ac4e8871da17cf182.1596473604.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) The VIR_XPATH_NODE_AUTORESTORE contains an ignore_value statement to silence an unused variable warning on clang. Use a pragma instead, which is not a statement. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/internal.h | 5 +++++ src/util/virxml.h | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/internal.h b/src/internal.h index 3bab6b4bfe..3aa3c6ca67 100644 --- a/src/internal.h +++ b/src/internal.h @@ -189,6 +189,11 @@ _Pragma ("GCC diagnostic push") #endif =20 +/* Where ignore_value cannot be used because it's a statement */ +#define VIR_WARNINGS_NO_UNUSED_VARIABLE \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wunused-variable\"") + #define VIR_WARNINGS_RESET \ _Pragma ("GCC diagnostic pop") =20 diff --git a/src/util/virxml.h b/src/util/virxml.h index 886d1e025f..0301f15308 100644 --- a/src/util/virxml.h +++ b/src/util/virxml.h @@ -241,9 +241,10 @@ G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(virXPathContextNodeSa= ve, virXPathContextNodeRes * node pointer is reset to the original value when this macro was used. */ #define VIR_XPATH_NODE_AUTORESTORE(_ctxt) \ + VIR_WARNINGS_NO_UNUSED_VARIABLE \ g_auto(virXPathContextNodeSave) _ctxt ## CtxtSave =3D { .ctxt =3D _ctx= t,\ .node =3D _ctxt-= >node}; \ - ignore_value(&_ctxt ## CtxtSave) + VIR_WARNINGS_RESET =20 G_DEFINE_AUTOPTR_CLEANUP_FUNC(xmlDoc, xmlFreeDoc); G_DEFINE_AUTOPTR_CLEANUP_FUNC(xmlXPathContext, xmlXPathFreeContext); --=20 2.26.2 From nobody Mon Apr 29 19:13:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1596473863; cv=none; d=zohomail.com; s=zohoarc; b=geQYIPwDONcPk9bx3e0OA8NPbcim4U84RZihEPpP3LkaitL3NqhkKTptYsCuz9dSzYb4CbKWzK8Fcyi/eyGvEEL55QZ7dk3d9XIYOXmHrS521lbnPPxhGagqi+BE4qz9B8BHWvnGcuVYbyRvF0fVGo8kAkT+3gyBXhOEPWMqzbs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596473863; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Z61C0YoEx6wqH677eln8qsJ+wFSHBj+dpfB+OhoZEYw=; b=gB1E3o++JDkB/rvsBwiH6ingiSYP46+g0Xer3mWJyzKRMWz714g47JMt6U9oLXS0IrFmxPPZPLd4kQyee4Elq1s1XGlUNBNd1D/XCvMz6GnbeO/Y+zJS455abDkphEDgxSxhJOA8OIGbm+VgA6chkbVHoDmM9wLK2dgkd/WGYtQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1596473863141293.10497551577896; Mon, 3 Aug 2020 09:57:43 -0700 (PDT) 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-417-F4Y-sO7MPemqvFwf1LsNNg-1; Mon, 03 Aug 2020 12:57:38 -0400 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 DF16280046B; Mon, 3 Aug 2020 16:57:31 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BD93B90E81; Mon, 3 Aug 2020 16:57:31 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 8D45D9A11F; Mon, 3 Aug 2020 16:57:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 073GvThb007857 for ; Mon, 3 Aug 2020 12:57:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id AAC1371775; Mon, 3 Aug 2020 16:57:29 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id C37B471770 for ; Mon, 3 Aug 2020 16:57:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596473861; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Z61C0YoEx6wqH677eln8qsJ+wFSHBj+dpfB+OhoZEYw=; b=PgM+dguqvVOvAGogmma1Bht3YYJXUUg7FowKmZnVTvW1gVpP7eyIvFL6dLmO/rBAV5r5U6 IcEK6Pl/WSohhExTG8KDuGf48+MO2JdMLXX545bLW0KuBhpgppTdm12egBd3f5YfaPTX2R PJs/GA9C0k0ICPCxw2LUOuV99RhslhU= X-MC-Unique: F4Y-sO7MPemqvFwf1LsNNg-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH RFC 16/19] VIR_XPATH_NODE_AUTORESTORE: remove semicolon from users Date: Mon, 3 Aug 2020 18:56:53 +0200 Message-Id: <00498568eb6844bd190e2ddc2ccf10f1c391c52a.1596473604.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Since the macro no longer includes the 'ignore_value' statement, stop putting another empty statement after it. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/conf/backup_conf.c | 2 +- src/conf/checkpoint_conf.c | 2 +- src/conf/cpu_conf.c | 2 +- src/conf/domain_conf.c | 109 ++++++++++++++++--------------- src/conf/interface_conf.c | 8 +-- src/conf/netdev_vlan_conf.c | 2 +- src/conf/network_conf.c | 14 ++-- src/conf/networkcommon_conf.c | 2 +- src/conf/node_device_conf.c | 34 +++++----- src/conf/numa_conf.c | 6 +- src/conf/snapshot_conf.c | 2 +- src/conf/storage_adapter_conf.c | 2 +- src/conf/storage_conf.c | 2 +- src/conf/virsavecookie.c | 2 +- src/cpu/cpu_map.c | 4 +- src/cpu/cpu_x86.c | 2 +- src/lxc/lxc_domain.c | 2 +- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_domain.c | 6 +- src/qemu/qemu_domainjob.c | 4 +- src/qemu/qemu_migration_cookie.c | 6 +- src/util/virstorageencryption.c | 4 +- src/util/virstoragefile.c | 2 +- 23 files changed, 111 insertions(+), 110 deletions(-) diff --git a/src/conf/backup_conf.c b/src/conf/backup_conf.c index 02319f7245..5caba621d8 100644 --- a/src/conf/backup_conf.c +++ b/src/conf/backup_conf.c @@ -102,7 +102,7 @@ virDomainBackupDiskDefParseXML(xmlNodePtr node, unsigned int flags, virDomainXMLOptionPtr xmlopt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) g_autofree char *type =3D NULL; g_autofree char *driver =3D NULL; g_autofree char *backup =3D NULL; diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c index 1f935952c8..914af4305d 100644 --- a/src/conf/checkpoint_conf.c +++ b/src/conf/checkpoint_conf.c @@ -96,7 +96,7 @@ virDomainCheckpointDiskDefParseXML(xmlNodePtr node, virDomainCheckpointDiskDefPtr def) { g_autofree char *checkpoint =3D NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) =20 ctxt->node =3D node; =20 diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index fcc1ab6814..dea950ce68 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -327,7 +327,7 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt, { g_autoptr(virCPUDef) def =3D NULL; g_autofree xmlNodePtr *nodes =3D NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int n; size_t i; g_autofree char *cpuMode =3D NULL; diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 570812cefb..9a9211460c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8305,7 +8305,7 @@ virDomainHostdevSubsysSCSIiSCSIDefParseXML(xmlNodePtr= sourcenode, virDomainHostdevSubsysSCSIiSCSIPtr iscsisrc =3D &def->u.iscsi; g_autoptr(virStorageAuthDef) authdef =3D NULL; xmlNodePtr node; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) =20 ctxt->node =3D sourcenode; =20 @@ -8793,7 +8793,7 @@ virDomainNetDefCoalesceParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt) { virNetDevCoalescePtr ret =3D NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) unsigned long long tmp =3D 0; g_autofree char *str =3D NULL; =20 @@ -9164,7 +9164,7 @@ virSecurityLabelDefsParseXML(virDomainDefPtr def, virDomainXMLOptionPtr xmlopt, unsigned int flags) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) size_t i =3D 0, j; int n; g_autofree xmlNodePtr *list =3D NULL; @@ -9262,7 +9262,7 @@ virSecurityDeviceLabelDefParseXML(virSecurityDeviceLa= belDefPtr **seclabels_rtn, xmlXPathContextPtr ctxt, unsigned int flags) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) virSecurityDeviceLabelDefPtr *seclabels =3D NULL; size_t nseclabels =3D 0; int n; @@ -9458,7 +9458,7 @@ static virStorageNetCookieDefPtr virDomainStorageNetCookieParse(xmlNodePtr node, xmlXPathContextPtr ctxt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) g_autoptr(virStorageNetCookieDef) cookie =3D NULL; =20 ctxt->node =3D node; @@ -9485,7 +9485,7 @@ virDomainStorageNetCookiesParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virStorageSourcePtr src) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) g_autofree xmlNodePtr *nodes =3D NULL; ssize_t nnodes; size_t i; @@ -9702,7 +9702,7 @@ virDomainDiskSourcePRParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virStoragePRDefPtr *pr) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) =20 ctxt->node =3D node; =20 @@ -9757,7 +9757,7 @@ static virStorageSourceSlicePtr virDomainStorageSourceParseSlice(xmlNodePtr node, xmlXPathContextPtr ctxt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) g_autofree char *offset =3D NULL; g_autofree char *size =3D NULL; g_autofree virStorageSourceSlicePtr ret =3D g_new0(virStorageSourceSli= ce, 1); @@ -9823,7 +9823,7 @@ virDomainStorageSourceParse(xmlNodePtr node, unsigned int flags, virDomainXMLOptionPtr xmlopt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr tmp; =20 ctxt->node =3D node; @@ -9901,7 +9901,7 @@ virDomainDiskBackingStoreParse(xmlXPathContextPtr ctx= t, unsigned int flags, virDomainXMLOptionPtr xmlopt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr source; g_autoptr(virStorageSource) backingStore =3D NULL; g_autofree char *type =3D NULL; @@ -10039,7 +10039,7 @@ virDomainDiskDefMirrorParse(virDomainDiskDefPtr def, virDomainXMLOptionPtr xmlopt) { xmlNodePtr mirrorNode; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) g_autofree char *mirrorFormat =3D NULL; g_autofree char *mirrorType =3D NULL; g_autofree char *ready =3D NULL; @@ -10408,7 +10408,7 @@ virDomainDiskDefParsePrivateData(xmlXPathContextPtr= ctxt, virDomainXMLOptionPtr xmlopt) { xmlNodePtr private_node =3D virXPathNode("./privateData", ctxt); - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) =20 if (!xmlopt || !xmlopt->privateData.diskParse || @@ -10435,7 +10435,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlo= pt, { virDomainDiskDefPtr def; xmlNodePtr cur; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) bool source =3D false; virStorageEncryptionPtr encryption =3D NULL; g_autoptr(virStorageAuthDef) authdef =3D NULL; @@ -11038,7 +11038,7 @@ virDomainControllerDefParseXML(virDomainXMLOptionPt= r xmlopt, bool processedTarget =3D false; int numaNode =3D -1; int ports =3D -1; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int rc; g_autofree char *typeStr =3D NULL; g_autofree char *idx =3D NULL; @@ -11424,7 +11424,7 @@ virDomainFSDefParseXML(virDomainXMLOptionPtr xmlopt, xmlXPathContextPtr ctxt, unsigned int flags) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) virDomainFSDefPtr def; xmlNodePtr cur; g_autofree char *type =3D NULL; @@ -11676,7 +11676,7 @@ virDomainActualNetDefParseXML(xmlNodePtr node, { virDomainActualNetDefPtr actual =3D NULL; int ret =3D -1; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr bandwidth_node =3D NULL; xmlNodePtr vlanNode; xmlNodePtr virtPortNode; @@ -11876,7 +11876,7 @@ virDomainChrSourceReconnectDefParseXML(virDomainChr= SourceReconnectDefPtr def, xmlXPathContextPtr ctxt) { int tmpVal; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr cur; g_autofree char *tmp =3D NULL; =20 @@ -11927,7 +11927,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlop= t, xmlNodePtr tmpNode; virHashTablePtr filterparams =3D NULL; virDomainActualNetDefPtr actual =3D NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) virDomainChrSourceReconnectDef reconnect =3D {0}; int rv, val; g_autofree char *macaddr =3D NULL; @@ -13255,7 +13255,7 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDef= Ptr def, =20 /* Check for an optional seclabel override in . */ if (chr_def) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) ctxt->node =3D cur; if (virSecurityDeviceLabelDefParseXML(&def->seclabels, &def->nseclabels, @@ -13632,7 +13632,7 @@ virDomainTPMDefParseXML(virDomainXMLOptionPtr xmlop= t, unsigned int flags) { virDomainTPMDefPtr def; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int nbackends; g_autofree char *path =3D NULL; g_autofree char *model =3D NULL; @@ -13765,7 +13765,7 @@ virDomainInputDefParseXML(virDomainXMLOptionPtr xml= opt, xmlXPathContextPtr ctxt, unsigned int flags) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) virDomainInputDefPtr def; g_autofree char *evdev =3D NULL; g_autofree char *type =3D NULL; @@ -13960,7 +13960,7 @@ virDomainTimerDefParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt) { virDomainTimerDefPtr def; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr catchup; int ret; g_autofree char *name =3D NULL; @@ -14307,7 +14307,7 @@ virDomainGraphicsListensParseXML(virDomainGraphicsD= efPtr def, xmlXPathContextPtr ctxt, unsigned int flags) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) virDomainGraphicsListenDef newListen =3D {0}; int nListens; int ret =3D -1; @@ -14464,7 +14464,7 @@ virDomainGraphicsDefParseXMLSDL(virDomainGraphicsDe= fPtr def, xmlNodePtr node, xmlXPathContextPtr ctxt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int enableVal; xmlNodePtr glNode; g_autofree char *fullscreen =3D virXMLPropString(node, "fullscreen"); @@ -14853,7 +14853,7 @@ virDomainGraphicsDefParseXMLEGLHeadless(virDomainGr= aphicsDefPtr def, xmlNodePtr node, xmlXPathContextPtr ctxt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr glNode; =20 ctxt->node =3D node; @@ -14998,7 +14998,7 @@ virDomainSoundDefParseXML(virDomainXMLOptionPtr xml= opt, unsigned int flags) { virDomainSoundDefPtr def; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) g_autofree char *model =3D NULL; =20 if (VIR_ALLOC(def) < 0) @@ -15146,7 +15146,7 @@ virDomainRNGDefParseXML(virDomainXMLOptionPtr xmlop= t, unsigned int flags) { virDomainRNGDefPtr def; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int nbackends; g_autofree xmlNodePtr *backends =3D NULL; g_autofree char *model =3D NULL; @@ -15259,7 +15259,7 @@ virDomainMemballoonDefParseXML(virDomainXMLOptionPt= r xmlopt, unsigned int flags) { virDomainMemballoonDefPtr def; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) unsigned int period =3D 0; g_autofree char *model =3D NULL; g_autofree char *deflate =3D NULL; @@ -15344,7 +15344,7 @@ virDomainShmemDefParseXML(virDomainXMLOptionPtr xml= opt, virDomainShmemDefPtr def =3D NULL; virDomainShmemDefPtr ret =3D NULL; xmlNodePtr msi =3D NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr server =3D NULL; g_autofree char *tmp =3D NULL; =20 @@ -15447,7 +15447,7 @@ virSysinfoBIOSParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt, virSysinfoBIOSDefPtr *bios) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int ret =3D -1; virSysinfoBIOSDefPtr def; =20 @@ -15510,7 +15510,7 @@ virSysinfoSystemParseXML(xmlNodePtr node, unsigned char *domUUID, bool uuid_generated) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int ret =3D -1; virSysinfoSystemDefPtr def; g_autofree char *tmpUUID =3D NULL; @@ -15584,7 +15584,7 @@ virSysinfoBaseBoardParseXML(xmlXPathContextPtr ctxt, size_t *nbaseBoard) { size_t i, nboards =3D 0; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int n; g_autofree virSysinfoBaseBoardDefPtr boards =3D NULL; g_autofree xmlNodePtr *nodes =3D NULL; @@ -15633,7 +15633,7 @@ virSysinfoOEMStringsParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt, virSysinfoOEMStringsDefPtr *oem) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int ret =3D -1; virSysinfoOEMStringsDefPtr def; int nstrings; @@ -15671,7 +15671,7 @@ virSysinfoChassisParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt, virSysinfoChassisDefPtr *chassisdef) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int ret =3D -1; virSysinfoChassisDefPtr def; =20 @@ -15757,7 +15757,7 @@ virSysinfoParseFWCfgDef(virSysinfoDefPtr def, xmlNodePtr node, xmlXPathContextPtr ctxt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) g_autofree xmlNodePtr *nodes =3D NULL; int n; size_t i; @@ -15816,7 +15816,7 @@ virSysinfoParseXML(xmlNodePtr node, unsigned char *domUUID, bool uuid_generated) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) virSysinfoDefPtr def; g_autofree char *typeStr =3D NULL; int type; @@ -16029,7 +16029,7 @@ virDomainVideoDefParseXML(virDomainXMLOptionPtr xml= opt, { virDomainVideoDefPtr def; xmlNodePtr cur; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) g_autofree char *type =3D NULL; g_autofree char *driver_name =3D NULL; g_autofree char *heads =3D NULL; @@ -16184,7 +16184,7 @@ virDomainHostdevDefParseXML(virDomainXMLOptionPtr x= mlopt, unsigned int flags) { virDomainHostdevDefPtr def; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) g_autofree char *mode =3D virXMLPropString(node, "mode"); g_autofree char *type =3D virXMLPropString(node, "type"); =20 @@ -16448,7 +16448,7 @@ virDomainRedirFilterDefParseXML(xmlNodePtr node, { int n; size_t i; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) virDomainRedirFilterDefPtr def =3D NULL; g_autofree xmlNodePtr *nodes =3D NULL; =20 @@ -16586,7 +16586,7 @@ virDomainMemorySourceDefParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt, virDomainMemoryDefPtr def) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) g_autofree char *nodemask =3D NULL; =20 ctxt->node =3D node; @@ -16640,10 +16640,11 @@ virDomainMemoryTargetDefParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt, virDomainMemoryDefPtr def) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); - ctxt->node =3D node; + VIR_XPATH_NODE_AUTORESTORE(ctxt) int rv; =20 + ctxt->node =3D node; + /* initialize to value which marks that the user didn't specify it */ def->targetNode =3D -1; =20 @@ -16687,7 +16688,7 @@ static virDomainSEVDefPtr virDomainSEVDefParseXML(xmlNodePtr sevNode, xmlXPathContextPtr ctxt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) virDomainSEVDefPtr def; unsigned long policy; g_autofree char *type =3D NULL; @@ -16753,7 +16754,7 @@ virDomainMemoryDefParseXML(virDomainXMLOptionPtr xm= lopt, const virDomainDef *dom, unsigned int flags) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr node; virDomainMemoryDefPtr def; int val; @@ -16848,7 +16849,7 @@ static virDomainIOMMUDefPtr virDomainIOMMUDefParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr driver; int val; g_autofree char *tmp =3D NULL; @@ -16928,7 +16929,7 @@ virDomainVsockDefParseXML(virDomainXMLOptionPtr xml= opt, xmlXPathContextPtr ctxt, unsigned int flags) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr cid; int val; g_autofree char *tmp =3D NULL; @@ -18851,7 +18852,7 @@ virDomainIdmapDefParseXML(xmlXPathContextPtr ctxt, { size_t i; virDomainIdMapEntryPtr idmap =3D NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) =20 if (VIR_ALLOC_N(idmap, num) < 0) return idmap; @@ -19250,7 +19251,7 @@ virDomainHugepagesParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt, virDomainHugePagePtr hugepage) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) g_autofree char *nodeset =3D NULL; =20 ctxt->node =3D node; @@ -19285,7 +19286,7 @@ static virDomainResourceDefPtr virDomainResourceDefParse(xmlNodePtr node, xmlXPathContextPtr ctxt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) virDomainResourceDefPtr def =3D NULL; =20 ctxt->node =3D node; @@ -20462,7 +20463,7 @@ virDomainCachetuneDefParseCache(xmlXPathContextPtr = ctxt, xmlNodePtr node, virResctrlAllocPtr alloc) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) unsigned int level; unsigned int cache; int type; @@ -20606,7 +20607,7 @@ virDomainResctrlMonDefParse(virDomainDefPtr def, virDomainResctrlDefPtr resctrl) { virDomainResctrlMonDefPtr domresmon =3D NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) unsigned int level =3D 0; size_t i =3D 0; int n =3D 0; @@ -20760,7 +20761,7 @@ virDomainCachetuneDefParse(virDomainDefPtr def, xmlNodePtr node, unsigned int flags) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) virDomainResctrlDefPtr resctrl =3D NULL; ssize_t i =3D 0; int n; @@ -20902,7 +20903,7 @@ virDomainMemorytuneDefParseMemory(xmlXPathContextPt= r ctxt, xmlNodePtr node, virResctrlAllocPtr alloc) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) unsigned int id; unsigned int bandwidth; g_autofree char *tmp =3D NULL; @@ -20948,7 +20949,7 @@ virDomainMemorytuneDefParse(virDomainDefPtr def, xmlNodePtr node, unsigned int flags) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) virDomainResctrlDefPtr resctrl =3D NULL; virDomainResctrlDefPtr newresctrl =3D NULL; g_autoptr(virBitmap) vcpus =3D NULL; diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index 76f7054721..1e478ac075 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -262,7 +262,7 @@ static int virInterfaceDefParseDhcp(virInterfaceProtocolDefPtr def, xmlNodePtr dhcp, xmlXPathContextPtr ctxt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) char *tmp; int ret =3D 0; =20 @@ -424,7 +424,7 @@ static int virInterfaceDefParseIfAdressing(virInterfaceDefPtr def, xmlXPathContextPtr ctxt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr *protoNodes =3D NULL; int nProtoNodes, pp, ret =3D -1; char *tmp; @@ -553,7 +553,7 @@ virInterfaceDefParseBondItfs(virInterfaceDefPtr def, xmlXPathContextPtr ctxt) { xmlNodePtr *interfaces =3D NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) virInterfaceDefPtr itf; int nbItf; size_t i; @@ -692,7 +692,7 @@ virInterfaceDefParseXML(xmlXPathContextPtr ctxt, virInterfaceDefPtr def; int type; char *tmp; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr lnk; =20 =20 diff --git a/src/conf/netdev_vlan_conf.c b/src/conf/netdev_vlan_conf.c index 7830a341b2..493708fee1 100644 --- a/src/conf/netdev_vlan_conf.c +++ b/src/conf/netdev_vlan_conf.c @@ -33,7 +33,7 @@ int virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevVlan= Ptr def) { int ret =3D -1; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) char *trunk =3D NULL; char *nativeMode =3D NULL; xmlNodePtr *tagNodes =3D NULL; diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index d9a198a372..2547ae57c0 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -779,7 +779,7 @@ virNetworkDNSSrvDefParseXML(const char *networkName, bool partialOkay) { int ret; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) =20 ctxt->node =3D node; =20 @@ -937,7 +937,7 @@ virNetworkDNSDefParseXML(const char *networkName, g_autofree char *enable =3D NULL; int nhosts, nsrvs, ntxts, nfwds; size_t i; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) =20 ctxt->node =3D node; =20 @@ -1081,7 +1081,7 @@ virNetworkIPDefParseXML(const char *networkName, * On failure clear it out, but don't free it. */ =20 - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr dhcp; g_autofree char *address =3D NULL; g_autofree char *netmask =3D NULL; @@ -1252,7 +1252,7 @@ virNetworkPortGroupParseXML(virPortGroupDefPtr def, * On failure clear it out, but don't free it. */ =20 - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr virtPortNode; xmlNodePtr vlanNode; xmlNodePtr bandwidth_node; @@ -1322,7 +1322,7 @@ virNetworkForwardNatDefParseXML(const char *networkNa= me, g_autofree char *addrStart =3D NULL; g_autofree char *addrEnd =3D NULL; g_autofree char *ipv6 =3D NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) =20 ctxt->node =3D node; =20 @@ -1460,7 +1460,7 @@ virNetworkForwardDefParseXML(const char *networkName, g_autofree char *forwardManaged =3D NULL; g_autofree char *forwardDriverName =3D NULL; g_autofree char *type =3D NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) =20 ctxt->node =3D node; =20 @@ -1699,7 +1699,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, xmlNodePtr forwardNode =3D NULL; g_autofree char *ipv6nogwStr =3D NULL; g_autofree char *trustGuestRxFilters =3D NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr bandwidthNode =3D NULL; xmlNodePtr vlanNode; xmlNodePtr metadataNode =3D NULL; diff --git a/src/conf/networkcommon_conf.c b/src/conf/networkcommon_conf.c index a4f9ce5c62..2e51c80174 100644 --- a/src/conf/networkcommon_conf.c +++ b/src/conf/networkcommon_conf.c @@ -228,7 +228,7 @@ virNetDevIPRouteParseXML(const char *errorDetail, */ =20 virNetDevIPRoutePtr def =3D NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) char *family =3D NULL; char *address =3D NULL, *netmask =3D NULL; char *gateway =3D NULL; diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 79f3f67a1a..5a05f738aa 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -717,7 +717,7 @@ virNodeDevCapDRMParseXML(xmlXPathContextPtr ctxt, xmlNodePtr node, virNodeDevCapDRMPtr drm) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int ret =3D -1, val; char *type =3D NULL; =20 @@ -746,7 +746,7 @@ virNodeDevCapCCWParseXML(xmlXPathContextPtr ctxt, xmlNodePtr node, virNodeDevCapCCWPtr ccw_dev) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int ret =3D -1; char *cssid =3D NULL, *ssid =3D NULL, *devno =3D NULL; =20 @@ -807,7 +807,7 @@ virNodeDevCapStorageParseXML(xmlXPathContextPtr ctxt, xmlNodePtr node, virNodeDevCapStoragePtr storage) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr *nodes =3D NULL; size_t i; int n, ret =3D -1; @@ -900,7 +900,7 @@ virNodeDevCapSCSIParseXML(xmlXPathContextPtr ctxt, xmlNodePtr node, virNodeDevCapSCSIPtr scsi) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int ret =3D -1; =20 ctxt->node =3D node; @@ -943,7 +943,7 @@ virNodeDevCapSCSITargetParseXML(xmlXPathContextPtr ctxt, xmlNodePtr node, virNodeDevCapSCSITargetPtr scsi_target) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr *nodes =3D NULL; int ret =3D -1, n =3D 0; size_t i; @@ -1019,7 +1019,7 @@ virNodeDevCapSCSIHostParseXML(xmlXPathContextPtr ctxt, int create, const char *virt_type) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr *nodes =3D NULL; int ret =3D -1, n =3D 0; size_t i; @@ -1119,7 +1119,7 @@ virNodeDevCapNetParseXML(xmlXPathContextPtr ctxt, xmlNodePtr node, virNodeDevCapNetPtr net) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr lnk; size_t i =3D -1; int ret =3D -1, n =3D -1; @@ -1197,7 +1197,7 @@ virNodeDevCapUSBInterfaceParseXML(xmlXPathContextPtr = ctxt, xmlNodePtr node, virNodeDevCapUSBIfPtr usb_if) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int ret =3D -1; =20 ctxt->node =3D node; @@ -1264,7 +1264,7 @@ virNodeDevCapUSBDevParseXML(xmlXPathContextPtr ctxt, xmlNodePtr node, virNodeDevCapUSBDevPtr usb_dev) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int ret =3D -1; =20 ctxt->node =3D node; @@ -1307,7 +1307,7 @@ virNodeDevCapPCIDevIommuGroupParseXML(xmlXPathContext= Ptr ctxt, xmlNodePtr iommuGroupNode, virNodeDevCapPCIDevPtr pci_dev) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr *addrNodes =3D NULL; char *numberStr =3D NULL; int nAddrNodes, ret =3D -1; @@ -1363,7 +1363,7 @@ virPCIEDeviceInfoLinkParseXML(xmlXPathContextPtr ctxt, xmlNodePtr linkNode, virPCIELinkPtr lnk) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int ret =3D -1, speed; char *speedStr =3D NULL, *portStr =3D NULL; =20 @@ -1409,7 +1409,7 @@ virPCIEDeviceInfoParseXML(xmlXPathContextPtr ctxt, xmlNodePtr pciExpressNode, virPCIEDeviceInfoPtr pci_express) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr lnk; int ret =3D -1; =20 @@ -1579,7 +1579,7 @@ virNodeDevPCICapabilityParseXML(xmlXPathContextPtr ct= xt, virNodeDevCapPCIDevPtr pci_dev) { char *type =3D virXMLPropString(node, "type"); - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int ret =3D -1; =20 ctxt->node =3D node; @@ -1618,7 +1618,7 @@ virNodeDevCapPCIDevParseXML(xmlXPathContextPtr ctxt, xmlNodePtr node, virNodeDevCapPCIDevPtr pci_dev) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr iommuGroupNode; xmlNodePtr pciExpress; xmlNodePtr *nodes =3D NULL; @@ -1733,7 +1733,7 @@ virNodeDevCapSystemParseXML(xmlXPathContextPtr ctxt, { virNodeDevCapSystemHardwarePtr hardware =3D &syscap->hardware; virNodeDevCapSystemFirmwarePtr firmware =3D &syscap->firmware; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int ret =3D -1; char *tmp; =20 @@ -1774,7 +1774,7 @@ virNodeDevCapMdevAttributeParseXML(xmlXPathContextPtr= ctxt, xmlNodePtr node, virNodeDevCapMdevPtr mdev) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) g_autoptr(virMediatedDeviceAttr) attr =3D virMediatedDeviceAttrNew(); =20 ctxt->node =3D node; @@ -1797,7 +1797,7 @@ virNodeDevCapMdevParseXML(xmlXPathContextPtr ctxt, xmlNodePtr node, virNodeDevCapMdevPtr mdev) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int ret =3D -1; int nattrs =3D 0; g_autofree xmlNodePtr *attrs =3D NULL; diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c index 50d57ba8f6..6a12495cf2 100644 --- a/src/conf/numa_conf.c +++ b/src/conf/numa_conf.c @@ -910,7 +910,7 @@ virDomainNumaDefNodeCacheParseXML(virDomainNumaPtr def, def->mem_nodes[cur_cell].caches =3D g_new0(virDomainNumaCache, n); =20 for (i =3D 0; i < n; i++) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) virDomainNumaCachePtr cache =3D &def->mem_nodes[cur_cell].caches[i= ]; g_autofree char *tmp =3D NULL; unsigned int level; @@ -1010,7 +1010,7 @@ virDomainNumaDefParseXML(virDomainNumaPtr def, def->nmem_nodes =3D n; =20 for (i =3D 0; i < n; i++) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int rc; unsigned int cur_cell =3D i; =20 @@ -1134,7 +1134,7 @@ virDomainNumaDefParseXML(virDomainNumaPtr def, } VIR_FREE(tmp); } else if (virXMLNodeNameEqual(nodes[i], "bandwidth")) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) type =3D VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_BANDWIDTH; =20 ctxt->node =3D nodes[i]; diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index 07336e914f..1ee63b9141 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -144,7 +144,7 @@ virDomainSnapshotDiskDefParseXML(xmlNodePtr node, char *type =3D NULL; char *driver =3D NULL; xmlNodePtr cur; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) =20 ctxt->node =3D node; =20 diff --git a/src/conf/storage_adapter_conf.c b/src/conf/storage_adapter_con= f.c index 015e572630..77ecb8d5f2 100644 --- a/src/conf/storage_adapter_conf.c +++ b/src/conf/storage_adapter_conf.c @@ -178,7 +178,7 @@ virStorageAdapterParseXML(virStorageAdapterPtr adapter, xmlXPathContextPtr ctxt) { int ret =3D -1; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) char *adapter_type =3D NULL; =20 ctxt->node =3D node; diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index fac5ff7b86..001f4f2bdd 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -727,7 +727,7 @@ virStorageDefParsePerms(xmlXPathContextPtr ctxt, { long long val; int ret =3D -1; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr node; g_autofree char *mode =3D NULL; =20 diff --git a/src/conf/virsavecookie.c b/src/conf/virsavecookie.c index d8c51ce0ef..eeca61f351 100644 --- a/src/conf/virsavecookie.c +++ b/src/conf/virsavecookie.c @@ -57,7 +57,7 @@ virSaveCookieParse(xmlXPathContextPtr ctxt, virObjectPtr *obj, virSaveCookieCallbacksPtr saveCookie) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int ret =3D -1; =20 *obj =3D NULL; diff --git a/src/cpu/cpu_map.c b/src/cpu/cpu_map.c index d14488f8aa..913e34a067 100644 --- a/src/cpu/cpu_map.c +++ b/src/cpu/cpu_map.c @@ -40,7 +40,7 @@ loadData(const char *mapfile, void *data) { int ret =3D -1; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr *nodes =3D NULL; int n; size_t i; @@ -130,7 +130,7 @@ loadIncludes(xmlXPathContextPtr ctxt, void *data) { int ret =3D -1; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr *nodes =3D NULL; int n; size_t i; diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 1e5cd93abb..0a53e6968a 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -1486,7 +1486,7 @@ x86ModelParseSignatures(virCPUx86ModelPtr model, xmlXPathContextPtr ctxt) { g_autofree xmlNodePtr *nodes =3D NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) size_t i; int n; =20 diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c index d75942667c..d8aebe06d9 100644 --- a/src/lxc/lxc_domain.c +++ b/src/lxc/lxc_domain.c @@ -207,7 +207,7 @@ lxcDomainDefNamespaceParse(xmlXPathContextPtr ctxt, lxcDomainDefPtr lxcDef =3D g_new0(lxcDomainDef, 1); g_autofree xmlNodePtr *nodes =3D NULL; bool uses_lxc_ns =3D false; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) int feature; int n; size_t i; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 589f2eda58..ebfbbcc296 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3822,7 +3822,7 @@ virQEMUCapsLoadHostCPUModelInfo(virQEMUCapsAccelPtr c= aps, char *str =3D NULL; xmlNodePtr hostCPUNode; xmlNodePtr *nodes =3D NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) qemuMonitorCPUModelInfoPtr hostCPU =3D NULL; g_autofree char *xpath =3D g_strdup_printf("./hostCPU[@type=3D'%s']", = typeStr); int ret =3D -1; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 56999c2c46..a74f0d121f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2520,7 +2520,7 @@ qemuDomainObjPrivateXMLParseBlockjobChain(xmlNodePtr = node, virDomainXMLOptionPtr xmlopt) =20 { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) g_autofree char *format =3D NULL; g_autofree char *type =3D NULL; g_autofree char *index =3D NULL; @@ -2694,7 +2694,7 @@ qemuDomainObjPrivateXMLParseBlockjobData(virDomainObj= Ptr vm, xmlXPathContextPtr ctxt, virDomainXMLOptionPtr xmlopt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) virDomainDiskDefPtr disk =3D NULL; g_autoptr(qemuBlockJobData) job =3D NULL; g_autofree char *name =3D NULL; @@ -2876,7 +2876,7 @@ qemuDomainObjPrivateXMLParseSlirpFeatures(xmlNodePtr = featuresNode, xmlXPathContextPtr ctxt, qemuSlirpPtr slirp) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) g_autofree xmlNodePtr *nodes =3D NULL; size_t i; int n; diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index 6393cc0b40..aeca738c5d 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -1298,7 +1298,7 @@ qemuDomainObjPrivateXMLParseJobNBDSource(xmlNodePtr n= ode, virDomainDiskDefPtr disk, virDomainXMLOptionPtr xmlopt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) qemuDomainDiskPrivatePtr diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); g_autofree char *format =3D NULL; g_autofree char *type =3D NULL; @@ -1382,7 +1382,7 @@ qemuDomainObjPrivateXMLParseJob(virDomainObjPtr vm, { qemuDomainObjPrivatePtr priv =3D vm->privateData; qemuDomainJobObjPtr job =3D &priv->job; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) g_autofree char *tmp =3D NULL; =20 if (!(ctxt->node =3D virXPathNode("./job[1]", ctxt))) diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_coo= kie.c index 81b557e0a8..cef2555988 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -935,7 +935,7 @@ qemuMigrationCookieNetworkXMLParse(xmlXPathContextPtr c= txt) int n; xmlNodePtr *interfaces =3D NULL; char *vporttype; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) =20 if (VIR_ALLOC(optr) < 0) goto error; @@ -983,7 +983,7 @@ qemuMigrationCookieNBDXMLParse(xmlXPathContextPtr ctxt) size_t i; int n; xmlNodePtr *disks =3D NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) =20 if (VIR_ALLOC(ret) < 0) goto error; @@ -1043,7 +1043,7 @@ qemuMigrationCookieStatisticsXMLParse(xmlXPathContext= Ptr ctxt) { qemuDomainJobInfoPtr jobInfo =3D NULL; qemuMonitorMigrationStats *stats; - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) =20 if (!(ctxt->node =3D virXPathNode("./statistics", ctxt))) return NULL; diff --git a/src/util/virstorageencryption.c b/src/util/virstorageencryptio= n.c index 94ccaf1e9a..76958b3876 100644 --- a/src/util/virstorageencryption.c +++ b/src/util/virstorageencryption.c @@ -143,7 +143,7 @@ static virStorageEncryptionSecretPtr virStorageEncryptionSecretParse(xmlXPathContextPtr ctxt, xmlNodePtr node) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) virStorageEncryptionSecretPtr ret; char *type_str =3D NULL; =20 @@ -237,7 +237,7 @@ virStorageEncryptionPtr virStorageEncryptionParseNode(xmlNodePtr node, xmlXPathContextPtr ctxt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr *nodes =3D NULL; virStorageEncryptionPtr encdef =3D NULL; virStorageEncryptionPtr ret =3D NULL; diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 51037c691f..97a346db28 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1781,7 +1781,7 @@ virStorageAuthDefPtr virStorageAuthDefParse(xmlNodePtr node, xmlXPathContextPtr ctxt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt); + VIR_XPATH_NODE_AUTORESTORE(ctxt) virStorageAuthDefPtr ret =3D NULL; xmlNodePtr secretnode =3D NULL; g_autoptr(virStorageAuthDef) authdef =3D NULL; --=20 2.26.2 From nobody Mon Apr 29 19:13:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1596473886; cv=none; d=zohomail.com; s=zohoarc; b=jAcMmOV6VeDpefW7WB1Y5vubBEONCAskobq1TVLo5DatBrq4HTHr4tUl4qkW+tB8ZnKqyWiXsrtn97UXD3dk1+HI33H9qrnJphYJg2mFw3Ju8fI8+HGHTEZKa1rhyTmbw5ffQcHUIT6c8gc+KhHETzhUZAH9xpfPizJPm0NoJN0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596473886; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3B91+bIuJE84ET3mP5IZWvUd49XtZoovqdTOrT22CBA=; b=YcgNYbvBpo8U77nmcpPTRIA39jFNWy0wonVnvzs0qqruKIc3y3PGnmk4gLDu9oDXkEDKRZlvi4lvBeZyjD7jQacPMyUhtl9xP2hZy2NEBZy8ZTCJqHdzHx6Km1ASCGRLpF3dhl+/oN9KVAtepi6bGLfhW8hesMeXKGECoy3m7MY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1596473886946732.1656227279019; Mon, 3 Aug 2020 09:58:06 -0700 (PDT) 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-486-jYLyBaa5NeGu2uhHWECssQ-1; Mon, 03 Aug 2020 12:57:41 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D4D46107BEF8; Mon, 3 Aug 2020 16:57:34 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B0D8060BF4; Mon, 3 Aug 2020 16:57:34 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 824C39A103; Mon, 3 Aug 2020 16:57:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 073GvWPf007876 for ; Mon, 3 Aug 2020 12:57:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id E9E6771778; Mon, 3 Aug 2020 16:57:32 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3080071775 for ; Mon, 3 Aug 2020 16:57:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596473885; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=3B91+bIuJE84ET3mP5IZWvUd49XtZoovqdTOrT22CBA=; b=W3j7WP6c9TYAWssEsramk7e0Y52zqyQdZe12ocQblyliaopxnrXMUJFsHG5T3x4KhMp/Ih 7a4DQMSMqMcLCKqKz3/2f/WfB0npwPQ6tVRGA/094koQADcZwMHcOBF9kMxWyMIKM2qQVp Ff8AyRlclibjax0/dJAD4jAxXnmUTpg= X-MC-Unique: jYLyBaa5NeGu2uhHWECssQ-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH RFC 17/19] src: internal: add VIR_WARNINGS_NO_DECLARATION_AFTER_STATEMENT Date: Mon, 3 Aug 2020 18:56:54 +0200 Message-Id: <6736a109aa419c1293f34f5f46ab365bac0fd6fc.1596473604.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Add a macro to suppress the warning. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/internal.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/internal.h b/src/internal.h index 3aa3c6ca67..d95db330b3 100644 --- a/src/internal.h +++ b/src/internal.h @@ -194,6 +194,10 @@ _Pragma ("GCC diagnostic push") \ _Pragma ("GCC diagnostic ignored \"-Wunused-variable\"") =20 +#define VIR_WARNINGS_NO_DECLARATION_AFTER_STATEMENT \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wdeclaration-after-statement\"") + #define VIR_WARNINGS_RESET \ _Pragma ("GCC diagnostic pop") =20 --=20 2.26.2 From nobody Mon Apr 29 19:13:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1596473945; cv=none; d=zohomail.com; s=zohoarc; b=P7p1GKT9rNovnNMSIH4koStycvSf0oLNmNVblgSjGGfC095rA436J1jGP9nf3vg35Eb5wbwJATRIjuV3zhO12FFKKzF2E3qwsSGjzQrkyv1ZY1z3oITGnArnpco83NeFcfqwCcIKGTaf+hvqxY42W2UvKgm8xqJtxPXCchIAgH0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596473945; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=43+Kg3syygzCcE7Yp/zPtQzTjY/cmIzbDRgOzLI8t7s=; b=BeIpaWvFhQgVDTCaRKXlpL9pg+FjPfc7SSInBDE1uSv4GLKe4ZnEXxqjsHRNzDjjUwO967NMOT0is42DAW8+XZ3lrkliBhTu6v2xqb+NrZs/YboI1GON0Xd324BgaYkAZ+MbPl1YAg43uRvAUIHrwvgpQagP+VAg5Nr6zk84v9E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 159647394554496.67109347255268; Mon, 3 Aug 2020 09:59:05 -0700 (PDT) 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-20-bA2Qcwb6POe-LiVdzKX1gQ-1; Mon, 03 Aug 2020 12:57:44 -0400 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 32AF7101C8A6; Mon, 3 Aug 2020 16:57:39 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0F4E45DA74; Mon, 3 Aug 2020 16:57:39 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id CFFD41800C9A; Mon, 3 Aug 2020 16:57:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 073Gvasa007899 for ; Mon, 3 Aug 2020 12:57:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id BB9DC7177A; Mon, 3 Aug 2020 16:57:36 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 13B2771778 for ; Mon, 3 Aug 2020 16:57:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596473944; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=43+Kg3syygzCcE7Yp/zPtQzTjY/cmIzbDRgOzLI8t7s=; b=Ks0nVjOVXXremGw8OBLnPMHmFSf1ZEtwAhWJJPRxK66YoVG6JxzxcTDaTXPEqtaJCZwIeL WnpRtoqKW7YQ5nXSqagWnfwjrIIEsjVRfvZJuja6r/dzlAkxquycOr0WMuDi4HuSii0Cxb KbjWcI81RX1txR84QCuxVaAsZhN2Hpw= X-MC-Unique: bA2Qcwb6POe-LiVdzKX1gQ-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH RFC 18/19] tests: use VIR_WARNINGS_NO_DECLARATION_AFTER_STATEMENT Date: Mon, 3 Aug 2020 18:56:55 +0200 Message-Id: <8908ce196516a2ac56dcce07d5ba1f40b4254e5a.1596473604.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Some test rely too much on declaring variables in the middle of the function. Use the macro to locally suppress the warning Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- tests/domaincapstest.c | 2 ++ tests/virnetsockettest.c | 2 ++ tests/virnettlscontexttest.c | 3 +++ tests/virnettlssessiontest.c | 3 +++ tests/virstoragetest.c | 2 ++ tests/virstringtest.c | 4 ++++ tests/viruritest.c | 2 ++ 7 files changed, 18 insertions(+) diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index c3a9f4ef91..1c3acdcd25 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -287,6 +287,7 @@ doTestQemuInternal(const char *version, capsName =3D g_strdup_printf("caps_%s", version); emulator =3D g_strdup_printf("/usr/bin/qemu-system-%s", arch); =20 + VIR_WARNINGS_NO_DECLARATION_AFTER_STATEMENT struct testData data =3D { .name =3D name, .emulator =3D emulator, @@ -297,6 +298,7 @@ doTestQemuInternal(const char *version, .capsName =3D capsName, .capsOpaque =3D opaque, }; + VIR_WARNINGS_RESET =20 if (virTestRun(name, test_virDomainCapsFormat, &data) < 0) return -1; diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index 96c582216c..7d2ad36aae 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -572,6 +572,7 @@ mymain(void) if (virTestRun("Socket External Command /dev/does-not-exist", testSock= etCommandFail, NULL) < 0) ret =3D -1; =20 + VIR_WARNINGS_NO_DECLARATION_AFTER_STATEMENT struct testSSHData sshData1 =3D { .nodename =3D "somehost", .path =3D "/tmp/socket", @@ -675,6 +676,7 @@ mymain(void) "fi;" "'''\\''/tmp/fo o/nc'\\'''' $ARG -U /tmp/socket'\n", }; + VIR_WARNINGS_RESET if (virTestRun("SSH test 7", testSocketSSH, &sshData7) < 0) ret =3D -1; =20 diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c index 6d970d0ea8..9860e0ec3e 100644 --- a/tests/virnettlscontexttest.c +++ b/tests/virnettlscontexttest.c @@ -136,6 +136,7 @@ mymain(void) }; \ testTLSGenerateCert(&varname, cavarname.crt) =20 + VIR_WARNINGS_NO_DECLARATION_AFTER_STATEMENT # define TLS_ROOT_REQ(varname, \ co, cn, an1, an2, ia1, ia2, bce, bcc, bci, \ kue, kuc, kuv, kpe, kpc, kpo1, kpo2, so, eo) \ @@ -563,6 +564,8 @@ mymain(void) certchain, G_N_ELEMENTS(certchain)); =20 + VIR_WARNINGS_RESET + DO_CTX_TEST(true, "cacertchain-ctx.pem", servercertlevel3areq.filename= , false); DO_CTX_TEST(false, "cacertchain-ctx.pem", clientcertlevel2breq.filenam= e, false); =20 diff --git a/tests/virnettlssessiontest.c b/tests/virnettlssessiontest.c index 6807581d70..ebb90ad5a2 100644 --- a/tests/virnettlssessiontest.c +++ b/tests/virnettlssessiontest.c @@ -277,6 +277,7 @@ mymain(void) ret =3D -1; \ } while (0) =20 + VIR_WARNINGS_NO_DECLARATION_AFTER_STATEMENT # define TLS_CERT_REQ(varname, cavarname, \ co, cn, an1, an2, ia1, ia2, bce, bcc, bci, \ kue, kuc, kuv, kpe, kpc, kpo1, kpo2, so, eo) \ @@ -460,6 +461,8 @@ mymain(void) DO_SESS_TEST("cacertchain-sess.pem", servercertlevel3areq.filename, cl= ientcertlevel2breq.filename, false, false, "libvirt.org", NULL); =20 + VIR_WARNINGS_RESET + testTLSDiscardCert(&clientcertreq); testTLSDiscardCert(&clientcertaltreq); =20 diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 98f47f0e41..179ae5e5e7 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -682,6 +682,7 @@ mymain(void) /* Missing file */ TEST_ONE_CHAIN("bogus", VIR_STORAGE_FILE_RAW, EXP_FAIL); =20 + VIR_WARNINGS_NO_DECLARATION_AFTER_STATEMENT /* Raw image, whether with right format or no specified format */ testFileData raw =3D { .path =3D absraw, @@ -963,6 +964,7 @@ mymain(void) }; TEST_CHAIN(absqcow2, VIR_STORAGE_FILE_QCOW2, (&qcow2, &rbd2), EXP_PASS= ); =20 + VIR_WARNINGS_RESET =20 /* Rewrite wrap and qcow2 back to 3-deep chain, absolute backing */ virCommandFree(cmd); diff --git a/tests/virstringtest.c b/tests/virstringtest.c index 8b8d2acced..704686ac10 100644 --- a/tests/virstringtest.c +++ b/tests/virstringtest.c @@ -691,6 +691,7 @@ mymain(void) ret =3D -1; \ } while (0) =20 + VIR_WARNINGS_NO_DECLARATION_AFTER_STATEMENT const char *tokens1[] =3D { NULL }; TEST_SPLIT("", " ", 0, tokens1); =20 @@ -714,6 +715,7 @@ mymain(void) =20 const char *tokens8[] =3D { "gluster", "rdma", NULL }; TEST_SPLIT("gluster+rdma", "+", 2, tokens8); + VIR_WARNINGS_RESET =20 if (virTestRun("virStringSortCompare", testStringSortCompare, NULL) < = 0) ret =3D -1; @@ -741,6 +743,7 @@ mymain(void) /* None matching */ TEST_SEARCH("foo", "(bar)", 10, 0, NULL, false); =20 + VIR_WARNINGS_NO_DECLARATION_AFTER_STATEMENT /* Full match */ const char *matches1[] =3D { "foo" }; TEST_SEARCH("foo", "(foo)", 10, 1, matches1, false); @@ -752,6 +755,7 @@ mymain(void) /* Multi matches, limited returns */ const char *matches3[] =3D { "foo", "bar" }; TEST_SEARCH("1foo2bar3eek", "([a-z]+)", 2, 2, matches3, false); + VIR_WARNINGS_RESET =20 #define TEST_MATCH(s, r, m) \ do { \ diff --git a/tests/viruritest.c b/tests/viruritest.c index 0edf3e5522..587498bc2b 100644 --- a/tests/viruritest.c +++ b/tests/viruritest.c @@ -166,6 +166,7 @@ mymain(void) *query_out ? "test://example.com/?" query_out : NULL, \ "test", "example.com", 0, "/", query_in, NULL, NULL, params) =20 + VIR_WARNINGS_NO_DECLARATION_AFTER_STATEMENT virURIParam params[] =3D { { (char*)"name", (char*)"value", false }, { NULL, NULL, false }, @@ -216,6 +217,7 @@ mymain(void) { (char*)"foo", (char*)"one", false }, { NULL, NULL, false }, }; + VIR_WARNINGS_RESET =20 TEST_PARAMS("foo=3Done&bar=3Dtwo", "", params1); TEST_PARAMS("foo=3Done&foo=3Dtwo", "", params2); --=20 2.26.2 From nobody Mon Apr 29 19:13:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1596473931; cv=none; d=zohomail.com; s=zohoarc; b=ZjWNfQUhRaAhKqpbUVX5bf5E9qH+IdSFAJlIp1C9YAS7wqCMnwtpu+couNl7zqRKw80MfJqC3Eu7fQSs5kURnSlEgfxJSBO0OtoStuGItE/t9Mk+SxrOCLqMvog/5Q7k0DJSPfAiLjJ3bmFom7H5U594WJvehrUjTvIBzTVsskk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596473931; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9da0jkVPuaWubtRkSbY/0AR14aicYqrKbNmIUUQH77g=; b=VMZe0vDa19kZUoHMLbdMRbyYTsYdK+PFkMjDWoIsdlRTs3O2q2vwN+5wKs8oV9poq03CsR8NzfEYdRejlwVuHeo1UUkWKiazCUFemnYCkb+0n6269e05eoF5pLYgEdKktZRQHrvXI6dMR07gbOrfiMNUQUT2bSED28qSqkIVmvM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1596473931873547.2299660995502; Mon, 3 Aug 2020 09:58:51 -0700 (PDT) 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-195-GLD0M0jIOke8CYCG65kfwQ-1; Mon, 03 Aug 2020 12:58:46 -0400 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 485EE800474; Mon, 3 Aug 2020 16:58:38 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2363069322; Mon, 3 Aug 2020 16:58:38 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id E878DA35B3; Mon, 3 Aug 2020 16:58:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 073GvgGb007941 for ; Mon, 3 Aug 2020 12:57:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id F1FC87177A; Mon, 3 Aug 2020 16:57:42 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3A8AF71779 for ; Mon, 3 Aug 2020 16:57:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596473930; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=9da0jkVPuaWubtRkSbY/0AR14aicYqrKbNmIUUQH77g=; b=Cw+pE2YIDDKlub8oUOWxPSolR5hZTfgzcZ0dKj25vcJKPrczPX2Xtg7wAgAJj6Vc6XVcSY bQiyjhBNwwfsJIYSGVLj3pIhdEJy9N04l0XvLyjoDCZZKTmh7bQF/lLnVtXC6ZBwDgyDrx UkH6VuOZYa9+ELjvHkPvU6TDl6472GI= X-MC-Unique: GLD0M0jIOke8CYCG65kfwQ-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 19/19] build: add -Wdeclaration-after-statement Date: Mon, 3 Aug 2020 18:56:56 +0200 Message-Id: <46eb5e6863db2de82383fd1d495eaa66050778cc.1596473604.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Now that all the users have been converted or silenced, let's enable this warning. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 48b937d6bb..fe75718cac 100644 --- a/meson.build +++ b/meson.build @@ -236,6 +236,7 @@ cc_flags +=3D [ '-Wcpp', '-Wdangling-else', '-Wdate-time', + '-Wdeclaration-after-statement', '-Wdeprecated-declarations', '-Wdesignated-init', '-Wdiscarded-array-qualifiers', @@ -555,7 +556,6 @@ cc_flags_disabled =3D [ # We might fundamentally need some of these disabled forever, but # ideally we'd turn many of them on '-Wfloat-equal', - '-Wdeclaration-after-statement', '-Wpacked', '-Wunused-macros', '-Woverlength-strings', --=20 2.26.2