From c38e337f5d62b19cb176965cb26aeb8bebd438b4 Mon Sep 17 00:00:00 2001 From: Fiona Ebner Date: Fri, 17 Nov 2023 11:45:41 +0100 Subject: [PATCH] revert commit breaking VirtIO network adapters for certain versions of Windows 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 --- ...workaround-Windows-not-handling-name.patch | 45 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 46 insertions(+) create mode 100644 debian/patches/extra/0008-Revert-x86-acpi-workaround-Windows-not-handling-name.patch diff --git a/debian/patches/extra/0008-Revert-x86-acpi-workaround-Windows-not-handling-name.patch b/debian/patches/extra/0008-Revert-x86-acpi-workaround-Windows-not-handling-name.patch new file mode 100644 index 0000000..02d9b6b --- /dev/null +++ b/debian/patches/extra/0008-Revert-x86-acpi-workaround-Windows-not-handling-name.patch @@ -0,0 +1,45 @@ +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 bb12b0ad43..de14d3c3da 100644 +--- a/hw/i386/acpi-build.c ++++ b/hw/i386/acpi-build.c +@@ -362,13 +362,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)) diff --git a/debian/patches/series b/debian/patches/series index c27c245..ad84088 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,6 +5,7 @@ extra/0004-migration-block-dirty-bitmap-fix-loading-bitmap-when.patch extra/0005-hw-ide-reset-cancel-async-DMA-operation-before-reset.patch extra/0006-Revert-Revert-graph-lock-Disable-locking-for-now.patch extra/0007-migration-states-workaround-snapshot-performance-reg.patch +extra/0008-Revert-x86-acpi-workaround-Windows-not-handling-name.patch bitmap-mirror/0001-drive-mirror-add-support-for-sync-bitmap-mode-never.patch bitmap-mirror/0002-drive-mirror-add-support-for-conditional-and-always-.patch bitmap-mirror/0003-mirror-add-check-for-bitmap-mode-without-bitmap.patch