2020-06-30 15:06:20 +03:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Stefan Reiter <s.reiter@proxmox.com>
|
2021-02-11 19:11:11 +03:00
|
|
|
Date: Tue, 12 Jan 2021 14:12:20 +0100
|
2020-06-30 15:06:20 +03:00
|
|
|
Subject: [PATCH] PVE: redirect stderr to journal when daemonized
|
|
|
|
|
|
|
|
|
|
QEMU uses the logging for error messages usually, so LOG_ERR is most
|
|
|
|
|
fitting.
|
2020-10-29 16:10:36 +03:00
|
|
|
|
|
|
|
|
Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
|
2022-01-13 12:34:33 +03:00
|
|
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
2020-06-30 15:06:20 +03:00
|
|
|
---
|
2021-02-11 19:11:11 +03:00
|
|
|
meson.build | 2 ++
|
|
|
|
|
os-posix.c | 7 +++++--
|
|
|
|
|
2 files changed, 7 insertions(+), 2 deletions(-)
|
2020-06-30 15:06:20 +03:00
|
|
|
|
2021-02-11 19:11:11 +03:00
|
|
|
diff --git a/meson.build b/meson.build
|
2023-06-15 14:38:59 +03:00
|
|
|
index 69afe3441b..b2e9b2aec7 100644
|
2021-02-11 19:11:11 +03:00
|
|
|
--- a/meson.build
|
|
|
|
|
+++ b/meson.build
|
update submodule and patches to QEMU 8.0.0
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>
2023-05-15 16:39:53 +03:00
|
|
|
@@ -1528,6 +1528,7 @@ keyutils = dependency('libkeyutils', required: false,
|
2021-02-11 19:11:11 +03:00
|
|
|
has_gettid = cc.has_function('gettid')
|
2020-06-30 15:06:20 +03:00
|
|
|
|
2021-02-11 19:11:11 +03:00
|
|
|
libuuid = cc.find_library('uuid', required: true)
|
|
|
|
|
+libsystemd = cc.find_library('systemd', required: true)
|
|
|
|
|
libproxmox_backup_qemu = cc.find_library('proxmox_backup_qemu', required: true)
|
2020-06-30 15:06:20 +03:00
|
|
|
|
2022-02-11 12:24:33 +03:00
|
|
|
# libselinux
|
2023-05-15 16:39:54 +03:00
|
|
|
@@ -3144,6 +3145,7 @@ if have_block
|
2021-05-27 13:43:32 +03:00
|
|
|
# os-posix.c contains POSIX-specific functions used by qemu-storage-daemon,
|
|
|
|
|
# os-win32.c does not
|
|
|
|
|
blockdev_ss.add(when: 'CONFIG_POSIX', if_true: files('os-posix.c'))
|
|
|
|
|
+ blockdev_ss.add(when: 'CONFIG_POSIX', if_true: libsystemd)
|
|
|
|
|
softmmu_ss.add(when: 'CONFIG_WIN32', if_true: [files('os-win32.c')])
|
|
|
|
|
endif
|
2021-02-11 19:11:11 +03:00
|
|
|
|
2020-06-30 15:06:20 +03:00
|
|
|
diff --git a/os-posix.c b/os-posix.c
|
2023-06-15 14:38:59 +03:00
|
|
|
index 90ea71725f..33745a8c22 100644
|
2020-06-30 15:06:20 +03:00
|
|
|
--- a/os-posix.c
|
|
|
|
|
+++ b/os-posix.c
|
|
|
|
|
@@ -28,6 +28,8 @@
|
|
|
|
|
#include <pwd.h>
|
|
|
|
|
#include <grp.h>
|
|
|
|
|
#include <libgen.h>
|
|
|
|
|
+#include <systemd/sd-journal.h>
|
|
|
|
|
+#include <syslog.h>
|
|
|
|
|
|
|
|
|
|
/* Needed early for CONFIG_BSD etc. */
|
update submodule and patches to 7.1.0
Notable changes:
* The only big change is the switch to using a custom QIOChannel for
savevm-async, because the previously used QEMUFileOps was dropped.
Changes to the current implementation:
* Switch to vector based methods as required for an IO channel. For
short reads the passed-in IO vector is stuffed with zeroes at the
end, just to be sure.
* For reading: The documentation in include/io/channel.h states that
at least one byte should be read, so also error out when whe are
at the very end instead of returning 0.
* For reading: Fix off-by-one error when request goes beyond end.
The wrong code piece was:
if ((pos + size) > maxlen) {
size = maxlen - pos - 1;
}
Previously, the last byte would not be read. It's actually
possible to get a snapshot .raw file that has content all the way
up the final 512 byte (= BDRV_SECTOR_SIZE) boundary without any
trailing zero bytes (I wrote a script to do it).
Luckily, it didn't cause a real issue, because qemu_loadvm_state()
is not interested in the final (i.e. QEMU_VM_VMDESCRIPTION)
section. The buffer for reading it is simply freed up afterwards
and the function will assume that it read the whole section, even
if that's not the case.
* For writing: Make use of the generated blk_pwritev() wrapper
instead of manually wrapping the coroutine to simplify and save a
few lines.
* Adapt to changed interfaces for blk_{pread,pwrite}:
* a9262f551e ("block: Change blk_{pread,pwrite}() param order")
* 3b35d4542c ("block: Add a 'flags' param to blk_pread()")
* bf5b16fa40 ("block: Make blk_{pread,pwrite}() return 0 on success")
Those changes especially affected the qemu-img dd patches, because
the context also changed, but also some of our block drivers used
the functions.
* Drop qemu-common.h include: it got renamed after essentially
everything was moved to other headers. The only remaining user I
could find for things dropped from the header between 7.0 and 7.1
was qemu_get_vm_name() in the iscsi-initiatorname patch, but it
already includes the header to which the function was moved.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
2022-10-14 15:07:13 +03:00
|
|
|
#include "net/slirp.h"
|
2023-06-15 14:38:59 +03:00
|
|
|
@@ -301,9 +303,10 @@ void os_setup_post(void)
|
2020-06-30 15:06:20 +03:00
|
|
|
|
|
|
|
|
dup2(fd, 0);
|
|
|
|
|
dup2(fd, 1);
|
|
|
|
|
- /* In case -D is given do not redirect stderr to /dev/null */
|
|
|
|
|
+ /* In case -D is given do not redirect stderr to journal */
|
update submodule and patches to 7.1.0
Notable changes:
* The only big change is the switch to using a custom QIOChannel for
savevm-async, because the previously used QEMUFileOps was dropped.
Changes to the current implementation:
* Switch to vector based methods as required for an IO channel. For
short reads the passed-in IO vector is stuffed with zeroes at the
end, just to be sure.
* For reading: The documentation in include/io/channel.h states that
at least one byte should be read, so also error out when whe are
at the very end instead of returning 0.
* For reading: Fix off-by-one error when request goes beyond end.
The wrong code piece was:
if ((pos + size) > maxlen) {
size = maxlen - pos - 1;
}
Previously, the last byte would not be read. It's actually
possible to get a snapshot .raw file that has content all the way
up the final 512 byte (= BDRV_SECTOR_SIZE) boundary without any
trailing zero bytes (I wrote a script to do it).
Luckily, it didn't cause a real issue, because qemu_loadvm_state()
is not interested in the final (i.e. QEMU_VM_VMDESCRIPTION)
section. The buffer for reading it is simply freed up afterwards
and the function will assume that it read the whole section, even
if that's not the case.
* For writing: Make use of the generated blk_pwritev() wrapper
instead of manually wrapping the coroutine to simplify and save a
few lines.
* Adapt to changed interfaces for blk_{pread,pwrite}:
* a9262f551e ("block: Change blk_{pread,pwrite}() param order")
* 3b35d4542c ("block: Add a 'flags' param to blk_pread()")
* bf5b16fa40 ("block: Make blk_{pread,pwrite}() return 0 on success")
Those changes especially affected the qemu-img dd patches, because
the context also changed, but also some of our block drivers used
the functions.
* Drop qemu-common.h include: it got renamed after essentially
everything was moved to other headers. The only remaining user I
could find for things dropped from the header between 7.0 and 7.1
was qemu_get_vm_name() in the iscsi-initiatorname patch, but it
already includes the header to which the function was moved.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
2022-10-14 15:07:13 +03:00
|
|
|
if (!qemu_log_enabled()) {
|
2020-06-30 15:06:20 +03:00
|
|
|
- dup2(fd, 2);
|
|
|
|
|
+ int journal_fd = sd_journal_stream_fd("QEMU", LOG_ERR, 0);
|
|
|
|
|
+ dup2(journal_fd, 2);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
close(fd);
|