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

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

Philippe Mathieu-Daudé posted 1 patch 6 years ago

Download mbox

Test asan passed

Test checkpatch passed

Test docker-mingw@fedora passed

Test FreeBSD passed

Test docker-quick@centos7 passed

Test docker-clang@ubuntu passed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20191017162614.21327-1-philmd@redhat.com

Maintainers: Paolo Bonzini <pbonzini@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com>

hw/timer/mc146818rtc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Expand all Fold all

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

Posted by Philippe Mathieu-Daudé 6 years ago

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

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 hw/timer/mc146818rtc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c
index 6cb378751b..c1eb0a7376 100644
--- a/hw/timer/mc146818rtc.c
+++ b/hw/timer/mc146818rtc.c
@@ -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
 
-- 
2.21.0

Re: [PATCH] hw/timer/mc146818rtc: Only include qapi-commands-misc on I386

Posted by Paolo Bonzini 6 years ago

On 17/10/19 18:26, Philippe Mathieu-Daudé wrote:
> Commit a6c7040fb09 restricted the rtc-reset-reinjection command
> to the I386 target.
> Restrict the "qapi/qapi-commands-misc-target.h" header to it too.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>  hw/timer/mc146818rtc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c
> index 6cb378751b..c1eb0a7376 100644
> --- a/hw/timer/mc146818rtc.c
> +++ b/hw/timer/mc146818rtc.c
> @@ -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
>  
> 

Queued, thanks.

Paolo