From nobody Sun Feb 8 18:44:54 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1617980522; cv=none; d=zohomail.com; s=zohoarc; b=ZSFuTI22usojiH+m34lMw8f8hcWtqNqy/0jF+Xeg1fDD39ZSv78vKHmQ/O3jaybMPbzK3LDoUy+BG76ygqREZyonVUgjO9ylAGXr4LYxSlZtL1upd7Miam/ZMFaanl72bjytK7iGhLKfLbRTZq8zvnSzDo7FS4scRJqInoNoCwg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617980522; 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=6/PTRcL4Q72eTRTbgY/FTtbhbjwlQNWQQSCr51oFbMI=; b=f8HX4+cxgglmkUX8NG+Z0wyagDU3K8giz9AqG+pgL02zAf4YrvalWHUkDPq8FOgK0Zcr1bAvw8EeWHyPvDcx0iyiPXYdDnn2aUyXIftQWarWLpbuNHX2V5FLRep6wDwVcMVzxvNW9c+4O9mYl3EsBGSrXXEh/+0XZbGqrUggX1U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1617980522155405.3504823866921; Fri, 9 Apr 2021 08:02:02 -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-238-AMOVXtLeOe6xUStk4VpraA-1; Fri, 09 Apr 2021 11:01:55 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BC0861020C23; Fri, 9 Apr 2021 15:01: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 8E8EA69FA4; Fri, 9 Apr 2021 15:01: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 4E10D1806D1D; Fri, 9 Apr 2021 15:01:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 139EwTUI024106 for ; Fri, 9 Apr 2021 10:58:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id CC38C14106; Fri, 9 Apr 2021 14:58:29 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3841560D79 for ; Fri, 9 Apr 2021 14:58:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617980518; 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=6/PTRcL4Q72eTRTbgY/FTtbhbjwlQNWQQSCr51oFbMI=; b=EtLUALwvlPG7lRh7LFGt6Uyvscmlenr2hzyDE9sf8ijMnTOLJqLCPGoonrVsJ5uIDpWrRQ sspdoddYdMiv7alyxA0dqCjM+IeI5VlaBSmunk16NUERV4pMROxzLN5BCT2Kmp2+J6Jhi4 wo1oyu0LGFH2YOv+Tzime+9MjvoJmdc= X-MC-Unique: AMOVXtLeOe6xUStk4VpraA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [RFC PATCH 43/43] qemu: capabilities: Probe QMP schema before probing commands Date: Fri, 9 Apr 2021 16:57:19 +0200 Message-Id: <1b238c677e8b40be2cd3aa4bbc6cb2b8539f6bc8.1617979433.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.11 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 --- 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 f1da65abd6..8b4c24b6ed 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5289,6 +5289,8 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, /* initiate all capabilities based on qemu version */ virQEMUCapsInitQMPVersionCaps(qemuCaps); + if (virQEMUCapsProbeQMPSchemaCapabilities(qemuCaps, mon) < 0) + return -1; if (virQEMUCapsProbeQMPCommands(qemuCaps, mon) < 0) return -1; @@ -5317,8 +5319,6 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr 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) diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies b/tests/q= emucapabilitiesdata/caps_2.11.0.s390x.replies index 42846d9169..5eeeb42d19 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies @@ -39,15284 +39,15284 @@ } { - "execute": "query-commands", + "execute": "query-qmp-schema", "id": "libvirt-4" } [truncated - original patch was 27MiB]