From e683a7fd37cf436e1717a0aa60ac28c5e883d5c5 Mon Sep 17 00:00:00 2001 From: "alex.lyn" Date: Wed, 23 Jul 2025 17:51:09 +0800 Subject: [PATCH] runtime-rs: Change the device_id with block device index As block device index is an very important unique id of a block device and can indicate a block device which is equivalent to device_id. In case of index is required in calculating scsi LUN and reduce useless arguments within reusing `hotplug_block_device`, we'd better change the device_id with block device index. Signed-off-by: alex.lyn --- src/runtime-rs/crates/hypervisor/src/qemu/inner.rs | 2 +- src/runtime-rs/crates/hypervisor/src/qemu/qmp.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/runtime-rs/crates/hypervisor/src/qemu/inner.rs b/src/runtime-rs/crates/hypervisor/src/qemu/inner.rs index 3855dccc07..15746d2f06 100644 --- a/src/runtime-rs/crates/hypervisor/src/qemu/inner.rs +++ b/src/runtime-rs/crates/hypervisor/src/qemu/inner.rs @@ -635,7 +635,7 @@ impl QemuInner { block_device.config.pci_path = qmp .hotplug_block_device( &self.config.blockdev_info.block_device_driver, - &block_device.device_id, + block_device.config.index, &block_device.config.path_on_host, &block_device.config.blkdev_aio.to_string(), block_device.config.is_direct, diff --git a/src/runtime-rs/crates/hypervisor/src/qemu/qmp.rs b/src/runtime-rs/crates/hypervisor/src/qemu/qmp.rs index dfd173c3b5..aad90fa68d 100644 --- a/src/runtime-rs/crates/hypervisor/src/qemu/qmp.rs +++ b/src/runtime-rs/crates/hypervisor/src/qemu/qmp.rs @@ -519,7 +519,7 @@ impl Qmp { pub fn hotplug_block_device( &mut self, block_driver: &str, - device_id: &str, + device_id: u64, path_on_host: &str, blkdev_aio: &str, is_direct: Option,