diff mbox series

[6/7] hw/i386/acpi-microvm: Reuse qbus_build_aml()

Message ID 20230114222738.282478-7-shentey@gmail.com
State New
Headers show
Series AML Housekeeping | expand

Commit Message

Bernhard Beschow Jan. 14, 2023, 10:27 p.m. UTC 
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
 hw/i386/acpi-microvm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Philippe Mathieu-Daudé Jan. 16, 2023, 9:14 a.m. UTC | #1 
On 14/1/23 23:27, Bernhard Beschow wrote:
> Signed-off-by: Bernhard Beschow <shentey@gmail.com>
> ---
>   hw/i386/acpi-microvm.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)

Possibly squash with next patch, regardless:

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Bernhard Beschow Jan. 16, 2023, 2:02 p.m. UTC | #2 
Am 16. Januar 2023 09:14:28 UTC schrieb "Philippe Mathieu-Daudé" <philmd@linaro.org>:
>On 14/1/23 23:27, Bernhard Beschow wrote:
>> Signed-off-by: Bernhard Beschow <shentey@gmail.com>
>> ---
>>   hw/i386/acpi-microvm.c | 3 ++-
>>   1 file changed, 2 insertions(+), 1 deletion(-)
>
>Possibly squash with next patch, regardless:

Not sure how to name the patches then. Hm...

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

Thanks!
Bernhard Beschow Jan. 16, 2023, 2:18 p.m. UTC | #3 
Am 16. Januar 2023 14:02:55 UTC schrieb Bernhard Beschow <shentey@gmail.com>:
>
>
>Am 16. Januar 2023 09:14:28 UTC schrieb "Philippe Mathieu-Daudé" <philmd@linaro.org>:
>>On 14/1/23 23:27, Bernhard Beschow wrote:
>>> Signed-off-by: Bernhard Beschow <shentey@gmail.com>
>>> ---
>>>   hw/i386/acpi-microvm.c | 3 ++-
>>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>
>>Possibly squash with next patch, regardless:
>
>Not sure how to name the patches then. Hm...

I could first move and rename isa_build_aml(). I think that'll be cleaner and avoids two functions doing the same temporarily.

>
>>Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>
>Thanks!
Philippe Mathieu-Daudé Jan. 16, 2023, 2:22 p.m. UTC | #4 
On 16/1/23 15:02, Bernhard Beschow wrote:
> Am 16. Januar 2023 09:14:28 UTC schrieb "Philippe Mathieu-Daudé" <philmd@linaro.org>:
>> On 14/1/23 23:27, Bernhard Beschow wrote:
>>> Signed-off-by: Bernhard Beschow <shentey@gmail.com>
>>> ---
>>>    hw/i386/acpi-microvm.c | 3 ++-
>>>    1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> Possibly squash with next patch, regardless:
> 
> Not sure how to name the patches then. Hm...

"hw/isa: Reuse generic qbus_build_aml()" ?
diff mbox series

Patch

diff --git a/hw/i386/acpi-microvm.c b/hw/i386/acpi-microvm.c
index d8a444d06c..fec22d85c1 100644
--- a/hw/i386/acpi-microvm.c
+++ b/hw/i386/acpi-microvm.c
@@ -26,6 +26,7 @@ 
 
 #include "exec/memory.h"
 #include "hw/acpi/acpi.h"
+#include "hw/acpi/acpi_aml_interface.h"
 #include "hw/acpi/aml-build.h"
 #include "hw/acpi/bios-linker-loader.h"
 #include "hw/acpi/generic_event_device.h"
@@ -129,7 +130,7 @@  build_dsdt_microvm(GArray *table_data, BIOSLinker *linker,
 
     sb_scope = aml_scope("_SB");
     fw_cfg_add_acpi_dsdt(sb_scope, x86ms->fw_cfg);
-    isa_build_aml(ISA_BUS(isabus), sb_scope);
+    qbus_build_aml(BUS(isabus), sb_scope);
     build_ged_aml(sb_scope, GED_DEVICE, x86ms->acpi_dev,
                   GED_MMIO_IRQ, AML_SYSTEM_MEMORY, GED_MMIO_BASE);
     acpi_dsdt_add_power_button(sb_scope);