[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V11 7/8] hw/arm/virt: use the configure interface
From: |
Peng Hao |
Subject: |
[Qemu-devel] [PATCH V11 7/8] hw/arm/virt: use the configure interface |
Date: |
Tue, 4 Dec 2018 03:26:48 +0800 |
Use the configure interface for pvpanic-mmio.
Signed-off-by: Peng Hao <address@hidden>
---
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,
VirtMachineState *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_TRANSPORTS);
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 VirtMachineState
*vms)
hwaddr base = vms->memmap[VIRT_PVPANIC].base;
hwaddr size = vms->memmap[VIRT_PVPANIC].size;
+ if (!vms->pvpanic) {
+ return;
+ }
sysbus_create_simple(TYPE_PVPANIC_MMIO, base, NULL);
nodename = g_strdup_printf("/address@hidden" PRIx64, base);
--
1.8.3.1
- [Qemu-devel] [PATCH V11 0/8] add pvpanic mmio support, Peng Hao, 2018/12/03
- [Qemu-devel] [PATCH V11 5/8] hw/arm/virt: add pvpanic device in virt acpi table, Peng Hao, 2018/12/03
- [Qemu-devel] [PATCH V11 6/8] hw/arm/virt: add configure interface for pvpanic-mmio, Peng Hao, 2018/12/03
- [Qemu-devel] [PATCH V11 4/8] hw/arm/virt: Use the pvpanic device, Peng Hao, 2018/12/03
- [Qemu-devel] [PATCH V11 8/8] pvpanic : update pvpanic document, Peng Hao, 2018/12/03
- [Qemu-devel] [PATCH V11 3/8] hw/misc/pvpanic: Add the MMIO interface, Peng Hao, 2018/12/03
- [Qemu-devel] [PATCH V11 1/8] hw/misc/pvpanic: Build the pvpanic device in $(common-obj), Peng Hao, 2018/12/03
- [Qemu-devel] [PATCH V11 7/8] hw/arm/virt: use the configure interface,
Peng Hao <=
- [Qemu-devel] [PATCH V11 2/8] hw/misc/pvpanic: Cosmetic renaming, Peng Hao, 2018/12/03
- Re: [Qemu-devel] [PATCH V11 0/8] add pvpanic mmio support, Peter Maydell, 2018/12/03
Re: [Qemu-devel] [PATCH V11 0/8] add pvpanic mmio support, Daniel P . Berrangé, 2018/12/04