Skip to contentSkip to conversation

hw/timer/mc146818rtc: Only include qapi-commands-misc on I386

PATCH Applied Philippe Mathieu-Daudé 2 participants 2 messages Oct 17, 2019 – Oct 22, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hw/timer/mc146818rtc: Only include qapi-commands-misc on I386

Commit a6c7040fb09 restricted the rtc-reset-reinjection command to the I386 target.
Restrict the "qapi/qapi-commands-misc-target.h" header to it too.

---
 hw/timer/mc146818rtc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/timer/mc146818rtc.c +1 -1
index 6cb378751b..c1eb0a7376 100644
@@ -37,12 +37,12 @@
 #include "hw/timer/mc146818rtc.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"
-#include "qapi/qapi-commands-misc-target.h"
 #include "qapi/qapi-events-misc-target.h"
 #include "qapi/visitor.h"
 #include "exec/address-spaces.h"
 
 #ifdef TARGET_I386
+#include "qapi/qapi-commands-misc-target.h"
 #include "hw/i386/apic.h"
 #endif
 
Signature · 1 line
2.21.0
#1 lore raw
Quoted 18 lines · Philippe Mathieu-Daudé

Commit a6c7040fb09 restricted the rtc-reset-reinjection command to the I386 target.
Restrict the "qapi/qapi-commands-misc-target.h" header to it too.

---
 hw/timer/mc146818rtc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/timer/mc146818rtc.c +0 -0
index 6cb378751b..c1eb0a7376 100644
@@ -37,12 +37,12 @@
 #include "hw/timer/mc146818rtc.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"

hw/timer/mc146818rtc.c line 48

Quoted 10 lines
hw/timer/mc146818rtc.c +1 -1
-#include "qapi/qapi-commands-misc-target.h"
 #include "qapi/qapi-events-misc-target.h"
 #include "qapi/visitor.h"
 #include "exec/address-spaces.h"
 
 #ifdef TARGET_I386
+#include "qapi/qapi-commands-misc-target.h"
 #include "hw/i386/apic.h"
 #endif
 

Queued, thanks.

Paolo