target/cpu: Do not include 'exec/cpu-defs.h' anymore

[PATCH v2 03/38] hw/s390x/vfio: Replace TARGET_PAGE_BITS -> qemu_target_page_bits()

Philippe Mathieu-Daudé posted 38 patches 3 weeks, 4 days ago

Download mbox

Maintainers: Richard Henderson <richard.henderson@linaro.org>, Peter Maydell <peter.maydell@linaro.org>, Igor Mitsyanko <i.mitsyanko@gmail.com>, Eric Auger <eric.auger@redhat.com>, Michael Rolnik <mrolnik@gmail.com>, Helge Deller <deller@gmx.de>, Paolo Bonzini <pbonzini@redhat.com>, Eduardo Habkost <eduardo@habkost.net>, "Michael S. Tsirkin" <mst@redhat.com>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Gerd Hoffmann <kraxel@redhat.com>, Laurent Vivier <laurent@vivier.eu>, Yoshinori Sato <yoshinori.sato@nifty.com>, Magnus Damm <magnus.damm@gmail.com>, Thomas Huth <th.huth+qemu@posteo.eu>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Alistair Francis <alistair@alistair23.me>, Huacai Chen <chenhuacai@kernel.org>, Jiaxun Yang <jiaxun.yang@flygoat.com>, "Hervé Poussineau" <hpoussin@reactos.org>, Aleksandar Rikalo <arikalo@gmail.com>, Aurelien Jarno <aurelien@aurel32.net>, Stafford Horne <shorne@gmail.com>, Jia Liu <proljc@gmail.com>, Bernhard Beschow <shentey@gmail.com>, BALATON Zoltan <balaton@eik.bme.hu>, Nicholas Piggin <npiggin@gmail.com>, Chinmay Rath <rathc@linux.ibm.com>, Glenn Miles <milesg@linux.ibm.com>, Harsh Prateek Bora <harshpb@linux.ibm.com>, Sai Pavan Boddu <sai.pavan.boddu@amd.com>, Palmer Dabbelt <palmer@dabbelt.com>, Weiwei Li <liwei1518@gmail.com>, Daniel Henrique Barboza <dbarboza@ventanamicro.com>, Liu Zhiwei <zhiwei_liu@linux.alibaba.com>, Tony Krowiak <akrowiak@linux.ibm.com>, Halil Pasic <pasic@linux.ibm.com>, Jason Herne <jjherne@linux.ibm.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Eric Farman <farman@linux.ibm.com>, Matthew Rosato <mjrosato@linux.ibm.com>, Ilya Leoshkevich <iii@linux.ibm.com>, David Hildenbrand <david@kernel.org>, Jared Rossi <jrossi@linux.ibm.com>, Zhuoying Cai <zycai@linux.ibm.com>, Farhan Ali <alifm@linux.ibm.com>, "Clément Chigot" <chigot@adacore.com>, Frederic Konrad <konrad.frederic@yahoo.fr>, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, Artyom Tarasenko <atar4qemu@gmail.com>, Bastian Koppelmann <kbastian@rumtueddeln.de>, Max Filippov <jcmvbkbc@gmail.com>, Antony Pavlov <antonynpavlov@gmail.com>, Jean-Christophe Dubois <jcd@tribudubois.net>, Andrey Smirnov <andrew.smirnov@gmail.com>, Aditya Gupta <adityag@linux.ibm.com>, Sourabh Jain <sourabhjain@linux.ibm.com>, "Dr. David Alan Gilbert" <dave@treblig.org>, David Woodhouse <dwmw2@infradead.org>, Paul Durrant <paul@xen.org>, Pierrick Bouvier <pierrick.bouvier@linaro.org>, Alexander Graf <agraf@csgraf.de>, Brian Cain <brian.cain@oss.qualcomm.com>, Zhao Liu <zhao1.liu@intel.com>, Song Gao <gaosong@loongson.cn>

Expand all Fold all

[PATCH v2 03/38] hw/s390x/vfio: Replace TARGET_PAGE_BITS -> qemu_target_page_bits()

Posted by Philippe Mathieu-Daudé 3 weeks, 4 days ago

Get the target page bits at runtime.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/s390x/s390-pci-vfio.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hw/s390x/s390-pci-vfio.c b/hw/s390x/s390-pci-vfio.c
index 8ce44dbecce..7c754b656da 100644
--- a/hw/s390x/s390-pci-vfio.c
+++ b/hw/s390x/s390-pci-vfio.c
@@ -22,6 +22,7 @@
 #include "hw/vfio/pci.h"
 #include "hw/vfio/vfio-container-legacy.h"
 #include "hw/vfio/vfio-helpers.h"
+#include "exec/target_page.h"
 
 /*
  * Get the current DMA available count from vfio.  Returns true if vfio is
@@ -150,7 +151,7 @@ static void s390_pci_read_base(S390PCIBusDevice *pbdev,
      * to request that the guest free DMA mappings as necessary.
      */
     if (!pbdev->rtr_avail) {
-        vfio_size = pbdev->iommu->max_dma_limit << TARGET_PAGE_BITS;
+        vfio_size = pbdev->iommu->max_dma_limit << qemu_target_page_bits();
         if (vfio_size > 0 && vfio_size < cap->end_dma - cap->start_dma + 1) {
             pbdev->zpci_fn.edma = cap->start_dma + vfio_size - 1;
         }
-- 
2.53.0

Re: [PATCH v2 03/38] hw/s390x/vfio: Replace TARGET_PAGE_BITS -> qemu_target_page_bits()

Posted by Pierrick Bouvier 3 weeks, 3 days ago

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> Get the target page bits at runtime.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/s390x/s390-pci-vfio.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 03/38] hw/s390x/vfio: Replace TARGET_PAGE_BITS -> qemu_target_page_bits()

Posted by Thomas Huth 3 weeks, 4 days ago

On 13/03/2026 07.20, Philippe Mathieu-Daudé wrote:
> Get the target page bits at runtime.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/s390x/s390-pci-vfio.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/hw/s390x/s390-pci-vfio.c b/hw/s390x/s390-pci-vfio.c
> index 8ce44dbecce..7c754b656da 100644
> --- a/hw/s390x/s390-pci-vfio.c
> +++ b/hw/s390x/s390-pci-vfio.c
> @@ -22,6 +22,7 @@
>   #include "hw/vfio/pci.h"
>   #include "hw/vfio/vfio-container-legacy.h"
>   #include "hw/vfio/vfio-helpers.h"
> +#include "exec/target_page.h"
>   
>   /*
>    * Get the current DMA available count from vfio.  Returns true if vfio is
> @@ -150,7 +151,7 @@ static void s390_pci_read_base(S390PCIBusDevice *pbdev,
>        * to request that the guest free DMA mappings as necessary.
>        */
>       if (!pbdev->rtr_avail) {
> -        vfio_size = pbdev->iommu->max_dma_limit << TARGET_PAGE_BITS;
> +        vfio_size = pbdev->iommu->max_dma_limit << qemu_target_page_bits();
>           if (vfio_size > 0 && vfio_size < cap->end_dma - cap->start_dma + 1) {
>               pbdev->zpci_fn.edma = cap->start_dma + vfio_size - 1;
>           }

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH v2 03/38] hw/s390x/vfio: Replace TARGET_PAGE_BITS -> qemu_target_page_bits()

Posted by Cédric Le Goater 3 weeks, 3 days ago

On 3/13/26 11:25, Thomas Huth wrote:
> On 13/03/2026 07.20, Philippe Mathieu-Daudé wrote:
>> Get the target page bits at runtime.
>>
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>> ---
>>   hw/s390x/s390-pci-vfio.c | 3 ++-
>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/hw/s390x/s390-pci-vfio.c b/hw/s390x/s390-pci-vfio.c
>> index 8ce44dbecce..7c754b656da 100644
>> --- a/hw/s390x/s390-pci-vfio.c
>> +++ b/hw/s390x/s390-pci-vfio.c
>> @@ -22,6 +22,7 @@
>>   #include "hw/vfio/pci.h"
>>   #include "hw/vfio/vfio-container-legacy.h"
>>   #include "hw/vfio/vfio-helpers.h"
>> +#include "exec/target_page.h"
>>   /*
>>    * Get the current DMA available count from vfio.  Returns true if vfio is
>> @@ -150,7 +151,7 @@ static void s390_pci_read_base(S390PCIBusDevice *pbdev,
>>        * to request that the guest free DMA mappings as necessary.
>>        */
>>       if (!pbdev->rtr_avail) {
>> -        vfio_size = pbdev->iommu->max_dma_limit << TARGET_PAGE_BITS;
>> +        vfio_size = pbdev->iommu->max_dma_limit << qemu_target_page_bits();
>>           if (vfio_size > 0 && vfio_size < cap->end_dma - cap->start_dma + 1) {
>>               pbdev->zpci_fn.edma = cap->start_dma + vfio_size - 1;
>>           }
> 
> Reviewed-by: Thomas Huth <thuth@redhat.com>
> 

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

Thanks,

C.