From fcca6d6bf9cf95b7a2e910625e7996f95cc64bc2 Mon Sep 17 00:00:00 2001 From: Yingshun Cui Date: Mon, 6 Jan 2025 10:53:16 +0800 Subject: [PATCH] guest_os_booting: Fix a case error There is no particular order in which devices with no bootindex property set will be considered for booting. So it is possible to enter the disk system even without cdrom. Signed-off-by: Yingshun Cui --- .../guest_os_booting/boot_order/boot_from_cdrom_device.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt/tests/cfg/guest_os_booting/boot_order/boot_from_cdrom_device.cfg b/libvirt/tests/cfg/guest_os_booting/boot_order/boot_from_cdrom_device.cfg index 64edc39d91..ec07d8d039 100644 --- a/libvirt/tests/cfg/guest_os_booting/boot_order/boot_from_cdrom_device.cfg +++ b/libvirt/tests/cfg/guest_os_booting/boot_order/boot_from_cdrom_device.cfg @@ -7,12 +7,12 @@ - without_cdrom: only os_dev aarch64: - bootable_patterns = ["Shell>"] + bootable_patterns = ["Shell>", "Booting .* on physical CPU"] - with_cdrom_with_no_src: cdrom1_attrs = {'target': {'dev': 'sda', 'bus': 'sata'}, **${cdrom_attrs}} aarch64: cdrom1_attrs = {'target': {'dev': 'sda', 'bus': 'scsi'}, **${cdrom_attrs}} - bootable_patterns = ["Shell>"] + bootable_patterns = ["Shell>", "Booting .* on physical CPU"] - with_cdrom: check_bootable_iso = "yes" cdrom1_attrs = {'source': {'attrs': {'file': boot_img_path}}, 'target': {'dev': 'sda', 'bus': 'scsi'}, **${cdrom_attrs}}