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

rust: Kconfig: Factor out whether HPET is Rust or C

Browse source 
Currently we require everywhere that wants to know if there
is an HPET device to check for "CONFIG_HPET || CONFIG_X_HPET_RUST".
Factor out whether the HPET device is Rust or C into a separate
Kconfig stanza, so that CONFIG_HPET means "there is an HPET",
and whether this has pulled in CONFIG_X_HPET_RUST or CONFIG_HPET_C
is something the rest of QEMU can ignore.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Link: https://lore.kernel.org/r/20250319193110.1565578-3-peter.maydell@linaro.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Peter Maydell 2025-03-19 19:31:10 +00:00 • committed by Paolo Bonzini
parent f88c9cd804
commit d1368344bc
7 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
configs/devices/i386-softmmu/default.mak
View file

@ -6,7 +6,6 @@
#CONFIG_APPLESMC=n
#CONFIG_FDC=n
#CONFIG_HPET=n
#CONFIG_X_HPET_RUST=n
#CONFIG_HYPERV=n
#CONFIG_ISA_DEBUG=n
#CONFIG_ISA_IPMI_BT=n

2
hw/i386/fw_cfg.c
View file

@ -26,7 +26,7 @@
#include CONFIG_DEVICES
#include "target/i386/cpu.h"
#if !defined(CONFIG_HPET) && !defined(CONFIG_X_HPET_RUST)
#if !defined(CONFIG_HPET)
struct hpet_fw_config hpet_fw_cfg = {.count = UINT8_MAX};
#endif

2
hw/i386/pc.c
View file

@ -1704,7 +1704,7 @@ static void pc_machine_initfn(Object *obj)
pcms->sata_enabled = true;
pcms->i8042_enabled = true;
pcms->max_fw_size = 8 * MiB;
#if defined(CONFIG_HPET) || defined(CONFIG_X_HPET_RUST)
#if defined(CONFIG_HPET)
pcms->hpet_enabled = true;
#endif
pcms->fd_bootchk = true;

8
hw/timer/Kconfig
View file

@ -11,7 +11,13 @@ config A9_GTIMER
config HPET
bool
default y if PC && !HAVE_RUST
default y if PC
# The HPET has both a Rust and a C implementation
select HPET_C if !HAVE_RUST
select X_HPET_RUST if HAVE_RUST
config HPET_C
bool
config I8254
bool

2
hw/timer/meson.build
View file

@ -13,7 +13,7 @@ system_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic-timer.c'))
system_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_mct.c'))
system_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_pwm.c'))
system_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_gptimer.c'))
system_ss.add(when: 'CONFIG_HPET', if_true: files('hpet.c'))
system_ss.add(when: 'CONFIG_HPET_C', if_true: files('hpet.c'))
system_ss.add(when: 'CONFIG_I8254', if_true: files('i8254_common.c', 'i8254.c'))
system_ss.add(when: 'CONFIG_IMX', if_true: files('imx_epit.c'))
system_ss.add(when: 'CONFIG_IMX', if_true: files('imx_gpt.c'))

1
rust/hw/timer/Kconfig
View file

@ -1,3 +1,2 @@
config X_HPET_RUST
bool
default y if PC && HAVE_RUST

3
tests/qtest/meson.build
View file

@ -103,8 +103,7 @@ qtests_i386 = \
config_all_devices.has_key('CONFIG_VIRTIO_PCI') and \
slirp.found() ? ['virtio-net-failover'] : []) + \
(unpack_edk2_blobs and \
(config_all_devices.has_key('CONFIG_HPET') or \
config_all_devices.has_key('CONFIG_X_HPET_RUST')) and \
config_all_devices.has_key('CONFIG_HPET') and \
config_all_devices.has_key('CONFIG_PARALLEL') ? ['bios-tables-test'] : []) + \
qtests_pci + \
qtests_cxl + \