When the IOMMU is implemented as a PCI device, its BDF is created
locally in virt.c. However, the same BDF is also required in
virt-acpi-build.c to support ACPI. Therefore, make this information part
of the global RISCVVirtState structure so that it can be accessed
outside of virt.c as well.

Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
---
 hw/riscv/virt.c         | 1 +
 include/hw/riscv/virt.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
index dae46f4733..ce256fb3b3 100644
--- a/hw/riscv/virt.c
+++ b/hw/riscv/virt.c
@@ -1116,6 +1116,7 @@ static void create_fdt_iommu(RISCVVirtState *s, uint16_t bdf)
     qemu_fdt_setprop_cells(fdt, pci_node, "iommu-map",
                            0, iommu_phandle, 0, bdf,
                            bdf + 1, iommu_phandle, bdf + 1, 0xffff - bdf);
+    s->pci_iommu_bdf = bdf;
 }
 
 static void finalize_fdt(RISCVVirtState *s)
diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h
index 48a14bea2e..7b4c2c8b7d 100644
--- a/include/hw/riscv/virt.h
+++ b/include/hw/riscv/virt.h
@@ -63,6 +63,7 @@ struct RISCVVirtState {
     const MemMapEntry *memmap;
     struct GPEXHost *gpex_host;
     OnOffAuto iommu_sys;
+    uint16_t pci_iommu_bdf;
 };
 
 enum {
-- 
2.43.0

On 3/14/25 2:15 AM, Sunil V L wrote:
> When the IOMMU is implemented as a PCI device, its BDF is created
> locally in virt.c. However, the same BDF is also required in
> virt-acpi-build.c to support ACPI. Therefore, make this information part
> of the global RISCVVirtState structure so that it can be accessed
> outside of virt.c as well.
> 
> Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
> ---

Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>

>   hw/riscv/virt.c         | 1 +
>   include/hw/riscv/virt.h | 1 +
>   2 files changed, 2 insertions(+)
> 
> diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
> index dae46f4733..ce256fb3b3 100644
> --- a/hw/riscv/virt.c
> +++ b/hw/riscv/virt.c
> @@ -1116,6 +1116,7 @@ static void create_fdt_iommu(RISCVVirtState *s, uint16_t bdf)
>       qemu_fdt_setprop_cells(fdt, pci_node, "iommu-map",
>                              0, iommu_phandle, 0, bdf,
>                              bdf + 1, iommu_phandle, bdf + 1, 0xffff - bdf);
> +    s->pci_iommu_bdf = bdf;
>   }
>   
>   static void finalize_fdt(RISCVVirtState *s)
> diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h
> index 48a14bea2e..7b4c2c8b7d 100644
> --- a/include/hw/riscv/virt.h
> +++ b/include/hw/riscv/virt.h
> @@ -63,6 +63,7 @@ struct RISCVVirtState {
>       const MemMapEntry *memmap;
>       struct GPEXHost *gpex_host;
>       OnOffAuto iommu_sys;
> +    uint16_t pci_iommu_bdf;
>   };
>   
>   enum {