forked from pool/libvirt
4d2c547eb1
- spec: use wireshark plugin directory from pkg-config
- virt-aa-helper: add SUSE path to OVMF and AAVMF images
Adjusted suse-ovmf-paths.patch
boo#1095556
- Update to libvirt 4.4.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- CVE-2018-3639
- Dropped patches:
1dbca2ec-CVE-2018-3639.patch, 92673422-CVE-2018-3639.patch
- libxl: fix leaking logfile fds
67c56f6e-libxl-logfd-leak-fix.patch
bsc#1094480
OBS-URL: https://build.opensuse.org/request/show/614408
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=691
53 lines
2.6 KiB
Diff
53 lines
2.6 KiB
Diff
Adjust paths of OVMF firmwares on SUSE distros
|
|
|
|
Index: libvirt-4.4.0/src/qemu/qemu.conf
|
|
===================================================================
|
|
--- libvirt-4.4.0.orig/src/qemu/qemu.conf
|
|
+++ libvirt-4.4.0/src/qemu/qemu.conf
|
|
@@ -747,10 +747,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.4.0/src/qemu/qemu_conf.c
|
|
===================================================================
|
|
--- libvirt-4.4.0.orig/src/qemu/qemu_conf.c
|
|
+++ libvirt-4.4.0/src/qemu/qemu_conf.c
|
|
@@ -122,10 +122,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.4.0/src/security/virt-aa-helper.c
|
|
===================================================================
|
|
--- libvirt-4.4.0.orig/src/security/virt-aa-helper.c
|
|
+++ libvirt-4.4.0/src/security/virt-aa-helper.c
|
|
@@ -517,7 +517,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[] = {
|