Apply better workaround for E820 conflict

[marmarek]

Instead of moving the whole kernel image, remap ACPI NVS region in P2M
map.

Fixes QubesOS/qubes-issues#8791

[marmarek]

openQArun

[qubesos-bot]

OpenQA test summary

Complete test suite and dependencies: https://openqa.qubes-os.org/tests/overview?distri=qubesos&version=4.3&build=202408090220-4.3&flavor=kernel

Test run included the following:

• Apply better workaround for E820 conflict #992

New failures, excluding unstable

Compared to: https://openqa.qubes-os.org/tests/overview?distri=qubesos&version=4.3&build=202408031008-4.3&flavor=kernel

• system_tests_network_updates

  • TC_11_QvmTemplateMgmtVM_debian-12-xfce: test_000_template_list (failure)
    AssertionError: libvirt event impl drain timeout

• system_tests_suspend_s0ix@hw15

  • suspend: Failed (test died)
    # Test died: command 'qvm-run -p sys-net true' failed at /usr/lib/o...

  • suspend: wait_serial (wait serial expected)
    # wait_serial expected: "lspci; echo 2E8vz-\$?-"...

  • suspend: wait_serial (wait serial expected)
    # wait_serial expected: qr/2E8vz-\d+-/...

• install_default_upload@hw7

  • install_startup: unnamed test (unknown)
  • install_startup: Failed (test died)
    # Test died: no candidate needle with tag(s) 'installer' matched...

• install_default_upload@hw5

  • firstboot: unnamed test (unknown)
  • firstboot: Failed (test died)
    # Test died: no candidate needle with tag(s) 'heads-menu, heads-hot...

• system_tests_suspend@hw6

  • suspend: unnamed test (unknown)

Failed tests

14 failures

• system_tests_network_updates

  • TC_11_QvmTemplateMgmtVM_debian-12-xfce: test_000_template_list (failure)
    AssertionError: libvirt event impl drain timeout

• system_tests_suspend_s0ix@hw15

  • suspend: Failed (test died)
    # Test died: command 'qvm-run -p sys-net true' failed at /usr/lib/o...

  • suspend: wait_serial (wait serial expected)
    # wait_serial expected: "lspci; echo 2E8vz-\$?-"...

  • suspend: wait_serial (wait serial expected)
    # wait_serial expected: qr/2E8vz-\d+-/...

• install_default_upload@hw7

  • install_startup: unnamed test (unknown)
  • install_startup: Failed (test died)
    # Test died: no candidate needle with tag(s) 'installer' matched...

• install_default_upload@hw5

  • firstboot: unnamed test (unknown)
  • firstboot: Failed (test died)
    # Test died: no candidate needle with tag(s) 'heads-menu, heads-hot...

• system_tests_suspend@hw6

  • suspend: unnamed test (unknown)
  • [unstable] suspend: Failed (test died)
    # Test died: no candidate needle with tag(s) 'xscreensaver-prompt' ...

• system_tests_suspend@hw10

  • suspend: unnamed test (unknown)

  • [unstable] suspend: Failed (test died)
    # Test died: no candidate needle with tag(s) 'xscreensaver-prompt' ...

  • [unstable] suspend: wait_serial (wait serial expected)
    # wait_serial expected: "lspci; echo 2E8vz-\$?-"...

  • [unstable] suspend: wait_serial (wait serial expected)
    # wait_serial expected: qr/2E8vz-\d+-/...

Fixed failures

Compared to: https://openqa.qubes-os.org/tests/108196#dependencies

6 fixed

• system_tests_guivm_gui_interactive@hw9

  • clipboard_and_web: unnamed test (unknown)
  • clipboard_and_web: Failed (test died)
    # Test died: no candidate needle with tag(s) 'clipboard-paste-notif...

• system_tests_suspend_s0ix@hw15

  • enable_s0ix: wait_serial (wait serial expected)
    # wait_serial expected: qr/D_chO-\d+-/...

  • enable_s0ix: Failed (test died + timed out)
    # Test died: command 'qvm-features dom0 suspend-s0ix 1' timed out a...

• system_tests_wifi@hw6

  • startup: unnamed test (unknown)
  • startup: Failed (test died)
    # Test died: no candidate needle with tag(s) 'nm-applet-more-networ...

Unstable tests

• system_tests_network_updates

  TC_10_QvmTemplate_whonix-gateway-17/test_010_template_install (1/5 times with errors)

  • job 105873 AssertionError: libvirt event impl drain timeout

• system_tests_suspend@hw13

  suspend/ (1/5 times with errors)

  • job 107593 None
  suspend/Failed (1/5 times with errors)

  • job 107593 # Test died: no candidate needle with tag(s) 'xscreensaver-prompt' ...
  suspend/wait_serial (1/5 times with errors)

  • job 107593 # wait_serial expected: qr/2E8vz-\d+-/...

• system_tests_suspend@hw9

  suspend/ (1/5 times with errors)

  • job 107593 None
  suspend/Failed (1/5 times with errors)

  • job 107593 # Test died: no candidate needle with tag(s) 'xscreensaver-prompt' ...
  suspend/wait_serial (1/5 times with errors)

  • job 107593 # wait_serial expected: qr/2E8vz-\d+-/...

• system_tests_suspend@hw1

  suspend/ (1/5 times with errors)

  • job 107593 None
  suspend/Failed (1/5 times with errors)

  • job 107593 # Test died: no candidate needle with tag(s) 'xscreensaver-prompt' ...
  suspend/wait_serial (1/5 times with errors)

  • job 107593 # wait_serial expected: qr/2E8vz-\d+-/...

• system_tests_suspend

  suspend/ (1/5 times with errors)

  • job 107593 None
  suspend/Failed (1/5 times with errors)

  • job 107593 # Test died: no candidate needle with tag(s) 'xscreensaver-prompt' ...
  suspend/wait_serial (1/5 times with errors)

  • job 107593 # wait_serial expected: qr/2E8vz-\d+-/...

• system_tests_suspend@hw7

  suspend/ (1/5 times with errors)

  • job 107593 None
  suspend/Failed (1/5 times with errors)

  • job 107593 # Test died: no candidate needle with tag(s) 'xscreensaver-prompt' ...
  suspend/wait_serial (1/5 times with errors)

  • job 107593 # wait_serial expected: qr/2E8vz-\d+-/...

• system_tests_suspend@hw5

  suspend/ (1/5 times with errors)

  • job 107593 None
  suspend/Failed (1/5 times with errors)

  • job 107593 # Test died: no candidate needle with tag(s) 'xscreensaver-prompt' ...
  suspend/wait_serial (1/5 times with errors)

  • job 107593 # wait_serial expected: qr/2E8vz-\d+-/...

• system_tests_suspend@hw15

  suspend/ (1/5 times with errors)

  • job 107593 None
  suspend/Failed (1/5 times with errors)

  • job 107593 # Test died: no candidate needle with tag(s) 'xscreensaver-prompt' ...
  suspend/wait_serial (1/5 times with errors)

  • job 107593 # wait_serial expected: qr/2E8vz-\d+-/...

• system_tests_suspend@hw6

  suspend/ (1/5 times with errors)

  • job 107593 None
  suspend/Failed (1/5 times with errors)

  • job 107593 # Test died: no candidate needle with tag(s) 'xscreensaver-prompt' ...
  suspend/wait_serial (1/5 times with errors)

  • job 107593 # wait_serial expected: qr/2E8vz-\d+-/...

• system_tests_suspend@hw2

  suspend/ (1/5 times with errors)

  • job 107593 None
  suspend/Failed (1/5 times with errors)

  • job 107593 # Test died: no candidate needle with tag(s) 'xscreensaver-prompt' ...
  suspend/wait_serial (1/5 times with errors)

  • job 107593 # wait_serial expected: qr/2E8vz-\d+-/...

• system_tests_suspend@hw10

  suspend/ (1/5 times with errors)

  • job 107593 None
  suspend/Failed (1/5 times with errors)

  • job 107593 # Test died: no candidate needle with tag(s) 'xscreensaver-prompt' ...
  suspend/wait_serial (1/5 times with errors)

  • job 107593 # wait_serial expected: qr/2E8vz-\d+-/...