From: Mihai Carabas <mihai.carabas@oracle.com>
To: peter.maydell@linaro.org, shannon.zhaosl@gmail.com,
mst@redhat.com, imammedo@redhat.com
Cc: Mihai Carabas <mihai.carabas@oracle.com>,
qemu-arm@nongnu.org, qemu-devel@nongnu.org
Subject: [PATCH 8/8] pvpanic: break dependency on ISA_BUS
Date: Thu, 22 Oct 2020 10:42:56 +0300 [thread overview]
Message-ID: <1603352576-21671-9-git-send-email-mihai.carabas@oracle.com> (raw)
In-Reply-To: <1603352576-21671-1-git-send-email-mihai.carabas@oracle.com>
pvpanic is supported on ARM VIRT MACHINE as an MMIO device, no need for an ISA
bus.
Signed-off-by: Mihai Carabas <mihai.carabas@oracle.com>
---
hw/arm/Kconfig | 1 +
hw/misc/Kconfig | 2 +-
hw/misc/pvpanic.c | 4 ++++
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index f303c6b..0dd570b 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -26,6 +26,7 @@ config ARM_VIRT
select ACPI_MEMORY_HOTPLUG
select ACPI_HW_REDUCED
select ACPI_NVDIMM
+ select PVPANIC
config CHEETAH
bool
diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig
index 3185456..5924e70 100644
--- a/hw/misc/Kconfig
+++ b/hw/misc/Kconfig
@@ -117,7 +117,7 @@ config IOTKIT_SYSINFO
config PVPANIC
bool
- depends on ISA_BUS
+ depends on ISA_BUS || ARM_VIRT
config AUX
bool
diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c
index 136f1d6..a70adb8 100644
--- a/hw/misc/pvpanic.c
+++ b/hw/misc/pvpanic.c
@@ -105,6 +105,7 @@ static const MemoryRegionOps pvpanic_ops = {
},
};
+#ifdef CONFIG_ISA_BUS
static void pvpanic_isa_initfn(Object *obj)
{
PVPanicISAState *s = PVPANIC_ISA_DEVICE(obj);
@@ -152,6 +153,7 @@ static TypeInfo pvpanic_isa_info = {
.instance_init = pvpanic_isa_initfn,
.class_init = pvpanic_isa_class_init,
};
+#endif
static void pvpanic_mmio_initfn(Object *obj)
{
@@ -180,7 +182,9 @@ static TypeInfo pvpanic_mmio_info = {
static void pvpanic_register_types(void)
{
+#ifdef CONFIG_ISA_BUS
type_register_static(&pvpanic_isa_info);
+#endif
type_register_static(&pvpanic_mmio_info);
}
--
1.8.3.1
next prev parent reply other threads:[~2020-10-22 8:29 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-22 7:42 [PATCH 0/8] Add support for pvpanic mmio device Mihai Carabas
2020-10-22 7:42 ` [PATCH 1/8] hw/misc/pvpanic: Build the pvpanic device for any machine Mihai Carabas
2020-10-22 7:42 ` [PATCH 2/8] hw/misc/pvpanic: Cosmetic renaming Mihai Carabas
2020-10-22 7:42 ` [PATCH 3/8] hw/misc/pvpanic: Add the MMIO interface Mihai Carabas
2020-10-22 7:42 ` [PATCH 4/8] hw/arm/virt: Use the pvpanic device Mihai Carabas
2020-10-22 7:42 ` [PATCH 5/8] hw/arm/virt: add pvpanic device in virt acpi table Mihai Carabas
2020-10-22 7:42 ` [PATCH 6/8] hw/arm/virt: add configure interface for pvpanic-mmio Mihai Carabas
2020-10-22 7:42 ` [PATCH 7/8] pvpanic : update pvpanic document Mihai Carabas
2020-10-22 7:42 ` Mihai Carabas [this message]
2020-10-22 10:17 ` [PATCH 0/8] Add support for pvpanic mmio device Peter Maydell
2020-10-26 13:50 ` Mihai Carabas
2020-10-26 14:32 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1603352576-21671-9-git-send-email-mihai.carabas@oracle.com \
--to=mihai.carabas@oracle.com \
--cc=imammedo@redhat.com \
--cc=mst@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=shannon.zhaosl@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).