From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54123) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwGC3-0006sk-9E for qemu-devel@nongnu.org; Wed, 03 Dec 2014 15:06:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XwGBx-0003ZM-3y for qemu-devel@nongnu.org; Wed, 03 Dec 2014 15:06:35 -0500 Received: from mail-ob0-f177.google.com ([209.85.214.177]:34682) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwGBw-0003Z7-W6 for qemu-devel@nongnu.org; Wed, 03 Dec 2014 15:06:29 -0500 Received: by mail-ob0-f177.google.com with SMTP id va2so1630767obc.22 for ; Wed, 03 Dec 2014 12:06:28 -0800 (PST) From: Greg Bellows Date: Wed, 3 Dec 2014 14:06:06 -0600 Message-Id: <1417637167-20640-13-git-send-email-greg.bellows@linaro.org> In-Reply-To: <1417637167-20640-1-git-send-email-greg.bellows@linaro.org> References: <1417637167-20640-1-git-send-email-greg.bellows@linaro.org> Subject: [Qemu-devel] [PATCH 12/13] target-arm: Set CPU secure prop during virt init List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, serge.fdrv@gmail.com, edgar.iglesias@gmail.com, aggelerf@ethz.ch, peter.maydell@linaro.org Cc: Greg Bellows Add setting of the CPU secure property based on the virt machine secure property during initialization. This enables/disables secure state during start-up. Signed-off-by: Greg Bellows --- hw/arm/virt.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index ba034e4..2f075e2 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -547,6 +547,7 @@ static void *machvirt_dtb(const struct arm_boot_info *binfo, int *fdt_size) static void machvirt_init(MachineState *machine) { + VirtMachineState *vms = VIRT_MACHINE(machine); qemu_irq pic[NUM_IRQS]; MemoryRegion *sysmem = get_system_memory(); int n; @@ -584,6 +585,16 @@ static void machvirt_init(MachineState *machine) } cpuobj = object_new(object_class_get_name(oc)); + if (vms->secure) { + Error *err = NULL; + object_property_set_bool(cpuobj, true, "secure", &err); + if (err) { + error_report("'secure' machine property not supported " + "with %s cpu", cpu_model); + exit(1); + } + } + object_property_set_int(cpuobj, QEMU_PSCI_CONDUIT_HVC, "psci-conduit", NULL); -- 1.8.3.2