From nobody Mon Feb 9 05:19:21 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=1618835999; cv=none; d=zohomail.com; s=zohoarc; b=Oe/3Hjzd97JclVQORaDWTrjWSAJvC7BdejJq3aTuqD1L7RIdYtE7tIyhSd7998EbXeh/Jy3uduibrxbSvTtVpKK0A3z5fgPouBCLy8nJXTQLxU5kSKt5MXzgsl3P1+Wp/zzl+N7Yj9FWKPXKERocbmXGqOxXFnPuqUgtWPO/LbQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618835999; 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=rpeZprKdU1uuTUnLEWeQq64Uqq2O5jONF9YhI+68cEo=; b=eyYl6Eb1Ot5CG/eWqmoHj862Vx9Xkhr8HibePgUHHo+1SYmmMNk0A1AIHqRKlDDWF64HKOVFktrn+BC7ePIXFxjC4TUjDBu3ifMFeGbLwjacWjS2n/tYoyzj6G5fiTEcbmRRVPlZx922s6XmIbxlYa+2dGNPwEn5csnoPx6uXvU= 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 1618835999832454.6850910796462; Mon, 19 Apr 2021 05:39:59 -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-545-NbWMsMghPB69Aj5jiYbBFw-1; Mon, 19 Apr 2021 08:39:56 -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 4051D1008060; Mon, 19 Apr 2021 12:39:50 +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 2382B60C5C; Mon, 19 Apr 2021 12:39:50 +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 DD57318184B5; Mon, 19 Apr 2021 12:39:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13JCaaBn019372 for ; Mon, 19 Apr 2021 08:36:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id BFC24E730; Mon, 19 Apr 2021 12:36:36 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7DF71E724 for ; Mon, 19 Apr 2021 12:36:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618835998; 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=rpeZprKdU1uuTUnLEWeQq64Uqq2O5jONF9YhI+68cEo=; b=OzIg3kGsCl4babU9fvZsPx/l1vz+1kd+1KrTfNQTZPYaCSaBzOrT1zW/1lx0NEnJj4Upz2 BWCHvW6d8ASYOFJo96ef7oBorNRtx9XZIqzUmM9aS54A4Ek/pV3KZue6+OboW/RDilCFN+ Q4nI/C7tWCKYXHfM7LoLwrbTsvazy34= X-MC-Unique: NbWMsMghPB69Aj5jiYbBFw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 30/38] qemu: capabilities: Probe QMP schema before probing commands Date: Mon, 19 Apr 2021 14:35:34 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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 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" All supported QEMU versions now support query-qmp-schema. In the future it will be possible to use the output of query-qmp-schema to also detect commands reliably. Since we are at the point where we have the least amount of .replies files needing changing for a long time, move the 'query-qmp-schema' bits before 'query-commands' to prepare for the future. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina Reviewed-by: Neal Gompa --- src/qemu/qemu_capabilities.c | 4 +- .../caps_2.11.0.s390x.replies | 24402 ++++---- .../caps_2.11.0.x86_64.replies | 25714 ++++----- .../caps_2.12.0.aarch64.replies | 29184 +++++----- .../caps_2.12.0.ppc64.replies | 31498 +++++------ .../caps_2.12.0.s390x.replies | 27150 ++++----- .../caps_2.12.0.x86_64.replies | 30348 +++++----- .../caps_3.0.0.ppc64.replies | 32840 +++++------ .../caps_3.0.0.riscv32.replies | 21708 ++++---- .../caps_3.0.0.riscv64.replies | 21708 ++++---- .../caps_3.0.0.s390x.replies | 28078 +++++----- .../caps_3.0.0.x86_64.replies | 31462 +++++------ .../caps_3.1.0.ppc64.replies | 32540 +++++------ .../caps_3.1.0.x86_64.replies | 32302 +++++------ .../caps_4.0.0.aarch64.replies | 31300 +++++------ .../caps_4.0.0.ppc64.replies | 33522 +++++------ .../caps_4.0.0.riscv32.replies | 29066 +++++----- .../caps_4.0.0.riscv64.replies | 29066 +++++----- .../caps_4.0.0.s390x.replies | 29544 +++++----- .../caps_4.0.0.x86_64.replies | 32926 +++++------ .../caps_4.1.0.x86_64.replies | 34448 ++++++------ .../caps_4.2.0.aarch64.replies | 33728 ++++++------ .../caps_4.2.0.ppc64.replies | 34230 ++++++------ .../caps_4.2.0.s390x.replies | 31044 +++++------ .../caps_4.2.0.x86_64.replies | 37040 ++++++------- .../caps_5.0.0.aarch64.replies | 36328 ++++++------ .../caps_5.0.0.ppc64.replies | 37728 ++++++------- .../caps_5.0.0.riscv64.replies | 32792 +++++------ .../caps_5.0.0.x86_64.replies | 39754 +++++++------- .../caps_5.1.0.sparc.replies | 25244 ++++----- .../caps_5.1.0.x86_64.replies | 41046 +++++++------- .../caps_5.2.0.aarch64.replies | 38490 ++++++------- .../caps_5.2.0.ppc64.replies | 40514 +++++++------- .../caps_5.2.0.riscv64.replies | 34452 ++++++------ .../caps_5.2.0.s390x.replies | 35480 ++++++------ .../caps_5.2.0.x86_64.replies | 42432 +++++++------- .../caps_6.0.0.x86_64.replies | 45838 ++++++++-------- 37 files changed, 587475 insertions(+), 587475 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 94824f3d8b..c2b7764eb8 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5284,6 +5284,8 @@ virQEMUCapsInitQMPMonitor(virQEMUCaps *qemuCaps, /* initiate all capabilities based on qemu version */ virQEMUCapsInitQMPVersionCaps(qemuCaps); + if (virQEMUCapsProbeQMPSchemaCapabilities(qemuCaps, mon) < 0) + return -1; if (virQEMUCapsProbeQMPCommands(qemuCaps, mon) < 0) return -1; @@ -5312,8 +5314,6 @@ virQEMUCapsInitQMPMonitor(virQEMUCaps *qemuCaps, return -1; if (virQEMUCapsProbeQMPMigrationCapabilities(qemuCaps, mon) < 0) return -1; - if (virQEMUCapsProbeQMPSchemaCapabilities(qemuCaps, mon) < 0) - return -1; if (virQEMUCapsProbeQMPGICCapabilities(qemuCaps, mon) < 0) return -1; if (virQEMUCapsProbeQMPSEVCapabilities(qemuCaps, mon) < 0) [snipped test data changes]