[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/20] hw/i386: Ignore the default parallel port if it has not bee
|
From: |
Thomas Huth |
|
Subject: |
[PULL 09/20] hw/i386: Ignore the default parallel port if it has not been compiled into QEMU |
|
Date: |
Mon, 22 May 2023 13:50:03 +0200 |
Don't try to instantiate the parallel port if it has not been
enabled in the build configuration.
Message-Id: <20230512124033.502654-10-thuth@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
hw/i386/pc_piix.c | 3 +++
hw/i386/pc_q35.c | 2 ++
2 files changed, 5 insertions(+)
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 17892ad580..d5b0dcd1fe 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -26,6 +26,7 @@
#include CONFIG_DEVICES
#include "qemu/units.h"
+#include "hw/char/parallel.h"
#include "hw/dma/i8257.h"
#include "hw/loader.h"
#include "hw/i386/x86.h"
@@ -458,6 +459,7 @@ static void pc_i440fx_machine_options(MachineClass *m)
m->default_machine_opts = "firmware=bios-256k.bin";
m->default_display = "std";
m->default_nic = "e1000";
+ m->no_parallel = !module_object_class_by_name(TYPE_ISA_PARALLEL);
machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE);
machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE);
}
@@ -886,6 +888,7 @@ static void isapc_machine_options(MachineClass *m)
pcmc->has_reserved_memory = false;
m->default_nic = "ne2k_isa";
m->default_cpu_type = X86_CPU_TYPE_NAME("486");
+ m->no_parallel = !module_object_class_by_name(TYPE_ISA_PARALLEL);
}
DEFINE_PC_MACHINE(isapc, "isapc", pc_init_isa,
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 7e0f354edd..6155427e48 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -30,6 +30,7 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
+#include "hw/char/parallel.h"
#include "hw/loader.h"
#include "hw/i2c/smbus_eeprom.h"
#include "hw/rtc/mc146818rtc.h"
@@ -367,6 +368,7 @@ static void pc_q35_machine_options(MachineClass *m)
m->default_nic = "e1000e";
m->default_kernel_irqchip_split = false;
m->no_floppy = 1;
+ m->no_parallel = !module_object_class_by_name(TYPE_ISA_PARALLEL);
machine_class_allow_dynamic_sysbus_dev(m, TYPE_AMD_IOMMU_DEVICE);
machine_class_allow_dynamic_sysbus_dev(m, TYPE_INTEL_IOMMU_DEVICE);
machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE);
--
2.31.1
- [PULL 00/20] Allow "make check" with "--without-default-devices", Thomas Huth, 2023/05/22
- [PULL 04/20] softmmu/vl.c: Disable default NIC if it has not been compiled into the binary, Thomas Huth, 2023/05/22
- [PULL 01/20] hw/i386/Kconfig: ISAPC works fine without VGA_ISA, Thomas Huth, 2023/05/22
- [PULL 03/20] hw: Move the default NIC machine class setting from the x86 to the generic one, Thomas Huth, 2023/05/22
- [PULL 07/20] hw/sh4: Use MachineClass->default_nic in the sh4 r2d machine, Thomas Huth, 2023/05/22
- [PULL 05/20] hw/ppc: Use MachineClass->default_nic in the ppc machines, Thomas Huth, 2023/05/22
- [PULL 11/20] tests/qtest/readconfig-test: Check for the availability of USB controllers, Thomas Huth, 2023/05/22
- [PULL 08/20] hw/char/parallel: Move TYPE_ISA_PARALLEL to the header file, Thomas Huth, 2023/05/22
- [PULL 09/20] hw/i386: Ignore the default parallel port if it has not been compiled into QEMU,
Thomas Huth <=
- [PULL 06/20] hw/s390x: Use MachineClass->default_nic in the s390x machine, Thomas Huth, 2023/05/22
- [PULL 17/20] tests/qemu-iotests/172: Run QEMU with -vga none and -nic none, Thomas Huth, 2023/05/22
- [PULL 16/20] tests/qtest/meson.build: Run the net filter tests only with default devices, Thomas Huth, 2023/05/22
- [PULL 20/20] memory: stricter checks prior to unsetting engaged_in_io, Thomas Huth, 2023/05/22
- [PULL 13/20] tests/qtest/cdrom-test: Fix the test to also work without optional devices, Thomas Huth, 2023/05/22
- [PULL 10/20] hw/sparc64/sun4u: Use MachineClass->default_nic and MachineClass->no_parallel, Thomas Huth, 2023/05/22
- [PULL 19/20] acpi/tests/avocado/bits: enable bios bits avocado tests on gitlab CI pipeline, Thomas Huth, 2023/05/22
- [PULL 18/20] .gitlab-ci.d/buildtest.yml: Run full "make check" with --without-default-devices, Thomas Huth, 2023/05/22
- [PULL 14/20] tests/qtest/virtio-ccw-test: Remove superfluous tests, Thomas Huth, 2023/05/22
- [PULL 02/20] softmmu/vl.c: Check for the availability of the VGA device before using it, Thomas Huth, 2023/05/22