From nobody Thu Nov 6 22:56:53 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1543835402423549.0976989663191; Mon, 3 Dec 2018 03:10:02 -0800 (PST) Received: from localhost ([::1]:47969 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gTm6z-0000Ty-8C for importer@patchew.org; Mon, 03 Dec 2018 06:10:01 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51885) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gTm1i-00048N-Tz for qemu-devel@nongnu.org; Mon, 03 Dec 2018 06:04:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gTm1h-0002fy-Ln for qemu-devel@nongnu.org; Mon, 03 Dec 2018 06:04:34 -0500 Received: from out1.zte.com.cn ([202.103.147.172]:58682 helo=mxct.zte.com.cn) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gTm1c-0002Ym-FK; Mon, 03 Dec 2018 06:04:28 -0500 Received: from mse01.zte.com.cn (unknown [10.30.3.20]) by Forcepoint Email with ESMTPS id 7CED758095A4319E685D; Mon, 3 Dec 2018 19:04:26 +0800 (CST) Received: from notes_smtp.zte.com.cn ([10.30.1.239]) by mse01.zte.com.cn with ESMTP id wB3B4EmT097970; Mon, 3 Dec 2018 19:04:14 +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 2018120319042187-14451343 ; Mon, 3 Dec 2018 19:04:21 +0800 From: Peng Hao To: peter.maydell@linaro.org, drjones@redhat.com, philmd@redhat.com Date: Tue, 4 Dec 2018 03:26:48 +0800 Message-Id: <1543865209-50994-8-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:21, Serialize by Router on notes_smtp/zte_ltd(Release 9.0.1FP7|August 17, 2016) at 2018-12-03 19:04:14, Serialize complete at 2018-12-03 19:04:14 X-MAIL: mse01.zte.com.cn wB3B4EmT097970 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 202.103.147.172 Subject: [Qemu-devel] [PATCH V11 7/8] hw/arm/virt: use the configure interface 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use the configure interface for pvpanic-mmio. Signed-off-by: Peng Hao --- hw/arm/virt-acpi-build.c | 5 ++++- hw/arm/virt.c | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 4215ca6..4990a0d 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -785,7 +785,10 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, Vir= tMachineState *vms) acpi_dsdt_add_uart(scope, &memmap[VIRT_UART], (irqmap[VIRT_UART] + ARM_SPI_BASE)); acpi_dsdt_add_flash(scope, &memmap[VIRT_FLASH]); - acpi_dsdt_add_pvpanic(scope, &memmap[VIRT_PVPANIC]); + + if (vms->pvpanic) { + acpi_dsdt_add_pvpanic(scope, &memmap[VIRT_PVPANIC]); + } acpi_dsdt_add_fw_cfg(scope, &memmap[VIRT_FW_CFG]); acpi_dsdt_add_virtio(scope, &memmap[VIRT_MMIO], (irqmap[VIRT_MMIO] + ARM_SPI_BASE), NUM_VIRTIO_TRANSPO= RTS); diff --git a/hw/arm/virt.c b/hw/arm/virt.c index fdd3f20..a63e9e1 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -198,6 +198,9 @@ static void create_pvpanic_device(const VirtMachineStat= e *vms) hwaddr base =3D vms->memmap[VIRT_PVPANIC].base; hwaddr size =3D vms->memmap[VIRT_PVPANIC].size; =20 + if (!vms->pvpanic) { + return; + } sysbus_create_simple(TYPE_PVPANIC_MMIO, base, NULL); =20 nodename =3D g_strdup_printf("/pvpanic-mmio@%" PRIx64, base); --=20 1.8.3.1