mirror of
https://github.com/izzy2lost/xemu.git
synced 2026-07-06 00:20:22 -07:00
rust: re-export qemu macros from common/qom/hwcore
This is just a bit nicer. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Link: https://lore.kernel.org/r/20250827104147.717203-22-marcandre.lureau@redhat.com Reviewed-by: Zhao Liu <zhao1.liu@intel.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
committed by
Paolo Bonzini
parent
b0f6bf8a5b
commit
e4444d71e8
@@ -17,7 +17,6 @@ migration = { path = "../../../migration" }
|
||||
bql = { path = "../../../bql" }
|
||||
qom = { path = "../../../qom" }
|
||||
system = { path = "../../../system" }
|
||||
qemu_macros = { path = "../../../qemu-macros" }
|
||||
hwcore = { path = "../../../hw/core" }
|
||||
|
||||
[lints]
|
||||
|
||||
@@ -8,7 +8,6 @@ _libhpet_rs = static_library(
|
||||
util_rs,
|
||||
migration_rs,
|
||||
bql_rs,
|
||||
qemu_macros,
|
||||
qom_rs,
|
||||
system_rs,
|
||||
hwcore_rs,
|
||||
|
||||
@@ -97,7 +97,7 @@ const HPET_TN_CFG_FSB_CAP_SHIFT: usize = 15;
|
||||
/// Timer N Interrupt Routing Capability (bits 32:63)
|
||||
const HPET_TN_CFG_INT_ROUTE_CAP_SHIFT: usize = 32;
|
||||
|
||||
#[derive(qemu_macros::TryInto)]
|
||||
#[derive(common::TryInto)]
|
||||
#[repr(u64)]
|
||||
#[allow(non_camel_case_types)]
|
||||
/// Timer registers, masked by 0x18
|
||||
@@ -110,7 +110,7 @@ enum TimerRegister {
|
||||
ROUTE = 16,
|
||||
}
|
||||
|
||||
#[derive(qemu_macros::TryInto)]
|
||||
#[derive(common::TryInto)]
|
||||
#[repr(u64)]
|
||||
#[allow(non_camel_case_types)]
|
||||
/// Global registers
|
||||
@@ -520,7 +520,7 @@ impl HPETTimer {
|
||||
|
||||
/// HPET Event Timer Block Abstraction
|
||||
#[repr(C)]
|
||||
#[derive(qemu_macros::Object)]
|
||||
#[derive(qom::Object)]
|
||||
pub struct HPETState {
|
||||
parent_obj: ParentField<SysBusDevice>,
|
||||
iomem: MemoryRegion,
|
||||
|
||||
Reference in New Issue
Block a user