From nobody Tue Nov 26 08:58:25 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=1578485811; cv=none; d=zohomail.com; s=zohoarc; b=k2qsdWiOLE1vi/VeVSZ5vJUvPa6erKylkqyX/l+Ajh6idL2JA0Q5vee/4QgD7rYRDSYfAxfWbZK55nmjh8RYeDdY13NtlmiAHWJ17C34Dyfir3vO113OBtXgIQV842WJFEE5RdU0TYIJ1ahdD0AUxToxsBd1dYeqMfnOsq0gnio= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578485811; 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=rNzyWISVOPeT4K61p5PuqIUTm4tIXDhELj3BxstVpSE=; b=lSYai0Cgzu8Ydd6DDMX3sheCOTaRjkj4ASLUzl5YsRS/BwSttyYweSaui66BH26O6Q32Y+HFhwj1zlZJsFI/c9FJjOtC3Myb0DeroOmLDXPQoSXxTL8jdibic3/a9WL0b0u4Q1sN1cZn/6grI2Ud2gTkRblhU/hNBpZsT7mfP1w= 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 1578485811202923.4002454794313; Wed, 8 Jan 2020 04:16:51 -0800 (PST) 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-359-83TYwPvFPDKJvcXG71dG9A-1; Wed, 08 Jan 2020 07:16:48 -0500 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 201DF911EC; Wed, 8 Jan 2020 12:16:43 +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 ECA225D9E2; Wed, 8 Jan 2020 12:16:42 +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 A8AC981C98; Wed, 8 Jan 2020 12:16:42 +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 008CGZ1T024612 for ; Wed, 8 Jan 2020 07:16:35 -0500 Received: by smtp.corp.redhat.com (Postfix) id 8939E7BA22; Wed, 8 Jan 2020 12:16:35 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 122839A84 for ; Wed, 8 Jan 2020 12:16:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578485810; 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=rNzyWISVOPeT4K61p5PuqIUTm4tIXDhELj3BxstVpSE=; b=euDOsMA3sO89cTa4BX0Nmm9sHNW2wVuKZRhbRJ1/VRIQAalHAXooDD0TeSAOoSYG1kMgeH MgYxLlSGqIAHnmdEUID0FWffHoZXGsI+pScHIpZlqBMouyNeCvi1y6hexmMeize47LPFYk 9KykYWLanCYOdMT3XAyKbD5kN5RNDX8= From: Michal Privoznik To: libvir-list@redhat.com Date: Wed, 8 Jan 2020 13:16:29 +0100 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 Subject: [libvirt] [PATCH 1/2] bhyve_parse_command.c: Don't jump onto non-existent label in CONSUME_ARG() 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 X-MC-Unique: 83TYwPvFPDKJvcXG71dG9A-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" In v5.10.0-508-gfbf3f3d86a, the 'error' label was removed from bhyveParseBhyveCommandLine(), however the CONSUME_ARG() macro still uses it. Fix the macro to return an error instead. Signed-off-by: Michal Privoznik --- src/bhyve/bhyve_parse_command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_comman= d.c index f7cedf5c65..30927ff10c 100644 --- a/src/bhyve/bhyve_parse_command.c +++ b/src/bhyve/bhyve_parse_command.c @@ -628,7 +628,7 @@ bhyveParseBhyvePCIArg(virDomainDefPtr def, if ((opti + 1) =3D=3D argc) { \ virReportError(VIR_ERR_INVALID_ARG, _("Missing argument for '%s'")= , \ argv[opti]); \ - goto error; \ + return -1; \ } \ var =3D argv[++opti] =20 --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Nov 26 08:58:25 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=1578485806; cv=none; d=zohomail.com; s=zohoarc; b=XcRJNXaPAcxyxVtDCz4HO/E1PIa4HZJeTOuWChWqLxSfzZeHR3n74yA81j1J5poSqzYdKQLTWxSrYPz4l8922mIBP4VmDrrB7+eGwGHS/MO0yyj9/Nt6y9FbZi4jyEekCNjpxPix3oDTtZUYBRVdOa8JeDNurJtkNV3+952utlc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578485806; 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=7oUq4YEDZC03dZ4A08hsNd2W1c7t4MJTO3DXBy/wugg=; b=VUE4N+SZ84Gu06U+pJarYcHjP8n62qQNDn1n54hCKgNGTU+Z00+XuBhVl/QQO+hzuyTCe+Y0P0dJpHqj3nyAKV78PVjS7xpdfvHnKbbkSOH6DcN6vx6NFW6gSzAAtG9HNGRhicl6LqeZb6Rvnq0OXU9Mo8U/oh3Qil6MJtW2/hg= 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 1578485806470379.48913580085684; Wed, 8 Jan 2020 04:16:46 -0800 (PST) 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-105-OKVukapuPxeJVhrL24jmfg-1; Wed, 08 Jan 2020 07:16:43 -0500 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 3708F800D48; Wed, 8 Jan 2020 12:16:38 +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 E75D586C5C; Wed, 8 Jan 2020 12:16:37 +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 A496D18089CF; Wed, 8 Jan 2020 12:16: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 008CGawM024622 for ; Wed, 8 Jan 2020 07:16:36 -0500 Received: by smtp.corp.redhat.com (Postfix) id 5AEFB7BA22; Wed, 8 Jan 2020 12:16:36 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id D64D79A84 for ; Wed, 8 Jan 2020 12:16:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578485805; 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=7oUq4YEDZC03dZ4A08hsNd2W1c7t4MJTO3DXBy/wugg=; b=IM1uuao5h+oMBD3DVcWdHa0VIE6jdU5/IPjYNmO+W6FVFLE01ZQH9LtrdDJQf9Kk5Bc6UR jJsgHVd5we/CDdrXNYGrs3AQxomktIKjMKZdGOwPDl7g1HwYMG3TKrNUcR9fBgIN8l1lF7 V7op8yGfpc+ak0txrFkxMzOUR1hbjp4= From: Michal Privoznik To: libvir-list@redhat.com Date: Wed, 8 Jan 2020 13:16:30 +0100 Message-Id: <832656fa8e6f7bfa6eb5f6f7de5ede697c6392e8.1578485461.git.mprivozn@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 Subject: [libvirt] [PATCH 2/2] bhyve_parse_command: Undefine CONSUME_ARG macro when no longer needed 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-MC-Unique: OKVukapuPxeJVhrL24jmfg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik --- src/bhyve/bhyve_parse_command.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_comman= d.c index 30927ff10c..dd6a626ff4 100644 --- a/src/bhyve/bhyve_parse_command.c +++ b/src/bhyve/bhyve_parse_command.c @@ -823,6 +823,8 @@ bhyveParseBhyveLoadCommandLine(virDomainDefPtr def, return 0; } =20 +#undef CONSUME_ARG + static int bhyveParseCustomLoaderCommandLine(virDomainDefPtr def, int argc G_GNUC_UNUSED, --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list