qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Aleksandar Markovic" <amarkovic@wavecomp.com>,
	"Aleksandar Rikalo" <arikalo@wavecomp.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	"Aurelien Jarno" <aurelien@aurel32.net>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Igor Mammedov" <imammedo@redhat.com>,
	"Corey Minyard" <minyard@acm.org>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [Qemu-devel] [PATCH v2 5/6] stubs: Add missing ACPI symbols
Date: Sun, 28 Apr 2019 08:47:30 +0200	[thread overview]
Message-ID: <20190428064731.29913-6-philmd@redhat.com> (raw)
In-Reply-To: <20190428064731.29913-1-philmd@redhat.com>

When building with ACPI disabled, we get:

  /usr/bin/ld: hw/i386/pc.o: in function `bochs_bios_init':
  /source/qemu/hw/i386/pc.c:1017: undefined reference to `acpi_tables_len'
  /usr/bin/ld: /source/qemu/hw/i386/pc.c:1017: undefined reference to `acpi_tables'
  collect2: error: ld returned 1 exit status
  make[1]: *** [Makefile:204: qemu-system-x86_64] Error 1

These symbols are indeed declared as extern in "hw/acpi/acpi.h".
Add them as stub to satisfy the linker.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 stubs/acpi.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/stubs/acpi.c b/stubs/acpi.c
index 4c9d081ed48..cd0119f9fb1 100644
--- a/stubs/acpi.c
+++ b/stubs/acpi.c
@@ -23,6 +23,10 @@
 #include "qapi/qmp/qerror.h"
 #include "hw/acpi/acpi.h"
 
+size_t acpi_tables_len;
+
+char unsigned *acpi_tables;
+
 void acpi_table_add(const QemuOpts *opts, Error **errp)
 {
     error_setg(errp, QERR_UNSUPPORTED);
-- 
2.20.1

WARNING: multiple messages have this Message-ID (diff)
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Corey Minyard" <minyard@acm.org>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	"Aleksandar Rikalo" <arikalo@wavecomp.com>,
	"Aleksandar Markovic" <amarkovic@wavecomp.com>,
	"Igor Mammedov" <imammedo@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Aurelien Jarno" <aurelien@aurel32.net>
Subject: [Qemu-devel] [PATCH v2 5/6] stubs: Add missing ACPI symbols
Date: Sun, 28 Apr 2019 08:47:30 +0200	[thread overview]
Message-ID: <20190428064731.29913-6-philmd@redhat.com> (raw)
Message-ID: <20190428064730.VL_jEo43ht-sUCLChTZ8WqNMH9aZ_WlYUBBPaFNSNpo@z> (raw)
In-Reply-To: <20190428064731.29913-1-philmd@redhat.com>

When building with ACPI disabled, we get:

  /usr/bin/ld: hw/i386/pc.o: in function `bochs_bios_init':
  /source/qemu/hw/i386/pc.c:1017: undefined reference to `acpi_tables_len'
  /usr/bin/ld: /source/qemu/hw/i386/pc.c:1017: undefined reference to `acpi_tables'
  collect2: error: ld returned 1 exit status
  make[1]: *** [Makefile:204: qemu-system-x86_64] Error 1

These symbols are indeed declared as extern in "hw/acpi/acpi.h".
Add them as stub to satisfy the linker.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 stubs/acpi.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/stubs/acpi.c b/stubs/acpi.c
index 4c9d081ed48..cd0119f9fb1 100644
--- a/stubs/acpi.c
+++ b/stubs/acpi.c
@@ -23,6 +23,10 @@
 #include "qapi/qmp/qerror.h"
 #include "hw/acpi/acpi.h"
 
+size_t acpi_tables_len;
+
+char unsigned *acpi_tables;
+
 void acpi_table_add(const QemuOpts *opts, Error **errp)
 {
     error_setg(errp, QERR_UNSUPPORTED);
-- 
2.20.1



  parent reply	other threads:[~2019-04-28  6:48 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-28  6:47 [Qemu-devel] [PATCH v2 0/6] hw/acpi: Improve build modularity (targeting MIPS/PPC) Philippe Mathieu-Daudé
2019-04-28  6:47 ` Philippe Mathieu-Daudé
2019-04-28  6:47 ` [Qemu-devel] [PATCH v2 1/6] hw/acpi: Move the IPMI stub to the stubs/ directory Philippe Mathieu-Daudé
2019-04-28  6:47   ` Philippe Mathieu-Daudé
2019-05-02 13:24   ` Corey Minyard
2019-05-02 13:24     ` Corey Minyard
2019-05-02 16:28     ` Philippe Mathieu-Daudé
2019-05-02 16:28       ` Philippe Mathieu-Daudé
2019-04-28  6:47 ` [Qemu-devel] [PATCH v2 2/6] hw/acpi: Move the ACPI " Philippe Mathieu-Daudé
2019-04-28  6:47   ` Philippe Mathieu-Daudé
2019-04-28  6:47 ` [Qemu-devel] [PATCH v2 3/6] hw/acpi: Simplify the Makefile logic Philippe Mathieu-Daudé
2019-04-28  6:47   ` Philippe Mathieu-Daudé
2019-04-28  6:47 ` [Qemu-devel] [PATCH v2 4/6] hw/acpi: Always build the 'core' ACPI functions Philippe Mathieu-Daudé
2019-04-28  6:47   ` Philippe Mathieu-Daudé
2019-04-28  6:47 ` Philippe Mathieu-Daudé [this message]
2019-04-28  6:47   ` [Qemu-devel] [PATCH v2 5/6] stubs: Add missing ACPI symbols Philippe Mathieu-Daudé
2019-04-28  6:47 ` [Qemu-devel] [PATCH v2 6/6] vl: Do not set acpi_enabled when ACPI is disabled at build time Philippe Mathieu-Daudé
2019-04-28  6:47   ` Philippe Mathieu-Daudé

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=20190428064731.29913-6-philmd@redhat.com \
    --to=philmd@redhat.com \
    --cc=amarkovic@wavecomp.com \
    --cc=arikalo@wavecomp.com \
    --cc=aurelien@aurel32.net \
    --cc=imammedo@redhat.com \
    --cc=minyard@acm.org \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@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).