[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 23/33] hw/i386: Include "hw/mem/nvdimm.h"
From: |
Laurent Vivier |
Subject: |
[PULL 23/33] hw/i386: Include "hw/mem/nvdimm.h" |
Date: |
Mon, 9 Mar 2020 16:08:27 +0100 |
From: Philippe Mathieu-Daudé <address@hidden>
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>
Reviewed-by: Richard Henderson <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <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 26777f882844..9a19c14e661b 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 6ab4acb0c62e..362eb2a180ff 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 9088db8fb601..e2d98243bc64 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 84cf925cf43a..d37c425e2236 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.24.1
- [PULL 14/33] hw/alpha/alpha_sys: Remove unused "hw/ide.h" header, (continued)
- [PULL 14/33] hw/alpha/alpha_sys: Remove unused "hw/ide.h" header, Laurent Vivier, 2020/03/09
- [PULL 26/33] core/qdev: fix memleak in qdev_get_gpio_out_connector(), Laurent Vivier, 2020/03/09
- [PULL 20/33] hw/i2c/smbus_ich9: Include "qemu/range.h", Laurent Vivier, 2020/03/09
- [PULL 25/33] hw/i386/pc: Clean up includes, Laurent Vivier, 2020/03/09
- [PULL 16/33] hw/hppa/machine: Include "net/net.h", Laurent Vivier, 2020/03/09
- [PULL 22/33] hw/acpi: Include "hw/mem/nvdimm.h", Laurent Vivier, 2020/03/09
- [PULL 30/33] scsi/scsi-disk: Remove redundant statement in scsi_disk_emulate_command(), Laurent Vivier, 2020/03/09
- [PULL 32/33] display/exynos4210_fimd: Remove redundant statement in exynos4210_fimd_update(), Laurent Vivier, 2020/03/09
- [PULL 31/33] display/pxa2xx_lcd: Remove redundant statement in pxa2xx_palette_parse(), Laurent Vivier, 2020/03/09
- [PULL 28/33] block/file-posix: Remove redundant statement in raw_handle_perm_lock(), Laurent Vivier, 2020/03/09
- [PULL 23/33] hw/i386: Include "hw/mem/nvdimm.h",
Laurent Vivier <=
- [PULL 27/33] block/stream: Remove redundant statement in stream_run(), Laurent Vivier, 2020/03/09
- [PULL 33/33] monitor/hmp-cmds: Remove redundant statement in hmp_rocker_of_dpa_groups(), Laurent Vivier, 2020/03/09
- [PULL 29/33] dma/xlnx-zdma: Remove redundant statement in zdma_write_dst(), Laurent Vivier, 2020/03/09
- Re: [PULL 00/33] Trivial branch patches, no-reply, 2020/03/09
- Re: [PULL 00/33] Trivial branch patches, Peter Maydell, 2020/03/09
- Re: [PULL 00/33] Trivial branch patches, Michael S. Tsirkin, 2020/03/09