From nobody Mon Sep 16 19:39:17 2024 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=1693924036; cv=none; d=zohomail.com; s=zohoarc; b=Y3a82isDHE5fh8GltpfRAUzglt96v/PgQa2SdAvTSVzcl9xN4r5r/DCieNJTR5urfrqFu4/y/jbctNWcif/sxQXUl24wNpCP4aZJBo6I9B966uwUgw7WHUtBLVm0dEA+fvuZTW1z8O+9buJ9FNUJOIi+7dEYUtuOldJkm4PHIY8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693924036; 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=54R1vLiNaCRnGsqstctvHdUIdEzDVciMY7Y3czlcKzU=; b=FTk+34dd53WTa8PchyHmt+om4h3qlNn0DPsWCUEZ3v3RDgGzhZTicG6bUCaOZtOK8F+ANT1MopdMP855yomIh/RF6TI+LFFuiJ/+iphRWlntNsWjB16Ykz/L/7QrakangpX+HItEemB93cGTX7w6J7zvhMNUGTn5rJv7zqmDvFM= 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 1693924036640765.0122959704237; Tue, 5 Sep 2023 07:27:16 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-663-wVdngMw4Obm2J_MDWlhXRQ-1; Tue, 05 Sep 2023 10:25:59 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 63C9B3811F3D; Tue, 5 Sep 2023 14:24:59 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4E3F5493110; Tue, 5 Sep 2023 14:24:59 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3F6891946597; Tue, 5 Sep 2023 14:24:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D2A041946595 for ; Tue, 5 Sep 2023 14:24:57 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C5E0D1121318; Tue, 5 Sep 2023 14:24:57 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4B2F11121314 for ; Tue, 5 Sep 2023 14:24:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693924035; 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=54R1vLiNaCRnGsqstctvHdUIdEzDVciMY7Y3czlcKzU=; b=ElxS0xlm/eXjnurOzqUz2lRDU/8zjkDqmhLtJ+tSw2et5b6GchuIy5roclBo/8G67Z5yVQ m2v1zJRSD29Vve8JgnKYWe6GudrcSI6Cds4SRMbYmCmEzBXtwM1q7rFuTNrYLpQ7uLC3lI CX7qxr6UNqirSDFGD/mUndyABJXF/uU= X-MC-Unique: wVdngMw4Obm2J_MDWlhXRQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 31/51] qemuxml2argvtest: Assume QEMU_CAPS_DEVICE_PCIE_ROOT_PORT for fake-caps tests Date: Tue, 5 Sep 2023 16:23:58 +0200 Message-ID: <4661d2940e5bb7bcab3749751f34c9b1a20ec3a5.1693923601.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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: 1693924037747100003 Content-Type: text/plain; charset="utf-8" Assume the support for the 'pcie-root-port' all modern qemus have to bring the test data closer to the 'latest' real-caps versions. Signed-off-by: Peter Krempa --- tests/qemuxml2argvdata/autoindex.args | 2 +- tests/qemuxml2argvdata/pcie-expander-bus.args | 2 +- tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args | 2 +- tests/qemuxml2argvdata/pcie-root-port.args | 2 +- tests/qemuxml2argvdata/pcie-switch-downstream-port.args | 2 +- tests/qemuxml2argvdata/pcie-switch-upstream-port.args | 4 ++-- tests/qemuxml2argvdata/q35-pci-force-address.args | 2 +- tests/qemuxml2argvtest.c | 2 ++ 8 files changed, 10 insertions(+), 8 deletions(-) diff --git a/tests/qemuxml2argvdata/autoindex.args b/tests/qemuxml2argvdata= /autoindex.args index e0c7471f3a..e712a324d8 100644 --- a/tests/qemuxml2argvdata/autoindex.args +++ b/tests/qemuxml2argvdata/autoindex.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -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":"pcie-root-port","port":8,"chassis":3,"id":"pci.3","bus= ":"pcie.0","addr":"0x1"}' \ -device '{"driver":"x3130-upstream","id":"pci.4","bus":"pci.3","addr":"0x0= "}' \ -device '{"driver":"xio3130-downstream","port":0,"chassis":5,"id":"pci.5",= "bus":"pci.4","addr":"0x0"}' \ -device '{"driver":"xio3130-downstream","port":1,"chassis":6,"id":"pci.6",= "bus":"pci.4","addr":"0x1"}' \ diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.args b/tests/qemuxml2= argvdata/pcie-expander-bus.args index 64b7d5d7df..c14303213d 100644 --- a/tests/qemuxml2argvdata/pcie-expander-bus.args +++ b/tests/qemuxml2argvdata/pcie-expander-bus.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-pcie-ex= pander-bus-te/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"pxb-pcie","bus_nr":254,"id":"pci.1","numa_node":0,"bus= ":"pcie.0","addr":"0x4"}' \ --device '{"driver":"ioh3420","port":0,"chassis":2,"id":"pci.2","bus":"pci.= 1","addr":"0x0"}' \ +-device '{"driver":"pcie-root-port","port":0,"chassis":2,"id":"pci.2","bus= ":"pci.1","addr":"0x0"}' \ -device '{"driver":"x3130-upstream","id":"pci.3","bus":"pci.2","addr":"0x0= "}' \ -device '{"driver":"xio3130-downstream","port":0,"chassis":4,"id":"pci.4",= "bus":"pci.3","addr":"0x0"}' \ -device '{"driver":"xio3130-downstream","port":1,"chassis":5,"id":"pci.5",= "bus":"pci.3","addr":"0x1"}' \ diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args b/tes= ts/qemuxml2argvdata/pcie-root-port-model-ioh3420.args index 271bfab93c..430bedd7d8 100644 --- a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args +++ b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"ioh3420","port":8,"chassis":1,"id":"pci.1","bus":"pcie= .0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ -device '{"driver":"ioh3420","port":9,"chassis":2,"id":"pci.2","bus":"pcie= .0","addr":"0x1.0x1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=3Doff \ diff --git a/tests/qemuxml2argvdata/pcie-root-port.args b/tests/qemuxml2arg= vdata/pcie-root-port.args index cee54df33c..a48d65b8eb 100644 --- a/tests/qemuxml2argvdata/pcie-root-port.args +++ b/tests/qemuxml2argvdata/pcie-root-port.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"ioh3420","port":16,"chassis":1,"id":"pci.1","bus":"pci= e.0","multifunction":true,"addr":"0x2"}' \ +-device '{"driver":"pcie-root-port","port":16,"chassis":1,"id":"pci.1","bu= s":"pcie.0","multifunction":true,"addr":"0x2"}' \ -device '{"driver":"ioh3420","port":26,"chassis":40,"id":"pci.2","bus":"pc= ie.0","addr":"0x2.0x1"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ diff --git a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args b/test= s/qemuxml2argvdata/pcie-switch-downstream-port.args index 3a346a1697..4e39017179 100644 --- a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args +++ b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"ioh3420","port":16,"chassis":1,"id":"pci.1","bus":"pci= e.0","addr":"0x2"}' \ +-device '{"driver":"pcie-root-port","port":16,"chassis":1,"id":"pci.1","bu= s":"pcie.0","addr":"0x2"}' \ -device '{"driver":"x3130-upstream","id":"pci.2","bus":"pci.1","addr":"0x0= "}' \ -device '{"driver":"xio3130-downstream","port":0,"chassis":3,"id":"pci.3",= "bus":"pci.2","addr":"0x0"}' \ -device '{"driver":"xio3130-downstream","port":1,"chassis":4,"id":"pci.4",= "bus":"pci.2","addr":"0x1"}' \ diff --git a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args b/tests/= qemuxml2argvdata/pcie-switch-upstream-port.args index c4670c674e..4b2b99ba0a 100644 --- a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args +++ b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args @@ -26,8 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"ioh3420","port":16,"chassis":1,"id":"pci.1","bus":"pci= e.0","multifunction":true,"addr":"0x2"}' \ --device '{"driver":"ioh3420","port":17,"chassis":2,"id":"pci.2","bus":"pci= e.0","addr":"0x2.0x1"}' \ +-device '{"driver":"pcie-root-port","port":16,"chassis":1,"id":"pci.1","bu= s":"pcie.0","multifunction":true,"addr":"0x2"}' \ +-device '{"driver":"pcie-root-port","port":17,"chassis":2,"id":"pci.2","bu= s":"pcie.0","addr":"0x2.0x1"}' \ -device '{"driver":"x3130-upstream","id":"pci.3","bus":"pci.1","addr":"0x0= "}' \ -device '{"driver":"x3130-upstream","id":"pci.4","bus":"pci.2","addr":"0x0= "}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/q35-pci-force-address.args b/tests/qemu= xml2argvdata/q35-pci-force-address.args index 33171a4d87..484de9ad27 100644 --- a/tests/qemuxml2argvdata/q35-pci-force-address.args +++ b/tests/qemuxml2argvdata/q35-pci-force-address.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -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":"pcie-root-port","port":8,"chassis":3,"id":"pci.3","bus= ":"pcie.0","addr":"0x1"}' \ -netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"e1000e","netdev":"hostnet0","id":"net0","mac":"52:54:0= 0:aa:bf:ef","bus":"pci.2","addr":"0x1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index d18962d614..7e1d132bf6 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -863,6 +863,7 @@ mymain(void) QEMU_CAPS_NETDEV_JSON, \ QEMU_CAPS_SECCOMP_SANDBOX, \ QEMU_CAPS_PIIX3_USB_UHCI, \ + QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, \ __VA_ARGS__, \ QEMU_CAPS_LAST, \ ARG_END) @@ -874,6 +875,7 @@ mymain(void) QEMU_CAPS_NETDEV_JSON, \ QEMU_CAPS_SECCOMP_SANDBOX, \ QEMU_CAPS_PIIX3_USB_UHCI, \ + QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, \ QEMU_CAPS_LAST, \ ARG_END) --=20 2.41.0