hw/char/parallel: Make it possible to compile also without CONFIG_PARALLEL
PATCH 1/1 hw/char/parallel: Make it possible to compile also without CONFIG_PARALLEL
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, let's move this file unconditionally to common-obj-y again. And while we're at it, also rename it to parallel-helper.c (since parallel.c is also about ISA already), add a proper comment in there with the rationale for the separate file, and a check via object_class_by_name() to see whether the device class is available in the binary or not.
---
hw/char/Makefile.objs | 2 +-
hw/char/{parallel-isa.c => parallel-helper.c} | 10 +++++++++-
hw/char/parallel.c | 1 -
hw/i386/Kconfig | 2 --
include/hw/char/parallel.h | 2 ++
5 files changed, 12 insertions(+), 5 deletions(-)
rename hw/char/{parallel-isa.c => parallel-helper.c} (70%)hw/char/Makefile.objs +1 -1
@@ -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-y += parallel-helper.o common-obj-$(CONFIG_PL011) += pl011.o common-obj-$(CONFIG_SERIAL) += serial.o common-obj-$(CONFIG_SERIAL_ISA) += serial-isa.o
hw/char/parallel-helper.c renamed from hw/char/parallel-isa.c +9 -1
@@ -1,11 +1,15 @@/* * 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 */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "sysemu/sysemu.h" #include "hw/isa/isa.h" #include "hw/char/parallel.h"
@@ -15,7 +19,7 @@ static void parallel_init(ISABus *bus, int index, Chardev *chr)DeviceState *dev;ISADevice *isadev; - isadev =isa_create (bus,"isa-parallel" ); + isadev =isa_create (bus,TYPE_ISA_PARALLEL ); dev =DEVICE (isadev);qdev_prop_set_uint32 (dev,"index" , index);qdev_prop_set_chr (dev,"chardev" , chr);
@@ -28,6 +32,10 @@ void parallel_hds_isa_init(ISABus *bus, int n)assert (n <=MAX_PARALLEL_PORTS ); +if (!object_class_by_name (TYPE_ISA_PARALLEL )) { +return ; + } +for (i =0 ; i < n; i++) {if (parallel_hds[i]) {parallel_init (bus, i, parallel_hds[i]);
hw/char/parallel.c +0 -1
@@ -85,7 +85,6 @@ typedef struct ParallelState {PortioList portio_list; } ParallelState; -#define TYPE_ISA_PARALLEL "isa-parallel"#define ISA_PARALLEL (obj) \ OBJECT_CHECK(ISAParallelState, (obj), TYPE_ISA_PARALLEL)
hw/i386/Kconfig +0 -2
@@ -25,8 +25,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
include/hw/char/parallel.h +2 -0
@@ -5,6 +5,8 @@#include "hw/isa/isa.h" #include "chardev/char.h" +#define TYPE_ISA_PARALLEL "isa-parallel" +void parallel_hds_isa_init (ISABus *bus,int n); bool parallel_mm_init(MemoryRegion *address_space,
Signature · 1 line
1.8.3.1
Quoted 27 lines · Thomas Huth
For the downstream distribution of QEMU, we want to compile without
CONFIG_PARALLEL. Commit9157eee1b1c076ff3already moved the functionparallel_hds_isa_init()(which is still required for linking) into a file that is included anyway, but commitbb3d5ea858e7f888563amoved it to a separate file which is only compiled again ifCONFIG_PARALLELis set. To be able to link QEMU again withoutCONFIG_PARALLEL, let's move this file unconditionally to common-obj-y again. And while we're at it, also rename it toparallel-helper.c(sinceparallel.cis also about ISA already), add a proper comment in there with the rationale for the separate file, and a check viaobject_class_by_name()to see whether the device class is available in the binary or not.Signed-off-by Thomas Huth <[email protected]>--- hw/char/Makefile.objs | 2 +- hw/char/{parallel-isa.c => parallel-helper.c} | 10 +++++++++- hw/char/parallel.c | 1 - hw/i386/Kconfig | 2 -- include/hw/char/parallel.h | 2 ++ 5 files changed, 12 insertions(+), 5 deletions(-) rename hw/char/{parallel-isa.c => parallel-helper.c} (70%)hw/char/Makefile.objs +0
-0
hw/char/Makefile.objs common-obj-$(CONFIG_IPACK) += ipoctal232.o · line 5
Quoted 5 lines
hw/char/Makefile.objs +1
-1@@ -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-y += parallel-helper.o
Self-NACK.
This has to be "common-obj-$(CONFIG_ISA_BUS) += parallel-helper.o" since it uses the function isa_create(). ... thus, maybe I should also not rename the file here... I'll ponder about that in a v2...
Thomas
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series failed the docker-mingw@fedora build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
time make docker-test-mingw@fedora SHOW_ENV=1 J=14 NETWORK=1 === TEST SCRIPT END ===
GEN x86_64-softmmu/qemu-system-x86_64.exe../hw/char/parallel-helper.o: In function `parallel_init':/tmp/qemu-test/src/hw/char/parallel-helper.c:22: undefined reference to `isa_create'
collect2: error: ld returned 1 exit status
make[1]: *** [Makefile:212: qemu-system-aarch64w.exe] Error 1
make: *** [Makefile:449: subdir-aarch64-softmmu] Error 2
make: *** Waiting for unfinished jobs....
The full log is available at
http://patchew.org/logs/[email protected]/testing.docker-mingw@fedora/?type=message.
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to [email protected]
Quoted 10 lines · Thomas Huth
For the downstream distribution of QEMU, we want to compile without
CONFIG_PARALLEL. Commit9157eee1b1c076ff3already moved the functionparallel_hds_isa_init()(which is still required for linking) into a file that is included anyway, but commitbb3d5ea858e7f888563amoved it to a separate file which is only compiled again ifCONFIG_PARALLELis set. To be able to link QEMU again withoutCONFIG_PARALLEL, let's move this file unconditionally to common-obj-y again. And while we're at it, also rename it toparallel-helper.c(sinceparallel.cis also about ISA already)
parallel.c also provides an MMIO interface to the parallel port via parallel_mm_init(), used by the MIPS Jazz board. (In an ideal world this would be a proper device, but it is ancient code.)
thanks
-- PMM