From nobody Mon Feb 9 06:49:24 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=1618836079; cv=none; d=zohomail.com; s=zohoarc; b=Gl8MTRmFbwQqYgoJcQLlMo7z3OoQSZOil7n4Nhj9pO8pECFGvDwUX88n96evVX54lluGJ3UQ8Zng5vJFuTsXmqgWzEW9zmKxjaQMCefvRTT8OPZkfdtT71DmfbTFlyWepBIUnPzKxwO4HCTl0SPhYmL2MQHeSz7B1DVh7XNBUJk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618836079; 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=1VGGFyk4YdlzANymxypOnz26A1+Cx6TKqPpSyqGaMbo=; b=M41WdyGna+6UBg7i/O8q4irKSjZ8rK84bPUjOUs7f/s+irpOk8JVkMVRMfRiihxz/SIJOyov+f2xpXdFAdT99ZIG56YfhoGvkvjxpDe6t4ok38B4LMNGhTTZ8cnTrVlVwoj2uKnDJPsnLw3wRYsutn36p5/uieZJYoDIVxnY6/0= 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 1618836079477368.6836920199361; Mon, 19 Apr 2021 05:41:19 -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-16-6erkW6BbO2q7fvQJk7CL_Q-1; Mon, 19 Apr 2021 08:39:45 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0DDA96D254; Mon, 19 Apr 2021 12:39:40 +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 E453E5D74B; Mon, 19 Apr 2021 12:39:39 +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 A6EE2180CB1A; Mon, 19 Apr 2021 12:39:39 +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 13JCaKhb019258 for ; Mon, 19 Apr 2021 08:36:20 -0400 Received: by smtp.corp.redhat.com (Postfix) id B64F7E72F; Mon, 19 Apr 2021 12:36:20 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0B46F19C66 for ; Mon, 19 Apr 2021 12:36:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618836078; 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=1VGGFyk4YdlzANymxypOnz26A1+Cx6TKqPpSyqGaMbo=; b=eKy7ysn9Ji15/dzrdol/pS4yvYzLisswRWDjUht3TUOYYCl5JMx2R+3OvymopGP1LG0rwp ZH9xT7lHWU3LbpC/dxuMzxdZQklR9QgeUbzCBoNRVN7kTbeWuVxR+2/igIubnLxGTjSDTt 6mkzU1iJyar4w0VYGma2uUiPGnzAcRY= X-MC-Unique: 6erkW6BbO2q7fvQJk7CL_Q-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 21/38] qemuhotplugtest: Add also always-present capabilities Date: Mon, 19 Apr 2021 14:35:25 +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.15 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 Reviewed-by: Pavel Hrdina Reviewed-by: Neal Gompa --- 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 cb29d62aff..57d76845c6 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(virDomainXMLOption *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 @@