From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: thuth@redhat.com
Subject: [PATCH 12/13] i386: select correct components for no-board build
Date: Thu, 9 May 2024 19:00:43 +0200 [thread overview]
Message-ID: <20240509170044.190795-13-pbonzini@redhat.com> (raw)
In-Reply-To: <20240509170044.190795-1-pbonzini@redhat.com>
The local APIC is a part of the CPU and has callbacks that are invoked
from multiple accelerators.
The IOAPIC on the other hand is optional, but ioapic_eoi_broadcast is
used by common x86 code to implement the IOAPIC's implicit EOI mode.
Add a stub in case the IOAPIC device is not included but the APIC is.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/intc/ioapic-stub.c | 29 +++++++++++++++++++++++++++++
.gitlab-ci.d/buildtest.yml | 2 +-
hw/intc/meson.build | 2 +-
target/i386/Kconfig | 1 +
4 files changed, 32 insertions(+), 2 deletions(-)
create mode 100644 hw/intc/ioapic-stub.c
diff --git a/hw/intc/ioapic-stub.c b/hw/intc/ioapic-stub.c
new file mode 100644
index 00000000000..4dcd86248da
--- /dev/null
+++ b/hw/intc/ioapic-stub.c
@@ -0,0 +1,29 @@
+/*
+ * ioapic.c IOAPIC emulation logic
+ *
+ * Copyright (c) 2004-2005 Fabrice Bellard
+ *
+ * Split the ioapic logic from apic.c
+ * Xiantao Zhang <xiantao.zhang@intel.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "hw/intc/ioapic.h"
+
+void ioapic_eoi_broadcast(int vector)
+{
+}
diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml
index f8502905203..62616157206 100644
--- a/.gitlab-ci.d/buildtest.yml
+++ b/.gitlab-ci.d/buildtest.yml
@@ -650,7 +650,7 @@ build-tci:
# Check our reduced build configurations
# requires libfdt: aarch64, arm, i386, loongarch64, microblaze, microblazeel,
# mips64el, or1k, ppc, ppc64, riscv32, riscv64, rx, x86_64
-# does not build without boards: i386, x86_64
+# fails qtest without boards: i386, x86_64
build-without-defaults:
extends: .native_build_job_template
needs:
diff --git a/hw/intc/meson.build b/hw/intc/meson.build
index f4b540e6a8b..0d1b7d0a432 100644
--- a/hw/intc/meson.build
+++ b/hw/intc/meson.build
@@ -20,7 +20,7 @@ system_ss.add(when: 'CONFIG_GOLDFISH_PIC', if_true: files('goldfish_pic.c'))
system_ss.add(when: 'CONFIG_HEATHROW_PIC', if_true: files('heathrow_pic.c'))
system_ss.add(when: 'CONFIG_I8259', if_true: files('i8259_common.c', 'i8259.c'))
system_ss.add(when: 'CONFIG_IMX', if_true: files('imx_avic.c', 'imx_gpcv2.c'))
-system_ss.add(when: 'CONFIG_IOAPIC', if_true: files('ioapic_common.c'))
+system_ss.add(when: 'CONFIG_IOAPIC', if_true: files('ioapic_common.c'), if_false: files('ioapic-stub.c'))
system_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_intc.c'))
system_ss.add(when: 'CONFIG_OPENPIC', if_true: files('openpic.c'))
system_ss.add(when: 'CONFIG_PL190', if_true: files('pl190.c'))
diff --git a/target/i386/Kconfig b/target/i386/Kconfig
index ad9291d3b8f..6b0feef0299 100644
--- a/target/i386/Kconfig
+++ b/target/i386/Kconfig
@@ -1,5 +1,6 @@
config I386
bool
+ select APIC
# kvm_arch_fixup_msi_route() needs to access PCIDevice
select PCI if KVM
--
2.45.0
next prev parent reply other threads:[~2024-05-09 17:03 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-09 17:00 [PATCH 00/13] fix --without-default-devices build and (mostly) tests Paolo Bonzini
2024-05-09 17:00 ` [PATCH 01/13] s390x: move s390_cpu_addr2state to target/s390x/sigp.c Paolo Bonzini
2024-05-10 4:59 ` Thomas Huth
2024-05-09 17:00 ` [PATCH 02/13] s390_flic: add migration-enabled property Paolo Bonzini
2024-05-10 5:06 ` Thomas Huth
2024-05-16 14:42 ` Marc Hartmayer
2024-05-17 5:47 ` Thomas Huth
2024-05-09 17:00 ` [PATCH 03/13] s390: move css_migration_enabled from machine to css.c Paolo Bonzini
2024-05-10 5:37 ` Thomas Huth
2024-05-10 9:19 ` Paolo Bonzini
2024-05-09 17:00 ` [PATCH 04/13] s390x: select correct components for no-board build Paolo Bonzini
2024-05-10 5:11 ` Thomas Huth
2024-05-09 17:00 ` [PATCH 05/13] tests/qtest: s390x: fix operation in a build without any boards or devices Paolo Bonzini
2024-05-10 5:13 ` Thomas Huth
2024-05-09 17:00 ` [PATCH 06/13] xen: initialize legacy backends from xen_bus_init() Paolo Bonzini
2024-05-10 10:18 ` Philippe Mathieu-Daudé
2024-05-09 17:00 ` [PATCH 07/13] xen: register legacy backends via xen_backend_init Paolo Bonzini
2024-05-10 10:52 ` Philippe Mathieu-Daudé
2024-05-09 17:00 ` [PATCH 08/13] i386: correctly select code in hw/i386 that depends on other components Paolo Bonzini
2024-05-10 12:15 ` Zhao Liu
2024-05-09 17:00 ` [PATCH 09/13] i386: pc: remove unnecessary MachineClass overrides Paolo Bonzini
2024-05-10 12:05 ` Zhao Liu
2024-05-09 17:00 ` [PATCH 10/13] hw/i386: split x86.c in multiple parts Paolo Bonzini
2024-05-10 12:32 ` Zhao Liu
2024-05-09 17:00 ` [PATCH 11/13] hw/i386: move rtc-reset-reinjection command out of hw/rtc Paolo Bonzini
2024-05-10 12:37 ` Zhao Liu
2024-05-09 17:00 ` Paolo Bonzini [this message]
2024-05-10 12:40 ` [PATCH 12/13] i386: select correct components for no-board build Zhao Liu
2024-05-09 17:00 ` [PATCH 13/13] tests/qtest: arm: fix operation in a build without any boards or devices Paolo Bonzini
2024-05-10 5:55 ` Thomas Huth
2024-05-10 9:14 ` 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=20240509170044.190795-13-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).