From c2eb6d70891d9be5ce13f07946841239a81c3ed9 Mon Sep 17 00:00:00 2001 Message-ID: From: Peter Krempa Date: Mon, 16 Feb 2026 15:08:54 +0100 Subject: [PATCH] RHEL-ONLY: backport test data for 'migrate-pr' capability of 'scsi-block' In upstream qemu the capability is present starting with qemu-11.0. We don't have the test data downstream and backporting them would be too invasive. Backport the relevant capability detection as a downstream-only fix. https://issues.redhat.com/browse/RHEL-140614 [rhel-9.8] https://issues.redhat.com/browse/RHEL-135115 [rhel-10.2] Signed-off-by: Peter Krempa --- .../caps_10.2.0_x86_64.replies | 79 ++++++++++++++++++- .../caps_10.2.0_x86_64.xml | 1 + 2 files changed, 76 insertions(+), 4 deletions(-) diff --git a/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.replies index cb4abb4533..10db9baca1 100644 --- a/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.replies @@ -33081,10 +33081,81 @@ } { - "error": { - "class": "DeviceNotFound", - "desc": "The libvirt device dump was not collected for this version+device tuple" - }, + "return": [ + { + "default-value": 4294967295, + "name": "scsi-id", + "type": "uint32" + }, + { + "default-value": 4294967295, + "name": "lun", + "type": "uint32" + }, + { + "default-value": 0, + "name": "channel", + "type": "uint32" + }, + { + "default-value": "auto", + "name": "rerror", + "description": "Error handling policy (report/ignore/enospc/stop/auto)", + "type": "BlockdevOnError" + }, + { + "default-value": 2147483647, + "name": "max_io_size", + "type": "uint64" + }, + { + "default-value": false, + "name": "share-rw", + "description": "on/off", + "type": "bool" + }, + { + "default-value": true, + "name": "migrate-pr", + "description": "on/off", + "type": "bool" + }, + { + "default-value": "auto", + "name": "werror", + "description": "Error handling policy (report/ignore/enospc/stop/auto)", + "type": "BlockdevOnError" + }, + { + "default-value": 1073741824, + "name": "max_unmap_size", + "type": "uint64" + }, + { + "default-value": -1, + "name": "scsi_version", + "type": "int32" + }, + { + "default-value": 0, + "name": "rotation_rate", + "type": "uint16" + }, + { + "name": "drive", + "description": "Node name or ID of a block device to use as a backend", + "type": "str" + }, + { + "default-value": 30, + "name": "io_timeout", + "type": "uint32" + }, + { + "name": "bootindex", + "type": "int32" + } + ], "id": "libvirt-37" } diff --git a/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.xml index 7cff2c2291..7d5a75ce88 100644 --- a/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.xml @@ -215,6 +215,7 @@ + 10001091 43100287 v10.2.0-rc1-38-gfb241d0a1f -- 2.53.0