block: Remove qcow compat alias

Update external consumers to use formats::qcow::internal instead
of the top level qcow alias. Keep a crate private use for the
QcowError variant in lib.rs.

Signed-off-by: Anatol Belski <anbelski@linux.microsoft.com>

block/src/formats/qcow/internal/mod.rs

@@ -664,7 +664,7 @@ pub(crate) fn parse_qcow(
 /// # Example
 ///
 /// ```
-/// # use block::qcow::{self, QcowFile, RawFile};
+/// # use block::formats::qcow::internal::{QcowFile, RawFile};
 /// # use std::io::{Read, Seek, SeekFrom};
 /// # fn test(file: std::fs::File) -> std::io::Result<()> {
 ///     let mut raw_img = RawFile::new(file, false);

block/src/lib.rs

@@ -27,7 +27,7 @@ use std::path::Path;
 use std::str::FromStr;
 use std::{cmp, mem, result};
 
-pub use formats::qcow::internal as qcow;
+use formats::qcow::internal as qcow;
 pub use formats::vhdx::internal as vhdx;
 #[cfg(feature = "io_uring")]
 use io_uring::{IoUring, Probe, opcode};

cloud-hypervisor/tests/common/utils.rs

@@ -14,6 +14,7 @@ use std::sync::mpsc::Receiver;
 use std::time::{Duration, Instant};
 use std::{cmp, fs, io, thread};
 
+use block::formats::qcow::internal::ImageType as QcowImageType;
 use test_infra::*;
 use vmm_sys_util::tempdir::TempDir;
 #[cfg(not(feature = "mshv"))]
@@ -947,7 +948,7 @@ pub(crate) fn disk_check_consistency(
     }
 
     if let Some((backing_path, format, initial_checksum)) = initial_backing_checksum {
-        if format.parse::<block::qcow::ImageType>().ok() != Some(block::qcow::ImageType::Raw) {
+        if format.parse::<QcowImageType>().ok() != Some(QcowImageType::Raw) {
             let output = run_qemu_img(&backing_path, &["check"], None);
 
             assert!(

fuzz/fuzz_targets/qcow.rs

@@ -11,7 +11,7 @@ use std::io::{self, Cursor, Read, Seek, SeekFrom, Write};
 use std::mem::size_of;
 use std::os::unix::io::{FromRawFd, RawFd};
 
-use block::qcow::{QcowFile, RawFile};
+use block::formats::qcow::internal::{QcowFile, RawFile};
 use libfuzzer_sys::{fuzz_target, Corpus};
 
 // Take the first 64 bits of data as an address and the next 64 bits as data to

performance-metrics/src/util.rs

@@ -16,7 +16,7 @@ use std::time::Duration;
 
 use block::async_io::{AsyncIo, GuestMemoryTarget};
 use block::formats::qcow::QcowDisk;
-use block::qcow::{BackingFileConfig, ImageType, QcowFile, RawFile};
+use block::formats::qcow::internal::{BackingFileConfig, ImageType, QcowFile, RawFile};
 use vm_memory::{Bytes, GuestAddress, GuestMemoryMmap};
 use vmm_sys_util::eventfd::EventFd;
 use vmm_sys_util::tempfile::TempFile;

vhost_user_block/src/lib.rs

@@ -19,7 +19,7 @@ use std::sync::{Arc, Mutex, RwLock, RwLockWriteGuard};
 use std::time::Instant;
 use std::{convert, io, process, result};
 
-use block::qcow::RawFile;
+use block::formats::qcow::internal::RawFile;
 use block::{Request, RequestType, VirtioBlockConfig, build_serial};
 use libc::EFD_NONBLOCK;
 use log::{debug, error, info, warn};