From c472b5db54ec0eef5292abfb69fa85df8eae84b4 Mon Sep 17 00:00:00 2001 From: Alex Lyn Date: Sun, 4 Jan 2026 15:20:19 +0800 Subject: [PATCH] runtime-rs: Bump qapi-rs from 0.14 to 0.15 The detailed information about the updated versions as below: ``` qapi = { version = "0.15", features = ["qmp", "async-tokio-all"] } qapi-spec = "0.3.2" qapi-qmp = "0.15.0" ``` and it will correct some corresonding structures. Signed-off-by: Alex Lyn --- Cargo.lock | 8 ++++---- src/runtime-rs/crates/hypervisor/Cargo.toml | 6 +++--- src/runtime-rs/crates/hypervisor/src/qemu/qmp.rs | 11 ++++++----- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b0d45e75e0..869007c4f4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3621,9 +3621,9 @@ dependencies = [ [[package]] name = "qapi" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6412bdd014ebee03ddbbe79ac03a0b622cce4d80ba45254f6357c847f06fa38" +checksum = "7b047adab56acc4948d4b9b58693c1f33fd13efef2d6bb5f0f66a47436ceada8" dependencies = [ "bytes", "futures 0.3.28", @@ -3658,9 +3658,9 @@ dependencies = [ [[package]] name = "qapi-qmp" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8b944db7e544d2fa97595e9a000a6ba5c62c426fa185e7e00aabe4b5640b538" +checksum = "45303cac879d89361cad0287ae15f9ae1e7799b904b474152414aeece39b9875" dependencies = [ "qapi-codegen", "qapi-spec", diff --git a/src/runtime-rs/crates/hypervisor/Cargo.toml b/src/runtime-rs/crates/hypervisor/Cargo.toml index 38bfcf8a35..0a87fd654a 100644 --- a/src/runtime-rs/crates/hypervisor/Cargo.toml +++ b/src/runtime-rs/crates/hypervisor/Cargo.toml @@ -33,9 +33,9 @@ oci-spec = { workspace = true } futures = "0.3.25" safe-path = "0.1.0" crossbeam-channel = "0.5.6" -qapi = { version = "0.14", features = ["qmp", "async-tokio-all"] } -qapi-spec = "0.3.1" -qapi-qmp = "0.14.0" +qapi = { version = "0.15", features = ["qmp", "async-tokio-all"] } +qapi-spec = "0.3.2" +qapi-qmp = "0.15.0" hyperlocal = { workspace = true } hyper = { workspace = true, features = ["client"] } diff --git a/src/runtime-rs/crates/hypervisor/src/qemu/qmp.rs b/src/runtime-rs/crates/hypervisor/src/qemu/qmp.rs index b633a0a270..9236c0bcd8 100644 --- a/src/runtime-rs/crates/hypervisor/src/qemu/qmp.rs +++ b/src/runtime-rs/crates/hypervisor/src/qemu/qmp.rs @@ -98,11 +98,10 @@ impl Qmp { pub fn execute_migration(&mut self, uri: &str) -> Result<()> { self.qmp .execute(&migrate { + channels: None, detach: None, resume: None, - blk: None, - inc: None, - uri: uri.to_string(), + uri: Some(uri.to_string()), }) .map(|_| ()) .context("execute migration") @@ -111,7 +110,9 @@ impl Qmp { pub fn execute_migration_incoming(&mut self, uri: &str) -> Result<()> { self.qmp .execute(&migrate_incoming { - uri: uri.to_string(), + channels: None, + exit_on_error: None, + uri: Some(uri.to_string()), }) .map(|_| ()) .context("execute migration incoming") @@ -270,6 +271,7 @@ impl Qmp { pmem: None, readonly: None, mem_path: "/dev/shm".to_owned(), + rom: None, }, }); self.qmp.execute(&memory_backend)?; @@ -834,7 +836,6 @@ impl Qmp { | qmp::CpuInfoFast::mips64(cpu_info) | qmp::CpuInfoFast::mips64el(cpu_info) | qmp::CpuInfoFast::mipsel(cpu_info) - | qmp::CpuInfoFast::nios2(cpu_info) | qmp::CpuInfoFast::or1k(cpu_info) | qmp::CpuInfoFast::ppc(cpu_info) | qmp::CpuInfoFast::ppc64(cpu_info)