Signed-off-by: Paolo Bonzini <[email protected]>
---
rust/hw/char/pl011/src/device.rs | 2 +-
rust/hw/core/src/qdev.rs | 2 +-
rust/hw/core/src/sysbus.rs | 2 +-
rust/hw/core/tests/tests.rs | 2 +-
rust/hw/timer/hpet/src/device.rs | 2 +-
rust/qom/src/prelude.rs | 4 ++++
6 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/rust/hw/char/pl011/src/device.rs b/rust/hw/char/pl011/src/device.rs
index 0b1bb2d5a3b..9f5c4a34df0 100644
--- a/rust/hw/char/pl011/src/device.rs
+++ b/rust/hw/char/pl011/src/device.rs
@@ -9,7 +9,7 @@
use common::prelude::*;
use hwcore::{prelude::*, ClockEvent, IRQState};
use migration::{self, prelude::*};
-use qom::{prelude::*, ObjectImpl, Owned, ParentField, ParentInit};
+use qom::prelude::*;
use system::prelude::*;
use util::prelude::*;
diff --git a/rust/hw/core/src/qdev.rs b/rust/hw/core/src/qdev.rs
index 4e983da28b7..32370319871 100644
--- a/rust/hw/core/src/qdev.rs
+++ b/rust/hw/core/src/qdev.rs
@@ -12,7 +12,7 @@
use chardev::Chardev;
use common::{callbacks::FnCall, Opaque};
use migration::{impl_vmstate_c_struct, VMStateDescription};
-use qom::{prelude::*, ObjectClass, ObjectImpl, Owned, ParentInit};
+use qom::{prelude::*, ObjectClass};
use util::{Error, Result};
pub use crate::bindings::{ClockEvent, DeviceClass, Property, ResetType};
diff --git a/rust/hw/core/src/sysbus.rs b/rust/hw/core/src/sysbus.rs
index 68165e89295..c7acf214559 100644
--- a/rust/hw/core/src/sysbus.rs
+++ b/rust/hw/core/src/sysbus.rs
@@ -8,7 +8,7 @@
pub use bindings::SysBusDeviceClass;
use common::Opaque;
-use qom::{prelude::*, Owned};
+use qom::prelude::*;
use system::MemoryRegion;
use util::{Error, Result};
diff --git a/rust/hw/core/tests/tests.rs b/rust/hw/core/tests/tests.rs
index e60c9d018f5..115dd7a860d 100644
--- a/rust/hw/core/tests/tests.rs
+++ b/rust/hw/core/tests/tests.rs
@@ -7,7 +7,7 @@
use bql::prelude::*;
use hwcore::prelude::*;
use migration::prelude::*;
-use qom::{prelude::*, ObjectImpl, ParentField};
+use qom::prelude::*;
use util::bindings::{module_call_init, module_init_type};
// Test that macros can compile.
diff --git a/rust/hw/timer/hpet/src/device.rs b/rust/hw/timer/hpet/src/device.rs
index c5cdb87b073..c82b27ddf15 100644
--- a/rust/hw/timer/hpet/src/device.rs
+++ b/rust/hw/timer/hpet/src/device.rs
@@ -14,7 +14,7 @@
use common::prelude::*;
use hwcore::prelude::*;
use migration::{self, prelude::*};
-use qom::{prelude::*, ObjectImpl, ParentField, ParentInit};
+use qom::prelude::*;
use system::{
bindings::{address_space_memory, address_space_stl_le},
MEMTXATTRS_UNSPECIFIED,
diff --git a/rust/qom/src/prelude.rs b/rust/qom/src/prelude.rs
index 00a60959771..6a1ecaef2a7 100644
--- a/rust/qom/src/prelude.rs
+++ b/rust/qom/src/prelude.rs
@@ -6,7 +6,11 @@
pub use crate::qom::ObjectCast;
pub use crate::qom::ObjectClassMethods;
pub use crate::qom::ObjectDeref;
+pub use crate::qom::ObjectImpl;
pub use crate::qom::ObjectMethods;
pub use crate::qom::ObjectType;
+pub use crate::qom::Owned;
+pub use crate::qom::ParentField;
+pub use crate::qom::ParentInit;
pub use crate::qom_isa;
--
2.51.1