From nobody Sun Feb 8 18:09:07 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1559909202; cv=none; d=zoho.com; s=zohoarc; b=lYepdip0DRMT/KhK6w9LDWyHcfxtCpmZQe9ttwaro3Iu1RCVZZJryZ2zyHFfoOi37Q7Kie91v/yGdXz9Pt18vantc1hUtPPDCcPZGCIntjFS4xBi6H4TCKLx+Ye8UMkMv6m3RBbnW4OLwYTG2sQ7Q0BEU0BV9hfR5UX+tW+4qaY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559909202; 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:ARC-Authentication-Results; bh=9WshHMF6uzqqrvS5bzZJFeEwLrVvOwjY3YgVTQ9KKoU=; b=Dq8cmlGekYOPiZtH+fMtV4LJ0AB4UfNjWv7qi1/XExytvxCk6zOeu5ePF8Tx7JvOCslsvIuf6vQJqt3rXsOl7tYHk/oKrryyCtuvkrPYnLk9UjotcYqYUsaP6x+bva2GJqufe5q+8DXQ2M95HYbbk7pxGMTR+f1upUmrfNNNuQk= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1559909202736304.14007041384025; Fri, 7 Jun 2019 05:06:42 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 71B3C2EED05; Fri, 7 Jun 2019 12:06:32 +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 1E50110AFF1C; Fri, 7 Jun 2019 12:06: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 D29291833013; Fri, 7 Jun 2019 12:06: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 x57C1M9f014780 for ; Fri, 7 Jun 2019 08:01:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id BE7A87DFD2; Fri, 7 Jun 2019 12:01:22 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 47E3818394 for ; Fri, 7 Jun 2019 12:01:22 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Fri, 7 Jun 2019 14:01:17 +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 Subject: [libvirt] [PATCH 2/4] tests: qemu: Add QMP schema checking in qemuMonitorTestProcessCommandVerbatim 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: , Content-Transfer-Encoding: quoted-printable 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-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 07 Jun 2019 12:06:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" In case when we are testing a QMP command we can try to schema check it so that we catch inconsistencies. Signed-off-by: Peter Krempa --- tests/qemumonitortestutils.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index 1cd35830af..0de9048243 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -690,14 +690,30 @@ qemuMonitorTestProcessCommandVerbatim(qemuMonitorTest= Ptr test, struct qemuMonitorTestHandlerData *data =3D item->opaque; VIR_AUTOFREE(char *) reformatted =3D NULL; VIR_AUTOFREE(char *) errmsg =3D NULL; + VIR_AUTOPTR(virJSONValue) json =3D NULL; + virJSONValuePtr cmdargs; + const char *cmdname; int ret =3D -1; + int rc; /* JSON strings will be reformatted to simplify checking */ if (test->json || test->agent) { - if (!(reformatted =3D virJSONStringReformat(cmdstr, false))) + if (!(json =3D virJSONValueFromString(cmdstr)) || + !(reformatted =3D virJSONValueToString(json, false))) return -1; cmdstr =3D reformatted; + + /* in this case we do a best-effort schema check if we can find th= e command */ + if ((cmdname =3D virJSONValueObjectGetString(json, "execute"))) { + cmdargs =3D virJSONValueObjectGet(json, "arguments"); + + if ((rc =3D qemuMonitorTestProcessCommandDefaultValidate(test,= cmdname, cmdargs)) < 0) + return -1; + + if (rc =3D=3D 1) + return 0; + } } if (STREQ(data->command_name, cmdstr)) { --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list