motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-07-27 12:23:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

rust: use std::os::raw instead of core::ffi

Browse source 
core::ffi::c_* types were introduced in Rust 1.64.0.  Use the older types
in std::os::raw, which are now aliases of the types in core::ffi.  There is
no need to compile QEMU as no_std, so this is acceptable as long as we support
a version of Debian with Rust 1.63.0.

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-24 13:53:59 +02:00
parent 646b5378e0
commit 9f7d4520d6
9 changed files with 39 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

11
rust/qemu-api/src/lib.rs
View file

@ -34,7 +34,10 @@ pub mod device_class;
pub mod vmstate;
pub mod zeroable;
use std::alloc::{GlobalAlloc, Layout};
use std::{
alloc::{GlobalAlloc, Layout},
os::raw::c_void,
};
#[cfg(HAVE_GLIB_WITH_ALIGNED_ALLOC)]
extern "C" {
@ -48,8 +51,8 @@ extern "C" {
#[cfg(not(HAVE_GLIB_WITH_ALIGNED_ALLOC))]
extern "C" {
fn qemu_memalign(alignment: usize, size: usize) -> *mut ::core::ffi::c_void;
fn qemu_vfree(ptr: *mut ::core::ffi::c_void);
fn qemu_memalign(alignment: usize, size: usize) -> *mut c_void;
fn qemu_vfree(ptr: *mut c_void);
}
extern "C" {
@ -114,7 +117,7 @@ impl Default for QemuAllocator {
}
// Sanity check.
const _: [(); 8] = [(); ::core::mem::size_of::<*mut ::core::ffi::c_void>()];
const _: [(); 8] = [(); ::core::mem::size_of::<*mut c_void>()];
unsafe impl GlobalAlloc for QemuAllocator {
unsafe fn alloc(&self, layout: Layout) -> *mut u8 {