From 04fb28ca0613ca5804899f82a8762c92e5a52342 Mon Sep 17 00:00:00 2001 From: Patrick Roy Date: Thu, 27 Apr 2023 18:41:48 +0000 Subject: [PATCH 1/5] Enable dependabot for rust dependency updates Also increases the frequency for rust-vmm-ci submodules updates to once a week, and limits the number of simultaneous PRs for it to one. This brings the configuration in-line with vm-allocator and vm-memory. Signed-off-by: Patrick Roy --- .github/dependabot.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 97b20206..25e5a36a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -3,5 +3,11 @@ updates: - package-ecosystem: gitsubmodule directory: "/" schedule: - interval: monthly + interval: weekly + open-pull-requests-limit: 1 +- package-ecosystem: cargo + directory: "/" + schedule: + interval: weekly open-pull-requests-limit: 10 + rebase-strategy: "disabled" From 40c57f16b1642ea83bba6442ce4f1ff07a5037f8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 May 2023 13:06:14 +0000 Subject: [PATCH 2/5] build(deps): update vm-memory requirement from 0.10.0 to 0.11.0 Updates the requirements on [vm-memory](https://github.com/rust-vmm/vm-memory) to permit the latest version. - [Release notes](https://github.com/rust-vmm/vm-memory/releases) - [Changelog](https://github.com/rust-vmm/vm-memory/blob/main/CHANGELOG.md) - [Commits](https://github.com/rust-vmm/vm-memory/compare/v0.10.0...v0.11.0) --- updated-dependencies: - dependency-name: vm-memory dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 8d0540f8..8ffc07ab 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,11 +22,11 @@ elf = [] pe = [] [dependencies] -vm-memory = "0.10.0" +vm-memory = "0.11.0" [dev-dependencies] criterion = "0.3.5" -vm-memory = { version = "0.10.0", features = ["backend-mmap"] } +vm-memory = { version = "0.11.0", features = ["backend-mmap"] } [[bench]] name = "main" From 004366d401df6f1e2a1281791daf2ba4b7fb9778 Mon Sep 17 00:00:00 2001 From: Patrick Roy Date: Tue, 2 May 2023 14:57:50 +0000 Subject: [PATCH 3/5] Prepare Release 0.9.0 Requires so that downstream crates can consume the vm-memory update. Signed-off-by: Patrick Roy --- CHANGELOG.md | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 979b3106..74cc48f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# [Upcoming Release] +# [v0.9.0] ## Fixed - [[#71]](https://github.com/rust-vmm/linux-loader/issues/71) Fix incorrect diff --git a/Cargo.toml b/Cargo.toml index 8ffc07ab..8919e4fc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "linux-loader" -version = "0.8.1" +version = "0.9.0" authors = [ "The rust-vmm maintainers", "rust-vmm AWS maintainers ", From c2880b0e14357cee758f84e43c99c136d427ff67 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 May 2023 20:56:41 +0000 Subject: [PATCH 4/5] build(deps): bump rust-vmm-ci from `c2f8c93` to `8627b37` Bumps [rust-vmm-ci](https://github.com/rust-vmm/rust-vmm-ci) from `c2f8c93` to `8627b37`. - [Release notes](https://github.com/rust-vmm/rust-vmm-ci/releases) - [Commits](https://github.com/rust-vmm/rust-vmm-ci/compare/c2f8c93e3796d8b3ea7dc339fad211457be9c238...8627b3766b2bedde4657c7e9ddfc6f95a20e6942) --- updated-dependencies: - dependency-name: rust-vmm-ci dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- rust-vmm-ci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-vmm-ci b/rust-vmm-ci index c2f8c93e..8627b376 160000 --- a/rust-vmm-ci +++ b/rust-vmm-ci @@ -1 +1 @@ -Subproject commit c2f8c93e3796d8b3ea7dc339fad211457be9c238 +Subproject commit 8627b3766b2bedde4657c7e9ddfc6f95a20e6942 From eac7ec4ea15356c8b353a48460d625d56a8484de Mon Sep 17 00:00:00 2001 From: Patrick Roy Date: Tue, 2 May 2023 14:50:59 +0000 Subject: [PATCH 5/5] Fix lints introduced in 1.68.2 - `Default` implementations for enums can now be derived in more cases. Signed-off-by: Patrick Roy --- src/loader/x86_64/elf/mod.rs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/loader/x86_64/elf/mod.rs b/src/loader/x86_64/elf/mod.rs index 7f750a4c..51c2c8df 100644 --- a/src/loader/x86_64/elf/mod.rs +++ b/src/loader/x86_64/elf/mod.rs @@ -104,7 +104,7 @@ impl fmt::Display for Error { impl std::error::Error for Error {} -#[derive(Clone, Copy, Debug, PartialEq, Eq)] +#[derive(Clone, Default, Copy, Debug, PartialEq, Eq)] /// Availability of PVH entry point in the kernel, which allows the VMM /// to use the PVH boot protocol to start guests. pub enum PvhBootCapability { @@ -113,15 +113,10 @@ pub enum PvhBootCapability { /// PVH entry point is not present PvhEntryNotPresent, /// PVH entry point is ignored, even if available + #[default] PvhEntryIgnored, } -impl Default for PvhBootCapability { - fn default() -> Self { - PvhBootCapability::PvhEntryIgnored - } -} - impl fmt::Display for PvhBootCapability { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { use self::PvhBootCapability::*;