From nobody Mon Feb 9 03:30:01 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=1618835987; cv=none; d=zohomail.com; s=zohoarc; b=k3rkNWqtbNj0yDnoHWNPm7F0OpaXpMK1jY1HzsnHmlTD/RmZthlvCxISVjOXUph1XSmRrB2mNjJ/vvBlkCljcJuaqf68lLbE0epflbdfgQqDp9URcBS5JBmuckrYTw8fYqpIhV3X4DFCWz554gmGm/Y8Z+WTEHEgcWm+ZdJ5QXA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618835987; 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=lhv5BfAuMwNnKyxc1iiw2U65k+uGQSrkNWuX5sVC6aM=; b=jSlC31cAlkeXvHb1H42UalgC5gW3IuluitBiOVYRVh1kIWKHXKfzrdQRf8QBToxv+AumwcQwkg3gV8/ieTv+bS2kOp1doMJNzyeuDMIbeIEA3DoacHZdbNgXKEaBN6rYpP77USIeFQFrPhVKICr+3Jg3+OUpf/hDuuUjEf/Hwds= 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 1618835987585758.3549384232758; Mon, 19 Apr 2021 05:39:47 -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-395-CzMFXy8iM5WrnJuM2fYGAw-1; Mon, 19 Apr 2021 08:39:43 -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 319026D246; Mon, 19 Apr 2021 12:39:37 +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 11CC42C167; Mon, 19 Apr 2021 12:39:37 +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 C89071806D39; Mon, 19 Apr 2021 12:39:36 +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 13JCaJDf019249 for ; Mon, 19 Apr 2021 08:36:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id 99EE1E72F; Mon, 19 Apr 2021 12:36:19 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id EB10719C66 for ; Mon, 19 Apr 2021 12:36:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618835986; 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=lhv5BfAuMwNnKyxc1iiw2U65k+uGQSrkNWuX5sVC6aM=; b=XMK1ItS8X+IiSBpLvilanMzezSMfZY+7NgP3M6aMYxaBMSPdbXR4MDU1RS6HroOl4gZdlW I5QeRi85PQcj6FpjhaTx9hcEuVUYMCX8A0AISn64KSjdQwwkEM0aXXP1XyPOpsQ4sywSR4 x1+hE34/4CfYVusrTqDB+Vj9O5Q/u5c= X-MC-Unique: CzMFXy8iM5WrnJuM2fYGAw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 20/38] qemu: capabilities: Move rest of always present caps to virQEMUCapsInitQMPArch Date: Mon, 19 Apr 2021 14:35:24 +0200 Message-Id: <4b6f2c92f490fa2db6b601b8623a88b352137d4f.1618834490.git.pkrempa@redhat.com> 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.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" These conveniently don't have any test fallout. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina Reviewed-by: Neal Gompa --- src/qemu/qemu_capabilities.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 61dd4fd6f8..0ac68197a3 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5044,6 +5044,13 @@ virQEMUCapsInitQMPBasicArch(virQEMUCaps *qemuCaps) { /* Following caps were asserted by a version check for pre 2.11 qemus = */ virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); + virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_VMPORT_OPT); + virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOSTUSER_MULTIQUEUE); + virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_SMM_OPT); + virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL_GL); + virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_KERNEL_IRQCHIP_SPLIT); + virQEMUCapsSet(qemuCaps, QEMU_CAPS_EGL_HEADLESS); + virQEMUCapsSet(qemuCaps, QEMU_CAPS_NUMA_DIST); switch (qemuCaps->arch) { case VIR_ARCH_I686: @@ -5120,15 +5127,6 @@ virQEMUCapsInitQMPBasicArch(virQEMUCaps *qemuCaps) static void virQEMUCapsInitQMPVersionCaps(virQEMUCaps *qemuCaps) { - /* Following caps were asserted by a version check for pre 2.11 qemus = */ - virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_VMPORT_OPT); - virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOSTUSER_MULTIQUEUE); - virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_SMM_OPT); - virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL_GL); - virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_KERNEL_IRQCHIP_SPLIT); - virQEMUCapsSet(qemuCaps, QEMU_CAPS_EGL_HEADLESS); - virQEMUCapsSet(qemuCaps, QEMU_CAPS_NUMA_DIST); - /* -enable-fips is deprecated in QEMU 5.2.0, and QEMU * should be built with gcrypt to achieve FIPS compliance * automatically / implicitly --=20 2.30.2