[PATCH] hax: unbreak accelerator cpu code after cpus.c split

Claudio Fontana posted 1 patch 1 week ago
Test checkpatch passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20201016080032.13914-1-cfontana@suse.de
target/i386/hax-cpus.c | 1 +
1 file changed, 1 insertion(+)

[PATCH] hax: unbreak accelerator cpu code after cpus.c split

Posted by Claudio Fontana 1 week ago
during my split of cpus.c, code line
"current_cpu = cpu"
was removed by mistake, causing hax to break.

This commit fixes the situation restoring it.

Reported-by: Volker Rümelin <vr_qemu@t-online.de>
Fixes: e92558e4bf8059ce4f0b310afe218802b72766bc
Signed-off-by: Claudio Fontana <cfontana@suse.de>
---
 target/i386/hax-cpus.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/i386/hax-cpus.c b/target/i386/hax-cpus.c
index 99770e590c..f72c85bd49 100644
--- a/target/i386/hax-cpus.c
+++ b/target/i386/hax-cpus.c
@@ -38,6 +38,7 @@ static void *hax_cpu_thread_fn(void *arg)
     qemu_thread_get_self(cpu->thread);
 
     cpu->thread_id = qemu_get_thread_id();
+    current_cpu = cpu;
     hax_init_vcpu(cpu);
     cpu_thread_signal_created(cpu);
     qemu_guest_random_seed_thread_part2(cpu->random_seed);
-- 
2.26.2


Re: [PATCH] hax: unbreak accelerator cpu code after cpus.c split

Posted by Philippe Mathieu-Daudé 1 week ago
Le ven. 16 oct. 2020 10:03, Claudio Fontana <cfontana@suse.de> a écrit :

> during my split of cpus.c, code line
> "current_cpu = cpu"
> was removed by mistake, causing hax to break.
>
> This commit fixes the situation restoring it.
>
> Reported-by: Volker Rümelin <vr_qemu@t-online.de>
> Fixes: e92558e4bf8059ce4f0b310afe218802b72766bc
> Signed-off-by: Claudio Fontana <cfontana@suse.de>
>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

---
>  target/i386/hax-cpus.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/target/i386/hax-cpus.c b/target/i386/hax-cpus.c
> index 99770e590c..f72c85bd49 100644
> --- a/target/i386/hax-cpus.c
> +++ b/target/i386/hax-cpus.c
> @@ -38,6 +38,7 @@ static void *hax_cpu_thread_fn(void *arg)
>      qemu_thread_get_self(cpu->thread);
>
>      cpu->thread_id = qemu_get_thread_id();
> +    current_cpu = cpu;
>      hax_init_vcpu(cpu);
>      cpu_thread_signal_created(cpu);
>      qemu_guest_random_seed_thread_part2(cpu->random_seed);
> --
> 2.26.2
>
>
>

Re: [PATCH] hax: unbreak accelerator cpu code after cpus.c split

Posted by Paolo Bonzini 1 week ago
On 16/10/20 10:00, Claudio Fontana wrote:
> during my split of cpus.c, code line
> "current_cpu = cpu"
> was removed by mistake, causing hax to break.
> 
> This commit fixes the situation restoring it.
> 
> Reported-by: Volker Rümelin <vr_qemu@t-online.de>
> Fixes: e92558e4bf8059ce4f0b310afe218802b72766bc
> Signed-off-by: Claudio Fontana <cfontana@suse.de>
> ---
>  target/i386/hax-cpus.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/target/i386/hax-cpus.c b/target/i386/hax-cpus.c
> index 99770e590c..f72c85bd49 100644
> --- a/target/i386/hax-cpus.c
> +++ b/target/i386/hax-cpus.c
> @@ -38,6 +38,7 @@ static void *hax_cpu_thread_fn(void *arg)
>      qemu_thread_get_self(cpu->thread);
>  
>      cpu->thread_id = qemu_get_thread_id();
> +    current_cpu = cpu;
>      hax_init_vcpu(cpu);
>      cpu_thread_signal_created(cpu);
>      qemu_guest_random_seed_thread_part2(cpu->random_seed);
> 

Queued, thanks.

Paolo