From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Fiona Ebner Date: Fri, 17 Nov 2023 11:18:06 +0100 Subject: [PATCH] Revert "x86: acpi: workaround Windows not handling name references in Package properly" This reverts commit 44d975ef340e2f21f236f9520c53e1b30d2213a4. As reported in the community forum [0] and reproduced locally this breaks VirtIO network adapters in (at least) the German ISO of Windows Server 2022. The fix itself was for > Issue is not fatal but as result acpi-index/"PCI Label ID" property > is either not shown in device details page or shows incorrect value. so revert and tolerate that as a stop-gap, rather than have the devices not working at all. [0]: https://forum.proxmox.com/threads/92094/post-605684 Signed-off-by: Fiona Ebner --- hw/i386/acpi-build.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 1e178341de..d8694b338e 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -357,13 +357,9 @@ Aml *aml_pci_device_dsm(void) { Aml *params = aml_local(0); Aml *pkg = aml_package(2); - aml_append(pkg, aml_int(0)); - aml_append(pkg, aml_int(0)); + aml_append(pkg, aml_name("BSEL")); + aml_append(pkg, aml_name("ASUN")); aml_append(method, aml_store(pkg, params)); - aml_append(method, - aml_store(aml_name("BSEL"), aml_index(params, aml_int(0)))); - aml_append(method, - aml_store(aml_name("ASUN"), aml_index(params, aml_int(1)))); aml_append(method, aml_return(aml_call5("PDSM", aml_arg(0), aml_arg(1), aml_arg(2), aml_arg(3), params))