From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40088) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bybKV-0003a5-IF for qemu-devel@nongnu.org; Mon, 24 Oct 2016 05:14:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bybKQ-0002ZB-RV for qemu-devel@nongnu.org; Mon, 24 Oct 2016 05:14:03 -0400 Date: Mon, 24 Oct 2016 11:13:40 +0200 From: Andrew Jones Message-ID: <20161024091340.nhvlg2fvaopxixro@hawk.localdomain> References: <1477086782-10479-1-git-send-email-wei@redhat.com> <1477086782-10479-3-git-send-email-wei@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1477086782-10479-3-git-send-email-wei@redhat.com> Subject: Re: [Qemu-devel] [PATCH V7 2/2] arm: virt: add PMU property to mach-virt machine type List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Wei Huang Cc: qemu-arm@nongnu.org, peter.maydell@linaro.org, qemu-devel@nongnu.org, abologna@redhat.com, shannon.zhao@linaro.org On Fri, Oct 21, 2016 at 05:53:02PM -0400, Wei Huang wrote: > 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. > > Signed-off-by: Wei Huang > --- > hw/arm/virt.c | 7 +++++++ > 1 file changed, 7 insertions(+) Reviewed-by: Andrew Jones > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index 074d11c..e64dc4a 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); > @@ -1588,5 +1593,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) > -- > 1.8.3.1 > >