forked from pool/libvirt
096d671ce7
- Update to libvirt 4.10.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
14d03b27-libxl-rm-redundant-virObjectEventStateQueue.patch,
82452a5d-libxl-rm-goto-libxlDomainShutdownThread.patch,
da4b0fd9-libxl-support-soft-reset.patch,
libxl-qemu-emulator-caps.patch
- Added patches:
libxl-support-ovswitch.patch,
libxl-ovswitch-config-format-conversions.patch
- FATE#320928, FATE#325817, FATE#326380, FATE#326698
OBS-URL: https://build.opensuse.org/request/show/653614
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=718
53 lines
2.6 KiB
Diff
53 lines
2.6 KiB
Diff
Adjust paths of OVMF firmwares on SUSE distros
|
|
|
|
Index: libvirt-4.10.0/src/qemu/qemu.conf
|
|
===================================================================
|
|
--- libvirt-4.10.0.orig/src/qemu/qemu.conf
|
|
+++ libvirt-4.10.0/src/qemu/qemu.conf
|
|
@@ -768,10 +768,9 @@ security_default_confined = 0
|
|
# for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default
|
|
# follows this scheme.
|
|
#nvram = [
|
|
-# "/usr/share/OVMF/OVMF_CODE.fd:/usr/share/OVMF/OVMF_VARS.fd",
|
|
-# "/usr/share/OVMF/OVMF_CODE.secboot.fd:/usr/share/OVMF/OVMF_VARS.fd",
|
|
-# "/usr/share/AAVMF/AAVMF_CODE.fd:/usr/share/AAVMF/AAVMF_VARS.fd",
|
|
-# "/usr/share/AAVMF/AAVMF32_CODE.fd:/usr/share/AAVMF/AAVMF32_VARS.fd"
|
|
+# "/usr/share/qemu/ovmf-x86_64-ms-4m-code.bin:/usr/share/qemu/ovmf-x86_64-ms-4m-vars.bin",
|
|
+# "/usr/share/qemu/ovmf-x86_64-ms-code.bin:/usr/share/qemu/ovmf-x86_64-ms-vars.bin",
|
|
+# "/usr/share/qemu/aavmf-aarch64-code.bin:/usr/share/qemu/aavmf-aarch64-vars.bin"
|
|
#]
|
|
|
|
# The backend to use for handling stdout/stderr output from
|
|
Index: libvirt-4.10.0/src/qemu/qemu_conf.c
|
|
===================================================================
|
|
--- libvirt-4.10.0.orig/src/qemu/qemu_conf.c
|
|
+++ libvirt-4.10.0/src/qemu/qemu_conf.c
|
|
@@ -118,10 +118,9 @@ void qemuDomainCmdlineDefFree(qemuDomain
|
|
|
|
#ifndef DEFAULT_LOADER_NVRAM
|
|
# define DEFAULT_LOADER_NVRAM \
|
|
- "/usr/share/OVMF/OVMF_CODE.fd:/usr/share/OVMF/OVMF_VARS.fd:" \
|
|
- "/usr/share/OVMF/OVMF_CODE.secboot.fd:/usr/share/OVMF/OVMF_VARS.fd:" \
|
|
- "/usr/share/AAVMF/AAVMF_CODE.fd:/usr/share/AAVMF/AAVMF_VARS.fd:" \
|
|
- "/usr/share/AAVMF/AAVMF32_CODE.fd:/usr/share/AAVMF/AAVMF32_VARS.fd"
|
|
+ "/usr/share/qemu/ovmf-x86_64-ms-4m-code.bin:/usr/share/qemu/ovmf-x86_64-ms-4m-vars.bin:" \
|
|
+ "/usr/share/qemu/ovmf-x86_64-ms-code.bin:/usr/share/qemu/ovmf-x86_64-ms-vars.bin:" \
|
|
+ "/usr/share/qemu/aavmf-aarch64-code.bin:/usr/share/qemu/aavmf-aarch64-vars.bin"
|
|
#endif
|
|
|
|
|
|
Index: libvirt-4.10.0/src/security/virt-aa-helper.c
|
|
===================================================================
|
|
--- libvirt-4.10.0.orig/src/security/virt-aa-helper.c
|
|
+++ libvirt-4.10.0/src/security/virt-aa-helper.c
|
|
@@ -511,7 +511,8 @@ valid_path(const char *path, const bool
|
|
"/usr/share/ovmf/", /* for OVMF images */
|
|
"/usr/share/AAVMF/", /* for AAVMF images */
|
|
"/usr/share/qemu-efi/", /* for AAVMF images */
|
|
- "/usr/share/qemu-efi-aarch64/" /* for AAVMF images */
|
|
+ "/usr/share/qemu-efi-aarch64/", /* for AAVMF images */
|
|
+ "/usr/share/qemu/" /* SUSE path for OVMF and AAVMF images */
|
|
};
|
|
/* override the above with these */
|
|
const char * const override[] = {
|