mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rust: remove uses of #[no_mangle]

Browse Source 
Mangled symbols do not cause any issue; disabling mangling is only useful if
C headers reference the Rust function, which is not the case here.

Reviewed-by: Junjie Mao <junjie.mao@hotmail.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2024-10-18 11:38:41 +02:00
parent 00ed18de35
commit 2eb6274d12
5 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rust/hw/char/pl011/src/device.rs
View File

@ -514,7 +514,6 @@ pub const IRQMASK: [u32; 6] = [
/// We expect the FFI user of this function to pass a valid pointer, that has /// We expect the FFI user of this function to pass a valid pointer, that has
/// the same size as [`PL011State`]. We also expect the device is /// the same size as [`PL011State`]. We also expect the device is
/// readable/writeable from one thread at any time. /// readable/writeable from one thread at any time.
#[no_mangle]
pub unsafe extern "C" fn pl011_can_receive(opaque: *mut c_void) -> c_int { pub unsafe extern "C" fn pl011_can_receive(opaque: *mut c_void) -> c_int {
unsafe { unsafe {
debug_assert!(!opaque.is_null()); debug_assert!(!opaque.is_null());
@ -530,7 +529,6 @@ pub unsafe extern "C" fn pl011_can_receive(opaque: *mut c_void) -> c_int {
/// readable/writeable from one thread at any time. /// readable/writeable from one thread at any time.
/// ///
/// The buffer and size arguments must also be valid. /// The buffer and size arguments must also be valid.
#[no_mangle]
pub unsafe extern "C" fn pl011_receive( pub unsafe extern "C" fn pl011_receive(
opaque: *mut core::ffi::c_void, opaque: *mut core::ffi::c_void,
buf: *const u8, buf: *const u8,
@ -554,7 +552,6 @@ pub unsafe extern "C" fn pl011_receive(
/// We expect the FFI user of this function to pass a valid pointer, that has /// We expect the FFI user of this function to pass a valid pointer, that has
/// the same size as [`PL011State`]. We also expect the device is /// the same size as [`PL011State`]. We also expect the device is
/// readable/writeable from one thread at any time. /// readable/writeable from one thread at any time.
#[no_mangle]
pub unsafe extern "C" fn pl011_event(opaque: *mut core::ffi::c_void, event: QEMUChrEvent) { pub unsafe extern "C" fn pl011_event(opaque: *mut core::ffi::c_void, event: QEMUChrEvent) {
unsafe { unsafe {
debug_assert!(!opaque.is_null()); debug_assert!(!opaque.is_null());
@ -589,7 +586,6 @@ pub unsafe extern "C" fn pl011_create(
/// We expect the FFI user of this function to pass a valid pointer, that has /// We expect the FFI user of this function to pass a valid pointer, that has
/// the same size as [`PL011State`]. We also expect the device is /// the same size as [`PL011State`]. We also expect the device is
/// readable/writeable from one thread at any time. /// readable/writeable from one thread at any time.
#[no_mangle]
pub unsafe extern "C" fn pl011_init(obj: *mut Object) { pub unsafe extern "C" fn pl011_init(obj: *mut Object) {
unsafe { unsafe {
debug_assert!(!obj.is_null()); debug_assert!(!obj.is_null());

2
rust/hw/char/pl011/src/device_class.rs
View File

@ -46,7 +46,6 @@ qemu_api::device_class_init! {
/// We expect the FFI user of this function to pass a valid pointer, that has /// We expect the FFI user of this function to pass a valid pointer, that has
/// the same size as [`PL011State`]. We also expect the device is /// the same size as [`PL011State`]. We also expect the device is
/// readable/writeable from one thread at any time. /// readable/writeable from one thread at any time.
#[no_mangle]
pub unsafe extern "C" fn pl011_realize(dev: *mut DeviceState, _errp: *mut *mut Error) { pub unsafe extern "C" fn pl011_realize(dev: *mut DeviceState, _errp: *mut *mut Error) {
unsafe { unsafe {
assert!(!dev.is_null()); assert!(!dev.is_null());
@ -60,7 +59,6 @@ pub unsafe extern "C" fn pl011_realize(dev: *mut DeviceState, _errp: *mut *mut E
/// We expect the FFI user of this function to pass a valid pointer, that has /// We expect the FFI user of this function to pass a valid pointer, that has
/// the same size as [`PL011State`]. We also expect the device is /// the same size as [`PL011State`]. We also expect the device is
/// readable/writeable from one thread at any time. /// readable/writeable from one thread at any time.
#[no_mangle]
pub unsafe extern "C" fn pl011_reset(dev: *mut DeviceState) { pub unsafe extern "C" fn pl011_reset(dev: *mut DeviceState) {
unsafe { unsafe {
assert!(!dev.is_null()); assert!(!dev.is_null());

2
rust/hw/char/pl011/src/memory_ops.rs
View File

@ -22,7 +22,6 @@ pub static PL011_OPS: MemoryRegionOps = MemoryRegionOps {
}, },
}; };
#[no_mangle]
unsafe extern "C" fn pl011_read( unsafe extern "C" fn pl011_read(
opaque: *mut core::ffi::c_void, opaque: *mut core::ffi::c_void,
addr: hwaddr, addr: hwaddr,
@ -44,7 +43,6 @@ unsafe extern "C" fn pl011_read(
} }
} }
#[no_mangle]
unsafe extern "C" fn pl011_write( unsafe extern "C" fn pl011_write(
opaque: *mut core::ffi::c_void, opaque: *mut core::ffi::c_void,
addr: hwaddr, addr: hwaddr,

1
rust/qemu-api/src/definitions.rs
View File

@ -53,7 +53,6 @@ macro_rules! module_init {
#[cfg_attr(target_os = "windows", link_section = ".CRT$XCU")] #[cfg_attr(target_os = "windows", link_section = ".CRT$XCU")]
pub static LOAD_MODULE: extern "C" fn() = { pub static LOAD_MODULE: extern "C" fn() = {
extern "C" fn __load() { extern "C" fn __load() {
#[no_mangle]
unsafe extern "C" fn $func() { unsafe extern "C" fn $func() {
$body $body
} }

2
rust/qemu-api/src/device_class.rs
View File

@ -9,7 +9,6 @@ use crate::bindings::Property;
#[macro_export] #[macro_export]
macro_rules! device_class_init { macro_rules! device_class_init {
($func:ident, props => $props:ident, realize_fn => $realize_fn:expr, legacy_reset_fn => $legacy_reset_fn:expr, vmsd => $vmsd:ident$(,)*) => { ($func:ident, props => $props:ident, realize_fn => $realize_fn:expr, legacy_reset_fn => $legacy_reset_fn:expr, vmsd => $vmsd:ident$(,)*) => {
#[no_mangle]
pub unsafe extern "C" fn $func( pub unsafe extern "C" fn $func(
klass: *mut $crate::bindings::ObjectClass, klass: *mut $crate::bindings::ObjectClass,
_: *mut ::core::ffi::c_void, _: *mut ::core::ffi::c_void,
@ -103,7 +102,6 @@ macro_rules! declare_properties {
] ]
} }
#[no_mangle]
pub static mut $ident: $crate::device_class::Properties<PROP_LEN> = $crate::device_class::Properties(::std::sync::OnceLock::new(), _make_properties); pub static mut $ident: $crate::device_class::Properties<PROP_LEN> = $crate::device_class::Properties(::std::sync::OnceLock::new(), _make_properties);
}; };
} }