motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-03 07:43:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

rust: replace c_str! with c"" literals

Browse source 
Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2025-05-02 10:39:08 +02:00
parent b134a09ffa
commit f117857b39
12 changed files with 32 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

19
rust/hw/timer/hpet/src/hpet.rs
View file

@ -14,7 +14,6 @@ use qemu_api::{
address_space_memory, address_space_stl_le, qdev_prop_bit, qdev_prop_bool,
qdev_prop_uint32, qdev_prop_uint8,
},
c_str,
cell::{BqlCell, BqlRefCell},
irq::InterruptSource,
memory::{
@ -908,7 +907,7 @@ impl ObjectImpl for HPETState {
qemu_api::declare_properties! {
HPET_PROPERTIES,
qemu_api::define_property!(
c_str!("timers"),
c"timers",
HPETState,
num_timers,
unsafe { &qdev_prop_uint8 },
@ -916,7 +915,7 @@ qemu_api::declare_properties! {
default = HPET_MIN_TIMERS
),
qemu_api::define_property!(
c_str!("msi"),
c"msi",
HPETState,
flags,
unsafe { &qdev_prop_bit },
@ -925,7 +924,7 @@ qemu_api::declare_properties! {
default = false,
),
qemu_api::define_property!(
c_str!("hpet-intcap"),
c"hpet-intcap",
HPETState,
int_route_cap,
unsafe { &qdev_prop_uint32 },
@ -933,7 +932,7 @@ qemu_api::declare_properties! {
default = 0
),
qemu_api::define_property!(
c_str!("hpet-offset-saved"),
c"hpet-offset-saved",
HPETState,
hpet_offset_saved,
unsafe { &qdev_prop_bool },
@ -974,7 +973,7 @@ unsafe extern "C" fn hpet_post_load(opaque: *mut c_void, version_id: c_int) -> c
}
static VMSTATE_HPET_RTC_IRQ_LEVEL: VMStateDescription = VMStateDescription {
name: c_str!("hpet/rtc_irq_level").as_ptr(),
name: c"hpet/rtc_irq_level".as_ptr(),
version_id: 1,
minimum_version_id: 1,
needed: Some(hpet_rtc_irq_level_needed),
@ -985,7 +984,7 @@ static VMSTATE_HPET_RTC_IRQ_LEVEL: VMStateDescription = VMStateDescription {
};
static VMSTATE_HPET_OFFSET: VMStateDescription = VMStateDescription {
name: c_str!("hpet/offset").as_ptr(),
name: c"hpet/offset".as_ptr(),
version_id: 1,
minimum_version_id: 1,
needed: Some(hpet_offset_needed),
@ -996,7 +995,7 @@ static VMSTATE_HPET_OFFSET: VMStateDescription = VMStateDescription {
};
static VMSTATE_HPET_TIMER: VMStateDescription = VMStateDescription {
name: c_str!("hpet_timer").as_ptr(),
name: c"hpet_timer".as_ptr(),
version_id: 1,
minimum_version_id: 1,
fields: vmstate_fields! {
@ -1011,10 +1010,10 @@ static VMSTATE_HPET_TIMER: VMStateDescription = VMStateDescription {
..Zeroable::ZERO
};
const VALIDATE_TIMERS_NAME: &CStr = c_str!("num_timers must match");
const VALIDATE_TIMERS_NAME: &CStr = c"num_timers must match";
static VMSTATE_HPET: VMStateDescription = VMStateDescription {
name: c_str!("hpet").as_ptr(),
name: c"hpet".as_ptr(),
version_id: 2,
minimum_version_id: 1,
pre_save: Some(hpet_pre_save),

4
rust/hw/timer/hpet/src/lib.rs
View file

@ -7,9 +7,7 @@
//! This library implements a device model for the IA-PC HPET (High
//! Precision Event Timers) device in QEMU.
use qemu_api::c_str;
pub mod fw_cfg;
pub mod hpet;
pub const TYPE_HPET: &::std::ffi::CStr = c_str!("hpet");
pub const TYPE_HPET: &::std::ffi::CStr = c"hpet";