bf251437e9
Many changes were necessary this time around:
* QAPI was changed to avoid redundant has_* variables, see commit
44ea9d9be3 ("qapi: Start to elide redundant has_FOO in generated C")
for details. This affected many QMP commands added by Proxmox too.
* Pending querying for migration got split into two functions, one to
estimate, one for exact value, see commit c8df4a7aef ("migration:
Split save_live_pending() into state_pending_*") for details. Relevant
for savevm-async and PBS dirty bitmap.
* Some block (driver) functions got converted to coroutines, so the
Proxmox block drivers needed to be adapted.
* Alloc track auto-detaching during PBS live restore got broken by
AioContext-related changes resulting in a deadlock. The current, hacky
method was replaced by a simpler one. Stefan apparently ran into a
problem with that when he wrote the driver, but there were
improvements in the stream job code since then and I didn't manage to
reproduce the issue. It's a separate patch "alloc-track: fix deadlock
during drop" for now, you can find the details there.
* Async snapshot-related changes:
- The pending querying got adapted to the above-mentioned split and
a patch is added to optimize it/make it more similar to what
upstream code does.
- Added initialization of the compression counters (for
future-proofing).
- It's necessary the hold the BQL (big QEMU lock = iothread mutex)
during the setup phase, because block layer functions are used there
and not doing so leads to racy, hard-to-debug crashes or hangs. It's
necessary to change some upstream code too for this, a version of
the patch "migration: for snapshots, hold the BQL during setup
callbacks" is intended to be upstreamed.
- Need to take the bdrv graph read lock before flushing.
* hmp_info_balloon was moved to a different file.
* Needed to include a new headers from time to time to still get the
correct functions.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
57 lines
1.9 KiB
Diff
57 lines
1.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
|
|
Date: Mon, 6 Apr 2020 12:16:33 +0200
|
|
Subject: [PATCH] PVE: [Config] ui/spice: default to pve certificates
|
|
|
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
---
|
|
ui/spice-core.c | 15 +++++++++------
|
|
1 file changed, 9 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/ui/spice-core.c b/ui/spice-core.c
|
|
index 52a59386d7..b20c25aee0 100644
|
|
--- a/ui/spice-core.c
|
|
+++ b/ui/spice-core.c
|
|
@@ -691,32 +691,35 @@ static void qemu_spice_init(void)
|
|
|
|
if (tls_port) {
|
|
x509_dir = qemu_opt_get(opts, "x509-dir");
|
|
- if (!x509_dir) {
|
|
- x509_dir = ".";
|
|
- }
|
|
|
|
str = qemu_opt_get(opts, "x509-key-file");
|
|
if (str) {
|
|
x509_key_file = g_strdup(str);
|
|
- } else {
|
|
+ } else if (x509_dir) {
|
|
x509_key_file = g_strdup_printf("%s/%s", x509_dir,
|
|
X509_SERVER_KEY_FILE);
|
|
+ } else {
|
|
+ x509_key_file = g_strdup("/etc/pve/local/pve-ssl.key");
|
|
}
|
|
|
|
str = qemu_opt_get(opts, "x509-cert-file");
|
|
if (str) {
|
|
x509_cert_file = g_strdup(str);
|
|
- } else {
|
|
+ } else if (x509_dir) {
|
|
x509_cert_file = g_strdup_printf("%s/%s", x509_dir,
|
|
X509_SERVER_CERT_FILE);
|
|
+ } else {
|
|
+ x509_cert_file = g_strdup("/etc/pve/local/pve-ssl.pem");
|
|
}
|
|
|
|
str = qemu_opt_get(opts, "x509-cacert-file");
|
|
if (str) {
|
|
x509_cacert_file = g_strdup(str);
|
|
- } else {
|
|
+ } else if (x509_dir) {
|
|
x509_cacert_file = g_strdup_printf("%s/%s", x509_dir,
|
|
X509_CA_CERT_FILE);
|
|
+ } else {
|
|
+ x509_cacert_file = g_strdup("/etc/pve/pve-root-ca.pem");
|
|
}
|
|
|
|
x509_key_password = qemu_opt_get(opts, "x509-key-password");
|