676ca2f0f6
bugfix patches list: d677de remote: fix driver name check for libxl driver 075641 systemd: start libvirtd after firewalld iptables services 06fc99 qemuDomainCleanupRun: Actually run cleanup callbacks in reverse order 01626c virDevMapperGetTargetsImpl: quit early if device is not a devmapper target 006782 qemu: only stop external devices after the domain 42a415 qemuDomainStorageSourcePrivateDispose: Free httpcookie cc8c29 Don't require secdrivers to implement .domainMoveImageMetadata 0230e3 qemuProcessStop: Use XATTRs to restore seclabels on disks a domain is mirroring into 8fd274 qemuProcessStop: Reattach NVMe disks a domain is mirroring into 55029d security: don't fail if built without attr support a5a297 qemu: Skip pre creation of NVMe disks 2a372 Fix some wrong usage of ATTRIBUTE_NONNULL e728ff conf: Increase cpuset length limit for CPU pinning 8f58a4 virQEMUDriverConfigNew: Add slash to cfg defaultTLSx509certdir for non-embeded driver 1b22dd qemuDomainSetNumaParamsLive: set nodeset for root cgroup bdb8f2 qemu: do not add model when actual iface type is hostdev Signed-off-by: Jin Yan <jinyan12@huawei.com>
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
From a34f1d6623f3fb1ec03982ef776e31a4b450158d Mon Sep 17 00:00:00 2001
|
|
From: Peter Krempa <pkrempa@redhat.com>
|
|
Date: Tue, 16 Jun 2020 12:36:55 +0200
|
|
Subject: [PATCH] virQEMUDriverConfigNew: Add slash to
|
|
cfg->defaultTLSx509certdir for non-embedded driver
|
|
|
|
Commit 068efae5b1a9ef accidentally removed the slash.
|
|
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1847234
|
|
|
|
cherry-pick from commit: 8f58a4003532d5fffdadf2adc659c94eba3fa21a
|
|
|
|
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
|
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
|
|
Signed-off-by: Jin Yan <jinyan12@huawei.com>
|
|
---
|
|
src/qemu/qemu_conf.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
|
|
index 15837ce..809e8fe 100644
|
|
--- a/src/qemu/qemu_conf.c
|
|
+++ b/src/qemu/qemu_conf.c
|
|
@@ -234,7 +234,7 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged,
|
|
* directory doesn't exist (although we don't check if this exists).
|
|
*/
|
|
if (root == NULL) {
|
|
- cfg->defaultTLSx509certdir = g_strdup(SYSCONFDIR "pki/qemu");
|
|
+ cfg->defaultTLSx509certdir = g_strdup(SYSCONFDIR "/pki/qemu");
|
|
} else {
|
|
cfg->defaultTLSx509certdir = g_strdup_printf("%s/etc/pki/qemu", root);
|
|
}
|
|
--
|
|
1.8.3.1
|
|
|