diff options
| author | Phil Dennis-Jordan <phil@philjordan.eu> | 2024-12-09 21:36:28 +0100 |
|---|---|---|
| committer | Philippe Mathieu-Daudé <philmd@linaro.org> | 2025-02-16 14:25:07 +0100 |
| commit | 1e71a9b1147145c9904b2ce5350c5591d5badb23 (patch) | |
| tree | 081ae767a30b458b1660ea186346d7f8e1a557d5 /hw/intc | |
| parent | 7f2626dc24198700683d264c265a2d337fff980b (diff) | |
| download | focaccia-qemu-1e71a9b1147145c9904b2ce5350c5591d5badb23.tar.gz focaccia-qemu-1e71a9b1147145c9904b2ce5350c5591d5badb23.zip | |
hw/intc/apic: Fixes magic number use, removes outdated comment
This changes replaces the use of an explicit literal constant for the APIC base address mask with the existing symbolic constant intended for this purpose. Additionally, we remove the comment about not being able to re-enable the APIC after disabling it. This is no longer the case after the APIC implementation's state machine was modified in 9.0. Signed-off-by: Phil Dennis-Jordan <phil@philjordan.eu> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Message-ID: <20241209203629.74436-11-phil@philjordan.eu> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Diffstat (limited to 'hw/intc')
| -rw-r--r-- | hw/intc/apic.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/intc/apic.c b/hw/intc/apic.c index d1d343d421..d18c1dbf2c 100644 --- a/hw/intc/apic.c +++ b/hw/intc/apic.c @@ -350,9 +350,8 @@ static int apic_set_base(APICCommonState *s, uint64_t val) return -1; } - s->apicbase = (val & 0xfffff000) | + s->apicbase = (val & MSR_IA32_APICBASE_BASE) | (s->apicbase & (MSR_IA32_APICBASE_BSP | MSR_IA32_APICBASE_ENABLE)); - /* if disabled, cannot be enabled again */ if (!(val & MSR_IA32_APICBASE_ENABLE)) { s->apicbase &= ~MSR_IA32_APICBASE_ENABLE; cpu_clear_apic_feature(&s->cpu->env); |