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

rust: fix a couple style issues from clippy

Browse source 
These are reported as clippy::semicolon_inside_block and clippy::as_ptr_cast_mut.

clippy::semicolon_inside_block can be configured not to lint single-line
blocks; just go with the default.

Reviewed-by: Junjie Mao <junjie.mao@hotmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2024-11-05 18:03:12 +01:00
parent de98c17593
commit 7a35e2fb80
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rust/hw/char/pl011/src/device.rs
View file

@ -2,7 +2,7 @@
// Author(s): Manos Pitsidianakis <manos.pitsidianakis@linaro.org> // Author(s): Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
use core::ptr::{addr_of, addr_of_mut, NonNull}; use core::ptr::{addr_of_mut, NonNull};
use std::{ use std::{
ffi::CStr, ffi::CStr,
os::raw::{c_int, c_uchar, c_uint, c_void}, os::raw::{c_int, c_uchar, c_uint, c_void},
@ -499,7 +499,9 @@ impl PL011State {
let flags = self.int_level & self.int_enabled; let flags = self.int_level & self.int_enabled;
for (irq, i) in self.interrupts.iter().zip(IRQMASK) { for (irq, i) in self.interrupts.iter().zip(IRQMASK) {
// SAFETY: self.interrupts have been initialized in init(). // SAFETY: self.interrupts have been initialized in init().
unsafe { qemu_set_irq(*irq, i32::from(flags & i != 0)) }; unsafe {
qemu_set_irq(*irq, i32::from(flags & i != 0));
}
} }
} }
@ -601,7 +603,7 @@ pub unsafe extern "C" fn pl011_create(
let sysbus: *mut SysBusDevice = dev.cast::<SysBusDevice>(); let sysbus: *mut SysBusDevice = dev.cast::<SysBusDevice>();
qdev_prop_set_chr(dev, c_str!("chardev").as_ptr(), chr); qdev_prop_set_chr(dev, c_str!("chardev").as_ptr(), chr);
sysbus_realize_and_unref(sysbus, addr_of!(error_fatal) as *mut *mut Error); sysbus_realize_and_unref(sysbus, addr_of_mut!(error_fatal));
sysbus_mmio_map(sysbus, 0, addr); sysbus_mmio_map(sysbus, 0, addr);
sysbus_connect_irq(sysbus, 0, irq); sysbus_connect_irq(sysbus, 0, irq);
dev dev

4
rust/hw/char/pl011/src/memory_ops.rs
View file

@ -33,7 +33,9 @@ unsafe extern "C" fn pl011_read(opaque: *mut c_void, addr: hwaddr, size: c_uint)
// SAFETY: self.char_backend is a valid CharBackend instance after it's been // SAFETY: self.char_backend is a valid CharBackend instance after it's been
// initialized in realize(). // initialized in realize().
let cb_ptr = unsafe { core::ptr::addr_of_mut!(state.as_mut().char_backend) }; let cb_ptr = unsafe { core::ptr::addr_of_mut!(state.as_mut().char_backend) };
unsafe { qemu_chr_fe_accept_input(cb_ptr) }; unsafe {
qemu_chr_fe_accept_input(cb_ptr);
}
val val
} }

2
rust/qemu-api/tests/tests.rs
View file

@ -74,6 +74,6 @@ fn test_device_decl_macros() {
unsafe { unsafe {
module_call_init(module_init_type::MODULE_INIT_QOM); module_call_init(module_init_type::MODULE_INIT_QOM);
object_unref(object_new(DummyState::TYPE_NAME.as_ptr()) as *mut _); object_unref(object_new(DummyState::TYPE_NAME.as_ptr()).cast());
} }
} }