From nobody Mon Feb 9 17:35:16 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=1634833552; cv=none; d=zohomail.com; s=zohoarc; b=VompzXSs4AtWEmFgz1tL0APlyafzFRXMiZ0yYNmyoi6A8tP+MUKK0wpnl/oASMkC3H10DexSuXYK9YwNNS48zHoDDXiBn8DF8TtjPko/kiuVh5ZKXAnpBah7t2ZPI6Sx4rPDSHkeQrt4MsFhnjVfqyYdOe0tTuyhXcJSiaZGb5w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634833552; h=Content-Type:Content-Transfer-Encoding:Cc: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=HYW90Pbcj8KVanfiF+78fnvnbkmRpDSIH8utHPyUQ0c=; b=GenKHegPYrmHydYq7/WVp8+s/tAv+b7jxWH0WFKfuOVB6RwfPTVWeYyXIE5l2KUtDdpp4Tp76OxQfvci7cFx+1ArPnVK+43L6NyhSCArSFSup3vBO/p8/Dc2pDU8gweyEDjwOuF/Z2QDkw0dLJQcYo7dBQrNdZYpob0Ebo5JQwo= 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) 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 1634833552272237.8501033268568; Thu, 21 Oct 2021 09:25:52 -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-427-UoZnJfuVP5qcQOuuyJ2Dlg-1; Thu, 21 Oct 2021 12:25:46 -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 8372F19253C3; Thu, 21 Oct 2021 16:25: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 61A965D9DE; Thu, 21 Oct 2021 16:25: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 007EC4EA2A; Thu, 21 Oct 2021 16:25:34 +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 19LGPXkD006561 for ; Thu, 21 Oct 2021 12:25:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id 28E915F4ED; Thu, 21 Oct 2021 16:25:33 +0000 (UTC) Received: from vhost3.router.laine.org (ovpn-114-79.phx2.redhat.com [10.3.114.79]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8012B18428; Thu, 21 Oct 2021 16:25:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1634833551; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=HYW90Pbcj8KVanfiF+78fnvnbkmRpDSIH8utHPyUQ0c=; b=QmcT7Fvh/6qPxI5VXzoP0hOS2YcDROKiQhqRaF9J2p2UdlTELtty5EcqLVPJecjf6IiqtA 7Gi2IX/bHOry6FCBvPd+W6aWPTCjjuHhPZMm/Bh/3SLnM7MsvzG0exwiI08G0PVCnCp6mK dx+TDNsw35MJXMnF1iIywi7+fGbKudw= X-MC-Unique: UoZnJfuVP5qcQOuuyJ2Dlg-1 From: Laine Stump To: libvir-list@redhat.com Subject: [libvirt PATCH 03/10] Revert "qemuxml2argvtest: Add '-enable' variants for ACPI-hotplug related cases" Date: Thu, 21 Oct 2021 12:24:53 -0400 Message-Id: <20211021162500.1295221-4-laine@redhat.com> In-Reply-To: <20211021162500.1295221-1-laine@redhat.com> References: <20211021162500.1295221-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Ani Sinha , Igor Mammedov , Julia Suvorova , Michael Tsirkin 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) X-ZM-MESSAGEID: 1634833554017100005 Content-Type: text/plain; charset="utf-8" This reverts commit 64146031058906804b3c5f519570fadc9ff4df48. Conflicts: tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-enable.x86_64-latest.= args tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-latest.ar= gs tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.x86_64-latest.args These files are unrelated to the functionality we need to remove, so they weren't removed, and the associated test cases weren't removed from qemuxml2argvtest.c Signed-off-by: Laine Stump --- ...i-hotplug-bridge-enable.x86_64-latest.args | 34 ----------------- ...cpi-hotplug-bridge-enable.x86_64-6.0.0.err | 1 - ...i-hotplug-bridge-enable.x86_64-latest.args | 37 ------------------- tests/qemuxml2argvtest.c | 3 -- 4 files changed, 75 deletions(-) delete mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-en= able.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.x= 86_64-6.0.0.err delete mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.x= 86_64-latest.args diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-enable.x8= 6_64-latest.args b/tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-ena= ble.x86_64-latest.args deleted file mode 100644 index 77ef82f25b..0000000000 --- a/tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-enable.x86_64-la= test.args +++ /dev/null @@ -1,34 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-i440fx \ -USER=3Dtest \ -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 \ -/usr/bin/qemu-system-x86_64 \ --name guest=3Di440fx,debug-threads=3Don \ --S \ --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 \ --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,fd=3D1729,server=3Don,wait=3Doff \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --no-acpi \ --global PIIX4_PM.acpi-pci-hotplug-with-bridge-support=3Don \ --boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ --sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.x86_64-6= .0.0.err b/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.x86_64-6.0= .0.err deleted file mode 100644 index 8c09a3cd76..0000000000 --- a/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.x86_64-6.0.0.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: acpi-bridge-hotplug is not available with this = QEMU binary diff --git a/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.x86_64-l= atest.args b/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.x86_64-l= atest.args deleted file mode 100644 index 4ff07ad3b8..0000000000 --- a/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.x86_64-latest.a= rgs +++ /dev/null @@ -1,37 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-q35 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-q35/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-q35/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3Dq35,debug-threads=3Don \ --S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-q35/master-key.aes"}' \ --machine pc-q35-2.5,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-bac= kend=3Dpc.ram \ --cpu qemu64 \ --m 1024 \ --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,fd=3D1729,server=3Don,wait=3Doff \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --no-acpi \ --global ICH9-LPC.acpi-pci-hotplug-with-bridge-support=3Don \ --boot strict=3Don \ --device '{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"= 0x1e"}' \ --device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.1",= "addr":"0x0"}' \ --device '{"driver":"ioh3420","port":8,"chassis":3,"id":"pci.3","bus":"pcie= .0","addr":"0x1"}' \ --device '{"driver":"qemu-xhci","id":"usb","bus":"pci.3","addr":"0x0"}' \ --audiodev id=3Daudio1,driver=3Dnone \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","add= r":"0x1"}' \ --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 e209b48fce..7c8b55f72c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2571,11 +2571,8 @@ mymain(void) DO_TEST_CAPS_VER_PARSE_ERROR("pc-i440fx-acpi-root-hotplug-disable", "5= .1.0"); DO_TEST_CAPS_VER_PARSE_ERROR("pc-i440fx-acpi-root-hotplug-enable", "5.= 1.0"); DO_TEST_CAPS_LATEST("q35-acpi-hotplug-bridge-disable"); - DO_TEST_CAPS_LATEST("q35-acpi-hotplug-bridge-enable"); DO_TEST_CAPS_LATEST("pc-i440fx-acpi-hotplug-bridge-disable"); - DO_TEST_CAPS_LATEST("pc-i440fx-acpi-hotplug-bridge-enable"); DO_TEST_CAPS_VER_PARSE_ERROR("q35-acpi-hotplug-bridge-disable", "6.0.0= "); - DO_TEST_CAPS_VER_PARSE_ERROR("q35-acpi-hotplug-bridge-enable", "6.0.0"= ); /* verify that we fail when acpi-bridge-hotplug option is specified for * archs other than x86 */ --=20 2.31.1