Re: [PATCH v2 01/10] i386/fw_cfg: move hpet_cfg definition to hpet.c

[Zhao Liu]

On Thu, Feb 13, 2025 at 12:25:55PM +0100, Paolo Bonzini wrote:
> Date: Thu, 13 Feb 2025 12:25:55 +0100
> From: Paolo Bonzini <pbonzini@redhat.com>
> Subject: Re: [PATCH v2 01/10] i386/fw_cfg: move hpet_cfg definition to
>  hpet.c
> 
> On Mon, Feb 10, 2025 at 3:41 AM Zhao Liu <zhao1.liu@intel.com> wrote:
> > diff --git a/hw/i386/fw_cfg.c b/hw/i386/fw_cfg.c
> > index d2cb08715a21..546de63123e6 100644
> > --- a/hw/i386/fw_cfg.c
> > +++ b/hw/i386/fw_cfg.c
> > @@ -26,8 +26,6 @@
> >  #include CONFIG_DEVICES
> >  #include "target/i386/cpu.h"
> >
> > -struct hpet_fw_config hpet_cfg = {.count = UINT8_MAX};
> 
> This must be kept for the case where HPET is not enabled at all in the
> build; removing the FW_CFG_HPET file changes the guest API and I'd
> prefer to merge the Rust HPET implementation without having to figure
> out the safety of that change.
> 
> No need to do anything, I'll just make it
> 
> #if !defined(CONFIG_HPET) && !defined(CONFIG_X_HPET_RUST)
> const struct hpet_fw_config hpet_fw_cfg = {.count = UINT8_MAX};
> #endif
> 

Thanks! This makes sense.

Zhao