| Message ID | 20210418165102.1139848-1-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] hw/mips/jazz: Remove confusing ifdef'ry | expand |
On 4/18/21 9:51 AM, Philippe Mathieu-Daudé wrote: > The jazz machine is not used under user emulation and > does not support KVM. Simplify the ifdef'ry. > > Signed-off-by: Philippe Mathieu-Daudé<f4bug@amsat.org> > Reviewed-by: Richard Henderson<richard.henderson@linaro.org> > Reviewed-by: Claudio Fontana<cfontana@suse.de> > Message-Id:<20210226132723.3969650-3-f4bug@amsat.org> > --- > v2: Rebased. > > Based-on:<20210418163134.1133100-1-f4bug@amsat.org> > --- > hw/mips/jazz.c | 4 ---- > 1 file changed, 4 deletions(-) Were you going to apply this one before my cleanup to completely remove this hook manipulation? https://patchew.org/QEMU/20210227232519.222663-1-richard.henderson@linaro.org/20210227232519.222663-2-richard.henderson@linaro.org/ r~
On 4/18/21 8:48 PM, Richard Henderson wrote: > On 4/18/21 9:51 AM, Philippe Mathieu-Daudé wrote: >> The jazz machine is not used under user emulation and >> does not support KVM. Simplify the ifdef'ry. >> >> Signed-off-by: Philippe Mathieu-Daudé<f4bug@amsat.org> >> Reviewed-by: Richard Henderson<richard.henderson@linaro.org> >> Reviewed-by: Claudio Fontana<cfontana@suse.de> >> Message-Id:<20210226132723.3969650-3-f4bug@amsat.org> >> --- >> v2: Rebased. >> >> Based-on:<20210418163134.1133100-1-f4bug@amsat.org> >> --- >> hw/mips/jazz.c | 4 ---- >> 1 file changed, 4 deletions(-) > > Were you going to apply this one before my cleanup to completely remove > this hook manipulation? > > https://patchew.org/QEMU/20210227232519.222663-1-richard.henderson@linaro.org/20210227232519.222663-2-richard.henderson@linaro.org/ Doh I completely forgot your patch =) Let's forget about mine then! Regards, Phil.
diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c index 1a0888a0fd5..29d32ef516f 100644 --- a/hw/mips/jazz.c +++ b/hw/mips/jazz.c @@ -120,7 +120,6 @@ static const MemoryRegionOps dma_dummy_ops = { #define MAGNUM_BIOS_SIZE \ (BIOS_SIZE < MAGNUM_BIOS_SIZE_MAX ? BIOS_SIZE : MAGNUM_BIOS_SIZE_MAX) -#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) static void (*real_do_transaction_failed)(CPUState *cpu, hwaddr physaddr, vaddr addr, unsigned size, MMUAccessType access_type, @@ -142,7 +141,6 @@ static void mips_jazz_do_transaction_failed(CPUState *cs, hwaddr physaddr, (*real_do_transaction_failed)(cs, physaddr, addr, size, access_type, mmu_idx, attrs, response, retaddr); } -#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ static void mips_jazz_init(MachineState *machine, enum jazz_model_e jazz_model) @@ -211,10 +209,8 @@ static void mips_jazz_init(MachineState *machine, * memory region that catches all memory accesses, as we do on Malta. */ cc = CPU_GET_CLASS(cpu); -#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) real_do_transaction_failed = cc->tcg_ops->do_transaction_failed; cc->tcg_ops->do_transaction_failed = mips_jazz_do_transaction_failed; -#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ /* allocate RAM */ memory_region_add_subregion(address_space, 0, machine->ram);