From f8327faa33c3414f15b3e6d3d5220f48a1442df8 Mon Sep 17 00:00:00 2001
From: Anatol Belski <anbelski@linux.microsoft.com>
Date: Sun, 26 Apr 2026 22:02:15 +0200
Subject: [PATCH] block: Remove raw_disk compat alias

Update external consumers and internal test modules to use
formats::raw instead of the raw_disk alias, then remove the
re-export from lib.rs.

Signed-off-by: Anatol Belski <anbelski@linux.microsoft.com>
---
 block/src/formats/raw/worker/async_aio.rs    | 2 +-
 block/src/formats/raw/worker/sync.rs         | 2 +-
 block/src/lib.rs                             | 1 -
 fuzz/fuzz_targets/block.rs                   | 2 +-
 performance-metrics/src/micro_bench_block.rs | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/block/src/formats/raw/worker/async_aio.rs b/block/src/formats/raw/worker/async_aio.rs
index 1e1f5d105..726a71c76 100644
--- a/block/src/formats/raw/worker/async_aio.rs
+++ b/block/src/formats/raw/worker/async_aio.rs
@@ -107,7 +107,7 @@ mod unit_tests {
     use vmm_sys_util::tempfile::TempFile;
 
     use super::*;
-    use crate::raw_disk::worker::tests;
+    use crate::formats::raw::worker::tests;
 
     #[test]
     fn test_punch_hole() {
diff --git a/block/src/formats/raw/worker/sync.rs b/block/src/formats/raw/worker/sync.rs
index 89276744c..858fb3855 100644
--- a/block/src/formats/raw/worker/sync.rs
+++ b/block/src/formats/raw/worker/sync.rs
@@ -135,7 +135,7 @@ mod unit_tests {
     use vmm_sys_util::tempfile::TempFile;
 
     use super::*;
-    use crate::raw_disk::worker::tests;
+    use crate::formats::raw::worker::tests;
 
     #[test]
     fn test_punch_hole() {
diff --git a/block/src/lib.rs b/block/src/lib.rs
index 891c1329c..f02ab2b0a 100644
--- a/block/src/lib.rs
+++ b/block/src/lib.rs
@@ -28,7 +28,6 @@ use std::str::FromStr;
 use std::{cmp, mem, result};
 
 pub use formats::qcow::internal as qcow;
-pub use formats::raw as raw_disk;
 pub use formats::vhdx::internal as vhdx;
 #[cfg(feature = "io_uring")]
 use io_uring::{IoUring, Probe, opcode};
diff --git a/fuzz/fuzz_targets/block.rs b/fuzz/fuzz_targets/block.rs
index 0d131b935..9a2cde671 100644
--- a/fuzz/fuzz_targets/block.rs
+++ b/fuzz/fuzz_targets/block.rs
@@ -16,7 +16,7 @@ use std::sync::Arc;
 use std::{ffi, io};
 
 use block::fcntl::LockGranularityChoice;
-use block::raw_disk::{RawBackend, RawDisk};
+use block::formats::raw::{RawBackend, RawDisk};
 use libfuzzer_sys::{fuzz_target, Corpus};
 use seccompiler::SeccompAction;
 use virtio_devices::{Block, VirtioDevice, VirtioInterrupt, VirtioInterruptType};
diff --git a/performance-metrics/src/micro_bench_block.rs b/performance-metrics/src/micro_bench_block.rs
index c217f3c08..9d13b2def 100644
--- a/performance-metrics/src/micro_bench_block.rs
+++ b/performance-metrics/src/micro_bench_block.rs
@@ -13,7 +13,7 @@ use std::time::Instant;
 
 use block::async_io::AsyncIoOperation;
 use block::disk_file::AsyncDiskFile;
-use block::raw_disk::{RawBackend, RawDisk};
+use block::formats::raw::{RawBackend, RawDisk};
 
 use crate::PerformanceTestControl;
 use crate::util::{