From nobody Mon Feb 9 10:33:18 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1609941904; cv=none; d=zohomail.com; s=zohoarc; b=EJOzKpC/CGGyuAyuJADD7jeI6h/0KDO1//flgZhsjUEJtLqISSbxmCyODBb5pjqDU9sF4MawJQEN/fTARvKXdP6csQNb7nMnbeaJN7iefKGF/gDH4KHaTQL8Ji6MjuMQAFMJ7skOhrDsmBT0wdn75L3Xm/b9igcLMaJx6Qa2xyg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609941904; 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=NIp8HimGrFLWRyZMWlLETSjKuS2Op1ZlIZpPf84KDbo=; b=FdjNQCveb0pCKRbxYKw3WA/FsDiz4V7fFtozGuN55VX5uqWpt0EhaBTI6nSECIGfAU5lH4dKw6uwlEx8V5DttfozvxdKixv1aVkHo6DC6mnhWdvy+SFa1+AGvS/YyF9V0VwMPC5+rpKoMEBObRqN/niI7dzVbEZkG9bTYMfGBEc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1609941904001570.0557632681506; Wed, 6 Jan 2021 06:05:04 -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-391-SLfA__YBOV6q6KGH4ZnDpQ-1; Wed, 06 Jan 2021 09:04:24 -0500 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 DA3C1180E492; Wed, 6 Jan 2021 14:04: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 A1FF727CB2; Wed, 6 Jan 2021 14:04: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 6123A1809CAB; Wed, 6 Jan 2021 14:04: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 106E42Z8031442 for ; Wed, 6 Jan 2021 09:04:02 -0500 Received: by smtp.corp.redhat.com (Postfix) id ACED862686; Wed, 6 Jan 2021 14:04:02 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 093F46267A for ; Wed, 6 Jan 2021 14:03:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1609941902; 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=NIp8HimGrFLWRyZMWlLETSjKuS2Op1ZlIZpPf84KDbo=; b=K7+/oGhSxEZ/MuPJoyljHJJ/XLiYXUwOumZEp1TLwK5KNnrQILyUhOm3P67lWjJ8ngFR0r J4b+DOZxo6BTuv9uo56u0DPzr/Mj1zEfNbpxHQ7PPALdXntnkWAkuGoNjFxHR7YKLsQeRJ m4BsKQb+18tyHBRCWomYuaqpTlP7G6M= X-MC-Unique: SLfA__YBOV6q6KGH4ZnDpQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 10/12] tests: qemuxml2argv: Don't check whether -netdev was QAPIfied repeatedly Date: Wed, 6 Jan 2021 15:03:41 +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 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 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Check once before looping through the args. Signed-off-by: Peter Krempa --- tests/qemuxml2argvtest.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index d2712e0dce..662d0d5df6 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -524,6 +524,7 @@ testCompareXMLToArgvValidateSchema(virQEMUDriverPtr drv, g_autoptr(GHashTable) schema =3D NULL; g_autoptr(virCommand) cmd =3D NULL; unsigned int parseFlags =3D info->parseFlags; + bool netdevQAPIfied =3D false; if (info->schemafile) schema =3D testQEMUSchemaLoad(info->schemafile); @@ -552,6 +553,8 @@ testCompareXMLToArgvValidateSchema(virQEMUDriverPtr drv, if (virCommandGetArgList(cmd, &args, &nargs) < 0) return -1; + netdevQAPIfied =3D !virQEMUQAPISchemaPathExists("netdev_add/arg-type/t= ype/!string", schema); + for (i =3D 0; i < nargs; i++) { g_auto(virBuffer) debug =3D VIR_BUFFER_INITIALIZER; g_autoptr(virJSONValue) jsonargs =3D NULL; @@ -569,13 +572,14 @@ testCompareXMLToArgvValidateSchema(virQEMUDriverPtr d= rv, i++; } else if (STREQ(args[i], "-netdev")) { + if (!netdevQAPIfied) { + i++; + continue; + } + if (!(jsonargs =3D virJSONValueFromString(args[i + 1]))) return -1; - /* skip the validation for pre-QAPIfication cases */ - if (virQEMUQAPISchemaPathExists("netdev_add/arg-type/type/!str= ing", schema)) - continue; - if (testQEMUSchemaValidateCommand("netdev_add", jsonargs, schema, false, false, &debug= ) < 0) { VIR_TEST_VERBOSE("failed to validate -netdev '%s' against = QAPI schema: %s", --=20 2.29.2