From 2f28470e62034f1a35adb9c8fc59b6b60a895468 Mon Sep 17 00:00:00 2001 From: novafacing Date: Mon, 11 Mar 2024 09:18:45 -0700 Subject: [PATCH 1/2] Bump version to 8.2.2 --- Cargo.toml | 8 ++++---- README.md | 4 ++-- qemu-plugin/Cargo.toml | 2 +- qemu-plugin/README.md | 4 ++-- qemu-plugin/src/lib.rs | 2 +- qemu/README.md | 8 ++++---- qemu/build.rs | 2 +- qemu/src/lib.rs | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index edd3c26..a0ead70 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ license = "GPL-2.0-only" publish = true readme = "README.md" repository = "https://github.com/novafacing/qemu-rs" -version = "8.2.0-v1" +version = "8.2.2-v0" [workspace] resolver = "2" @@ -23,6 +23,6 @@ members = [ default-members = ["qemu-plugin", "qemu-plugin-sys"] [workspace.dependencies] -qemu-plugin-sys = { version = "8.2.0-v1", path = "qemu-plugin-sys" } -qemu-plugin = { version = "8.2.0-v1", path = "qemu-plugin" } -qemu = { version = "8.2.0-v1", path = "qemu" } +qemu-plugin-sys = { version = "8.2.2-v0", path = "qemu-plugin-sys" } +qemu-plugin = { version = "8.2.2-v0", path = "qemu-plugin" } +qemu = { version = "8.2.2-v0", path = "qemu" } diff --git a/README.md b/README.md index 4beb7f2..1e6c5da 100644 --- a/README.md +++ b/README.md @@ -31,10 +31,10 @@ installs Rust wrappers for QEMU as binaries. You can install QEMU with (add any additional features you need, e.g. `plugins`): ```sh -cargo install qemu@8.2.0-v1 --features=binaries +cargo install qemu@8.2.2-v0 --features=binaries ``` On some systems, particularly BTRFS systems, `/tmp` may not be large enough for the temporary build directory (QEMU is quite large to build). In this case, create a directory on your root filesystem (e.g. `$HOME/.cargo/tmp`) and set -`CARGO_TARGET_DIR=$HOME/.cargo/tmp` when running the install command. \ No newline at end of file +`CARGO_TARGET_DIR=$HOME/.cargo/tmp` when running the install command. diff --git a/qemu-plugin/Cargo.toml b/qemu-plugin/Cargo.toml index b43d098..f30c1c8 100644 --- a/qemu-plugin/Cargo.toml +++ b/qemu-plugin/Cargo.toml @@ -14,7 +14,7 @@ version.workspace = true [dependencies] anyhow = "1.0.75" once_cell = "1.19.0" -qemu-plugin-sys = { version = "8.2.0-v1", workspace = true } +qemu-plugin-sys = { version = "8.2.2-v0", workspace = true } thiserror = "1.0.51" [target.'cfg(windows)'.dependencies.windows] diff --git a/qemu-plugin/README.md b/qemu-plugin/README.md index 94d1470..e49d771 100644 --- a/qemu-plugin/README.md +++ b/qemu-plugin/README.md @@ -65,8 +65,8 @@ edition = "2021" crate-type = ["cdylib"] [dependencies] -qemu-plugin = "8.2.0-v1" +qemu-plugin = "8.2.2-v0" anyhow = "1.0.75" ffi = "0.1.0" ctor = "0.2.6" -``` \ No newline at end of file +``` diff --git a/qemu-plugin/src/lib.rs b/qemu-plugin/src/lib.rs index b20d8d4..13c3834 100644 --- a/qemu-plugin/src/lib.rs +++ b/qemu-plugin/src/lib.rs @@ -64,7 +64,7 @@ //! crate-type = ["cdylib"] //! //! [dependencies] -//! qemu-plugin = "8.2.0-v1" +//! qemu-plugin = "8.2.2-v0" //! anyhow = "1.0.75" //! ffi = "0.1.0" //! ctor = "0.2.6" diff --git a/qemu/README.md b/qemu/README.md index 4a1b313..c8c880e 100644 --- a/qemu/README.md +++ b/qemu/README.md @@ -78,7 +78,7 @@ license = "MIT" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] memfd-exec = "2.1.0" -qemu = { version = "8.2.0", features = ["qemu-aarch64"] } +qemu = { version = "8.2.2", features = ["qemu-aarch64"] } ``` ```rust @@ -115,7 +115,7 @@ to configure this crate as a dependency: This will make the `qemu-x86_64` binary available. ```toml -qemu = { version = "8.2.0", features = ["qemu-x86_64"] } +qemu = { version = "8.2.2", features = ["qemu-x86_64"] } ``` ### Install an optimized qemu-x86_64 usermode emulator @@ -124,7 +124,7 @@ This will also make the `qemu-x86_64` binary available, but will strip and optim with `lto`. ```toml -qemu = { version = "8.2.0", features = ["qemu-x86_64", "lto", "strip"] +qemu = { version = "8.2.2", features = ["qemu-x86_64", "lto", "strip"] ``` ### Install qemu-system-arm emulator with customized options @@ -136,4 +136,4 @@ about configure options for more details. ## Contributing -Contributions are welcome for any reason! \ No newline at end of file +Contributions are welcome for any reason! diff --git a/qemu/build.rs b/qemu/build.rs index 695957d..3bba494 100644 --- a/qemu/build.rs +++ b/qemu/build.rs @@ -14,7 +14,7 @@ use tar::Archive; use xz2::read::XzDecoder; const QEMU_SRC_URL_BASE: &str = "https://download.qemu.org/"; -const QEMU_VERSION: &str = "8.2.0"; +const QEMU_VERSION: &str = "8.2.2"; pub struct ConfigureArgs(Vec); diff --git a/qemu/src/lib.rs b/qemu/src/lib.rs index 4efffbd..c81df7d 100644 --- a/qemu/src/lib.rs +++ b/qemu/src/lib.rs @@ -23,7 +23,7 @@ //! //! To install with binaries, `cargo install qemu --features=binaries,plugins,lto` -pub const QEMU_VERSION: &str = "8.2.0"; +pub const QEMU_VERSION: &str = "8.2.2"; #[cfg(all(feature = "aarch64-linux-user", not(docs_rs)))] /// QEMU binary for qemu-aarch64 From 178ea421fb7da7ce51758ed8e9620cd28077b26d Mon Sep 17 00:00:00 2001 From: novafacing Date: Mon, 11 Mar 2024 09:52:46 -0700 Subject: [PATCH 2/2] Update to 8.2.2 --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 75eaa00..bc5e78e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,8 +10,8 @@ RUN apt-get -y update && \ COPY . /qemu-rs -WORKDIR /qemu-rs +WORKDIR /qemu-rs/plugins/tracer -RUN cargo build -r && \ - cargo run -r --bin tracer -- -a /bin/ls -- -lah +RUN cargo build -r || exit 0 +RUN cargo build -r