Re: [PATCH 16/33] accel/kvm: Hold gdbstub_sstep_flags in KVMState

[Daniel Henrique Barboza <daniel.barboza@oss.qualcomm.com>]

On 6/30/2026 7:00 PM, Philippe Mathieu-Daudé wrote:
> Prefer to store per-accelerator variables in the per-accelerator
> state, rather than as static variables. This is a good practice
> to allow concurrent accelerators in the future.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
> ---

Reviewed-by: Daniel Henrique Barboza <daniel.barboza@oss.qualcomm.com>

>   include/system/kvm_int.h | 1 +
>   accel/kvm/kvm-all.c      | 7 +++----
>   2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/include/system/kvm_int.h b/include/system/kvm_int.h
> index 49e90cc0235..062759eaa01 100644
> --- a/include/system/kvm_int.h
> +++ b/include/system/kvm_int.h
> @@ -114,6 +114,7 @@ struct KVMState
>       bool coalesced_flush_in_progress;
>       int vcpu_events;
>       bool have_guest_supported;
> +    int gdbstub_sstep_flags;
>   #ifdef TARGET_KVM_HAVE_GUEST_DEBUG
>       QTAILQ_HEAD(, kvm_sw_breakpoint) kvm_sw_breakpoints;
>   #endif
> diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
> index 80d8ef1a974..76c9ae6d4d4 100644
> --- a/accel/kvm/kvm-all.c
> +++ b/accel/kvm/kvm-all.c
> @@ -104,7 +104,6 @@ bool kvm_readonly_mem_allowed;
>   bool kvm_vm_attributes_allowed;
>   bool kvm_msi_use_devid;
>   bool kvm_pre_fault_memory_supported;
> -static int kvm_sstep_flags;
>   static bool kvm_immediate_exit;
>   static uint64_t kvm_supported_memory_attributes;
>   static bool kvm_guest_memfd_supported;
> @@ -3036,20 +3035,20 @@ static int kvm_init(AccelState *as, MachineState *ms)
>       kvm_vm_attributes_allowed =
>           (kvm_check_extension(s, KVM_CAP_VM_ATTRIBUTES) > 0);
>   
> -    kvm_sstep_flags = 0;
> +    s->gdbstub_sstep_flags = 0;
>   
>   #ifdef TARGET_KVM_HAVE_GUEST_DEBUG
>       s->have_guest_supported =
>           (kvm_check_extension(s, KVM_CAP_SET_GUEST_DEBUG) > 0);
>   
>       if (s->have_guest_supported) {
> -        kvm_sstep_flags = SSTEP_ENABLE;
> +        s->gdbstub_sstep_flags = SSTEP_ENABLE;
>   
>           int guest_debug_flags =
>               kvm_check_extension(s, KVM_CAP_SET_GUEST_DEBUG2);
>   
>           if (guest_debug_flags & KVM_GUESTDBG_BLOCKIRQ) {
> -            kvm_sstep_flags |= SSTEP_NOIRQ;
> +            s->gdbstub_sstep_flags |= SSTEP_NOIRQ;
>           }
>       }
>   #endif