[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 7/9] arm: virt: add PMU property to mach-virt machine
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 7/9] arm: virt: add PMU property to mach-virt machine type |
Date: |
Fri, 28 Oct 2016 15:59:22 +0100 |
From: Wei Huang <address@hidden>
CPU vPMU is now turned ON by default, but this feature wasn't introduced
until virt-2.7 machine type. To solve this problem, this patch adds a
PMU option in machine state, which is used to control CPU's vPMU status.
This PMU option is not exposed to command line and is turned off in
virt-2.6 machine type.
Reviewed-by: Andrew Jones <address@hidden>
Signed-off-by: Wei Huang <address@hidden>
Message-id: address@hidden
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
---
hw/arm/virt.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 32c95fb..54a8b28 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -85,6 +85,7 @@ typedef struct {
VirtBoardInfo *daughterboard;
bool disallow_affinity_adjustment;
bool no_its;
+ bool no_pmu;
} VirtMachineClass;
typedef struct {
@@ -1353,6 +1354,10 @@ static void machvirt_init(MachineState *machine)
}
}
+ if (vmc->no_pmu && object_property_find(cpuobj, "pmu", NULL)) {
+ object_property_set_bool(cpuobj, false, "pmu", NULL);
+ }
+
if (object_property_find(cpuobj, "reset-cbar", NULL)) {
object_property_set_int(cpuobj, vbi->memmap[VIRT_CPUPERIPHS].base,
"reset-cbar", &error_abort);
@@ -1592,5 +1597,7 @@ static void virt_machine_2_6_options(MachineClass *mc)
virt_machine_2_7_options(mc);
SET_MACHINE_COMPAT(mc, VIRT_COMPAT_2_6);
vmc->disallow_affinity_adjustment = true;
+ /* Disable PMU for 2.6 as PMU support was first introduced in 2.7 */
+ vmc->no_pmu = true;
}
DEFINE_VIRT_MACHINE(2, 6)
--
2.7.4
- [Qemu-devel] [PULL 0/9] target-arm queue, Peter Maydell, 2016/10/28
- [Qemu-devel] [PULL 8/9] hw/arm/spitz: Fix reset handling, Peter Maydell, 2016/10/28
- [Qemu-devel] [PULL 7/9] arm: virt: add PMU property to mach-virt machine type,
Peter Maydell <=
- [Qemu-devel] [PULL 3/9] hw/arm/pxa2xx: Set value default values for CCCR and CKEN on PXA255, Peter Maydell, 2016/10/28
- [Qemu-devel] [PULL 9/9] hw/arm/tosa: Fix reset handling, Peter Maydell, 2016/10/28
- [Qemu-devel] [PULL 5/9] char: cadence: correct reset value for baud rate registers, Peter Maydell, 2016/10/28
- [Qemu-devel] [PULL 4/9] versatilepb: do not run if user asks for more than 256MB RAM, Peter Maydell, 2016/10/28
- [Qemu-devel] [PULL 6/9] arm: Add an option to turn on/off vPMU support, Peter Maydell, 2016/10/28
- [Qemu-devel] [PULL 1/9] i.MX: Fix GPIO ISR register write, Peter Maydell, 2016/10/28
- [Qemu-devel] [PULL 2/9] arm: cubieboard: Add support for initrd, Peter Maydell, 2016/10/28
- Re: [Qemu-devel] [PULL 0/9] target-arm queue, Peter Maydell, 2016/10/31