From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Laurent Vivier <lvivier@redhat.com>,
Peter Maydell <peter.maydell@linaro.org>,
Thomas Huth <thuth@redhat.com>,
Eduardo Habkost <ehabkost@redhat.com>,
Sergio Lopez <slp@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Shannon Zhao <shannon.zhaosl@gmail.com>,
qemu-arm@nongnu.org, Gerd Hoffmann <kraxel@redhat.com>,
Igor Mammedov <imammedo@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Richard Henderson <rth@twiddle.net>
Subject: [PATCH v7 05/21] acpi: ged: add x86 device variant.
Date: Tue, 8 Sep 2020 14:10:34 +0200 [thread overview]
Message-ID: <20200908121050.1162-6-kraxel@redhat.com> (raw)
In-Reply-To: <20200908121050.1162-1-kraxel@redhat.com>
Set AcpiDeviceIfClass->madt_cpu,
otherwise identical to TYPE_ACPI_GED.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
---
include/hw/acpi/generic_event_device.h | 4 +++
hw/i386/generic_event_device_x86.c | 36 ++++++++++++++++++++++++++
hw/i386/meson.build | 1 +
3 files changed, 41 insertions(+)
create mode 100644 hw/i386/generic_event_device_x86.c
diff --git a/include/hw/acpi/generic_event_device.h b/include/hw/acpi/generic_event_device.h
index 4533cddb486c..bd79cfff2b6a 100644
--- a/include/hw/acpi/generic_event_device.h
+++ b/include/hw/acpi/generic_event_device.h
@@ -69,6 +69,10 @@
#define ACPI_GED(obj) \
OBJECT_CHECK(AcpiGedState, (obj), TYPE_ACPI_GED)
+#define TYPE_ACPI_GED_X86 "acpi-ged-x86"
+#define ACPI_GED_X86(obj) \
+ OBJECT_CHECK(AcpiGedX86State, (obj), TYPE_ACPI_GED_X86)
+
#define ACPI_GED_EVT_SEL_OFFSET 0x0
#define ACPI_GED_EVT_SEL_LEN 0x4
diff --git a/hw/i386/generic_event_device_x86.c b/hw/i386/generic_event_device_x86.c
new file mode 100644
index 000000000000..e26fb02a2ef6
--- /dev/null
+++ b/hw/i386/generic_event_device_x86.c
@@ -0,0 +1,36 @@
+/*
+ * x86 variant of the generic event device for hw reduced acpi
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2 or later, as published by the Free Software Foundation.
+ */
+
+#include "qemu/osdep.h"
+#include "hw/acpi/generic_event_device.h"
+#include "hw/i386/pc.h"
+
+static void acpi_ged_x86_class_init(ObjectClass *class, void *data)
+{
+ AcpiDeviceIfClass *adevc = ACPI_DEVICE_IF_CLASS(class);
+
+ adevc->madt_cpu = pc_madt_cpu_entry;
+}
+
+static const TypeInfo acpi_ged_x86_info = {
+ .name = TYPE_ACPI_GED_X86,
+ .parent = TYPE_ACPI_GED,
+ .class_init = acpi_ged_x86_class_init,
+ .interfaces = (InterfaceInfo[]) {
+ { TYPE_HOTPLUG_HANDLER },
+ { TYPE_ACPI_DEVICE_IF },
+ { }
+ }
+};
+
+static void acpi_ged_x86_register_types(void)
+{
+ type_register_static(&acpi_ged_x86_info);
+}
+
+type_init(acpi_ged_x86_register_types)
diff --git a/hw/i386/meson.build b/hw/i386/meson.build
index 63918fbe22f9..1a7d1a685d77 100644
--- a/hw/i386/meson.build
+++ b/hw/i386/meson.build
@@ -18,6 +18,7 @@ i386_ss.add(when: 'CONFIG_VMPORT', if_true: files('vmport.c'))
i386_ss.add(when: 'CONFIG_VTD', if_true: files('intel_iommu.c'))
i386_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-common.c'))
+i386_ss.add(when: 'CONFIG_ACPI_HW_REDUCED', if_true: files('generic_event_device_x86.c'))
i386_ss.add(when: 'CONFIG_PC', if_true: files(
'pc.c',
'pc_sysfw.c',
--
2.27.0
next prev parent reply other threads:[~2020-09-08 12:20 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-08 12:10 [PATCH v7 00/21] microvm: add acpi support Gerd Hoffmann
2020-09-08 12:10 ` [PATCH v7 01/21] microvm: name qboot binary qboot.rom Gerd Hoffmann
2020-09-08 12:17 ` Philippe Mathieu-Daudé
2020-09-08 12:10 ` [PATCH v7 02/21] seabios: add microvm config, update build rules Gerd Hoffmann
2020-09-08 12:10 ` [PATCH v7 03/21] seabios: add bios-microvm.bin binary Gerd Hoffmann
2020-09-08 12:10 ` [PATCH v7 04/21] acpi: ged: add control regs Gerd Hoffmann
2020-09-08 12:10 ` Gerd Hoffmann [this message]
2020-09-08 12:10 ` [PATCH v7 06/21] acpi: move acpi_dsdt_add_power_button() to ged Gerd Hoffmann
2020-09-08 12:10 ` [PATCH v7 07/21] microvm: make virtio irq base runtime configurable Gerd Hoffmann
2020-09-08 12:10 ` [PATCH v7 08/21] microvm/acpi: add minimal acpi support Gerd Hoffmann
2020-09-08 12:10 ` [PATCH v7 09/21] microvm/acpi: add acpi_dsdt_add_virtio() for x86 Gerd Hoffmann
2020-09-08 12:10 ` [PATCH v7 10/21] microvm/acpi: use GSI 16-23 for virtio Gerd Hoffmann
2020-09-08 12:10 ` [PATCH v7 11/21] microvm/acpi: use seabios with acpi=on Gerd Hoffmann
2020-09-08 12:10 ` [PATCH v7 12/21] microvm/acpi: disable virtio-mmio cmdline hack Gerd Hoffmann
2020-09-08 12:10 ` [PATCH v7 13/21] x86: constify x86_machine_is_*_enabled Gerd Hoffmann
2020-09-08 12:17 ` Philippe Mathieu-Daudé
2020-09-08 12:10 ` [PATCH v7 14/21] x86: move acpi_dev from pc/microvm Gerd Hoffmann
2020-09-08 12:10 ` [PATCH v7 15/21] x86: move cpu hotplug from pc to x86 Gerd Hoffmann
2020-09-08 12:10 ` [PATCH v7 16/21] microvm: wire up hotplug Gerd Hoffmann
2020-09-08 12:10 ` [PATCH v7 17/21] tests/acpi: allow microvm test data updates Gerd Hoffmann
2020-09-08 12:10 ` [PATCH v7 18/21] tests/acpi: allow override blkdev Gerd Hoffmann
2020-09-08 12:10 ` [PATCH v7 19/21] tests/acpi: add microvm test Gerd Hoffmann
2020-09-08 12:10 ` [PATCH v7 20/21] tests/acpi: update expected data files for microvm Gerd Hoffmann
2020-09-08 12:10 ` [PATCH v7 21/21] microvm: enable ramfb Gerd Hoffmann
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=20200908121050.1162-6-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=ehabkost@redhat.com \
--cc=imammedo@redhat.com \
--cc=lvivier@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
--cc=shannon.zhaosl@gmail.com \
--cc=slp@redhat.com \
--cc=thuth@redhat.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).