From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Aleksandar Markovic" <amarkovic@wavecomp.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
qemu-trivial@nongnu.org,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Igor Mammedov" <imammedo@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"John Snow" <jsnow@redhat.com>,
"Aurelien Jarno" <aurelien@aurel32.net>
Subject: [PATCH v2 15/18] hw/acpi: Include "hw/mem/nvdimm.h"
Date: Fri, 28 Feb 2020 12:46:46 +0100 [thread overview]
Message-ID: <20200228114649.12818-16-philmd@redhat.com> (raw)
In-Reply-To: <20200228114649.12818-1-philmd@redhat.com>
Both ich9.c and piix4.c use methods/definitions declared in the
NVDIMM device header. Include it.
This fixes (when modifying unrelated headers):
hw/acpi/ich9.c:507:46: error: use of undeclared identifier 'TYPE_NVDIMM'
if (object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM)) {
^
hw/acpi/ich9.c:508:13: error: implicit declaration of function 'nvdimm_acpi_plug_cb' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
nvdimm_acpi_plug_cb(hotplug_dev, dev);
^
hw/acpi/piix4.c:403:46: error: use of undeclared identifier 'TYPE_NVDIMM'
if (object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM)) {
^
hw/acpi/piix4.c:404:13: error: implicit declaration of function 'nvdimm_acpi_plug_cb' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
nvdimm_acpi_plug_cb(hotplug_dev, dev);
^
Acked-by: John Snow <jsnow@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/acpi/ich9.c | 1 +
hw/acpi/piix4.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
index fdd0a6c79e..4e74284b65 100644
--- a/hw/acpi/ich9.c
+++ b/hw/acpi/ich9.c
@@ -39,6 +39,7 @@
#include "hw/i386/ich9.h"
#include "hw/mem/pc-dimm.h"
+#include "hw/mem/nvdimm.h"
//#define DEBUG
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
index 6d621c31e7..b84dbba2c3 100644
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -38,6 +38,7 @@
#include "hw/acpi/cpu.h"
#include "hw/hotplug.h"
#include "hw/mem/pc-dimm.h"
+#include "hw/mem/nvdimm.h"
#include "hw/acpi/memory_hotplug.h"
#include "hw/acpi/acpi_dev_interface.h"
#include "hw/xen/xen.h"
--
2.21.1
next prev parent reply other threads:[~2020-02-28 11:58 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-28 11:46 [PATCH v2 00/18] hw: Clean up hw/i386 headers (and few alpha/hppa) Philippe Mathieu-Daudé
2020-02-28 11:46 ` [PATCH v2 01/18] vl: Add missing "hw/boards.h" include Philippe Mathieu-Daudé
2020-02-28 11:46 ` [PATCH v2 02/18] hw/southbridge/ich9: Removed unused headers Philippe Mathieu-Daudé
2020-02-28 11:46 ` [PATCH v2 03/18] hw/i386/ioapic_internal: Remove unused "hw/i386/ioapic.h" header Philippe Mathieu-Daudé
2020-02-28 11:46 ` [PATCH v2 04/18] hw/timer: Remove unused "ui/console.h" header Philippe Mathieu-Daudé
2020-02-28 11:46 ` [PATCH v2 05/18] hw/usb/dev-storage: " Philippe Mathieu-Daudé
2020-02-28 13:19 ` Gerd Hoffmann
2020-02-28 11:46 ` [PATCH v2 06/18] hw/i386/intel_iommu: Remove unused includes Philippe Mathieu-Daudé
2020-02-28 11:46 ` [PATCH v2 07/18] hw/alpha/alpha_sys: Remove unused "hw/ide.h" header Philippe Mathieu-Daudé
2020-02-28 11:46 ` [PATCH v2 08/18] hw/alpha/dp264: Include "net/net.h" Philippe Mathieu-Daudé
2020-02-28 11:46 ` [PATCH v2 09/18] hw/hppa/machine: " Philippe Mathieu-Daudé
2020-02-28 11:46 ` [PATCH v2 10/18] hw/acpi/cpu_hotplug: Include "hw/pci/pci.h" Philippe Mathieu-Daudé
2020-02-28 11:46 ` [PATCH v2 11/18] hw/timer/hpet: Include "exec/address-spaces.h" Philippe Mathieu-Daudé
2020-02-28 11:46 ` [PATCH v2 12/18] hw/pci-host/q35: Include "qemu/range.h" Philippe Mathieu-Daudé
2020-02-28 11:46 ` [PATCH v2 13/18] hw/i2c/smbus_ich9: " Philippe Mathieu-Daudé
2020-02-28 11:46 ` [PATCH v2 14/18] hw/pci-host/piix: " Philippe Mathieu-Daudé
2020-02-28 11:46 ` Philippe Mathieu-Daudé [this message]
2020-02-28 11:46 ` [PATCH v2 16/18] hw/i386: Include "hw/mem/nvdimm.h" Philippe Mathieu-Daudé
2020-02-28 11:46 ` [PATCH v2 17/18] hw/pci-host/q35: Remove unused includes Philippe Mathieu-Daudé
2020-02-28 11:46 ` [PATCH v2 18/18] hw/i386/pc: Clean up includes Philippe Mathieu-Daudé
2020-02-29 19:53 ` [PATCH v2 00/18] hw: Clean up hw/i386 headers (and few alpha/hppa) Richard Henderson
2020-03-09 11:56 ` Laurent Vivier
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=20200228114649.12818-16-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=amarkovic@wavecomp.com \
--cc=aurelien@aurel32.net \
--cc=imammedo@redhat.com \
--cc=jsnow@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
/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).