Re: [PATCH v5 1/2] acpi: i386: Move VMBus DSDT entry to SB

[Igor Mammedov <imammedo@redhat.com>]

On Wed, 15 Jul 2020 11:43:25 +0300
Jon Doron <arilou@gmail.com> wrote:

> Signed-off-by: Jon Doron <arilou@gmail.com>

Reviewed-by: Igor Mammedov <imammedo@redhat.com>

> ---
>  hw/i386/acpi-build.c | 12 +++++++-----
>  1 file changed, 7 insertions(+), 5 deletions(-)
> 
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index b7bcbbbb2a..7708a27f70 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -975,7 +975,6 @@ static Aml *build_vmbus_device_aml(VMBusBridge *vmbus_bridge)
>  
>  static void build_isa_devices_aml(Aml *table)
>  {
> -    VMBusBridge *vmbus_bridge = vmbus_bridge_find();
>      bool ambiguous;
>      Object *obj = object_resolve_path_type("", TYPE_ISA_BUS, &ambiguous);
>      Aml *scope;
> @@ -986,10 +985,6 @@ static void build_isa_devices_aml(Aml *table)
>      build_acpi_ipmi_devices(scope, BUS(obj), "\\_SB.PCI0.ISA");
>      isa_build_aml(ISA_BUS(obj), scope);
>  
> -    if (vmbus_bridge) {
> -        aml_append(scope, build_vmbus_device_aml(vmbus_bridge));
> -    }
> -
>      aml_append(table, scope);
>  }
>  
> @@ -1485,6 +1480,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
>      PCIBus *bus = NULL;
>      TPMIf *tpm = tpm_find();
>      int i;
> +    VMBusBridge *vmbus_bridge = vmbus_bridge_find();
>  
>      dsdt = init_aml_allocator();
>  
> @@ -1526,6 +1522,12 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
>          }
>      }
>  
> +    if (vmbus_bridge) {
> +        sb_scope = aml_scope("_SB");
> +        aml_append(sb_scope, build_vmbus_device_aml(vmbus_bridge));
> +        aml_append(dsdt, sb_scope);
> +    }
> +
>      if (pcmc->legacy_cpu_hotplug) {
>          build_legacy_cpu_hotplug_aml(dsdt, machine, pm->cpu_hp_io_base);
>      } else {