[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/23] hw/char/parallel: Make it possible to compile
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 06/23] hw/char/parallel: Make it possible to compile also without CONFIG_PARALLEL |
Date: |
Wed, 27 Mar 2019 13:37:44 +0100 |
From: Thomas Huth <address@hidden>
For the downstream distribution of QEMU, we want to compile without
CONFIG_PARALLEL. Commit 9157eee1b1c076ff3 already moved the function
parallel_hds_isa_init() (which is still required for linking) into a file
that is included anyway, but commit bb3d5ea858e7f888563a moved it
to a separate file which is only compiled again if CONFIG_PARALLEL is
set. To be able to link QEMU again without CONFIG_PARALLEL, the file
should be considered for linking for all targets that have CONFIG_ISA_BUS.
And while we're at it, add a proper comment in there with the rationale
for the separate file.
Signed-off-by: Thomas Huth <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/char/Makefile.objs | 2 +-
hw/char/parallel-isa.c | 3 +++
hw/i386/Kconfig | 3 +--
hw/sparc64/Kconfig | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/hw/char/Makefile.objs b/hw/char/Makefile.objs
index c4947d7..cf086e7 100644
--- a/hw/char/Makefile.objs
+++ b/hw/char/Makefile.objs
@@ -2,7 +2,7 @@ common-obj-$(CONFIG_IPACK) += ipoctal232.o
common-obj-$(CONFIG_ESCC) += escc.o
common-obj-$(CONFIG_NRF51_SOC) += nrf51_uart.o
common-obj-$(CONFIG_PARALLEL) += parallel.o
-common-obj-$(CONFIG_PARALLEL) += parallel-isa.o
+common-obj-$(CONFIG_ISA_BUS) += parallel-isa.o
common-obj-$(CONFIG_PL011) += pl011.o
common-obj-$(CONFIG_SERIAL) += serial.o
common-obj-$(CONFIG_SERIAL_ISA) += serial-isa.o
diff --git a/hw/char/parallel-isa.c b/hw/char/parallel-isa.c
index 639e179..a043832 100644
--- a/hw/char/parallel-isa.c
+++ b/hw/char/parallel-isa.c
@@ -1,6 +1,9 @@
/*
* QEMU Parallel PORT (ISA bus helpers)
*
+ * These functions reside in a separate file since they also might be
+ * required for linking when compiling QEMU without CONFIG_PARALLEL.
+ *
* Copyright (c) 2003 Fabrice Bellard
*
* SPDX-License-Identifier: MIT
diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig
index 78fd703..4e4415f 100644
--- a/hw/i386/Kconfig
+++ b/hw/i386/Kconfig
@@ -9,6 +9,7 @@ config PC
imply ISA_IPMI_KCS
imply ISA_IPMI_BT
imply ISA_DEBUG
+ imply PARALLEL
imply PCI_DEVICES
imply PVPANIC
imply QXL
@@ -25,8 +26,6 @@ config PC
select I82374
select I8257
select MC146818RTC
- # Needed by the board code:
- select PARALLEL
# For ACPI builder:
select SERIAL_ISA
select ACPI_VMGENID
diff --git a/hw/sparc64/Kconfig b/hw/sparc64/Kconfig
index 4a8166e..d4d76a8 100644
--- a/hw/sparc64/Kconfig
+++ b/hw/sparc64/Kconfig
@@ -3,13 +3,13 @@ config SUN4U
imply PCI_DEVICES
imply SUNHME
imply TEST_DEVICES
+ imply PARALLEL
select M48T59
select ISA_BUS
select FDC
select SERIAL_ISA
select PCI_SABRE
select IDE_CMD646
- select PARALLEL
select PCKBD
select SIMBA
--
1.8.3.1
- [Qemu-devel] [PULL 00/23] Misc patches for QEMU 4.0-rc, mostly Kconfig refinements, Paolo Bonzini, 2019/03/27
- [Qemu-devel] [PULL 03/23] kconfig: add dependencies on CONFIG_MSI_NONBROKEN, Paolo Bonzini, 2019/03/27
- [Qemu-devel] [PULL 01/23] riscv: plic: Set msi_nonbroken as true, Paolo Bonzini, 2019/03/27
- [Qemu-devel] [PULL 05/23] target/i386: sev: Do not pin the ram device memory region, Paolo Bonzini, 2019/03/27
- [Qemu-devel] [PULL 04/23] memory: Fix the memory region type assignment order, Paolo Bonzini, 2019/03/27
- [Qemu-devel] [PULL 06/23] hw/char/parallel: Make it possible to compile also without CONFIG_PARALLEL,
Paolo Bonzini <=
- [Qemu-devel] [PULL 02/23] kconfig: add CONFIG_MSI_NONBROKEN, Paolo Bonzini, 2019/03/27
- [Qemu-devel] [PULL 08/23] prep: do not select I82374, Paolo Bonzini, 2019/03/27
- [Qemu-devel] [PULL 07/23] hw/i386/Kconfig: PC uses I8257, not I82374, Paolo Bonzini, 2019/03/27
- [Qemu-devel] [PULL 10/23] hw/isa/Kconfig: PIIX4 southbridge requires USB UHCI, Paolo Bonzini, 2019/03/27
- [Qemu-devel] [PULL 11/23] hw/i386/Kconfig: enable devices that can be created by default, Paolo Bonzini, 2019/03/27
- [Qemu-devel] [PULL 13/23] hw/mips/Kconfig: Fulong 2e board requires ati-vga/rtl8139 PCI devices, Paolo Bonzini, 2019/03/27
- [Qemu-devel] [PULL 12/23] hw/mips/Kconfig: Malta machine requires the pcnet network card, Paolo Bonzini, 2019/03/27
- [Qemu-devel] [PULL 09/23] hw/isa/Kconfig: i82378 SuperIO requires PC speaker device, Paolo Bonzini, 2019/03/27
- [Qemu-devel] [PULL 14/23] hw/ppc/Kconfig: Bamboo machine requires e1000 network card, Paolo Bonzini, 2019/03/27
- [Qemu-devel] [PULL 15/23] hw/ppc/Kconfig: e500 based machines require virtio-net-pci device, Paolo Bonzini, 2019/03/27