From nobody Mon Feb 9 10:32:17 2026 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=1614182340; cv=none; d=zohomail.com; s=zohoarc; b=BLn3BW2xjP69QuLKn+MSQIoaNnGKwy+EehtVAeyHBXRvLC6FRo3Hcm5q4BaFVqrMY3yj3d2A052L9jv2pvr+R0VBxCphHxJOLFmad0mYgOER84lbGMr/tz6iw7bF3CQuOA7v40wTv7USVKXdLxp43B3XlJK+/ut6KVbdFusZfCI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614182340; 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=2Yvd0PIegkjsTSPCksYh9JfoUD0HW2IYjdcrZrZ9osY=; b=OWInRv3B+XMQTaSxz1odiOV5yLF1x48ZwFTO+BUj+vhbRfFGGorZjCr5NStAxskZkC6QdOqHOJcOu8FECvp9jPChcmhQpfypFy9jqZLYVhd3Wd9xQ4QrWS7JGAKqWYB+omTd9JczvPeIG5eRK/KVF8PJkOPIYfCcILLmUoBFWgo= 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 1614182340172443.7965014750514; Wed, 24 Feb 2021 07:59:00 -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-190-2Zr7XZz8PLSCMbX5i3wDLg-1; Wed, 24 Feb 2021 10:58:56 -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 375A5DF8C3; Wed, 24 Feb 2021 15:58:44 +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 1363D5D9D3; Wed, 24 Feb 2021 15:58:44 +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 CD681CF4B; Wed, 24 Feb 2021 15:58:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 11OFwGHq010763 for ; Wed, 24 Feb 2021 10:58:16 -0500 Received: by smtp.corp.redhat.com (Postfix) id 29356100239F; Wed, 24 Feb 2021 15:58:16 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 80929100239A for ; Wed, 24 Feb 2021 15:58:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614182339; 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=2Yvd0PIegkjsTSPCksYh9JfoUD0HW2IYjdcrZrZ9osY=; b=Fww/Rab04GtypcEvY6d5y6Q2KIEu/EvbEYWAhY5ew5RvWyfKTy3e457jX7XsxmXC9Deog2 xioqBMnF/pINTUpKoeG3SFN0aLPsYcsh0eYK8OyQcf0EOw8qrQPNIJj2rMITj/JDm/3996 z6biXkYHBafGoamdTfUuYqa+mXhz9dY= X-MC-Unique: 2Zr7XZz8PLSCMbX5i3wDLg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 05/12] tests: qemuxml2argv: Validate generation of JSON props for object-add Date: Wed, 24 Feb 2021 16:57:59 +0100 Message-Id: <7233e7fcde596c216fc1f830b138711de755a3a4.1614182040.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Similarly to the validation for blockdev-add and netdev_add, use the qemuxml2argv test repository to drive validation of props for object-add. Signed-off-by: Peter Krempa --- tests/qemuxml2argvtest.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index d6d707cd24..a5e40c218a 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -527,6 +527,7 @@ testCompareXMLToArgvValidateSchema(virQEMUDriverPtr drv, g_autoptr(virCommand) cmd =3D NULL; unsigned int parseFlags =3D info->parseFlags; bool netdevQAPIfied =3D false; + bool objectQAPIfied =3D false; /* comment out with line comment to enable schema checking for non _CA= PS tests if (!info->schemafile) @@ -570,6 +571,7 @@ testCompareXMLToArgvValidateSchema(virQEMUDriverPtr drv, return -1; netdevQAPIfied =3D !virQEMUQAPISchemaPathExists("netdev_add/arg-type/t= ype/!string", schema); + objectQAPIfied =3D virQEMUQAPISchemaPathExists("object-add/arg-type/qo= m-type/^secret", schema); for (i =3D 0; i < nargs; i++) { g_auto(virBuffer) debug =3D VIR_BUFFER_INITIALIZER; @@ -603,6 +605,24 @@ testCompareXMLToArgvValidateSchema(virQEMUDriverPtr dr= v, return -1; } + i++; + } else if (STREQ(args[i], "-object")) { + + if (!objectQAPIfied) { + i++; + continue; + } + + if (!(jsonargs =3D virJSONValueFromString(args[i + 1]))) + return -1; + + if (testQEMUSchemaValidateCommand("object-add", jsonargs, + schema, false, false, &debug= ) < 0) { + VIR_TEST_VERBOSE("failed to validate -object '%s' against = QAPI schema: %s", + args[i + 1], virBufferCurrentContent(&deb= ug)); + return -1; + } + i++; } } --=20 2.29.2