1. Patchew
  2. QEMU
  3. [PATCH 0/8] hw/vfio: single-binary
  4. View patch

[PATCH 6/8] hw/vfio/ap.c: use full path for target specific header

Pierrick Bouvier posted 8 patches 2 weeks ago
Maintainers: Thomas Huth <thuth@redhat.com>, Alex Williamson <alex@shazbot.org>, "Cédric Le Goater" <clg@redhat.com>, Tony Krowiak <akrowiak@linux.ibm.com>, Halil Pasic <pasic@linux.ibm.com>, Jason Herne <jjherne@linux.ibm.com>, Eric Farman <farman@linux.ibm.com>, Matthew Rosato <mjrosato@linux.ibm.com>, Paolo Bonzini <pbonzini@redhat.com>, Nicholas Piggin <npiggin@gmail.com>, Harsh Prateek Bora <harshpb@linux.ibm.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Richard Henderson <richard.henderson@linaro.org>, Ilya Leoshkevich <iii@linux.ibm.com>, David Hildenbrand <david@kernel.org>
There is a newer version of this series
[PATCH 6/8] hw/vfio/ap.c: use full path for target specific header
Posted by Pierrick Bouvier 2 weeks ago 
In addition, we fix target/s390x/kvm/kvm_s390x.h cpu-qom include also.

Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
---
 target/s390x/kvm/kvm_s390x.h | 2 +-
 hw/vfio/ap.c                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/s390x/kvm/kvm_s390x.h b/target/s390x/kvm/kvm_s390x.h
index 649dae5948a..7b1cce3e60d 100644
--- a/target/s390x/kvm/kvm_s390x.h
+++ b/target/s390x/kvm/kvm_s390x.h
@@ -10,7 +10,7 @@
 #ifndef KVM_S390X_H
 #define KVM_S390X_H
 
-#include "cpu-qom.h"
+#include "target/s390x/cpu-qom.h"
 
 struct kvm_s390_irq;
 
diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c
index 856fa2678cd..3fae9ae9814 100644
--- a/hw/vfio/ap.c
+++ b/hw/vfio/ap.c
@@ -25,7 +25,7 @@
 #include "qemu/module.h"
 #include "qemu/option.h"
 #include "qemu/config-file.h"
-#include "kvm/kvm_s390x.h"
+#include "target/s390x/kvm/kvm_s390x.h"
 #include "migration/vmstate.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/s390x/ap-bridge.h"
-- 
2.47.3
Re: [PATCH 6/8] hw/vfio/ap.c: use full path for target specific header
Posted by Cédric Le Goater 1 week, 6 days ago 
On 3/12/26 23:44, Pierrick Bouvier wrote:
> In addition, we fix target/s390x/kvm/kvm_s390x.h cpu-qom include also.
> 
> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
> ---
>   target/s390x/kvm/kvm_s390x.h | 2 +-
>   hw/vfio/ap.c                 | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/target/s390x/kvm/kvm_s390x.h b/target/s390x/kvm/kvm_s390x.h
> index 649dae5948a..7b1cce3e60d 100644
> --- a/target/s390x/kvm/kvm_s390x.h
> +++ b/target/s390x/kvm/kvm_s390x.h
> @@ -10,7 +10,7 @@
>   #ifndef KVM_S390X_H
>   #define KVM_S390X_H
>   
> -#include "cpu-qom.h"
> +#include "target/s390x/cpu-qom.h"
>   
>   struct kvm_s390_irq;
>   
> diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c
> index 856fa2678cd..3fae9ae9814 100644
> --- a/hw/vfio/ap.c
> +++ b/hw/vfio/ap.c
> @@ -25,7 +25,7 @@
>   #include "qemu/module.h"
>   #include "qemu/option.h"
>   #include "qemu/config-file.h"
> -#include "kvm/kvm_s390x.h"
> +#include "target/s390x/kvm/kvm_s390x.h"
>   #include "migration/vmstate.h"
>   #include "hw/core/qdev-properties.h"
>   #include "hw/s390x/ap-bridge.h"

Reviewed-by: Cédric Le Goater <clg@redhat.com>

Thanks,

C.
Re: [PATCH 6/8] hw/vfio/ap.c: use full path for target specific header
Posted by Philippe Mathieu-Daudé 1 week, 6 days ago 
On 12/3/26 23:44, Pierrick Bouvier wrote:
> In addition, we fix target/s390x/kvm/kvm_s390x.h cpu-qom include also.
> 
> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
> ---
>   target/s390x/kvm/kvm_s390x.h | 2 +-
>   hw/vfio/ap.c                 | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/target/s390x/kvm/kvm_s390x.h b/target/s390x/kvm/kvm_s390x.h
> index 649dae5948a..7b1cce3e60d 100644
> --- a/target/s390x/kvm/kvm_s390x.h
> +++ b/target/s390x/kvm/kvm_s390x.h
> @@ -10,7 +10,7 @@
>   #ifndef KVM_S390X_H
>   #define KVM_S390X_H
>   
> -#include "cpu-qom.h"
> +#include "target/s390x/cpu-qom.h"

Yeah, I've been tempted to do that globally with a script, then remove
the various '-Itarget/foo/' from CPPFLAGs, but not a priority.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Re: [PATCH 6/8] hw/vfio/ap.c: use full path for target specific header
Posted by Pierrick Bouvier 1 week, 6 days ago 
On 3/12/26 8:26 PM, Philippe Mathieu-Daudé wrote:
> On 12/3/26 23:44, Pierrick Bouvier wrote:
>> In addition, we fix target/s390x/kvm/kvm_s390x.h cpu-qom include also.
>>
>> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
>> ---
>>    target/s390x/kvm/kvm_s390x.h | 2 +-
>>    hw/vfio/ap.c                 | 2 +-
>>    2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/target/s390x/kvm/kvm_s390x.h b/target/s390x/kvm/kvm_s390x.h
>> index 649dae5948a..7b1cce3e60d 100644
>> --- a/target/s390x/kvm/kvm_s390x.h
>> +++ b/target/s390x/kvm/kvm_s390x.h
>> @@ -10,7 +10,7 @@
>>    #ifndef KVM_S390X_H
>>    #define KVM_S390X_H
>>    
>> -#include "cpu-qom.h"
>> +#include "target/s390x/cpu-qom.h"
> 
> Yeah, I've been tempted to do that globally with a script, then remove
> the various '-Itarget/foo/' from CPPFLAGs, but not a priority.
>

Crossed my mind in the past also. But it's probably easier to do that on 
a per need basis, like here.

> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>

Patchew 2.1-devel-ea86937

© 2016 - 2026 Red Hat, Inc.