From patchwork Mon Dec 3 19:26:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Hao X-Patchwork-Id: 10709181 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DAC361057 for ; Mon, 3 Dec 2018 11:06:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CB3182A888 for ; Mon, 3 Dec 2018 11:06:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BF4AC2AE48; Mon, 3 Dec 2018 11:06:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=2.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6AC2C2A888 for ; Mon, 3 Dec 2018 11:06:50 +0000 (UTC) Received: from localhost ([::1]:47958 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gTm3t-000662-Kq for patchwork-qemu-devel@patchwork.kernel.org; Mon, 03 Dec 2018 06:06:49 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51848) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gTm1h-00046y-JR for qemu-devel@nongnu.org; Mon, 03 Dec 2018 06:04:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gTm1g-0002eh-Gj for qemu-devel@nongnu.org; Mon, 03 Dec 2018 06:04:33 -0500 Received: from mxhk.zte.com.cn ([63.217.80.70]:21106) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gTm1c-0002Vh-Rs; Mon, 03 Dec 2018 06:04:29 -0500 Received: from mse01.zte.com.cn (unknown [10.30.3.20]) by Forcepoint Email with ESMTPS id 06E6613392A868DECE5E; Mon, 3 Dec 2018 19:04:23 +0800 (CST) Received: from notes_smtp.zte.com.cn ([10.30.1.239]) by mse01.zte.com.cn with ESMTP id wB3B4CPF097927; Mon, 3 Dec 2018 19:04:12 +0800 (GMT-8) (envelope-from peng.hao2@zte.com.cn) Received: from localhost.localdomain.localdomain ([10.74.120.59]) by szsmtp06.zte.com.cn (Lotus Domino Release 8.5.3FP6) with ESMTP id 2018120319042060-14451331 ; Mon, 3 Dec 2018 19:04:20 +0800 From: Peng Hao To: peter.maydell@linaro.org, drjones@redhat.com, philmd@redhat.com Date: Tue, 4 Dec 2018 03:26:47 +0800 Message-Id: <1543865209-50994-7-git-send-email-peng.hao2@zte.com.cn> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1543865209-50994-1-git-send-email-peng.hao2@zte.com.cn> References: <1543865209-50994-1-git-send-email-peng.hao2@zte.com.cn> X-MIMETrack: Itemize by SMTP Server on SZSMTP06/server/zte_ltd(Release 8.5.3FP6|November 21, 2013) at 2018-12-03 19:04:20, Serialize by Router on notes_smtp/zte_ltd(Release 9.0.1FP7|August 17, 2016) at 2018-12-03 19:04:12, Serialize complete at 2018-12-03 19:04:12 X-MAIL: mse01.zte.com.cn wB3B4CPF097927 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 63.217.80.70 Subject: [Qemu-devel] [PATCH V11 6/8] hw/arm/virt: add configure interface for pvpanic-mmio X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peng Hao , qemu-arm@nongnu.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add configure interface for pvpanic-mmio device in virt machine. Signed-off-by: Peng Hao Reviewed-by: Andrew Jones --- hw/arm/virt.c | 23 +++++++++++++++++++++++ include/hw/arm/virt.h | 1 + 2 files changed, 24 insertions(+) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index a4541fa..fdd3f20 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1655,6 +1655,20 @@ static void virt_set_its(Object *obj, bool value, Error **errp) vms->its = value; } +static bool virt_get_pvpanic(Object *obj, Error **errp) +{ + VirtMachineState *vms = VIRT_MACHINE(obj); + + return vms->pvpanic; +} + +static void virt_set_pvpanic(Object *obj, bool value, Error **errp) +{ + VirtMachineState *vms = VIRT_MACHINE(obj); + + vms->pvpanic = value; +} + static char *virt_get_gic_version(Object *obj, Error **errp) { VirtMachineState *vms = VIRT_MACHINE(obj); @@ -1884,6 +1898,15 @@ static void virt_3_1_instance_init(Object *obj) "Valid values are none and smmuv3", NULL); + /* Default disallows pvpanic-mmio instantiation */ + vms->pvpanic = false; + object_property_add_bool(obj, "pvpanic", virt_get_pvpanic, + virt_set_pvpanic, NULL); + object_property_set_description(obj, "pvpanic", + "Set on/off to enable/disable " + "PVPANIC MMIO device", + NULL); + vms->memmap = a15memmap; vms->irqmap = a15irqmap; } diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index 937c124..7d6d1c0 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -113,6 +113,7 @@ typedef struct { bool highmem; bool highmem_ecam; bool its; + bool pvpanic; bool virt; int32_t gic_version; VirtIOMMUType iommu;