Re: [PATCH] rust: Update Cargo.lock

Re: [PATCH] rust: Update Cargo.lock

[Paolo Bonzini]

Queued, thanks.

Paolo

[PATCH] rust: Update Cargo.lock

[Zhao Liu]

`cargo +nightly build` updates Cargo.lock file.

Reported-by: Philippe Mathieu-Daudé <philmd@linaro.org> 
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
 rust/Cargo.lock | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index 42ae857fe533..78452c3db9b4 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "anyhow"
@@ -233,6 +233,8 @@ dependencies = [
 [[package]]
 name = "probe"
 version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "136558b6e1ebaecc92755d0ffaf9421f519531bed30cc2ad23b22cb00965cc5e"
 
 [[package]]
 name = "proc-macro-error"
@@ -392,7 +394,6 @@ dependencies = [
  "migration",
  "qom",
  "system",
- "trace",
  "util",
 ]
 
-- 
2.34.1

[PATCH] rust: Update Cargo.lock

[Philippe Mathieu-Daudé]

Update Cargo.lock on top of commit  7ecd3f71079 ("Merge tag
'for-upstream' of https://gitlab.com/bonzini/qemu into staging").

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 rust/Cargo.lock | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index 801ac5f4f51..cbb3ca15f77 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -172,7 +172,6 @@ dependencies = [
  "migration",
  "qemu_macros",
  "qom",
- "system",
  "util",
 ]
 
@@ -351,7 +350,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0dca6411025b24b60bfa7ec1fe1f8e710ac09782dca409ee8237ba74b51295fd"
 dependencies = [
  "serde_core",
- "serde_derive",
 ]
 
 [[package]]
@@ -407,6 +405,7 @@ dependencies = [
  "bql",
  "common",
  "glib-sys",
+ "hwcore",
  "migration",
  "qom",
  "system-sys",
-- 
2.53.0

Re: [PATCH] rust: Update Cargo.lock

[Zhao Liu]

On Mon, Mar 09, 2026 at 06:24:40PM +0100, Philippe Mathieu-Daudé wrote:
> Date: Mon,  9 Mar 2026 18:24:40 +0100
> From: Philippe Mathieu-Daudé <philmd@linaro.org>
> Subject: [PATCH] rust: Update Cargo.lock
> X-Mailer: git-send-email 2.53.0
> 
> Update Cargo.lock on top of commit  7ecd3f71079 ("Merge tag
> 'for-upstream' of https://gitlab.com/bonzini/qemu into staging").
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>  rust/Cargo.lock | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)

When I ran `cargo +nightly build`, I met this error:

$ cargo +nightly build
   Compiling system-sys v0.1.0 (/media/liuzhao/data/qemu-cook/rust/bindings/system-sys)
error[E0432]: unresolved import `hwcore_sys`
  --> bindings/system-sys/lib.rs:22:5
   |
22 | use hwcore_sys::{qemu_irq, DeviceClass, DeviceState};
   |     ^^^^^^^^^^ use of unresolved module or unlinked crate `hwcore_sys`
   |
   = help: if you wanted to use a crate named `hwcore_sys`, use `cargo add hwcore_sys` to add it to your `Cargo.toml`

For more information about this error, try `rustc --explain E0432`.
error: could not compile `system-sys` (lib) due to 1 previous error

This is because of the wrong dependency relationship in Cargo.toml of
hwcore-sys & system-sys.

But the fix for this error will bring a little more change in
Cargo.lock (since the dependencies will change).

What about fixing this build bug first before updating Cargo.lock?

(That's a fix for build error I met.)
-------------------------------->8-------------------------------
From cc96c5530f5fe75eb0a422b092dbb761547e7514 Mon Sep 17 00:00:00 2001
From: Zhao Liu <zhao1.liu@intel.com>
Date: Wed, 11 Mar 2026 17:00:51 +0800
Subject: [PATCH] rust: Fix wrong dependencies for cargo

There's a build error:

$ cargo +nightly build
   Compiling system-sys v0.1.0 (/media/liuzhao/data/qemu-cook/rust/bindings/system-sys)
error[E0432]: unresolved import `hwcore_sys`
  --> bindings/system-sys/lib.rs:22:5
   |
22 | use hwcore_sys::{qemu_irq, DeviceClass, DeviceState};
   |     ^^^^^^^^^^ use of unresolved module or unlinked crate `hwcore_sys`
   |
   = help: if you wanted to use a crate named `hwcore_sys`, use `cargo add hwcore_sys` to add it to your `Cargo.toml`

For more information about this error, try `rustc --explain E0432`.
error: could not compile `system-sys` (lib) due to 1 previous error

This is because hwcore-sys & system-sys have the wrong dependencies
relationship in their Cargo.toml.

Fix the dependencies of hwcore-sys & system-sys in Cargo.toml, aligning
the dependencies described in their meson.build files.

Fixes: commit c899071b5a86 ("rust: move binding generation to bindings/")
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
 rust/bindings/hwcore-sys/Cargo.toml | 1 -
 rust/bindings/system-sys/Cargo.toml | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust/bindings/hwcore-sys/Cargo.toml b/rust/bindings/hwcore-sys/Cargo.toml
index c20024e921a1..b5ae33da8ed6 100644
--- a/rust/bindings/hwcore-sys/Cargo.toml
+++ b/rust/bindings/hwcore-sys/Cargo.toml
@@ -21,7 +21,6 @@ chardev-sys = { path = "../chardev-sys" }
 qom-sys = { path = "../qom-sys" }
 migration-sys = { path = "../migration-sys" }
 util-sys = { path = "../util-sys" }
-system-sys = { path = "../system-sys" }

 [lints]
 workspace = true
diff --git a/rust/bindings/system-sys/Cargo.toml b/rust/bindings/system-sys/Cargo.toml
index 7e527130ff5d..bbb4eaa53db3 100644
--- a/rust/bindings/system-sys/Cargo.toml
+++ b/rust/bindings/system-sys/Cargo.toml
@@ -17,6 +17,7 @@ path = "lib.rs"
 [dependencies]
 glib-sys = { workspace = true }
 common = { path = "../../common" }
+hwcore-sys = { path = "../hwcore-sys" }
 migration-sys = { path = "../migration-sys" }
 util-sys = { path = "../util-sys" }
 qom-sys = { path = "../qom-sys" }
--
2.34.1

Re: [PATCH] rust: Update Cargo.lock

[Paolo Bonzini]

Queued, thanks.

Paolo