Merge remote-tracking branch 'up/main' into main-riscv64
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
commit
dc5fb57483
|
@ -1,34 +0,0 @@
|
||||||
From: Pavel Hrdina <phrdina@redhat.com>
|
|
||||||
Date: Fri, 3 Nov 2023 14:03:55 +0100
|
|
||||||
Subject: [PATCH] qemu_process: fix crash in qemuSaveImageDecompressionStart
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
Content-type: text/plain
|
|
||||||
|
|
||||||
Commit changing the code to allow passing NULL as @data into
|
|
||||||
qemuSaveImageDecompressionStart() was not correct as it left the
|
|
||||||
original call into the function as well.
|
|
||||||
|
|
||||||
Introduced-by: 2f3e582a1ac1008eba8d43c751cdba8712dd1614
|
|
||||||
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2247754
|
|
||||||
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
||||||
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
||||||
---
|
|
||||||
src/qemu/qemu_process.c | 3 ---
|
|
||||||
1 file changed, 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
|
|
||||||
index 1ef032dbd2..b9267d8699 100644
|
|
||||||
--- a/src/qemu/qemu_process.c
|
|
||||||
+++ b/src/qemu/qemu_process.c
|
|
||||||
@@ -8208,9 +8208,6 @@ qemuProcessStartWithMemoryState(virConnectPtr conn,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (qemuSaveImageDecompressionStart(data, fd, &intermediatefd, &errbuf, &cmd) < 0)
|
|
||||||
- return -1;
|
|
||||||
-
|
|
||||||
/* No cookie means libvirt which saved the domain was too old to mess up
|
|
||||||
* the CPU definitions.
|
|
||||||
*/
|
|
495
libvirt.spec
495
libvirt.spec
File diff suppressed because it is too large
Load Diff
2
sources
2
sources
|
@ -1 +1 @@
|
||||||
SHA512 (libvirt-9.9.0.tar.xz) = 77cea28acf4f3e8c92fbd5bd72ad084be183c07f14e3a9ce35d6d9d62d36ee97a30cef55fb204b3e43f282890ecd7d5827a784a517e7f4ed8b22ee502c3f09d7
|
SHA512 (libvirt-9.10.0.tar.xz) = d35d14810a29aef9319d894e60d493c9011930e0b45d832861c8f8669ee66c0539cdd49f8e0a94801b510ae0f1ed150e4d6a03ea03cc23e8cb2e5456edd76f68
|
||||||
|
|
Loading…
Reference in New Issue