From nobody Thu May 16 00:56:52 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1705485854200891.7356731779203; Wed, 17 Jan 2024 02:04:14 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 1D5F61D5C; Wed, 17 Jan 2024 05:04:13 -0500 (EST) Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 7EA5A1D8A; Wed, 17 Jan 2024 04:55:30 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id F01CB1C5B; Wed, 17 Jan 2024 04:54:57 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 344B51C65 for ; Wed, 17 Jan 2024 04:54:57 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-553-uFN6zym7P3q8xFfvlISWug-1; Wed, 17 Jan 2024 04:54:54 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F3F99830E56 for ; Wed, 17 Jan 2024 09:54:53 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.224.208]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8A94F40C6E2B for ; Wed, 17 Jan 2024 09:54:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: uFN6zym7P3q8xFfvlISWug-1 From: Andrea Bolognani To: devel@lists.libvirt.org Subject: [PATCH 01/18] tests: Add devices to pseries-phb-simple Date: Wed, 17 Jan 2024 10:54:34 +0100 Message-ID: <20240117095451.788816-2-abologna@redhat.com> In-Reply-To: <20240117095451.788816-1-abologna@redhat.com> References: <20240117095451.788816-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: WUL2OWPYR74BDYUNOXBF7SN5RQ4VMRKZ X-Message-ID-Hash: WUL2OWPYR74BDYUNOXBF7SN5RQ4VMRKZ X-MailFrom: abologna@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8"; x-default="true" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1705485855416100001 We want to make sure that not only the controllers themselves are added correctly, but also that devices attached to them get assigned the expected bus value. In order to do that add some devices, one per controller. Signed-off-by: Andrea Bolognani Reviewed-by: Peter Krempa --- .../pseries-phb-simple.ppc64-latest.args | 5 ++++- tests/qemuxml2argvdata/pseries-phb-simple.xml | 11 ++++++++++- .../pseries-phb-simple.ppc64-latest.xml | 14 ++++++++++---- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/tests/qemuxml2argvdata/pseries-phb-simple.ppc64-latest.args b/= tests/qemuxml2argvdata/pseries-phb-simple.ppc64-latest.args index c2c28bd198..b6c0ecae8e 100644 --- a/tests/qemuxml2argvdata/pseries-phb-simple.ppc64-latest.args +++ b/tests/qemuxml2argvdata/pseries-phb-simple.ppc64-latest.args @@ -27,7 +27,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"spapr-pci-host-bridge","index":1,"id":"pci.1"}' \ --device '{"driver":"spapr-pci-host-bridge","index":2,"id":"pci.2"}' \ +-netdev user,id=3Dhostnet0 \ +-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:a2:44:92","bus":"pci.0","addr":"0x1"}' \ +-netdev user,id=3Dhostnet1 \ +-device '{"driver":"virtio-net-pci","netdev":"hostnet1","id":"net1","mac":= "52:54:00:a2:44:93","bus":"pci.1.0","addr":"0x1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-phb-simple.xml b/tests/qemuxml2= argvdata/pseries-phb-simple.xml index b1c6ff3006..ae9e78b95b 100644 --- a/tests/qemuxml2argvdata/pseries-phb-simple.xml +++ b/tests/qemuxml2argvdata/pseries-phb-simple.xml @@ -10,7 +10,16 @@ /usr/bin/qemu-system-ppc64 - + + + +
+ + + + +
+ diff --git a/tests/qemuxml2xmloutdata/pseries-phb-simple.ppc64-latest.xml b= /tests/qemuxml2xmloutdata/pseries-phb-simple.ppc64-latest.xml index 80231e3dd7..936db5df2b 100644 --- a/tests/qemuxml2xmloutdata/pseries-phb-simple.ppc64-latest.xml +++ b/tests/qemuxml2xmloutdata/pseries-phb-simple.ppc64-latest.xml @@ -25,11 +25,17 @@ - - - - + + + +
+ + + + +
+