[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 16/18] hw/i386: Include "hw/mem/nvdimm.h"
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 16/18] hw/i386: Include "hw/mem/nvdimm.h" |
Date: |
Fri, 28 Feb 2020 12:46:47 +0100 |
All this files use methods/definitions declared in the NVDIMM
device header. Include it.
This fixes (when modifying unrelated headers):
hw/i386/acpi-build.c:2733:9: error: implicit declaration of function
'nvdimm_build_acpi' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
nvdimm_build_acpi(table_offsets, tables_blob, tables->linker,
^
hw/i386/pc.c:1996:61: error: use of undeclared identifier 'TYPE_NVDIMM'
const bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM);
^
hw/i386/pc.c:2032:55: error: use of undeclared identifier 'TYPE_NVDIMM'
bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM);
^
hw/i386/pc.c:2040:9: error: implicit declaration of function 'nvdimm_plug' is
invalid in C99 [-Werror,-Wimplicit-function-declaration]
nvdimm_plug(ms->nvdimms_state);
^
hw/i386/pc.c:2040:9: error: this function declaration is not a prototype
[-Werror,-Wstrict-prototypes]
nvdimm_plug(ms->nvdimms_state);
^
hw/i386/pc.c:2065:42: error: use of undeclared identifier 'TYPE_NVDIMM'
if (object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM)) {
^
hw/i386/pc_i440fx.c:307:9: error: implicit declaration of function
'nvdimm_init_acpi_state' is invalid in C99
[-Werror,-Wimplicit-function-declaration]
nvdimm_init_acpi_state(machine->nvdimms_state, system_io,
^
hw/i386/pc_q35.c:332:9: error: implicit declaration of function
'nvdimm_init_acpi_state' is invalid in C99
[-Werror,-Wimplicit-function-declaration]
nvdimm_init_acpi_state(machine->nvdimms_state, system_io,
^
Acked-by: John Snow <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/i386/acpi-build.c | 1 +
hw/i386/pc.c | 1 +
hw/i386/pc_piix.c | 1 +
hw/i386/pc_q35.c | 1 +
4 files changed, 4 insertions(+)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 9c4e46fa74..9335a82e9f 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -47,6 +47,7 @@
#include "hw/rtc/mc146818rtc_regs.h"
#include "migration/vmstate.h"
#include "hw/mem/memory-device.h"
+#include "hw/mem/nvdimm.h"
#include "sysemu/numa.h"
#include "sysemu/reset.h"
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 6ab4acb0c6..362eb2a180 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -76,6 +76,7 @@
#include "hw/boards.h"
#include "acpi-build.h"
#include "hw/mem/pc-dimm.h"
+#include "hw/mem/nvdimm.h"
#include "qapi/error.h"
#include "qapi/qapi-visit-common.h"
#include "qapi/visitor.h"
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index fa12203079..82f1693901 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -60,6 +60,7 @@
#include "migration/global_state.h"
#include "migration/misc.h"
#include "sysemu/numa.h"
+#include "hw/mem/nvdimm.h"
#define MAX_IDE_BUS 2
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 84cf925cf4..d37c425e22 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -53,6 +53,7 @@
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "sysemu/numa.h"
+#include "hw/mem/nvdimm.h"
/* ICH9 AHCI has 6 ports */
#define MAX_SATA_PORTS 6
--
2.21.1
- [PATCH v2 06/18] hw/i386/intel_iommu: Remove unused includes, (continued)
- [PATCH v2 06/18] hw/i386/intel_iommu: Remove unused includes, Philippe Mathieu-Daudé, 2020/02/28
- [PATCH v2 07/18] hw/alpha/alpha_sys: Remove unused "hw/ide.h" header, Philippe Mathieu-Daudé, 2020/02/28
- [PATCH v2 08/18] hw/alpha/dp264: Include "net/net.h", Philippe Mathieu-Daudé, 2020/02/28
- [PATCH v2 11/18] hw/timer/hpet: Include "exec/address-spaces.h", Philippe Mathieu-Daudé, 2020/02/28
- [PATCH v2 09/18] hw/hppa/machine: Include "net/net.h", Philippe Mathieu-Daudé, 2020/02/28
- [PATCH v2 10/18] hw/acpi/cpu_hotplug: Include "hw/pci/pci.h", Philippe Mathieu-Daudé, 2020/02/28
- [PATCH v2 12/18] hw/pci-host/q35: Include "qemu/range.h", Philippe Mathieu-Daudé, 2020/02/28
- [PATCH v2 13/18] hw/i2c/smbus_ich9: Include "qemu/range.h", Philippe Mathieu-Daudé, 2020/02/28
- [PATCH v2 15/18] hw/acpi: Include "hw/mem/nvdimm.h", Philippe Mathieu-Daudé, 2020/02/28
- [PATCH v2 14/18] hw/pci-host/piix: Include "qemu/range.h", Philippe Mathieu-Daudé, 2020/02/28
- [PATCH v2 16/18] hw/i386: Include "hw/mem/nvdimm.h",
Philippe Mathieu-Daudé <=
- [PATCH v2 17/18] hw/pci-host/q35: Remove unused includes, Philippe Mathieu-Daudé, 2020/02/28
- [PATCH v2 18/18] hw/i386/pc: Clean up includes, Philippe Mathieu-Daudé, 2020/02/28
- Re: [PATCH v2 00/18] hw: Clean up hw/i386 headers (and few alpha/hppa), Richard Henderson, 2020/02/29