Re: [PULL 00/39] Misc (mostly x86) patches for 2019-10-24

[Philippe Mathieu-Daudé]

On 10/25/19 1:17 PM, Paolo Bonzini wrote:
> On 25/10/19 12:46, Peter Maydell wrote:
> > x86_register_ferr_irq() is defined in target/i386/fpu_helper.c,
> > which is only built if CONFIG_TCG, but the callers don't
> > seem to be similarly guarded and there's no stub fallback.
>
> Indeed, thanks.  I'll add an "if (tcg_enabled())" since this feature is
> not supported by accelerators other than TCG.

Paolo, since the "Split timer <-> rtc" series got merged via
the trivial tree, you need to squash this fix to patch #33
("mc146818rtc: Include mc146818rtc_regs.h directly in
 mc146818rtc.c") to avoid build failure:

-- >8 --
diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c
index bbe6783898..9f5dd47fb6 100644
--- a/hw/rtc/mc146818rtc.c
+++ b/hw/rtc/mc146818rtc.c
@@ -42,7 +42,7 @@
 #include "qapi/qapi-events-misc-target.h"
 #include "qapi/visitor.h"
 #include "exec/address-spaces.h"
-#include "hw/timer/mc146818rtc_regs.h"
+#include "hw/rtc/mc146818rtc_regs.h"

 #ifdef TARGET_I386
 #include "hw/i386/apic.h"
---

Regards,

Phil.