qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: Markus Armbruster <armbru@redhat.com>, qemu-devel@nongnu.org
Cc: "Fam Zheng" <fam@euphon.net>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	"Matthew Rosato" <mjrosato@linux.ibm.com>,
	"Paul Durrant" <paul@xen.org>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Gerd Hoffmann" <kraxel@redhat.com>,
	"Stefano Stabellini" <sstabellini@kernel.org>,
	qemu-block@nongnu.org, "Helge Deller" <deller@gmx.de>,
	"David Hildenbrand" <david@redhat.com>,
	"Halil Pasic" <pasic@linux.ibm.com>,
	"Christian Borntraeger" <borntraeger@de.ibm.com>,
	"Anthony Perard" <anthony.perard@citrix.com>,
	xen-devel@lists.xenproject.org,
	"Eduardo Habkost" <ehabkost@redhat.com>,
	"Xie Changlong" <xiechanglong.d@gmail.com>,
	qemu-s390x@nongnu.org, qemu-arm@nongnu.org,
	"Stefan Hajnoczi" <stefanha@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"John Snow" <jsnow@redhat.com>,
	"Richard Henderson" <rth@twiddle.net>,
	"Kevin Wolf" <kwolf@redhat.com>,
	"Wen Congyang" <wencongyang2@huawei.com>,
	"Cornelia Huck" <cohuck@redhat.com>,
	"Max Reitz" <mreitz@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	"Igor Mammedov" <imammedo@redhat.com>
Subject: [PATCH 18/20] hw/i386: Include "hw/mem/nvdimm.h"
Date: Mon, 14 Oct 2019 16:22:44 +0200	[thread overview]
Message-ID: <20191014142246.4538-19-philmd@redhat.com> (raw)
In-Reply-To: <20191014142246.4538-1-philmd@redhat.com>

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,
        ^

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 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 4e0f9f425a..ac46936f63 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -48,6 +48,7 @@
 #include "hw/timer/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 bcda50efcc..cff330802d 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -73,6 +73,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 6824b72124..8651b6e2ec 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -58,6 +58,7 @@
 #include "migration/misc.h"
 #include "kvm_i386.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 8fad20f314..91ba231ef1 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.0



  parent reply	other threads:[~2019-10-14 14:39 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-14 14:22 [PATCH 00/20] hw: Clean up hw/i386 headers (and few alpha/hppa) Philippe Mathieu-Daudé
2019-10-14 14:22 ` [PATCH 01/20] vl: Add missing "hw/boards.h" include Philippe Mathieu-Daudé
2019-10-14 14:22 ` [PATCH 02/20] hw/southbridge/ich9: Removed unused headers Philippe Mathieu-Daudé
2019-10-14 17:01   ` John Snow
2019-10-14 14:22 ` [PATCH 03/20] hw/input/pckbd: Remove unused "hw/i386/pc.h" header Philippe Mathieu-Daudé
2019-10-14 14:22 ` [PATCH 04/20] hw/i386/ioapic_internal: Remove unused "hw/i386/ioapic.h" header Philippe Mathieu-Daudé
2019-10-14 14:22 ` [PATCH 05/20] hw/timer: Remove unused "ui/console.h" header Philippe Mathieu-Daudé
2019-10-14 14:22 ` [PATCH 06/20] hw/usb/dev-storage: " Philippe Mathieu-Daudé
2019-10-14 14:22 ` [PATCH 07/20] hw/i386/intel_iommu: Remove unused includes Philippe Mathieu-Daudé
2019-10-14 14:22 ` [PATCH 08/20] hw/xen/xen_pt_load_rom: " Philippe Mathieu-Daudé
2019-10-14 14:29   ` Paul Durrant
2020-02-27 12:18     ` Anthony PERARD
2019-10-14 14:22 ` [PATCH 09/20] hw/alpha/alpha_sys: Remove unused "hw/ide.h" header Philippe Mathieu-Daudé
2019-10-14 14:22 ` [PATCH 10/20] hw/alpha/dp264: Include "net/net.h" Philippe Mathieu-Daudé
2019-10-14 14:22 ` [PATCH 11/20] hw/hppa/machine: " Philippe Mathieu-Daudé
2019-10-14 14:22 ` [PATCH 12/20] hw/acpi/cpu_hotplug: Include "hw/pci/pci.h" Philippe Mathieu-Daudé
2019-10-14 14:22 ` [PATCH 13/20] hw/timer/hpet: Include "exec/address-spaces.h" Philippe Mathieu-Daudé
2019-10-14 14:22 ` [PATCH 14/20] hw/pci-host/q35: Include "qemu/range.h" Philippe Mathieu-Daudé
2019-10-14 14:22 ` [PATCH 15/20] hw/i2c/smbus_ich9: " Philippe Mathieu-Daudé
2019-10-14 14:22 ` [PATCH 16/20] hw/pci-host/piix: " Philippe Mathieu-Daudé
2019-10-14 14:22 ` [PATCH 17/20] hw/acpi: Include "hw/mem/nvdimm.h" Philippe Mathieu-Daudé
2019-10-14 14:22 ` Philippe Mathieu-Daudé [this message]
2019-10-14 14:22 ` [PATCH 19/20] hw/pci-host/q35: Remove unused includes Philippe Mathieu-Daudé
2019-10-14 14:22 ` [PATCH 20/20] hw/i386/pc: Clean up includes Philippe Mathieu-Daudé
2019-10-14 17:03 ` [PATCH 00/20] hw: Clean up hw/i386 headers (and few alpha/hppa) John Snow
2019-10-26 12:20 ` Philippe Mathieu-Daudé
2019-10-26 13:32   ` Laurent Vivier
2020-02-27 13:28     ` Paolo Bonzini
2020-03-09 11:57       ` 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=20191014142246.4538-19-philmd@redhat.com \
    --to=philmd@redhat.com \
    --cc=anthony.perard@citrix.com \
    --cc=armbru@redhat.com \
    --cc=borntraeger@de.ibm.com \
    --cc=cohuck@redhat.com \
    --cc=david@redhat.com \
    --cc=deller@gmx.de \
    --cc=ehabkost@redhat.com \
    --cc=fam@euphon.net \
    --cc=imammedo@redhat.com \
    --cc=jsnow@redhat.com \
    --cc=kraxel@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=mjrosato@linux.ibm.com \
    --cc=mreitz@redhat.com \
    --cc=mst@redhat.com \
    --cc=pasic@linux.ibm.com \
    --cc=paul@xen.org \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-s390x@nongnu.org \
    --cc=rth@twiddle.net \
    --cc=sstabellini@kernel.org \
    --cc=stefanha@redhat.com \
    --cc=wencongyang2@huawei.com \
    --cc=xen-devel@lists.xenproject.org \
    --cc=xiechanglong.d@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).