From 6c5c9c73ef484a73f1df413d0562ba719d7800d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Kr=C3=B6ning?=
 <martin.kroening@eonerc.rwth-aachen.de>
Date: Thu, 6 Jun 2024 14:38:25 +0200
Subject: [PATCH] build(deps): update volatile to version 0.6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Martin Kröning <martin.kroening@eonerc.rwth-aachen.de>
---
 Cargo.lock             | 18 +++++++++---------
 Cargo.toml             |  6 +-----
 virtio-spec/Cargo.toml |  3 ++-
 virtio-spec/src/pci.rs |  3 ++-
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e036a90728..9748bc9e8c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -651,7 +651,7 @@ dependencies = [
  "trapframe",
  "uart_16550",
  "virtio-spec",
- "volatile 0.5.4",
+ "volatile 0.6.1",
  "x86",
  "x86_64 0.15.1",
  "zerocopy",
@@ -1538,7 +1538,8 @@ dependencies = [
  "bitflags 2.5.0",
  "endian-num",
  "num_enum",
- "volatile 0.5.4",
+ "volatile 0.6.1",
+ "volatile-macro",
  "zerocopy",
  "zerocopy-derive",
 ]
@@ -1551,16 +1552,15 @@ checksum = "442887c63f2c839b346c192d047a7c87e73d0689c9157b00b53dcc27dd5ea793"
 
 [[package]]
 name = "volatile"
-version = "0.5.4"
-source = "git+https://github.com/rust-osdev/volatile.git#ac3a01640f0d93283a9e8def75038bbea85164b6"
-dependencies = [
- "volatile-macro",
-]
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af8ca9a5d4debca0633e697c88269395493cebf2e10db21ca2dbde37c1356452"
 
 [[package]]
 name = "volatile-macro"
-version = "0.5.4"
-source = "git+https://github.com/rust-osdev/volatile.git#ac3a01640f0d93283a9e8def75038bbea85164b6"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65c67ce935f3b4329e473ecaff7bab444fcdc3d1d19f8bae61fabfa90b84f93e"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index 9e0310829a..1f8eabcedb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -104,7 +104,7 @@ smallvec = { version = "1", features = ["const_new"] }
 take-static = "0.1"
 talc = { version = "4" }
 time = { version = "0.3", default-features = false }
-volatile = { version = "0.5.4", features = ["unstable"] }
+volatile = { version = "0.6", features = ["unstable"] }
 zerocopy = { version = "0.7", features = ["derive"] }
 
 [dependencies.smoltcp]
@@ -167,7 +167,3 @@ members = [
 exclude = [
 	"hermit-builtins",
 ]
-
-[patch.crates-io]
-# We need https://github.com/rust-osdev/volatile/pull/61
-volatile = { git = "https://github.com/rust-osdev/volatile.git" }
diff --git a/virtio-spec/Cargo.toml b/virtio-spec/Cargo.toml
index fc1454983a..9496ff8eab 100644
--- a/virtio-spec/Cargo.toml
+++ b/virtio-spec/Cargo.toml
@@ -12,7 +12,8 @@ categories = ["no-std", "no-std::no-alloc"]
 bitflags = "2"
 endian-num = { version = "0.1", features = ["bitflags", "linux-types"] }
 num_enum = { version = "0.7", default-features = false }
-volatile = { version = "0.5.3", features = ["derive"] }
+volatile = "0.6"
+volatile-macro = "0.6"
 zerocopy = { version = "0.7", optional = true, default-features = false }
 zerocopy-derive = { version = "0.7", optional = true }
 
diff --git a/virtio-spec/src/pci.rs b/virtio-spec/src/pci.rs
index 245fca4fd1..0191b5bb91 100644
--- a/virtio-spec/src/pci.rs
+++ b/virtio-spec/src/pci.rs
@@ -2,7 +2,8 @@
 
 use num_enum::{FromPrimitive, IntoPrimitive};
 use volatile::access::{ReadOnly, ReadWrite, RestrictAccess};
-use volatile::{VolatileFieldAccess, VolatilePtr};
+use volatile::VolatilePtr;
+use volatile_macro::VolatileFieldAccess;
 
 use crate::volatile::WideVolatilePtr;
 use crate::{le16, le32, DeviceStatus};