i386: Fix the missing Rust HPET configuration option

[PATCH] i386: Fix the missing Rust HPET configuration option

Posted by Zhao Liu 1 month, 2 weeks ago

The configuration option of Rust HPET is missing, so that PC machine
can't boot with "hpet=on" when QEMU Rust support is enabled.

Add the Rust HPET configuration option.

Fixes: d128c341a744 ("i386: enable rust hpet for pc when rust is enabled")
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
 hw/timer/Kconfig | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig
index 9ac008453408..c051597180f4 100644
--- a/hw/timer/Kconfig
+++ b/hw/timer/Kconfig
@@ -13,6 +13,10 @@ config HPET
     bool
     default y if PC && !HAVE_RUST
 
+config X_HPET_RUST
+    bool
+    default y if PC && HAVE_RUST
+
 config I8254
     bool
     depends on ISA_BUS
-- 
2.34.1

Re: [PATCH] i386: Fix the missing Rust HPET configuration option

Posted by Paolo Bonzini 1 month, 2 weeks ago

On 2/17/25 16:44, Zhao Liu wrote:
> The configuration option of Rust HPET is missing, so that PC machine
> can't boot with "hpet=on" when QEMU Rust support is enabled.
> 
> Add the Rust HPET configuration option.
> 
> Fixes: d128c341a744 ("i386: enable rust hpet for pc when rust is enabled")
> Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
> ---
>   hw/timer/Kconfig | 4 ++++
>   1 file changed, 4 insertions(+)
> 
> diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig
> index 9ac008453408..c051597180f4 100644
> --- a/hw/timer/Kconfig
> +++ b/hw/timer/Kconfig
> @@ -13,6 +13,10 @@ config HPET
>       bool
>       default y if PC && !HAVE_RUST
>   
> +config X_HPET_RUST
> +    bool
> +    default y if PC && HAVE_RUST
> +
>   config I8254
>       bool
>       depends on ISA_BUS

The config item is already declared in rust/hw/timer/Kconfig, so it's 
enough to do

diff --git b/rust/hw/timer/Kconfig a/rust/hw/timer/Kconfig
index afd98033503..42e421317a5 100644
--- b/rust/hw/timer/Kconfig
+++ a/rust/hw/timer/Kconfig
@@ -1,2 +1,3 @@
  config X_HPET_RUST
      bool
+    default y if PC && HAVE_RUST

I applied it with your commit message.

Paolo

Re: [PATCH] i386: Fix the missing Rust HPET configuration option

Posted by Zhao Liu 1 month, 2 weeks ago

> The config item is already declared in rust/hw/timer/Kconfig, so it's enough
> to do
> 
> diff --git b/rust/hw/timer/Kconfig a/rust/hw/timer/Kconfig
> index afd98033503..42e421317a5 100644
> --- b/rust/hw/timer/Kconfig
> +++ a/rust/hw/timer/Kconfig
> @@ -1,2 +1,3 @@
>  config X_HPET_RUST
>      bool
> +    default y if PC && HAVE_RUST
> 
> I applied it with your commit message.
> 

Ah, thanks! I misunderstood your comment before...

Regards,
Zhao