forked from pool/libvirt
9940daa715
- libxl: fix crash when initializing driver
88011ed2-libxl-driver-crash-fix.patch
- Update to libvirt 6.2.0
- Many incremental improvements and bug fixes, see
https://libvirt.org/news.html
- Dropped patches:
a30078cb-qemu-create-mp-target.patch,
aeb909bf-qemu-multipath-fix.patch
OBS-URL: https://build.opensuse.org/request/show/791854
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=818
39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
commit 88011ed280c4f946a7b8e7ffcea2335eb075de60
|
|
Author: Jim Fehlig <jfehlig@suse.com>
|
|
Date: Fri Apr 3 15:51:48 2020 -0600
|
|
|
|
libxl: fix crash when initializing driver
|
|
|
|
Commit 54a401af478 split out DriverConfigInit from DriverConfigNew, but
|
|
then called it a bit late from libxlStateInitialize. The cfg is used in
|
|
libxlDriverConfigLoadFile and when uninitialized results in a crash.
|
|
Calling DriverConfigInit immediately after DriverConfigNew fixes the
|
|
crash.
|
|
|
|
Signed-off-by: Jim Fehlig <jfehlig@suse.com>
|
|
Reviewed-by: Erik Skultety <eskultet@redhat.com>
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
|
Index: libvirt-6.2.0/src/libxl/libxl_driver.c
|
|
===================================================================
|
|
--- libvirt-6.2.0.orig/src/libxl/libxl_driver.c
|
|
+++ libvirt-6.2.0/src/libxl/libxl_driver.c
|
|
@@ -702,14 +702,14 @@ libxlStateInitialize(bool privileged,
|
|
if (!(cfg = libxlDriverConfigNew()))
|
|
goto error;
|
|
|
|
+ if (libxlDriverConfigInit(cfg) < 0)
|
|
+ goto error;
|
|
+
|
|
driverConf = g_strdup_printf("%s/libxl.conf", cfg->configBaseDir);
|
|
|
|
if (libxlDriverConfigLoadFile(cfg, driverConf) < 0)
|
|
goto error;
|
|
|
|
- if (libxlDriverConfigInit(cfg) < 0)
|
|
- goto error;
|
|
-
|
|
/* Register the callbacks providing access to libvirt's event loop */
|
|
libxl_osevent_register_hooks(cfg->ctx, &libxl_osevent_callbacks, cfg->ctx);
|
|
|