From nobody Mon Feb 9 14:00:11 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=1617980644; cv=none; d=zohomail.com; s=zohoarc; b=iLmL7HzsDPehfbSSdbbJGQgeuj08zrorwjJCSE9x1JUAMiFA78LR4SsBXjClOb9+lYjDEiKMSx1QGmu1ZyVXMHC51B8XPyucU6B7EumCYF6O6U/34Eqt1X+P+AvmNL7EwNFSJ7nJ3A/HoHCOpMfskM3lzzjd3ERVg6n7BNJm+1E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617980644; 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=J8sEhM4aJ1RKfQwbeztvVvrq+9ocqT4qSwfLcwfIN9M=; b=LjiVOnOhCGOQ4t102slmUsfBdH5vIs4kWl9lG4jWUD/JTwxqvdTIrnFLZ4VjjwJO+MczluWf0aSjuDwLu8Ormg+8C4ZLPDbm8qXHH0PPImJigC1of5zZ00ksJjOy508HzF5J8jCJM3KhszTC8+3VAPOw19SCcl6R0uDH7x+Jy7g= 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 161798064433042.49396239208659; Fri, 9 Apr 2021 08:04:04 -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-463-XLQm6lc2PPKa-Kdgg6CL2g-1; Fri, 09 Apr 2021 11:01:32 -0400 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 4EC65101E2DE; Fri, 9 Apr 2021 15:00:38 +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 1726B5DDAD; Fri, 9 Apr 2021 15:00:38 +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 BD4E555349; Fri, 9 Apr 2021 15:00:37 +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 139EwEhv023997 for ; Fri, 9 Apr 2021 10:58:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7A4C360D79; Fri, 9 Apr 2021 14:58:14 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id D03A06EF41 for ; Fri, 9 Apr 2021 14:58:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617980642; 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=J8sEhM4aJ1RKfQwbeztvVvrq+9ocqT4qSwfLcwfIN9M=; b=i05KN/k1+kcw77BS6C+3DFrhBuL8A109UkiC0DtCjTuz5Ci6F5S4CzA0fbwuMcJtOHYR3U ge4iTU/hqUMe0UBt4XqyyjaEliZZJEbVcgpOX4ahph/mV6GLSSmIimtcd9iWaLALRlh2u6 6cdWbcmO5KfFD4nz/JOTwSnd9eiXlfQ= X-MC-Unique: XLQm6lc2PPKa-Kdgg6CL2g-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [RFC PATCH 32/43] qemuhotplugtest: Add also always-present capabilities Date: Fri, 9 Apr 2021 16:57:08 +0200 Message-Id: <4ae3065994bbd34d2f8ed6e256e139fad657acf5.1617979432.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.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" Use virQEMUCapsInitQMPBasicArch in qemuHotplugCreateObjects so that we also add the always-present capabilities to the set of capabilities used for the hotplug test and fix fallout. Signed-off-by: Peter Krempa --- tests/qemuhotplugtest.c | 5 +++++ .../qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml | 2 +- .../qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml | 2 +- .../ppc64-modern-individual-result-conf.xml | 2 +- .../ppc64-modern-individual-result-live.xml | 2 +- tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml | 2 +- tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml | 2 +- .../x86-modern-individual-add-result-conf.xml | 2 +- .../x86-modern-individual-add-result-live.xml | 2 +- tests/qemuhotplugtestcpus/x86-old-bulk-result-conf.xml | 2 +- tests/qemuhotplugtestcpus/x86-old-bulk-result-live.xml | 2 +- .../qemuhotplug-ivshmem-doorbell-detach.xml | 2 +- .../qemuhotplug-ivshmem-plain-detach.xml | 2 +- .../qemuhotplugtestdevices/qemuhotplug-watchdog-full.xml | 2 +- .../qemuhotplug-watchdog-user-alias-full.xml | 2 +- .../qemuhotplug-base-live+disk-virtio.xml | 2 +- .../qemuhotplug-base-live+hostdev-pci.xml | 2 +- .../qemuhotplug-base-live+interface-vdpa.xml | 2 +- .../qemuhotplug-base-live+ivshmem-doorbell.xml | 4 ++-- .../qemuhotplug-base-live+ivshmem-plain.xml | 2 +- .../qemuhotplug-base-live+watchdog-user-alias.xml | 2 +- .../qemuhotplug-base-live+watchdog.xml | 2 +- .../qemuhotplug-base-with-scsi-controller-live.xml | 8 ++++---- ...plug-base-without-scsi-controller-live+disk-scsi-2.xml | 8 ++++---- 24 files changed, 35 insertions(+), 30 deletions(-) diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index df5c9c9059..3b2e5f6c39 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -32,6 +32,9 @@ #include "virthread.h" #include "virfile.h" +#define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW +#include "qemu/qemu_capspriv.h" + #define VIR_FROM_THIS VIR_FROM_NONE static virQEMUDriver driver; @@ -71,6 +74,8 @@ qemuHotplugCreateObjects(virDomainXMLOptionPtr xmlopt, if (!(priv->qemuCaps =3D virQEMUCapsNew())) return -1; + virQEMUCapsInitQMPBasicArch(priv->qemuCaps); + virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_VIRTIO_SCSI); virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_USB_STORAGE); virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_CCW); diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml b/= tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml index 690c85cf85..a7ada18bf3 100644 --- a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml +++ b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml @@ -59,7 +59,7 @@