summaryrefslogtreecommitdiffstats
path: root/recipes-extended/libvirt/libvirt/0001-qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-extended/libvirt/libvirt/0001-qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch')
-rw-r--r--recipes-extended/libvirt/libvirt/0001-qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch52
1 files changed, 0 insertions, 52 deletions
diff --git a/recipes-extended/libvirt/libvirt/0001-qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch b/recipes-extended/libvirt/libvirt/0001-qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch
deleted file mode 100644
index 85870e09..00000000
--- a/recipes-extended/libvirt/libvirt/0001-qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From 823a62ec8aac4fb75e6e281164f3eb56ae47597c Mon Sep 17 00:00:00 2001
2From: Boris Fiuczynski <fiuczy@linux.ibm.com>
3Date: Tue, 1 Mar 2022 18:47:59 +0100
4Subject: [PATCH] qemu: segmentation fault in virtqemud executing
5 qemuDomainUndefineFlags
6
7Commit 5adfb3472342741c443ac91dee0abb18b5a3d038 causes a segmentation fault.
8
9Stack trace of thread 664419:
10 #0 0x000003ff62ec553c in qemuDomainUndefineFlags (dom=0x3ff6c002810, flags=<optimized out>) at ../src/qemu/qemu_driver.c:6618
11 #1 0x000003ff876a7e5c in virDomainUndefineFlags (domain=domain@entry=0x3ff6c002810, flags=<optimized out>) at ../src/libvirt-domain.c:6519
12 #2 0x000002aa2b64a808 in remoteDispatchDomainUndefineFlags (server=0x2aa2c3d7880, msg=0x2aa2c3d2770, args=<optimized out>, rerr=0x3ff8287b950, client=<optimized out>)
13 at src/remote/remote_daemon_dispatch_stubs.h:13080
14 #3 remoteDispatchDomainUndefineFlagsHelper (server=0x2aa2c3d7880, client=<optimized out>, msg=0x2aa2c3d2770, rerr=0x3ff8287b950, args=<optimized out>, ret=0x0)
15 at src/remote/remote_daemon_dispatch_stubs.h:13059
16 #4 0x000003ff8758bbf4 in virNetServerProgramDispatchCall (msg=0x2aa2c3d2770, client=0x2aa2c3e3050, server=0x2aa2c3d7880, prog=0x2aa2c3d8010)
17 at ../src/rpc/virnetserverprogram.c:428
18 #5 virNetServerProgramDispatch (prog=0x2aa2c3d8010, server=server@entry=0x2aa2c3d7880, client=0x2aa2c3e3050, msg=0x2aa2c3d2770) at ../src/rpc/virnetserverprogram.c:302
19 #6 0x000003ff8758c260 in virNetServerProcessMsg (msg=<optimized out>, prog=<optimized out>, client=<optimized out>, srv=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:140
20 #7 virNetServerHandleJob (jobOpaque=0x2aa2c3e2d30, opaque=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:160
21 #8 0x000003ff874c49aa in virThreadPoolWorker (opaque=<optimized out>) at ../src/util/virthreadpool.c:164
22 #9 0x000003ff874c3f62 in virThreadHelper (data=<optimized out>) at ../src/util/virthread.c:256
23 #10 0x000003ff86c1cf8c in start_thread () from /lib64/libc.so.6
24 #11 0x000003ff86c9650e in thread_start () from /lib64/libc.so.6
25
26Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
27Reviewed-by: Jim Fehlig <jfehlig@suse.com>
28Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
29
30Upstream-Status: Backport [823a62ec8aac4fb75e6e281164f3eb56ae47597c]
31
32Signed-off-by: He Zhe <zhe.he@windriver.com>
33---
34 src/qemu/qemu_driver.c | 2 +-
35 1 file changed, 1 insertion(+), 1 deletion(-)
36
37diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
38index bcd9bdb436..8337eed510 100644
39--- a/src/qemu/qemu_driver.c
40+++ b/src/qemu/qemu_driver.c
41@@ -6615,7 +6615,7 @@ qemuDomainUndefineFlags(virDomainPtr dom,
42 }
43 }
44
45- if (vm->def->os.loader->nvram) {
46+ if (vm->def->os.loader && vm->def->os.loader->nvram) {
47 nvram_path = g_strdup(vm->def->os.loader->nvram);
48 } else if (vm->def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI) {
49 qemuDomainNVRAMPathFormat(cfg, vm->def, &nvram_path);
50--
512.25.1
52