On 21/10/25 18:07, Philippe Mathieu-Daudé wrote:
On 19/10/25 23:02, Bernhard Beschow wrote:
Bernhard Beschow (10):
hw/timer/i8254: Add I/O trace events
hw/audio/pcspk: Add I/O trace events
hw/rtc/mc146818rtc: Convert CMOS_DPRINTF() into trace events
hw/rtc/mc146818rtc: Use ARRAY_SIZE macro
hw/rtc/mc146818rtc: Assert correct usage of
mc146818rtc_set_cmos_data()
hw/ide/ide-internal: Move dma_buf_commit() into ide "namespace"
hw/i386/apic: Prefer APICCommonState over DeviceState
hw/i386/apic: Ensure own APIC use in apic_msr_{read,write}
hw/intc/apic: Pass APICCommonState to apic_register_{read,write}
tests/qtest/ds1338-test: Reuse from_bcd()
Thanks, except if Paolo/MST/Igor object, series queued squashing:
-- >8 --
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index 67ff52a8b40..d981ca05977 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -29,2 +29,3 @@
#include "exec/memop.h"
+#include "hw/i386/apic.h"
#include "hw/i386/topology.h"
@@ -2352,3 +2352,3 @@ struct ArchCPU {
user */
- struct APICCommonState *apic_state;
+ APICCommonState *apic_state;
struct MemoryRegion *cpu_as_root, *cpu_as_mem, *smram;
diff --git a/target/i386/whpx/whpx-internal.h b/target/i386/whpx/whpx-
internal.h
index 066e16bd8e2..2dcad1f5650 100644
--- a/target/i386/whpx/whpx-internal.h
+++ b/target/i386/whpx/whpx-internal.h
@@ -7,2 +7,4 @@
+#include "hw/i386/apic.h"
+
typedef enum WhpxBreakpointState {
@@ -46,3 +48,3 @@ struct whpx_state {
extern struct whpx_state whpx_global;
-void whpx_apic_get(struct APICCommonState *s);
+void whpx_apic_get(APICCommonState *s);
---
Also squashing:
-- >8 --
diff --git a/hw/intc/apic.c b/hw/intc/apic.c
index 077ef18686b..aad253af158 100644
--- a/hw/intc/apic.c
+++ b/hw/intc/apic.c
@@ -1056,4 +1055,0 @@ static void apic_mem_write(void *opaque, hwaddr
addr, uint64_t val,
- if (!s) {
- return;
- }
-
@@ -1072,0 +1069,4 @@ static void apic_mem_write(void *opaque, hwaddr
addr, uint64_t val,
+ if (!s) {
+ return;
+ }
+
---
