diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-02-11 11:24:16 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-02-11 11:24:16 +0000 |
| commit | 36a9abd9be2f85c07e93378a5c5d1b180f5b2e15 (patch) | |
| tree | e759b3873d39ed5ad47605d41fe4934d1fe477be /hw/arm/virt.c | |
| parent | 88c73d16ad1b6c22a2ab082064d0d521f756296a (diff) | |
| parent | f0afa73164778570083504a185d7498884c68d65 (diff) | |
| download | focaccia-qemu-36a9abd9be2f85c07e93378a5c5d1b180f5b2e15.tar.gz focaccia-qemu-36a9abd9be2f85c07e93378a5c5d1b180f5b2e15.zip | |
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20160211' into staging
target-arm queue: * fix some missing traps for EL3 support * enable EL3 on Cortex-A53 and Cortex-A57 * fix syndrome IL bit for Thumb coprocessor, VFP and Neon traps * fix mishandling of architectural watchpoints * avoid buffer overflow in sd.c * fix max-cpus check in virt board * implement 'get board revision' query for BCM2835 # gpg: Signature made Thu 11 Feb 2016 11:23:47 GMT using RSA key ID 14360CDE # gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>" # gpg: aka "Peter Maydell <pmaydell@gmail.com>" # gpg: aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>" * remotes/pmaydell/tags/pull-target-arm-20160211: bcm2835_property: implement "get board revision" query hw/arm/virt: fix max-cpus check sd: limit 'req.cmd' while using as an array index target-arm: Implement checking of fired watchpoint cpu: Add callback to check architectural watchpoint match target-arm: Fix IL bit reported for Thumb VFP and Neon traps target-arm: Fix IL bit reported for Thumb coprocessor traps target-arm: Correct misleading 'is_thumb' syn_* parameter names target-arm: Enable EL3 for Cortex-A53 and Cortex-A57 target-arm: Implement NSACR trapping behaviour target-arm: Add isread parameter to CPAccessFns target-arm: Update arm_generate_debug_exceptions() to handle EL2/EL3 target-arm: Use access_trap_aa32s_el1() for SCR and MVBAR target-arm: Implement MDCR_EL3 and SDCR target-arm: Fix typo in comment in arm_is_secure_below_el3() Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm/virt.c')
| -rw-r--r-- | hw/arm/virt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 15658f49c4..44bbbea92b 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1013,7 +1013,7 @@ static void machvirt_init(MachineState *machine) MemoryRegion *sysmem = get_system_memory(); MemoryRegion *secure_sysmem = NULL; int gic_version = vms->gic_version; - int n, max_cpus; + int n, virt_max_cpus; MemoryRegion *ram = g_new(MemoryRegion, 1); const char *cpu_model = machine->cpu_model; VirtBoardInfo *vbi; @@ -1051,15 +1051,15 @@ static void machvirt_init(MachineState *machine) * many redistributors we can fit into the memory map. */ if (gic_version == 3) { - max_cpus = vbi->memmap[VIRT_GIC_REDIST].size / 0x20000; + virt_max_cpus = vbi->memmap[VIRT_GIC_REDIST].size / 0x20000; } else { - max_cpus = GIC_NCPU; + virt_max_cpus = GIC_NCPU; } - if (smp_cpus > max_cpus) { + if (max_cpus > virt_max_cpus) { error_report("Number of SMP CPUs requested (%d) exceeds max CPUs " "supported by machine 'mach-virt' (%d)", - smp_cpus, max_cpus); + max_cpus, virt_max_cpus); exit(1); } |