mirror of
https://git.proxmox.com/git/pve-qemu
synced 2025-08-24 13:04:03 +00:00
7882afe30d
Notable changes, most interestingly the two build system changes:
* avoid making 'migration' target depend on 'libproxmox_backup_qemu':
Having pbs-state.c be part of the 'migration_files' makes the
'migration' target depend on 'libproxmox_backup_qemu'. Adding the
dependency to 'migration' and 'libmigration' would not be enough
however, because pbs-state.c depends on savevm.c (for
register_savevm_live()), and savevm.c is not itself part of the
'migration_files' and would need to be moved too. Otherwise, linking
the 'test-xbzrle' unit test is broken. Instead, don't declare
pbs-state.c to be part of the 'migration_files'.
* meson: pbs-restore + vma: add qemuutil dependency explicitly
Both pbs-restore and vma use "qemu/osdep.h" so the dependency is
present. Being explicit is required after commit 414b180d42 ("meson:
Pass objects and dependencies to declare_dependency()").
* QAPI docs "Notes:" to ".. note::" conversion following commit
d461c27973 ("qapi: convert "Note" sections to plain rST").
* Removal of QERR_* macros following commit
a95921f171 ("qapi: Inline and remove QERR_DEVICE_HAS_NO_MEDIUM
definition") and friends.
* Signature change for .save_setup callbacks following commit
01c3ac681b ("migration: Add Error** argument to .save_setup()
handler").
* Removal of separate .bdrv_file_open callbacks following commit
44b424dc4a ("block: remove separate bdrv_file_open callback")
* Adapt dirty bitmap migration error handling following commit
dd03167725 ("migration: Add Error** argument to
add_bitmaps_to_list()")
* Adapt savevm async to removed block migration following commit
eef0bae3a7 ("migration: Remove block migration")
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
34 lines
1.3 KiB
Diff
34 lines
1.3 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:53 +0200
|
|
Subject: [PATCH] PVE: monitor: disable oob capability
|
|
|
|
A bisect revealed that commit 8258292e18c3
|
|
("monitor: Remove "x-oob", offer capability "oob" unconditionally")
|
|
causes unexpected hangs when restoring live snapshots from some
|
|
types of block devices (particularly RBD).
|
|
We need to figure out what's happnening there. For now, since we
|
|
had this disabled before and probably don't need it now either,
|
|
disable oob, so we can get a functioning qemu out...
|
|
|
|
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
|
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
---
|
|
monitor/qmp.c | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
diff --git a/monitor/qmp.c b/monitor/qmp.c
|
|
index eb181d5979..20fc0d20a6 100644
|
|
--- a/monitor/qmp.c
|
|
+++ b/monitor/qmp.c
|
|
@@ -534,8 +534,7 @@ void monitor_init_qmp(Chardev *chr, bool pretty, Error **errp)
|
|
qemu_chr_fe_set_echo(&mon->common.chr, true);
|
|
|
|
/* Note: we run QMP monitor in I/O thread when @chr supports that */
|
|
- monitor_data_init(&mon->common, true, false,
|
|
- qemu_chr_has_feature(chr, QEMU_CHAR_FEATURE_GCONTEXT));
|
|
+ monitor_data_init(&mon->common, true, false, false);
|
|
|
|
mon->pretty = pretty;
|
|
|