From 693f65e183cc578eed213b1ea5dc11e9c2697f15 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Fri, 22 Nov 2024 23:40:42 +0100 Subject: [PATCH 2/7] tests/avocado/hotplug_blk: Fix addr in device_add command RH-Author: Stefan Hajnoczi RH-MergeRequest: 312: qdev-monitor: avoid QemuOpts in QMP device_add RH-Jira: RHEL-43412 RH-Acked-by: Kevin Wolf RH-Acked-by: Hanna Czenczek RH-Commit: [2/4] 7e2d360d3bb8e606d868c17d6032f9fb8ee15814 (stefanha/centos-stream-qemu-kvm) pci_devfn properties accept both integer and string values, but integer 1 and string '1' have different meanings: The integer value means device 0, function 1 whereas the string value '1' is short for '1.0' and means device 1, function 0. This test wants the string version so that the device actually becomes visible for the guest. device_add hides the problem because it goes through QemuOpts, which turns all properties into strings - this is a QEMU bug that we want to fix, but that cancelled out the bug in this test. Fix the test first so that device_add can be fixed afterwards. Signed-off-by: Kevin Wolf Message-ID: <20241122224042.149258-1-kwolf@redhat.com> Reviewed-by: Markus Armbruster Signed-off-by: Kevin Wolf (cherry picked from commit 770de685353e8c495ad4773fbd4bc0db997e4dfd) Signed-off-by: Stefan Hajnoczi --- tests/avocado/hotplug_blk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/avocado/hotplug_blk.py b/tests/avocado/hotplug_blk.py index d55ded1c1d..b36bca02ec 100644 --- a/tests/avocado/hotplug_blk.py +++ b/tests/avocado/hotplug_blk.py @@ -33,7 +33,7 @@ def plug(self) -> None: 'drive': 'disk', 'id': 'virtio-disk0', 'bus': 'pci.1', - 'addr': 1 + 'addr': '1', } self.assert_no_vda() -- 2.39.3