From nobody Mon Feb 9 07:26:51 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=1633957367; cv=none; d=zohomail.com; s=zohoarc; b=UjGdZ8QE0O4SoJkj+S2tUxdAw9VCRa7T/76pD3YX8RDayUnMeEvXrS9Fq2LXsQgikOm46OoKbdnoHzGk6WffxrE1y7QA0OWH34U4Y8wyBH7tm5bnrqtEydXSmvX4csE9NX14AAsk+amnVQu4+Opm7AShj2+ngS4RuUw7EPFWoPg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633957367; 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=lyzWG6/P5VW+t7aLHCyyMsIU3c1FMwnOmf4jGEfuch0=; b=FFEkFeeEygI6kn4XZvnJlT7COoHSz09fjb7qVooANIObHbN53O0CM8f59OOJbPco3uIzsgVnXrCBZNywP2Qm319c+kXNUnKzKSPJyMLGq4koyAyTbUaXV0prsvbni5Pxh2zQ4YVaHOxw0lzpj7hpPS8HcfmXlcCUVwT6gKeqoGA= 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) 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 1633957367809702.0775313760016; Mon, 11 Oct 2021 06:02: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-166-APZUiTkuMMGgnssrUQ2foA-1; Mon, 11 Oct 2021 09:02:42 -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 E6429A40C5; Mon, 11 Oct 2021 13:02:35 +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 C8BFF60938; Mon, 11 Oct 2021 13:02:35 +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 92FDB4EA30; Mon, 11 Oct 2021 13:02:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 19BD2I7V024819 for ; Mon, 11 Oct 2021 09:02:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2E2635F4E8; Mon, 11 Oct 2021 13:02:18 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7D4575F4E4 for ; Mon, 11 Oct 2021 13:02:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633957366; 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=lyzWG6/P5VW+t7aLHCyyMsIU3c1FMwnOmf4jGEfuch0=; b=VeymtOBl48bD157x02O1kcybwd6yRZsMZUetegqxefTKkEgXLpTnU0M5hsbJSOgvhD0hUa +haN6wRRSmD2qs2Mv+Fd3Tdk//bj4ZQRBOP+1YTCxvsVJOlo/qzTTMUWydeiSXk/K2nKZ7 h9BECyIfui+EE2EEXMJN/mzLQjTm2Ow= X-MC-Unique: APZUiTkuMMGgnssrUQ2foA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 3/7] qemuxml2argvtest: Use real-caps testing for 'pc-i440fx-acpi-root-hotplug-disable' Date: Mon, 11 Oct 2021 15:02:08 +0200 Message-Id: <0deab14acc94c9dc4668299f7b849d413714e24c.1633957206.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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) X-ZM-MESSAGEID: 1633958295611100001 Content-Type: text/plain; charset="utf-8" We can use two real example configs to prove the support without the need for using fake capabilities. Fix the recently added test cases. Fixes: 133d7983d6c Signed-off-by: Peter Krempa --- ...fx-acpi-root-hotplug-disable.x86_64-5.1.0.err} | 0 ...-acpi-root-hotplug-disable.x86_64-latest.args} | 15 +++++++++------ tests/qemuxml2argvtest.c | 5 ++--- 3 files changed, 11 insertions(+), 9 deletions(-) rename tests/qemuxml2argvdata/{pc-i440fx-acpi-root-hotplug-disable.err =3D= > pc-i440fx-acpi-root-hotplug-disable.x86_64-5.1.0.err} (100%) rename tests/qemuxml2argvdata/{pc-i440fx-acpi-root-hotplug-disable.args = =3D> pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.args} (55%) diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.err= b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-5.1.0.= err similarity index 100% rename from tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.err rename to tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.x86_64= -5.1.0.err diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.arg= s b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-lates= t.args similarity index 55% rename from tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.args rename to tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.x86_64= -latest.args index dd8ea503fc..056a925bc0 100644 --- a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.args +++ b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-lat= est.args @@ -6,26 +6,29 @@ LOGNAME=3Dtest \ XDG_DATA_HOME=3D/tmp/lib/domain--1-i440fx/.local/share \ XDG_CACHE_HOME=3D/tmp/lib/domain--1-i440fx/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-i440fx/.config \ -QEMU_AUDIO_DRV=3Dnone \ /usr/bin/qemu-system-x86_64 \ -name guest=3Di440fx,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-i440= fx/master-key.aes \ --machine pc-i440fx-2.5,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-i440fx/master-key.aes"}' \ +-machine pc-i440fx-2.5,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-= backend=3Dpc.ram \ +-cpu qemu64 \ -m 1024 \ --realtime mlock=3Doff \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 56f5055c-1b8d-490c-844a-ad646a1caaaa \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-i440fx/monitor.= sock,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ -global PIIX4_PM.acpi-root-pci-hotplug=3Doff \ --usb \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-audiodev id=3Daudio1,driver=3Dnone \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 116ba714eb..0224bd1854 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2559,9 +2559,8 @@ mymain(void) QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4); - DO_TEST("pc-i440fx-acpi-root-hotplug-disable", - QEMU_CAPS_PIIX4_ACPI_ROOT_PCI_HOTPLUG); - DO_TEST_PARSE_ERROR_NOCAPS("pc-i440fx-acpi-root-hotplug-disable"); + DO_TEST_CAPS_LATEST("pc-i440fx-acpi-root-hotplug-disable"); + DO_TEST_CAPS_VER_PARSE_ERROR("pc-i440fx-acpi-root-hotplug-disable", "5= .1.0"); DO_TEST("q35-acpi-hotplug-bridge-disable", QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, --=20 2.31.1