[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 05/13] hw/pci: define msi_nonbroken in pci-stub
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 05/13] hw/pci: define msi_nonbroken in pci-stub |
Date: |
Wed, 12 Jul 2017 16:38:01 +0300 |
From: Philippe Mathieu-Daudé <address@hidden>
The kludged field 'msi_nonbroken' is declared in "hw/pci/msi.h" and defined in
hw/pci/msi.c.
When using an ARM config with CONFIG_PCI disabled, hw/pci/msi.c is not included.
Without being PCI-related, the files hw/intc/arm_gicv[23*].c do access this
field (to enable the kludge if PCI is enabled).
The final link fails since hw/pci/msi.c is not included.
Defining this field in pci-stub is safe enough for configs without CONFIG_PCI.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
hw/pci/pci-stub.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/hw/pci/pci-stub.c b/hw/pci/pci-stub.c
index 36d2c430c5..ecad664946 100644
--- a/hw/pci/pci-stub.c
+++ b/hw/pci/pci-stub.c
@@ -24,6 +24,9 @@
#include "qapi/qmp/qerror.h"
#include "hw/pci/pci.h"
#include "qmp-commands.h"
+#include "hw/pci/msi.h"
+
+bool msi_nonbroken;
PciInfoList *qmp_query_pci(Error **errp)
{
--
2.11.0
- [Qemu-trivial] [PULL 00/13] Trivial patches for 2017-07-12, Michael Tokarev, 2017/07/12
- [Qemu-trivial] [PULL 03/13] configure: Fix build with pkg-config and --static --enable-sdl, Michael Tokarev, 2017/07/12
- [Qemu-trivial] [PULL 07/13] elf-loader: warn about invalid endianness, Michael Tokarev, 2017/07/12
- [Qemu-trivial] [PULL 06/13] configure: Handle having no c++ compiler in FORTIFY_SOURCE check, Michael Tokarev, 2017/07/12
- [Qemu-trivial] [PULL 01/13] target/xtensa: gdbstub: drop dead return statement, Michael Tokarev, 2017/07/12
- [Qemu-trivial] [PULL 02/13] util/qemu-sockets: Drop unused helper socket_address_to_string(), Michael Tokarev, 2017/07/12
- [Qemu-trivial] [PULL 12/13] qobject: Catch another straggler for use of qdict_put_str(), Michael Tokarev, 2017/07/12
- [Qemu-trivial] [PULL 08/13] hw/core: fix missing return value in load_image_targphys_as(), Michael Tokarev, 2017/07/12
- [Qemu-trivial] [PULL 10/13] hxtool: remove dead -q option, Michael Tokarev, 2017/07/12
- [Qemu-trivial] [PULL 05/13] hw/pci: define msi_nonbroken in pci-stub,
Michael Tokarev <=
- [Qemu-trivial] [PULL 13/13] qobject: Update coccinelle script to catch Q{INC, DEC}REF, Michael Tokarev, 2017/07/12
- [Qemu-trivial] [PULL 11/13] include/hw/ptimer.h: Add documentation comments, Michael Tokarev, 2017/07/12
- [Qemu-trivial] [PULL 09/13] qga-win32: Fix memory leak of device information set, Michael Tokarev, 2017/07/12
- [Qemu-trivial] [PULL 04/13] hw/misc: add missing includes, Michael Tokarev, 2017/07/12
- Re: [Qemu-trivial] [Qemu-devel] [PULL 00/13] Trivial patches for 2017-07-12, Eric Blake, 2017/07/12