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

Re-export Vhdx from formats::vhdx and update the fuzz target to
use block::formats::vhdx::Vhdx. Remove the vhdx compat alias
from lib.rs.

Signed-off-by: Anatol Belski <anbelski@linux.microsoft.com>
---
 block/src/formats/vhdx/mod.rs | 3 +--
 block/src/lib.rs              | 1 -
 fuzz/fuzz_targets/vhdx.rs     | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/block/src/formats/vhdx/mod.rs b/block/src/formats/vhdx/mod.rs
index d1be62c7a..fbf0e6e76 100644
--- a/block/src/formats/vhdx/mod.rs
+++ b/block/src/formats/vhdx/mod.rs
@@ -16,9 +16,8 @@ use std::fs::File;
 use std::os::fd::AsRawFd;
 use std::sync::{Arc, Mutex};
 
-pub use internal::VhdxError;
+pub use internal::{Vhdx, VhdxError};
 
-use self::internal::Vhdx;
 use self::worker::sync::VhdxSync;
 use crate::async_io::{AsyncIo, BorrowedDiskFd, DiskFileError};
 use crate::error::{BlockError, BlockErrorKind, BlockResult, ErrorOp};
diff --git a/block/src/lib.rs b/block/src/lib.rs
index 986d5e509..d75f4bf0b 100644
--- a/block/src/lib.rs
+++ b/block/src/lib.rs
@@ -28,7 +28,6 @@ use std::str::FromStr;
 use std::{cmp, mem, result};
 
 use formats::qcow::internal as qcow;
-pub use formats::vhdx::internal as vhdx;
 #[cfg(feature = "io_uring")]
 use io_uring::{IoUring, Probe, opcode};
 use libc::{
diff --git a/fuzz/fuzz_targets/vhdx.rs b/fuzz/fuzz_targets/vhdx.rs
index 812cf8411..96caf7eca 100644
--- a/fuzz/fuzz_targets/vhdx.rs
+++ b/fuzz/fuzz_targets/vhdx.rs
@@ -8,7 +8,7 @@ use std::fs::File;
 use std::io::{self, Read, Seek, SeekFrom, Write};
 use std::os::unix::io::{FromRawFd, RawFd};
 
-use block::vhdx::Vhdx;
+use block::formats::vhdx::Vhdx;
 use libfuzzer_sys::{fuzz_target, Corpus};
 
 // Populate the corpus directory with a test file: