Compare commits
65 Commits
v8.0.2-3+v
...
master
Author | SHA1 | Date |
---|---|---|
Vitaliy Filippov | 42c03e8631 | |
Thomas Lamprecht | 16b7dfe03b | |
Fiona Ebner | f06b222ece | |
Fiona Ebner | db293008ee | |
Fiona Ebner | 51232e2e40 | |
Thomas Lamprecht | 2cd560e0d2 | |
Fiona Ebner | 4fbd50e2f9 | |
Thomas Lamprecht | 766c61f1b6 | |
Thomas Lamprecht | c19617bf9b | |
Fiona Ebner | f1eed34ac7 | |
Fiona Ebner | 2e71c17f5b | |
Fiona Ebner | f76e07f370 | |
Fiona Ebner | 71dd2d48f9 | |
Thomas Lamprecht | 59ab88deb6 | |
Thomas Lamprecht | 20209d8d73 | |
Thomas Lamprecht | 47bdd04244 | |
Thomas Lamprecht | 8dd76cc52d | |
Fiona Ebner | cd7676f3e6 | |
Fiona Ebner | 862b46e3e0 | |
Fiona Ebner | 061e9ceb36 | |
Thomas Lamprecht | 0d4462207b | |
Fiona Ebner | ed159bc32a | |
Fiona Ebner | 86460aef76 | |
Thomas Lamprecht | 676adda3c6 | |
Thomas Lamprecht | 4ff04bdfa5 | |
Thomas Lamprecht | 12b69ed9c5 | |
Fiona Ebner | 5e8903f875 | |
Fiona Ebner | 4b7975e75d | |
Fiona Ebner | f366bb97ae | |
Fiona Ebner | 2a49e667ba | |
Thomas Lamprecht | c6eb05a799 | |
Fiona Ebner | dfac4f3593 | |
Fiona Ebner | 6b7c1815e1 | |
Thomas Lamprecht | 24d732ac0f | |
Fiona Ebner | df2cc786ee | |
Thomas Lamprecht | 38726d3473 | |
Fiona Ebner | 89b46e17ec | |
Thomas Lamprecht | 33b22c3fe0 | |
Fiona Ebner | c38e337f5d | |
Fiona Ebner | 763949965f | |
Thomas Lamprecht | 1807330a6f | |
Thomas Lamprecht | a31ab74058 | |
Fiona Ebner | b39f726f31 | |
Fiona Ebner | a36bda146c | |
Fiona Ebner | 03ff63aa61 | |
Fiona Ebner | 10e1093325 | |
Fiona Ebner | 0d9c737d61 | |
Fiona Ebner | a6ddea7ef7 | |
Fiona Ebner | 89520c1cd0 | |
Thomas Lamprecht | eca4daeeed | |
Fiona Ebner | 816077299c | |
Fiona Ebner | ef3308db71 | |
Filip Schauer | 0ff45eb23e | |
Thomas Lamprecht | 6c5563e30b | |
Fiona Ebner | 9e0186f289 | |
Fiona Ebner | 0cffb504e7 | |
Fiona Ebner | f7eed6caa1 | |
Filip Schauer | 0cff91a000 | |
Fiona Ebner | 6cadf3677d | |
Fiona Ebner | 5f9cb29c3a | |
Fiona Ebner | c36e3f9d17 | |
Filip Schauer | b8b4ce0480 | |
Fiona Ebner | df47146afe | |
Fabian Grünbichler | d9cbfafeeb | |
Fiona Ebner | 5919ec1446 |
26
Makefile
26
Makefile
|
@ -17,10 +17,14 @@ all: $(DEBS)
|
|||
|
||||
.PHONY: submodule
|
||||
submodule:
|
||||
test -f "$(SRCDIR)/configure" || git submodule update --init --recursive
|
||||
ifeq ($(shell test -f "$(SRCDIR)/configure" && echo 1 || echo 0), 0)
|
||||
git submodule update --init --recursive
|
||||
cd $(SRCDIR); meson subprojects download
|
||||
endif
|
||||
|
||||
PC_BIOS_FW_PURGE_LIST_IN = \
|
||||
hppa-firmware.img \
|
||||
hppa-firmware64.img \
|
||||
openbios-ppc \
|
||||
openbios-sparc32 \
|
||||
openbios-sparc64 \
|
||||
|
@ -28,7 +32,8 @@ PC_BIOS_FW_PURGE_LIST_IN = \
|
|||
s390-ccw.img \
|
||||
s390-netboot.img \
|
||||
u-boot.e500 \
|
||||
.*\.dtb \
|
||||
.*[a-zA-Z0-9]\.dtb \
|
||||
.*[a-zA-Z0-9]\.dts \
|
||||
qemu_vga.ndrv \
|
||||
slof.bin \
|
||||
opensbi-riscv.*-generic-fw_dynamic.bin \
|
||||
|
@ -36,16 +41,14 @@ PC_BIOS_FW_PURGE_LIST_IN = \
|
|||
BLOB_PURGE_SED_CMDS = $(foreach FILE,$(PC_BIOS_FW_PURGE_LIST_IN),-e "/$(FILE)/d")
|
||||
BLOB_PURGE_FILTER = $(foreach FILE,$(PC_BIOS_FW_PURGE_LIST_IN),-e "$(FILE)")
|
||||
|
||||
$(BUILDDIR): keycodemapdb | submodule
|
||||
$(BUILDDIR): submodule
|
||||
# check if qemu/ was used for a build
|
||||
# if so, please run 'make distclean' in the submodule and try again
|
||||
test ! -f $(SRCDIR)/build/config.status
|
||||
rm -rf $@.tmp $@
|
||||
cp -a $(SRCDIR) $@.tmp
|
||||
cp -a debian $@.tmp/debian
|
||||
rm -rf $@.tmp/ui/keycodemapdb
|
||||
rm -rf $@.tmp/roms/edk2 # packaged separately
|
||||
cp -a keycodemapdb $@.tmp/ui/
|
||||
find $@.tmp/pc-bios -type f | grep $(BLOB_PURGE_FILTER) | xargs rm -f
|
||||
sed -i $(BLOB_PURGE_SED_CMDS) $@.tmp/pc-bios/meson.build
|
||||
echo "git clone git://git.proxmox.com/git/pve-qemu.git\\ngit checkout $(GITVERSION)" > $@.tmp/debian/SOURCE
|
||||
|
@ -55,7 +58,7 @@ $(BUILDDIR): keycodemapdb | submodule
|
|||
deb kvm: $(DEBS)
|
||||
$(DEB_DBG): $(DEB)
|
||||
$(DEB): $(BUILDDIR)
|
||||
cd $(BUILDDIR); dpkg-buildpackage -b -us -uc -j
|
||||
cd $(BUILDDIR); dpkg-buildpackage -b -us -uc -j32
|
||||
lintian $(DEBS)
|
||||
|
||||
sbuild: $(DSC)
|
||||
|
@ -73,17 +76,6 @@ dsc:
|
|||
$(DSC): $(ORIG_SRC_TAR) $(BUILDDIR)
|
||||
cd $(BUILDDIR); dpkg-buildpackage -S -us -uc -d
|
||||
|
||||
.PHONY: update
|
||||
update:
|
||||
cd $(SRCDIR) && git submodule deinit ui/keycodemapdb || true
|
||||
rm -rf $(SRCDIR)/ui/keycodemapdb
|
||||
mkdir $(SRCDIR)/ui/keycodemapdb
|
||||
cd $(SRCDIR) && git submodule update --init ui/keycodemapdb
|
||||
rm -rf keycodemapdb
|
||||
mkdir keycodemapdb
|
||||
cp -R $(SRCDIR)/ui/keycodemapdb/* keycodemapdb/
|
||||
git add keycodemapdb
|
||||
|
||||
.PHONY: upload
|
||||
upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
|
||||
upload: $(DEBS)
|
||||
|
|
|
@ -1,3 +1,178 @@
|
|||
pve-qemu-kvm (9.0.0-2+vitastor1) bookworm; urgency=medium
|
||||
|
||||
* Add Vitastor support
|
||||
|
||||
-- Vitaliy Filippov <vitalif@yourcmc.ru> Mon, 20 May 2024 19:53:28 +0300
|
||||
|
||||
pve-qemu-kvm (9.0.0-2) bookworm; urgency=medium
|
||||
|
||||
* fix #5409: backup: fix copy-before-write timeout
|
||||
|
||||
* backup: improve error when copy-before-write fails for fleecing
|
||||
|
||||
* fix forwards and backwards migration with VirtIO-GPU display
|
||||
|
||||
* fix a regression in pflash device introduced in 8.2
|
||||
|
||||
* revert a commit for VirtIO PCI devices that turned out to cause more
|
||||
potential security issues than what it fixed
|
||||
|
||||
* move compatibility flags for a new VirtIO-net feature to the correct
|
||||
machine type. The feature was introduced in QEMU 8.2, but the
|
||||
compatibility flags got added to machine version 8.0 instead of 8.1. This
|
||||
breaks backwards migration with machine version 8.1 from a 8.2/9.0 binary
|
||||
to an 8.1 binary, in cases where the guest kernel enables the feature
|
||||
(e.g. Ubuntu 23.10).
|
||||
While that breaks migration with machine version 8.1 from an unpatched to
|
||||
a patched binary, Proxmox VE only ever had 8.2 on the test repository and
|
||||
9.0 not yet in any public repository.
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Fri, 17 May 2024 17:04:52 +0200
|
||||
|
||||
pve-qemu-kvm (9.0.0-1) bookworm; urgency=medium
|
||||
|
||||
* update submodule and patches to QEMU 9.0.0
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Mon, 29 Apr 2024 10:51:37 +0200
|
||||
|
||||
pve-qemu-kvm (8.2.2-1) bookworm; urgency=medium
|
||||
|
||||
* update submodule and patches to QEMU 8.2.2
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Sat, 27 Apr 2024 12:44:30 +0200
|
||||
|
||||
pve-qemu-kvm (8.1.5-5) bookworm; urgency=medium
|
||||
|
||||
* implement support for backup fleecing
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Thu, 11 Apr 2024 17:46:48 +0200
|
||||
|
||||
pve-qemu-kvm (8.1.5-4) bookworm; urgency=medium
|
||||
|
||||
* fix live-import for certain kinds of VMDK images that rely on padding
|
||||
|
||||
* backup: avoid bubbling up first error if it's an ECANCELED one, as those
|
||||
are often a result of cancling the job due to running into an actual
|
||||
issue.
|
||||
|
||||
* backup: factor out & clean up gathering device info into helper
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Tue, 12 Mar 2024 14:08:40 +0100
|
||||
|
||||
pve-qemu-kvm (8.1.5-3) bookworm; urgency=medium
|
||||
|
||||
* backport fix for potential deadlock during QMP stop command if the VM has
|
||||
disks attached through VirtIO-Block and IO-Thread enabled
|
||||
|
||||
* fix #4507: add patch to automatically increase NOFILE soft limit
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Wed, 21 Feb 2024 20:11:23 +0100
|
||||
|
||||
pve-qemu-kvm (8.1.5-2) bookworm; urgency=medium
|
||||
|
||||
* work around for a situation where guest IO might get stuck, if the VM is
|
||||
configure with iothread and VirtIO block/SCSI
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Fri, 02 Feb 2024 19:41:27 +0100
|
||||
|
||||
pve-qemu-kvm (8.1.5-1) bookworm; urgency=medium
|
||||
|
||||
* update to 8.1.5 stable release, including more relevant fixes like:
|
||||
- virtio-net: correctly copy vnet header when flushing TX
|
||||
- hw/pflash: implement update buffer for block writes
|
||||
- Fixes to i386 emulation and ARM emulation.
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Fri, 02 Feb 2024 19:08:13 +0100
|
||||
|
||||
pve-qemu-kvm (8.1.2-6) bookworm; urgency=medium
|
||||
|
||||
* revert attempted fix to avoid rare issue with stuck guest IO when using
|
||||
iothread, because it caused a much more common issue with iothreads
|
||||
consuming too much CPU
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Fri, 15 Dec 2023 14:22:06 +0100
|
||||
|
||||
pve-qemu-kvm (8.1.2-5) bookworm; urgency=medium
|
||||
|
||||
* backport workaround for stuck guest IO with iothread and VirtIO block/SCSI
|
||||
in some rare edge cases
|
||||
|
||||
* backport fix for potential deadlock when issuing the "resize" QMP command
|
||||
for a disk that is using iothread
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Mon, 11 Dec 2023 16:58:27 +0100
|
||||
|
||||
pve-qemu-kvm (8.1.2-4) bookworm; urgency=medium
|
||||
|
||||
* fix vnc clipboard in the host to guest direction
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Wed, 22 Nov 2023 14:28:21 +0100
|
||||
|
||||
pve-qemu-kvm (8.1.2-3) bookworm; urgency=medium
|
||||
|
||||
* fix #5054: backport fix for software reset with SATA, avoiding breakage
|
||||
with, e.g., some FreeBSD VMs
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Mon, 20 Nov 2023 10:24:50 +0100
|
||||
|
||||
pve-qemu-kvm (8.1.2-2) bookworm; urgency=medium
|
||||
|
||||
* revert "x86: acpi: workaround Windows not handling name references in
|
||||
Package properly" as that seems to have broken networking (and possibly
|
||||
other things) one some localized variants of Windows (e.g., the German
|
||||
versions).
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Fri, 17 Nov 2023 11:55:23 +0100
|
||||
|
||||
pve-qemu-kvm (8.1.2-1) bookworm; urgency=medium
|
||||
|
||||
* update submodule and patches to QEMU 8.1.2
|
||||
|
||||
* use QEMU's keycode-map-db again instead of our static copy from QEMU 6.0
|
||||
|
||||
* disable graph locking, newly introduced in the 8.1 release, as it has
|
||||
still various deadlock issuess, e.g., during canceling backup jobs.
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Tue, 24 Oct 2023 13:42:45 +0200
|
||||
|
||||
pve-qemu-kvm (8.0.2-7) bookworm; urgency=medium
|
||||
|
||||
* fix #2874: SATA: avoid unsolicited write to sector 0 during reset
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Wed, 04 Oct 2023 08:33:35 +0200
|
||||
|
||||
pve-qemu-kvm (8.0.2-6) bookworm; urgency=medium
|
||||
|
||||
* fix #1534: vma: add extract-filter for disk images allowing users to pass
|
||||
a comma separated list of the disks they want to extract from an archive.
|
||||
|
||||
* backup: create jobs in a drained section to avoid subtle bugs where
|
||||
something interferes with the block-copy-state bitmap on initialization
|
||||
|
||||
* backup: drop experimental, and since a while also fully broken, directory
|
||||
backup format (BACKUP_FORMAT_DIR). This format was never exposed via the
|
||||
Proxmox VE API, but only available via QMP, as its broken since QEMU 8 and
|
||||
we got zero reports about that, it's safe to assume that there are no
|
||||
public users, so just remove it completely.
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Wed, 06 Sep 2023 17:03:59 +0200
|
||||
|
||||
pve-qemu-kvm (8.0.2-5) bookworm; urgency=medium
|
||||
|
||||
* improve memory footprint after backup by not keeping as much memory
|
||||
resident.
|
||||
|
||||
* fix file descriptor leak for vhost (used by default by vNICs).
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Wed, 16 Aug 2023 11:52:24 +0200
|
||||
|
||||
pve-qemu-kvm (8.0.2-4) bookworm; urgency=medium
|
||||
|
||||
* fix resume for snapshot and hibernate in combination with iothread and
|
||||
dirty bitmap
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Fri, 28 Jul 2023 12:58:22 +0200
|
||||
|
||||
pve-qemu-kvm (8.0.2-3) bookworm; urgency=medium
|
||||
|
||||
* fix regression in QEMU 8.0 for drive mirror with bitmap
|
||||
|
|
|
@ -37,6 +37,7 @@ Build-Depends: debhelper-compat (= 13),
|
|||
python3-minimal,
|
||||
python3-sphinx,
|
||||
python3-sphinx-rtd-theme,
|
||||
python3-venv,
|
||||
quilt,
|
||||
uuid-dev,
|
||||
xfslibs-dev,
|
||||
|
@ -58,6 +59,7 @@ Depends: ceph-common (>= 0.48),
|
|||
libspice-server1 (>= 0.14.0~),
|
||||
libusb-1.0-0 (>= 1.0.17-1),
|
||||
libusbredirparser1 (>= 0.6-2),
|
||||
vitastor-client (>= 0.9.4),
|
||||
libuuid1,
|
||||
${misc:Depends},
|
||||
${shlibs:Depends},
|
||||
|
@ -79,6 +81,7 @@ Replaces: pve-kvm,
|
|||
qemu-system-arm,
|
||||
qemu-system-x86,
|
||||
qemu-utils,
|
||||
Breaks: qemu-server (<= 8.0.6)
|
||||
Description: Full virtualization on x86 hardware
|
||||
Using KVM, one can run multiple virtual PCs, each running unmodified Linux or
|
||||
Windows images. Each virtual machine has private virtualized hardware: a
|
||||
|
|
|
@ -27,18 +27,18 @@ Signed-off-by: Ma Haocong <mahaocong@didichuxing.com>
|
|||
Signed-off-by: John Snow <jsnow@redhat.com>
|
||||
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
[FE: rebased for 8.0]
|
||||
[FE: rebased for 8.2.2]
|
||||
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
---
|
||||
block/mirror.c | 98 +++++++++++++++++++++-----
|
||||
block/mirror.c | 99 ++++++++++++++++++++------
|
||||
blockdev.c | 38 +++++++++-
|
||||
include/block/block_int-global-state.h | 4 +-
|
||||
qapi/block-core.json | 29 ++++++--
|
||||
qapi/block-core.json | 25 ++++++-
|
||||
tests/unit/test-block-iothread.c | 4 +-
|
||||
5 files changed, 144 insertions(+), 29 deletions(-)
|
||||
5 files changed, 142 insertions(+), 28 deletions(-)
|
||||
|
||||
diff --git a/block/mirror.c b/block/mirror.c
|
||||
index 663e2b7002..9099c75992 100644
|
||||
index 1bdce3b657..0c5c72df2e 100644
|
||||
--- a/block/mirror.c
|
||||
+++ b/block/mirror.c
|
||||
@@ -51,7 +51,7 @@ typedef struct MirrorBlockJob {
|
||||
|
@ -50,7 +50,7 @@ index 663e2b7002..9099c75992 100644
|
|||
BlockMirrorBackingMode backing_mode;
|
||||
/* Whether the target image requires explicit zero-initialization */
|
||||
bool zero_target;
|
||||
@@ -65,6 +65,8 @@ typedef struct MirrorBlockJob {
|
||||
@@ -73,6 +73,8 @@ typedef struct MirrorBlockJob {
|
||||
size_t buf_size;
|
||||
int64_t bdev_length;
|
||||
unsigned long *cow_bitmap;
|
||||
|
@ -59,9 +59,9 @@ index 663e2b7002..9099c75992 100644
|
|||
BdrvDirtyBitmap *dirty_bitmap;
|
||||
BdrvDirtyBitmapIter *dbi;
|
||||
uint8_t *buf;
|
||||
@@ -703,7 +705,8 @@ static int mirror_exit_common(Job *job)
|
||||
bdrv_child_refresh_perms(mirror_top_bs, mirror_top_bs->backing,
|
||||
@@ -722,7 +724,8 @@ static int mirror_exit_common(Job *job)
|
||||
&error_abort);
|
||||
|
||||
if (!abort && s->backing_mode == MIRROR_SOURCE_BACKING_CHAIN) {
|
||||
- BlockDriverState *backing = s->is_none_mode ? src : s->base;
|
||||
+ BlockDriverState *backing;
|
||||
|
@ -69,7 +69,7 @@ index 663e2b7002..9099c75992 100644
|
|||
BlockDriverState *unfiltered_target = bdrv_skip_filters(target_bs);
|
||||
|
||||
if (bdrv_cow_bs(unfiltered_target) != backing) {
|
||||
@@ -801,6 +804,16 @@ static void mirror_abort(Job *job)
|
||||
@@ -819,6 +822,16 @@ static void mirror_abort(Job *job)
|
||||
assert(ret == 0);
|
||||
}
|
||||
|
||||
|
@ -86,7 +86,7 @@ index 663e2b7002..9099c75992 100644
|
|||
static void coroutine_fn mirror_throttle(MirrorBlockJob *s)
|
||||
{
|
||||
int64_t now = qemu_clock_get_ns(QEMU_CLOCK_REALTIME);
|
||||
@@ -987,7 +1000,8 @@ static int coroutine_fn mirror_run(Job *job, Error **errp)
|
||||
@@ -1015,7 +1028,8 @@ static int coroutine_fn mirror_run(Job *job, Error **errp)
|
||||
mirror_free_init(s);
|
||||
|
||||
s->last_pause_ns = qemu_clock_get_ns(QEMU_CLOCK_REALTIME);
|
||||
|
@ -96,7 +96,7 @@ index 663e2b7002..9099c75992 100644
|
|||
ret = mirror_dirty_init(s);
|
||||
if (ret < 0 || job_is_cancelled(&s->common.job)) {
|
||||
goto immediate_exit;
|
||||
@@ -1240,6 +1254,7 @@ static const BlockJobDriver mirror_job_driver = {
|
||||
@@ -1304,6 +1318,7 @@ static const BlockJobDriver mirror_job_driver = {
|
||||
.run = mirror_run,
|
||||
.prepare = mirror_prepare,
|
||||
.abort = mirror_abort,
|
||||
|
@ -104,7 +104,7 @@ index 663e2b7002..9099c75992 100644
|
|||
.pause = mirror_pause,
|
||||
.complete = mirror_complete,
|
||||
.cancel = mirror_cancel,
|
||||
@@ -1256,6 +1271,7 @@ static const BlockJobDriver commit_active_job_driver = {
|
||||
@@ -1322,6 +1337,7 @@ static const BlockJobDriver commit_active_job_driver = {
|
||||
.run = mirror_run,
|
||||
.prepare = mirror_prepare,
|
||||
.abort = mirror_abort,
|
||||
|
@ -112,7 +112,7 @@ index 663e2b7002..9099c75992 100644
|
|||
.pause = mirror_pause,
|
||||
.complete = mirror_complete,
|
||||
.cancel = commit_active_cancel,
|
||||
@@ -1647,7 +1663,10 @@ static BlockJob *mirror_start_job(
|
||||
@@ -1714,7 +1730,10 @@ static BlockJob *mirror_start_job(
|
||||
BlockCompletionFunc *cb,
|
||||
void *opaque,
|
||||
const BlockJobDriver *driver,
|
||||
|
@ -124,9 +124,9 @@ index 663e2b7002..9099c75992 100644
|
|||
bool auto_complete, const char *filter_node_name,
|
||||
bool is_mirror, MirrorCopyMode copy_mode,
|
||||
Error **errp)
|
||||
@@ -1659,10 +1678,39 @@ static BlockJob *mirror_start_job(
|
||||
uint64_t target_perms, target_shared_perms;
|
||||
int ret;
|
||||
@@ -1728,10 +1747,39 @@ static BlockJob *mirror_start_job(
|
||||
|
||||
GLOBAL_STATE_CODE();
|
||||
|
||||
- if (granularity == 0) {
|
||||
- granularity = bdrv_get_default_bitmap_granularity(target);
|
||||
|
@ -166,7 +166,7 @@ index 663e2b7002..9099c75992 100644
|
|||
assert(is_power_of_2(granularity));
|
||||
|
||||
if (buf_size < 0) {
|
||||
@@ -1793,7 +1841,9 @@ static BlockJob *mirror_start_job(
|
||||
@@ -1871,7 +1919,9 @@ static BlockJob *mirror_start_job(
|
||||
s->replaces = g_strdup(replaces);
|
||||
s->on_source_error = on_source_error;
|
||||
s->on_target_error = on_target_error;
|
||||
|
@ -176,10 +176,10 @@ index 663e2b7002..9099c75992 100644
|
|||
+ s->bitmap_mode = bitmap_mode;
|
||||
s->backing_mode = backing_mode;
|
||||
s->zero_target = zero_target;
|
||||
s->copy_mode = copy_mode;
|
||||
@@ -1814,6 +1864,18 @@ static BlockJob *mirror_start_job(
|
||||
bdrv_disable_dirty_bitmap(s->dirty_bitmap);
|
||||
}
|
||||
qatomic_set(&s->copy_mode, copy_mode);
|
||||
@@ -1897,6 +1947,18 @@ static BlockJob *mirror_start_job(
|
||||
*/
|
||||
bdrv_disable_dirty_bitmap(s->dirty_bitmap);
|
||||
|
||||
+ if (s->sync_bitmap) {
|
||||
+ bdrv_dirty_bitmap_set_busy(s->sync_bitmap, true);
|
||||
|
@ -193,10 +193,10 @@ index 663e2b7002..9099c75992 100644
|
|||
+ }
|
||||
+ }
|
||||
+
|
||||
bdrv_graph_wrlock();
|
||||
ret = block_job_add_bdrv(&s->common, "source", bs, 0,
|
||||
BLK_PERM_WRITE_UNCHANGED | BLK_PERM_WRITE |
|
||||
BLK_PERM_CONSISTENT_READ,
|
||||
@@ -1891,6 +1953,9 @@ fail:
|
||||
@@ -1979,6 +2041,9 @@ fail:
|
||||
if (s->dirty_bitmap) {
|
||||
bdrv_release_dirty_bitmap(s->dirty_bitmap);
|
||||
}
|
||||
|
@ -206,7 +206,7 @@ index 663e2b7002..9099c75992 100644
|
|||
job_early_fail(&s->common.job);
|
||||
}
|
||||
|
||||
@@ -1908,31 +1973,25 @@ void mirror_start(const char *job_id, BlockDriverState *bs,
|
||||
@@ -2001,35 +2066,28 @@ void mirror_start(const char *job_id, BlockDriverState *bs,
|
||||
BlockDriverState *target, const char *replaces,
|
||||
int creation_flags, int64_t speed,
|
||||
uint32_t granularity, int64_t buf_size,
|
||||
|
@ -231,8 +231,12 @@ index 663e2b7002..9099c75992 100644
|
|||
- MirrorSyncMode_str(mode));
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
bdrv_graph_rdlock_main_loop();
|
||||
- is_none_mode = mode == MIRROR_SYNC_MODE_NONE;
|
||||
base = mode == MIRROR_SYNC_MODE_TOP ? bdrv_backing_chain_next(bs) : NULL;
|
||||
bdrv_graph_rdunlock_main_loop();
|
||||
|
||||
mirror_start_job(job_id, bs, creation_flags, target, replaces,
|
||||
speed, granularity, buf_size, backing_mode, zero_target,
|
||||
on_source_error, on_target_error, unmap, NULL, NULL,
|
||||
|
@ -243,7 +247,7 @@ index 663e2b7002..9099c75992 100644
|
|||
}
|
||||
|
||||
BlockJob *commit_active_start(const char *job_id, BlockDriverState *bs,
|
||||
@@ -1959,7 +2018,8 @@ BlockJob *commit_active_start(const char *job_id, BlockDriverState *bs,
|
||||
@@ -2056,7 +2114,8 @@ BlockJob *commit_active_start(const char *job_id, BlockDriverState *bs,
|
||||
job_id, bs, creation_flags, base, NULL, speed, 0, 0,
|
||||
MIRROR_LEAVE_BACKING_CHAIN, false,
|
||||
on_error, on_error, true, cb, opaque,
|
||||
|
@ -254,10 +258,10 @@ index 663e2b7002..9099c75992 100644
|
|||
errp);
|
||||
if (!job) {
|
||||
diff --git a/blockdev.c b/blockdev.c
|
||||
index e464daea58..50e4a9c682 100644
|
||||
index 057601dcf0..8682814a7a 100644
|
||||
--- a/blockdev.c
|
||||
+++ b/blockdev.c
|
||||
@@ -2942,6 +2942,9 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
|
||||
@@ -2776,6 +2776,9 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
|
||||
BlockDriverState *target,
|
||||
const char *replaces,
|
||||
enum MirrorSyncMode sync,
|
||||
|
@ -267,15 +271,15 @@ index e464daea58..50e4a9c682 100644
|
|||
BlockMirrorBackingMode backing_mode,
|
||||
bool zero_target,
|
||||
bool has_speed, int64_t speed,
|
||||
@@ -2960,6 +2963,7 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
|
||||
@@ -2794,6 +2797,7 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
|
||||
{
|
||||
BlockDriverState *unfiltered_bs;
|
||||
int job_flags = JOB_DEFAULT;
|
||||
+ BdrvDirtyBitmap *bitmap = NULL;
|
||||
|
||||
if (!has_speed) {
|
||||
speed = 0;
|
||||
@@ -3011,6 +3015,29 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
|
||||
GLOBAL_STATE_CODE();
|
||||
GRAPH_RDLOCK_GUARD_MAINLOOP();
|
||||
@@ -2848,6 +2852,29 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
|
||||
sync = MIRROR_SYNC_MODE_FULL;
|
||||
}
|
||||
|
||||
|
@ -305,7 +309,7 @@ index e464daea58..50e4a9c682 100644
|
|||
if (!replaces) {
|
||||
/* We want to mirror from @bs, but keep implicit filters on top */
|
||||
unfiltered_bs = bdrv_skip_implicit_filters(bs);
|
||||
@@ -3056,8 +3083,8 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
|
||||
@@ -2889,8 +2916,8 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
|
||||
* and will allow to check whether the node still exist at mirror completion
|
||||
*/
|
||||
mirror_start(job_id, bs, target,
|
||||
|
@ -316,7 +320,7 @@ index e464daea58..50e4a9c682 100644
|
|||
on_source_error, on_target_error, unmap, filter_node_name,
|
||||
copy_mode, errp);
|
||||
}
|
||||
@@ -3202,6 +3229,8 @@ void qmp_drive_mirror(DriveMirror *arg, Error **errp)
|
||||
@@ -3034,6 +3061,8 @@ void qmp_drive_mirror(DriveMirror *arg, Error **errp)
|
||||
|
||||
blockdev_mirror_common(arg->job_id, bs, target_bs,
|
||||
arg->replaces, arg->sync,
|
||||
|
@ -325,7 +329,7 @@ index e464daea58..50e4a9c682 100644
|
|||
backing_mode, zero_target,
|
||||
arg->has_speed, arg->speed,
|
||||
arg->has_granularity, arg->granularity,
|
||||
@@ -3223,6 +3252,8 @@ void qmp_blockdev_mirror(const char *job_id,
|
||||
@@ -3053,6 +3082,8 @@ void qmp_blockdev_mirror(const char *job_id,
|
||||
const char *device, const char *target,
|
||||
const char *replaces,
|
||||
MirrorSyncMode sync,
|
||||
|
@ -334,7 +338,7 @@ index e464daea58..50e4a9c682 100644
|
|||
bool has_speed, int64_t speed,
|
||||
bool has_granularity, uint32_t granularity,
|
||||
bool has_buf_size, int64_t buf_size,
|
||||
@@ -3271,7 +3302,8 @@ void qmp_blockdev_mirror(const char *job_id,
|
||||
@@ -3093,7 +3124,8 @@ void qmp_blockdev_mirror(const char *job_id,
|
||||
}
|
||||
|
||||
blockdev_mirror_common(job_id, bs, target_bs,
|
||||
|
@ -345,10 +349,10 @@ index e464daea58..50e4a9c682 100644
|
|||
has_granularity, granularity,
|
||||
has_buf_size, buf_size,
|
||||
diff --git a/include/block/block_int-global-state.h b/include/block/block_int-global-state.h
|
||||
index 902406eb99..d559be928c 100644
|
||||
index d2201e27f4..cc1387ae02 100644
|
||||
--- a/include/block/block_int-global-state.h
|
||||
+++ b/include/block/block_int-global-state.h
|
||||
@@ -152,7 +152,9 @@ void mirror_start(const char *job_id, BlockDriverState *bs,
|
||||
@@ -158,7 +158,9 @@ void mirror_start(const char *job_id, BlockDriverState *bs,
|
||||
BlockDriverState *target, const char *replaces,
|
||||
int creation_flags, int64_t speed,
|
||||
uint32_t granularity, int64_t buf_size,
|
||||
|
@ -360,31 +364,26 @@ index 902406eb99..d559be928c 100644
|
|||
BlockdevOnError on_source_error,
|
||||
BlockdevOnError on_target_error,
|
||||
diff --git a/qapi/block-core.json b/qapi/block-core.json
|
||||
index c05ad0c07e..3c945c1f93 100644
|
||||
index 746d1694c2..45ab548dfe 100644
|
||||
--- a/qapi/block-core.json
|
||||
+++ b/qapi/block-core.json
|
||||
@@ -2095,10 +2095,19 @@
|
||||
# (all the disk, only the sectors allocated in the topmost image, or
|
||||
# only new I/O).
|
||||
@@ -2174,6 +2174,15 @@
|
||||
# destination (all the disk, only the sectors allocated in the
|
||||
# topmost image, or only new I/O).
|
||||
#
|
||||
+# @bitmap: The name of a bitmap to use for sync=bitmap mode. This argument must
|
||||
+# be present for bitmap mode and absent otherwise. The bitmap's
|
||||
+# granularity is used instead of @granularity (since 4.1).
|
||||
+# @bitmap: The name of a bitmap to use for sync=bitmap mode. This
|
||||
+# argument must be present for bitmap mode and absent otherwise.
|
||||
+# The bitmap's granularity is used instead of @granularity (Since
|
||||
+# 4.1).
|
||||
+#
|
||||
+# @bitmap-mode: Specifies the type of data the bitmap should contain after
|
||||
+# the operation concludes. Must be present if sync is "bitmap".
|
||||
+# Must NOT be present otherwise. (Since 4.1)
|
||||
+# @bitmap-mode: Specifies the type of data the bitmap should contain
|
||||
+# after the operation concludes. Must be present if sync is
|
||||
+# "bitmap". Must NOT be present otherwise. (Since 4.1)
|
||||
+#
|
||||
# @granularity: granularity of the dirty bitmap, default is 64K
|
||||
# if the image format doesn't have clusters, 4K if the clusters
|
||||
# are smaller than that, else the cluster size. Must be a
|
||||
-# power of 2 between 512 and 64M (since 1.4).
|
||||
+# power of 2 between 512 and 64M. Must not be specified if
|
||||
+# @bitmap is present (since 1.4).
|
||||
#
|
||||
# @buf-size: maximum amount of data in flight from source to
|
||||
# target (since 1.4).
|
||||
@@ -2138,7 +2147,9 @@
|
||||
# @granularity: granularity of the dirty bitmap, default is 64K if the
|
||||
# image format doesn't have clusters, 4K if the clusters are
|
||||
# smaller than that, else the cluster size. Must be a power of 2
|
||||
@@ -2216,7 +2225,9 @@
|
||||
{ 'struct': 'DriveMirror',
|
||||
'data': { '*job-id': 'str', 'device': 'str', 'target': 'str',
|
||||
'*format': 'str', '*node-name': 'str', '*replaces': 'str',
|
||||
|
@ -395,28 +394,23 @@ index c05ad0c07e..3c945c1f93 100644
|
|||
'*speed': 'int', '*granularity': 'uint32',
|
||||
'*buf-size': 'int', '*on-source-error': 'BlockdevOnError',
|
||||
'*on-target-error': 'BlockdevOnError',
|
||||
@@ -2417,10 +2428,19 @@
|
||||
# (all the disk, only the sectors allocated in the topmost image, or
|
||||
# only new I/O).
|
||||
@@ -2496,6 +2507,15 @@
|
||||
# destination (all the disk, only the sectors allocated in the
|
||||
# topmost image, or only new I/O).
|
||||
#
|
||||
+# @bitmap: The name of a bitmap to use for sync=bitmap mode. This argument must
|
||||
+# be present for bitmap mode and absent otherwise. The bitmap's
|
||||
+# granularity is used instead of @granularity (since 4.1).
|
||||
+# @bitmap: The name of a bitmap to use for sync=bitmap mode. This
|
||||
+# argument must be present for bitmap mode and absent otherwise.
|
||||
+# The bitmap's granularity is used instead of @granularity (since
|
||||
+# 4.1).
|
||||
+#
|
||||
+# @bitmap-mode: Specifies the type of data the bitmap should contain after
|
||||
+# the operation concludes. Must be present if sync is "bitmap".
|
||||
+# Must NOT be present otherwise. (Since 4.1)
|
||||
+# @bitmap-mode: Specifies the type of data the bitmap should contain
|
||||
+# after the operation concludes. Must be present if sync is
|
||||
+# "bitmap". Must NOT be present otherwise. (Since 4.1)
|
||||
+#
|
||||
# @granularity: granularity of the dirty bitmap, default is 64K
|
||||
# if the image format doesn't have clusters, 4K if the clusters
|
||||
# are smaller than that, else the cluster size. Must be a
|
||||
-# power of 2 between 512 and 64M
|
||||
+# power of 2 between 512 and 64M . Must not be specified if
|
||||
+# @bitmap is present.
|
||||
#
|
||||
# @buf-size: maximum amount of data in flight from source to
|
||||
# target
|
||||
@@ -2470,7 +2490,8 @@
|
||||
# @granularity: granularity of the dirty bitmap, default is 64K if the
|
||||
# image format doesn't have clusters, 4K if the clusters are
|
||||
# smaller than that, else the cluster size. Must be a power of 2
|
||||
@@ -2544,7 +2564,8 @@
|
||||
{ 'command': 'blockdev-mirror',
|
||||
'data': { '*job-id': 'str', 'device': 'str', 'target': 'str',
|
||||
'*replaces': 'str',
|
||||
|
@ -427,10 +421,10 @@ index c05ad0c07e..3c945c1f93 100644
|
|||
'*buf-size': 'int', '*on-source-error': 'BlockdevOnError',
|
||||
'*on-target-error': 'BlockdevOnError',
|
||||
diff --git a/tests/unit/test-block-iothread.c b/tests/unit/test-block-iothread.c
|
||||
index 3a5e1eb2c4..c1ecc49073 100644
|
||||
index 3766d5de6b..afa44cbd34 100644
|
||||
--- a/tests/unit/test-block-iothread.c
|
||||
+++ b/tests/unit/test-block-iothread.c
|
||||
@@ -757,8 +757,8 @@ static void test_propagate_mirror(void)
|
||||
@@ -755,8 +755,8 @@ static void test_propagate_mirror(void)
|
||||
|
||||
/* Start a mirror job */
|
||||
mirror_start("job0", src, target, NULL, JOB_DEFAULT, 0, 0, 0,
|
||||
|
@ -440,4 +434,4 @@ index 3a5e1eb2c4..c1ecc49073 100644
|
|||
+ false, BLOCKDEV_ON_ERROR_REPORT, BLOCKDEV_ON_ERROR_REPORT,
|
||||
false, "filter_node", MIRROR_COPY_MODE_BACKGROUND,
|
||||
&error_abort);
|
||||
WITH_JOB_LOCK_GUARD() {
|
||||
|
||||
|
|
|
@ -24,10 +24,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|||
1 file changed, 18 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/block/mirror.c b/block/mirror.c
|
||||
index 9099c75992..e2ff42067b 100644
|
||||
index 0c5c72df2e..37fee3fa25 100644
|
||||
--- a/block/mirror.c
|
||||
+++ b/block/mirror.c
|
||||
@@ -680,8 +680,6 @@ static int mirror_exit_common(Job *job)
|
||||
@@ -693,8 +693,6 @@ static int mirror_exit_common(Job *job)
|
||||
bdrv_unfreeze_backing_chain(mirror_top_bs, target_bs);
|
||||
}
|
||||
|
||||
|
@ -36,9 +36,9 @@ index 9099c75992..e2ff42067b 100644
|
|||
/* Make sure that the source BDS doesn't go away during bdrv_replace_node,
|
||||
* before we can call bdrv_drained_end */
|
||||
bdrv_ref(src);
|
||||
@@ -782,6 +780,18 @@ static int mirror_exit_common(Job *job)
|
||||
block_job_remove_all_bdrv(bjob);
|
||||
bdrv_replace_node(mirror_top_bs, mirror_top_bs->backing->bs, &error_abort);
|
||||
@@ -800,6 +798,18 @@ static int mirror_exit_common(Job *job)
|
||||
bdrv_drained_end(target_bs);
|
||||
bdrv_unref(target_bs);
|
||||
|
||||
+ if (s->sync_bitmap) {
|
||||
+ if (s->bitmap_mode == BITMAP_SYNC_MODE_ALWAYS ||
|
||||
|
@ -55,7 +55,7 @@ index 9099c75992..e2ff42067b 100644
|
|||
bs_opaque->job = NULL;
|
||||
|
||||
bdrv_drained_end(src);
|
||||
@@ -1688,10 +1698,6 @@ static BlockJob *mirror_start_job(
|
||||
@@ -1757,10 +1767,6 @@ static BlockJob *mirror_start_job(
|
||||
" sync mode",
|
||||
MirrorSyncMode_str(sync_mode));
|
||||
return NULL;
|
||||
|
@ -66,7 +66,7 @@ index 9099c75992..e2ff42067b 100644
|
|||
}
|
||||
} else if (bitmap) {
|
||||
error_setg(errp,
|
||||
@@ -1708,6 +1714,12 @@ static BlockJob *mirror_start_job(
|
||||
@@ -1777,6 +1783,12 @@ static BlockJob *mirror_start_job(
|
||||
return NULL;
|
||||
}
|
||||
granularity = bdrv_dirty_bitmap_granularity(bitmap);
|
||||
|
|
|
@ -16,10 +16,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/blockdev.c b/blockdev.c
|
||||
index 50e4a9c682..e6b2b1e338 100644
|
||||
index 8682814a7a..5b75a085ee 100644
|
||||
--- a/blockdev.c
|
||||
+++ b/blockdev.c
|
||||
@@ -3036,6 +3036,9 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
|
||||
@@ -2873,6 +2873,9 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
|
||||
if (bdrv_dirty_bitmap_check(bitmap, BDRV_BITMAP_ALLOW_RO, errp)) {
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -16,10 +16,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|||
1 file changed, 4 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/block/mirror.c b/block/mirror.c
|
||||
index e2ff42067b..f42953837b 100644
|
||||
index 37fee3fa25..6b3cce1007 100644
|
||||
--- a/block/mirror.c
|
||||
+++ b/block/mirror.c
|
||||
@@ -786,8 +786,8 @@ static int mirror_exit_common(Job *job)
|
||||
@@ -804,8 +804,8 @@ static int mirror_exit_common(Job *job)
|
||||
job->ret == 0 && ret == 0)) {
|
||||
/* Success; synchronize copy back to sync. */
|
||||
bdrv_clear_dirty_bitmap(s->sync_bitmap, NULL);
|
||||
|
@ -30,7 +30,7 @@ index e2ff42067b..f42953837b 100644
|
|||
}
|
||||
}
|
||||
bdrv_release_dirty_bitmap(s->dirty_bitmap);
|
||||
@@ -1881,11 +1881,8 @@ static BlockJob *mirror_start_job(
|
||||
@@ -1964,11 +1964,8 @@ static BlockJob *mirror_start_job(
|
||||
}
|
||||
|
||||
if (s->sync_mode == MIRROR_SYNC_MODE_BITMAP) {
|
||||
|
@ -43,4 +43,4 @@ index e2ff42067b..f42953837b 100644
|
|||
+ NULL, true);
|
||||
}
|
||||
|
||||
ret = block_job_add_bdrv(&s->common, "source", bs, 0,
|
||||
bdrv_graph_wrlock();
|
||||
|
|
|
@ -12,7 +12,7 @@ uniform w.r.t. backup block jobs.
|
|||
|
||||
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
[FE: rebase for 8.0]
|
||||
[FE: rebase for 8.2.2]
|
||||
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
---
|
||||
block/mirror.c | 28 +++------------
|
||||
|
@ -21,12 +21,12 @@ Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
|||
3 files changed, 70 insertions(+), 59 deletions(-)
|
||||
|
||||
diff --git a/block/mirror.c b/block/mirror.c
|
||||
index f42953837b..8f79efaa87 100644
|
||||
index 6b3cce1007..2f1223852b 100644
|
||||
--- a/block/mirror.c
|
||||
+++ b/block/mirror.c
|
||||
@@ -1688,31 +1688,13 @@ static BlockJob *mirror_start_job(
|
||||
uint64_t target_perms, target_shared_perms;
|
||||
int ret;
|
||||
@@ -1757,31 +1757,13 @@ static BlockJob *mirror_start_job(
|
||||
|
||||
GLOBAL_STATE_CODE();
|
||||
|
||||
- if (sync_mode == MIRROR_SYNC_MODE_INCREMENTAL) {
|
||||
- error_setg(errp, "Sync mode '%s' not supported",
|
||||
|
@ -62,10 +62,10 @@ index f42953837b..8f79efaa87 100644
|
|||
|
||||
if (bitmap_mode != BITMAP_SYNC_MODE_NEVER) {
|
||||
diff --git a/blockdev.c b/blockdev.c
|
||||
index e6b2b1e338..bdae211a54 100644
|
||||
index 5b75a085ee..d27d8c38ec 100644
|
||||
--- a/blockdev.c
|
||||
+++ b/blockdev.c
|
||||
@@ -3015,7 +3015,36 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
|
||||
@@ -2852,7 +2852,36 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
|
||||
sync = MIRROR_SYNC_MODE_FULL;
|
||||
}
|
||||
|
||||
|
|
|
@ -48,7 +48,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|||
6 files changed, 59 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h
|
||||
index 033390f699..ad35d4fea8 100644
|
||||
index 965f5d5450..e04bd059b6 100644
|
||||
--- a/include/monitor/monitor.h
|
||||
+++ b/include/monitor/monitor.h
|
||||
@@ -16,6 +16,7 @@ extern QemuOptsList qemu_mon_opts;
|
||||
|
@ -60,10 +60,10 @@ index 033390f699..ad35d4fea8 100644
|
|||
void monitor_init_globals(void);
|
||||
void monitor_init_globals_core(void);
|
||||
diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h
|
||||
index 53e3808054..a19f8cbc2b 100644
|
||||
index 252de85681..8db28f9272 100644
|
||||
--- a/monitor/monitor-internal.h
|
||||
+++ b/monitor/monitor-internal.h
|
||||
@@ -152,6 +152,13 @@ typedef struct {
|
||||
@@ -151,6 +151,13 @@ typedef struct {
|
||||
QemuMutex qmp_queue_lock;
|
||||
/* Input queue that holds all the parsed QMP requests */
|
||||
GQueue *qmp_requests;
|
||||
|
@ -78,10 +78,10 @@ index 53e3808054..a19f8cbc2b 100644
|
|||
|
||||
/**
|
||||
diff --git a/monitor/monitor.c b/monitor/monitor.c
|
||||
index 8dc96f6af9..f3c38cb714 100644
|
||||
index 01ede1babd..5681bca346 100644
|
||||
--- a/monitor/monitor.c
|
||||
+++ b/monitor/monitor.c
|
||||
@@ -135,6 +135,21 @@ bool monitor_cur_is_qmp(void)
|
||||
@@ -117,6 +117,21 @@ bool monitor_cur_is_qmp(void)
|
||||
return cur_mon && monitor_is_qmp(cur_mon);
|
||||
}
|
||||
|
||||
|
@ -104,10 +104,10 @@ index 8dc96f6af9..f3c38cb714 100644
|
|||
* Is @mon is using readline?
|
||||
* Note: not all HMP monitors use readline, e.g., gdbserver has a
|
||||
diff --git a/monitor/qmp.c b/monitor/qmp.c
|
||||
index 092c527b6f..6b8cfcf6d8 100644
|
||||
index a239945e8d..589c9524f8 100644
|
||||
--- a/monitor/qmp.c
|
||||
+++ b/monitor/qmp.c
|
||||
@@ -141,6 +141,8 @@ static void monitor_qmp_dispatch(MonitorQMP *mon, QObject *req)
|
||||
@@ -165,6 +165,8 @@ static void monitor_qmp_dispatch(MonitorQMP *mon, QObject *req)
|
||||
QDict *rsp;
|
||||
QDict *error;
|
||||
|
||||
|
@ -116,7 +116,7 @@ index 092c527b6f..6b8cfcf6d8 100644
|
|||
rsp = qmp_dispatch(mon->commands, req, qmp_oob_enabled(mon),
|
||||
&mon->common);
|
||||
|
||||
@@ -156,7 +158,17 @@ static void monitor_qmp_dispatch(MonitorQMP *mon, QObject *req)
|
||||
@@ -180,7 +182,17 @@ static void monitor_qmp_dispatch(MonitorQMP *mon, QObject *req)
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -135,7 +135,7 @@ index 092c527b6f..6b8cfcf6d8 100644
|
|||
qobject_unref(rsp);
|
||||
}
|
||||
|
||||
@@ -444,6 +456,7 @@ static void monitor_qmp_event(void *opaque, QEMUChrEvent event)
|
||||
@@ -461,6 +473,7 @@ static void monitor_qmp_event(void *opaque, QEMUChrEvent event)
|
||||
|
||||
switch (event) {
|
||||
case CHR_EVENT_OPENED:
|
||||
|
@ -144,7 +144,7 @@ index 092c527b6f..6b8cfcf6d8 100644
|
|||
monitor_qmp_caps_reset(mon);
|
||||
data = qmp_greeting(mon);
|
||||
diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c
|
||||
index 0990873ec8..e605003771 100644
|
||||
index f3488afeef..2624eb3470 100644
|
||||
--- a/qapi/qmp-dispatch.c
|
||||
+++ b/qapi/qmp-dispatch.c
|
||||
@@ -117,16 +117,28 @@ typedef struct QmpDispatchBH {
|
||||
|
@ -180,13 +180,13 @@ index 0990873ec8..e605003771 100644
|
|||
aio_co_wake(data->co);
|
||||
}
|
||||
|
||||
@@ -231,6 +243,7 @@ QDict *qmp_dispatch(const QmpCommandList *cmds, QObject *request,
|
||||
@@ -250,6 +262,7 @@ QDict *coroutine_mixed_fn qmp_dispatch(const QmpCommandList *cmds, QObject *requ
|
||||
.ret = &ret,
|
||||
.errp = &err,
|
||||
.co = qemu_coroutine_self(),
|
||||
+ .conn_nr = monitor_get_connection_nr(cur_mon),
|
||||
};
|
||||
aio_bh_schedule_oneshot(qemu_get_aio_context(), do_qmp_dispatch_bh,
|
||||
aio_bh_schedule_oneshot(iohandler_get_aio_context(), do_qmp_dispatch_bh,
|
||||
&data);
|
||||
diff --git a/stubs/monitor-core.c b/stubs/monitor-core.c
|
||||
index afa477aae6..d3ff124bf3 100644
|
||||
|
|
|
@ -22,10 +22,10 @@ Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
|||
1 file changed, 2 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c
|
||||
index 9cbbb16121..d624866bb6 100644
|
||||
index 2d0c607177..97e51733af 100644
|
||||
--- a/hw/scsi/megasas.c
|
||||
+++ b/hw/scsi/megasas.c
|
||||
@@ -1780,7 +1780,7 @@ static int megasas_handle_io(MegasasState *s, MegasasCmd *cmd, int frame_cmd)
|
||||
@@ -1781,7 +1781,7 @@ static int megasas_handle_io(MegasasState *s, MegasasCmd *cmd, int frame_cmd)
|
||||
uint8_t cdb[16];
|
||||
int len;
|
||||
struct SCSIDevice *sdev = NULL;
|
||||
|
@ -34,7 +34,7 @@ index 9cbbb16121..d624866bb6 100644
|
|||
|
||||
lba_count = le32_to_cpu(cmd->frame->io.header.data_len);
|
||||
lba_start_lo = le32_to_cpu(cmd->frame->io.lba_lo);
|
||||
@@ -1789,7 +1789,6 @@ static int megasas_handle_io(MegasasState *s, MegasasCmd *cmd, int frame_cmd)
|
||||
@@ -1790,7 +1790,6 @@ static int megasas_handle_io(MegasasState *s, MegasasCmd *cmd, int frame_cmd)
|
||||
|
||||
target_id = cmd->frame->header.target_id;
|
||||
lun_id = cmd->frame->header.lun_id;
|
||||
|
@ -42,7 +42,7 @@ index 9cbbb16121..d624866bb6 100644
|
|||
|
||||
if (target_id < MFI_MAX_LD && lun_id == 0) {
|
||||
sdev = scsi_device_find(&s->bus, 0, target_id, lun_id);
|
||||
@@ -1804,15 +1803,6 @@ static int megasas_handle_io(MegasasState *s, MegasasCmd *cmd, int frame_cmd)
|
||||
@@ -1805,15 +1804,6 @@ static int megasas_handle_io(MegasasState *s, MegasasCmd *cmd, int frame_cmd)
|
||||
return MFI_STAT_DEVICE_NOT_FOUND;
|
||||
}
|
||||
|
||||
|
@ -58,7 +58,7 @@ index 9cbbb16121..d624866bb6 100644
|
|||
cmd->iov_size = lba_count * sdev->blocksize;
|
||||
if (megasas_map_sgl(s, cmd, &cmd->frame->io.sgl)) {
|
||||
megasas_write_sense(cmd, SENSE_CODE(TARGET_FAILURE));
|
||||
@@ -1823,7 +1813,7 @@ static int megasas_handle_io(MegasasState *s, MegasasCmd *cmd, int frame_cmd)
|
||||
@@ -1824,7 +1814,7 @@ static int megasas_handle_io(MegasasState *s, MegasasCmd *cmd, int frame_cmd)
|
||||
|
||||
megasas_encode_lba(cdb, lba_start, lba_count, is_write);
|
||||
cmd->req = scsi_req_new(sdev, cmd->index,
|
||||
|
|
|
@ -55,10 +55,10 @@ Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
|||
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/hw/ide/core.c b/hw/ide/core.c
|
||||
index 45d14a25e9..08e1f0c3d7 100644
|
||||
index e8cb2dac92..3b21acf651 100644
|
||||
--- a/hw/ide/core.c
|
||||
+++ b/hw/ide/core.c
|
||||
@@ -444,7 +444,7 @@ static void ide_trim_bh_cb(void *opaque)
|
||||
@@ -456,7 +456,7 @@ static void ide_trim_bh_cb(void *opaque)
|
||||
iocb->bh = NULL;
|
||||
qemu_aio_unref(iocb);
|
||||
|
||||
|
@ -67,7 +67,7 @@ index 45d14a25e9..08e1f0c3d7 100644
|
|||
blk_dec_in_flight(blk);
|
||||
}
|
||||
|
||||
@@ -504,6 +504,8 @@ static void ide_issue_trim_cb(void *opaque, int ret)
|
||||
@@ -516,6 +516,8 @@ static void ide_issue_trim_cb(void *opaque, int ret)
|
||||
done:
|
||||
iocb->aiocb = NULL;
|
||||
if (iocb->bh) {
|
||||
|
@ -76,8 +76,8 @@ index 45d14a25e9..08e1f0c3d7 100644
|
|||
replay_bh_schedule_event(iocb->bh);
|
||||
}
|
||||
}
|
||||
@@ -515,9 +517,6 @@ BlockAIOCB *ide_issue_trim(
|
||||
IDEState *s = opaque;
|
||||
@@ -528,9 +530,6 @@ BlockAIOCB *ide_issue_trim(
|
||||
IDEDevice *dev = s->unit ? s->bus->slave : s->bus->master;
|
||||
TrimAIOCB *iocb;
|
||||
|
||||
- /* Paired with a decrement in ide_trim_bh_cb() */
|
||||
|
@ -85,8 +85,8 @@ index 45d14a25e9..08e1f0c3d7 100644
|
|||
-
|
||||
iocb = blk_aio_get(&trim_aiocb_info, s->blk, cb, cb_opaque);
|
||||
iocb->s = s;
|
||||
iocb->bh = qemu_bh_new(ide_trim_bh_cb, iocb);
|
||||
@@ -740,8 +739,9 @@ void ide_cancel_dma_sync(IDEState *s)
|
||||
iocb->bh = qemu_bh_new_guarded(ide_trim_bh_cb, iocb,
|
||||
@@ -754,8 +753,9 @@ void ide_cancel_dma_sync(IDEState *s)
|
||||
*/
|
||||
if (s->bus->dma->aiocb) {
|
||||
trace_ide_cancel_dma_sync_remaining();
|
||||
|
|
45
debian/patches/extra/0004-Revert-x86-acpi-workaround-Windows-not-handling-name.patch
vendored
Normal file
45
debian/patches/extra/0004-Revert-x86-acpi-workaround-Windows-not-handling-name.patch
vendored
Normal file
|
@ -0,0 +1,45 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Fiona Ebner <f.ebner@proxmox.com>
|
||||
Date: Fri, 17 Nov 2023 11:18:06 +0100
|
||||
Subject: [PATCH] Revert "x86: acpi: workaround Windows not handling name
|
||||
references in Package properly"
|
||||
|
||||
This reverts commit 44d975ef340e2f21f236f9520c53e1b30d2213a4.
|
||||
|
||||
As reported in the community forum [0] and reproduced locally this
|
||||
breaks VirtIO network adapters in (at least) the German ISO of Windows
|
||||
Server 2022. The fix itself was for
|
||||
|
||||
> Issue is not fatal but as result acpi-index/"PCI Label ID" property
|
||||
> is either not shown in device details page or shows incorrect value.
|
||||
|
||||
so revert and tolerate that as a stop-gap, rather than have the
|
||||
devices not working at all.
|
||||
|
||||
[0]: https://forum.proxmox.com/threads/92094/post-605684
|
||||
|
||||
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
---
|
||||
hw/i386/acpi-build.c | 8 ++------
|
||||
1 file changed, 2 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
|
||||
index 53f804ac16..9b1b9f0412 100644
|
||||
--- a/hw/i386/acpi-build.c
|
||||
+++ b/hw/i386/acpi-build.c
|
||||
@@ -347,13 +347,9 @@ Aml *aml_pci_device_dsm(void)
|
||||
{
|
||||
Aml *params = aml_local(0);
|
||||
Aml *pkg = aml_package(2);
|
||||
- aml_append(pkg, aml_int(0));
|
||||
- aml_append(pkg, aml_int(0));
|
||||
+ aml_append(pkg, aml_name("BSEL"));
|
||||
+ aml_append(pkg, aml_name("ASUN"));
|
||||
aml_append(method, aml_store(pkg, params));
|
||||
- aml_append(method,
|
||||
- aml_store(aml_name("BSEL"), aml_index(params, aml_int(0))));
|
||||
- aml_append(method,
|
||||
- aml_store(aml_name("ASUN"), aml_index(params, aml_int(1))));
|
||||
aml_append(method,
|
||||
aml_return(aml_call5("PDSM", aml_arg(0), aml_arg(1),
|
||||
aml_arg(2), aml_arg(3), params))
|
|
@ -1,36 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
|
||||
Date: Fri, 28 Apr 2023 19:48:06 +0400
|
||||
Subject: [PATCH] ui: return NULL when getting cursor without a console
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
VNC may try to get the current cursor even when there are no consoles
|
||||
and crashes. Simple reproducer is qemu with -nodefaults.
|
||||
|
||||
Fixes: (again)
|
||||
https://gitlab.com/qemu-project/qemu/-/issues/1548
|
||||
|
||||
Fixes: commit 385ac97f8 ("ui: keep current cursor with QemuConsole")
|
||||
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
||||
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
||||
(picked up from https://lists.nongnu.org/archive/html/qemu-devel/2023-04/msg05598.html)
|
||||
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
---
|
||||
ui/console.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/ui/console.c b/ui/console.c
|
||||
index e173731e20..7461446e71 100644
|
||||
--- a/ui/console.c
|
||||
+++ b/ui/console.c
|
||||
@@ -2306,7 +2306,7 @@ QEMUCursor *qemu_console_get_cursor(QemuConsole *con)
|
||||
if (con == NULL) {
|
||||
con = active_console;
|
||||
}
|
||||
- return con->cursor;
|
||||
+ return con ? con->cursor : NULL;
|
||||
}
|
||||
|
||||
bool qemu_console_is_visible(QemuConsole *con)
|
35
debian/patches/extra/0005-block-copy-before-write-use-uint64_t-for-timeout-in-.patch
vendored
Normal file
35
debian/patches/extra/0005-block-copy-before-write-use-uint64_t-for-timeout-in-.patch
vendored
Normal file
|
@ -0,0 +1,35 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Fiona Ebner <f.ebner@proxmox.com>
|
||||
Date: Mon, 29 Apr 2024 15:41:11 +0200
|
||||
Subject: [PATCH] block/copy-before-write: use uint64_t for timeout in
|
||||
nanoseconds
|
||||
|
||||
rather than the uint32_t for which the maximum is slightly more than 4
|
||||
seconds and larger values would overflow. The QAPI interface allows
|
||||
specifying the number of seconds, so only values 0 to 4 are safe right
|
||||
now, other values lead to a much lower timeout than a user expects.
|
||||
|
||||
The block_copy() call where this is used already takes a uint64_t for
|
||||
the timeout, so no change required there.
|
||||
|
||||
Fixes: 6db7fd1ca9 ("block/copy-before-write: implement cbw-timeout option")
|
||||
Reported-by: Friedrich Weber <f.weber@proxmox.com>
|
||||
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
Tested-by: Friedrich Weber <f.weber@proxmox.com>
|
||||
---
|
||||
block/copy-before-write.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/block/copy-before-write.c b/block/copy-before-write.c
|
||||
index 8aba27a71d..026fa9840f 100644
|
||||
--- a/block/copy-before-write.c
|
||||
+++ b/block/copy-before-write.c
|
||||
@@ -43,7 +43,7 @@ typedef struct BDRVCopyBeforeWriteState {
|
||||
BlockCopyState *bcs;
|
||||
BdrvChild *target;
|
||||
OnCbwError on_cbw_error;
|
||||
- uint32_t cbw_timeout_ns;
|
||||
+ uint64_t cbw_timeout_ns;
|
||||
|
||||
/*
|
||||
* @lock: protects access to @access_bitmap, @done_bitmap and
|
|
@ -1,130 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Bulekov <alxndr@bu.edu>
|
||||
Date: Thu, 27 Apr 2023 17:10:06 -0400
|
||||
Subject: [PATCH] memory: prevent dma-reentracy issues
|
||||
|
||||
Add a flag to the DeviceState, when a device is engaged in PIO/MMIO/DMA.
|
||||
This flag is set/checked prior to calling a device's MemoryRegion
|
||||
handlers, and set when device code initiates DMA. The purpose of this
|
||||
flag is to prevent two types of DMA-based reentrancy issues:
|
||||
|
||||
1.) mmio -> dma -> mmio case
|
||||
2.) bh -> dma write -> mmio case
|
||||
|
||||
These issues have led to problems such as stack-exhaustion and
|
||||
use-after-frees.
|
||||
|
||||
Summary of the problem from Peter Maydell:
|
||||
https://lore.kernel.org/qemu-devel/CAFEAcA_23vc7hE3iaM-JVA6W38LK4hJoWae5KcknhPRD5fPBZA@mail.gmail.com
|
||||
|
||||
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/62
|
||||
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/540
|
||||
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/541
|
||||
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/556
|
||||
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/557
|
||||
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/827
|
||||
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1282
|
||||
Resolves: CVE-2023-0330
|
||||
|
||||
Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
|
||||
Reviewed-by: Thomas Huth <thuth@redhat.com>
|
||||
Message-Id: <20230427211013.2994127-2-alxndr@bu.edu>
|
||||
[thuth: Replace warn_report() with warn_report_once()]
|
||||
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
||||
(cherry-picked from commit a2e1753b8054344f32cf94f31c6399a58794a380)
|
||||
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
---
|
||||
include/exec/memory.h | 5 +++++
|
||||
include/hw/qdev-core.h | 7 +++++++
|
||||
softmmu/memory.c | 16 ++++++++++++++++
|
||||
3 files changed, 28 insertions(+)
|
||||
|
||||
diff --git a/include/exec/memory.h b/include/exec/memory.h
|
||||
index 15ade918ba..e45ce6061f 100644
|
||||
--- a/include/exec/memory.h
|
||||
+++ b/include/exec/memory.h
|
||||
@@ -767,6 +767,8 @@ struct MemoryRegion {
|
||||
bool is_iommu;
|
||||
RAMBlock *ram_block;
|
||||
Object *owner;
|
||||
+ /* owner as TYPE_DEVICE. Used for re-entrancy checks in MR access hotpath */
|
||||
+ DeviceState *dev;
|
||||
|
||||
const MemoryRegionOps *ops;
|
||||
void *opaque;
|
||||
@@ -791,6 +793,9 @@ struct MemoryRegion {
|
||||
unsigned ioeventfd_nb;
|
||||
MemoryRegionIoeventfd *ioeventfds;
|
||||
RamDiscardManager *rdm; /* Only for RAM */
|
||||
+
|
||||
+ /* For devices designed to perform re-entrant IO into their own IO MRs */
|
||||
+ bool disable_reentrancy_guard;
|
||||
};
|
||||
|
||||
struct IOMMUMemoryRegion {
|
||||
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
|
||||
index bd50ad5ee1..7623703943 100644
|
||||
--- a/include/hw/qdev-core.h
|
||||
+++ b/include/hw/qdev-core.h
|
||||
@@ -162,6 +162,10 @@ struct NamedClockList {
|
||||
QLIST_ENTRY(NamedClockList) node;
|
||||
};
|
||||
|
||||
+typedef struct {
|
||||
+ bool engaged_in_io;
|
||||
+} MemReentrancyGuard;
|
||||
+
|
||||
/**
|
||||
* DeviceState:
|
||||
* @realized: Indicates whether the device has been fully constructed.
|
||||
@@ -194,6 +198,9 @@ struct DeviceState {
|
||||
int alias_required_for_version;
|
||||
ResettableState reset;
|
||||
GSList *unplug_blockers;
|
||||
+
|
||||
+ /* Is the device currently in mmio/pio/dma? Used to prevent re-entrancy */
|
||||
+ MemReentrancyGuard mem_reentrancy_guard;
|
||||
};
|
||||
|
||||
struct DeviceListener {
|
||||
diff --git a/softmmu/memory.c b/softmmu/memory.c
|
||||
index b1a6cae6f5..b7b3386e9d 100644
|
||||
--- a/softmmu/memory.c
|
||||
+++ b/softmmu/memory.c
|
||||
@@ -542,6 +542,18 @@ static MemTxResult access_with_adjusted_size(hwaddr addr,
|
||||
access_size_max = 4;
|
||||
}
|
||||
|
||||
+ /* Do not allow more than one simultaneous access to a device's IO Regions */
|
||||
+ if (mr->dev && !mr->disable_reentrancy_guard &&
|
||||
+ !mr->ram_device && !mr->ram && !mr->rom_device && !mr->readonly) {
|
||||
+ if (mr->dev->mem_reentrancy_guard.engaged_in_io) {
|
||||
+ warn_report_once("Blocked re-entrant IO on MemoryRegion: "
|
||||
+ "%s at addr: 0x%" HWADDR_PRIX,
|
||||
+ memory_region_name(mr), addr);
|
||||
+ return MEMTX_ACCESS_ERROR;
|
||||
+ }
|
||||
+ mr->dev->mem_reentrancy_guard.engaged_in_io = true;
|
||||
+ }
|
||||
+
|
||||
/* FIXME: support unaligned access? */
|
||||
access_size = MAX(MIN(size, access_size_max), access_size_min);
|
||||
access_mask = MAKE_64BIT_MASK(0, access_size * 8);
|
||||
@@ -556,6 +568,9 @@ static MemTxResult access_with_adjusted_size(hwaddr addr,
|
||||
access_mask, attrs);
|
||||
}
|
||||
}
|
||||
+ if (mr->dev) {
|
||||
+ mr->dev->mem_reentrancy_guard.engaged_in_io = false;
|
||||
+ }
|
||||
return r;
|
||||
}
|
||||
|
||||
@@ -1170,6 +1185,7 @@ static void memory_region_do_init(MemoryRegion *mr,
|
||||
}
|
||||
mr->name = g_strdup(name);
|
||||
mr->owner = owner;
|
||||
+ mr->dev = (DeviceState *) object_dynamic_cast(mr->owner, TYPE_DEVICE);
|
||||
mr->ram_block = NULL;
|
||||
|
||||
if (name) {
|
|
@ -1,39 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Bulekov <alxndr@bu.edu>
|
||||
Date: Thu, 27 Apr 2023 17:10:10 -0400
|
||||
Subject: [PATCH] lsi53c895a: disable reentrancy detection for script RAM
|
||||
|
||||
As the code is designed to use the memory APIs to access the script ram,
|
||||
disable reentrancy checks for the pseudo-RAM ram_io MemoryRegion.
|
||||
|
||||
In the future, ram_io may be converted from an IO to a proper RAM MemoryRegion.
|
||||
|
||||
Reported-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
|
||||
Reviewed-by: Thomas Huth <thuth@redhat.com>
|
||||
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
|
||||
Message-Id: <20230427211013.2994127-6-alxndr@bu.edu>
|
||||
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
||||
(cherry-picked from commit bfd6e7ae6a72b84e2eb9574f56e6ec037f05182c)
|
||||
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
---
|
||||
hw/scsi/lsi53c895a.c | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c
|
||||
index bbf32d3f73..17af67935f 100644
|
||||
--- a/hw/scsi/lsi53c895a.c
|
||||
+++ b/hw/scsi/lsi53c895a.c
|
||||
@@ -2313,6 +2313,12 @@ static void lsi_scsi_realize(PCIDevice *dev, Error **errp)
|
||||
memory_region_init_io(&s->io_io, OBJECT(s), &lsi_io_ops, s,
|
||||
"lsi-io", 256);
|
||||
|
||||
+ /*
|
||||
+ * Since we use the address-space API to interact with ram_io, disable the
|
||||
+ * re-entrancy guard.
|
||||
+ */
|
||||
+ s->ram_io.disable_reentrancy_guard = true;
|
||||
+
|
||||
address_space_init(&s->pci_io_as, pci_address_space_io(dev), "lsi-pci-io");
|
||||
qdev_init_gpio_out(d, &s->ext_irq, 1);
|
||||
|
|
@ -0,0 +1,98 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
|
||||
Date: Thu, 16 May 2024 12:40:22 +0400
|
||||
Subject: [PATCH] virtio-gpu: fix v2 migration
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Commit dfcf74fa ("virtio-gpu: fix scanout migration post-load") broke
|
||||
forward/backward version migration. Versioning of nested VMSD structures
|
||||
is not straightforward, as the wire format doesn't have nested
|
||||
structures versions. Introduce x-scanout-vmstate-version and a field
|
||||
test to save/load appropriately according to the machine version.
|
||||
|
||||
Fixes: dfcf74fa ("virtio-gpu: fix scanout migration post-load")
|
||||
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
||||
Signed-off-by: Peter Xu <peterx@redhat.com>
|
||||
---
|
||||
hw/core/machine.c | 1 +
|
||||
hw/display/virtio-gpu.c | 24 ++++++++++++++++--------
|
||||
include/hw/virtio/virtio-gpu.h | 1 +
|
||||
3 files changed, 18 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/hw/core/machine.c b/hw/core/machine.c
|
||||
index 37ede0e7d4..d33a37a6f6 100644
|
||||
--- a/hw/core/machine.c
|
||||
+++ b/hw/core/machine.c
|
||||
@@ -37,6 +37,7 @@ GlobalProperty hw_compat_8_2[] = {
|
||||
{ "migration", "zero-page-detection", "legacy"},
|
||||
{ TYPE_VIRTIO_IOMMU_PCI, "granule", "4k" },
|
||||
{ TYPE_VIRTIO_IOMMU_PCI, "aw-bits", "64" },
|
||||
+ { "virtio-gpu-device", "x-scanout-vmstate-version", "1" },
|
||||
};
|
||||
const size_t hw_compat_8_2_len = G_N_ELEMENTS(hw_compat_8_2);
|
||||
|
||||
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
|
||||
index ae831b6b3e..85323daf99 100644
|
||||
--- a/hw/display/virtio-gpu.c
|
||||
+++ b/hw/display/virtio-gpu.c
|
||||
@@ -1166,10 +1166,17 @@ static void virtio_gpu_cursor_bh(void *opaque)
|
||||
virtio_gpu_handle_cursor(&g->parent_obj.parent_obj, g->cursor_vq);
|
||||
}
|
||||
|
||||
+static bool scanout_vmstate_after_v2(void *opaque, int version)
|
||||
+{
|
||||
+ struct VirtIOGPUBase *base = container_of(opaque, VirtIOGPUBase, scanout);
|
||||
+ struct VirtIOGPU *gpu = container_of(base, VirtIOGPU, parent_obj);
|
||||
+
|
||||
+ return gpu->scanout_vmstate_version >= 2;
|
||||
+}
|
||||
+
|
||||
static const VMStateDescription vmstate_virtio_gpu_scanout = {
|
||||
.name = "virtio-gpu-one-scanout",
|
||||
- .version_id = 2,
|
||||
- .minimum_version_id = 1,
|
||||
+ .version_id = 1,
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_UINT32(resource_id, struct virtio_gpu_scanout),
|
||||
VMSTATE_UINT32(width, struct virtio_gpu_scanout),
|
||||
@@ -1181,12 +1188,12 @@ static const VMStateDescription vmstate_virtio_gpu_scanout = {
|
||||
VMSTATE_UINT32(cursor.hot_y, struct virtio_gpu_scanout),
|
||||
VMSTATE_UINT32(cursor.pos.x, struct virtio_gpu_scanout),
|
||||
VMSTATE_UINT32(cursor.pos.y, struct virtio_gpu_scanout),
|
||||
- VMSTATE_UINT32_V(fb.format, struct virtio_gpu_scanout, 2),
|
||||
- VMSTATE_UINT32_V(fb.bytes_pp, struct virtio_gpu_scanout, 2),
|
||||
- VMSTATE_UINT32_V(fb.width, struct virtio_gpu_scanout, 2),
|
||||
- VMSTATE_UINT32_V(fb.height, struct virtio_gpu_scanout, 2),
|
||||
- VMSTATE_UINT32_V(fb.stride, struct virtio_gpu_scanout, 2),
|
||||
- VMSTATE_UINT32_V(fb.offset, struct virtio_gpu_scanout, 2),
|
||||
+ VMSTATE_UINT32_TEST(fb.format, struct virtio_gpu_scanout, scanout_vmstate_after_v2),
|
||||
+ VMSTATE_UINT32_TEST(fb.bytes_pp, struct virtio_gpu_scanout, scanout_vmstate_after_v2),
|
||||
+ VMSTATE_UINT32_TEST(fb.width, struct virtio_gpu_scanout, scanout_vmstate_after_v2),
|
||||
+ VMSTATE_UINT32_TEST(fb.height, struct virtio_gpu_scanout, scanout_vmstate_after_v2),
|
||||
+ VMSTATE_UINT32_TEST(fb.stride, struct virtio_gpu_scanout, scanout_vmstate_after_v2),
|
||||
+ VMSTATE_UINT32_TEST(fb.offset, struct virtio_gpu_scanout, scanout_vmstate_after_v2),
|
||||
VMSTATE_END_OF_LIST()
|
||||
},
|
||||
};
|
||||
@@ -1659,6 +1666,7 @@ static Property virtio_gpu_properties[] = {
|
||||
DEFINE_PROP_BIT("blob", VirtIOGPU, parent_obj.conf.flags,
|
||||
VIRTIO_GPU_FLAG_BLOB_ENABLED, false),
|
||||
DEFINE_PROP_SIZE("hostmem", VirtIOGPU, parent_obj.conf.hostmem, 0),
|
||||
+ DEFINE_PROP_UINT8("x-scanout-vmstate-version", VirtIOGPU, scanout_vmstate_version, 2),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h
|
||||
index ed44cdad6b..842315d51d 100644
|
||||
--- a/include/hw/virtio/virtio-gpu.h
|
||||
+++ b/include/hw/virtio/virtio-gpu.h
|
||||
@@ -177,6 +177,7 @@ typedef struct VGPUDMABuf {
|
||||
struct VirtIOGPU {
|
||||
VirtIOGPUBase parent_obj;
|
||||
|
||||
+ uint8_t scanout_vmstate_version;
|
||||
uint64_t conf_max_hostmem;
|
||||
|
||||
VirtQueue *ctrl_vq;
|
|
@ -1,37 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Bulekov <alxndr@bu.edu>
|
||||
Date: Thu, 27 Apr 2023 17:10:11 -0400
|
||||
Subject: [PATCH] bcm2835_property: disable reentrancy detection for iomem
|
||||
|
||||
As the code is designed for re-entrant calls from bcm2835_property to
|
||||
bcm2835_mbox and back into bcm2835_property, mark iomem as
|
||||
reentrancy-safe.
|
||||
|
||||
Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
|
||||
Reviewed-by: Thomas Huth <thuth@redhat.com>
|
||||
Message-Id: <20230427211013.2994127-7-alxndr@bu.edu>
|
||||
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
||||
(cherry-picked from commit 985c4a4e547afb9573b6bd6843d20eb2c3d1d1cd)
|
||||
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
---
|
||||
hw/misc/bcm2835_property.c | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/hw/misc/bcm2835_property.c b/hw/misc/bcm2835_property.c
|
||||
index 890ae7bae5..de056ea2df 100644
|
||||
--- a/hw/misc/bcm2835_property.c
|
||||
+++ b/hw/misc/bcm2835_property.c
|
||||
@@ -382,6 +382,13 @@ static void bcm2835_property_init(Object *obj)
|
||||
|
||||
memory_region_init_io(&s->iomem, OBJECT(s), &bcm2835_property_ops, s,
|
||||
TYPE_BCM2835_PROPERTY, 0x10);
|
||||
+
|
||||
+ /*
|
||||
+ * bcm2835_property_ops call into bcm2835_mbox, which in-turn reads from
|
||||
+ * iomem. As such, mark iomem as re-entracy safe.
|
||||
+ */
|
||||
+ s->iomem.disable_reentrancy_guard = true;
|
||||
+
|
||||
sysbus_init_mmio(SYS_BUS_DEVICE(s), &s->iomem);
|
||||
sysbus_init_irq(SYS_BUS_DEVICE(s), &s->mbox_irq);
|
||||
}
|
|
@ -0,0 +1,59 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Gerd Hoffmann <kraxel@redhat.com>
|
||||
Date: Thu, 16 May 2024 10:46:34 +0200
|
||||
Subject: [PATCH] hw/pflash: fix block write start
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Move the pflash_blk_write_start() call. We need the offset of the
|
||||
first data write, not the offset for the setup (number-of-bytes)
|
||||
write. Without this fix u-boot can do block writes to the first
|
||||
flash block only.
|
||||
|
||||
While being at it drop a leftover FIXME.
|
||||
|
||||
Cc: qemu-stable@nongnu.org
|
||||
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2343
|
||||
Fixes: fcc79f2e0955 ("hw/pflash: implement update buffer for block writes")
|
||||
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
||||
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
||||
(picked up from https://lists.nongnu.org/archive/html/qemu-stable/2024-05/msg00091.html)
|
||||
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
---
|
||||
hw/block/pflash_cfi01.c | 8 +++-----
|
||||
1 file changed, 3 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c
|
||||
index 1bda8424b9..c8f1cf5a87 100644
|
||||
--- a/hw/block/pflash_cfi01.c
|
||||
+++ b/hw/block/pflash_cfi01.c
|
||||
@@ -518,10 +518,6 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offset,
|
||||
break;
|
||||
case 0xe8: /* Write to buffer */
|
||||
trace_pflash_write(pfl->name, "write to buffer");
|
||||
- /* FIXME should save @offset, @width for case 1+ */
|
||||
- qemu_log_mask(LOG_UNIMP,
|
||||
- "%s: Write to buffer emulation is flawed\n",
|
||||
- __func__);
|
||||
pfl->status |= 0x80; /* Ready! */
|
||||
break;
|
||||
case 0xf0: /* Probe for AMD flash */
|
||||
@@ -574,7 +570,6 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offset,
|
||||
}
|
||||
pfl->counter = value;
|
||||
pfl->wcycle++;
|
||||
- pflash_blk_write_start(pfl, offset);
|
||||
break;
|
||||
case 0x60:
|
||||
if (cmd == 0xd0) {
|
||||
@@ -605,6 +600,9 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offset,
|
||||
switch (pfl->cmd) {
|
||||
case 0xe8: /* Block write */
|
||||
/* FIXME check @offset, @width */
|
||||
+ if (pfl->blk_offset == -1 && pfl->counter) {
|
||||
+ pflash_blk_write_start(pfl, offset);
|
||||
+ }
|
||||
if (!pfl->ro && (pfl->blk_offset != -1)) {
|
||||
pflash_data_write(pfl, offset, value, width, be);
|
||||
} else {
|
|
@ -1,35 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Bulekov <alxndr@bu.edu>
|
||||
Date: Thu, 27 Apr 2023 17:10:12 -0400
|
||||
Subject: [PATCH] raven: disable reentrancy detection for iomem
|
||||
|
||||
As the code is designed for re-entrant calls from raven_io_ops to
|
||||
pci-conf, mark raven_io_ops as reentrancy-safe.
|
||||
|
||||
Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
|
||||
Message-Id: <20230427211013.2994127-8-alxndr@bu.edu>
|
||||
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
||||
(cherry-picked from commit 6dad5a6810d9c60ca320d01276f6133bbcfa1fc7)
|
||||
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
---
|
||||
hw/pci-host/raven.c | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/hw/pci-host/raven.c b/hw/pci-host/raven.c
|
||||
index 072ffe3c5e..9a11ac4b2b 100644
|
||||
--- a/hw/pci-host/raven.c
|
||||
+++ b/hw/pci-host/raven.c
|
||||
@@ -294,6 +294,13 @@ static void raven_pcihost_initfn(Object *obj)
|
||||
memory_region_init(&s->pci_memory, obj, "pci-memory", 0x3f000000);
|
||||
address_space_init(&s->pci_io_as, &s->pci_io, "raven-io");
|
||||
|
||||
+ /*
|
||||
+ * Raven's raven_io_ops use the address-space API to access pci-conf-idx
|
||||
+ * (which is also owned by the raven device). As such, mark the
|
||||
+ * pci_io_non_contiguous as re-entrancy safe.
|
||||
+ */
|
||||
+ s->pci_io_non_contiguous.disable_reentrancy_guard = true;
|
||||
+
|
||||
/* CPU address space */
|
||||
memory_region_add_subregion(address_space_mem, PCI_IO_BASE_ADDR,
|
||||
&s->pci_io);
|
51
debian/patches/extra/0008-target-i386-fix-operand-size-for-DATA16-REX.W-POPCNT.patch
vendored
Normal file
51
debian/patches/extra/0008-target-i386-fix-operand-size-for-DATA16-REX.W-POPCNT.patch
vendored
Normal file
|
@ -0,0 +1,51 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Paolo Bonzini <pbonzini@redhat.com>
|
||||
Date: Thu, 9 May 2024 12:38:10 +0200
|
||||
Subject: [PATCH] target/i386: fix operand size for DATA16 REX.W POPCNT
|
||||
|
||||
According to the manual, 32-bit vs 64-bit is governed by REX.W
|
||||
and REX ignores the 0x66 prefix. This can be confirmed with this
|
||||
program:
|
||||
|
||||
#include <stdio.h>
|
||||
int main()
|
||||
{
|
||||
int x = 0x12340000;
|
||||
int y;
|
||||
asm("popcntl %1, %0" : "=r" (y) : "r" (x)); printf("%x\n", y);
|
||||
asm("mov $-1, %0; .byte 0x66; popcntl %1, %0" : "+r" (y) : "r" (x)); printf("%x\n", y);
|
||||
asm("mov $-1, %0; .byte 0x66; popcntq %q1, %q0" : "+r" (y) : "r" (x)); printf("%x\n", y);
|
||||
}
|
||||
|
||||
which prints 5/ffff0000/5 on real hardware and 5/ffff0000/ffff0000
|
||||
on QEMU.
|
||||
|
||||
Cc: qemu-stable@nongnu.org
|
||||
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
|
||||
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
|
||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
(cherry picked from commit 41c685dc59bb611096f3bb6a663cfa82e4cba97b)
|
||||
[FE: keep mo_64_32 helper which still has other users in 9.0.0]
|
||||
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
---
|
||||
target/i386/tcg/translate.c | 7 +------
|
||||
1 file changed, 1 insertion(+), 6 deletions(-)
|
||||
|
||||
diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c
|
||||
index 76a42c679c..b60f3bd642 100644
|
||||
--- a/target/i386/tcg/translate.c
|
||||
+++ b/target/i386/tcg/translate.c
|
||||
@@ -6799,12 +6799,7 @@ static bool disas_insn(DisasContext *s, CPUState *cpu)
|
||||
modrm = x86_ldub_code(env, s);
|
||||
reg = ((modrm >> 3) & 7) | REX_R(s);
|
||||
|
||||
- if (s->prefix & PREFIX_DATA) {
|
||||
- ot = MO_16;
|
||||
- } else {
|
||||
- ot = mo_64_32(dflag);
|
||||
- }
|
||||
-
|
||||
+ ot = dflag;
|
||||
gen_ldst_modrm(env, s, modrm, ot, OR_TMP0, 0);
|
||||
gen_extu(ot, s->T0);
|
||||
tcg_gen_mov_tl(cpu_cc_src, s->T0);
|
|
@ -1,36 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Bulekov <alxndr@bu.edu>
|
||||
Date: Thu, 27 Apr 2023 17:10:13 -0400
|
||||
Subject: [PATCH] apic: disable reentrancy detection for apic-msi
|
||||
|
||||
As the code is designed for re-entrant calls to apic-msi, mark apic-msi
|
||||
as reentrancy-safe.
|
||||
|
||||
Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
|
||||
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
|
||||
Message-Id: <20230427211013.2994127-9-alxndr@bu.edu>
|
||||
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
||||
(cherry-picked from commit 50795ee051a342c681a9b45671c552fbd6274db8)
|
||||
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
---
|
||||
hw/intc/apic.c | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/hw/intc/apic.c b/hw/intc/apic.c
|
||||
index 20b5a94073..ac3d47d231 100644
|
||||
--- a/hw/intc/apic.c
|
||||
+++ b/hw/intc/apic.c
|
||||
@@ -885,6 +885,13 @@ static void apic_realize(DeviceState *dev, Error **errp)
|
||||
memory_region_init_io(&s->io_memory, OBJECT(s), &apic_io_ops, s, "apic-msi",
|
||||
APIC_SPACE_SIZE);
|
||||
|
||||
+ /*
|
||||
+ * apic-msi's apic_mem_write can call into ioapic_eoi_broadcast, which can
|
||||
+ * write back to apic-msi. As such mark the apic-msi region re-entrancy
|
||||
+ * safe.
|
||||
+ */
|
||||
+ s->io_memory.disable_reentrancy_guard = true;
|
||||
+
|
||||
s->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, apic_timer, s);
|
||||
local_apics[s->id] = s;
|
||||
|
40
debian/patches/extra/0009-target-i386-rdpkru-wrpkru-are-no-prefix-instructions.patch
vendored
Normal file
40
debian/patches/extra/0009-target-i386-rdpkru-wrpkru-are-no-prefix-instructions.patch
vendored
Normal file
|
@ -0,0 +1,40 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Paolo Bonzini <pbonzini@redhat.com>
|
||||
Date: Thu, 9 May 2024 15:55:47 +0200
|
||||
Subject: [PATCH] target/i386: rdpkru/wrpkru are no-prefix instructions
|
||||
|
||||
Reject 0x66/0xf3/0xf2 in front of them.
|
||||
|
||||
Cc: qemu-stable@nongnu.org
|
||||
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
|
||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
(cherry picked from commit 40a3ec7b5ffde500789d016660a171057d6b467c)
|
||||
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
---
|
||||
target/i386/tcg/translate.c | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c
|
||||
index b60f3bd642..3e949fe964 100644
|
||||
--- a/target/i386/tcg/translate.c
|
||||
+++ b/target/i386/tcg/translate.c
|
||||
@@ -6083,7 +6083,8 @@ static bool disas_insn(DisasContext *s, CPUState *cpu)
|
||||
gen_ldst_modrm(env, s, modrm, ot, OR_TMP0, 1);
|
||||
break;
|
||||
case 0xee: /* rdpkru */
|
||||
- if (prefixes & PREFIX_LOCK) {
|
||||
+ if (s->prefix & (PREFIX_LOCK | PREFIX_DATA
|
||||
+ | PREFIX_REPZ | PREFIX_REPNZ)) {
|
||||
goto illegal_op;
|
||||
}
|
||||
tcg_gen_trunc_tl_i32(s->tmp2_i32, cpu_regs[R_ECX]);
|
||||
@@ -6091,7 +6092,8 @@ static bool disas_insn(DisasContext *s, CPUState *cpu)
|
||||
tcg_gen_extr_i64_tl(cpu_regs[R_EAX], cpu_regs[R_EDX], s->tmp1_i64);
|
||||
break;
|
||||
case 0xef: /* wrpkru */
|
||||
- if (prefixes & PREFIX_LOCK) {
|
||||
+ if (s->prefix & (PREFIX_LOCK | PREFIX_DATA
|
||||
+ | PREFIX_REPZ | PREFIX_REPNZ)) {
|
||||
goto illegal_op;
|
||||
}
|
||||
tcg_gen_concat_tl_i64(s->tmp1_i64, cpu_regs[R_EAX],
|
33
debian/patches/extra/0010-target-i386-fix-feature-dependency-for-WAITPKG.patch
vendored
Normal file
33
debian/patches/extra/0010-target-i386-fix-feature-dependency-for-WAITPKG.patch
vendored
Normal file
|
@ -0,0 +1,33 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Paolo Bonzini <pbonzini@redhat.com>
|
||||
Date: Wed, 8 May 2024 11:10:54 +0200
|
||||
Subject: [PATCH] target/i386: fix feature dependency for WAITPKG
|
||||
|
||||
The VMX feature bit depends on general availability of WAITPKG,
|
||||
not the other way round.
|
||||
|
||||
Fixes: 33cc88261c3 ("target/i386: add support for VMX_SECONDARY_EXEC_ENABLE_USER_WAIT_PAUSE", 2023-08-28)
|
||||
Cc: qemu-stable@nongnu.org
|
||||
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
|
||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
(cherry picked from commit fe01af5d47d4cf7fdf90c54d43f784e5068c8d72)
|
||||
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
---
|
||||
target/i386/cpu.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
|
||||
index 33760a2ee1..e693f8ca9a 100644
|
||||
--- a/target/i386/cpu.c
|
||||
+++ b/target/i386/cpu.c
|
||||
@@ -1550,8 +1550,8 @@ static FeatureDep feature_dependencies[] = {
|
||||
.to = { FEAT_SVM, ~0ull },
|
||||
},
|
||||
{
|
||||
- .from = { FEAT_VMX_SECONDARY_CTLS, VMX_SECONDARY_EXEC_ENABLE_USER_WAIT_PAUSE },
|
||||
- .to = { FEAT_7_0_ECX, CPUID_7_0_ECX_WAITPKG },
|
||||
+ .from = { FEAT_7_0_ECX, CPUID_7_0_ECX_WAITPKG },
|
||||
+ .to = { FEAT_VMX_SECONDARY_CTLS, VMX_SECONDARY_EXEC_ENABLE_USER_WAIT_PAUSE },
|
||||
},
|
||||
};
|
||||
|
87
debian/patches/extra/0011-Revert-virtio-pci-fix-use-of-a-released-vector.patch
vendored
Normal file
87
debian/patches/extra/0011-Revert-virtio-pci-fix-use-of-a-released-vector.patch
vendored
Normal file
|
@ -0,0 +1,87 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Fiona Ebner <f.ebner@proxmox.com>
|
||||
Date: Thu, 16 May 2024 12:59:52 +0200
|
||||
Subject: [PATCH] Revert "virtio-pci: fix use of a released vector"
|
||||
|
||||
This reverts commit 2ce6cff94df2650c460f809e5ad263f1d22507c0.
|
||||
|
||||
The fix causes some issues:
|
||||
https://gitlab.com/qemu-project/qemu/-/issues/2321
|
||||
https://gitlab.com/qemu-project/qemu/-/issues/2334
|
||||
|
||||
The CVE fixed by commit 2ce6cff94d ("virtio-pci: fix use of a released
|
||||
vector") is CVE-2024-4693 [0] and allows a malicious guest that
|
||||
controls the boot process in the guest to crash its QEMU process.
|
||||
|
||||
The issues sound worse than the CVE, so revert until there is a proper
|
||||
fix.
|
||||
|
||||
[0]: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-4693
|
||||
|
||||
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
---
|
||||
hw/virtio/virtio-pci.c | 37 ++-----------------------------------
|
||||
1 file changed, 2 insertions(+), 35 deletions(-)
|
||||
|
||||
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
|
||||
index cb159fd078..cb6940fc0e 100644
|
||||
--- a/hw/virtio/virtio-pci.c
|
||||
+++ b/hw/virtio/virtio-pci.c
|
||||
@@ -1424,38 +1424,6 @@ static int virtio_pci_add_mem_cap(VirtIOPCIProxy *proxy,
|
||||
return offset;
|
||||
}
|
||||
|
||||
-static void virtio_pci_set_vector(VirtIODevice *vdev,
|
||||
- VirtIOPCIProxy *proxy,
|
||||
- int queue_no, uint16_t old_vector,
|
||||
- uint16_t new_vector)
|
||||
-{
|
||||
- bool kvm_irqfd = (vdev->status & VIRTIO_CONFIG_S_DRIVER_OK) &&
|
||||
- msix_enabled(&proxy->pci_dev) && kvm_msi_via_irqfd_enabled();
|
||||
-
|
||||
- if (new_vector == old_vector) {
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- /*
|
||||
- * If the device uses irqfd and the vector changes after DRIVER_OK is
|
||||
- * set, we need to release the old vector and set up the new one.
|
||||
- * Otherwise just need to set the new vector on the device.
|
||||
- */
|
||||
- if (kvm_irqfd && old_vector != VIRTIO_NO_VECTOR) {
|
||||
- kvm_virtio_pci_vector_release_one(proxy, queue_no);
|
||||
- }
|
||||
- /* Set the new vector on the device. */
|
||||
- if (queue_no == VIRTIO_CONFIG_IRQ_IDX) {
|
||||
- vdev->config_vector = new_vector;
|
||||
- } else {
|
||||
- virtio_queue_set_vector(vdev, queue_no, new_vector);
|
||||
- }
|
||||
- /* If the new vector changed need to set it up. */
|
||||
- if (kvm_irqfd && new_vector != VIRTIO_NO_VECTOR) {
|
||||
- kvm_virtio_pci_vector_use_one(proxy, queue_no);
|
||||
- }
|
||||
-}
|
||||
-
|
||||
int virtio_pci_add_shm_cap(VirtIOPCIProxy *proxy,
|
||||
uint8_t bar, uint64_t offset, uint64_t length,
|
||||
uint8_t id)
|
||||
@@ -1602,8 +1570,7 @@ static void virtio_pci_common_write(void *opaque, hwaddr addr,
|
||||
} else {
|
||||
val = VIRTIO_NO_VECTOR;
|
||||
}
|
||||
- virtio_pci_set_vector(vdev, proxy, VIRTIO_CONFIG_IRQ_IDX,
|
||||
- vdev->config_vector, val);
|
||||
+ vdev->config_vector = val;
|
||||
break;
|
||||
case VIRTIO_PCI_COMMON_STATUS:
|
||||
if (!(val & VIRTIO_CONFIG_S_DRIVER_OK)) {
|
||||
@@ -1643,7 +1610,7 @@ static void virtio_pci_common_write(void *opaque, hwaddr addr,
|
||||
} else {
|
||||
val = VIRTIO_NO_VECTOR;
|
||||
}
|
||||
- virtio_pci_set_vector(vdev, proxy, vdev->queue_sel, vector, val);
|
||||
+ virtio_queue_set_vector(vdev, vdev->queue_sel, val);
|
||||
break;
|
||||
case VIRTIO_PCI_COMMON_Q_ENABLE:
|
||||
if (val == 1) {
|
57
debian/patches/extra/0012-hw-core-machine-move-compatibility-flags-for-VirtIO-.patch
vendored
Normal file
57
debian/patches/extra/0012-hw-core-machine-move-compatibility-flags-for-VirtIO-.patch
vendored
Normal file
|
@ -0,0 +1,57 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Fiona Ebner <f.ebner@proxmox.com>
|
||||
Date: Thu, 16 May 2024 15:21:07 +0200
|
||||
Subject: [PATCH] hw/core/machine: move compatibility flags for VirtIO-net USO
|
||||
to machine 8.1
|
||||
|
||||
Migration from an 8.2 or 9.0 binary to an 8.1 binary with machine
|
||||
version 8.1 can fail with:
|
||||
|
||||
> kvm: Features 0x1c0010130afffa7 unsupported. Allowed features: 0x10179bfffe7
|
||||
> kvm: Failed to load virtio-net:virtio
|
||||
> kvm: error while loading state for instance 0x0 of device '0000:00:12.0/virtio-net'
|
||||
> kvm: load of migration failed: Operation not permitted
|
||||
|
||||
The series
|
||||
|
||||
53da8b5a99 virtio-net: Add support for USO features
|
||||
9da1684954 virtio-net: Add USO flags to vhost support.
|
||||
f03e0cf63b tap: Add check for USO features
|
||||
2ab0ec3121 tap: Add USO support to tap device.
|
||||
|
||||
only landed in QEMU 8.2, so the compatibility flags should be part of
|
||||
machine version 8.1.
|
||||
|
||||
Moving the flags unfortunately breaks forward migration with machine
|
||||
version 8.1 from a binary without this patch to a binary with this
|
||||
patch when the feature is enabled by the guest.
|
||||
|
||||
Fixes: 53da8b5a99 ("virtio-net: Add support for USO features")
|
||||
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
---
|
||||
hw/core/machine.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/hw/core/machine.c b/hw/core/machine.c
|
||||
index d33a37a6f6..4273de16a0 100644
|
||||
--- a/hw/core/machine.c
|
||||
+++ b/hw/core/machine.c
|
||||
@@ -46,15 +46,15 @@ GlobalProperty hw_compat_8_1[] = {
|
||||
{ "ramfb", "x-migrate", "off" },
|
||||
{ "vfio-pci-nohotplug", "x-ramfb-migrate", "off" },
|
||||
{ "igb", "x-pcie-flr-init", "off" },
|
||||
+ { TYPE_VIRTIO_NET, "host_uso", "off"},
|
||||
+ { TYPE_VIRTIO_NET, "guest_uso4", "off"},
|
||||
+ { TYPE_VIRTIO_NET, "guest_uso6", "off"},
|
||||
};
|
||||
const size_t hw_compat_8_1_len = G_N_ELEMENTS(hw_compat_8_1);
|
||||
|
||||
GlobalProperty hw_compat_8_0[] = {
|
||||
{ "migration", "multifd-flush-after-each-section", "on"},
|
||||
{ TYPE_PCI_DEVICE, "x-pcie-ari-nextfn-1", "on" },
|
||||
- { TYPE_VIRTIO_NET, "host_uso", "off"},
|
||||
- { TYPE_VIRTIO_NET, "guest_uso4", "off"},
|
||||
- { TYPE_VIRTIO_NET, "guest_uso6", "off"},
|
||||
};
|
||||
const size_t hw_compat_8_0_len = G_N_ELEMENTS(hw_compat_8_0);
|
||||
|
File diff suppressed because it is too large
Load Diff
|
@ -14,10 +14,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/block/file-posix.c b/block/file-posix.c
|
||||
index c2dee3f056..9681bd0434 100644
|
||||
index 35684f7e21..43bc0bd520 100644
|
||||
--- a/block/file-posix.c
|
||||
+++ b/block/file-posix.c
|
||||
@@ -553,7 +553,7 @@ static QemuOptsList raw_runtime_opts = {
|
||||
@@ -563,7 +563,7 @@ static QemuOptsList raw_runtime_opts = {
|
||||
{
|
||||
.name = "locking",
|
||||
.type = QEMU_OPT_STRING,
|
||||
|
@ -26,7 +26,7 @@ index c2dee3f056..9681bd0434 100644
|
|||
},
|
||||
{
|
||||
.name = "pr-manager",
|
||||
@@ -653,7 +653,7 @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
|
||||
@@ -663,7 +663,7 @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
|
||||
s->use_lock = false;
|
||||
break;
|
||||
case ON_OFF_AUTO_AUTO:
|
||||
|
|
|
@ -9,10 +9,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/include/net/net.h b/include/net/net.h
|
||||
index 1448d00afb..d1601d32c1 100644
|
||||
index b1f9b35fcc..096c0d52e4 100644
|
||||
--- a/include/net/net.h
|
||||
+++ b/include/net/net.h
|
||||
@@ -258,8 +258,8 @@ void netdev_add(QemuOpts *opts, Error **errp);
|
||||
@@ -317,8 +317,8 @@ void netdev_add(QemuOpts *opts, Error **errp);
|
||||
int net_hub_id_for_client(NetClientState *nc, int *id);
|
||||
NetClientState *net_hub_port_find(int hub_id);
|
||||
|
||||
|
|
|
@ -10,10 +10,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
|
||||
index d243e290d3..3489b05ec4 100644
|
||||
index 6b05738079..d82869900a 100644
|
||||
--- a/target/i386/cpu.h
|
||||
+++ b/target/i386/cpu.h
|
||||
@@ -2203,9 +2203,9 @@ uint64_t cpu_get_tsc(CPUX86State *env);
|
||||
@@ -2291,9 +2291,9 @@ uint64_t cpu_get_tsc(CPUX86State *env);
|
||||
#define CPU_RESOLVING_TYPE TYPE_X86_CPU
|
||||
|
||||
#ifdef TARGET_X86_64
|
||||
|
|
|
@ -9,10 +9,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|||
1 file changed, 9 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/ui/spice-core.c b/ui/spice-core.c
|
||||
index 52a59386d7..b20c25aee0 100644
|
||||
index 15be640286..ea20e6153c 100644
|
||||
--- a/ui/spice-core.c
|
||||
+++ b/ui/spice-core.c
|
||||
@@ -691,32 +691,35 @@ static void qemu_spice_init(void)
|
||||
@@ -690,32 +690,35 @@ static void qemu_spice_init(void)
|
||||
|
||||
if (tls_port) {
|
||||
x509_dir = qemu_opt_get(opts, "x509-dir");
|
||||
|
|
|
@ -9,7 +9,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|||
1 file changed, 11 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/block/gluster.c b/block/gluster.c
|
||||
index 185a83e5e5..f11a40aa9e 100644
|
||||
index cc74af06dc..3ba9bbfa5e 100644
|
||||
--- a/block/gluster.c
|
||||
+++ b/block/gluster.c
|
||||
@@ -43,7 +43,7 @@
|
||||
|
@ -24,7 +24,7 @@ index 185a83e5e5..f11a40aa9e 100644
|
|||
@@ -425,6 +425,7 @@ static struct glfs *qemu_gluster_glfs_init(BlockdevOptionsGluster *gconf,
|
||||
int old_errno;
|
||||
SocketAddressList *server;
|
||||
unsigned long long port;
|
||||
uint64_t port;
|
||||
+ const char *logfile;
|
||||
|
||||
glfs = glfs_find_preopened(gconf->volume);
|
||||
|
|
|
@ -18,7 +18,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/block/rbd.c b/block/rbd.c
|
||||
index 978671411e..a4749f3b1b 100644
|
||||
index 84bb2fa5d7..63f60d41be 100644
|
||||
--- a/block/rbd.c
|
||||
+++ b/block/rbd.c
|
||||
@@ -963,6 +963,8 @@ static int qemu_rbd_connect(rados_t *cluster, rados_ioctx_t *io_ctx,
|
||||
|
|
|
@ -16,7 +16,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|||
1 file changed, 9 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/block/gluster.c b/block/gluster.c
|
||||
index f11a40aa9e..6756e6b886 100644
|
||||
index 3ba9bbfa5e..34936eb855 100644
|
||||
--- a/block/gluster.c
|
||||
+++ b/block/gluster.c
|
||||
@@ -58,6 +58,7 @@ typedef struct GlusterAIOCB {
|
||||
|
@ -39,7 +39,7 @@ index f11a40aa9e..6756e6b886 100644
|
|||
}
|
||||
|
||||
aio_co_schedule(acb->aio_context, acb->coroutine);
|
||||
@@ -1021,6 +1024,7 @@ static coroutine_fn int qemu_gluster_co_pwrite_zeroes(BlockDriverState *bs,
|
||||
@@ -1023,6 +1026,7 @@ static coroutine_fn int qemu_gluster_co_pwrite_zeroes(BlockDriverState *bs,
|
||||
acb.ret = 0;
|
||||
acb.coroutine = qemu_coroutine_self();
|
||||
acb.aio_context = bdrv_get_aio_context(bs);
|
||||
|
@ -47,7 +47,7 @@ index f11a40aa9e..6756e6b886 100644
|
|||
|
||||
ret = glfs_zerofill_async(s->fd, offset, bytes, gluster_finish_aiocb, &acb);
|
||||
if (ret < 0) {
|
||||
@@ -1201,9 +1205,11 @@ static coroutine_fn int qemu_gluster_co_rw(BlockDriverState *bs,
|
||||
@@ -1203,9 +1207,11 @@ static coroutine_fn int qemu_gluster_co_rw(BlockDriverState *bs,
|
||||
acb.aio_context = bdrv_get_aio_context(bs);
|
||||
|
||||
if (write) {
|
||||
|
@ -59,7 +59,7 @@ index f11a40aa9e..6756e6b886 100644
|
|||
ret = glfs_preadv_async(s->fd, qiov->iov, qiov->niov, offset, 0,
|
||||
gluster_finish_aiocb, &acb);
|
||||
}
|
||||
@@ -1266,6 +1272,7 @@ static coroutine_fn int qemu_gluster_co_flush_to_disk(BlockDriverState *bs)
|
||||
@@ -1268,6 +1274,7 @@ static coroutine_fn int qemu_gluster_co_flush_to_disk(BlockDriverState *bs)
|
||||
acb.ret = 0;
|
||||
acb.coroutine = qemu_coroutine_self();
|
||||
acb.aio_context = bdrv_get_aio_context(bs);
|
||||
|
@ -67,7 +67,7 @@ index f11a40aa9e..6756e6b886 100644
|
|||
|
||||
ret = glfs_fsync_async(s->fd, gluster_finish_aiocb, &acb);
|
||||
if (ret < 0) {
|
||||
@@ -1314,6 +1321,7 @@ static coroutine_fn int qemu_gluster_co_pdiscard(BlockDriverState *bs,
|
||||
@@ -1316,6 +1323,7 @@ static coroutine_fn int qemu_gluster_co_pdiscard(BlockDriverState *bs,
|
||||
acb.ret = 0;
|
||||
acb.coroutine = qemu_coroutine_self();
|
||||
acb.aio_context = bdrv_get_aio_context(bs);
|
||||
|
|
|
@ -9,10 +9,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/qemu-img.c b/qemu-img.c
|
||||
index 9aeac69fa6..0919fac1f1 100644
|
||||
index 7668f86769..2575e97b43 100644
|
||||
--- a/qemu-img.c
|
||||
+++ b/qemu-img.c
|
||||
@@ -3059,7 +3059,8 @@ static int img_info(int argc, char **argv)
|
||||
@@ -3075,7 +3075,8 @@ static int img_info(int argc, char **argv)
|
||||
list = collect_image_info_list(image_opts, filename, fmt, chain,
|
||||
force_share);
|
||||
if (!list) {
|
||||
|
|
|
@ -38,10 +38,10 @@ Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
|||
2 files changed, 133 insertions(+), 73 deletions(-)
|
||||
|
||||
diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx
|
||||
index 1b1dab5b17..d1616c045a 100644
|
||||
index c9dd70a892..048788b23d 100644
|
||||
--- a/qemu-img-cmds.hx
|
||||
+++ b/qemu-img-cmds.hx
|
||||
@@ -58,9 +58,9 @@ SRST
|
||||
@@ -60,9 +60,9 @@ SRST
|
||||
ERST
|
||||
|
||||
DEF("dd", img_dd,
|
||||
|
@ -54,10 +54,10 @@ index 1b1dab5b17..d1616c045a 100644
|
|||
|
||||
DEF("info", img_info,
|
||||
diff --git a/qemu-img.c b/qemu-img.c
|
||||
index 0919fac1f1..c584de648c 100644
|
||||
index 2575e97b43..8ec68b346f 100644
|
||||
--- a/qemu-img.c
|
||||
+++ b/qemu-img.c
|
||||
@@ -4885,10 +4885,12 @@ static int img_bitmap(int argc, char **argv)
|
||||
@@ -4993,10 +4993,12 @@ static int img_bitmap(int argc, char **argv)
|
||||
#define C_IF 04
|
||||
#define C_OF 010
|
||||
#define C_SKIP 020
|
||||
|
@ -70,7 +70,7 @@ index 0919fac1f1..c584de648c 100644
|
|||
};
|
||||
|
||||
struct DdIo {
|
||||
@@ -4964,6 +4966,19 @@ static int img_dd_skip(const char *arg,
|
||||
@@ -5072,6 +5074,19 @@ static int img_dd_skip(const char *arg,
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -90,7 +90,7 @@ index 0919fac1f1..c584de648c 100644
|
|||
static int img_dd(int argc, char **argv)
|
||||
{
|
||||
int ret = 0;
|
||||
@@ -5004,6 +5019,7 @@ static int img_dd(int argc, char **argv)
|
||||
@@ -5112,6 +5127,7 @@ static int img_dd(int argc, char **argv)
|
||||
{ "if", img_dd_if, C_IF },
|
||||
{ "of", img_dd_of, C_OF },
|
||||
{ "skip", img_dd_skip, C_SKIP },
|
||||
|
@ -98,7 +98,7 @@ index 0919fac1f1..c584de648c 100644
|
|||
{ NULL, NULL, 0 }
|
||||
};
|
||||
const struct option long_options[] = {
|
||||
@@ -5079,91 +5095,112 @@ static int img_dd(int argc, char **argv)
|
||||
@@ -5187,91 +5203,112 @@ static int img_dd(int argc, char **argv)
|
||||
arg = NULL;
|
||||
}
|
||||
|
||||
|
@ -275,7 +275,7 @@ index 0919fac1f1..c584de648c 100644
|
|||
}
|
||||
|
||||
if (dd.flags & C_SKIP && (in.offset > INT64_MAX / in.bsz ||
|
||||
@@ -5180,20 +5217,43 @@ static int img_dd(int argc, char **argv)
|
||||
@@ -5288,20 +5325,43 @@ static int img_dd(int argc, char **argv)
|
||||
in.buf = g_new(uint8_t, in.bsz);
|
||||
|
||||
for (out_pos = 0; in_pos < size; ) {
|
||||
|
|
|
@ -16,10 +16,10 @@ Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
|||
1 file changed, 25 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/qemu-img.c b/qemu-img.c
|
||||
index c584de648c..a57ceeddfe 100644
|
||||
index 8ec68b346f..b98184bba1 100644
|
||||
--- a/qemu-img.c
|
||||
+++ b/qemu-img.c
|
||||
@@ -4886,11 +4886,13 @@ static int img_bitmap(int argc, char **argv)
|
||||
@@ -4994,11 +4994,13 @@ static int img_bitmap(int argc, char **argv)
|
||||
#define C_OF 010
|
||||
#define C_SKIP 020
|
||||
#define C_OSIZE 040
|
||||
|
@ -33,7 +33,7 @@ index c584de648c..a57ceeddfe 100644
|
|||
};
|
||||
|
||||
struct DdIo {
|
||||
@@ -4979,6 +4981,19 @@ static int img_dd_osize(const char *arg,
|
||||
@@ -5087,6 +5089,19 @@ static int img_dd_osize(const char *arg,
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -53,7 +53,7 @@ index c584de648c..a57ceeddfe 100644
|
|||
static int img_dd(int argc, char **argv)
|
||||
{
|
||||
int ret = 0;
|
||||
@@ -4993,12 +5008,14 @@ static int img_dd(int argc, char **argv)
|
||||
@@ -5101,12 +5116,14 @@ static int img_dd(int argc, char **argv)
|
||||
int c, i;
|
||||
const char *out_fmt = "raw";
|
||||
const char *fmt = NULL;
|
||||
|
@ -69,7 +69,7 @@ index c584de648c..a57ceeddfe 100644
|
|||
};
|
||||
struct DdIo in = {
|
||||
.bsz = 512, /* Block size is by default 512 bytes */
|
||||
@@ -5020,6 +5037,7 @@ static int img_dd(int argc, char **argv)
|
||||
@@ -5128,6 +5145,7 @@ static int img_dd(int argc, char **argv)
|
||||
{ "of", img_dd_of, C_OF },
|
||||
{ "skip", img_dd_skip, C_SKIP },
|
||||
{ "osize", img_dd_osize, C_OSIZE },
|
||||
|
@ -77,7 +77,7 @@ index c584de648c..a57ceeddfe 100644
|
|||
{ NULL, NULL, 0 }
|
||||
};
|
||||
const struct option long_options[] = {
|
||||
@@ -5216,9 +5234,10 @@ static int img_dd(int argc, char **argv)
|
||||
@@ -5324,9 +5342,10 @@ static int img_dd(int argc, char **argv)
|
||||
|
||||
in.buf = g_new(uint8_t, in.bsz);
|
||||
|
||||
|
@ -90,7 +90,7 @@ index c584de648c..a57ceeddfe 100644
|
|||
if (blk1) {
|
||||
in_ret = blk_pread(blk1, in_pos, bytes, in.buf, 0);
|
||||
if (in_ret == 0) {
|
||||
@@ -5227,6 +5246,9 @@ static int img_dd(int argc, char **argv)
|
||||
@@ -5335,6 +5354,9 @@ static int img_dd(int argc, char **argv)
|
||||
} else {
|
||||
in_ret = read(STDIN_FILENO, in.buf, bytes);
|
||||
if (in_ret == 0) {
|
||||
|
|
|
@ -13,10 +13,10 @@ Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
|||
3 files changed, 26 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/docs/tools/qemu-img.rst b/docs/tools/qemu-img.rst
|
||||
index 15aeddc6d8..5e713e231d 100644
|
||||
index 3653adb963..d83e8fb3c0 100644
|
||||
--- a/docs/tools/qemu-img.rst
|
||||
+++ b/docs/tools/qemu-img.rst
|
||||
@@ -208,6 +208,10 @@ Parameters to convert subcommand:
|
||||
@@ -212,6 +212,10 @@ Parameters to convert subcommand:
|
||||
|
||||
Parameters to dd subcommand:
|
||||
|
||||
|
@ -27,7 +27,7 @@ index 15aeddc6d8..5e713e231d 100644
|
|||
.. program:: qemu-img-dd
|
||||
|
||||
.. option:: bs=BLOCK_SIZE
|
||||
@@ -488,7 +492,7 @@ Command description:
|
||||
@@ -492,7 +496,7 @@ Command description:
|
||||
it doesn't need to be specified separately in this case.
|
||||
|
||||
|
||||
|
@ -36,7 +36,7 @@ index 15aeddc6d8..5e713e231d 100644
|
|||
|
||||
dd copies from *INPUT* file to *OUTPUT* file converting it from
|
||||
*FMT* format to *OUTPUT_FMT* format.
|
||||
@@ -499,6 +503,11 @@ Command description:
|
||||
@@ -503,6 +507,11 @@ Command description:
|
||||
|
||||
The size syntax is similar to :manpage:`dd(1)`'s size syntax.
|
||||
|
||||
|
@ -49,10 +49,10 @@ index 15aeddc6d8..5e713e231d 100644
|
|||
|
||||
Give information about the disk image *FILENAME*. Use it in
|
||||
diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx
|
||||
index d1616c045a..b5b0bb4467 100644
|
||||
index 048788b23d..0b29a67a06 100644
|
||||
--- a/qemu-img-cmds.hx
|
||||
+++ b/qemu-img-cmds.hx
|
||||
@@ -58,9 +58,9 @@ SRST
|
||||
@@ -60,9 +60,9 @@ SRST
|
||||
ERST
|
||||
|
||||
DEF("dd", img_dd,
|
||||
|
@ -65,10 +65,10 @@ index d1616c045a..b5b0bb4467 100644
|
|||
|
||||
DEF("info", img_info,
|
||||
diff --git a/qemu-img.c b/qemu-img.c
|
||||
index a57ceeddfe..06d814e39c 100644
|
||||
index b98184bba1..6fc8384f64 100644
|
||||
--- a/qemu-img.c
|
||||
+++ b/qemu-img.c
|
||||
@@ -5010,7 +5010,7 @@ static int img_dd(int argc, char **argv)
|
||||
@@ -5118,7 +5118,7 @@ static int img_dd(int argc, char **argv)
|
||||
const char *fmt = NULL;
|
||||
int64_t size = 0, readsize = 0;
|
||||
int64_t out_pos, in_pos;
|
||||
|
@ -77,7 +77,7 @@ index a57ceeddfe..06d814e39c 100644
|
|||
struct DdInfo dd = {
|
||||
.flags = 0,
|
||||
.count = 0,
|
||||
@@ -5048,7 +5048,7 @@ static int img_dd(int argc, char **argv)
|
||||
@@ -5156,7 +5156,7 @@ static int img_dd(int argc, char **argv)
|
||||
{ 0, 0, 0, 0 }
|
||||
};
|
||||
|
||||
|
@ -86,7 +86,7 @@ index a57ceeddfe..06d814e39c 100644
|
|||
if (c == EOF) {
|
||||
break;
|
||||
}
|
||||
@@ -5068,6 +5068,9 @@ static int img_dd(int argc, char **argv)
|
||||
@@ -5176,6 +5176,9 @@ static int img_dd(int argc, char **argv)
|
||||
case 'h':
|
||||
help();
|
||||
break;
|
||||
|
@ -96,7 +96,7 @@ index a57ceeddfe..06d814e39c 100644
|
|||
case 'U':
|
||||
force_share = true;
|
||||
break;
|
||||
@@ -5198,13 +5201,15 @@ static int img_dd(int argc, char **argv)
|
||||
@@ -5306,13 +5309,15 @@ static int img_dd(int argc, char **argv)
|
||||
size - in.bsz * in.offset, &error_abort);
|
||||
}
|
||||
|
||||
|
|
|
@ -12,10 +12,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|||
3 files changed, 36 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/docs/tools/qemu-img.rst b/docs/tools/qemu-img.rst
|
||||
index 5e713e231d..9390d5e5cf 100644
|
||||
index d83e8fb3c0..61c6b21859 100644
|
||||
--- a/docs/tools/qemu-img.rst
|
||||
+++ b/docs/tools/qemu-img.rst
|
||||
@@ -492,10 +492,10 @@ Command description:
|
||||
@@ -496,10 +496,10 @@ Command description:
|
||||
it doesn't need to be specified separately in this case.
|
||||
|
||||
|
||||
|
@ -30,10 +30,10 @@ index 5e713e231d..9390d5e5cf 100644
|
|||
The data is by default read and written using blocks of 512 bytes but can be
|
||||
modified by specifying *BLOCK_SIZE*. If count=\ *BLOCKS* is specified
|
||||
diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx
|
||||
index b5b0bb4467..36f97e1f19 100644
|
||||
index 0b29a67a06..758f397232 100644
|
||||
--- a/qemu-img-cmds.hx
|
||||
+++ b/qemu-img-cmds.hx
|
||||
@@ -58,9 +58,9 @@ SRST
|
||||
@@ -60,9 +60,9 @@ SRST
|
||||
ERST
|
||||
|
||||
DEF("dd", img_dd,
|
||||
|
@ -46,10 +46,10 @@ index b5b0bb4467..36f97e1f19 100644
|
|||
|
||||
DEF("info", img_info,
|
||||
diff --git a/qemu-img.c b/qemu-img.c
|
||||
index 06d814e39c..e2c06c496d 100644
|
||||
index 6fc8384f64..a6c88e0860 100644
|
||||
--- a/qemu-img.c
|
||||
+++ b/qemu-img.c
|
||||
@@ -5002,6 +5002,7 @@ static int img_dd(int argc, char **argv)
|
||||
@@ -5110,6 +5110,7 @@ static int img_dd(int argc, char **argv)
|
||||
BlockDriver *drv = NULL, *proto_drv = NULL;
|
||||
BlockBackend *blk1 = NULL, *blk2 = NULL;
|
||||
QemuOpts *opts = NULL;
|
||||
|
@ -57,7 +57,7 @@ index 06d814e39c..e2c06c496d 100644
|
|||
QemuOptsList *create_opts = NULL;
|
||||
Error *local_err = NULL;
|
||||
bool image_opts = false;
|
||||
@@ -5011,6 +5012,7 @@ static int img_dd(int argc, char **argv)
|
||||
@@ -5119,6 +5120,7 @@ static int img_dd(int argc, char **argv)
|
||||
int64_t size = 0, readsize = 0;
|
||||
int64_t out_pos, in_pos;
|
||||
bool force_share = false, skip_create = false;
|
||||
|
@ -65,7 +65,7 @@ index 06d814e39c..e2c06c496d 100644
|
|||
struct DdInfo dd = {
|
||||
.flags = 0,
|
||||
.count = 0,
|
||||
@@ -5048,7 +5050,7 @@ static int img_dd(int argc, char **argv)
|
||||
@@ -5156,7 +5158,7 @@ static int img_dd(int argc, char **argv)
|
||||
{ 0, 0, 0, 0 }
|
||||
};
|
||||
|
||||
|
@ -74,7 +74,7 @@ index 06d814e39c..e2c06c496d 100644
|
|||
if (c == EOF) {
|
||||
break;
|
||||
}
|
||||
@@ -5071,6 +5073,19 @@ static int img_dd(int argc, char **argv)
|
||||
@@ -5179,6 +5181,19 @@ static int img_dd(int argc, char **argv)
|
||||
case 'n':
|
||||
skip_create = true;
|
||||
break;
|
||||
|
@ -94,7 +94,7 @@ index 06d814e39c..e2c06c496d 100644
|
|||
case 'U':
|
||||
force_share = true;
|
||||
break;
|
||||
@@ -5130,11 +5145,24 @@ static int img_dd(int argc, char **argv)
|
||||
@@ -5238,11 +5253,24 @@ static int img_dd(int argc, char **argv)
|
||||
if (dd.flags & C_IF) {
|
||||
blk1 = img_open(image_opts, in.filename, fmt, 0, false, false,
|
||||
force_share);
|
||||
|
@ -120,7 +120,7 @@ index 06d814e39c..e2c06c496d 100644
|
|||
}
|
||||
|
||||
if (dd.flags & C_OSIZE) {
|
||||
@@ -5289,6 +5317,7 @@ static int img_dd(int argc, char **argv)
|
||||
@@ -5397,6 +5425,7 @@ static int img_dd(int argc, char **argv)
|
||||
out:
|
||||
g_free(arg);
|
||||
qemu_opts_del(opts);
|
||||
|
|
|
@ -18,10 +18,10 @@ Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
|||
4 files changed, 82 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/hw/core/machine-hmp-cmds.c b/hw/core/machine-hmp-cmds.c
|
||||
index c3e55ef9e9..0e32e6201f 100644
|
||||
index a6ff6a4875..e7f74d1c63 100644
|
||||
--- a/hw/core/machine-hmp-cmds.c
|
||||
+++ b/hw/core/machine-hmp-cmds.c
|
||||
@@ -169,7 +169,35 @@ void hmp_info_balloon(Monitor *mon, const QDict *qdict)
|
||||
@@ -175,7 +175,35 @@ void hmp_info_balloon(Monitor *mon, const QDict *qdict)
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -59,10 +59,10 @@ index c3e55ef9e9..0e32e6201f 100644
|
|||
qapi_free_BalloonInfo(info);
|
||||
}
|
||||
diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
|
||||
index 746f07c4d2..a41854b902 100644
|
||||
index 609e39a821..8cb6dfcac3 100644
|
||||
--- a/hw/virtio/virtio-balloon.c
|
||||
+++ b/hw/virtio/virtio-balloon.c
|
||||
@@ -804,8 +804,37 @@ static uint64_t virtio_balloon_get_features(VirtIODevice *vdev, uint64_t f,
|
||||
@@ -781,8 +781,37 @@ static uint64_t virtio_balloon_get_features(VirtIODevice *vdev, uint64_t f,
|
||||
static void virtio_balloon_stat(void *opaque, BalloonInfo *info)
|
||||
{
|
||||
VirtIOBalloon *dev = opaque;
|
||||
|
@ -103,12 +103,12 @@ index 746f07c4d2..a41854b902 100644
|
|||
|
||||
static void virtio_balloon_to_target(void *opaque, ram_addr_t target)
|
||||
diff --git a/qapi/machine.json b/qapi/machine.json
|
||||
index 604b686e59..15f5f86683 100644
|
||||
index e8b60641f2..2054cdc70d 100644
|
||||
--- a/qapi/machine.json
|
||||
+++ b/qapi/machine.json
|
||||
@@ -1056,9 +1056,29 @@
|
||||
# @actual: the logical size of the VM in bytes
|
||||
# Formula used: logical_vm_size = vm_ram_size - balloon_size
|
||||
@@ -1079,9 +1079,29 @@
|
||||
# @actual: the logical size of the VM in bytes Formula used:
|
||||
# logical_vm_size = vm_ram_size - balloon_size
|
||||
#
|
||||
+# @last_update: time when stats got updated from guest
|
||||
+#
|
||||
|
@ -138,10 +138,10 @@ index 604b686e59..15f5f86683 100644
|
|||
##
|
||||
# @query-balloon:
|
||||
diff --git a/qapi/pragma.json b/qapi/pragma.json
|
||||
index 7f810b0e97..325e684411 100644
|
||||
index 59fbe74b8c..be8fa304c5 100644
|
||||
--- a/qapi/pragma.json
|
||||
+++ b/qapi/pragma.json
|
||||
@@ -35,6 +35,7 @@
|
||||
@@ -90,6 +90,7 @@
|
||||
'member-name-exceptions': [ # visible in:
|
||||
'ACPISlotType', # query-acpi-ospm-status
|
||||
'AcpiTableOptions', # -acpitable
|
||||
|
|
|
@ -13,10 +13,10 @@ Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
|
|||
2 files changed, 9 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c
|
||||
index b98ff15089..24595f618c 100644
|
||||
index 4b72009cd3..314351cdff 100644
|
||||
--- a/hw/core/machine-qmp-cmds.c
|
||||
+++ b/hw/core/machine-qmp-cmds.c
|
||||
@@ -103,6 +103,12 @@ MachineInfoList *qmp_query_machines(Error **errp)
|
||||
@@ -90,6 +90,12 @@ MachineInfoList *qmp_query_machines(Error **errp)
|
||||
info->numa_mem_supported = mc->numa_mem_supported;
|
||||
info->deprecated = !!mc->deprecation_reason;
|
||||
info->acpi = !!object_class_property_find(OBJECT_CLASS(mc), "acpi");
|
||||
|
@ -30,19 +30,19 @@ index b98ff15089..24595f618c 100644
|
|||
info->default_cpu_type = g_strdup(mc->default_cpu_type);
|
||||
}
|
||||
diff --git a/qapi/machine.json b/qapi/machine.json
|
||||
index 15f5f86683..c904280085 100644
|
||||
index 2054cdc70d..a024d5b05d 100644
|
||||
--- a/qapi/machine.json
|
||||
+++ b/qapi/machine.json
|
||||
@@ -138,6 +138,8 @@
|
||||
@@ -146,6 +146,8 @@
|
||||
#
|
||||
# @is-default: whether the machine is default
|
||||
#
|
||||
+# @is-current: whether this machine is currently used
|
||||
+#
|
||||
# @cpu-max: maximum number of CPUs supported by the machine type
|
||||
# (since 1.5)
|
||||
# (since 1.5)
|
||||
#
|
||||
@@ -161,7 +163,7 @@
|
||||
@@ -170,7 +172,7 @@
|
||||
##
|
||||
{ 'struct': 'MachineInfo',
|
||||
'data': { 'name': 'str', '*alias': 'str',
|
||||
|
|
|
@ -14,10 +14,10 @@ Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
|||
2 files changed, 7 insertions(+)
|
||||
|
||||
diff --git a/qapi/ui.json b/qapi/ui.json
|
||||
index 98322342f7..316d4dc933 100644
|
||||
index f610bce118..6ea26a9acb 100644
|
||||
--- a/qapi/ui.json
|
||||
+++ b/qapi/ui.json
|
||||
@@ -310,11 +310,14 @@
|
||||
@@ -314,11 +314,14 @@
|
||||
#
|
||||
# @channels: a list of @SpiceChannel for each active spice channel
|
||||
#
|
||||
|
@ -33,7 +33,7 @@ index 98322342f7..316d4dc933 100644
|
|||
'if': 'CONFIG_SPICE' }
|
||||
|
||||
diff --git a/ui/spice-core.c b/ui/spice-core.c
|
||||
index b20c25aee0..26baeb7846 100644
|
||||
index ea20e6153c..55a15fba8b 100644
|
||||
--- a/ui/spice-core.c
|
||||
+++ b/ui/spice-core.c
|
||||
@@ -548,6 +548,10 @@ static SpiceInfo *qmp_query_spice_real(Error **errp)
|
||||
|
|
|
@ -14,20 +14,21 @@ Additionally, allows tracking the current position from the outside
|
|||
(intended to be used for progress tracking).
|
||||
|
||||
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
---
|
||||
migration/channel-savevm-async.c | 183 +++++++++++++++++++++++++++++++
|
||||
migration/channel-savevm-async.c | 184 +++++++++++++++++++++++++++++++
|
||||
migration/channel-savevm-async.h | 51 +++++++++
|
||||
migration/meson.build | 1 +
|
||||
3 files changed, 235 insertions(+)
|
||||
3 files changed, 236 insertions(+)
|
||||
create mode 100644 migration/channel-savevm-async.c
|
||||
create mode 100644 migration/channel-savevm-async.h
|
||||
|
||||
diff --git a/migration/channel-savevm-async.c b/migration/channel-savevm-async.c
|
||||
new file mode 100644
|
||||
index 0000000000..aab081ce07
|
||||
index 0000000000..081a192f49
|
||||
--- /dev/null
|
||||
+++ b/migration/channel-savevm-async.c
|
||||
@@ -0,0 +1,183 @@
|
||||
@@ -0,0 +1,184 @@
|
||||
+/*
|
||||
+ * QIO Channel implementation to be used by savevm-async QMP calls
|
||||
+ */
|
||||
|
@ -174,8 +175,9 @@ index 0000000000..aab081ce07
|
|||
+
|
||||
+static void
|
||||
+qio_channel_savevm_async_set_aio_fd_handler(QIOChannel *ioc,
|
||||
+ AioContext *ctx,
|
||||
+ AioContext *read_ctx,
|
||||
+ IOHandler *io_read,
|
||||
+ AioContext *write_ctx,
|
||||
+ IOHandler *io_write,
|
||||
+ void *opaque)
|
||||
+{
|
||||
|
@ -269,14 +271,14 @@ index 0000000000..17ae2cb261
|
|||
+
|
||||
+#endif /* QIO_CHANNEL_SAVEVM_ASYNC_H */
|
||||
diff --git a/migration/meson.build b/migration/meson.build
|
||||
index 0d1bb9f96e..8a142fc7a9 100644
|
||||
index 1eeb915ff6..95d1cf2250 100644
|
||||
--- a/migration/meson.build
|
||||
+++ b/migration/meson.build
|
||||
@@ -13,6 +13,7 @@ softmmu_ss.add(files(
|
||||
@@ -13,6 +13,7 @@ system_ss.add(files(
|
||||
'block-dirty-bitmap.c',
|
||||
'channel.c',
|
||||
'channel-block.c',
|
||||
+ 'channel-savevm-async.c',
|
||||
'colo-failover.c',
|
||||
'colo.c',
|
||||
'dirtyrate.c',
|
||||
'exec.c',
|
||||
'fd.c',
|
||||
|
|
|
@ -27,7 +27,7 @@ Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
|
|||
[FE: further improve aborting
|
||||
adapt to removal of QEMUFileOps
|
||||
improve condition for entering final stage
|
||||
adapt to QAPI and other changes for 8.0]
|
||||
adapt to QAPI and other changes for 8.2]
|
||||
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
---
|
||||
hmp-commands-info.hx | 13 +
|
||||
|
@ -35,20 +35,20 @@ Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
|||
include/migration/snapshot.h | 2 +
|
||||
include/monitor/hmp.h | 3 +
|
||||
migration/meson.build | 1 +
|
||||
migration/savevm-async.c | 533 +++++++++++++++++++++++++++++++++++
|
||||
migration/savevm-async.c | 531 +++++++++++++++++++++++++++++++++++
|
||||
monitor/hmp-cmds.c | 38 +++
|
||||
qapi/migration.json | 34 +++
|
||||
qapi/misc.json | 16 ++
|
||||
qapi/misc.json | 18 ++
|
||||
qemu-options.hx | 12 +
|
||||
softmmu/vl.c | 10 +
|
||||
system/vl.c | 10 +
|
||||
11 files changed, 679 insertions(+)
|
||||
create mode 100644 migration/savevm-async.c
|
||||
|
||||
diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx
|
||||
index 47d63d26db..a166bff3d5 100644
|
||||
index ad1b1306e3..d5ab880492 100644
|
||||
--- a/hmp-commands-info.hx
|
||||
+++ b/hmp-commands-info.hx
|
||||
@@ -540,6 +540,19 @@ SRST
|
||||
@@ -525,6 +525,19 @@ SRST
|
||||
Show current migration parameters.
|
||||
ERST
|
||||
|
||||
|
@ -69,10 +69,10 @@ index 47d63d26db..a166bff3d5 100644
|
|||
.name = "balloon",
|
||||
.args_type = "",
|
||||
diff --git a/hmp-commands.hx b/hmp-commands.hx
|
||||
index bb85ee1d26..d9f9f42d11 100644
|
||||
index 2e2a3bcf98..7506de251c 100644
|
||||
--- a/hmp-commands.hx
|
||||
+++ b/hmp-commands.hx
|
||||
@@ -1846,3 +1846,20 @@ SRST
|
||||
@@ -1862,3 +1862,20 @@ SRST
|
||||
List event channels in the guest
|
||||
ERST
|
||||
#endif
|
||||
|
@ -94,18 +94,18 @@ index bb85ee1d26..d9f9f42d11 100644
|
|||
+ .coroutine = true,
|
||||
+ },
|
||||
diff --git a/include/migration/snapshot.h b/include/migration/snapshot.h
|
||||
index e72083b117..c846d37806 100644
|
||||
index 9e4dcaaa75..2581730d74 100644
|
||||
--- a/include/migration/snapshot.h
|
||||
+++ b/include/migration/snapshot.h
|
||||
@@ -61,4 +61,6 @@ bool delete_snapshot(const char *name,
|
||||
bool has_devices, strList *devices,
|
||||
Error **errp);
|
||||
@@ -68,4 +68,6 @@ bool delete_snapshot(const char *name,
|
||||
*/
|
||||
void load_snapshot_resume(RunState state);
|
||||
|
||||
+int load_snapshot_from_blockdev(const char *filename, Error **errp);
|
||||
+
|
||||
#endif
|
||||
diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h
|
||||
index fdb69b7f9c..fdf6b45fb8 100644
|
||||
index 13f9a2dedb..7a7def7530 100644
|
||||
--- a/include/monitor/hmp.h
|
||||
+++ b/include/monitor/hmp.h
|
||||
@@ -28,6 +28,7 @@ void hmp_info_status(Monitor *mon, const QDict *qdict);
|
||||
|
@ -126,11 +126,11 @@ index fdb69b7f9c..fdf6b45fb8 100644
|
|||
void coroutine_fn hmp_screendump(Monitor *mon, const QDict *qdict);
|
||||
void hmp_chardev_add(Monitor *mon, const QDict *qdict);
|
||||
diff --git a/migration/meson.build b/migration/meson.build
|
||||
index 8a142fc7a9..a7824b5266 100644
|
||||
index 95d1cf2250..800f12a60d 100644
|
||||
--- a/migration/meson.build
|
||||
+++ b/migration/meson.build
|
||||
@@ -25,6 +25,7 @@ softmmu_ss.add(files(
|
||||
'multifd-zlib.c',
|
||||
@@ -28,6 +28,7 @@ system_ss.add(files(
|
||||
'options.c',
|
||||
'postcopy-ram.c',
|
||||
'savevm.c',
|
||||
+ 'savevm-async.c',
|
||||
|
@ -139,13 +139,15 @@ index 8a142fc7a9..a7824b5266 100644
|
|||
'threadinfo.c',
|
||||
diff --git a/migration/savevm-async.c b/migration/savevm-async.c
|
||||
new file mode 100644
|
||||
index 0000000000..ac1fac6378
|
||||
index 0000000000..779e4e2a78
|
||||
--- /dev/null
|
||||
+++ b/migration/savevm-async.c
|
||||
@@ -0,0 +1,533 @@
|
||||
@@ -0,0 +1,531 @@
|
||||
+#include "qemu/osdep.h"
|
||||
+#include "migration/channel-savevm-async.h"
|
||||
+#include "migration/migration.h"
|
||||
+#include "migration/migration-stats.h"
|
||||
+#include "migration/options.h"
|
||||
+#include "migration/savevm.h"
|
||||
+#include "migration/snapshot.h"
|
||||
+#include "migration/global_state.h"
|
||||
|
@ -275,7 +277,7 @@ index 0000000000..ac1fac6378
|
|||
+ return ret;
|
||||
+}
|
||||
+
|
||||
+static void save_snapshot_error(const char *fmt, ...)
|
||||
+static void G_GNUC_PRINTF(1, 2) save_snapshot_error(const char *fmt, ...)
|
||||
+{
|
||||
+ va_list ap;
|
||||
+ char *msg;
|
||||
|
@ -298,7 +300,6 @@ index 0000000000..ac1fac6378
|
|||
+static void process_savevm_finalize(void *opaque)
|
||||
+{
|
||||
+ int ret;
|
||||
+ AioContext *iohandler_ctx = iohandler_get_aio_context();
|
||||
+ MigrationState *ms = migrate_get_current();
|
||||
+
|
||||
+ bool aborted = savevm_aborted();
|
||||
|
@ -315,9 +316,7 @@ index 0000000000..ac1fac6378
|
|||
+ * so move it back. It can stay in the main context and live out its live
|
||||
+ * there, since we're done with it after this method ends anyway.
|
||||
+ */
|
||||
+ aio_context_acquire(iohandler_ctx);
|
||||
+ blk_set_aio_context(snap_state.target, qemu_get_aio_context(), NULL);
|
||||
+ aio_context_release(iohandler_ctx);
|
||||
+
|
||||
+ ret = vm_stop_force_state(RUN_STATE_FINISH_MIGRATE);
|
||||
+ if (ret < 0) {
|
||||
|
@ -394,12 +393,12 @@ index 0000000000..ac1fac6378
|
|||
+ * lock. Similar to what is done in migration.c, call the exact variant
|
||||
+ * only once pend_precopy in the estimate is below the threshold.
|
||||
+ */
|
||||
+ qemu_mutex_unlock_iothread();
|
||||
+ bql_unlock();
|
||||
+ qemu_savevm_state_pending_estimate(&pend_precopy, &pend_postcopy);
|
||||
+ if (pend_precopy <= threshold) {
|
||||
+ qemu_savevm_state_pending_exact(&pend_precopy, &pend_postcopy);
|
||||
+ }
|
||||
+ qemu_mutex_lock_iothread();
|
||||
+ bql_lock();
|
||||
+ pending_size = pend_precopy + pend_postcopy;
|
||||
+
|
||||
+ /*
|
||||
|
@ -420,11 +419,7 @@ index 0000000000..ac1fac6378
|
|||
+ DPRINTF("savevm iterate pending size %lu ret %d\n", pending_size, ret);
|
||||
+ } else {
|
||||
+ qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER, NULL);
|
||||
+ ret = global_state_store();
|
||||
+ if (ret) {
|
||||
+ save_snapshot_error("global_state_store error %d", ret);
|
||||
+ break;
|
||||
+ }
|
||||
+ global_state_store();
|
||||
+
|
||||
+ DPRINTF("savevm iterate complete\n");
|
||||
+ break;
|
||||
|
@ -443,21 +438,25 @@ index 0000000000..ac1fac6378
|
|||
+ * so move there now and after every flush.
|
||||
+ */
|
||||
+ aio_co_reschedule_self(qemu_get_aio_context());
|
||||
+ for (bs = bdrv_first(&it); bs; bs = bdrv_next(&it)) {
|
||||
+ bdrv_graph_co_rdlock();
|
||||
+ bs = bdrv_first(&it);
|
||||
+ bdrv_graph_co_rdunlock();
|
||||
+ while (bs) {
|
||||
+ /* target has BDRV_O_NO_FLUSH, no sense calling bdrv_flush on it */
|
||||
+ if (bs == blk_bs(snap_state.target)) {
|
||||
+ continue;
|
||||
+ }
|
||||
+
|
||||
+ AioContext *bs_ctx = bdrv_get_aio_context(bs);
|
||||
+ if (bs_ctx != qemu_get_aio_context()) {
|
||||
+ DPRINTF("savevm: async flushing drive %s\n", bs->filename);
|
||||
+ aio_co_reschedule_self(bs_ctx);
|
||||
+ bdrv_graph_co_rdlock();
|
||||
+ bdrv_flush(bs);
|
||||
+ bdrv_graph_co_rdunlock();
|
||||
+ aio_co_reschedule_self(qemu_get_aio_context());
|
||||
+ if (bs != blk_bs(snap_state.target)) {
|
||||
+ AioContext *bs_ctx = bdrv_get_aio_context(bs);
|
||||
+ if (bs_ctx != qemu_get_aio_context()) {
|
||||
+ DPRINTF("savevm: async flushing drive %s\n", bs->filename);
|
||||
+ aio_co_reschedule_self(bs_ctx);
|
||||
+ bdrv_graph_co_rdlock();
|
||||
+ bdrv_flush(bs);
|
||||
+ bdrv_graph_co_rdunlock();
|
||||
+ aio_co_reschedule_self(qemu_get_aio_context());
|
||||
+ }
|
||||
+ }
|
||||
+ bdrv_graph_co_rdlock();
|
||||
+ bs = bdrv_next(&it);
|
||||
+ bdrv_graph_co_rdunlock();
|
||||
+ }
|
||||
+
|
||||
+ DPRINTF("timing: async flushing took %ld ms\n",
|
||||
|
@ -480,12 +479,12 @@ index 0000000000..ac1fac6378
|
|||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ if (migration_is_running(ms->state)) {
|
||||
+ if (migration_is_running()) {
|
||||
+ error_set(errp, ERROR_CLASS_GENERIC_ERROR, QERR_MIGRATION_ACTIVE);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ if (migrate_use_block()) {
|
||||
+ if (migrate_block()) {
|
||||
+ error_set(errp, ERROR_CLASS_GENERIC_ERROR,
|
||||
+ "Block migration and snapshots are incompatible");
|
||||
+ return;
|
||||
|
@ -537,9 +536,10 @@ index 0000000000..ac1fac6378
|
|||
+ * State is cleared in process_savevm_co, but has to be initialized
|
||||
+ * here (blocking main thread, from QMP) to avoid race conditions.
|
||||
+ */
|
||||
+ migrate_init(ms);
|
||||
+ memset(&ram_counters, 0, sizeof(ram_counters));
|
||||
+ memset(&compression_counters, 0, sizeof(compression_counters));
|
||||
+ if (migrate_init(ms, errp)) {
|
||||
+ return;
|
||||
+ }
|
||||
+ memset(&mig_stats, 0, sizeof(mig_stats));
|
||||
+ ms->to_dst_file = snap_state.file;
|
||||
+
|
||||
+ error_setg(&snap_state.blocker, "block device is in use by savevm");
|
||||
|
@ -548,10 +548,8 @@ index 0000000000..ac1fac6378
|
|||
+ snap_state.state = SAVE_STATE_ACTIVE;
|
||||
+ snap_state.finalize_bh = qemu_bh_new(process_savevm_finalize, &snap_state);
|
||||
+ snap_state.co = qemu_coroutine_create(&process_savevm_co, NULL);
|
||||
+ qemu_mutex_unlock_iothread();
|
||||
+ qemu_savevm_state_header(snap_state.file);
|
||||
+ qemu_savevm_state_setup(snap_state.file);
|
||||
+ qemu_mutex_lock_iothread();
|
||||
+
|
||||
+ /* Async processing from here on out happens in iohandler context, so let
|
||||
+ * the target bdrv have its home there.
|
||||
|
@ -677,7 +675,7 @@ index 0000000000..ac1fac6378
|
|||
+ return ret;
|
||||
+}
|
||||
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
|
||||
index 6c559b48c8..91be698308 100644
|
||||
index 871898ac46..ef4634e5c1 100644
|
||||
--- a/monitor/hmp-cmds.c
|
||||
+++ b/monitor/hmp-cmds.c
|
||||
@@ -22,6 +22,7 @@
|
||||
|
@ -687,7 +685,7 @@ index 6c559b48c8..91be698308 100644
|
|||
+#include "qapi/qapi-commands-migration.h"
|
||||
#include "qapi/qapi-commands-misc.h"
|
||||
#include "qapi/qmp/qdict.h"
|
||||
#include "qapi/qmp/qerror.h"
|
||||
#include "qemu/cutils.h"
|
||||
@@ -443,3 +444,40 @@ void hmp_info_mtree(Monitor *mon, const QDict *qdict)
|
||||
|
||||
mtree_info(flatview, dispatch_tree, owner, disabled);
|
||||
|
@ -730,12 +728,12 @@ index 6c559b48c8..91be698308 100644
|
|||
+ }
|
||||
+}
|
||||
diff --git a/qapi/migration.json b/qapi/migration.json
|
||||
index c84fa10e86..1702b92553 100644
|
||||
index 8c65b90328..ed20d066cd 100644
|
||||
--- a/qapi/migration.json
|
||||
+++ b/qapi/migration.json
|
||||
@@ -261,6 +261,40 @@
|
||||
'*compression': 'CompressionStats',
|
||||
'*socket-address': ['SocketAddress'] } }
|
||||
@@ -297,6 +297,40 @@
|
||||
'*dirty-limit-throttle-time-per-round': 'uint64',
|
||||
'*dirty-limit-ring-full-time': 'uint64'} }
|
||||
|
||||
+##
|
||||
+# @SaveVMInfo:
|
||||
|
@ -775,10 +773,10 @@ index c84fa10e86..1702b92553 100644
|
|||
# @query-migrate:
|
||||
#
|
||||
diff --git a/qapi/misc.json b/qapi/misc.json
|
||||
index 6ddd16ea28..e5681ae8a2 100644
|
||||
index ec30e5c570..7147199a12 100644
|
||||
--- a/qapi/misc.json
|
||||
+++ b/qapi/misc.json
|
||||
@@ -469,6 +469,22 @@
|
||||
@@ -454,6 +454,24 @@
|
||||
##
|
||||
{ 'command': 'query-fdsets', 'returns': ['FdsetInfo'] }
|
||||
|
||||
|
@ -787,6 +785,8 @@ index 6ddd16ea28..e5681ae8a2 100644
|
|||
+#
|
||||
+# Prepare for snapshot and halt VM. Save VM state to statefile.
|
||||
+#
|
||||
+# @statefile: target file that state should be written to.
|
||||
+#
|
||||
+##
|
||||
+{ 'command': 'savevm-start', 'data': { '*statefile': 'str' } }
|
||||
+
|
||||
|
@ -802,10 +802,10 @@ index 6ddd16ea28..e5681ae8a2 100644
|
|||
# @CommandLineParameterType:
|
||||
#
|
||||
diff --git a/qemu-options.hx b/qemu-options.hx
|
||||
index fdddfab6ff..fdd551c2bb 100644
|
||||
index 8ce85d4559..511ab9415e 100644
|
||||
--- a/qemu-options.hx
|
||||
+++ b/qemu-options.hx
|
||||
@@ -4398,6 +4398,18 @@ SRST
|
||||
@@ -4610,6 +4610,18 @@ SRST
|
||||
Start right away with a saved state (``loadvm`` in monitor)
|
||||
ERST
|
||||
|
||||
|
@ -824,11 +824,11 @@ index fdddfab6ff..fdd551c2bb 100644
|
|||
#ifndef _WIN32
|
||||
DEF("daemonize", 0, QEMU_OPTION_daemonize, \
|
||||
"-daemonize daemonize QEMU after initializing\n", QEMU_ARCH_ALL)
|
||||
diff --git a/softmmu/vl.c b/softmmu/vl.c
|
||||
index ea20b23e4c..0eabc71b68 100644
|
||||
--- a/softmmu/vl.c
|
||||
+++ b/softmmu/vl.c
|
||||
@@ -164,6 +164,7 @@ static const char *accelerators;
|
||||
diff --git a/system/vl.c b/system/vl.c
|
||||
index c644222982..2738ab7c91 100644
|
||||
--- a/system/vl.c
|
||||
+++ b/system/vl.c
|
||||
@@ -163,6 +163,7 @@ static const char *accelerators;
|
||||
static bool have_custom_ram_size;
|
||||
static const char *ram_memdev_id;
|
||||
static QDict *machine_opts_dict;
|
||||
|
@ -836,10 +836,10 @@ index ea20b23e4c..0eabc71b68 100644
|
|||
static QTAILQ_HEAD(, ObjectOption) object_opts = QTAILQ_HEAD_INITIALIZER(object_opts);
|
||||
static QTAILQ_HEAD(, DeviceOption) device_opts = QTAILQ_HEAD_INITIALIZER(device_opts);
|
||||
static int display_remote;
|
||||
@@ -2612,6 +2613,12 @@ void qmp_x_exit_preconfig(Error **errp)
|
||||
|
||||
if (loadvm) {
|
||||
@@ -2712,6 +2713,12 @@ void qmp_x_exit_preconfig(Error **errp)
|
||||
RunState state = autostart ? RUN_STATE_RUNNING : runstate_get();
|
||||
load_snapshot(loadvm, NULL, false, NULL, &error_fatal);
|
||||
load_snapshot_resume(state);
|
||||
+ } else if (loadstate) {
|
||||
+ Error *local_err = NULL;
|
||||
+ if (load_snapshot_from_blockdev(loadstate, &local_err) < 0) {
|
||||
|
@ -849,7 +849,7 @@ index ea20b23e4c..0eabc71b68 100644
|
|||
}
|
||||
if (replay_mode != REPLAY_MODE_NONE) {
|
||||
replay_vmstate_init();
|
||||
@@ -3159,6 +3166,9 @@ void qemu_init(int argc, char **argv)
|
||||
@@ -3259,6 +3266,9 @@ void qemu_init(int argc, char **argv)
|
||||
case QEMU_OPTION_loadvm:
|
||||
loadvm = optarg;
|
||||
break;
|
||||
|
|
|
@ -13,18 +13,18 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|||
[FE: adapt to removal of QEMUFileOps]
|
||||
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
---
|
||||
migration/qemu-file.c | 49 +++++++++++++++++++++++++++-------------
|
||||
migration/qemu-file.c | 50 +++++++++++++++++++++++++++-------------
|
||||
migration/qemu-file.h | 2 ++
|
||||
migration/savevm-async.c | 5 ++--
|
||||
3 files changed, 38 insertions(+), 18 deletions(-)
|
||||
3 files changed, 39 insertions(+), 18 deletions(-)
|
||||
|
||||
diff --git a/migration/qemu-file.c b/migration/qemu-file.c
|
||||
index 102ab3b439..5ced17aba4 100644
|
||||
index a10882d47f..19c1de0472 100644
|
||||
--- a/migration/qemu-file.c
|
||||
+++ b/migration/qemu-file.c
|
||||
@@ -31,8 +31,8 @@
|
||||
#include "trace.h"
|
||||
#include "qapi/error.h"
|
||||
@@ -35,8 +35,8 @@
|
||||
#include "rdma.h"
|
||||
#include "io/channel-file.h"
|
||||
|
||||
-#define IO_BUF_SIZE 32768
|
||||
-#define MAX_IOV_SIZE MIN_CONST(IOV_MAX, 64)
|
||||
|
@ -32,8 +32,8 @@ index 102ab3b439..5ced17aba4 100644
|
|||
+#define MAX_IOV_SIZE MIN_CONST(IOV_MAX, 256)
|
||||
|
||||
struct QEMUFile {
|
||||
const QEMUFileHooks *hooks;
|
||||
@@ -55,7 +55,8 @@ struct QEMUFile {
|
||||
QIOChannel *ioc;
|
||||
@@ -44,7 +44,8 @@ struct QEMUFile {
|
||||
|
||||
int buf_index;
|
||||
int buf_size; /* 0 when writing */
|
||||
|
@ -43,8 +43,8 @@ index 102ab3b439..5ced17aba4 100644
|
|||
|
||||
DECLARE_BITMAP(may_free, MAX_IOV_SIZE);
|
||||
struct iovec iov[MAX_IOV_SIZE];
|
||||
@@ -127,7 +128,9 @@ bool qemu_file_mode_is_not_valid(const char *mode)
|
||||
return false;
|
||||
@@ -101,7 +102,9 @@ int qemu_file_shutdown(QEMUFile *f)
|
||||
return 0;
|
||||
}
|
||||
|
||||
-static QEMUFile *qemu_file_new_impl(QIOChannel *ioc, bool is_writable)
|
||||
|
@ -54,7 +54,7 @@ index 102ab3b439..5ced17aba4 100644
|
|||
{
|
||||
QEMUFile *f;
|
||||
|
||||
@@ -136,6 +139,8 @@ static QEMUFile *qemu_file_new_impl(QIOChannel *ioc, bool is_writable)
|
||||
@@ -110,6 +113,8 @@ static QEMUFile *qemu_file_new_impl(QIOChannel *ioc, bool is_writable)
|
||||
object_ref(ioc);
|
||||
f->ioc = ioc;
|
||||
f->is_writable = is_writable;
|
||||
|
@ -63,7 +63,7 @@ index 102ab3b439..5ced17aba4 100644
|
|||
|
||||
return f;
|
||||
}
|
||||
@@ -146,17 +151,27 @@ static QEMUFile *qemu_file_new_impl(QIOChannel *ioc, bool is_writable)
|
||||
@@ -120,17 +125,27 @@ static QEMUFile *qemu_file_new_impl(QIOChannel *ioc, bool is_writable)
|
||||
*/
|
||||
QEMUFile *qemu_file_get_return_path(QEMUFile *f)
|
||||
{
|
||||
|
@ -93,8 +93,8 @@ index 102ab3b439..5ced17aba4 100644
|
|||
+ return qemu_file_new_impl(ioc, false, buffer_size);
|
||||
}
|
||||
|
||||
void qemu_file_set_hooks(QEMUFile *f, const QEMUFileHooks *hooks)
|
||||
@@ -414,7 +429,7 @@ static ssize_t qemu_fill_buffer(QEMUFile *f)
|
||||
/*
|
||||
@@ -328,7 +343,7 @@ static ssize_t coroutine_mixed_fn qemu_fill_buffer(QEMUFile *f)
|
||||
do {
|
||||
len = qio_channel_read(f->ioc,
|
||||
(char *)f->buf + pending,
|
||||
|
@ -103,16 +103,17 @@ index 102ab3b439..5ced17aba4 100644
|
|||
&local_error);
|
||||
if (len == QIO_CHANNEL_ERR_BLOCK) {
|
||||
if (qemu_in_coroutine()) {
|
||||
@@ -464,6 +479,8 @@ int qemu_fclose(QEMUFile *f)
|
||||
@@ -368,6 +383,9 @@ int qemu_fclose(QEMUFile *f)
|
||||
ret = ret2;
|
||||
}
|
||||
g_clear_pointer(&f->ioc, object_unref);
|
||||
|
||||
+
|
||||
+ free(f->buf);
|
||||
+
|
||||
/* If any error was spotted before closing, we should report it
|
||||
* instead of the close() return value.
|
||||
*/
|
||||
@@ -518,7 +535,7 @@ static void add_buf_to_iovec(QEMUFile *f, size_t len)
|
||||
error_free(f->last_error_obj);
|
||||
g_free(f);
|
||||
trace_qemu_file_fclose();
|
||||
@@ -416,7 +434,7 @@ static void add_buf_to_iovec(QEMUFile *f, size_t len)
|
||||
{
|
||||
if (!add_to_iovec(f, f->buf + f->buf_index, len, false)) {
|
||||
f->buf_index += len;
|
||||
|
@ -121,7 +122,7 @@ index 102ab3b439..5ced17aba4 100644
|
|||
qemu_fflush(f);
|
||||
}
|
||||
}
|
||||
@@ -544,7 +561,7 @@ void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, size_t size)
|
||||
@@ -441,7 +459,7 @@ void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, size_t size)
|
||||
}
|
||||
|
||||
while (size > 0) {
|
||||
|
@ -130,7 +131,7 @@ index 102ab3b439..5ced17aba4 100644
|
|||
if (l > size) {
|
||||
l = size;
|
||||
}
|
||||
@@ -591,8 +608,8 @@ size_t qemu_peek_buffer(QEMUFile *f, uint8_t **buf, size_t size, size_t offset)
|
||||
@@ -587,8 +605,8 @@ size_t coroutine_mixed_fn qemu_peek_buffer(QEMUFile *f, uint8_t **buf, size_t si
|
||||
size_t index;
|
||||
|
||||
assert(!qemu_file_is_writable(f));
|
||||
|
@ -141,7 +142,7 @@ index 102ab3b439..5ced17aba4 100644
|
|||
|
||||
/* The 1st byte to read from */
|
||||
index = f->buf_index + offset;
|
||||
@@ -642,7 +659,7 @@ size_t qemu_get_buffer(QEMUFile *f, uint8_t *buf, size_t size)
|
||||
@@ -638,7 +656,7 @@ size_t coroutine_mixed_fn qemu_get_buffer(QEMUFile *f, uint8_t *buf, size_t size
|
||||
size_t res;
|
||||
uint8_t *src;
|
||||
|
||||
|
@ -150,16 +151,16 @@ index 102ab3b439..5ced17aba4 100644
|
|||
if (res == 0) {
|
||||
return done;
|
||||
}
|
||||
@@ -676,7 +693,7 @@ size_t qemu_get_buffer(QEMUFile *f, uint8_t *buf, size_t size)
|
||||
@@ -672,7 +690,7 @@ size_t coroutine_mixed_fn qemu_get_buffer(QEMUFile *f, uint8_t *buf, size_t size
|
||||
*/
|
||||
size_t qemu_get_buffer_in_place(QEMUFile *f, uint8_t **buf, size_t size)
|
||||
size_t coroutine_mixed_fn qemu_get_buffer_in_place(QEMUFile *f, uint8_t **buf, size_t size)
|
||||
{
|
||||
- if (size < IO_BUF_SIZE) {
|
||||
+ if (size < f->buf_allocated_size) {
|
||||
size_t res;
|
||||
uint8_t *src = NULL;
|
||||
|
||||
@@ -701,7 +718,7 @@ int qemu_peek_byte(QEMUFile *f, int offset)
|
||||
@@ -697,7 +715,7 @@ int coroutine_mixed_fn qemu_peek_byte(QEMUFile *f, int offset)
|
||||
int index = f->buf_index + offset;
|
||||
|
||||
assert(!qemu_file_is_writable(f));
|
||||
|
@ -168,7 +169,7 @@ index 102ab3b439..5ced17aba4 100644
|
|||
|
||||
if (index >= f->buf_size) {
|
||||
qemu_fill_buffer(f);
|
||||
@@ -853,7 +870,7 @@ static int qemu_compress_data(z_stream *stream, uint8_t *dest, size_t dest_len,
|
||||
@@ -811,7 +829,7 @@ static int qemu_compress_data(z_stream *stream, uint8_t *dest, size_t dest_len,
|
||||
ssize_t qemu_put_compression_data(QEMUFile *f, z_stream *stream,
|
||||
const uint8_t *p, size_t size)
|
||||
{
|
||||
|
@ -178,24 +179,24 @@ index 102ab3b439..5ced17aba4 100644
|
|||
if (blen < compressBound(size)) {
|
||||
return -1;
|
||||
diff --git a/migration/qemu-file.h b/migration/qemu-file.h
|
||||
index 9d0155a2a1..cc06240e8d 100644
|
||||
index 32fd4a34fd..36a0cd8cc8 100644
|
||||
--- a/migration/qemu-file.h
|
||||
+++ b/migration/qemu-file.h
|
||||
@@ -63,7 +63,9 @@ typedef struct QEMUFileHooks {
|
||||
} QEMUFileHooks;
|
||||
@@ -30,7 +30,9 @@
|
||||
#include "io/channel.h"
|
||||
|
||||
QEMUFile *qemu_file_new_input(QIOChannel *ioc);
|
||||
+QEMUFile *qemu_file_new_input_sized(QIOChannel *ioc, size_t buffer_size);
|
||||
QEMUFile *qemu_file_new_output(QIOChannel *ioc);
|
||||
+QEMUFile *qemu_file_new_output_sized(QIOChannel *ioc, size_t buffer_size);
|
||||
void qemu_file_set_hooks(QEMUFile *f, const QEMUFileHooks *hooks);
|
||||
int qemu_fclose(QEMUFile *f);
|
||||
|
||||
/*
|
||||
diff --git a/migration/savevm-async.c b/migration/savevm-async.c
|
||||
index ac1fac6378..ea3b2f36a6 100644
|
||||
index 779e4e2a78..bf36fc06d2 100644
|
||||
--- a/migration/savevm-async.c
|
||||
+++ b/migration/savevm-async.c
|
||||
@@ -380,7 +380,7 @@ void qmp_savevm_start(const char *statefile, Error **errp)
|
||||
@@ -379,7 +379,7 @@ void qmp_savevm_start(const char *statefile, Error **errp)
|
||||
|
||||
QIOChannel *ioc = QIO_CHANNEL(qio_channel_savevm_async_new(snap_state.target,
|
||||
&snap_state.bs_pos));
|
||||
|
@ -204,7 +205,7 @@ index ac1fac6378..ea3b2f36a6 100644
|
|||
|
||||
if (!snap_state.file) {
|
||||
error_set(errp, ERROR_CLASS_GENERIC_ERROR, "failed to open '%s'", statefile);
|
||||
@@ -498,7 +498,8 @@ int load_snapshot_from_blockdev(const char *filename, Error **errp)
|
||||
@@ -496,7 +496,8 @@ int load_snapshot_from_blockdev(const char *filename, Error **errp)
|
||||
blk_op_block_all(be, blocker);
|
||||
|
||||
/* restore the VM state */
|
||||
|
|
|
@ -4,32 +4,33 @@ Date: Mon, 6 Apr 2020 12:16:47 +0200
|
|||
Subject: [PATCH] PVE: block: add the zeroinit block driver filter
|
||||
|
||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
[FE: adapt to changed function signatures]
|
||||
[FE: adapt to changed function signatures
|
||||
adhere to block graph lock requirements]
|
||||
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
---
|
||||
block/meson.build | 1 +
|
||||
block/zeroinit.c | 200 ++++++++++++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 201 insertions(+)
|
||||
block/zeroinit.c | 214 ++++++++++++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 215 insertions(+)
|
||||
create mode 100644 block/zeroinit.c
|
||||
|
||||
diff --git a/block/meson.build b/block/meson.build
|
||||
index 382bec0e7d..253fe49fa2 100644
|
||||
index e1f03fd773..b530e117b5 100644
|
||||
--- a/block/meson.build
|
||||
+++ b/block/meson.build
|
||||
@@ -44,6 +44,7 @@ block_ss.add(files(
|
||||
'vmdk.c',
|
||||
'vpc.c',
|
||||
@@ -39,6 +39,7 @@ block_ss.add(files(
|
||||
'throttle.c',
|
||||
'throttle-groups.c',
|
||||
'write-threshold.c',
|
||||
+ 'zeroinit.c',
|
||||
), zstd, zlib, gnutls)
|
||||
|
||||
softmmu_ss.add(when: 'CONFIG_TCG', if_true: files('blkreplay.c'))
|
||||
system_ss.add(when: 'CONFIG_TCG', if_true: files('blkreplay.c'))
|
||||
diff --git a/block/zeroinit.c b/block/zeroinit.c
|
||||
new file mode 100644
|
||||
index 0000000000..1257342724
|
||||
index 0000000000..696558d8d6
|
||||
--- /dev/null
|
||||
+++ b/block/zeroinit.c
|
||||
@@ -0,0 +1,200 @@
|
||||
@@ -0,0 +1,214 @@
|
||||
+/*
|
||||
+ * Filter to fake a zero-initialized block device.
|
||||
+ *
|
||||
|
@ -44,6 +45,7 @@ index 0000000000..1257342724
|
|||
+#include "qapi/error.h"
|
||||
+#include "block/block_int.h"
|
||||
+#include "block/block-io.h"
|
||||
+#include "block/graph-lock.h"
|
||||
+#include "qapi/qmp/qdict.h"
|
||||
+#include "qapi/qmp/qstring.h"
|
||||
+#include "qemu/cutils.h"
|
||||
|
@ -94,6 +96,7 @@ index 0000000000..1257342724
|
|||
+ Error **errp)
|
||||
+{
|
||||
+ BDRVZeroinitState *s = bs->opaque;
|
||||
+ BdrvChild *file = NULL;
|
||||
+ QemuOpts *opts;
|
||||
+ Error *local_err = NULL;
|
||||
+ int ret;
|
||||
|
@ -109,10 +112,13 @@ index 0000000000..1257342724
|
|||
+ }
|
||||
+
|
||||
+ /* Open the raw file */
|
||||
+ bs->file = bdrv_open_child(qemu_opt_get(opts, "x-next"), options, "next",
|
||||
+ bs, &child_of_bds,
|
||||
+ BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY,
|
||||
+ false, &local_err);
|
||||
+ file = bdrv_open_child(qemu_opt_get(opts, "x-next"), options, "next", bs,
|
||||
+ &child_of_bds,
|
||||
+ BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY, false,
|
||||
+ &local_err);
|
||||
+ bdrv_graph_wrlock();
|
||||
+ bs->file = file;
|
||||
+ bdrv_graph_wrunlock();
|
||||
+ if (local_err) {
|
||||
+ ret = -EINVAL;
|
||||
+ error_propagate(errp, local_err);
|
||||
|
@ -125,7 +131,9 @@ index 0000000000..1257342724
|
|||
+ ret = 0;
|
||||
+fail:
|
||||
+ if (ret < 0) {
|
||||
+ bdrv_graph_wrlock();
|
||||
+ bdrv_unref_child(bs, bs->file);
|
||||
+ bdrv_graph_wrunlock();
|
||||
+ }
|
||||
+ qemu_opts_del(opts);
|
||||
+ return ret;
|
||||
|
@ -137,19 +145,22 @@ index 0000000000..1257342724
|
|||
+ (void)s;
|
||||
+}
|
||||
+
|
||||
+static coroutine_fn int64_t zeroinit_co_getlength(BlockDriverState *bs)
|
||||
+static coroutine_fn int64_t GRAPH_RDLOCK
|
||||
+zeroinit_co_getlength(BlockDriverState *bs)
|
||||
+{
|
||||
+ return bdrv_co_getlength(bs->file->bs);
|
||||
+}
|
||||
+
|
||||
+static int coroutine_fn zeroinit_co_preadv(BlockDriverState *bs,
|
||||
+ int64_t offset, int64_t bytes, QEMUIOVector *qiov, BdrvRequestFlags flags)
|
||||
+static int coroutine_fn GRAPH_RDLOCK
|
||||
+zeroinit_co_preadv(BlockDriverState *bs, int64_t offset, int64_t bytes,
|
||||
+ QEMUIOVector *qiov, BdrvRequestFlags flags)
|
||||
+{
|
||||
+ return bdrv_co_preadv(bs->file, offset, bytes, qiov, flags);
|
||||
+}
|
||||
+
|
||||
+static int coroutine_fn zeroinit_co_pwrite_zeroes(BlockDriverState *bs, int64_t offset,
|
||||
+ int64_t bytes, BdrvRequestFlags flags)
|
||||
+static int coroutine_fn GRAPH_RDLOCK
|
||||
+zeroinit_co_pwrite_zeroes(BlockDriverState *bs, int64_t offset, int64_t bytes,
|
||||
+ BdrvRequestFlags flags)
|
||||
+{
|
||||
+ BDRVZeroinitState *s = bs->opaque;
|
||||
+ if (offset >= s->extents)
|
||||
|
@ -157,8 +168,9 @@ index 0000000000..1257342724
|
|||
+ return bdrv_pwrite_zeroes(bs->file, offset, bytes, flags);
|
||||
+}
|
||||
+
|
||||
+static int coroutine_fn zeroinit_co_pwritev(BlockDriverState *bs,
|
||||
+ int64_t offset, int64_t bytes, QEMUIOVector *qiov, BdrvRequestFlags flags)
|
||||
+static int coroutine_fn GRAPH_RDLOCK
|
||||
+zeroinit_co_pwritev(BlockDriverState *bs, int64_t offset, int64_t bytes,
|
||||
+ QEMUIOVector *qiov, BdrvRequestFlags flags)
|
||||
+{
|
||||
+ BDRVZeroinitState *s = bs->opaque;
|
||||
+ int64_t extents = offset + bytes;
|
||||
|
@ -167,32 +179,35 @@ index 0000000000..1257342724
|
|||
+ return bdrv_co_pwritev(bs->file, offset, bytes, qiov, flags);
|
||||
+}
|
||||
+
|
||||
+static coroutine_fn int zeroinit_co_flush(BlockDriverState *bs)
|
||||
+static coroutine_fn int GRAPH_RDLOCK
|
||||
+zeroinit_co_flush(BlockDriverState *bs)
|
||||
+{
|
||||
+ return bdrv_co_flush(bs->file->bs);
|
||||
+}
|
||||
+
|
||||
+static int zeroinit_has_zero_init(BlockDriverState *bs)
|
||||
+static int GRAPH_RDLOCK
|
||||
+zeroinit_has_zero_init(BlockDriverState *bs)
|
||||
+{
|
||||
+ BDRVZeroinitState *s = bs->opaque;
|
||||
+ return s->has_zero_init;
|
||||
+}
|
||||
+
|
||||
+static int coroutine_fn zeroinit_co_pdiscard(BlockDriverState *bs,
|
||||
+ int64_t offset, int64_t bytes)
|
||||
+static int coroutine_fn GRAPH_RDLOCK
|
||||
+zeroinit_co_pdiscard(BlockDriverState *bs, int64_t offset, int64_t bytes)
|
||||
+{
|
||||
+ return bdrv_co_pdiscard(bs->file, offset, bytes);
|
||||
+}
|
||||
+
|
||||
+static int zeroinit_co_truncate(BlockDriverState *bs, int64_t offset,
|
||||
+ _Bool exact, PreallocMode prealloc,
|
||||
+ BdrvRequestFlags req_flags, Error **errp)
|
||||
+static int GRAPH_RDLOCK
|
||||
+zeroinit_co_truncate(BlockDriverState *bs, int64_t offset, _Bool exact,
|
||||
+ PreallocMode prealloc, BdrvRequestFlags req_flags,
|
||||
+ Error **errp)
|
||||
+{
|
||||
+ return bdrv_co_truncate(bs->file, offset, exact, prealloc, req_flags, errp);
|
||||
+}
|
||||
+
|
||||
+static coroutine_fn int zeroinit_co_get_info(BlockDriverState *bs,
|
||||
+ BlockDriverInfo *bdi)
|
||||
+static coroutine_fn int GRAPH_RDLOCK
|
||||
+zeroinit_co_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)
|
||||
+{
|
||||
+ return bdrv_co_get_info(bs->file->bs, bdi);
|
||||
+}
|
||||
|
|
|
@ -10,14 +10,14 @@ Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
|
|||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
---
|
||||
qemu-options.hx | 3 +++
|
||||
softmmu/vl.c | 8 ++++++++
|
||||
system/vl.c | 8 ++++++++
|
||||
2 files changed, 11 insertions(+)
|
||||
|
||||
diff --git a/qemu-options.hx b/qemu-options.hx
|
||||
index fdd551c2bb..4eb43b7bc5 100644
|
||||
index 511ab9415e..92e301d545 100644
|
||||
--- a/qemu-options.hx
|
||||
+++ b/qemu-options.hx
|
||||
@@ -1162,6 +1162,9 @@ legacy PC, they are not recommended for modern configurations.
|
||||
@@ -1237,6 +1237,9 @@ legacy PC, they are not recommended for modern configurations.
|
||||
|
||||
ERST
|
||||
|
||||
|
@ -27,11 +27,11 @@ index fdd551c2bb..4eb43b7bc5 100644
|
|||
DEF("fda", HAS_ARG, QEMU_OPTION_fda,
|
||||
"-fda/-fdb file use 'file' as floppy disk 0/1 image\n", QEMU_ARCH_ALL)
|
||||
DEF("fdb", HAS_ARG, QEMU_OPTION_fdb, "", QEMU_ARCH_ALL)
|
||||
diff --git a/softmmu/vl.c b/softmmu/vl.c
|
||||
index 0eabc71b68..323f6a23d4 100644
|
||||
--- a/softmmu/vl.c
|
||||
+++ b/softmmu/vl.c
|
||||
@@ -2648,6 +2648,7 @@ void qemu_init(int argc, char **argv)
|
||||
diff --git a/system/vl.c b/system/vl.c
|
||||
index 2738ab7c91..20ebf2c920 100644
|
||||
--- a/system/vl.c
|
||||
+++ b/system/vl.c
|
||||
@@ -2748,6 +2748,7 @@ void qemu_init(int argc, char **argv)
|
||||
MachineClass *machine_class;
|
||||
bool userconfig = true;
|
||||
FILE *vmstate_dump_file = NULL;
|
||||
|
@ -39,7 +39,7 @@ index 0eabc71b68..323f6a23d4 100644
|
|||
|
||||
qemu_add_opts(&qemu_drive_opts);
|
||||
qemu_add_drive_opts(&qemu_legacy_drive_opts);
|
||||
@@ -3271,6 +3272,13 @@ void qemu_init(int argc, char **argv)
|
||||
@@ -3371,6 +3372,13 @@ void qemu_init(int argc, char **argv)
|
||||
machine_parse_property_opt(qemu_find_opts("smp-opts"),
|
||||
"smp", optarg);
|
||||
break;
|
||||
|
@ -50,6 +50,6 @@ index 0eabc71b68..323f6a23d4 100644
|
|||
+ exit(1);
|
||||
+ }
|
||||
+ break;
|
||||
#ifdef CONFIG_VNC
|
||||
case QEMU_OPTION_vnc:
|
||||
vnc_parse(optarg);
|
||||
break;
|
||||
|
|
|
@ -11,10 +11,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|||
1 file changed, 9 insertions(+)
|
||||
|
||||
diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c
|
||||
index 4a34f03047..59b917e50c 100644
|
||||
index d8fc1e2815..789694b8b3 100644
|
||||
--- a/hw/intc/apic_common.c
|
||||
+++ b/hw/intc/apic_common.c
|
||||
@@ -252,6 +252,15 @@ static void apic_reset_common(DeviceState *dev)
|
||||
@@ -263,6 +263,15 @@ static void apic_reset_common(DeviceState *dev)
|
||||
info->vapic_base_update(s);
|
||||
|
||||
apic_init_reset(dev);
|
||||
|
|
|
@ -9,14 +9,14 @@ Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
|
|||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
---
|
||||
block/file-posix.c | 59 ++++++++++++++++++++++++++++++--------------
|
||||
qapi/block-core.json | 3 ++-
|
||||
2 files changed, 42 insertions(+), 20 deletions(-)
|
||||
qapi/block-core.json | 7 +++++-
|
||||
2 files changed, 46 insertions(+), 20 deletions(-)
|
||||
|
||||
diff --git a/block/file-posix.c b/block/file-posix.c
|
||||
index 9681bd0434..044890822d 100644
|
||||
index 43bc0bd520..60e98c87f1 100644
|
||||
--- a/block/file-posix.c
|
||||
+++ b/block/file-posix.c
|
||||
@@ -2483,6 +2483,7 @@ raw_co_create(BlockdevCreateOptions *options, Error **errp)
|
||||
@@ -2876,6 +2876,7 @@ raw_co_create(BlockdevCreateOptions *options, Error **errp)
|
||||
int fd;
|
||||
uint64_t perm, shared;
|
||||
int result = 0;
|
||||
|
@ -24,7 +24,7 @@ index 9681bd0434..044890822d 100644
|
|||
|
||||
/* Validate options and set default values */
|
||||
assert(options->driver == BLOCKDEV_DRIVER_FILE);
|
||||
@@ -2523,19 +2524,22 @@ raw_co_create(BlockdevCreateOptions *options, Error **errp)
|
||||
@@ -2916,19 +2917,22 @@ raw_co_create(BlockdevCreateOptions *options, Error **errp)
|
||||
perm = BLK_PERM_WRITE | BLK_PERM_RESIZE;
|
||||
shared = BLK_PERM_ALL & ~BLK_PERM_RESIZE;
|
||||
|
||||
|
@ -59,7 +59,7 @@ index 9681bd0434..044890822d 100644
|
|||
}
|
||||
|
||||
/* Clear the file by truncating it to 0 */
|
||||
@@ -2589,13 +2593,15 @@ raw_co_create(BlockdevCreateOptions *options, Error **errp)
|
||||
@@ -2982,13 +2986,15 @@ raw_co_create(BlockdevCreateOptions *options, Error **errp)
|
||||
}
|
||||
|
||||
out_unlock:
|
||||
|
@ -82,7 +82,7 @@ index 9681bd0434..044890822d 100644
|
|||
}
|
||||
|
||||
out_close:
|
||||
@@ -2619,6 +2625,7 @@ raw_co_create_opts(BlockDriver *drv, const char *filename,
|
||||
@@ -3012,6 +3018,7 @@ raw_co_create_opts(BlockDriver *drv, const char *filename,
|
||||
PreallocMode prealloc;
|
||||
char *buf = NULL;
|
||||
Error *local_err = NULL;
|
||||
|
@ -90,7 +90,7 @@ index 9681bd0434..044890822d 100644
|
|||
|
||||
/* Skip file: protocol prefix */
|
||||
strstart(filename, "file:", &filename);
|
||||
@@ -2641,6 +2648,18 @@ raw_co_create_opts(BlockDriver *drv, const char *filename,
|
||||
@@ -3034,6 +3041,18 @@ raw_co_create_opts(BlockDriver *drv, const char *filename,
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
@ -109,7 +109,7 @@ index 9681bd0434..044890822d 100644
|
|||
options = (BlockdevCreateOptions) {
|
||||
.driver = BLOCKDEV_DRIVER_FILE,
|
||||
.u.file = {
|
||||
@@ -2652,6 +2671,8 @@ raw_co_create_opts(BlockDriver *drv, const char *filename,
|
||||
@@ -3045,6 +3064,8 @@ raw_co_create_opts(BlockDriver *drv, const char *filename,
|
||||
.nocow = nocow,
|
||||
.has_extent_size_hint = has_extent_size_hint,
|
||||
.extent_size_hint = extent_size_hint,
|
||||
|
@ -119,10 +119,21 @@ index 9681bd0434..044890822d 100644
|
|||
};
|
||||
return raw_co_create(&options, errp);
|
||||
diff --git a/qapi/block-core.json b/qapi/block-core.json
|
||||
index 3c945c1f93..542add004b 100644
|
||||
index 45ab548dfe..f7c2b63c5d 100644
|
||||
--- a/qapi/block-core.json
|
||||
+++ b/qapi/block-core.json
|
||||
@@ -4740,7 +4740,8 @@
|
||||
@@ -4956,6 +4956,10 @@
|
||||
# @extent-size-hint: Extent size hint to add to the image file; 0 for
|
||||
# not adding an extent size hint (default: 1 MB, since 5.1)
|
||||
#
|
||||
+# @locking: whether to enable file locking. If set to 'auto', only
|
||||
+# enable when Open File Descriptor (OFD) locking API is available
|
||||
+# (default: auto).
|
||||
+#
|
||||
# Since: 2.12
|
||||
##
|
||||
{ 'struct': 'BlockdevCreateOptionsFile',
|
||||
@@ -4963,7 +4967,8 @@
|
||||
'size': 'size',
|
||||
'*preallocation': 'PreallocMode',
|
||||
'*nocow': 'bool',
|
||||
|
|
|
@ -18,10 +18,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/monitor/qmp.c b/monitor/qmp.c
|
||||
index 6b8cfcf6d8..3ec67e32d3 100644
|
||||
index 589c9524f8..2505dd658a 100644
|
||||
--- a/monitor/qmp.c
|
||||
+++ b/monitor/qmp.c
|
||||
@@ -519,8 +519,7 @@ void monitor_init_qmp(Chardev *chr, bool pretty, Error **errp)
|
||||
@@ -536,8 +536,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 */
|
||||
|
|
|
@ -26,10 +26,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/hw/core/machine.c b/hw/core/machine.c
|
||||
index 2f6ccf5623..a5927e92f1 100644
|
||||
index 4273de16a0..83f1fc0293 100644
|
||||
--- a/hw/core/machine.c
|
||||
+++ b/hw/core/machine.c
|
||||
@@ -142,7 +142,8 @@ GlobalProperty hw_compat_4_0[] = {
|
||||
@@ -162,7 +162,8 @@ GlobalProperty hw_compat_4_0[] = {
|
||||
{ "virtio-vga", "edid", "false" },
|
||||
{ "virtio-gpu-device", "edid", "false" },
|
||||
{ "virtio-device", "use-started", "false" },
|
||||
|
|
|
@ -17,14 +17,14 @@ Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
|||
hw/core/machine-qmp-cmds.c | 5 +++++
|
||||
include/hw/boards.h | 2 ++
|
||||
qapi/machine.json | 4 +++-
|
||||
softmmu/vl.c | 25 +++++++++++++++++++++++++
|
||||
system/vl.c | 25 +++++++++++++++++++++++++
|
||||
4 files changed, 35 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c
|
||||
index 24595f618c..ee9cb0cd04 100644
|
||||
index 314351cdff..628a3537c5 100644
|
||||
--- a/hw/core/machine-qmp-cmds.c
|
||||
+++ b/hw/core/machine-qmp-cmds.c
|
||||
@@ -107,6 +107,11 @@ MachineInfoList *qmp_query_machines(Error **errp)
|
||||
@@ -94,6 +94,11 @@ MachineInfoList *qmp_query_machines(Error **errp)
|
||||
if (strcmp(mc->name, MACHINE_GET_CLASS(current_machine)->name) == 0) {
|
||||
info->has_is_current = true;
|
||||
info->is_current = true;
|
||||
|
@ -37,10 +37,10 @@ index 24595f618c..ee9cb0cd04 100644
|
|||
|
||||
if (mc->default_cpu_type) {
|
||||
diff --git a/include/hw/boards.h b/include/hw/boards.h
|
||||
index 6fbbfd56c8..61a526e97d 100644
|
||||
index 8b8f6d5c00..dd6d0a1447 100644
|
||||
--- a/include/hw/boards.h
|
||||
+++ b/include/hw/boards.h
|
||||
@@ -232,6 +232,8 @@ struct MachineClass {
|
||||
@@ -246,6 +246,8 @@ struct MachineClass {
|
||||
const char *desc;
|
||||
const char *deprecation_reason;
|
||||
|
||||
|
@ -50,10 +50,10 @@ index 6fbbfd56c8..61a526e97d 100644
|
|||
void (*reset)(MachineState *state, ShutdownCause reason);
|
||||
void (*wakeup)(MachineState *state);
|
||||
diff --git a/qapi/machine.json b/qapi/machine.json
|
||||
index c904280085..47f3facdb2 100644
|
||||
index a024d5b05d..1d69bffaa0 100644
|
||||
--- a/qapi/machine.json
|
||||
+++ b/qapi/machine.json
|
||||
@@ -159,6 +159,8 @@
|
||||
@@ -168,6 +168,8 @@
|
||||
#
|
||||
# @acpi: machine type supports ACPI (since 8.0)
|
||||
#
|
||||
|
@ -62,7 +62,7 @@ index c904280085..47f3facdb2 100644
|
|||
# Since: 1.2
|
||||
##
|
||||
{ 'struct': 'MachineInfo',
|
||||
@@ -166,7 +168,7 @@
|
||||
@@ -175,7 +177,7 @@
|
||||
'*is-default': 'bool', '*is-current': 'bool', 'cpu-max': 'int',
|
||||
'hotpluggable-cpus': 'bool', 'numa-mem-supported': 'bool',
|
||||
'deprecated': 'bool', '*default-cpu-type': 'str',
|
||||
|
@ -71,19 +71,19 @@ index c904280085..47f3facdb2 100644
|
|||
|
||||
##
|
||||
# @query-machines:
|
||||
diff --git a/softmmu/vl.c b/softmmu/vl.c
|
||||
index 323f6a23d4..25abdc9da7 100644
|
||||
--- a/softmmu/vl.c
|
||||
+++ b/softmmu/vl.c
|
||||
@@ -1578,6 +1578,7 @@ static const QEMUOption *lookup_opt(int argc, char **argv,
|
||||
diff --git a/system/vl.c b/system/vl.c
|
||||
index 20ebf2c920..4d39e32097 100644
|
||||
--- a/system/vl.c
|
||||
+++ b/system/vl.c
|
||||
@@ -1659,6 +1659,7 @@ static const QEMUOption *lookup_opt(int argc, char **argv,
|
||||
static MachineClass *select_machine(QDict *qdict, Error **errp)
|
||||
{
|
||||
const char *optarg = qdict_get_try_str(qdict, "type");
|
||||
const char *machine_type = qdict_get_try_str(qdict, "type");
|
||||
+ const char *pvever = qdict_get_try_str(qdict, "pvever");
|
||||
GSList *machines = object_class_get_list(TYPE_MACHINE, false);
|
||||
MachineClass *machine_class;
|
||||
Error *local_err = NULL;
|
||||
@@ -1595,6 +1596,11 @@ static MachineClass *select_machine(QDict *qdict, Error **errp)
|
||||
@@ -1676,6 +1677,11 @@ static MachineClass *select_machine(QDict *qdict, Error **errp)
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -95,7 +95,7 @@ index 323f6a23d4..25abdc9da7 100644
|
|||
g_slist_free(machines);
|
||||
if (local_err) {
|
||||
error_append_hint(&local_err, "Use -machine help to list supported machines\n");
|
||||
@@ -3213,12 +3219,31 @@ void qemu_init(int argc, char **argv)
|
||||
@@ -3313,12 +3319,31 @@ void qemu_init(int argc, char **argv)
|
||||
case QEMU_OPTION_machine:
|
||||
{
|
||||
bool help;
|
||||
|
|
|
@ -25,7 +25,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/block/backup.c b/block/backup.c
|
||||
index db3791f4d1..39410dcf8d 100644
|
||||
index ec29d6b810..270957c0cd 100644
|
||||
--- a/block/backup.c
|
||||
+++ b/block/backup.c
|
||||
@@ -237,8 +237,8 @@ static void backup_init_bcs_bitmap(BackupBlockJob *job)
|
||||
|
@ -48,9 +48,9 @@ index db3791f4d1..39410dcf8d 100644
|
|||
if (s->sync_mode == MIRROR_SYNC_MODE_TOP) {
|
||||
int64_t offset = 0;
|
||||
int64_t count;
|
||||
@@ -495,6 +493,8 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
|
||||
block_job_add_bdrv(&job->common, "target", target, 0, BLK_PERM_ALL,
|
||||
@@ -501,6 +499,8 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
|
||||
&error_abort);
|
||||
bdrv_graph_wrunlock();
|
||||
|
||||
+ backup_init_bcs_bitmap(job);
|
||||
+
|
||||
|
|
|
@ -15,34 +15,34 @@ Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
|||
---
|
||||
block/meson.build | 2 +
|
||||
meson.build | 5 +
|
||||
vma-reader.c | 867 +++++++++++++++++++++++++++++++++++++++++++++
|
||||
vma-writer.c | 793 +++++++++++++++++++++++++++++++++++++++++
|
||||
vma.c | 878 ++++++++++++++++++++++++++++++++++++++++++++++
|
||||
vma-reader.c | 870 ++++++++++++++++++++++++++++++++++++++++++++
|
||||
vma-writer.c | 818 +++++++++++++++++++++++++++++++++++++++++
|
||||
vma.c | 901 ++++++++++++++++++++++++++++++++++++++++++++++
|
||||
vma.h | 150 ++++++++
|
||||
6 files changed, 2695 insertions(+)
|
||||
6 files changed, 2746 insertions(+)
|
||||
create mode 100644 vma-reader.c
|
||||
create mode 100644 vma-writer.c
|
||||
create mode 100644 vma.c
|
||||
create mode 100644 vma.h
|
||||
|
||||
diff --git a/block/meson.build b/block/meson.build
|
||||
index 253fe49fa2..744b698a82 100644
|
||||
index b530e117b5..b245daa98e 100644
|
||||
--- a/block/meson.build
|
||||
+++ b/block/meson.build
|
||||
@@ -47,6 +47,8 @@ block_ss.add(files(
|
||||
@@ -42,6 +42,8 @@ block_ss.add(files(
|
||||
'zeroinit.c',
|
||||
), zstd, zlib, gnutls)
|
||||
|
||||
+block_ss.add(files('../vma-writer.c'), libuuid)
|
||||
+
|
||||
softmmu_ss.add(when: 'CONFIG_TCG', if_true: files('blkreplay.c'))
|
||||
softmmu_ss.add(files('block-ram-registrar.c'))
|
||||
system_ss.add(when: 'CONFIG_TCG', if_true: files('blkreplay.c'))
|
||||
system_ss.add(files('block-ram-registrar.c'))
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 30447cfaef..38a4e2bcef 100644
|
||||
index 91a0aa64c6..620cc594b2 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -1527,6 +1527,8 @@ keyutils = dependency('libkeyutils', required: false,
|
||||
@@ -1922,6 +1922,8 @@ endif
|
||||
|
||||
has_gettid = cc.has_function('gettid')
|
||||
|
||||
|
@ -51,7 +51,7 @@ index 30447cfaef..38a4e2bcef 100644
|
|||
# libselinux
|
||||
selinux = dependency('libselinux',
|
||||
required: get_option('selinux'),
|
||||
@@ -3650,6 +3652,9 @@ if have_tools
|
||||
@@ -4023,6 +4025,9 @@ if have_tools
|
||||
dependencies: [blockdev, qemuutil, gnutls, selinux],
|
||||
install: true)
|
||||
|
||||
|
@ -59,14 +59,14 @@ index 30447cfaef..38a4e2bcef 100644
|
|||
+ dependencies: [authz, block, crypto, io, qom], install: true)
|
||||
+
|
||||
subdir('storage-daemon')
|
||||
subdir('contrib/rdmacm-mux')
|
||||
subdir('contrib/elf2dmp')
|
||||
|
||||
foreach exe: [ 'qemu-img', 'qemu-io', 'qemu-nbd', 'qemu-storage-daemon']
|
||||
diff --git a/vma-reader.c b/vma-reader.c
|
||||
new file mode 100644
|
||||
index 0000000000..81a891c6b1
|
||||
index 0000000000..d0b6721812
|
||||
--- /dev/null
|
||||
+++ b/vma-reader.c
|
||||
@@ -0,0 +1,867 @@
|
||||
@@ -0,0 +1,870 @@
|
||||
+/*
|
||||
+ * VMA: Virtual Machine Archive
|
||||
+ *
|
||||
|
@ -88,6 +88,7 @@ index 0000000000..81a891c6b1
|
|||
+#include "qemu/ratelimit.h"
|
||||
+#include "vma.h"
|
||||
+#include "block/block.h"
|
||||
+#include "block/graph-lock.h"
|
||||
+#include "sysemu/block-backend.h"
|
||||
+
|
||||
+static unsigned char zero_vma_block[VMA_BLOCK_SIZE];
|
||||
|
@ -600,8 +601,10 @@ index 0000000000..81a891c6b1
|
|||
+ } else {
|
||||
+ int res = blk_pwrite(target, sector_num * BDRV_SECTOR_SIZE, nb_sectors * BDRV_SECTOR_SIZE, buf, 0);
|
||||
+ if (res < 0) {
|
||||
+ bdrv_graph_rdlock_main_loop();
|
||||
+ error_setg(errp, "blk_pwrite to %s failed (%d)",
|
||||
+ bdrv_get_device_name(blk_bs(target)), res);
|
||||
+ bdrv_graph_rdunlock_main_loop();
|
||||
+ return -1;
|
||||
+ }
|
||||
+ }
|
||||
|
@ -936,10 +939,10 @@ index 0000000000..81a891c6b1
|
|||
+
|
||||
diff --git a/vma-writer.c b/vma-writer.c
|
||||
new file mode 100644
|
||||
index 0000000000..ac7da237d0
|
||||
index 0000000000..126b296647
|
||||
--- /dev/null
|
||||
+++ b/vma-writer.c
|
||||
@@ -0,0 +1,793 @@
|
||||
@@ -0,0 +1,818 @@
|
||||
+/*
|
||||
+ * VMA: Virtual Machine Archive
|
||||
+ *
|
||||
|
@ -955,6 +958,8 @@ index 0000000000..ac7da237d0
|
|||
+
|
||||
+#include "qemu/osdep.h"
|
||||
+#include <glib.h>
|
||||
+#include <linux/magic.h>
|
||||
+#include <sys/vfs.h>
|
||||
+#include <uuid/uuid.h>
|
||||
+
|
||||
+#include "vma.h"
|
||||
|
@ -963,6 +968,7 @@ index 0000000000..ac7da237d0
|
|||
+#include "qemu/main-loop.h"
|
||||
+#include "qemu/coroutine.h"
|
||||
+#include "qemu/cutils.h"
|
||||
+#include "qemu/error-report.h"
|
||||
+#include "qemu/memalign.h"
|
||||
+
|
||||
+#define DEBUG_VMA 0
|
||||
|
@ -1146,10 +1152,10 @@ index 0000000000..ac7da237d0
|
|||
+{
|
||||
+ assert(qemu_in_coroutine());
|
||||
+ AioContext *ctx = qemu_get_current_aio_context();
|
||||
+ aio_set_fd_handler(ctx, fd, false, NULL, (IOHandler *)qemu_coroutine_enter,
|
||||
+ NULL, NULL, qemu_coroutine_self());
|
||||
+ aio_set_fd_handler(ctx, fd, NULL, (IOHandler *)qemu_coroutine_enter, NULL,
|
||||
+ NULL, qemu_coroutine_self());
|
||||
+ qemu_coroutine_yield();
|
||||
+ aio_set_fd_handler(ctx, fd, false, NULL, NULL, NULL, NULL, NULL);
|
||||
+ aio_set_fd_handler(ctx, fd, NULL, NULL, NULL, NULL, NULL);
|
||||
+}
|
||||
+
|
||||
+static ssize_t coroutine_fn
|
||||
|
@ -1198,6 +1204,23 @@ index 0000000000..ac7da237d0
|
|||
+ return (done == bytes) ? bytes : -1;
|
||||
+}
|
||||
+
|
||||
+static bool is_path_tmpfs(const char *path) {
|
||||
+ struct statfs fs;
|
||||
+ int ret;
|
||||
+
|
||||
+ do {
|
||||
+ ret = statfs(path, &fs);
|
||||
+ } while (ret != 0 && errno == EINTR);
|
||||
+
|
||||
+ if (ret != 0) {
|
||||
+ warn_report("statfs call for %s failed, assuming not tmpfs - %s\n",
|
||||
+ path, strerror(errno));
|
||||
+ return false;
|
||||
+ }
|
||||
+
|
||||
+ return fs.f_type == TMPFS_MAGIC;
|
||||
+}
|
||||
+
|
||||
+VmaWriter *vma_writer_create(const char *filename, uuid_t uuid, Error **errp)
|
||||
+{
|
||||
+ const char *p;
|
||||
|
@ -1247,8 +1270,13 @@ index 0000000000..ac7da237d0
|
|||
+ }
|
||||
+ /* try to use O_NONBLOCK */
|
||||
+ fcntl(vmaw->fd, F_SETFL, fcntl(vmaw->fd, F_GETFL)|O_NONBLOCK);
|
||||
+ } else {
|
||||
+ oflags = O_NONBLOCK|O_DIRECT|O_WRONLY|O_EXCL;
|
||||
+ } else {
|
||||
+ gchar *dirname = g_path_get_dirname(filename);
|
||||
+ oflags = O_NONBLOCK|O_WRONLY|O_EXCL;
|
||||
+ if (!is_path_tmpfs(dirname)) {
|
||||
+ oflags |= O_DIRECT;
|
||||
+ }
|
||||
+ g_free(dirname);
|
||||
+ vmaw->fd = qemu_create(filename, oflags, 0644, errp);
|
||||
+ }
|
||||
+
|
||||
|
@ -1735,10 +1763,10 @@ index 0000000000..ac7da237d0
|
|||
+}
|
||||
diff --git a/vma.c b/vma.c
|
||||
new file mode 100644
|
||||
index 0000000000..304f02bc84
|
||||
index 0000000000..bb715e9061
|
||||
--- /dev/null
|
||||
+++ b/vma.c
|
||||
@@ -0,0 +1,878 @@
|
||||
@@ -0,0 +1,901 @@
|
||||
+/*
|
||||
+ * VMA: Virtual Machine Archive
|
||||
+ *
|
||||
|
@ -1772,7 +1800,7 @@ index 0000000000..304f02bc84
|
|||
+ "vma list <filename>\n"
|
||||
+ "vma config <filename> [-c config]\n"
|
||||
+ "vma create <filename> [-c config] pathname ...\n"
|
||||
+ "vma extract <filename> [-r <fifo>] <targetdir>\n"
|
||||
+ "vma extract <filename> [-d <drive-list>] [-r <fifo>] <targetdir>\n"
|
||||
+ "vma verify <filename> [-v]\n"
|
||||
+ ;
|
||||
+
|
||||
|
@ -1917,9 +1945,10 @@ index 0000000000..304f02bc84
|
|||
+ const char *filename;
|
||||
+ const char *dirname;
|
||||
+ const char *readmap = NULL;
|
||||
+ gchar **drive_list = NULL;
|
||||
+
|
||||
+ for (;;) {
|
||||
+ c = getopt(argc, argv, "hvr:");
|
||||
+ c = getopt(argc, argv, "hvd:r:");
|
||||
+ if (c == -1) {
|
||||
+ break;
|
||||
+ }
|
||||
|
@ -1928,6 +1957,9 @@ index 0000000000..304f02bc84
|
|||
+ case 'h':
|
||||
+ help();
|
||||
+ break;
|
||||
+ case 'd':
|
||||
+ drive_list = g_strsplit(optarg, ",", 254);
|
||||
+ break;
|
||||
+ case 'r':
|
||||
+ readmap = optarg;
|
||||
+ break;
|
||||
|
@ -2047,29 +2079,29 @@ index 0000000000..304f02bc84
|
|||
+ inbuf);
|
||||
+ }
|
||||
+
|
||||
+ RestoreMap *map = g_new0(RestoreMap, 1);
|
||||
+ map->devname = g_strdup(devname);
|
||||
+ map->path = g_strdup(path);
|
||||
+ map->format = format;
|
||||
+ map->throttling_bps = bps_value;
|
||||
+ map->throttling_group = group;
|
||||
+ map->cache = cache;
|
||||
+ map->write_zero = write_zero;
|
||||
+ map->skip = skip;
|
||||
+ RestoreMap *restore_map = g_new0(RestoreMap, 1);
|
||||
+ restore_map->devname = g_strdup(devname);
|
||||
+ restore_map->path = g_strdup(path);
|
||||
+ restore_map->format = format;
|
||||
+ restore_map->throttling_bps = bps_value;
|
||||
+ restore_map->throttling_group = group;
|
||||
+ restore_map->cache = cache;
|
||||
+ restore_map->write_zero = write_zero;
|
||||
+ restore_map->skip = skip;
|
||||
+
|
||||
+ g_hash_table_insert(devmap, map->devname, map);
|
||||
+ g_hash_table_insert(devmap, restore_map->devname, restore_map);
|
||||
+
|
||||
+ };
|
||||
+ }
|
||||
+
|
||||
+ int i;
|
||||
+ int vmstate_fd = -1;
|
||||
+ guint8 vmstate_stream = 0;
|
||||
+ bool drive_rename_bitmap[255];
|
||||
+ memset(drive_rename_bitmap, 0, sizeof(drive_rename_bitmap));
|
||||
+
|
||||
+ for (i = 1; i < 255; i++) {
|
||||
+ VmaDeviceInfo *di = vma_reader_get_device_info(vmar, i);
|
||||
+ if (di && (strcmp(di->devname, "vmstate") == 0)) {
|
||||
+ vmstate_stream = i;
|
||||
+ char *statefn = g_strdup_printf("%s/vmstate.bin", dirname);
|
||||
+ vmstate_fd = open(statefn, O_WRONLY|O_CREAT|O_EXCL, 0644);
|
||||
+ if (vmstate_fd < 0) {
|
||||
|
@ -2089,7 +2121,21 @@ index 0000000000..304f02bc84
|
|||
+
|
||||
+ BlockBackend *blk = NULL;
|
||||
+
|
||||
+ if (readmap) {
|
||||
+ if (drive_list) {
|
||||
+ skip = true;
|
||||
+ int j;
|
||||
+ for (j = 0; drive_list[j]; j++) {
|
||||
+ if (strcmp(drive_list[j], di->devname) == 0) {
|
||||
+ skip = false;
|
||||
+ drive_rename_bitmap[i] = true;
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+ } else {
|
||||
+ drive_rename_bitmap[i] = true;
|
||||
+ }
|
||||
+
|
||||
+ if (!skip && readmap) {
|
||||
+ RestoreMap *map;
|
||||
+ map = (RestoreMap *)g_hash_table_lookup(devmap, di->devname);
|
||||
+ if (map == NULL) {
|
||||
|
@ -2102,7 +2148,7 @@ index 0000000000..304f02bc84
|
|||
+ cache = map->cache;
|
||||
+ write_zero = map->write_zero;
|
||||
+ skip = map->skip;
|
||||
+ } else {
|
||||
+ } else if (!skip) {
|
||||
+ devfn = g_strdup_printf("%s/tmp-disk-%s.raw",
|
||||
+ dirname, di->devname);
|
||||
+ printf("DEVINFO %s %zd\n", devfn, di->size);
|
||||
|
@ -2183,6 +2229,10 @@ index 0000000000..304f02bc84
|
|||
+ }
|
||||
+ }
|
||||
+
|
||||
+ if (drive_list) {
|
||||
+ g_strfreev(drive_list);
|
||||
+ }
|
||||
+
|
||||
+ if (vma_reader_restore(vmar, vmstate_fd, verbose, &errp) < 0) {
|
||||
+ g_error("restore failed - %s", error_get_pretty(errp));
|
||||
+ }
|
||||
|
@ -2190,7 +2240,7 @@ index 0000000000..304f02bc84
|
|||
+ if (!readmap) {
|
||||
+ for (i = 1; i < 255; i++) {
|
||||
+ VmaDeviceInfo *di = vma_reader_get_device_info(vmar, i);
|
||||
+ if (di && (i != vmstate_stream)) {
|
||||
+ if (di && drive_rename_bitmap[i]) {
|
||||
+ char *tmpfn = g_strdup_printf("%s/tmp-disk-%s.raw",
|
||||
+ dirname, di->devname);
|
||||
+ char *fn = g_strdup_printf("%s/disk-%s.raw",
|
||||
|
@ -2314,13 +2364,13 @@ index 0000000000..304f02bc84
|
|||
+ ret = blk_co_preadv(job->target, start * VMA_CLUSTER_SIZE,
|
||||
+ readlen, &qiov, 0);
|
||||
+ if (ret < 0) {
|
||||
+ vma_writer_set_error(job->vmaw, "read error", -1);
|
||||
+ vma_writer_set_error(job->vmaw, "read error");
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
+ size_t zb = 0;
|
||||
+ if (vma_writer_write(job->vmaw, job->dev_id, start, buf, &zb) < 0) {
|
||||
+ vma_writer_set_error(job->vmaw, "backup_dump_cb vma_writer_write failed", -1);
|
||||
+ vma_writer_set_error(job->vmaw, "backup_dump_cb vma_writer_write failed");
|
||||
+ goto out;
|
||||
+ }
|
||||
+ }
|
||||
|
@ -2338,7 +2388,7 @@ index 0000000000..304f02bc84
|
|||
+
|
||||
+static int create_archive(int argc, char **argv)
|
||||
+{
|
||||
+ int i, c;
|
||||
+ int c;
|
||||
+ int verbose = 0;
|
||||
+ const char *archivename;
|
||||
+ GList *backup_coroutines = NULL;
|
||||
|
@ -2496,6 +2546,7 @@ index 0000000000..304f02bc84
|
|||
+ vma_writer_get_status(vmaw, &vmastat);
|
||||
+
|
||||
+ if (verbose) {
|
||||
+ int i;
|
||||
+ for (i = 0; i < 256; i++) {
|
||||
+ VmaStreamInfo *si = &vmastat.stream_info[i];
|
||||
+ if (si->size) {
|
||||
|
@ -2619,7 +2670,7 @@ index 0000000000..304f02bc84
|
|||
+}
|
||||
diff --git a/vma.h b/vma.h
|
||||
new file mode 100644
|
||||
index 0000000000..1b62859165
|
||||
index 0000000000..86d2873aa5
|
||||
--- /dev/null
|
||||
+++ b/vma.h
|
||||
@@ -0,0 +1,150 @@
|
||||
|
@ -2757,7 +2808,7 @@ index 0000000000..1b62859165
|
|||
+int coroutine_fn vma_writer_flush_output(VmaWriter *vmaw);
|
||||
+
|
||||
+int vma_writer_get_status(VmaWriter *vmaw, VmaStatus *status);
|
||||
+void vma_writer_set_error(VmaWriter *vmaw, const char *fmt, ...);
|
||||
+void vma_writer_set_error(VmaWriter *vmaw, const char *fmt, ...) G_GNUC_PRINTF(2, 3);
|
||||
+
|
||||
+
|
||||
+VmaReader *vma_reader_create(const char *filename, Error **errp);
|
||||
|
|
|
@ -12,20 +12,20 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|||
[FE: adapt to coroutine changes]
|
||||
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
---
|
||||
block/backup-dump.c | 168 +++++++++++++++++++++++++++++++
|
||||
block/backup-dump.c | 172 +++++++++++++++++++++++++++++++
|
||||
block/backup.c | 30 ++----
|
||||
block/meson.build | 1 +
|
||||
include/block/block_int-common.h | 35 +++++++
|
||||
job.c | 3 +-
|
||||
5 files changed, 214 insertions(+), 23 deletions(-)
|
||||
5 files changed, 218 insertions(+), 23 deletions(-)
|
||||
create mode 100644 block/backup-dump.c
|
||||
|
||||
diff --git a/block/backup-dump.c b/block/backup-dump.c
|
||||
new file mode 100644
|
||||
index 0000000000..232a094426
|
||||
index 0000000000..e46abf1070
|
||||
--- /dev/null
|
||||
+++ b/block/backup-dump.c
|
||||
@@ -0,0 +1,168 @@
|
||||
@@ -0,0 +1,172 @@
|
||||
+/*
|
||||
+ * BlockDriver to send backup data stream to a callback function
|
||||
+ *
|
||||
|
@ -37,6 +37,8 @@ index 0000000000..232a094426
|
|||
+ */
|
||||
+
|
||||
+#include "qemu/osdep.h"
|
||||
+
|
||||
+#include "qapi/qmp/qdict.h"
|
||||
+#include "qom/object_interfaces.h"
|
||||
+#include "block/block_int.h"
|
||||
+
|
||||
|
@ -169,7 +171,7 @@ index 0000000000..232a094426
|
|||
+block_init(bdrv_backup_dump_init);
|
||||
+
|
||||
+
|
||||
+BlockDriverState *bdrv_backup_dump_create(
|
||||
+BlockDriverState *coroutine_fn bdrv_co_backup_dump_create(
|
||||
+ int dump_cb_block_size,
|
||||
+ uint64_t byte_size,
|
||||
+ BackupDumpFunc *dump_cb,
|
||||
|
@ -177,9 +179,11 @@ index 0000000000..232a094426
|
|||
+ Error **errp)
|
||||
+{
|
||||
+ BDRVBackupDumpState *state;
|
||||
+ BlockDriverState *bs = bdrv_new_open_driver(
|
||||
+ &bdrv_backup_dump_drive, NULL, BDRV_O_RDWR, errp);
|
||||
+
|
||||
+ QDict *options = qdict_new();
|
||||
+ qdict_put_str(options, "driver", "backup-dump-drive");
|
||||
+
|
||||
+ BlockDriverState *bs = bdrv_co_open(NULL, NULL, options, BDRV_O_RDWR, errp);
|
||||
+ if (!bs) {
|
||||
+ return NULL;
|
||||
+ }
|
||||
|
@ -195,7 +199,7 @@ index 0000000000..232a094426
|
|||
+ return bs;
|
||||
+}
|
||||
diff --git a/block/backup.c b/block/backup.c
|
||||
index 39410dcf8d..af87fa6aa9 100644
|
||||
index 270957c0cd..16d611c4ca 100644
|
||||
--- a/block/backup.c
|
||||
+++ b/block/backup.c
|
||||
@@ -29,28 +29,6 @@
|
||||
|
@ -227,7 +231,7 @@ index 39410dcf8d..af87fa6aa9 100644
|
|||
static const BlockJobDriver backup_job_driver;
|
||||
|
||||
static void backup_cleanup_sync_bitmap(BackupBlockJob *job, int ret)
|
||||
@@ -457,6 +435,14 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
|
||||
@@ -461,6 +439,14 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
|
||||
}
|
||||
|
||||
cluster_size = block_copy_cluster_size(bcs);
|
||||
|
@ -243,7 +247,7 @@ index 39410dcf8d..af87fa6aa9 100644
|
|||
if (perf->max_chunk && perf->max_chunk < cluster_size) {
|
||||
error_setg(errp, "Required max-chunk (%" PRIi64 ") is less than backup "
|
||||
diff --git a/block/meson.build b/block/meson.build
|
||||
index 744b698a82..f580f95395 100644
|
||||
index b245daa98e..e99914eaa4 100644
|
||||
--- a/block/meson.build
|
||||
+++ b/block/meson.build
|
||||
@@ -4,6 +4,7 @@ block_ss.add(files(
|
||||
|
@ -251,11 +255,11 @@ index 744b698a82..f580f95395 100644
|
|||
'amend.c',
|
||||
'backup.c',
|
||||
+ 'backup-dump.c',
|
||||
'copy-before-write.c',
|
||||
'blkdebug.c',
|
||||
'blklogwrites.c',
|
||||
'blkverify.c',
|
||||
diff --git a/include/block/block_int-common.h b/include/block/block_int-common.h
|
||||
index f01bb8b617..d7ffd1826e 100644
|
||||
index 761276127e..b3e6697613 100644
|
||||
--- a/include/block/block_int-common.h
|
||||
+++ b/include/block/block_int-common.h
|
||||
@@ -26,6 +26,7 @@
|
||||
|
@ -272,7 +276,7 @@ index f01bb8b617..d7ffd1826e 100644
|
|||
|
||||
+typedef int BackupDumpFunc(void *opaque, uint64_t offset, uint64_t bytes, const void *buf);
|
||||
+
|
||||
+BlockDriverState *bdrv_backup_dump_create(
|
||||
+BlockDriverState *coroutine_fn bdrv_co_backup_dump_create(
|
||||
+ int dump_cb_block_size,
|
||||
+ uint64_t byte_size,
|
||||
+ BackupDumpFunc *dump_cb,
|
||||
|
@ -308,10 +312,10 @@ index f01bb8b617..d7ffd1826e 100644
|
|||
BDRV_TRACKED_READ,
|
||||
BDRV_TRACKED_WRITE,
|
||||
diff --git a/job.c b/job.c
|
||||
index 72d57f0934..93e22d180b 100644
|
||||
index 660ce22c56..baf54c8d60 100644
|
||||
--- a/job.c
|
||||
+++ b/job.c
|
||||
@@ -330,7 +330,8 @@ static bool job_started_locked(Job *job)
|
||||
@@ -331,7 +331,8 @@ static bool job_started_locked(Job *job)
|
||||
}
|
||||
|
||||
/* Called with job_mutex held. */
|
||||
|
|
|
@ -11,10 +11,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|||
2 files changed, 46 insertions(+)
|
||||
|
||||
diff --git a/include/qemu/job.h b/include/qemu/job.h
|
||||
index e502787dd8..963cf2bef5 100644
|
||||
index 2b873f2576..528cd6acb9 100644
|
||||
--- a/include/qemu/job.h
|
||||
+++ b/include/qemu/job.h
|
||||
@@ -381,6 +381,18 @@ void job_unlock(void);
|
||||
@@ -362,6 +362,18 @@ void job_unlock(void);
|
||||
*/
|
||||
JobTxn *job_txn_new(void);
|
||||
|
||||
|
@ -34,10 +34,10 @@ index e502787dd8..963cf2bef5 100644
|
|||
* Release a reference that was previously acquired with job_txn_add_job or
|
||||
* job_txn_new. If it's the last reference to the object, it will be freed.
|
||||
diff --git a/job.c b/job.c
|
||||
index 93e22d180b..2b31f1e14f 100644
|
||||
index baf54c8d60..3ac5e5cde2 100644
|
||||
--- a/job.c
|
||||
+++ b/job.c
|
||||
@@ -93,6 +93,8 @@ struct JobTxn {
|
||||
@@ -94,6 +94,8 @@ struct JobTxn {
|
||||
|
||||
/* Reference count */
|
||||
int refcnt;
|
||||
|
@ -46,7 +46,7 @@ index 93e22d180b..2b31f1e14f 100644
|
|||
};
|
||||
|
||||
void job_lock(void)
|
||||
@@ -118,6 +120,25 @@ JobTxn *job_txn_new(void)
|
||||
@@ -119,6 +121,25 @@ JobTxn *job_txn_new(void)
|
||||
return txn;
|
||||
}
|
||||
|
||||
|
@ -72,7 +72,7 @@ index 93e22d180b..2b31f1e14f 100644
|
|||
/* Called with job_mutex held. */
|
||||
static void job_txn_ref_locked(JobTxn *txn)
|
||||
{
|
||||
@@ -1057,6 +1078,12 @@ static void job_completed_txn_success_locked(Job *job)
|
||||
@@ -1042,6 +1063,12 @@ static void job_completed_txn_success_locked(Job *job)
|
||||
*/
|
||||
QLIST_FOREACH(other_job, &txn->jobs, txn_list) {
|
||||
if (!job_is_completed_locked(other_job)) {
|
||||
|
@ -85,7 +85,7 @@ index 93e22d180b..2b31f1e14f 100644
|
|||
return;
|
||||
}
|
||||
assert(other_job->ret == 0);
|
||||
@@ -1268,6 +1295,13 @@ int job_finish_sync_locked(Job *job,
|
||||
@@ -1253,6 +1280,13 @@ int job_finish_sync_locked(Job *job,
|
||||
return -EBUSY;
|
||||
}
|
||||
|
||||
|
|
|
@ -79,33 +79,35 @@ Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
|
|||
adapt for new job lock mechanism replacing AioContext locks
|
||||
adapt to QAPI changes
|
||||
improve canceling
|
||||
allow passing max-workers setting]
|
||||
allow passing max-workers setting
|
||||
use malloc_trim after backup
|
||||
create jobs in a drained section]
|
||||
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
---
|
||||
block/meson.build | 5 +
|
||||
block/monitor/block-hmp-cmds.c | 40 ++
|
||||
block/monitor/block-hmp-cmds.c | 39 ++
|
||||
blockdev.c | 1 +
|
||||
hmp-commands-info.hx | 14 +
|
||||
hmp-commands.hx | 31 +
|
||||
hmp-commands.hx | 29 +
|
||||
include/monitor/hmp.h | 3 +
|
||||
meson.build | 1 +
|
||||
monitor/hmp-cmds.c | 72 +++
|
||||
proxmox-backup-client.c | 146 +++++
|
||||
proxmox-backup-client.h | 60 ++
|
||||
pve-backup.c | 1097 ++++++++++++++++++++++++++++++++
|
||||
qapi/block-core.json | 226 +++++++
|
||||
qapi/common.json | 13 +
|
||||
qapi/machine.json | 15 +-
|
||||
14 files changed, 1711 insertions(+), 13 deletions(-)
|
||||
pve-backup.c | 1098 ++++++++++++++++++++++++++++++++
|
||||
qapi/block-core.json | 233 +++++++
|
||||
qapi/common.json | 14 +
|
||||
qapi/machine.json | 16 +-
|
||||
14 files changed, 1717 insertions(+), 14 deletions(-)
|
||||
create mode 100644 proxmox-backup-client.c
|
||||
create mode 100644 proxmox-backup-client.h
|
||||
create mode 100644 pve-backup.c
|
||||
|
||||
diff --git a/block/meson.build b/block/meson.build
|
||||
index f580f95395..5bcebb934b 100644
|
||||
index e99914eaa4..6bba803f94 100644
|
||||
--- a/block/meson.build
|
||||
+++ b/block/meson.build
|
||||
@@ -49,6 +49,11 @@ block_ss.add(files(
|
||||
@@ -44,6 +44,11 @@ block_ss.add(files(
|
||||
), zstd, zlib, gnutls)
|
||||
|
||||
block_ss.add(files('../vma-writer.c'), libuuid)
|
||||
|
@ -115,13 +117,13 @@ index f580f95395..5bcebb934b 100644
|
|||
+), libproxmox_backup_qemu)
|
||||
+
|
||||
|
||||
softmmu_ss.add(when: 'CONFIG_TCG', if_true: files('blkreplay.c'))
|
||||
softmmu_ss.add(files('block-ram-registrar.c'))
|
||||
system_ss.add(when: 'CONFIG_TCG', if_true: files('blkreplay.c'))
|
||||
system_ss.add(files('block-ram-registrar.c'))
|
||||
diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c
|
||||
index ca2599de44..636509b83e 100644
|
||||
index d954bec6f1..5000c084c5 100644
|
||||
--- a/block/monitor/block-hmp-cmds.c
|
||||
+++ b/block/monitor/block-hmp-cmds.c
|
||||
@@ -1029,3 +1029,43 @@ void hmp_change_medium(Monitor *mon, const char *device, const char *target,
|
||||
@@ -1008,3 +1008,42 @@ void hmp_change_medium(Monitor *mon, const char *device, const char *target,
|
||||
qmp_blockdev_change_medium(device, NULL, target, arg, true, force,
|
||||
!!read_only, read_only_mode, errp);
|
||||
}
|
||||
|
@ -139,7 +141,6 @@ index ca2599de44..636509b83e 100644
|
|||
+{
|
||||
+ Error *error = NULL;
|
||||
+
|
||||
+ int dir = qdict_get_try_bool(qdict, "directory", 0);
|
||||
+ const char *backup_file = qdict_get_str(qdict, "backupfile");
|
||||
+ const char *devlist = qdict_get_try_str(qdict, "devlist");
|
||||
+ int64_t speed = qdict_get_try_int(qdict, "speed", 0);
|
||||
|
@ -157,7 +158,7 @@ index ca2599de44..636509b83e 100644
|
|||
+ false, false, // PBS use-dirty-bitmap
|
||||
+ false, false, // PBS compress
|
||||
+ false, false, // PBS encrypt
|
||||
+ true, dir ? BACKUP_FORMAT_DIR : BACKUP_FORMAT_VMA,
|
||||
+ true, BACKUP_FORMAT_VMA,
|
||||
+ NULL, NULL,
|
||||
+ devlist, qdict_haskey(qdict, "speed"), speed,
|
||||
+ false, 0, // BackupPerf max-workers
|
||||
|
@ -166,7 +167,7 @@ index ca2599de44..636509b83e 100644
|
|||
+ hmp_handle_error(mon, error);
|
||||
+}
|
||||
diff --git a/blockdev.c b/blockdev.c
|
||||
index bdae211a54..315a27fc09 100644
|
||||
index d27d8c38ec..5e5dbc1da9 100644
|
||||
--- a/blockdev.c
|
||||
+++ b/blockdev.c
|
||||
@@ -37,6 +37,7 @@
|
||||
|
@ -178,10 +179,10 @@ index bdae211a54..315a27fc09 100644
|
|||
#include "monitor/monitor.h"
|
||||
#include "qemu/error-report.h"
|
||||
diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx
|
||||
index a166bff3d5..4b75966c2e 100644
|
||||
index d5ab880492..6c97248d1b 100644
|
||||
--- a/hmp-commands-info.hx
|
||||
+++ b/hmp-commands-info.hx
|
||||
@@ -486,6 +486,20 @@ SRST
|
||||
@@ -471,6 +471,20 @@ SRST
|
||||
Show the current VM UUID.
|
||||
ERST
|
||||
|
||||
|
@ -203,10 +204,10 @@ index a166bff3d5..4b75966c2e 100644
|
|||
{
|
||||
.name = "usernet",
|
||||
diff --git a/hmp-commands.hx b/hmp-commands.hx
|
||||
index d9f9f42d11..775518fb09 100644
|
||||
index 7506de251c..d5f9c28194 100644
|
||||
--- a/hmp-commands.hx
|
||||
+++ b/hmp-commands.hx
|
||||
@@ -101,6 +101,37 @@ ERST
|
||||
@@ -101,6 +101,35 @@ ERST
|
||||
SRST
|
||||
``block_stream``
|
||||
Copy data from a backing file into a block device.
|
||||
|
@ -214,11 +215,9 @@ index d9f9f42d11..775518fb09 100644
|
|||
+
|
||||
+ {
|
||||
+ .name = "backup",
|
||||
+ .args_type = "directory:-d,backupfile:s,speed:o?,devlist:s?",
|
||||
+ .params = "[-d] backupfile [speed [devlist]]",
|
||||
+ .help = "create a VM Backup."
|
||||
+ "\n\t\t\t Use -d to dump data into a directory instead"
|
||||
+ "\n\t\t\t of using VMA format.",
|
||||
+ .args_type = "backupfile:s,speed:o?,devlist:s?",
|
||||
+ .params = "backupfile [speed [devlist]]",
|
||||
+ .help = "create a VM backup (VMA format).",
|
||||
+ .cmd = hmp_backup,
|
||||
+ .coroutine = true,
|
||||
+ },
|
||||
|
@ -245,7 +244,7 @@ index d9f9f42d11..775518fb09 100644
|
|||
|
||||
{
|
||||
diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h
|
||||
index fdf6b45fb8..e01b2201d8 100644
|
||||
index 7a7def7530..cba7afe70c 100644
|
||||
--- a/include/monitor/hmp.h
|
||||
+++ b/include/monitor/hmp.h
|
||||
@@ -32,6 +32,7 @@ void hmp_info_savevm(Monitor *mon, const QDict *qdict);
|
||||
|
@ -266,10 +265,10 @@ index fdf6b45fb8..e01b2201d8 100644
|
|||
void hmp_device_add(Monitor *mon, const QDict *qdict);
|
||||
void hmp_device_del(Monitor *mon, const QDict *qdict);
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 38a4e2bcef..443b3238f9 100644
|
||||
index 620cc594b2..d16b97cf3c 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -1528,6 +1528,7 @@ keyutils = dependency('libkeyutils', required: false,
|
||||
@@ -1923,6 +1923,7 @@ endif
|
||||
has_gettid = cc.has_function('gettid')
|
||||
|
||||
libuuid = cc.find_library('uuid', required: true)
|
||||
|
@ -278,7 +277,7 @@ index 38a4e2bcef..443b3238f9 100644
|
|||
# libselinux
|
||||
selinux = dependency('libselinux',
|
||||
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
|
||||
index 91be698308..5b9c231a4c 100644
|
||||
index ef4634e5c1..6e25279f42 100644
|
||||
--- a/monitor/hmp-cmds.c
|
||||
+++ b/monitor/hmp-cmds.c
|
||||
@@ -21,6 +21,7 @@
|
||||
|
@ -587,10 +586,10 @@ index 0000000000..8cbf645b2c
|
|||
+#endif /* PROXMOX_BACKUP_CLIENT_H */
|
||||
diff --git a/pve-backup.c b/pve-backup.c
|
||||
new file mode 100644
|
||||
index 0000000000..dd72ee0ed6
|
||||
index 0000000000..9c13a92623
|
||||
--- /dev/null
|
||||
+++ b/pve-backup.c
|
||||
@@ -0,0 +1,1097 @@
|
||||
@@ -0,0 +1,1098 @@
|
||||
+#include "proxmox-backup-client.h"
|
||||
+#include "vma.h"
|
||||
+
|
||||
|
@ -601,10 +600,15 @@ index 0000000000..dd72ee0ed6
|
|||
+#include "block/block_int-global-state.h"
|
||||
+#include "block/blockjob.h"
|
||||
+#include "block/dirty-bitmap.h"
|
||||
+#include "block/graph-lock.h"
|
||||
+#include "qapi/qapi-commands-block.h"
|
||||
+#include "qapi/qmp/qerror.h"
|
||||
+#include "qemu/cutils.h"
|
||||
+
|
||||
+#if defined(CONFIG_MALLOC_TRIM)
|
||||
+#include <malloc.h>
|
||||
+#endif
|
||||
+
|
||||
+#include <proxmox-backup-qemu.h>
|
||||
+
|
||||
+/* PVE backup state and related function */
|
||||
|
@ -697,7 +701,7 @@ index 0000000000..dd72ee0ed6
|
|||
+ return error_or_canceled;
|
||||
+}
|
||||
+
|
||||
+static void pvebackup_add_transfered_bytes(size_t transferred, size_t zero_bytes, size_t reused)
|
||||
+static void pvebackup_add_transferred_bytes(size_t transferred, size_t zero_bytes, size_t reused)
|
||||
+{
|
||||
+ qemu_mutex_lock(&backup_state.stat.lock);
|
||||
+ backup_state.stat.zero_bytes += zero_bytes;
|
||||
|
@ -758,7 +762,7 @@ index 0000000000..dd72ee0ed6
|
|||
+ }
|
||||
+
|
||||
+ qemu_co_mutex_unlock(&backup_state.dump_callback_mutex);
|
||||
+ pvebackup_add_transfered_bytes(size, is_zero_block ? size : 0, reused);
|
||||
+ pvebackup_add_transferred_bytes(size, is_zero_block ? size : 0, reused);
|
||||
+
|
||||
+ return size;
|
||||
+}
|
||||
|
@ -816,11 +820,11 @@ index 0000000000..dd72ee0ed6
|
|||
+ } else {
|
||||
+ if (remaining >= VMA_CLUSTER_SIZE) {
|
||||
+ assert(ret == VMA_CLUSTER_SIZE);
|
||||
+ pvebackup_add_transfered_bytes(VMA_CLUSTER_SIZE, zero_bytes, 0);
|
||||
+ pvebackup_add_transferred_bytes(VMA_CLUSTER_SIZE, zero_bytes, 0);
|
||||
+ remaining -= VMA_CLUSTER_SIZE;
|
||||
+ } else {
|
||||
+ assert(ret == remaining);
|
||||
+ pvebackup_add_transfered_bytes(remaining, zero_bytes, 0);
|
||||
+ pvebackup_add_transferred_bytes(remaining, zero_bytes, 0);
|
||||
+ remaining = 0;
|
||||
+ }
|
||||
+ }
|
||||
|
@ -869,6 +873,14 @@ index 0000000000..dd72ee0ed6
|
|||
+ backup_state.stat.end_time = time(NULL);
|
||||
+ backup_state.stat.finishing = false;
|
||||
+ qemu_mutex_unlock(&backup_state.stat.lock);
|
||||
+
|
||||
+#if defined(CONFIG_MALLOC_TRIM)
|
||||
+ /*
|
||||
+ * Try to reclaim memory for buffers (and, in case of PBS, Rust futures), etc.
|
||||
+ * Won't happen by default if there is fragmentation.
|
||||
+ */
|
||||
+ malloc_trim(4 * 1024 * 1024);
|
||||
+#endif
|
||||
+}
|
||||
+
|
||||
+static void coroutine_fn pvebackup_co_complete_stream(void *opaque)
|
||||
|
@ -888,7 +900,12 @@ index 0000000000..dd72ee0ed6
|
|||
+
|
||||
+ qemu_co_mutex_lock(&backup_state.backup_mutex);
|
||||
+
|
||||
+ if (ret < 0) {
|
||||
+ /*
|
||||
+ * All jobs in the transaction will be canceled when one receives an error.
|
||||
+ * The first error wins, so only set it for ECANCELED if it was the last
|
||||
+ * job. This allows more interesting errors from other jobs to win.
|
||||
+ */
|
||||
+ if (ret < 0 && (ret != -ECANCELED || !g_list_nth(backup_state.di_list, 1))) {
|
||||
+ Error *local_err = NULL;
|
||||
+ error_setg(&local_err, "job failed with err %d - %s", ret, strerror(-ret));
|
||||
+ pvebackup_propagate_error(local_err);
|
||||
|
@ -912,13 +929,6 @@ index 0000000000..dd72ee0ed6
|
|||
+ }
|
||||
+ }
|
||||
+
|
||||
+ if (di->job) {
|
||||
+ WITH_JOB_LOCK_GUARD() {
|
||||
+ job_unref_locked(&di->job->job);
|
||||
+ di->job = NULL;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ // remove self from job list
|
||||
+ backup_state.di_list = g_list_remove(backup_state.di_list, di);
|
||||
+
|
||||
|
@ -938,6 +948,16 @@ index 0000000000..dd72ee0ed6
|
|||
+ di->completed_ret = ret;
|
||||
+
|
||||
+ /*
|
||||
+ * Needs to happen outside of coroutine, because it takes the graph write lock.
|
||||
+ */
|
||||
+ if (di->job) {
|
||||
+ WITH_JOB_LOCK_GUARD() {
|
||||
+ job_unref_locked(&di->job->job);
|
||||
+ di->job = NULL;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ /*
|
||||
+ * Schedule stream cleanup in async coroutine. close_image and finish might
|
||||
+ * take a while, so we can't block on them here. This way it also doesn't
|
||||
+ * matter if we're already running in a coroutine or not.
|
||||
|
@ -1020,7 +1040,6 @@ index 0000000000..dd72ee0ed6
|
|||
+ const char *file,
|
||||
+ const char *name,
|
||||
+ BackupFormat format,
|
||||
+ const char *backup_dir,
|
||||
+ VmaWriter *vmaw,
|
||||
+ ProxmoxBackupHandle *pbs,
|
||||
+ Error **errp)
|
||||
|
@ -1046,13 +1065,6 @@ index 0000000000..dd72ee0ed6
|
|||
+ } else if (format == BACKUP_FORMAT_PBS) {
|
||||
+ if (proxmox_backup_co_add_config(pbs, name, (unsigned char *)cdata, clen, errp) < 0)
|
||||
+ goto err;
|
||||
+ } else if (format == BACKUP_FORMAT_DIR) {
|
||||
+ char config_path[PATH_MAX];
|
||||
+ snprintf(config_path, PATH_MAX, "%s/%s", backup_dir, name);
|
||||
+ if (!g_file_set_contents(config_path, cdata, clen, &err)) {
|
||||
+ error_setg(errp, "unable to write config file '%s'", config_path);
|
||||
+ goto err;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ out:
|
||||
|
@ -1100,8 +1112,7 @@ index 0000000000..dd72ee0ed6
|
|||
+ sync_mode = MIRROR_SYNC_MODE_BITMAP;
|
||||
+ bitmap_mode = BITMAP_SYNC_MODE_ON_SUCCESS;
|
||||
+ }
|
||||
+ AioContext *aio_context = bdrv_get_aio_context(di->bs);
|
||||
+ aio_context_acquire(aio_context);
|
||||
+ bdrv_drained_begin(di->bs);
|
||||
+
|
||||
+ BlockJob *job = backup_job_create(
|
||||
+ NULL, di->bs, di->target, backup_state.speed, sync_mode, di->bitmap,
|
||||
|
@ -1109,7 +1120,7 @@ index 0000000000..dd72ee0ed6
|
|||
+ BLOCKDEV_ON_ERROR_REPORT, JOB_DEFAULT, pvebackup_complete_cb, di, backup_state.txn,
|
||||
+ &local_err);
|
||||
+
|
||||
+ aio_context_release(aio_context);
|
||||
+ bdrv_drained_end(di->bs);
|
||||
+
|
||||
+ di->job = job;
|
||||
+ if (job) {
|
||||
|
@ -1161,6 +1172,66 @@ index 0000000000..dd72ee0ed6
|
|||
+ aio_co_enter(data->ctx, data->co);
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ * Returns a list of device infos, which needs to be freed by the caller. In
|
||||
+ * case of an error, errp will be set, but the returned value might still be a
|
||||
+ * list.
|
||||
+ */
|
||||
+static GList coroutine_fn GRAPH_RDLOCK *get_device_info(
|
||||
+ const char *devlist,
|
||||
+ Error **errp)
|
||||
+{
|
||||
+ gchar **devs = NULL;
|
||||
+ GList *di_list = NULL;
|
||||
+
|
||||
+ if (devlist) {
|
||||
+ devs = g_strsplit_set(devlist, ",;:", -1);
|
||||
+
|
||||
+ gchar **d = devs;
|
||||
+ while (d && *d) {
|
||||
+ BlockBackend *blk = blk_by_name(*d);
|
||||
+ if (!blk) {
|
||||
+ error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
|
||||
+ "Device '%s' not found", *d);
|
||||
+ goto err;
|
||||
+ }
|
||||
+ BlockDriverState *bs = blk_bs(blk);
|
||||
+ if (!bdrv_co_is_inserted(bs)) {
|
||||
+ error_setg(errp, QERR_DEVICE_HAS_NO_MEDIUM, *d);
|
||||
+ goto err;
|
||||
+ }
|
||||
+ PVEBackupDevInfo *di = g_new0(PVEBackupDevInfo, 1);
|
||||
+ di->bs = bs;
|
||||
+ di_list = g_list_append(di_list, di);
|
||||
+ d++;
|
||||
+ }
|
||||
+ } else {
|
||||
+ BdrvNextIterator it;
|
||||
+
|
||||
+ for (BlockDriverState *bs = bdrv_first(&it); bs; bs = bdrv_next(&it)) {
|
||||
+ if (!bdrv_co_is_inserted(bs) || bdrv_is_read_only(bs)) {
|
||||
+ continue;
|
||||
+ }
|
||||
+
|
||||
+ PVEBackupDevInfo *di = g_new0(PVEBackupDevInfo, 1);
|
||||
+ di->bs = bs;
|
||||
+ di_list = g_list_append(di_list, di);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ if (!di_list) {
|
||||
+ error_set(errp, ERROR_CLASS_GENERIC_ERROR, "empty device list");
|
||||
+ goto err;
|
||||
+ }
|
||||
+
|
||||
+err:
|
||||
+ if (devs) {
|
||||
+ g_strfreev(devs);
|
||||
+ }
|
||||
+
|
||||
+ return di_list;
|
||||
+}
|
||||
+
|
||||
+UuidInfo coroutine_fn *qmp_backup(
|
||||
+ const char *backup_file,
|
||||
+ const char *password,
|
||||
|
@ -1186,14 +1257,10 @@ index 0000000000..dd72ee0ed6
|
|||
+
|
||||
+ qemu_co_mutex_lock(&backup_state.backup_mutex);
|
||||
+
|
||||
+ BlockBackend *blk;
|
||||
+ BlockDriverState *bs = NULL;
|
||||
+ const char *backup_dir = NULL;
|
||||
+ Error *local_err = NULL;
|
||||
+ uuid_t uuid;
|
||||
+ VmaWriter *vmaw = NULL;
|
||||
+ ProxmoxBackupHandle *pbs = NULL;
|
||||
+ gchar **devs = NULL;
|
||||
+ GList *di_list = NULL;
|
||||
+ GList *l;
|
||||
+ UuidInfo *uuid_info;
|
||||
|
@ -1211,48 +1278,14 @@ index 0000000000..dd72ee0ed6
|
|||
+ /* Todo: try to auto-detect format based on file name */
|
||||
+ format = has_format ? format : BACKUP_FORMAT_VMA;
|
||||
+
|
||||
+ if (devlist) {
|
||||
+ devs = g_strsplit_set(devlist, ",;:", -1);
|
||||
+
|
||||
+ gchar **d = devs;
|
||||
+ while (d && *d) {
|
||||
+ blk = blk_by_name(*d);
|
||||
+ if (blk) {
|
||||
+ bs = blk_bs(blk);
|
||||
+ if (!bdrv_co_is_inserted(bs)) {
|
||||
+ error_setg(errp, QERR_DEVICE_HAS_NO_MEDIUM, *d);
|
||||
+ goto err;
|
||||
+ }
|
||||
+ PVEBackupDevInfo *di = g_new0(PVEBackupDevInfo, 1);
|
||||
+ di->bs = bs;
|
||||
+ di_list = g_list_append(di_list, di);
|
||||
+ } else {
|
||||
+ error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
|
||||
+ "Device '%s' not found", *d);
|
||||
+ goto err;
|
||||
+ }
|
||||
+ d++;
|
||||
+ }
|
||||
+
|
||||
+ } else {
|
||||
+ BdrvNextIterator it;
|
||||
+
|
||||
+ bs = NULL;
|
||||
+ for (bs = bdrv_first(&it); bs; bs = bdrv_next(&it)) {
|
||||
+ if (!bdrv_co_is_inserted(bs) || bdrv_is_read_only(bs)) {
|
||||
+ continue;
|
||||
+ }
|
||||
+
|
||||
+ PVEBackupDevInfo *di = g_new0(PVEBackupDevInfo, 1);
|
||||
+ di->bs = bs;
|
||||
+ di_list = g_list_append(di_list, di);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ if (!di_list) {
|
||||
+ error_set(errp, ERROR_CLASS_GENERIC_ERROR, "empty device list");
|
||||
+ bdrv_graph_co_rdlock();
|
||||
+ di_list = get_device_info(devlist, &local_err);
|
||||
+ bdrv_graph_co_rdunlock();
|
||||
+ if (local_err) {
|
||||
+ error_propagate(errp, local_err);
|
||||
+ goto err;
|
||||
+ }
|
||||
+ assert(di_list);
|
||||
+
|
||||
+ size_t total = 0;
|
||||
+
|
||||
|
@ -1260,7 +1293,11 @@ index 0000000000..dd72ee0ed6
|
|||
+ while (l) {
|
||||
+ PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
|
||||
+ l = g_list_next(l);
|
||||
+ if (bdrv_op_is_blocked(di->bs, BLOCK_OP_TYPE_BACKUP_SOURCE, errp)) {
|
||||
+
|
||||
+ bdrv_graph_co_rdlock();
|
||||
+ bool blocked = bdrv_op_is_blocked(di->bs, BLOCK_OP_TYPE_BACKUP_SOURCE, errp);
|
||||
+ bdrv_graph_co_rdunlock();
|
||||
+ if (blocked) {
|
||||
+ goto err;
|
||||
+ }
|
||||
+
|
||||
|
@ -1344,7 +1381,9 @@ index 0000000000..dd72ee0ed6
|
|||
+
|
||||
+ di->block_size = dump_cb_block_size;
|
||||
+
|
||||
+ bdrv_graph_co_rdlock();
|
||||
+ const char *devname = bdrv_get_device_name(di->bs);
|
||||
+ bdrv_graph_co_rdunlock();
|
||||
+ PBSBitmapAction action = PBS_BITMAP_ACTION_NOT_USED;
|
||||
+ size_t dirty = di->size;
|
||||
+
|
||||
|
@ -1388,7 +1427,7 @@ index 0000000000..dd72ee0ed6
|
|||
+ goto err_mutex;
|
||||
+ }
|
||||
+
|
||||
+ if (!(di->target = bdrv_backup_dump_create(dump_cb_block_size, di->size, pvebackup_co_dump_pbs_cb, di, errp))) {
|
||||
+ if (!(di->target = bdrv_co_backup_dump_create(dump_cb_block_size, di->size, pvebackup_co_dump_pbs_cb, di, errp))) {
|
||||
+ goto err_mutex;
|
||||
+ }
|
||||
+
|
||||
|
@ -1416,11 +1455,13 @@ index 0000000000..dd72ee0ed6
|
|||
+ PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
|
||||
+ l = g_list_next(l);
|
||||
+
|
||||
+ if (!(di->target = bdrv_backup_dump_create(VMA_CLUSTER_SIZE, di->size, pvebackup_co_dump_vma_cb, di, errp))) {
|
||||
+ if (!(di->target = bdrv_co_backup_dump_create(VMA_CLUSTER_SIZE, di->size, pvebackup_co_dump_vma_cb, di, errp))) {
|
||||
+ goto err_mutex;
|
||||
+ }
|
||||
+
|
||||
+ bdrv_graph_co_rdlock();
|
||||
+ const char *devname = bdrv_get_device_name(di->bs);
|
||||
+ bdrv_graph_co_rdunlock();
|
||||
+ di->dev_id = vma_writer_register_stream(vmaw, devname, di->size);
|
||||
+ if (di->dev_id <= 0) {
|
||||
+ error_set(errp, ERROR_CLASS_GENERIC_ERROR,
|
||||
|
@ -1428,54 +1469,21 @@ index 0000000000..dd72ee0ed6
|
|||
+ goto err_mutex;
|
||||
+ }
|
||||
+ }
|
||||
+ } else if (format == BACKUP_FORMAT_DIR) {
|
||||
+ if (mkdir(backup_file, 0640) != 0) {
|
||||
+ error_setg_errno(errp, errno, "can't create directory '%s'\n",
|
||||
+ backup_file);
|
||||
+ goto err_mutex;
|
||||
+ }
|
||||
+ backup_dir = backup_file;
|
||||
+
|
||||
+ l = di_list;
|
||||
+ while (l) {
|
||||
+ PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
|
||||
+ l = g_list_next(l);
|
||||
+
|
||||
+ const char *devname = bdrv_get_device_name(di->bs);
|
||||
+ snprintf(di->targetfile, PATH_MAX, "%s/%s.raw", backup_dir, devname);
|
||||
+
|
||||
+ int flags = BDRV_O_RDWR;
|
||||
+ bdrv_img_create(di->targetfile, "raw", NULL, NULL, NULL,
|
||||
+ di->size, flags, false, &local_err);
|
||||
+ if (local_err) {
|
||||
+ error_propagate(errp, local_err);
|
||||
+ goto err_mutex;
|
||||
+ }
|
||||
+
|
||||
+ di->target = bdrv_co_open(di->targetfile, NULL, NULL, flags, &local_err);
|
||||
+ if (!di->target) {
|
||||
+ error_propagate(errp, local_err);
|
||||
+ goto err_mutex;
|
||||
+ }
|
||||
+ }
|
||||
+ } else {
|
||||
+ error_set(errp, ERROR_CLASS_GENERIC_ERROR, "unknown backup format");
|
||||
+ goto err_mutex;
|
||||
+ }
|
||||
+
|
||||
+
|
||||
+ /* add configuration file to archive */
|
||||
+ if (config_file) {
|
||||
+ if (pvebackup_co_add_config(config_file, config_name, format, backup_dir,
|
||||
+ vmaw, pbs, errp) != 0) {
|
||||
+ if (pvebackup_co_add_config(config_file, config_name, format, vmaw, pbs, errp) != 0) {
|
||||
+ goto err_mutex;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ /* add firewall file to archive */
|
||||
+ if (firewall_file) {
|
||||
+ if (pvebackup_co_add_config(firewall_file, firewall_name, format, backup_dir,
|
||||
+ vmaw, pbs, errp) != 0) {
|
||||
+ if (pvebackup_co_add_config(firewall_file, firewall_name, format, vmaw, pbs, errp) != 0) {
|
||||
+ goto err_mutex;
|
||||
+ }
|
||||
+ }
|
||||
|
@ -1573,10 +1581,6 @@ index 0000000000..dd72ee0ed6
|
|||
+ g_list_free(di_list);
|
||||
+ backup_state.di_list = NULL;
|
||||
+
|
||||
+ if (devs) {
|
||||
+ g_strfreev(devs);
|
||||
+ }
|
||||
+
|
||||
+ if (vmaw) {
|
||||
+ Error *err = NULL;
|
||||
+ vma_writer_close(vmaw, &err);
|
||||
|
@ -1588,10 +1592,6 @@ index 0000000000..dd72ee0ed6
|
|||
+ backup_state.pbs = NULL;
|
||||
+ }
|
||||
+
|
||||
+ if (backup_dir) {
|
||||
+ rmdir(backup_dir);
|
||||
+ }
|
||||
+
|
||||
+ qemu_co_mutex_unlock(&backup_state.backup_mutex);
|
||||
+ return NULL;
|
||||
+}
|
||||
|
@ -1689,10 +1689,10 @@ index 0000000000..dd72ee0ed6
|
|||
+ return ret;
|
||||
+}
|
||||
diff --git a/qapi/block-core.json b/qapi/block-core.json
|
||||
index 542add004b..4ec70acf95 100644
|
||||
index f7c2b63c5d..e49c7b5bc9 100644
|
||||
--- a/qapi/block-core.json
|
||||
+++ b/qapi/block-core.json
|
||||
@@ -835,6 +835,232 @@
|
||||
@@ -851,6 +851,239 @@
|
||||
{ 'command': 'query-block', 'returns': ['BlockInfo'],
|
||||
'allow-preconfig': true }
|
||||
|
||||
|
@ -1742,9 +1742,12 @@ index 542add004b..4ec70acf95 100644
|
|||
+# An enumeration of supported backup formats.
|
||||
+#
|
||||
+# @vma: Proxmox vma backup format
|
||||
+#
|
||||
+# @pbs: Proxmox backup server format
|
||||
+#
|
||||
+##
|
||||
+{ 'enum': 'BackupFormat',
|
||||
+ 'data': [ 'vma', 'dir', 'pbs' ] }
|
||||
+ 'data': [ 'vma', 'pbs' ] }
|
||||
+
|
||||
+##
|
||||
+# @backup:
|
||||
|
@ -1758,6 +1761,9 @@ index 542add004b..4ec70acf95 100644
|
|||
+# @config-file: a configuration file to include into
|
||||
+# the backup archive.
|
||||
+#
|
||||
+# @firewall-file: a firewall configuration file to include into the backup
|
||||
+# archive.
|
||||
+#
|
||||
+# @speed: the maximum speed, in bytes per second
|
||||
+#
|
||||
+# @devlist: list of block device names (separated by ',', ';'
|
||||
|
@ -1825,8 +1831,6 @@ index 542add004b..4ec70acf95 100644
|
|||
+#
|
||||
+# Cancel the current executing backup process.
|
||||
+#
|
||||
+# Returns: nothing on success
|
||||
+#
|
||||
+# Notes: This command succeeds even if there is no backup process running.
|
||||
+#
|
||||
+##
|
||||
|
@ -1850,6 +1854,9 @@ index 542add004b..4ec70acf95 100644
|
|||
+#
|
||||
+# @pbs-library-version: Running version of libproxmox-backup-qemu0 library.
|
||||
+#
|
||||
+# @backup-max-workers: Whether the 'max-workers' @BackupPerf setting is
|
||||
+# supported or not.
|
||||
+#
|
||||
+##
|
||||
+{ 'struct': 'ProxmoxSupportStatus',
|
||||
+ 'data': { 'pbs-dirty-bitmap': 'bool',
|
||||
|
@ -1926,10 +1933,10 @@ index 542add004b..4ec70acf95 100644
|
|||
# @BlockDeviceTimedStats:
|
||||
#
|
||||
diff --git a/qapi/common.json b/qapi/common.json
|
||||
index 356db3f670..aae8a3b682 100644
|
||||
index 7558ce5430..6e3d800373 100644
|
||||
--- a/qapi/common.json
|
||||
+++ b/qapi/common.json
|
||||
@@ -206,3 +206,16 @@
|
||||
@@ -200,3 +200,17 @@
|
||||
##
|
||||
{ 'struct': 'HumanReadableText',
|
||||
'data': { 'human-readable-text': 'str' } }
|
||||
|
@ -1943,11 +1950,12 @@ index 356db3f670..aae8a3b682 100644
|
|||
+#
|
||||
+# Since: 0.14.0
|
||||
+#
|
||||
+# Notes: If no UUID was specified for the guest, a null UUID is returned.
|
||||
+# Notes: If no UUID was specified for the guest, a null UUID is
|
||||
+# returned.
|
||||
+##
|
||||
+{ 'struct': 'UuidInfo', 'data': {'UUID': 'str'} }
|
||||
diff --git a/qapi/machine.json b/qapi/machine.json
|
||||
index 47f3facdb2..46760978ae 100644
|
||||
index 1d69bffaa0..731d8d2f60 100644
|
||||
--- a/qapi/machine.json
|
||||
+++ b/qapi/machine.json
|
||||
@@ -4,6 +4,8 @@
|
||||
|
@ -1959,7 +1967,7 @@ index 47f3facdb2..46760978ae 100644
|
|||
##
|
||||
# = Machines
|
||||
##
|
||||
@@ -228,19 +230,6 @@
|
||||
@@ -237,20 +239,6 @@
|
||||
##
|
||||
{ 'command': 'query-target', 'returns': 'TargetInfo' }
|
||||
|
||||
|
@ -1972,7 +1980,8 @@ index 47f3facdb2..46760978ae 100644
|
|||
-#
|
||||
-# Since: 0.14
|
||||
-#
|
||||
-# Notes: If no UUID was specified for the guest, a null UUID is returned.
|
||||
-# Notes: If no UUID was specified for the guest, a null UUID is
|
||||
-# returned.
|
||||
-##
|
||||
-{ 'struct': 'UuidInfo', 'data': {'UUID': 'str'} }
|
||||
-
|
||||
|
|
|
@ -14,10 +14,10 @@ Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
|
|||
create mode 100644 pbs-restore.c
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 443b3238f9..32ab849ce6 100644
|
||||
index d16b97cf3c..6de51c34cb 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -3656,6 +3656,10 @@ if have_tools
|
||||
@@ -4029,6 +4029,10 @@ if have_tools
|
||||
vma = executable('vma', files('vma.c', 'vma-reader.c') + genh,
|
||||
dependencies: [authz, block, crypto, io, qom], install: true)
|
||||
|
||||
|
@ -26,8 +26,8 @@ index 443b3238f9..32ab849ce6 100644
|
|||
+ libproxmox_backup_qemu], install: true)
|
||||
+
|
||||
subdir('storage-daemon')
|
||||
subdir('contrib/rdmacm-mux')
|
||||
subdir('contrib/elf2dmp')
|
||||
|
||||
foreach exe: [ 'qemu-img', 'qemu-io', 'qemu-nbd', 'qemu-storage-daemon']
|
||||
diff --git a/pbs-restore.c b/pbs-restore.c
|
||||
new file mode 100644
|
||||
index 0000000000..f03d9bab8d
|
||||
|
|
|
@ -14,35 +14,33 @@ Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
|
|||
getlength is now a coroutine function]
|
||||
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
---
|
||||
block/meson.build | 3 +
|
||||
block/pbs.c | 305 +++++++++++++++++++++++++++++++++++++++++++
|
||||
configure | 9 ++
|
||||
block/meson.build | 2 +
|
||||
block/pbs.c | 307 +++++++++++++++++++++++++++++++++++++++++++
|
||||
meson.build | 2 +-
|
||||
qapi/block-core.json | 13 ++
|
||||
qapi/block-core.json | 29 ++++
|
||||
qapi/pragma.json | 1 +
|
||||
6 files changed, 332 insertions(+), 1 deletion(-)
|
||||
5 files changed, 340 insertions(+), 1 deletion(-)
|
||||
create mode 100644 block/pbs.c
|
||||
|
||||
diff --git a/block/meson.build b/block/meson.build
|
||||
index 5bcebb934b..eece0d5743 100644
|
||||
index 6bba803f94..1945e04eeb 100644
|
||||
--- a/block/meson.build
|
||||
+++ b/block/meson.build
|
||||
@@ -54,6 +54,9 @@ block_ss.add(files(
|
||||
@@ -49,6 +49,8 @@ block_ss.add(files(
|
||||
'../pve-backup.c',
|
||||
), libproxmox_backup_qemu)
|
||||
|
||||
+block_ss.add(when: 'CONFIG_PBS_BDRV', if_true: files('pbs.c'))
|
||||
+block_ss.add(when: 'CONFIG_PBS_BDRV', if_true: libproxmox_backup_qemu)
|
||||
+block_ss.add(files('pbs.c'), libproxmox_backup_qemu)
|
||||
+
|
||||
|
||||
softmmu_ss.add(when: 'CONFIG_TCG', if_true: files('blkreplay.c'))
|
||||
softmmu_ss.add(files('block-ram-registrar.c'))
|
||||
system_ss.add(when: 'CONFIG_TCG', if_true: files('blkreplay.c'))
|
||||
system_ss.add(files('block-ram-registrar.c'))
|
||||
diff --git a/block/pbs.c b/block/pbs.c
|
||||
new file mode 100644
|
||||
index 0000000000..a2211e0f3b
|
||||
index 0000000000..dd72356bd3
|
||||
--- /dev/null
|
||||
+++ b/block/pbs.c
|
||||
@@ -0,0 +1,305 @@
|
||||
@@ -0,0 +1,307 @@
|
||||
+/*
|
||||
+ * Proxmox Backup Server read-only block driver
|
||||
+ */
|
||||
|
@ -234,7 +232,8 @@ index 0000000000..a2211e0f3b
|
|||
+ proxmox_restore_disconnect(s->conn);
|
||||
+}
|
||||
+
|
||||
+static coroutine_fn int64_t pbs_co_getlength(BlockDriverState *bs)
|
||||
+static coroutine_fn int64_t GRAPH_RDLOCK
|
||||
+pbs_co_getlength(BlockDriverState *bs)
|
||||
+{
|
||||
+ BDRVPBSState *s = bs->opaque;
|
||||
+ return s->length;
|
||||
|
@ -251,9 +250,9 @@ index 0000000000..a2211e0f3b
|
|||
+ aio_co_schedule(rcb->ctx, rcb->co);
|
||||
+}
|
||||
+
|
||||
+static coroutine_fn int pbs_co_preadv(BlockDriverState *bs,
|
||||
+ int64_t offset, int64_t bytes,
|
||||
+ QEMUIOVector *qiov, BdrvRequestFlags flags)
|
||||
+static coroutine_fn int GRAPH_RDLOCK
|
||||
+pbs_co_preadv(BlockDriverState *bs, int64_t offset, int64_t bytes,
|
||||
+ QEMUIOVector *qiov, BdrvRequestFlags flags)
|
||||
+{
|
||||
+ BDRVPBSState *s = bs->opaque;
|
||||
+ int ret;
|
||||
|
@ -298,16 +297,17 @@ index 0000000000..a2211e0f3b
|
|||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static coroutine_fn int pbs_co_pwritev(BlockDriverState *bs,
|
||||
+ int64_t offset, int64_t bytes,
|
||||
+ QEMUIOVector *qiov, BdrvRequestFlags flags)
|
||||
+static coroutine_fn int GRAPH_RDLOCK
|
||||
+pbs_co_pwritev(BlockDriverState *bs, int64_t offset, int64_t bytes,
|
||||
+ QEMUIOVector *qiov, BdrvRequestFlags flags)
|
||||
+{
|
||||
+ fprintf(stderr, "pbs-bdrv: cannot write to backup file, make sure "
|
||||
+ "any attached disk devices are set to read-only!\n");
|
||||
+ return -EPERM;
|
||||
+}
|
||||
+
|
||||
+static void pbs_refresh_filename(BlockDriverState *bs)
|
||||
+static void GRAPH_RDLOCK
|
||||
+pbs_refresh_filename(BlockDriverState *bs)
|
||||
+{
|
||||
+ BDRVPBSState *s = bs->opaque;
|
||||
+ if (s->namespace) {
|
||||
|
@ -348,52 +348,11 @@ index 0000000000..a2211e0f3b
|
|||
+}
|
||||
+
|
||||
+block_init(bdrv_pbs_init);
|
||||
diff --git a/configure b/configure
|
||||
index a62a3e6be9..1ac0feb46b 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -288,6 +288,7 @@ linux_user=""
|
||||
bsd_user=""
|
||||
pie=""
|
||||
coroutine=""
|
||||
+pbs_bdrv="yes"
|
||||
plugins="$default_feature"
|
||||
meson=""
|
||||
ninja=""
|
||||
@@ -873,6 +874,10 @@ for opt do
|
||||
;;
|
||||
--with-coroutine=*) coroutine="$optarg"
|
||||
;;
|
||||
+ --disable-pbs-bdrv) pbs_bdrv="no"
|
||||
+ ;;
|
||||
+ --enable-pbs-bdrv) pbs_bdrv="yes"
|
||||
+ ;;
|
||||
--with-git=*) git="$optarg"
|
||||
;;
|
||||
--with-git-submodules=*)
|
||||
@@ -1049,6 +1054,7 @@ cat << EOF
|
||||
debug-info debugging information
|
||||
safe-stack SafeStack Stack Smash Protection. Depends on
|
||||
clang/llvm and requires coroutine backend ucontext.
|
||||
+ pbs-bdrv Proxmox backup server read-only block driver support
|
||||
|
||||
NOTE: The object files are built at the place where configure is launched
|
||||
EOF
|
||||
@@ -2386,6 +2392,9 @@ echo "TARGET_DIRS=$target_list" >> $config_host_mak
|
||||
if test "$modules" = "yes"; then
|
||||
echo "CONFIG_MODULES=y" >> $config_host_mak
|
||||
fi
|
||||
+if test "$pbs_bdrv" = "yes" ; then
|
||||
+ echo "CONFIG_PBS_BDRV=y" >> $config_host_mak
|
||||
+fi
|
||||
|
||||
# XXX: suppress that
|
||||
if [ "$bsd" = "yes" ] ; then
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 32ab849ce6..69afe3441b 100644
|
||||
index 6de51c34cb..3bc039f60f 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -4041,7 +4041,7 @@ summary_info += {'bzip2 support': libbzip2}
|
||||
@@ -4477,7 +4477,7 @@ summary_info += {'bzip2 support': libbzip2}
|
||||
summary_info += {'lzfse support': liblzfse}
|
||||
summary_info += {'zstd support': zstd}
|
||||
summary_info += {'NUMA host support': numa}
|
||||
|
@ -403,10 +362,10 @@ index 32ab849ce6..69afe3441b 100644
|
|||
summary_info += {'libdaxctl support': libdaxctl}
|
||||
summary_info += {'libudev': libudev}
|
||||
diff --git a/qapi/block-core.json b/qapi/block-core.json
|
||||
index 4ec70acf95..47118bf83e 100644
|
||||
index e49c7b5bc9..fc32ff9957 100644
|
||||
--- a/qapi/block-core.json
|
||||
+++ b/qapi/block-core.json
|
||||
@@ -3301,6 +3301,7 @@
|
||||
@@ -3457,6 +3457,7 @@
|
||||
'parallels', 'preallocate', 'qcow', 'qcow2', 'qed', 'quorum',
|
||||
'raw', 'rbd',
|
||||
{ 'name': 'replication', 'if': 'CONFIG_REPLICATION' },
|
||||
|
@ -414,7 +373,7 @@ index 4ec70acf95..47118bf83e 100644
|
|||
'ssh', 'throttle', 'vdi', 'vhdx',
|
||||
{ 'name': 'virtio-blk-vfio-pci', 'if': 'CONFIG_BLKIO' },
|
||||
{ 'name': 'virtio-blk-vhost-user', 'if': 'CONFIG_BLKIO' },
|
||||
@@ -3377,6 +3378,17 @@
|
||||
@@ -3543,6 +3544,33 @@
|
||||
{ 'struct': 'BlockdevOptionsNull',
|
||||
'data': { '*size': 'int', '*latency-ns': 'uint64', '*read-zeroes': 'bool' } }
|
||||
|
||||
|
@ -423,6 +382,22 @@ index 4ec70acf95..47118bf83e 100644
|
|||
+#
|
||||
+# Driver specific block device options for the PBS backend.
|
||||
+#
|
||||
+# @repository: Proxmox Backup Server repository.
|
||||
+#
|
||||
+# @snapshot: backup snapshots ID.
|
||||
+#
|
||||
+# @archive: archive name.
|
||||
+#
|
||||
+# @keyfile: keyfile to use for encryption.
|
||||
+#
|
||||
+# @password: password to use for connection.
|
||||
+#
|
||||
+# @fingerprint: backup server fingerprint.
|
||||
+#
|
||||
+# @key_password: password to unlock key.
|
||||
+#
|
||||
+# @namespace: namespace where backup snapshot lives.
|
||||
+#
|
||||
+##
|
||||
+{ 'struct': 'BlockdevOptionsPbs',
|
||||
+ 'data': { 'repository': 'str', 'snapshot': 'str', 'archive': 'str',
|
||||
|
@ -432,7 +407,7 @@ index 4ec70acf95..47118bf83e 100644
|
|||
##
|
||||
# @BlockdevOptionsNVMe:
|
||||
#
|
||||
@@ -4750,6 +4762,7 @@
|
||||
@@ -4977,6 +5005,7 @@
|
||||
'nfs': 'BlockdevOptionsNfs',
|
||||
'null-aio': 'BlockdevOptionsNull',
|
||||
'null-co': 'BlockdevOptionsNull',
|
||||
|
@ -441,10 +416,10 @@ index 4ec70acf95..47118bf83e 100644
|
|||
'nvme-io_uring': { 'type': 'BlockdevOptionsNvmeIoUring',
|
||||
'if': 'CONFIG_BLKIO' },
|
||||
diff --git a/qapi/pragma.json b/qapi/pragma.json
|
||||
index 325e684411..b6079f6a0e 100644
|
||||
index be8fa304c5..7ff46bd128 100644
|
||||
--- a/qapi/pragma.json
|
||||
+++ b/qapi/pragma.json
|
||||
@@ -45,6 +45,7 @@
|
||||
@@ -100,6 +100,7 @@
|
||||
'BlockInfo', # query-block
|
||||
'BlockdevAioOptions', # blockdev-add, -blockdev
|
||||
'BlockdevDriver', # blockdev-add, query-blockstats, ...
|
||||
|
|
|
@ -9,15 +9,15 @@ fitting.
|
|||
Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
|
||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
---
|
||||
meson.build | 2 ++
|
||||
meson.build | 3 ++-
|
||||
os-posix.c | 7 +++++--
|
||||
2 files changed, 7 insertions(+), 2 deletions(-)
|
||||
2 files changed, 7 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 69afe3441b..b2e9b2aec7 100644
|
||||
index 3bc039f60f..067e8956a7 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -1528,6 +1528,7 @@ keyutils = dependency('libkeyutils', required: false,
|
||||
@@ -1923,6 +1923,7 @@ endif
|
||||
has_gettid = cc.has_function('gettid')
|
||||
|
||||
libuuid = cc.find_library('uuid', required: true)
|
||||
|
@ -25,28 +25,29 @@ index 69afe3441b..b2e9b2aec7 100644
|
|||
libproxmox_backup_qemu = cc.find_library('proxmox_backup_qemu', required: true)
|
||||
|
||||
# libselinux
|
||||
@@ -3144,6 +3145,7 @@ if have_block
|
||||
# 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')])
|
||||
@@ -3530,7 +3531,7 @@ if have_block
|
||||
if host_os == 'windows'
|
||||
system_ss.add(files('os-win32.c'))
|
||||
else
|
||||
- blockdev_ss.add(files('os-posix.c'))
|
||||
+ blockdev_ss.add(files('os-posix.c'), libsystemd)
|
||||
endif
|
||||
endif
|
||||
|
||||
diff --git a/os-posix.c b/os-posix.c
|
||||
index 90ea71725f..33745a8c22 100644
|
||||
index a4284e2c07..197a2120fd 100644
|
||||
--- a/os-posix.c
|
||||
+++ b/os-posix.c
|
||||
@@ -28,6 +28,8 @@
|
||||
@@ -29,6 +29,8 @@
|
||||
#include <pwd.h>
|
||||
#include <grp.h>
|
||||
#include <libgen.h>
|
||||
+#include <systemd/sd-journal.h>
|
||||
+#include <syslog.h>
|
||||
|
||||
/* Needed early for CONFIG_BSD etc. */
|
||||
#include "net/slirp.h"
|
||||
@@ -301,9 +303,10 @@ void os_setup_post(void)
|
||||
#include "qemu/error-report.h"
|
||||
#include "qemu/log.h"
|
||||
@@ -302,9 +304,10 @@ void os_setup_post(void)
|
||||
|
||||
dup2(fd, 0);
|
||||
dup2(fd, 1);
|
||||
|
|
|
@ -26,10 +26,10 @@ Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
|||
create mode 100644 migration/pbs-state.c
|
||||
|
||||
diff --git a/include/migration/misc.h b/include/migration/misc.h
|
||||
index 8b49841016..78f63ca400 100644
|
||||
index c9e200f4eb..12c99ebc69 100644
|
||||
--- a/include/migration/misc.h
|
||||
+++ b/include/migration/misc.h
|
||||
@@ -77,4 +77,7 @@ bool migration_in_bg_snapshot(void);
|
||||
@@ -117,4 +117,7 @@ bool migration_in_bg_snapshot(void);
|
||||
/* migration/block-dirty-bitmap.c */
|
||||
void dirty_bitmap_mig_init(void);
|
||||
|
||||
|
@ -38,32 +38,31 @@ index 8b49841016..78f63ca400 100644
|
|||
+
|
||||
#endif
|
||||
diff --git a/migration/meson.build b/migration/meson.build
|
||||
index a7824b5266..de6a271b58 100644
|
||||
index 800f12a60d..35a4306183 100644
|
||||
--- a/migration/meson.build
|
||||
+++ b/migration/meson.build
|
||||
@@ -6,8 +6,10 @@ migration_files = files(
|
||||
@@ -7,7 +7,9 @@ migration_files = files(
|
||||
'vmstate.c',
|
||||
'qemu-file.c',
|
||||
'yank_functions.c',
|
||||
+ 'pbs-state.c',
|
||||
)
|
||||
softmmu_ss.add(migration_files)
|
||||
+softmmu_ss.add(libproxmox_backup_qemu)
|
||||
+system_ss.add(libproxmox_backup_qemu)
|
||||
|
||||
softmmu_ss.add(files(
|
||||
system_ss.add(files(
|
||||
'block-dirty-bitmap.c',
|
||||
diff --git a/migration/migration.c b/migration/migration.c
|
||||
index 99f86bd6c2..db229e72c9 100644
|
||||
index 86bf76e925..b8d7e471a4 100644
|
||||
--- a/migration/migration.c
|
||||
+++ b/migration/migration.c
|
||||
@@ -245,6 +245,7 @@ void migration_object_init(void)
|
||||
@@ -239,6 +239,7 @@ void migration_object_init(void)
|
||||
blk_mig_init();
|
||||
ram_mig_init();
|
||||
dirty_bitmap_mig_init();
|
||||
+ pbs_state_mig_init();
|
||||
}
|
||||
|
||||
void migration_cancel(const Error *error)
|
||||
typedef struct {
|
||||
diff --git a/migration/pbs-state.c b/migration/pbs-state.c
|
||||
new file mode 100644
|
||||
index 0000000000..887e998b9e
|
||||
|
@ -175,10 +174,10 @@ index 0000000000..887e998b9e
|
|||
+ NULL);
|
||||
+}
|
||||
diff --git a/pve-backup.c b/pve-backup.c
|
||||
index dd72ee0ed6..cb5312fff3 100644
|
||||
index 9c13a92623..9d480a8eec 100644
|
||||
--- a/pve-backup.c
|
||||
+++ b/pve-backup.c
|
||||
@@ -1090,6 +1090,7 @@ ProxmoxSupportStatus *qmp_query_proxmox_support(Error **errp)
|
||||
@@ -1091,6 +1091,7 @@ ProxmoxSupportStatus *qmp_query_proxmox_support(Error **errp)
|
||||
ret->pbs_library_version = g_strdup(proxmox_backup_qemu_version());
|
||||
ret->pbs_dirty_bitmap = true;
|
||||
ret->pbs_dirty_bitmap_savevm = true;
|
||||
|
@ -187,10 +186,10 @@ index dd72ee0ed6..cb5312fff3 100644
|
|||
ret->pbs_masterkey = true;
|
||||
ret->backup_max_workers = true;
|
||||
diff --git a/qapi/block-core.json b/qapi/block-core.json
|
||||
index 47118bf83e..809f3c61bc 100644
|
||||
index fc32ff9957..f516d8e95a 100644
|
||||
--- a/qapi/block-core.json
|
||||
+++ b/qapi/block-core.json
|
||||
@@ -984,6 +984,11 @@
|
||||
@@ -1004,6 +1004,11 @@
|
||||
# @pbs-dirty-bitmap-savevm: True if 'dirty-bitmaps' migration capability can
|
||||
# safely be set for savevm-async.
|
||||
#
|
||||
|
@ -202,7 +201,7 @@ index 47118bf83e..809f3c61bc 100644
|
|||
# @pbs-masterkey: True if the QMP backup call supports the 'master_keyfile'
|
||||
# parameter.
|
||||
#
|
||||
@@ -994,6 +999,7 @@
|
||||
@@ -1017,6 +1022,7 @@
|
||||
'data': { 'pbs-dirty-bitmap': 'bool',
|
||||
'query-bitmap-info': 'bool',
|
||||
'pbs-dirty-bitmap-savevm': 'bool',
|
||||
|
|
|
@ -19,10 +19,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c
|
||||
index fe73aa94b1..a6440929fa 100644
|
||||
index 2708abf3d7..fb17c01308 100644
|
||||
--- a/migration/block-dirty-bitmap.c
|
||||
+++ b/migration/block-dirty-bitmap.c
|
||||
@@ -539,7 +539,7 @@ static int add_bitmaps_to_list(DBMSaveState *s, BlockDriverState *bs,
|
||||
@@ -540,7 +540,7 @@ static int add_bitmaps_to_list(DBMSaveState *s, BlockDriverState *bs,
|
||||
|
||||
if (bdrv_dirty_bitmap_check(bitmap, BDRV_BITMAP_DEFAULT, &local_err)) {
|
||||
error_report_err(local_err);
|
||||
|
|
|
@ -21,7 +21,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|||
1 file changed, 30 insertions(+)
|
||||
|
||||
diff --git a/block/iscsi.c b/block/iscsi.c
|
||||
index 9fc0bed90b..1d40933165 100644
|
||||
index 2ff14b7472..46f275fbf7 100644
|
||||
--- a/block/iscsi.c
|
||||
+++ b/block/iscsi.c
|
||||
@@ -1392,12 +1392,42 @@ static char *get_initiator_name(QemuOpts *opts)
|
||||
|
|
|
@ -11,7 +11,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/block/stream.c b/block/stream.c
|
||||
index 7f9e1ecdbb..6a29d80398 100644
|
||||
index 7031eef12b..d2da83ae7c 100644
|
||||
--- a/block/stream.c
|
||||
+++ b/block/stream.c
|
||||
@@ -27,7 +27,7 @@ enum {
|
||||
|
|
|
@ -19,27 +19,33 @@ well.
|
|||
This only worked if the target supports backing images, so up until now
|
||||
only for qcow2, with alloc-track any driver for the target can be used.
|
||||
|
||||
If 'auto-remove' is set, alloc-track will automatically detach itself
|
||||
once the backing image is removed. It will be replaced by 'file'.
|
||||
Replacing the node cannot be done in the
|
||||
track_co_change_backing_file() callback, because replacing a node
|
||||
cannot happen in a coroutine and requires the block graph lock
|
||||
exclusively. Could either become a special option for the stream job,
|
||||
or maybe the upcoming blockdev-replace QMP command can be used in the
|
||||
future.
|
||||
|
||||
Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
|
||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
[FE: adapt to changed function signatures
|
||||
make error return value consistent with QEMU
|
||||
avoid premature break during read]
|
||||
avoid premature break during read
|
||||
adhere to block graph lock requirements]
|
||||
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
---
|
||||
block/alloc-track.c | 352 ++++++++++++++++++++++++++++++++++++++++++++
|
||||
block/alloc-track.c | 366 ++++++++++++++++++++++++++++++++++++++++++++
|
||||
block/meson.build | 1 +
|
||||
2 files changed, 353 insertions(+)
|
||||
block/stream.c | 34 ++++
|
||||
3 files changed, 401 insertions(+)
|
||||
create mode 100644 block/alloc-track.c
|
||||
|
||||
diff --git a/block/alloc-track.c b/block/alloc-track.c
|
||||
new file mode 100644
|
||||
index 0000000000..b75d7c6460
|
||||
index 0000000000..b9f8ea9137
|
||||
--- /dev/null
|
||||
+++ b/block/alloc-track.c
|
||||
@@ -0,0 +1,352 @@
|
||||
@@ -0,0 +1,366 @@
|
||||
+/*
|
||||
+ * Node to allow backing images to be applied to any node. Assumes a blank
|
||||
+ * image to begin with, only new writes are tracked as allocated, thus this
|
||||
|
@ -56,9 +62,11 @@ index 0000000000..b75d7c6460
|
|||
+#include "qapi/error.h"
|
||||
+#include "block/block_int.h"
|
||||
+#include "block/dirty-bitmap.h"
|
||||
+#include "block/graph-lock.h"
|
||||
+#include "qapi/qmp/qdict.h"
|
||||
+#include "qapi/qmp/qstring.h"
|
||||
+#include "qemu/cutils.h"
|
||||
+#include "qemu/error-report.h"
|
||||
+#include "qemu/option.h"
|
||||
+#include "qemu/module.h"
|
||||
+#include "sysemu/block-backend.h"
|
||||
|
@ -67,12 +75,12 @@ index 0000000000..b75d7c6460
|
|||
+
|
||||
+typedef enum DropState {
|
||||
+ DropNone,
|
||||
+ DropRequested,
|
||||
+ DropInProgress,
|
||||
+} DropState;
|
||||
+
|
||||
+typedef struct {
|
||||
+ BdrvDirtyBitmap *bitmap;
|
||||
+ uint64_t granularity;
|
||||
+ DropState drop_state;
|
||||
+ bool auto_remove;
|
||||
+} BDRVAllocTrackState;
|
||||
|
@ -91,26 +99,29 @@ index 0000000000..b75d7c6460
|
|||
+ },
|
||||
+};
|
||||
+
|
||||
+static void track_refresh_limits(BlockDriverState *bs, Error **errp)
|
||||
+static void GRAPH_RDLOCK
|
||||
+track_refresh_limits(BlockDriverState *bs, Error **errp)
|
||||
+{
|
||||
+ BlockDriverInfo bdi;
|
||||
+ BDRVAllocTrackState *s = bs->opaque;
|
||||
+
|
||||
+ if (!bs->file) {
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ /* always use alignment from underlying write device so RMW cycle for
|
||||
+ * bdrv_pwritev reads data from our backing via track_co_preadv (no partial
|
||||
+ * cluster allocation in 'file') */
|
||||
+ bdrv_get_info(bs->file->bs, &bdi);
|
||||
+ /*
|
||||
+ * Always use alignment from underlying write device so RMW cycle for
|
||||
+ * bdrv_pwritev reads data from our backing via track_co_preadv. Also use at
|
||||
+ * least the bitmap granularity.
|
||||
+ */
|
||||
+ bs->bl.request_alignment = MAX(bs->file->bs->bl.request_alignment,
|
||||
+ MAX(bdi.cluster_size, BDRV_SECTOR_SIZE));
|
||||
+ s->granularity);
|
||||
+}
|
||||
+
|
||||
+static int track_open(BlockDriverState *bs, QDict *options, int flags,
|
||||
+ Error **errp)
|
||||
+{
|
||||
+ BDRVAllocTrackState *s = bs->opaque;
|
||||
+ BdrvChild *file = NULL;
|
||||
+ QemuOpts *opts;
|
||||
+ Error *local_err = NULL;
|
||||
+ int ret = 0;
|
||||
|
@ -126,18 +137,45 @@ index 0000000000..b75d7c6460
|
|||
+ s->auto_remove = qemu_opt_get_bool(opts, TRACK_OPT_AUTO_REMOVE, false);
|
||||
+
|
||||
+ /* open the target (write) node, backing will be attached by block layer */
|
||||
+ bs->file = bdrv_open_child(NULL, options, "file", bs, &child_of_bds,
|
||||
+ BDRV_CHILD_DATA | BDRV_CHILD_METADATA, false,
|
||||
+ &local_err);
|
||||
+ file = bdrv_open_child(NULL, options, "file", bs, &child_of_bds,
|
||||
+ BDRV_CHILD_DATA | BDRV_CHILD_METADATA, false,
|
||||
+ &local_err);
|
||||
+ bdrv_graph_wrlock();
|
||||
+ bs->file = file;
|
||||
+ bdrv_graph_wrunlock();
|
||||
+ if (local_err) {
|
||||
+ ret = -EINVAL;
|
||||
+ error_propagate(errp, local_err);
|
||||
+ goto fail;
|
||||
+ }
|
||||
+
|
||||
+ bdrv_graph_rdlock_main_loop();
|
||||
+ BlockDriverInfo bdi = {0};
|
||||
+ ret = bdrv_get_info(bs->file->bs, &bdi);
|
||||
+ if (ret < 0) {
|
||||
+ /*
|
||||
+ * Not a hard failure. Worst that can happen is partial cluster
|
||||
+ * allocation in the write target. However, the driver here returns its
|
||||
+ * allocation status based on the dirty bitmap, so any other data that
|
||||
+ * maps to such a cluster will still be copied later by a stream job (or
|
||||
+ * during writes to that cluster).
|
||||
+ */
|
||||
+ warn_report("alloc-track: unable to query cluster size for write target: %s",
|
||||
+ strerror(ret));
|
||||
+ }
|
||||
+ ret = 0;
|
||||
+ /*
|
||||
+ * Always consider alignment from underlying write device so RMW cycle for
|
||||
+ * bdrv_pwritev reads data from our backing via track_co_preadv. Also try to
|
||||
+ * avoid partial cluster allocation in the write target by considering the
|
||||
+ * cluster size.
|
||||
+ */
|
||||
+ s->granularity = MAX(bs->file->bs->bl.request_alignment,
|
||||
+ MAX(bdi.cluster_size, BDRV_SECTOR_SIZE));
|
||||
+ track_refresh_limits(bs, errp);
|
||||
+ uint64_t gran = bs->bl.request_alignment;
|
||||
+ s->bitmap = bdrv_create_dirty_bitmap(bs->file->bs, gran, NULL, &local_err);
|
||||
+ s->bitmap = bdrv_create_dirty_bitmap(bs->file->bs, s->granularity, NULL,
|
||||
+ &local_err);
|
||||
+ bdrv_graph_rdunlock_main_loop();
|
||||
+ if (local_err) {
|
||||
+ ret = -EIO;
|
||||
+ error_propagate(errp, local_err);
|
||||
|
@ -148,7 +186,9 @@ index 0000000000..b75d7c6460
|
|||
+
|
||||
+fail:
|
||||
+ if (ret < 0) {
|
||||
+ bdrv_graph_wrlock();
|
||||
+ bdrv_unref_child(bs, bs->file);
|
||||
+ bdrv_graph_wrunlock();
|
||||
+ if (s->bitmap) {
|
||||
+ bdrv_release_dirty_bitmap(s->bitmap);
|
||||
+ }
|
||||
|
@ -165,13 +205,15 @@ index 0000000000..b75d7c6460
|
|||
+ }
|
||||
+}
|
||||
+
|
||||
+static coroutine_fn int64_t track_co_getlength(BlockDriverState *bs)
|
||||
+static coroutine_fn int64_t GRAPH_RDLOCK
|
||||
+track_co_getlength(BlockDriverState *bs)
|
||||
+{
|
||||
+ return bdrv_co_getlength(bs->file->bs);
|
||||
+}
|
||||
+
|
||||
+static int coroutine_fn track_co_preadv(BlockDriverState *bs,
|
||||
+ int64_t offset, int64_t bytes, QEMUIOVector *qiov, BdrvRequestFlags flags)
|
||||
+static int coroutine_fn GRAPH_RDLOCK
|
||||
+track_co_preadv(BlockDriverState *bs, int64_t offset, int64_t bytes,
|
||||
+ QEMUIOVector *qiov, BdrvRequestFlags flags)
|
||||
+{
|
||||
+ BDRVAllocTrackState *s = bs->opaque;
|
||||
+ QEMUIOVector local_qiov;
|
||||
|
@ -229,36 +271,39 @@ index 0000000000..b75d7c6460
|
|||
+ return ret;
|
||||
+}
|
||||
+
|
||||
+static int coroutine_fn track_co_pwritev(BlockDriverState *bs,
|
||||
+ int64_t offset, int64_t bytes, QEMUIOVector *qiov, BdrvRequestFlags flags)
|
||||
+static int coroutine_fn GRAPH_RDLOCK
|
||||
+track_co_pwritev(BlockDriverState *bs, int64_t offset, int64_t bytes,
|
||||
+ QEMUIOVector *qiov, BdrvRequestFlags flags)
|
||||
+{
|
||||
+ return bdrv_co_pwritev(bs->file, offset, bytes, qiov, flags);
|
||||
+}
|
||||
+
|
||||
+static int coroutine_fn track_co_pwrite_zeroes(BlockDriverState *bs,
|
||||
+ int64_t offset, int64_t bytes, BdrvRequestFlags flags)
|
||||
+static int coroutine_fn GRAPH_RDLOCK
|
||||
+track_co_pwrite_zeroes(BlockDriverState *bs, int64_t offset, int64_t bytes,
|
||||
+ BdrvRequestFlags flags)
|
||||
+{
|
||||
+ return bdrv_co_pwrite_zeroes(bs->file, offset, bytes, flags);
|
||||
+}
|
||||
+
|
||||
+static int coroutine_fn track_co_pdiscard(BlockDriverState *bs,
|
||||
+ int64_t offset, int64_t bytes)
|
||||
+static int coroutine_fn GRAPH_RDLOCK
|
||||
+track_co_pdiscard(BlockDriverState *bs, int64_t offset, int64_t bytes)
|
||||
+{
|
||||
+ return bdrv_co_pdiscard(bs->file, offset, bytes);
|
||||
+}
|
||||
+
|
||||
+static coroutine_fn int track_co_flush(BlockDriverState *bs)
|
||||
+static coroutine_fn int GRAPH_RDLOCK
|
||||
+track_co_flush(BlockDriverState *bs)
|
||||
+{
|
||||
+ return bdrv_co_flush(bs->file->bs);
|
||||
+}
|
||||
+
|
||||
+static int coroutine_fn track_co_block_status(BlockDriverState *bs,
|
||||
+ bool want_zero,
|
||||
+ int64_t offset,
|
||||
+ int64_t bytes,
|
||||
+ int64_t *pnum,
|
||||
+ int64_t *map,
|
||||
+ BlockDriverState **file)
|
||||
+static int coroutine_fn GRAPH_RDLOCK
|
||||
+track_co_block_status(BlockDriverState *bs, bool want_zero,
|
||||
+ int64_t offset,
|
||||
+ int64_t bytes,
|
||||
+ int64_t *pnum,
|
||||
+ int64_t *map,
|
||||
+ BlockDriverState **file)
|
||||
+{
|
||||
+ BDRVAllocTrackState *s = bs->opaque;
|
||||
+
|
||||
|
@ -284,10 +329,10 @@ index 0000000000..b75d7c6460
|
|||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static void track_child_perm(BlockDriverState *bs, BdrvChild *c,
|
||||
+ BdrvChildRole role, BlockReopenQueue *reopen_queue,
|
||||
+ uint64_t perm, uint64_t shared,
|
||||
+ uint64_t *nperm, uint64_t *nshared)
|
||||
+static void GRAPH_RDLOCK
|
||||
+track_child_perm(BlockDriverState *bs, BdrvChild *c, BdrvChildRole role,
|
||||
+ BlockReopenQueue *reopen_queue, uint64_t perm, uint64_t shared,
|
||||
+ uint64_t *nperm, uint64_t *nshared)
|
||||
+{
|
||||
+ BDRVAllocTrackState *s = bs->opaque;
|
||||
+
|
||||
|
@ -310,53 +355,28 @@ index 0000000000..b75d7c6460
|
|||
+ }
|
||||
+}
|
||||
+
|
||||
+static void track_drop(void *opaque)
|
||||
+static int coroutine_fn GRAPH_RDLOCK
|
||||
+track_co_change_backing_file(BlockDriverState *bs, const char *backing_file,
|
||||
+ const char *backing_fmt)
|
||||
+{
|
||||
+ BlockDriverState *bs = (BlockDriverState*)opaque;
|
||||
+ BlockDriverState *file = bs->file->bs;
|
||||
+ BDRVAllocTrackState *s = bs->opaque;
|
||||
+
|
||||
+ assert(file);
|
||||
+
|
||||
+ /* we rely on the fact that we're not used anywhere else, so let's wait
|
||||
+ * until we're only used once - in the drive connected to the guest (and one
|
||||
+ * ref is held by bdrv_ref in track_change_backing_file) */
|
||||
+ if (bs->refcnt > 2) {
|
||||
+ aio_bh_schedule_oneshot(qemu_get_aio_context(), track_drop, opaque);
|
||||
+ return;
|
||||
+ }
|
||||
+ AioContext *aio_context = bdrv_get_aio_context(bs);
|
||||
+ aio_context_acquire(aio_context);
|
||||
+
|
||||
+ bdrv_drained_begin(bs);
|
||||
+
|
||||
+ /* now that we're drained, we can safely set 'DropInProgress' */
|
||||
+ s->drop_state = DropInProgress;
|
||||
+ bdrv_child_refresh_perms(bs, bs->file, &error_abort);
|
||||
+
|
||||
+ bdrv_replace_node(bs, file, &error_abort);
|
||||
+ bdrv_set_backing_hd(bs, NULL, &error_abort);
|
||||
+ bdrv_drained_end(bs);
|
||||
+ bdrv_unref(bs);
|
||||
+ aio_context_release(aio_context);
|
||||
+}
|
||||
+
|
||||
+static int track_change_backing_file(BlockDriverState *bs,
|
||||
+ const char *backing_file,
|
||||
+ const char *backing_fmt)
|
||||
+{
|
||||
+ BDRVAllocTrackState *s = bs->opaque;
|
||||
+ if (s->auto_remove && s->drop_state == DropNone &&
|
||||
+ backing_file == NULL && backing_fmt == NULL)
|
||||
+ {
|
||||
+ /* backing file has been disconnected, there's no longer any use for
|
||||
+ * this node, so let's remove ourselves from the block graph - we need
|
||||
+ * to schedule this for later however, since when this function is
|
||||
+ * called, the blockjob modifying us is probably not done yet and has a
|
||||
+ * blocker on 'bs' */
|
||||
+ s->drop_state = DropRequested;
|
||||
+ bdrv_ref(bs);
|
||||
+ aio_bh_schedule_oneshot(qemu_get_aio_context(), track_drop, (void*)bs);
|
||||
+ /*
|
||||
+ * Note that the actual backing file graph change is already done in the
|
||||
+ * stream job itself with bdrv_set_backing_hd_drained(), so no need to
|
||||
+ * actually do anything here. But still needs to be implemented, to make
|
||||
+ * our caller (i.e. bdrv_co_change_backing_file() do the right thing).
|
||||
+ *
|
||||
+ * FIXME
|
||||
+ * We'd like to auto-remove ourselves from the block graph, but it cannot
|
||||
+ * be done from a coroutine. Currently done in the stream job, where it
|
||||
+ * kinda fits better, but in the long-term, a special parameter would be
|
||||
+ * nice (or done via qemu-server via upcoming blockdev-replace QMP command).
|
||||
+ */
|
||||
+ if (backing_file == NULL) {
|
||||
+ BDRVAllocTrackState *s = bs->opaque;
|
||||
+ bdrv_drained_begin(bs);
|
||||
+ s->drop_state = DropInProgress;
|
||||
+ bdrv_child_refresh_perms(bs, bs->file, &error_abort);
|
||||
+ bdrv_drained_end(bs);
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
|
@ -383,7 +403,7 @@ index 0000000000..b75d7c6460
|
|||
+ .supports_backing = true,
|
||||
+
|
||||
+ .bdrv_co_block_status = track_co_block_status,
|
||||
+ .bdrv_change_backing_file = track_change_backing_file,
|
||||
+ .bdrv_co_change_backing_file = track_co_change_backing_file,
|
||||
+};
|
||||
+
|
||||
+static void bdrv_alloc_track_init(void)
|
||||
|
@ -393,7 +413,7 @@ index 0000000000..b75d7c6460
|
|||
+
|
||||
+block_init(bdrv_alloc_track_init);
|
||||
diff --git a/block/meson.build b/block/meson.build
|
||||
index eece0d5743..8a68162cc0 100644
|
||||
index 1945e04eeb..2873f3a25a 100644
|
||||
--- a/block/meson.build
|
||||
+++ b/block/meson.build
|
||||
@@ -2,6 +2,7 @@ block_ss.add(genh)
|
||||
|
@ -404,3 +424,48 @@ index eece0d5743..8a68162cc0 100644
|
|||
'amend.c',
|
||||
'backup.c',
|
||||
'backup-dump.c',
|
||||
diff --git a/block/stream.c b/block/stream.c
|
||||
index d2da83ae7c..f941cba14e 100644
|
||||
--- a/block/stream.c
|
||||
+++ b/block/stream.c
|
||||
@@ -120,6 +120,40 @@ static int stream_prepare(Job *job)
|
||||
ret = -EPERM;
|
||||
goto out;
|
||||
}
|
||||
+
|
||||
+ /*
|
||||
+ * This cannot be done in the co_change_backing_file callback, because
|
||||
+ * bdrv_replace_node() cannot be done in a coroutine. The latter also
|
||||
+ * requires the graph lock exclusively. Only required for the
|
||||
+ * alloc-track driver.
|
||||
+ *
|
||||
+ * The long-term plan is to either have an explicit parameter for the
|
||||
+ * stream job or use the upcoming blockdev-replace QMP command.
|
||||
+ */
|
||||
+ if (base_id == NULL && strcmp(unfiltered_bs->drv->format_name, "alloc-track") == 0) {
|
||||
+ BlockDriverState *file_bs;
|
||||
+
|
||||
+ bdrv_graph_rdlock_main_loop();
|
||||
+ file_bs = unfiltered_bs->file->bs;
|
||||
+ bdrv_graph_rdunlock_main_loop();
|
||||
+
|
||||
+ bdrv_ref(unfiltered_bs); // unrefed by bdrv_replace_node()
|
||||
+ bdrv_drained_begin(file_bs);
|
||||
+ bdrv_graph_wrlock();
|
||||
+
|
||||
+ bdrv_replace_node(unfiltered_bs, file_bs, &local_err);
|
||||
+
|
||||
+ bdrv_graph_wrunlock();
|
||||
+ bdrv_drained_end(file_bs);
|
||||
+ bdrv_unref(unfiltered_bs);
|
||||
+
|
||||
+ if (local_err) {
|
||||
+ error_prepend(&local_err, "failed to replace alloc-track node: ");
|
||||
+ error_report_err(local_err);
|
||||
+ ret = -EPERM;
|
||||
+ goto out;
|
||||
+ }
|
||||
+ }
|
||||
}
|
||||
|
||||
out:
|
|
@ -1,33 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Reiter <s.reiter@proxmox.com>
|
||||
Date: Tue, 2 Mar 2021 16:11:54 +0100
|
||||
Subject: [PATCH] block/io: accept NULL qiov in bdrv_pad_request
|
||||
|
||||
Some operations, e.g. block-stream, perform reads while discarding the
|
||||
results (only copy-on-read matters). In this case they will pass NULL as
|
||||
the target QEMUIOVector, which will however trip bdrv_pad_request, since
|
||||
it wants to extend its passed vector.
|
||||
|
||||
Simply check for NULL and do nothing, there's no reason to pad the
|
||||
target if it will be discarded anyway.
|
||||
|
||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
---
|
||||
block/io.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/block/io.c b/block/io.c
|
||||
index 2e267a85ab..449a44bf20 100644
|
||||
--- a/block/io.c
|
||||
+++ b/block/io.c
|
||||
@@ -1576,6 +1576,10 @@ static int bdrv_pad_request(BlockDriverState *bs,
|
||||
{
|
||||
int ret;
|
||||
|
||||
+ if (!qiov) {
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
bdrv_check_qiov_request(*offset, *bytes, *qiov, *qiov_offset, &error_abort);
|
||||
|
||||
if (!bdrv_init_padding(bs, *offset, *bytes, pad)) {
|
|
@ -7,15 +7,16 @@ This reverts commit fc176116cdea816ceb8dd969080b2b95f58edbc0 in
|
|||
preparation to revert 0347a8fd4c3faaedf119be04c197804be40a384b.
|
||||
|
||||
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
|
||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
---
|
||||
block/rbd.c | 42 ++----------------------------------------
|
||||
1 file changed, 2 insertions(+), 40 deletions(-)
|
||||
|
||||
diff --git a/block/rbd.c b/block/rbd.c
|
||||
index a4749f3b1b..53e0396b51 100644
|
||||
index 63f60d41be..367db42dce 100644
|
||||
--- a/block/rbd.c
|
||||
+++ b/block/rbd.c
|
||||
@@ -1511,7 +1511,6 @@ static int coroutine_fn qemu_rbd_co_block_status(BlockDriverState *bs,
|
||||
@@ -1515,7 +1515,6 @@ static int coroutine_fn qemu_rbd_co_block_status(BlockDriverState *bs,
|
||||
int status, r;
|
||||
RBDDiffIterateReq req = { .offs = offset };
|
||||
uint64_t features, flags;
|
||||
|
@ -23,7 +24,7 @@ index a4749f3b1b..53e0396b51 100644
|
|||
|
||||
assert(offset + bytes <= s->image_size);
|
||||
|
||||
@@ -1539,43 +1538,7 @@ static int coroutine_fn qemu_rbd_co_block_status(BlockDriverState *bs,
|
||||
@@ -1543,43 +1542,7 @@ static int coroutine_fn qemu_rbd_co_block_status(BlockDriverState *bs,
|
||||
return status;
|
||||
}
|
||||
|
||||
|
@ -68,7 +69,7 @@ index a4749f3b1b..53e0396b51 100644
|
|||
qemu_rbd_diff_iterate_cb, &req);
|
||||
if (r < 0 && r != QEMU_RBD_EXIT_DIFF_ITERATE2) {
|
||||
return status;
|
||||
@@ -1594,8 +1557,7 @@ static int coroutine_fn qemu_rbd_co_block_status(BlockDriverState *bs,
|
||||
@@ -1598,8 +1561,7 @@ static int coroutine_fn qemu_rbd_co_block_status(BlockDriverState *bs,
|
||||
status = BDRV_BLOCK_ZERO | BDRV_BLOCK_OFFSET_VALID;
|
||||
}
|
||||
|
|
@ -8,15 +8,16 @@ This reverts commit 9e302f64bb407a9bb097b626da97228c2654cfee in
|
|||
preparation to revert 0347a8fd4c3faaedf119be04c197804be40a384b.
|
||||
|
||||
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
|
||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
---
|
||||
block/rbd.c | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/block/rbd.c b/block/rbd.c
|
||||
index 53e0396b51..0913a0af39 100644
|
||||
index 367db42dce..347b121626 100644
|
||||
--- a/block/rbd.c
|
||||
+++ b/block/rbd.c
|
||||
@@ -1470,11 +1470,11 @@ static int qemu_rbd_diff_iterate_cb(uint64_t offs, size_t len,
|
||||
@@ -1474,11 +1474,11 @@ static int qemu_rbd_diff_iterate_cb(uint64_t offs, size_t len,
|
||||
RBDDiffIterateReq *req = opaque;
|
||||
|
||||
assert(req->offs + req->bytes <= offs);
|
|
@ -18,12 +18,13 @@ Upstream bug report:
|
|||
https://gitlab.com/qemu-project/qemu/-/issues/1026
|
||||
|
||||
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
|
||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
---
|
||||
block/rbd.c | 112 ----------------------------------------------------
|
||||
1 file changed, 112 deletions(-)
|
||||
|
||||
diff --git a/block/rbd.c b/block/rbd.c
|
||||
index 0913a0af39..1dab254517 100644
|
||||
index 347b121626..e61b359b97 100644
|
||||
--- a/block/rbd.c
|
||||
+++ b/block/rbd.c
|
||||
@@ -108,12 +108,6 @@ typedef struct RBDTask {
|
||||
|
@ -39,7 +40,7 @@ index 0913a0af39..1dab254517 100644
|
|||
static int qemu_rbd_connect(rados_t *cluster, rados_ioctx_t *io_ctx,
|
||||
BlockdevOptionsRbd *opts, bool cache,
|
||||
const char *keypairs, const char *secretid,
|
||||
@@ -1456,111 +1450,6 @@ static ImageInfoSpecific *qemu_rbd_get_specific_info(BlockDriverState *bs,
|
||||
@@ -1460,111 +1454,6 @@ static ImageInfoSpecific *qemu_rbd_get_specific_info(BlockDriverState *bs,
|
||||
return spec_info;
|
||||
}
|
||||
|
||||
|
@ -151,7 +152,7 @@ index 0913a0af39..1dab254517 100644
|
|||
static int64_t coroutine_fn qemu_rbd_co_getlength(BlockDriverState *bs)
|
||||
{
|
||||
BDRVRBDState *s = bs->opaque;
|
||||
@@ -1796,7 +1685,6 @@ static BlockDriver bdrv_rbd = {
|
||||
@@ -1800,7 +1689,6 @@ static BlockDriver bdrv_rbd = {
|
||||
#ifdef LIBRBD_SUPPORTS_WRITE_ZEROES
|
||||
.bdrv_co_pwrite_zeroes = qemu_rbd_co_pwrite_zeroes,
|
||||
#endif
|
43
debian/patches/pve/0042-alloc-track-error-out-when-auto-remove-is-not-set.patch
vendored
Normal file
43
debian/patches/pve/0042-alloc-track-error-out-when-auto-remove-is-not-set.patch
vendored
Normal file
|
@ -0,0 +1,43 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Fiona Ebner <f.ebner@proxmox.com>
|
||||
Date: Tue, 26 Mar 2024 14:57:51 +0100
|
||||
Subject: [PATCH] alloc-track: error out when auto-remove is not set
|
||||
|
||||
Since replacing the node now happens in the stream job, where the
|
||||
option cannot be read from (it's internal to the driver), it will
|
||||
always be treated as on.
|
||||
|
||||
qemu-server will always set it, make sure to have other users notice
|
||||
the change (should they even exist). The option can be fully dropped
|
||||
in the future while adding a version guard in qemu-server.
|
||||
|
||||
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
---
|
||||
block/alloc-track.c | 7 +++++--
|
||||
1 file changed, 5 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/block/alloc-track.c b/block/alloc-track.c
|
||||
index b9f8ea9137..f3ed2935c4 100644
|
||||
--- a/block/alloc-track.c
|
||||
+++ b/block/alloc-track.c
|
||||
@@ -34,7 +34,6 @@ typedef struct {
|
||||
BdrvDirtyBitmap *bitmap;
|
||||
uint64_t granularity;
|
||||
DropState drop_state;
|
||||
- bool auto_remove;
|
||||
} BDRVAllocTrackState;
|
||||
|
||||
static QemuOptsList runtime_opts = {
|
||||
@@ -86,7 +85,11 @@ static int track_open(BlockDriverState *bs, QDict *options, int flags,
|
||||
goto fail;
|
||||
}
|
||||
|
||||
- s->auto_remove = qemu_opt_get_bool(opts, TRACK_OPT_AUTO_REMOVE, false);
|
||||
+ if (!qemu_opt_get_bool(opts, TRACK_OPT_AUTO_REMOVE, false)) {
|
||||
+ error_setg(errp, "alloc-track: requires auto-remove option to be set to on");
|
||||
+ ret = -EINVAL;
|
||||
+ goto fail;
|
||||
+ }
|
||||
|
||||
/* open the target (write) node, backing will be attached by block layer */
|
||||
file = bdrv_open_child(NULL, options, "file", bs, &child_of_bds,
|
84
debian/patches/pve/0043-alloc-track-avoid-seemingly-superfluous-child-permis.patch
vendored
Normal file
84
debian/patches/pve/0043-alloc-track-avoid-seemingly-superfluous-child-permis.patch
vendored
Normal file
|
@ -0,0 +1,84 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Fiona Ebner <f.ebner@proxmox.com>
|
||||
Date: Wed, 27 Mar 2024 11:15:39 +0100
|
||||
Subject: [PATCH] alloc-track: avoid seemingly superfluous child permission
|
||||
update
|
||||
|
||||
Doesn't seem necessary nowadays (maybe after commit "alloc-track: fix
|
||||
deadlock during drop" where the dropping is not rescheduled and delayed
|
||||
anymore or some upstream change). Should there really be some issue,
|
||||
instead of having a drop state, this could also be just based off the
|
||||
fact whether there is still a backing child.
|
||||
|
||||
Dumping the cumulative (shared) permissions for the BDS with a debug
|
||||
print yields the same values after this patch and with QEMU 8.1,
|
||||
namely 3 and 5.
|
||||
|
||||
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
---
|
||||
block/alloc-track.c | 26 --------------------------
|
||||
1 file changed, 26 deletions(-)
|
||||
|
||||
diff --git a/block/alloc-track.c b/block/alloc-track.c
|
||||
index f3ed2935c4..29138dcc49 100644
|
||||
--- a/block/alloc-track.c
|
||||
+++ b/block/alloc-track.c
|
||||
@@ -25,15 +25,9 @@
|
||||
|
||||
#define TRACK_OPT_AUTO_REMOVE "auto-remove"
|
||||
|
||||
-typedef enum DropState {
|
||||
- DropNone,
|
||||
- DropInProgress,
|
||||
-} DropState;
|
||||
-
|
||||
typedef struct {
|
||||
BdrvDirtyBitmap *bitmap;
|
||||
uint64_t granularity;
|
||||
- DropState drop_state;
|
||||
} BDRVAllocTrackState;
|
||||
|
||||
static QemuOptsList runtime_opts = {
|
||||
@@ -137,8 +131,6 @@ static int track_open(BlockDriverState *bs, QDict *options, int flags,
|
||||
goto fail;
|
||||
}
|
||||
|
||||
- s->drop_state = DropNone;
|
||||
-
|
||||
fail:
|
||||
if (ret < 0) {
|
||||
bdrv_graph_wrlock();
|
||||
@@ -289,18 +281,8 @@ track_child_perm(BlockDriverState *bs, BdrvChild *c, BdrvChildRole role,
|
||||
BlockReopenQueue *reopen_queue, uint64_t perm, uint64_t shared,
|
||||
uint64_t *nperm, uint64_t *nshared)
|
||||
{
|
||||
- BDRVAllocTrackState *s = bs->opaque;
|
||||
-
|
||||
*nshared = BLK_PERM_ALL;
|
||||
|
||||
- /* in case we're currently dropping ourselves, claim to not use any
|
||||
- * permissions at all - which is fine, since from this point on we will
|
||||
- * never issue a read or write anymore */
|
||||
- if (s->drop_state == DropInProgress) {
|
||||
- *nperm = 0;
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
if (role & BDRV_CHILD_DATA) {
|
||||
*nperm = perm & DEFAULT_PERM_PASSTHROUGH;
|
||||
} else {
|
||||
@@ -326,14 +308,6 @@ track_co_change_backing_file(BlockDriverState *bs, const char *backing_file,
|
||||
* kinda fits better, but in the long-term, a special parameter would be
|
||||
* nice (or done via qemu-server via upcoming blockdev-replace QMP command).
|
||||
*/
|
||||
- if (backing_file == NULL) {
|
||||
- BDRVAllocTrackState *s = bs->opaque;
|
||||
- bdrv_drained_begin(bs);
|
||||
- s->drop_state = DropInProgress;
|
||||
- bdrv_child_refresh_perms(bs, bs->file, &error_abort);
|
||||
- bdrv_drained_end(bs);
|
||||
- }
|
||||
-
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -1,153 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Fiona Ebner <f.ebner@proxmox.com>
|
||||
Date: Thu, 6 Apr 2023 14:59:31 +0200
|
||||
Subject: [PATCH] alloc-track: fix deadlock during drop
|
||||
|
||||
by replacing the block node directly after changing the backing file
|
||||
instead of rescheduling it.
|
||||
|
||||
With changes in QEMU 8.0, calling bdrv_get_info (and bdrv_unref)
|
||||
during drop can lead to a deadlock when using iothread (only triggered
|
||||
with multiple disks, except during debugging where it also triggered
|
||||
with one disk sometimes):
|
||||
1. job_unref_locked acquires the AioContext and calls job->driver->free
|
||||
2. track_drop gets scheduled
|
||||
3. bdrv_graph_wrlock is called and polls which leads to track_drop being
|
||||
called
|
||||
4. track_drop acquires the AioContext recursively
|
||||
5. bdrv_get_info is a wrapped coroutine (since 8.0) and thus polls for
|
||||
bdrv_co_get_info. This releases the AioContext, but only once! The
|
||||
documentation for the AIO_WAIT_WHILE macro states that the
|
||||
AioContext lock needs to be acquired exactly once, but there does
|
||||
not seem to be a way for track_drop to know if it acquired the lock
|
||||
recursively or not (without adding further hacks).
|
||||
6. Because the AioContext is still held by the main thread once, it can't
|
||||
be acquired before entering bdrv_co_get_info in co_schedule_bh_cb
|
||||
which happens in the iothread
|
||||
|
||||
When doing the operation in change_backing_file, the AioContext has
|
||||
already been acquired by the caller, so the issue with the recursive
|
||||
lock goes away.
|
||||
|
||||
The comment explaining why delaying the replace is necessary is
|
||||
> we need to schedule this for later however, since when this function
|
||||
> is called, the blockjob modifying us is probably not done yet and
|
||||
> has a blocker on 'bs'
|
||||
|
||||
However, there is no check for blockers in bdrv_replace_node. It would
|
||||
need to be done by us, the caller, with check_to_replace_node.
|
||||
Furthermore, the mirror job also does its call to bdrv_replace_node
|
||||
while there is an active blocker (inserted by mirror itself) and they
|
||||
use a specialized version to check for blockers instead of
|
||||
check_to_replace_node there. Alloc-track could also do something
|
||||
similar to check for other blockers, but it should be fine to rely on
|
||||
Proxmox VE that no other operation with the blockdev is going on.
|
||||
|
||||
Mirror also drains the target before replacing the node, but the
|
||||
target can have other users. In case of alloc-track the file child
|
||||
should not be accessible by anybody else and so there can't be an
|
||||
in-flight operation for the file child when alloc-track is drained.
|
||||
|
||||
The rescheduling based on refcounting is a hack and it doesn't seem to
|
||||
be necessary anymore. It's not clear what the original issue from the
|
||||
comment was. Testing with older builds with track_drop done directly
|
||||
without rescheduling also didn't lead to any noticable issue for me.
|
||||
|
||||
One issue it might have been is the one fixed by b1e1af394d
|
||||
("block/stream: Drain subtree around graph change"), where
|
||||
block-stream had a use-after-free if the base node changed at an
|
||||
inconvenient time (which alloc-track's auto-drop does).
|
||||
|
||||
It's also not possible to just not auto-replace the alloc-track. Not
|
||||
replacing it at all leads to other operations like block resize
|
||||
hanging, and there is no good way to replace it manually via QMP
|
||||
(there is x-blockdev-change, but it is experimental and doesn't
|
||||
implement the required operation yet). Also, it's just cleaner in
|
||||
general to not leave unnecessary block nodes lying around.
|
||||
|
||||
Suggested-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
|
||||
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
---
|
||||
block/alloc-track.c | 54 ++++++++++++++-------------------------------
|
||||
1 file changed, 16 insertions(+), 38 deletions(-)
|
||||
|
||||
diff --git a/block/alloc-track.c b/block/alloc-track.c
|
||||
index b75d7c6460..76da140a68 100644
|
||||
--- a/block/alloc-track.c
|
||||
+++ b/block/alloc-track.c
|
||||
@@ -25,7 +25,6 @@
|
||||
|
||||
typedef enum DropState {
|
||||
DropNone,
|
||||
- DropRequested,
|
||||
DropInProgress,
|
||||
} DropState;
|
||||
|
||||
@@ -268,37 +267,6 @@ static void track_child_perm(BlockDriverState *bs, BdrvChild *c,
|
||||
}
|
||||
}
|
||||
|
||||
-static void track_drop(void *opaque)
|
||||
-{
|
||||
- BlockDriverState *bs = (BlockDriverState*)opaque;
|
||||
- BlockDriverState *file = bs->file->bs;
|
||||
- BDRVAllocTrackState *s = bs->opaque;
|
||||
-
|
||||
- assert(file);
|
||||
-
|
||||
- /* we rely on the fact that we're not used anywhere else, so let's wait
|
||||
- * until we're only used once - in the drive connected to the guest (and one
|
||||
- * ref is held by bdrv_ref in track_change_backing_file) */
|
||||
- if (bs->refcnt > 2) {
|
||||
- aio_bh_schedule_oneshot(qemu_get_aio_context(), track_drop, opaque);
|
||||
- return;
|
||||
- }
|
||||
- AioContext *aio_context = bdrv_get_aio_context(bs);
|
||||
- aio_context_acquire(aio_context);
|
||||
-
|
||||
- bdrv_drained_begin(bs);
|
||||
-
|
||||
- /* now that we're drained, we can safely set 'DropInProgress' */
|
||||
- s->drop_state = DropInProgress;
|
||||
- bdrv_child_refresh_perms(bs, bs->file, &error_abort);
|
||||
-
|
||||
- bdrv_replace_node(bs, file, &error_abort);
|
||||
- bdrv_set_backing_hd(bs, NULL, &error_abort);
|
||||
- bdrv_drained_end(bs);
|
||||
- bdrv_unref(bs);
|
||||
- aio_context_release(aio_context);
|
||||
-}
|
||||
-
|
||||
static int track_change_backing_file(BlockDriverState *bs,
|
||||
const char *backing_file,
|
||||
const char *backing_fmt)
|
||||
@@ -308,13 +276,23 @@ static int track_change_backing_file(BlockDriverState *bs,
|
||||
backing_file == NULL && backing_fmt == NULL)
|
||||
{
|
||||
/* backing file has been disconnected, there's no longer any use for
|
||||
- * this node, so let's remove ourselves from the block graph - we need
|
||||
- * to schedule this for later however, since when this function is
|
||||
- * called, the blockjob modifying us is probably not done yet and has a
|
||||
- * blocker on 'bs' */
|
||||
- s->drop_state = DropRequested;
|
||||
+ * this node, so let's remove ourselves from the block graph */
|
||||
+ BlockDriverState *file = bs->file->bs;
|
||||
+
|
||||
+ /* Just to be sure, because bdrv_replace_node unrefs it */
|
||||
bdrv_ref(bs);
|
||||
- aio_bh_schedule_oneshot(qemu_get_aio_context(), track_drop, (void*)bs);
|
||||
+ bdrv_drained_begin(bs);
|
||||
+
|
||||
+ /* now that we're drained, we can safely set 'DropInProgress' */
|
||||
+ s->drop_state = DropInProgress;
|
||||
+
|
||||
+ bdrv_child_refresh_perms(bs, bs->file, &error_abort);
|
||||
+
|
||||
+ bdrv_replace_node(bs, file, &error_abort);
|
||||
+ bdrv_set_backing_hd(bs, NULL, &error_abort);
|
||||
+
|
||||
+ bdrv_drained_end(bs);
|
||||
+ bdrv_unref(bs);
|
||||
}
|
||||
|
||||
return 0;
|
|
@ -0,0 +1,55 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
|
||||
Date: Thu, 11 Apr 2024 11:29:22 +0200
|
||||
Subject: [PATCH] block/copy-before-write: fix permission
|
||||
|
||||
In case when source node does not have any parents, the condition still
|
||||
works as required: backup job do create the parent by
|
||||
|
||||
block_job_create -> block_job_add_bdrv -> bdrv_root_attach_child
|
||||
|
||||
Still, in this case checking @perm variable doesn't work, as backup job
|
||||
creates the root blk with empty permissions (as it rely on CBW filter
|
||||
to require correct permissions and don't want to create extra
|
||||
conflicts).
|
||||
|
||||
So, we should not check @perm.
|
||||
|
||||
The hack may be dropped entirely when transactional insertion of
|
||||
filter (when we don't try to recalculate permissions in intermediate
|
||||
state, when filter does conflict with original parent of the source
|
||||
node) merged (old big series
|
||||
"[PATCH v5 00/45] Transactional block-graph modifying API"[1] and it's
|
||||
current in-flight part is "[PATCH v8 0/7] blockdev-replace"[2])
|
||||
|
||||
[1] https://patchew.org/QEMU/20220330212902.590099-1-vsementsov@openvz.org/
|
||||
[2] https://patchew.org/QEMU/20231017184444.932733-1-vsementsov@yandex-team.ru/
|
||||
|
||||
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
|
||||
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
---
|
||||
block/copy-before-write.c | 10 +++++++---
|
||||
1 file changed, 7 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/block/copy-before-write.c b/block/copy-before-write.c
|
||||
index 026fa9840f..5a9456d426 100644
|
||||
--- a/block/copy-before-write.c
|
||||
+++ b/block/copy-before-write.c
|
||||
@@ -364,9 +364,13 @@ cbw_child_perm(BlockDriverState *bs, BdrvChild *c, BdrvChildRole role,
|
||||
perm, shared, nperm, nshared);
|
||||
|
||||
if (!QLIST_EMPTY(&bs->parents)) {
|
||||
- if (perm & BLK_PERM_WRITE) {
|
||||
- *nperm = *nperm | BLK_PERM_CONSISTENT_READ;
|
||||
- }
|
||||
+ /*
|
||||
+ * Note, that source child may be shared with backup job. Backup job
|
||||
+ * does create own blk parent on copy-before-write node, so this
|
||||
+ * works even if source node does not have any parents before backup
|
||||
+ * start
|
||||
+ */
|
||||
+ *nperm = *nperm | BLK_PERM_CONSISTENT_READ;
|
||||
*nshared &= ~(BLK_PERM_WRITE | BLK_PERM_RESIZE);
|
||||
}
|
||||
}
|
|
@ -1,190 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Fiona Ebner <f.ebner@proxmox.com>
|
||||
Date: Fri, 5 May 2023 13:39:53 +0200
|
||||
Subject: [PATCH] migration: for snapshots, hold the BQL during setup callbacks
|
||||
|
||||
In spirit, this is a partial revert of commit 9b09503752 ("migration:
|
||||
run setup callbacks out of big lock"), but only for the snapshot case.
|
||||
|
||||
For snapshots, the bdrv_writev_vmstate() function is used during setup
|
||||
(in QIOChannelBlock backing the QEMUFile), but not holding the BQL
|
||||
while calling it could lead to an assertion failure. To understand
|
||||
how, first note the following:
|
||||
|
||||
1. Generated coroutine wrappers for block layer functions spawn the
|
||||
coroutine and use AIO_WAIT_WHILE()/aio_poll() to wait for it.
|
||||
2. If the host OS switches threads at an inconvenient time, it can
|
||||
happen that a bottom half scheduled for the main thread's AioContext
|
||||
is executed as part of a vCPU thread's aio_poll().
|
||||
|
||||
An example leading to the assertion failure is as follows:
|
||||
|
||||
main thread:
|
||||
1. A snapshot-save QMP command gets issued.
|
||||
2. snapshot_save_job_bh() is scheduled.
|
||||
|
||||
vCPU thread:
|
||||
3. aio_poll() for the main thread's AioContext is called (e.g. when
|
||||
the guest writes to a pflash device, as part of blk_pwrite which is a
|
||||
generated coroutine wrapper).
|
||||
4. snapshot_save_job_bh() is executed as part of aio_poll().
|
||||
3. qemu_savevm_state() is called.
|
||||
4. qemu_mutex_unlock_iothread() is called. Now
|
||||
qemu_get_current_aio_context() returns 0x0.
|
||||
5. bdrv_writev_vmstate() is executed during the usual savevm setup.
|
||||
But this function is a generated coroutine wrapper, so it uses
|
||||
AIO_WAIT_WHILE. There, the assertion
|
||||
assert(qemu_get_current_aio_context() == qemu_get_aio_context());
|
||||
will fail.
|
||||
|
||||
To fix it, ensure that the BQL is held during setup. To avoid changing
|
||||
the behavior for migration too, introduce conditionals for the setup
|
||||
callbacks that need the BQL and only take the lock if it's not already
|
||||
held.
|
||||
|
||||
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
---
|
||||
include/migration/register.h | 2 +-
|
||||
migration/block-dirty-bitmap.c | 15 ++++++++++++---
|
||||
migration/block.c | 15 ++++++++++++---
|
||||
migration/ram.c | 16 +++++++++++++---
|
||||
migration/savevm.c | 2 --
|
||||
5 files changed, 38 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/include/migration/register.h b/include/migration/register.h
|
||||
index a8dfd8fefd..fa9b0b0f10 100644
|
||||
--- a/include/migration/register.h
|
||||
+++ b/include/migration/register.h
|
||||
@@ -43,9 +43,9 @@ typedef struct SaveVMHandlers {
|
||||
* by other locks.
|
||||
*/
|
||||
int (*save_live_iterate)(QEMUFile *f, void *opaque);
|
||||
+ int (*save_setup)(QEMUFile *f, void *opaque);
|
||||
|
||||
/* This runs outside the iothread lock! */
|
||||
- int (*save_setup)(QEMUFile *f, void *opaque);
|
||||
/* Note for save_live_pending:
|
||||
* must_precopy:
|
||||
* - must be migrated in precopy or in stopped state
|
||||
diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c
|
||||
index a6440929fa..69fab3275c 100644
|
||||
--- a/migration/block-dirty-bitmap.c
|
||||
+++ b/migration/block-dirty-bitmap.c
|
||||
@@ -1214,10 +1214,17 @@ static int dirty_bitmap_save_setup(QEMUFile *f, void *opaque)
|
||||
{
|
||||
DBMSaveState *s = &((DBMState *)opaque)->save;
|
||||
SaveBitmapState *dbms = NULL;
|
||||
+ bool release_lock = false;
|
||||
|
||||
- qemu_mutex_lock_iothread();
|
||||
+ /* For snapshots, the BQL is held during setup. */
|
||||
+ if (!qemu_mutex_iothread_locked()) {
|
||||
+ qemu_mutex_lock_iothread();
|
||||
+ release_lock = true;
|
||||
+ }
|
||||
if (init_dirty_bitmap_migration(s) < 0) {
|
||||
- qemu_mutex_unlock_iothread();
|
||||
+ if (release_lock) {
|
||||
+ qemu_mutex_unlock_iothread();
|
||||
+ }
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -1225,7 +1232,9 @@ static int dirty_bitmap_save_setup(QEMUFile *f, void *opaque)
|
||||
send_bitmap_start(f, s, dbms);
|
||||
}
|
||||
qemu_put_bitmap_flags(f, DIRTY_BITMAP_MIG_FLAG_EOS);
|
||||
- qemu_mutex_unlock_iothread();
|
||||
+ if (release_lock) {
|
||||
+ qemu_mutex_unlock_iothread();
|
||||
+ }
|
||||
return 0;
|
||||
}
|
||||
|
||||
diff --git a/migration/block.c b/migration/block.c
|
||||
index b2497bbd32..c9d55be642 100644
|
||||
--- a/migration/block.c
|
||||
+++ b/migration/block.c
|
||||
@@ -716,21 +716,30 @@ static void block_migration_cleanup(void *opaque)
|
||||
static int block_save_setup(QEMUFile *f, void *opaque)
|
||||
{
|
||||
int ret;
|
||||
+ bool release_lock = false;
|
||||
|
||||
trace_migration_block_save("setup", block_mig_state.submitted,
|
||||
block_mig_state.transferred);
|
||||
|
||||
- qemu_mutex_lock_iothread();
|
||||
+ /* For snapshots, the BQL is held during setup. */
|
||||
+ if (!qemu_mutex_iothread_locked()) {
|
||||
+ qemu_mutex_lock_iothread();
|
||||
+ release_lock = true;
|
||||
+ }
|
||||
ret = init_blk_migration(f);
|
||||
if (ret < 0) {
|
||||
- qemu_mutex_unlock_iothread();
|
||||
+ if (release_lock) {
|
||||
+ qemu_mutex_unlock_iothread();
|
||||
+ }
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* start track dirty blocks */
|
||||
ret = set_dirty_tracking();
|
||||
|
||||
- qemu_mutex_unlock_iothread();
|
||||
+ if (release_lock) {
|
||||
+ qemu_mutex_unlock_iothread();
|
||||
+ }
|
||||
|
||||
if (ret) {
|
||||
return ret;
|
||||
diff --git a/migration/ram.c b/migration/ram.c
|
||||
index 79d881f735..0ecbbc3202 100644
|
||||
--- a/migration/ram.c
|
||||
+++ b/migration/ram.c
|
||||
@@ -3117,8 +3117,16 @@ static void migration_bitmap_clear_discarded_pages(RAMState *rs)
|
||||
|
||||
static void ram_init_bitmaps(RAMState *rs)
|
||||
{
|
||||
- /* For memory_global_dirty_log_start below. */
|
||||
- qemu_mutex_lock_iothread();
|
||||
+ bool release_lock = false;
|
||||
+
|
||||
+ /*
|
||||
+ * For memory_global_dirty_log_start below.
|
||||
+ * For snapshots, the BQL is held during setup.
|
||||
+ */
|
||||
+ if (!qemu_mutex_iothread_locked()) {
|
||||
+ qemu_mutex_lock_iothread();
|
||||
+ release_lock = true;
|
||||
+ }
|
||||
qemu_mutex_lock_ramlist();
|
||||
|
||||
WITH_RCU_READ_LOCK_GUARD() {
|
||||
@@ -3130,7 +3138,9 @@ static void ram_init_bitmaps(RAMState *rs)
|
||||
}
|
||||
}
|
||||
qemu_mutex_unlock_ramlist();
|
||||
- qemu_mutex_unlock_iothread();
|
||||
+ if (release_lock) {
|
||||
+ qemu_mutex_unlock_iothread();
|
||||
+ }
|
||||
|
||||
/*
|
||||
* After an eventual first bitmap sync, fixup the initial bitmap
|
||||
diff --git a/migration/savevm.c b/migration/savevm.c
|
||||
index aa54a67fda..fc6a82a555 100644
|
||||
--- a/migration/savevm.c
|
||||
+++ b/migration/savevm.c
|
||||
@@ -1621,10 +1621,8 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp)
|
||||
memset(&compression_counters, 0, sizeof(compression_counters));
|
||||
ms->to_dst_file = f;
|
||||
|
||||
- qemu_mutex_unlock_iothread();
|
||||
qemu_savevm_state_header(f);
|
||||
qemu_savevm_state_setup(f);
|
||||
- qemu_mutex_lock_iothread();
|
||||
|
||||
while (qemu_file_get_error(f) == 0) {
|
||||
if (qemu_savevm_state_iterate(f, false) > 0) {
|
48
debian/patches/pve/0045-block-copy-before-write-support-unligned-snapshot-di.patch
vendored
Normal file
48
debian/patches/pve/0045-block-copy-before-write-support-unligned-snapshot-di.patch
vendored
Normal file
|
@ -0,0 +1,48 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
|
||||
Date: Thu, 11 Apr 2024 11:29:23 +0200
|
||||
Subject: [PATCH] block/copy-before-write: support unligned snapshot-discard
|
||||
|
||||
First thing that crashes on unligned access here is
|
||||
bdrv_reset_dirty_bitmap(). Correct way is to align-down the
|
||||
snapshot-discard request.
|
||||
|
||||
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
|
||||
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
---
|
||||
block/copy-before-write.c | 16 +++++++++++++---
|
||||
1 file changed, 13 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/block/copy-before-write.c b/block/copy-before-write.c
|
||||
index 5a9456d426..c0e70669a2 100644
|
||||
--- a/block/copy-before-write.c
|
||||
+++ b/block/copy-before-write.c
|
||||
@@ -325,14 +325,24 @@ static int coroutine_fn GRAPH_RDLOCK
|
||||
cbw_co_pdiscard_snapshot(BlockDriverState *bs, int64_t offset, int64_t bytes)
|
||||
{
|
||||
BDRVCopyBeforeWriteState *s = bs->opaque;
|
||||
+ uint32_t cluster_size = block_copy_cluster_size(s->bcs);
|
||||
+ int64_t aligned_offset = QEMU_ALIGN_UP(offset, cluster_size);
|
||||
+ int64_t aligned_end = QEMU_ALIGN_DOWN(offset + bytes, cluster_size);
|
||||
+ int64_t aligned_bytes;
|
||||
+
|
||||
+ if (aligned_end <= aligned_offset) {
|
||||
+ return 0;
|
||||
+ }
|
||||
+ aligned_bytes = aligned_end - aligned_offset;
|
||||
|
||||
WITH_QEMU_LOCK_GUARD(&s->lock) {
|
||||
- bdrv_reset_dirty_bitmap(s->access_bitmap, offset, bytes);
|
||||
+ bdrv_reset_dirty_bitmap(s->access_bitmap, aligned_offset,
|
||||
+ aligned_bytes);
|
||||
}
|
||||
|
||||
- block_copy_reset(s->bcs, offset, bytes);
|
||||
+ block_copy_reset(s->bcs, aligned_offset, aligned_bytes);
|
||||
|
||||
- return bdrv_co_pdiscard(s->target, offset, bytes);
|
||||
+ return bdrv_co_pdiscard(s->target, aligned_offset, aligned_bytes);
|
||||
}
|
||||
|
||||
static void GRAPH_RDLOCK cbw_refresh_filename(BlockDriverState *bs)
|
|
@ -1,29 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Fiona Ebner <f.ebner@proxmox.com>
|
||||
Date: Fri, 5 May 2023 15:30:16 +0200
|
||||
Subject: [PATCH] savevm-async: don't hold BQL during setup
|
||||
|
||||
See commit "migration: for snapshots, hold the BQL during setup
|
||||
callbacks" for why. This is separate, because a version of that one
|
||||
will hopefully land upstream.
|
||||
|
||||
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
---
|
||||
migration/savevm-async.c | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/migration/savevm-async.c b/migration/savevm-async.c
|
||||
index ea3b2f36a6..dd7744ab66 100644
|
||||
--- a/migration/savevm-async.c
|
||||
+++ b/migration/savevm-async.c
|
||||
@@ -403,10 +403,8 @@ void qmp_savevm_start(const char *statefile, Error **errp)
|
||||
snap_state.state = SAVE_STATE_ACTIVE;
|
||||
snap_state.finalize_bh = qemu_bh_new(process_savevm_finalize, &snap_state);
|
||||
snap_state.co = qemu_coroutine_create(&process_savevm_co, NULL);
|
||||
- qemu_mutex_unlock_iothread();
|
||||
qemu_savevm_state_header(snap_state.file);
|
||||
qemu_savevm_state_setup(snap_state.file);
|
||||
- qemu_mutex_lock_iothread();
|
||||
|
||||
/* Async processing from here on out happens in iohandler context, so let
|
||||
* the target bdrv have its home there.
|
373
debian/patches/pve/0046-block-copy-before-write-create-block_copy-bitmap-in-.patch
vendored
Normal file
373
debian/patches/pve/0046-block-copy-before-write-create-block_copy-bitmap-in-.patch
vendored
Normal file
|
@ -0,0 +1,373 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
|
||||
Date: Thu, 11 Apr 2024 11:29:24 +0200
|
||||
Subject: [PATCH] block/copy-before-write: create block_copy bitmap in filter
|
||||
node
|
||||
|
||||
Currently block_copy creates copy_bitmap in source node. But that is in
|
||||
bad relation with .independent_close=true of copy-before-write filter:
|
||||
source node may be detached and removed before .bdrv_close() handler
|
||||
called, which should call block_copy_state_free(), which in turn should
|
||||
remove copy_bitmap.
|
||||
|
||||
That's all not ideal: it would be better if internal bitmap of
|
||||
block-copy object is not attached to any node. But that is not possible
|
||||
now.
|
||||
|
||||
The simplest solution is just create copy_bitmap in filter node, where
|
||||
anyway two other bitmaps are created.
|
||||
|
||||
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
|
||||
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
---
|
||||
block/block-copy.c | 3 +-
|
||||
block/copy-before-write.c | 2 +-
|
||||
include/block/block-copy.h | 1 +
|
||||
tests/qemu-iotests/257.out | 112 ++++++++++++++++++-------------------
|
||||
4 files changed, 60 insertions(+), 58 deletions(-)
|
||||
|
||||
diff --git a/block/block-copy.c b/block/block-copy.c
|
||||
index 9ee3dd7ef5..8fca2c3698 100644
|
||||
--- a/block/block-copy.c
|
||||
+++ b/block/block-copy.c
|
||||
@@ -351,6 +351,7 @@ static int64_t block_copy_calculate_cluster_size(BlockDriverState *target,
|
||||
}
|
||||
|
||||
BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target,
|
||||
+ BlockDriverState *copy_bitmap_bs,
|
||||
const BdrvDirtyBitmap *bitmap,
|
||||
Error **errp)
|
||||
{
|
||||
@@ -367,7 +368,7 @@ BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target,
|
||||
return NULL;
|
||||
}
|
||||
|
||||
- copy_bitmap = bdrv_create_dirty_bitmap(source->bs, cluster_size, NULL,
|
||||
+ copy_bitmap = bdrv_create_dirty_bitmap(copy_bitmap_bs, cluster_size, NULL,
|
||||
errp);
|
||||
if (!copy_bitmap) {
|
||||
return NULL;
|
||||
diff --git a/block/copy-before-write.c b/block/copy-before-write.c
|
||||
index c0e70669a2..94db31512d 100644
|
||||
--- a/block/copy-before-write.c
|
||||
+++ b/block/copy-before-write.c
|
||||
@@ -468,7 +468,7 @@ static int cbw_open(BlockDriverState *bs, QDict *options, int flags,
|
||||
((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK) &
|
||||
bs->file->bs->supported_zero_flags);
|
||||
|
||||
- s->bcs = block_copy_state_new(bs->file, s->target, bitmap, errp);
|
||||
+ s->bcs = block_copy_state_new(bs->file, s->target, bs, bitmap, errp);
|
||||
if (!s->bcs) {
|
||||
error_prepend(errp, "Cannot create block-copy-state: ");
|
||||
return -EINVAL;
|
||||
diff --git a/include/block/block-copy.h b/include/block/block-copy.h
|
||||
index 0700953ab8..8b41643bfa 100644
|
||||
--- a/include/block/block-copy.h
|
||||
+++ b/include/block/block-copy.h
|
||||
@@ -25,6 +25,7 @@ typedef struct BlockCopyState BlockCopyState;
|
||||
typedef struct BlockCopyCallState BlockCopyCallState;
|
||||
|
||||
BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target,
|
||||
+ BlockDriverState *copy_bitmap_bs,
|
||||
const BdrvDirtyBitmap *bitmap,
|
||||
Error **errp);
|
||||
|
||||
diff --git a/tests/qemu-iotests/257.out b/tests/qemu-iotests/257.out
|
||||
index aa76131ca9..c33dd7f3a9 100644
|
||||
--- a/tests/qemu-iotests/257.out
|
||||
+++ b/tests/qemu-iotests/257.out
|
||||
@@ -120,16 +120,16 @@ write -P0x67 0x3fe0000 0x20000
|
||||
"granularity": 65536,
|
||||
"persistent": false,
|
||||
"recording": false
|
||||
- }
|
||||
- ],
|
||||
- "drive0": [
|
||||
+ },
|
||||
{
|
||||
"busy": false,
|
||||
"count": 0,
|
||||
"granularity": 65536,
|
||||
"persistent": false,
|
||||
"recording": false
|
||||
- },
|
||||
+ }
|
||||
+ ],
|
||||
+ "drive0": [
|
||||
{
|
||||
"busy": false,
|
||||
"count": 458752,
|
||||
@@ -596,16 +596,16 @@ write -P0x67 0x3fe0000 0x20000
|
||||
"granularity": 65536,
|
||||
"persistent": false,
|
||||
"recording": false
|
||||
- }
|
||||
- ],
|
||||
- "drive0": [
|
||||
+ },
|
||||
{
|
||||
"busy": false,
|
||||
"count": 0,
|
||||
"granularity": 65536,
|
||||
"persistent": false,
|
||||
"recording": false
|
||||
- },
|
||||
+ }
|
||||
+ ],
|
||||
+ "drive0": [
|
||||
{
|
||||
"busy": false,
|
||||
"count": 458752,
|
||||
@@ -865,16 +865,16 @@ write -P0x67 0x3fe0000 0x20000
|
||||
"granularity": 65536,
|
||||
"persistent": false,
|
||||
"recording": false
|
||||
- }
|
||||
- ],
|
||||
- "drive0": [
|
||||
+ },
|
||||
{
|
||||
"busy": false,
|
||||
"count": 0,
|
||||
"granularity": 65536,
|
||||
"persistent": false,
|
||||
"recording": false
|
||||
- },
|
||||
+ }
|
||||
+ ],
|
||||
+ "drive0": [
|
||||
{
|
||||
"busy": false,
|
||||
"count": 458752,
|
||||
@@ -1341,16 +1341,16 @@ write -P0x67 0x3fe0000 0x20000
|
||||
"granularity": 65536,
|
||||
"persistent": false,
|
||||
"recording": false
|
||||
- }
|
||||
- ],
|
||||
- "drive0": [
|
||||
+ },
|
||||
{
|
||||
"busy": false,
|
||||
"count": 0,
|
||||
"granularity": 65536,
|
||||
"persistent": false,
|
||||
"recording": false
|
||||
- },
|
||||
+ }
|
||||
+ ],
|
||||
+ "drive0": [
|
||||
{
|
||||
"busy": false,
|
||||
"count": 458752,
|
||||
@@ -1610,16 +1610,16 @@ write -P0x67 0x3fe0000 0x20000
|
||||
"granularity": 65536,
|
||||
"persistent": false,
|
||||
"recording": false
|
||||
- }
|
||||
- ],
|
||||
- "drive0": [
|
||||
+ },
|
||||
{
|
||||
"busy": false,
|
||||
"count": 0,
|
||||
"granularity": 65536,
|
||||
"persistent": false,
|
||||
"recording": false
|
||||
- },
|
||||
+ }
|
||||
+ ],
|
||||
+ "drive0": [
|
||||
{
|
||||
"busy": false,
|
||||
"count": 458752,
|
||||
@@ -2086,16 +2086,16 @@ write -P0x67 0x3fe0000 0x20000
|
||||
"granularity": 65536,
|
||||
"persistent": false,
|
||||
"recording": false
|
||||
- }
|
||||
- ],
|
||||
- "drive0": [
|
||||
+ },
|
||||
{
|
||||
"busy": false,
|
||||
"count": 0,
|
||||
"granularity": 65536,
|
||||
"persistent": false,
|
||||
"recording": false
|
||||
- },
|
||||
+ }
|
||||
+ ],
|
||||
+ "drive0": [
|
||||
{
|
||||
"busy": false,
|
||||
"count": 458752,
|
||||
@@ -2355,16 +2355,16 @@ write -P0x67 0x3fe0000 0x20000
|
||||
"granularity": 65536,
|
||||
"persistent": false,
|
||||
"recording": false
|
||||
- }
|
||||
- ],
|
||||
- "drive0": [
|
||||
+ },
|
||||
{
|
||||
"busy": false,
|
||||
"count": 0,
|
||||
"granularity": 65536,
|
||||
"persistent": false,
|
||||
"recording": false
|
||||
- },
|
||||
+ }
|
||||
+ ],
|
||||
+ "drive0": [
|
||||
{
|
||||
"busy": false,
|
||||
"count": 458752,
|
||||
@@ -2831,16 +2831,16 @@ write -P0x67 0x3fe0000 0x20000
|
||||
"granularity": 65536,
|
||||
"persistent": false,
|
||||
"recording": false
|
||||
- }
|
||||
- ],
|
||||
- "drive0": [
|
||||
+ },
|
||||
{
|
||||
"busy": false,
|
||||
"count": 0,
|
||||
"granularity": 65536,
|
||||
"persistent": false,
|
||||
"recording": false
|
||||
- },
|
||||
+ }
|
||||
+ ],
|
||||
+ "drive0": [
|
||||
{
|
||||
"busy": false,
|
||||
"count": 458752,
|
||||
@@ -3100,16 +3100,16 @@ write -P0x67 0x3fe0000 0x20000
|
||||
"granularity": 65536,
|
||||
"persistent": false,
|
||||
"recording": false
|
||||
- }
|
||||
- ],
|
||||
- "drive0": [
|
||||
+ },
|
||||
{
|
||||
"busy": false,
|
||||
"count": 0,
|
||||
"granularity": 65536,
|
||||
"persistent": false,
|
||||
"recording": false
|
||||
- },
|
||||
+ }
|
||||
+ ],
|
||||
+ "drive0": [
|
||||
{
|
||||
"busy": false,
|
||||
"count": 458752,
|
||||
@@ -3576,16 +3576,16 @@ write -P0x67 0x3fe0000 0x20000
|
||||
"granularity": 65536,
|
||||
"persistent": false,
|
||||
"recording": false
|
||||
- }
|
||||
- ],
|
||||
- "drive0": [
|
||||
+ },
|
||||
{
|
||||
"busy": false,
|
||||
"count": 0,
|
||||
"granularity": 65536,
|
||||
"persistent": false,
|
||||
"recording": false
|
||||
- },
|
||||
+ }
|
||||
+ ],
|
||||
+ "drive0": [
|
||||
{
|
||||
"busy": false,
|
||||
"count": 458752,
|
||||
@@ -3845,16 +3845,16 @@ write -P0x67 0x3fe0000 0x20000
|
||||
"granularity": 65536,
|
||||
"persistent": false,
|
||||
"recording": false
|
||||
- }
|
||||
- ],
|
||||
- "drive0": [
|
||||
+ },
|
||||
{
|
||||
"busy": false,
|
||||
"count": 0,
|
||||
"granularity": 65536,
|
||||
"persistent": false,
|
||||
"recording": false
|
||||
- },
|
||||
+ }
|
||||
+ ],
|
||||
+ "drive0": [
|
||||
{
|
||||
"busy": false,
|
||||
"count": 458752,
|
||||
@@ -4321,16 +4321,16 @@ write -P0x67 0x3fe0000 0x20000
|
||||
"granularity": 65536,
|
||||
"persistent": false,
|
||||
"recording": false
|
||||
- }
|
||||
- ],
|
||||
- "drive0": [
|
||||
+ },
|
||||
{
|
||||
"busy": false,
|
||||
"count": 0,
|
||||
"granularity": 65536,
|
||||
"persistent": false,
|
||||
"recording": false
|
||||
- },
|
||||
+ }
|
||||
+ ],
|
||||
+ "drive0": [
|
||||
{
|
||||
"busy": false,
|
||||
"count": 458752,
|
||||
@@ -4590,16 +4590,16 @@ write -P0x67 0x3fe0000 0x20000
|
||||
"granularity": 65536,
|
||||
"persistent": false,
|
||||
"recording": false
|
||||
- }
|
||||
- ],
|
||||
- "drive0": [
|
||||
+ },
|
||||
{
|
||||
"busy": false,
|
||||
"count": 0,
|
||||
"granularity": 65536,
|
||||
"persistent": false,
|
||||
"recording": false
|
||||
- },
|
||||
+ }
|
||||
+ ],
|
||||
+ "drive0": [
|
||||
{
|
||||
"busy": false,
|
||||
"count": 458752,
|
||||
@@ -5066,16 +5066,16 @@ write -P0x67 0x3fe0000 0x20000
|
||||
"granularity": 65536,
|
||||
"persistent": false,
|
||||
"recording": false
|
||||
- }
|
||||
- ],
|
||||
- "drive0": [
|
||||
+ },
|
||||
{
|
||||
"busy": false,
|
||||
"count": 0,
|
||||
"granularity": 65536,
|
||||
"persistent": false,
|
||||
"recording": false
|
||||
- },
|
||||
+ }
|
||||
+ ],
|
||||
+ "drive0": [
|
||||
{
|
||||
"busy": false,
|
||||
"count": 458752,
|
277
debian/patches/pve/0047-qapi-blockdev-backup-add-discard-source-parameter.patch
vendored
Normal file
277
debian/patches/pve/0047-qapi-blockdev-backup-add-discard-source-parameter.patch
vendored
Normal file
|
@ -0,0 +1,277 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
|
||||
Date: Thu, 11 Apr 2024 11:29:25 +0200
|
||||
Subject: [PATCH] qapi: blockdev-backup: add discard-source parameter
|
||||
|
||||
Add a parameter that enables discard-after-copy. That is mostly useful
|
||||
in "push backup with fleecing" scheme, when source is snapshot-access
|
||||
format driver node, based on copy-before-write filter snapshot-access
|
||||
API:
|
||||
|
||||
[guest] [snapshot-access] ~~ blockdev-backup ~~> [backup target]
|
||||
| |
|
||||
| root | file
|
||||
v v
|
||||
[copy-before-write]
|
||||
| |
|
||||
| file | target
|
||||
v v
|
||||
[active disk] [temp.img]
|
||||
|
||||
In this case discard-after-copy does two things:
|
||||
|
||||
- discard data in temp.img to save disk space
|
||||
- avoid further copy-before-write operation in discarded area
|
||||
|
||||
Note that we have to declare WRITE permission on source in
|
||||
copy-before-write filter, for discard to work. Still we can't take it
|
||||
unconditionally, as it will break normal backup from RO source. So, we
|
||||
have to add a parameter and pass it thorough bdrv_open flags.
|
||||
|
||||
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
|
||||
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
---
|
||||
block/backup.c | 5 +++--
|
||||
block/block-copy.c | 9 +++++++++
|
||||
block/copy-before-write.c | 15 +++++++++++++--
|
||||
block/copy-before-write.h | 1 +
|
||||
block/replication.c | 4 ++--
|
||||
blockdev.c | 2 +-
|
||||
include/block/block-common.h | 2 ++
|
||||
include/block/block-copy.h | 1 +
|
||||
include/block/block_int-global-state.h | 2 +-
|
||||
qapi/block-core.json | 4 ++++
|
||||
10 files changed, 37 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/block/backup.c b/block/backup.c
|
||||
index 16d611c4ca..1963e47ab9 100644
|
||||
--- a/block/backup.c
|
||||
+++ b/block/backup.c
|
||||
@@ -332,7 +332,7 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
|
||||
BlockDriverState *target, int64_t speed,
|
||||
MirrorSyncMode sync_mode, BdrvDirtyBitmap *sync_bitmap,
|
||||
BitmapSyncMode bitmap_mode,
|
||||
- bool compress,
|
||||
+ bool compress, bool discard_source,
|
||||
const char *filter_node_name,
|
||||
BackupPerf *perf,
|
||||
BlockdevOnError on_source_error,
|
||||
@@ -433,7 +433,8 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
|
||||
goto error;
|
||||
}
|
||||
|
||||
- cbw = bdrv_cbw_append(bs, target, filter_node_name, &bcs, errp);
|
||||
+ cbw = bdrv_cbw_append(bs, target, filter_node_name, discard_source,
|
||||
+ &bcs, errp);
|
||||
if (!cbw) {
|
||||
goto error;
|
||||
}
|
||||
diff --git a/block/block-copy.c b/block/block-copy.c
|
||||
index 8fca2c3698..7e3b378528 100644
|
||||
--- a/block/block-copy.c
|
||||
+++ b/block/block-copy.c
|
||||
@@ -137,6 +137,7 @@ typedef struct BlockCopyState {
|
||||
CoMutex lock;
|
||||
int64_t in_flight_bytes;
|
||||
BlockCopyMethod method;
|
||||
+ bool discard_source;
|
||||
BlockReqList reqs;
|
||||
QLIST_HEAD(, BlockCopyCallState) calls;
|
||||
/*
|
||||
@@ -353,6 +354,7 @@ static int64_t block_copy_calculate_cluster_size(BlockDriverState *target,
|
||||
BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target,
|
||||
BlockDriverState *copy_bitmap_bs,
|
||||
const BdrvDirtyBitmap *bitmap,
|
||||
+ bool discard_source,
|
||||
Error **errp)
|
||||
{
|
||||
ERRP_GUARD();
|
||||
@@ -418,6 +420,7 @@ BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target,
|
||||
cluster_size),
|
||||
};
|
||||
|
||||
+ s->discard_source = discard_source;
|
||||
block_copy_set_copy_opts(s, false, false);
|
||||
|
||||
ratelimit_init(&s->rate_limit);
|
||||
@@ -589,6 +592,12 @@ static coroutine_fn int block_copy_task_entry(AioTask *task)
|
||||
co_put_to_shres(s->mem, t->req.bytes);
|
||||
block_copy_task_end(t, ret);
|
||||
|
||||
+ if (s->discard_source && ret == 0) {
|
||||
+ int64_t nbytes =
|
||||
+ MIN(t->req.offset + t->req.bytes, s->len) - t->req.offset;
|
||||
+ bdrv_co_pdiscard(s->source, t->req.offset, nbytes);
|
||||
+ }
|
||||
+
|
||||
return ret;
|
||||
}
|
||||
|
||||
diff --git a/block/copy-before-write.c b/block/copy-before-write.c
|
||||
index 94db31512d..853e01a1eb 100644
|
||||
--- a/block/copy-before-write.c
|
||||
+++ b/block/copy-before-write.c
|
||||
@@ -44,6 +44,7 @@ typedef struct BDRVCopyBeforeWriteState {
|
||||
BdrvChild *target;
|
||||
OnCbwError on_cbw_error;
|
||||
uint64_t cbw_timeout_ns;
|
||||
+ bool discard_source;
|
||||
|
||||
/*
|
||||
* @lock: protects access to @access_bitmap, @done_bitmap and
|
||||
@@ -357,6 +358,8 @@ cbw_child_perm(BlockDriverState *bs, BdrvChild *c, BdrvChildRole role,
|
||||
uint64_t perm, uint64_t shared,
|
||||
uint64_t *nperm, uint64_t *nshared)
|
||||
{
|
||||
+ BDRVCopyBeforeWriteState *s = bs->opaque;
|
||||
+
|
||||
if (!(role & BDRV_CHILD_FILTERED)) {
|
||||
/*
|
||||
* Target child
|
||||
@@ -381,6 +384,10 @@ cbw_child_perm(BlockDriverState *bs, BdrvChild *c, BdrvChildRole role,
|
||||
* start
|
||||
*/
|
||||
*nperm = *nperm | BLK_PERM_CONSISTENT_READ;
|
||||
+ if (s->discard_source) {
|
||||
+ *nperm = *nperm | BLK_PERM_WRITE;
|
||||
+ }
|
||||
+
|
||||
*nshared &= ~(BLK_PERM_WRITE | BLK_PERM_RESIZE);
|
||||
}
|
||||
}
|
||||
@@ -468,7 +475,9 @@ static int cbw_open(BlockDriverState *bs, QDict *options, int flags,
|
||||
((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK) &
|
||||
bs->file->bs->supported_zero_flags);
|
||||
|
||||
- s->bcs = block_copy_state_new(bs->file, s->target, bs, bitmap, errp);
|
||||
+ s->discard_source = flags & BDRV_O_CBW_DISCARD_SOURCE;
|
||||
+ s->bcs = block_copy_state_new(bs->file, s->target, bs, bitmap,
|
||||
+ flags & BDRV_O_CBW_DISCARD_SOURCE, errp);
|
||||
if (!s->bcs) {
|
||||
error_prepend(errp, "Cannot create block-copy-state: ");
|
||||
return -EINVAL;
|
||||
@@ -535,12 +544,14 @@ static BlockDriver bdrv_cbw_filter = {
|
||||
BlockDriverState *bdrv_cbw_append(BlockDriverState *source,
|
||||
BlockDriverState *target,
|
||||
const char *filter_node_name,
|
||||
+ bool discard_source,
|
||||
BlockCopyState **bcs,
|
||||
Error **errp)
|
||||
{
|
||||
BDRVCopyBeforeWriteState *state;
|
||||
BlockDriverState *top;
|
||||
QDict *opts;
|
||||
+ int flags = BDRV_O_RDWR | (discard_source ? BDRV_O_CBW_DISCARD_SOURCE : 0);
|
||||
|
||||
assert(source->total_sectors == target->total_sectors);
|
||||
GLOBAL_STATE_CODE();
|
||||
@@ -553,7 +564,7 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source,
|
||||
qdict_put_str(opts, "file", bdrv_get_node_name(source));
|
||||
qdict_put_str(opts, "target", bdrv_get_node_name(target));
|
||||
|
||||
- top = bdrv_insert_node(source, opts, BDRV_O_RDWR, errp);
|
||||
+ top = bdrv_insert_node(source, opts, flags, errp);
|
||||
if (!top) {
|
||||
return NULL;
|
||||
}
|
||||
diff --git a/block/copy-before-write.h b/block/copy-before-write.h
|
||||
index 6e72bb25e9..01af0cd3c4 100644
|
||||
--- a/block/copy-before-write.h
|
||||
+++ b/block/copy-before-write.h
|
||||
@@ -39,6 +39,7 @@
|
||||
BlockDriverState *bdrv_cbw_append(BlockDriverState *source,
|
||||
BlockDriverState *target,
|
||||
const char *filter_node_name,
|
||||
+ bool discard_source,
|
||||
BlockCopyState **bcs,
|
||||
Error **errp);
|
||||
void bdrv_cbw_drop(BlockDriverState *bs);
|
||||
diff --git a/block/replication.c b/block/replication.c
|
||||
index ca6bd0a720..0415a5e8b7 100644
|
||||
--- a/block/replication.c
|
||||
+++ b/block/replication.c
|
||||
@@ -582,8 +582,8 @@ static void replication_start(ReplicationState *rs, ReplicationMode mode,
|
||||
|
||||
s->backup_job = backup_job_create(
|
||||
NULL, s->secondary_disk->bs, s->hidden_disk->bs,
|
||||
- 0, MIRROR_SYNC_MODE_NONE, NULL, 0, false, NULL,
|
||||
- &perf,
|
||||
+ 0, MIRROR_SYNC_MODE_NONE, NULL, 0, false, false,
|
||||
+ NULL, &perf,
|
||||
BLOCKDEV_ON_ERROR_REPORT,
|
||||
BLOCKDEV_ON_ERROR_REPORT, JOB_INTERNAL,
|
||||
backup_job_completed, bs, NULL, &local_err);
|
||||
diff --git a/blockdev.c b/blockdev.c
|
||||
index 5e5dbc1da9..1054a69279 100644
|
||||
--- a/blockdev.c
|
||||
+++ b/blockdev.c
|
||||
@@ -2727,7 +2727,7 @@ static BlockJob *do_backup_common(BackupCommon *backup,
|
||||
|
||||
job = backup_job_create(backup->job_id, bs, target_bs, backup->speed,
|
||||
backup->sync, bmap, backup->bitmap_mode,
|
||||
- backup->compress,
|
||||
+ backup->compress, backup->discard_source,
|
||||
backup->filter_node_name,
|
||||
&perf,
|
||||
backup->on_source_error,
|
||||
diff --git a/include/block/block-common.h b/include/block/block-common.h
|
||||
index a846023a09..338fe5ff7a 100644
|
||||
--- a/include/block/block-common.h
|
||||
+++ b/include/block/block-common.h
|
||||
@@ -243,6 +243,8 @@ typedef enum {
|
||||
read-write fails */
|
||||
#define BDRV_O_IO_URING 0x40000 /* use io_uring instead of the thread pool */
|
||||
|
||||
+#define BDRV_O_CBW_DISCARD_SOURCE 0x80000 /* for copy-before-write filter */
|
||||
+
|
||||
#define BDRV_O_CACHE_MASK (BDRV_O_NOCACHE | BDRV_O_NO_FLUSH)
|
||||
|
||||
|
||||
diff --git a/include/block/block-copy.h b/include/block/block-copy.h
|
||||
index 8b41643bfa..bdc703bacd 100644
|
||||
--- a/include/block/block-copy.h
|
||||
+++ b/include/block/block-copy.h
|
||||
@@ -27,6 +27,7 @@ typedef struct BlockCopyCallState BlockCopyCallState;
|
||||
BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target,
|
||||
BlockDriverState *copy_bitmap_bs,
|
||||
const BdrvDirtyBitmap *bitmap,
|
||||
+ bool discard_source,
|
||||
Error **errp);
|
||||
|
||||
/* Function should be called prior any actual copy request */
|
||||
diff --git a/include/block/block_int-global-state.h b/include/block/block_int-global-state.h
|
||||
index cc1387ae02..f0c642b194 100644
|
||||
--- a/include/block/block_int-global-state.h
|
||||
+++ b/include/block/block_int-global-state.h
|
||||
@@ -195,7 +195,7 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
|
||||
MirrorSyncMode sync_mode,
|
||||
BdrvDirtyBitmap *sync_bitmap,
|
||||
BitmapSyncMode bitmap_mode,
|
||||
- bool compress,
|
||||
+ bool compress, bool discard_source,
|
||||
const char *filter_node_name,
|
||||
BackupPerf *perf,
|
||||
BlockdevOnError on_source_error,
|
||||
diff --git a/qapi/block-core.json b/qapi/block-core.json
|
||||
index f516d8e95a..d796d49abb 100644
|
||||
--- a/qapi/block-core.json
|
||||
+++ b/qapi/block-core.json
|
||||
@@ -1849,6 +1849,9 @@
|
||||
# node specified by @drive. If this option is not given, a node
|
||||
# name is autogenerated. (Since: 4.2)
|
||||
#
|
||||
+# @discard-source: Discard blocks on source which are already copied
|
||||
+# to the target. (Since 9.0)
|
||||
+#
|
||||
# @x-perf: Performance options. (Since 6.0)
|
||||
#
|
||||
# Features:
|
||||
@@ -1870,6 +1873,7 @@
|
||||
'*on-target-error': 'BlockdevOnError',
|
||||
'*auto-finalize': 'bool', '*auto-dismiss': 'bool',
|
||||
'*filter-node-name': 'str',
|
||||
+ '*discard-source': 'bool',
|
||||
'*x-perf': { 'type': 'BackupPerf',
|
||||
'features': [ 'unstable' ] } } }
|
||||
|
133
debian/patches/pve/0048-copy-before-write-allow-specifying-minimum-cluster-s.patch
vendored
Normal file
133
debian/patches/pve/0048-copy-before-write-allow-specifying-minimum-cluster-s.patch
vendored
Normal file
|
@ -0,0 +1,133 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Fiona Ebner <f.ebner@proxmox.com>
|
||||
Date: Thu, 11 Apr 2024 11:29:26 +0200
|
||||
Subject: [PATCH] copy-before-write: allow specifying minimum cluster size
|
||||
|
||||
Useful to make discard-source work in the context of backup fleecing
|
||||
when the fleecing image has a larger granularity than the backup
|
||||
target.
|
||||
|
||||
Copy-before-write operations will use at least this granularity and in
|
||||
particular, discard requests to the source node will too. If the
|
||||
granularity is too small, they will just be aligned down in
|
||||
cbw_co_pdiscard_snapshot() and thus effectively ignored.
|
||||
|
||||
The QAPI uses uint32 so the value will be non-negative, but still fit
|
||||
into a uint64_t.
|
||||
|
||||
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
---
|
||||
block/block-copy.c | 17 +++++++++++++----
|
||||
block/copy-before-write.c | 3 ++-
|
||||
include/block/block-copy.h | 1 +
|
||||
qapi/block-core.json | 8 +++++++-
|
||||
4 files changed, 23 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/block/block-copy.c b/block/block-copy.c
|
||||
index 7e3b378528..adb1cbb440 100644
|
||||
--- a/block/block-copy.c
|
||||
+++ b/block/block-copy.c
|
||||
@@ -310,6 +310,7 @@ void block_copy_set_copy_opts(BlockCopyState *s, bool use_copy_range,
|
||||
}
|
||||
|
||||
static int64_t block_copy_calculate_cluster_size(BlockDriverState *target,
|
||||
+ int64_t min_cluster_size,
|
||||
Error **errp)
|
||||
{
|
||||
int ret;
|
||||
@@ -335,7 +336,7 @@ static int64_t block_copy_calculate_cluster_size(BlockDriverState *target,
|
||||
"used. If the actual block size of the target exceeds "
|
||||
"this default, the backup may be unusable",
|
||||
BLOCK_COPY_CLUSTER_SIZE_DEFAULT);
|
||||
- return BLOCK_COPY_CLUSTER_SIZE_DEFAULT;
|
||||
+ return MAX(min_cluster_size, BLOCK_COPY_CLUSTER_SIZE_DEFAULT);
|
||||
} else if (ret < 0 && !target_does_cow) {
|
||||
error_setg_errno(errp, -ret,
|
||||
"Couldn't determine the cluster size of the target image, "
|
||||
@@ -345,16 +346,18 @@ static int64_t block_copy_calculate_cluster_size(BlockDriverState *target,
|
||||
return ret;
|
||||
} else if (ret < 0 && target_does_cow) {
|
||||
/* Not fatal; just trudge on ahead. */
|
||||
- return BLOCK_COPY_CLUSTER_SIZE_DEFAULT;
|
||||
+ return MAX(min_cluster_size, BLOCK_COPY_CLUSTER_SIZE_DEFAULT);
|
||||
}
|
||||
|
||||
- return MAX(BLOCK_COPY_CLUSTER_SIZE_DEFAULT, bdi.cluster_size);
|
||||
+ return MAX(min_cluster_size,
|
||||
+ MAX(BLOCK_COPY_CLUSTER_SIZE_DEFAULT, bdi.cluster_size));
|
||||
}
|
||||
|
||||
BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target,
|
||||
BlockDriverState *copy_bitmap_bs,
|
||||
const BdrvDirtyBitmap *bitmap,
|
||||
bool discard_source,
|
||||
+ int64_t min_cluster_size,
|
||||
Error **errp)
|
||||
{
|
||||
ERRP_GUARD();
|
||||
@@ -365,7 +368,13 @@ BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target,
|
||||
|
||||
GLOBAL_STATE_CODE();
|
||||
|
||||
- cluster_size = block_copy_calculate_cluster_size(target->bs, errp);
|
||||
+ if (min_cluster_size && !is_power_of_2(min_cluster_size)) {
|
||||
+ error_setg(errp, "min-cluster-size needs to be a power of 2");
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
+ cluster_size = block_copy_calculate_cluster_size(target->bs,
|
||||
+ min_cluster_size, errp);
|
||||
if (cluster_size < 0) {
|
||||
return NULL;
|
||||
}
|
||||
diff --git a/block/copy-before-write.c b/block/copy-before-write.c
|
||||
index 853e01a1eb..47b3cdd09f 100644
|
||||
--- a/block/copy-before-write.c
|
||||
+++ b/block/copy-before-write.c
|
||||
@@ -477,7 +477,8 @@ static int cbw_open(BlockDriverState *bs, QDict *options, int flags,
|
||||
|
||||
s->discard_source = flags & BDRV_O_CBW_DISCARD_SOURCE;
|
||||
s->bcs = block_copy_state_new(bs->file, s->target, bs, bitmap,
|
||||
- flags & BDRV_O_CBW_DISCARD_SOURCE, errp);
|
||||
+ flags & BDRV_O_CBW_DISCARD_SOURCE,
|
||||
+ opts->min_cluster_size, errp);
|
||||
if (!s->bcs) {
|
||||
error_prepend(errp, "Cannot create block-copy-state: ");
|
||||
return -EINVAL;
|
||||
diff --git a/include/block/block-copy.h b/include/block/block-copy.h
|
||||
index bdc703bacd..77857c6c68 100644
|
||||
--- a/include/block/block-copy.h
|
||||
+++ b/include/block/block-copy.h
|
||||
@@ -28,6 +28,7 @@ BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target,
|
||||
BlockDriverState *copy_bitmap_bs,
|
||||
const BdrvDirtyBitmap *bitmap,
|
||||
bool discard_source,
|
||||
+ int64_t min_cluster_size,
|
||||
Error **errp);
|
||||
|
||||
/* Function should be called prior any actual copy request */
|
||||
diff --git a/qapi/block-core.json b/qapi/block-core.json
|
||||
index d796d49abb..edbf6e78b9 100644
|
||||
--- a/qapi/block-core.json
|
||||
+++ b/qapi/block-core.json
|
||||
@@ -4930,12 +4930,18 @@
|
||||
# @on-cbw-error parameter will decide how this failure is handled.
|
||||
# Default 0. (Since 7.1)
|
||||
#
|
||||
+# @min-cluster-size: Minimum size of blocks used by copy-before-write
|
||||
+# operations. Has to be a power of 2. No effect if smaller than
|
||||
+# the maximum of the target's cluster size and 64 KiB. Default 0.
|
||||
+# (Since 8.1)
|
||||
+#
|
||||
# Since: 6.2
|
||||
##
|
||||
{ 'struct': 'BlockdevOptionsCbw',
|
||||
'base': 'BlockdevOptionsGenericFormat',
|
||||
'data': { 'target': 'BlockdevRef', '*bitmap': 'BlockDirtyBitmap',
|
||||
- '*on-cbw-error': 'OnCbwError', '*cbw-timeout': 'uint32' } }
|
||||
+ '*on-cbw-error': 'OnCbwError', '*cbw-timeout': 'uint32',
|
||||
+ '*min-cluster-size': 'uint32' } }
|
||||
|
||||
##
|
||||
# @BlockdevOptions:
|
106
debian/patches/pve/0049-backup-add-minimum-cluster-size-to-performance-optio.patch
vendored
Normal file
106
debian/patches/pve/0049-backup-add-minimum-cluster-size-to-performance-optio.patch
vendored
Normal file
|
@ -0,0 +1,106 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Fiona Ebner <f.ebner@proxmox.com>
|
||||
Date: Thu, 11 Apr 2024 11:29:27 +0200
|
||||
Subject: [PATCH] backup: add minimum cluster size to performance options
|
||||
|
||||
Useful to make discard-source work in the context of backup fleecing
|
||||
when the fleecing image has a larger granularity than the backup
|
||||
target.
|
||||
|
||||
Backup/block-copy will use at least this granularity for copy operations
|
||||
and in particular, discard requests to the backup source will too. If
|
||||
the granularity is too small, they will just be aligned down in
|
||||
cbw_co_pdiscard_snapshot() and thus effectively ignored.
|
||||
|
||||
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
---
|
||||
block/backup.c | 2 +-
|
||||
block/copy-before-write.c | 2 ++
|
||||
block/copy-before-write.h | 1 +
|
||||
blockdev.c | 3 +++
|
||||
qapi/block-core.json | 9 +++++++--
|
||||
5 files changed, 14 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/block/backup.c b/block/backup.c
|
||||
index 1963e47ab9..fe69723ada 100644
|
||||
--- a/block/backup.c
|
||||
+++ b/block/backup.c
|
||||
@@ -434,7 +434,7 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
|
||||
}
|
||||
|
||||
cbw = bdrv_cbw_append(bs, target, filter_node_name, discard_source,
|
||||
- &bcs, errp);
|
||||
+ perf->min_cluster_size, &bcs, errp);
|
||||
if (!cbw) {
|
||||
goto error;
|
||||
}
|
||||
diff --git a/block/copy-before-write.c b/block/copy-before-write.c
|
||||
index 47b3cdd09f..bba58326d7 100644
|
||||
--- a/block/copy-before-write.c
|
||||
+++ b/block/copy-before-write.c
|
||||
@@ -546,6 +546,7 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source,
|
||||
BlockDriverState *target,
|
||||
const char *filter_node_name,
|
||||
bool discard_source,
|
||||
+ int64_t min_cluster_size,
|
||||
BlockCopyState **bcs,
|
||||
Error **errp)
|
||||
{
|
||||
@@ -564,6 +565,7 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source,
|
||||
}
|
||||
qdict_put_str(opts, "file", bdrv_get_node_name(source));
|
||||
qdict_put_str(opts, "target", bdrv_get_node_name(target));
|
||||
+ qdict_put_int(opts, "min-cluster-size", min_cluster_size);
|
||||
|
||||
top = bdrv_insert_node(source, opts, flags, errp);
|
||||
if (!top) {
|
||||
diff --git a/block/copy-before-write.h b/block/copy-before-write.h
|
||||
index 01af0cd3c4..dc6cafe7fa 100644
|
||||
--- a/block/copy-before-write.h
|
||||
+++ b/block/copy-before-write.h
|
||||
@@ -40,6 +40,7 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source,
|
||||
BlockDriverState *target,
|
||||
const char *filter_node_name,
|
||||
bool discard_source,
|
||||
+ int64_t min_cluster_size,
|
||||
BlockCopyState **bcs,
|
||||
Error **errp);
|
||||
void bdrv_cbw_drop(BlockDriverState *bs);
|
||||
diff --git a/blockdev.c b/blockdev.c
|
||||
index 1054a69279..cbe224387b 100644
|
||||
--- a/blockdev.c
|
||||
+++ b/blockdev.c
|
||||
@@ -2654,6 +2654,9 @@ static BlockJob *do_backup_common(BackupCommon *backup,
|
||||
if (backup->x_perf->has_max_chunk) {
|
||||
perf.max_chunk = backup->x_perf->max_chunk;
|
||||
}
|
||||
+ if (backup->x_perf->has_min_cluster_size) {
|
||||
+ perf.min_cluster_size = backup->x_perf->min_cluster_size;
|
||||
+ }
|
||||
}
|
||||
|
||||
if ((backup->sync == MIRROR_SYNC_MODE_BITMAP) ||
|
||||
diff --git a/qapi/block-core.json b/qapi/block-core.json
|
||||
index edbf6e78b9..6e7ee87633 100644
|
||||
--- a/qapi/block-core.json
|
||||
+++ b/qapi/block-core.json
|
||||
@@ -1790,11 +1790,16 @@
|
||||
# it should not be less than job cluster size which is calculated
|
||||
# as maximum of target image cluster size and 64k. Default 0.
|
||||
#
|
||||
+# @min-cluster-size: Minimum size of blocks used by copy-before-write
|
||||
+# and background copy operations. Has to be a power of 2. No
|
||||
+# effect if smaller than the maximum of the target's cluster size
|
||||
+# and 64 KiB. Default 0. (Since 8.1)
|
||||
+#
|
||||
# Since: 6.0
|
||||
##
|
||||
{ 'struct': 'BackupPerf',
|
||||
- 'data': { '*use-copy-range': 'bool',
|
||||
- '*max-workers': 'int', '*max-chunk': 'int64' } }
|
||||
+ 'data': { '*use-copy-range': 'bool', '*max-workers': 'int',
|
||||
+ '*max-chunk': 'int64', '*min-cluster-size': 'uint32' } }
|
||||
|
||||
##
|
||||
# @BackupCommon:
|
|
@ -0,0 +1,345 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Fiona Ebner <f.ebner@proxmox.com>
|
||||
Date: Thu, 11 Apr 2024 11:29:28 +0200
|
||||
Subject: [PATCH] PVE backup: add fleecing option
|
||||
|
||||
When a fleecing option is given, it is expected that each device has
|
||||
a corresponding "-fleecing" block device already attached, except for
|
||||
EFI disk and TPM state, where fleecing is never used.
|
||||
|
||||
The following graph was adapted from [0] which also contains more
|
||||
details about fleecing.
|
||||
|
||||
[guest]
|
||||
|
|
||||
| root
|
||||
v file
|
||||
[copy-before-write]<------[snapshot-access]
|
||||
| |
|
||||
| file | target
|
||||
v v
|
||||
[source] [fleecing]
|
||||
|
||||
For fleecing, a copy-before-write filter is inserted on top of the
|
||||
source node, as well as a snapshot-access node pointing to the filter
|
||||
node which allows to read the consistent state of the image at the
|
||||
time it was inserted. New guest writes are passed through the
|
||||
copy-before-write filter which will first copy over old data to the
|
||||
fleecing image in case that old data is still needed by the
|
||||
snapshot-access node.
|
||||
|
||||
The backup process will sequentially read from the snapshot access,
|
||||
which has a bitmap and knows whether to read from the original image
|
||||
or the fleecing image to get the "snapshot" state, i.e. data from the
|
||||
source image at the time when the copy-before-write filter was
|
||||
inserted. After reading, the copied sections are discarded from the
|
||||
fleecing image to reduce space usage.
|
||||
|
||||
All of this can be restricted by an initial dirty bitmap to parts of
|
||||
the source image that are required for an incremental backup.
|
||||
|
||||
For discard to work, it is necessary that the fleecing image does not
|
||||
have a larger cluster size than the backup job granularity. Since
|
||||
querying that size does not always work, e.g. for RBD with krbd, the
|
||||
cluster size will not be reported, a minimum of 4 MiB is used. A job
|
||||
with PBS target already has at least this granularity, so it's just
|
||||
relevant for other targets. I.e. edge cases where this minimum is not
|
||||
enough should be very rare in practice. If ever necessary in the
|
||||
future, can still add a passed-in value for the backup QMP command to
|
||||
override.
|
||||
|
||||
Additionally, the cbw-timeout and on-cbw-error=break-snapshot options
|
||||
are set when installing the copy-before-write filter and
|
||||
snapshot-access. When an error or timeout occurs, the problematic (and
|
||||
each further) snapshot operation will fail and thus cancel the backup
|
||||
instead of breaking the guest write.
|
||||
|
||||
Note that job_id cannot be inferred from the snapshot-access bs because
|
||||
it has no parent, so just pass the one from the original bs.
|
||||
|
||||
[0]: https://www.mail-archive.com/qemu-devel@nongnu.org/msg876056.html
|
||||
|
||||
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
---
|
||||
block/monitor/block-hmp-cmds.c | 1 +
|
||||
pve-backup.c | 143 ++++++++++++++++++++++++++++++++-
|
||||
qapi/block-core.json | 10 ++-
|
||||
3 files changed, 150 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c
|
||||
index 5000c084c5..70b3de4c7e 100644
|
||||
--- a/block/monitor/block-hmp-cmds.c
|
||||
+++ b/block/monitor/block-hmp-cmds.c
|
||||
@@ -1043,6 +1043,7 @@ void coroutine_fn hmp_backup(Monitor *mon, const QDict *qdict)
|
||||
NULL, NULL,
|
||||
devlist, qdict_haskey(qdict, "speed"), speed,
|
||||
false, 0, // BackupPerf max-workers
|
||||
+ false, false, // fleecing
|
||||
&error);
|
||||
|
||||
hmp_handle_error(mon, error);
|
||||
diff --git a/pve-backup.c b/pve-backup.c
|
||||
index 9d480a8eec..7cc1dd3724 100644
|
||||
--- a/pve-backup.c
|
||||
+++ b/pve-backup.c
|
||||
@@ -7,9 +7,11 @@
|
||||
#include "sysemu/blockdev.h"
|
||||
#include "block/block_int-global-state.h"
|
||||
#include "block/blockjob.h"
|
||||
+#include "block/copy-before-write.h"
|
||||
#include "block/dirty-bitmap.h"
|
||||
#include "block/graph-lock.h"
|
||||
#include "qapi/qapi-commands-block.h"
|
||||
+#include "qapi/qmp/qdict.h"
|
||||
#include "qapi/qmp/qerror.h"
|
||||
#include "qemu/cutils.h"
|
||||
|
||||
@@ -81,8 +83,15 @@ static void pvebackup_init(void)
|
||||
// initialize PVEBackupState at startup
|
||||
opts_init(pvebackup_init);
|
||||
|
||||
+typedef struct PVEBackupFleecingInfo {
|
||||
+ BlockDriverState *bs;
|
||||
+ BlockDriverState *cbw;
|
||||
+ BlockDriverState *snapshot_access;
|
||||
+} PVEBackupFleecingInfo;
|
||||
+
|
||||
typedef struct PVEBackupDevInfo {
|
||||
BlockDriverState *bs;
|
||||
+ PVEBackupFleecingInfo fleecing;
|
||||
size_t size;
|
||||
uint64_t block_size;
|
||||
uint8_t dev_id;
|
||||
@@ -355,6 +364,25 @@ static void pvebackup_complete_cb(void *opaque, int ret)
|
||||
PVEBackupDevInfo *di = opaque;
|
||||
di->completed_ret = ret;
|
||||
|
||||
+ /*
|
||||
+ * Handle block-graph specific cleanup (for fleecing) outside of the coroutine, because the work
|
||||
+ * won't be done as a coroutine anyways:
|
||||
+ * - For snapshot_access, allows doing bdrv_unref() directly. Doing it via bdrv_co_unref() would
|
||||
+ * just spawn a BH calling bdrv_unref().
|
||||
+ * - For cbw, draining would need to spawn a BH.
|
||||
+ *
|
||||
+ * Note that the AioContext lock is already acquired by our caller, i.e.
|
||||
+ * job_finalize_single_locked()
|
||||
+ */
|
||||
+ if (di->fleecing.snapshot_access) {
|
||||
+ bdrv_unref(di->fleecing.snapshot_access);
|
||||
+ di->fleecing.snapshot_access = NULL;
|
||||
+ }
|
||||
+ if (di->fleecing.cbw) {
|
||||
+ bdrv_cbw_drop(di->fleecing.cbw);
|
||||
+ di->fleecing.cbw = NULL;
|
||||
+ }
|
||||
+
|
||||
/*
|
||||
* Needs to happen outside of coroutine, because it takes the graph write lock.
|
||||
*/
|
||||
@@ -522,9 +550,82 @@ static void create_backup_jobs_bh(void *opaque) {
|
||||
}
|
||||
bdrv_drained_begin(di->bs);
|
||||
|
||||
+ BackupPerf perf = (BackupPerf){ .max_workers = backup_state.perf.max_workers };
|
||||
+
|
||||
+ BlockDriverState *source_bs = di->bs;
|
||||
+ bool discard_source = false;
|
||||
+ bdrv_graph_co_rdlock();
|
||||
+ const char *job_id = bdrv_get_device_name(di->bs);
|
||||
+ bdrv_graph_co_rdunlock();
|
||||
+ if (di->fleecing.bs) {
|
||||
+ QDict *cbw_opts = qdict_new();
|
||||
+ qdict_put_str(cbw_opts, "driver", "copy-before-write");
|
||||
+ qdict_put_str(cbw_opts, "file", bdrv_get_node_name(di->bs));
|
||||
+ qdict_put_str(cbw_opts, "target", bdrv_get_node_name(di->fleecing.bs));
|
||||
+
|
||||
+ if (di->bitmap) {
|
||||
+ /*
|
||||
+ * Only guest writes to parts relevant for the backup need to be intercepted with
|
||||
+ * old data being copied to the fleecing image.
|
||||
+ */
|
||||
+ qdict_put_str(cbw_opts, "bitmap.node", bdrv_get_node_name(di->bs));
|
||||
+ qdict_put_str(cbw_opts, "bitmap.name", bdrv_dirty_bitmap_name(di->bitmap));
|
||||
+ }
|
||||
+ /*
|
||||
+ * Fleecing storage is supposed to be fast and it's better to break backup than guest
|
||||
+ * writes. Certain guest drivers like VirtIO-win have 60 seconds timeout by default, so
|
||||
+ * abort a bit before that.
|
||||
+ */
|
||||
+ qdict_put_str(cbw_opts, "on-cbw-error", "break-snapshot");
|
||||
+ qdict_put_int(cbw_opts, "cbw-timeout", 45);
|
||||
+
|
||||
+ di->fleecing.cbw = bdrv_insert_node(di->bs, cbw_opts, BDRV_O_RDWR, &local_err);
|
||||
+
|
||||
+ if (!di->fleecing.cbw) {
|
||||
+ error_setg(errp, "appending cbw node for fleecing failed: %s",
|
||||
+ local_err ? error_get_pretty(local_err) : "unknown error");
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+ QDict *snapshot_access_opts = qdict_new();
|
||||
+ qdict_put_str(snapshot_access_opts, "driver", "snapshot-access");
|
||||
+ qdict_put_str(snapshot_access_opts, "file", bdrv_get_node_name(di->fleecing.cbw));
|
||||
+
|
||||
+ /*
|
||||
+ * Holding the AioContext lock here would cause a deadlock, because bdrv_open_driver()
|
||||
+ * will aquire it a second time. But it's allowed to be held exactly once when polling
|
||||
+ * and that happens when the bdrv_refresh_total_sectors() call is made there.
|
||||
+ */
|
||||
+ di->fleecing.snapshot_access =
|
||||
+ bdrv_open(NULL, NULL, snapshot_access_opts, BDRV_O_RDWR | BDRV_O_UNMAP, &local_err);
|
||||
+ if (!di->fleecing.snapshot_access) {
|
||||
+ error_setg(errp, "setting up snapshot access for fleecing failed: %s",
|
||||
+ local_err ? error_get_pretty(local_err) : "unknown error");
|
||||
+ break;
|
||||
+ }
|
||||
+ source_bs = di->fleecing.snapshot_access;
|
||||
+ discard_source = true;
|
||||
+
|
||||
+ /*
|
||||
+ * bdrv_get_info() just retuns 0 (= doesn't matter) for RBD when using krbd. But discard
|
||||
+ * on the fleecing image won't work if the backup job's granularity is less than the RBD
|
||||
+ * object size (default 4 MiB), so it does matter. Always use at least 4 MiB. With a PBS
|
||||
+ * target, the backup job granularity would already be at least this much.
|
||||
+ */
|
||||
+ perf.min_cluster_size = 4 * 1024 * 1024;
|
||||
+ /*
|
||||
+ * For discard to work, cluster size for the backup job must be at least the same as for
|
||||
+ * the fleecing image.
|
||||
+ */
|
||||
+ BlockDriverInfo bdi;
|
||||
+ if (bdrv_get_info(di->fleecing.bs, &bdi) >= 0) {
|
||||
+ perf.min_cluster_size = MAX(perf.min_cluster_size, bdi.cluster_size);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
BlockJob *job = backup_job_create(
|
||||
- NULL, di->bs, di->target, backup_state.speed, sync_mode, di->bitmap,
|
||||
- bitmap_mode, false, NULL, &backup_state.perf, BLOCKDEV_ON_ERROR_REPORT,
|
||||
+ job_id, source_bs, di->target, backup_state.speed, sync_mode, di->bitmap,
|
||||
+ bitmap_mode, false, discard_source, NULL, &perf, BLOCKDEV_ON_ERROR_REPORT,
|
||||
BLOCKDEV_ON_ERROR_REPORT, JOB_DEFAULT, pvebackup_complete_cb, di, backup_state.txn,
|
||||
&local_err);
|
||||
|
||||
@@ -580,6 +681,14 @@ static void create_backup_jobs_bh(void *opaque) {
|
||||
aio_co_enter(data->ctx, data->co);
|
||||
}
|
||||
|
||||
+/*
|
||||
+ * EFI disk and TPM state are small and it's just not worth setting up fleecing for them.
|
||||
+ */
|
||||
+static bool device_uses_fleecing(const char *device_id)
|
||||
+{
|
||||
+ return strncmp(device_id, "drive-efidisk", 13) && strncmp(device_id, "drive-tpmstate", 14);
|
||||
+}
|
||||
+
|
||||
/*
|
||||
* Returns a list of device infos, which needs to be freed by the caller. In
|
||||
* case of an error, errp will be set, but the returned value might still be a
|
||||
@@ -587,6 +696,7 @@ static void create_backup_jobs_bh(void *opaque) {
|
||||
*/
|
||||
static GList coroutine_fn GRAPH_RDLOCK *get_device_info(
|
||||
const char *devlist,
|
||||
+ bool fleecing,
|
||||
Error **errp)
|
||||
{
|
||||
gchar **devs = NULL;
|
||||
@@ -610,6 +720,31 @@ static GList coroutine_fn GRAPH_RDLOCK *get_device_info(
|
||||
}
|
||||
PVEBackupDevInfo *di = g_new0(PVEBackupDevInfo, 1);
|
||||
di->bs = bs;
|
||||
+
|
||||
+ if (fleecing && device_uses_fleecing(*d)) {
|
||||
+ g_autofree gchar *fleecing_devid = g_strconcat(*d, "-fleecing", NULL);
|
||||
+ BlockBackend *fleecing_blk = blk_by_name(fleecing_devid);
|
||||
+ if (!fleecing_blk) {
|
||||
+ error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
|
||||
+ "Device '%s' not found", fleecing_devid);
|
||||
+ goto err;
|
||||
+ }
|
||||
+ BlockDriverState *fleecing_bs = blk_bs(fleecing_blk);
|
||||
+ if (!bdrv_co_is_inserted(fleecing_bs)) {
|
||||
+ error_setg(errp, QERR_DEVICE_HAS_NO_MEDIUM, fleecing_devid);
|
||||
+ goto err;
|
||||
+ }
|
||||
+ /*
|
||||
+ * Fleecing image needs to be the same size to act as a cbw target.
|
||||
+ */
|
||||
+ if (bs->total_sectors != fleecing_bs->total_sectors) {
|
||||
+ error_setg(errp, "Size mismatch for '%s' - sector count %ld != %ld",
|
||||
+ fleecing_devid, fleecing_bs->total_sectors, bs->total_sectors);
|
||||
+ goto err;
|
||||
+ }
|
||||
+ di->fleecing.bs = fleecing_bs;
|
||||
+ }
|
||||
+
|
||||
di_list = g_list_append(di_list, di);
|
||||
d++;
|
||||
}
|
||||
@@ -659,6 +794,7 @@ UuidInfo coroutine_fn *qmp_backup(
|
||||
const char *devlist,
|
||||
bool has_speed, int64_t speed,
|
||||
bool has_max_workers, int64_t max_workers,
|
||||
+ bool has_fleecing, bool fleecing,
|
||||
Error **errp)
|
||||
{
|
||||
assert(qemu_in_coroutine());
|
||||
@@ -687,7 +823,7 @@ UuidInfo coroutine_fn *qmp_backup(
|
||||
format = has_format ? format : BACKUP_FORMAT_VMA;
|
||||
|
||||
bdrv_graph_co_rdlock();
|
||||
- di_list = get_device_info(devlist, &local_err);
|
||||
+ di_list = get_device_info(devlist, has_fleecing && fleecing, &local_err);
|
||||
bdrv_graph_co_rdunlock();
|
||||
if (local_err) {
|
||||
error_propagate(errp, local_err);
|
||||
@@ -1095,5 +1231,6 @@ ProxmoxSupportStatus *qmp_query_proxmox_support(Error **errp)
|
||||
ret->query_bitmap_info = true;
|
||||
ret->pbs_masterkey = true;
|
||||
ret->backup_max_workers = true;
|
||||
+ ret->backup_fleecing = true;
|
||||
return ret;
|
||||
}
|
||||
diff --git a/qapi/block-core.json b/qapi/block-core.json
|
||||
index 6e7ee87633..dc5f75cd39 100644
|
||||
--- a/qapi/block-core.json
|
||||
+++ b/qapi/block-core.json
|
||||
@@ -948,6 +948,10 @@
|
||||
#
|
||||
# @max-workers: see @BackupPerf for details. Default 16.
|
||||
#
|
||||
+# @fleecing: perform a backup with fleecing. For each device in @devlist, a
|
||||
+# corresponing '-fleecing' device with the same size already needs to
|
||||
+# be present.
|
||||
+#
|
||||
# Returns: the uuid of the backup job
|
||||
#
|
||||
##
|
||||
@@ -968,7 +972,8 @@
|
||||
'*firewall-file': 'str',
|
||||
'*devlist': 'str',
|
||||
'*speed': 'int',
|
||||
- '*max-workers': 'int' },
|
||||
+ '*max-workers': 'int',
|
||||
+ '*fleecing': 'bool' },
|
||||
'returns': 'UuidInfo', 'coroutine': true }
|
||||
|
||||
##
|
||||
@@ -1014,6 +1019,8 @@
|
||||
#
|
||||
# @pbs-library-version: Running version of libproxmox-backup-qemu0 library.
|
||||
#
|
||||
+# @backup-fleecing: Whether backup fleecing is supported or not.
|
||||
+#
|
||||
# @backup-max-workers: Whether the 'max-workers' @BackupPerf setting is
|
||||
# supported or not.
|
||||
#
|
||||
@@ -1025,6 +1032,7 @@
|
||||
'pbs-dirty-bitmap-migration': 'bool',
|
||||
'pbs-masterkey': 'bool',
|
||||
'pbs-library-version': 'str',
|
||||
+ 'backup-fleecing': 'bool',
|
||||
'backup-max-workers': 'bool' } }
|
||||
|
||||
##
|
117
debian/patches/pve/0051-PVE-backup-improve-error-when-copy-before-write-fail.patch
vendored
Normal file
117
debian/patches/pve/0051-PVE-backup-improve-error-when-copy-before-write-fail.patch
vendored
Normal file
|
@ -0,0 +1,117 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Fiona Ebner <f.ebner@proxmox.com>
|
||||
Date: Mon, 29 Apr 2024 14:43:58 +0200
|
||||
Subject: [PATCH] PVE backup: improve error when copy-before-write fails for
|
||||
fleecing
|
||||
|
||||
With fleecing, failure for copy-before-write does not fail the guest
|
||||
write, but only sets the snapshot error that is associated to the
|
||||
copy-before-write filter, making further requests to the snapshot
|
||||
access fail with EACCES, which then also fails the job. But that error
|
||||
code is not the root cause of why the backup failed, so bubble up the
|
||||
original snapshot error instead.
|
||||
|
||||
Reported-by: Friedrich Weber <f.weber@proxmox.com>
|
||||
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
Tested-by: Friedrich Weber <f.weber@proxmox.com>
|
||||
---
|
||||
block/copy-before-write.c | 18 ++++++++++++------
|
||||
block/copy-before-write.h | 1 +
|
||||
pve-backup.c | 9 +++++++++
|
||||
3 files changed, 22 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/block/copy-before-write.c b/block/copy-before-write.c
|
||||
index bba58326d7..50cc4c7aae 100644
|
||||
--- a/block/copy-before-write.c
|
||||
+++ b/block/copy-before-write.c
|
||||
@@ -27,6 +27,7 @@
|
||||
#include "qapi/qmp/qjson.h"
|
||||
|
||||
#include "sysemu/block-backend.h"
|
||||
+#include "qemu/atomic.h"
|
||||
#include "qemu/cutils.h"
|
||||
#include "qapi/error.h"
|
||||
#include "block/block_int.h"
|
||||
@@ -74,7 +75,8 @@ typedef struct BDRVCopyBeforeWriteState {
|
||||
* @snapshot_error is normally zero. But on first copy-before-write failure
|
||||
* when @on_cbw_error == ON_CBW_ERROR_BREAK_SNAPSHOT, @snapshot_error takes
|
||||
* value of this error (<0). After that all in-flight and further
|
||||
- * snapshot-API requests will fail with that error.
|
||||
+ * snapshot-API requests will fail with that error. To be accessed with
|
||||
+ * atomics.
|
||||
*/
|
||||
int snapshot_error;
|
||||
} BDRVCopyBeforeWriteState;
|
||||
@@ -114,7 +116,7 @@ static coroutine_fn int cbw_do_copy_before_write(BlockDriverState *bs,
|
||||
return 0;
|
||||
}
|
||||
|
||||
- if (s->snapshot_error) {
|
||||
+ if (qatomic_read(&s->snapshot_error)) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -138,9 +140,7 @@ static coroutine_fn int cbw_do_copy_before_write(BlockDriverState *bs,
|
||||
WITH_QEMU_LOCK_GUARD(&s->lock) {
|
||||
if (ret < 0) {
|
||||
assert(s->on_cbw_error == ON_CBW_ERROR_BREAK_SNAPSHOT);
|
||||
- if (!s->snapshot_error) {
|
||||
- s->snapshot_error = ret;
|
||||
- }
|
||||
+ qatomic_cmpxchg(&s->snapshot_error, 0, ret);
|
||||
} else {
|
||||
bdrv_set_dirty_bitmap(s->done_bitmap, off, end - off);
|
||||
}
|
||||
@@ -214,7 +214,7 @@ cbw_snapshot_read_lock(BlockDriverState *bs, int64_t offset, int64_t bytes,
|
||||
|
||||
QEMU_LOCK_GUARD(&s->lock);
|
||||
|
||||
- if (s->snapshot_error) {
|
||||
+ if (qatomic_read(&s->snapshot_error)) {
|
||||
g_free(req);
|
||||
return NULL;
|
||||
}
|
||||
@@ -585,6 +585,12 @@ void bdrv_cbw_drop(BlockDriverState *bs)
|
||||
bdrv_unref(bs);
|
||||
}
|
||||
|
||||
+int bdrv_cbw_snapshot_error(BlockDriverState *bs)
|
||||
+{
|
||||
+ BDRVCopyBeforeWriteState *s = bs->opaque;
|
||||
+ return qatomic_read(&s->snapshot_error);
|
||||
+}
|
||||
+
|
||||
static void cbw_init(void)
|
||||
{
|
||||
bdrv_register(&bdrv_cbw_filter);
|
||||
diff --git a/block/copy-before-write.h b/block/copy-before-write.h
|
||||
index dc6cafe7fa..a27d2d7d9f 100644
|
||||
--- a/block/copy-before-write.h
|
||||
+++ b/block/copy-before-write.h
|
||||
@@ -44,5 +44,6 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source,
|
||||
BlockCopyState **bcs,
|
||||
Error **errp);
|
||||
void bdrv_cbw_drop(BlockDriverState *bs);
|
||||
+int bdrv_cbw_snapshot_error(BlockDriverState *bs);
|
||||
|
||||
#endif /* COPY_BEFORE_WRITE_H */
|
||||
diff --git a/pve-backup.c b/pve-backup.c
|
||||
index 7cc1dd3724..07709aa350 100644
|
||||
--- a/pve-backup.c
|
||||
+++ b/pve-backup.c
|
||||
@@ -379,6 +379,15 @@ static void pvebackup_complete_cb(void *opaque, int ret)
|
||||
di->fleecing.snapshot_access = NULL;
|
||||
}
|
||||
if (di->fleecing.cbw) {
|
||||
+ /*
|
||||
+ * With fleecing, failure for cbw does not fail the guest write, but only sets the snapshot
|
||||
+ * error, making further requests to the snapshot fail with EACCES, which then also fail the
|
||||
+ * job. But that code is not the root cause and just confusing, so update it.
|
||||
+ */
|
||||
+ int snapshot_error = bdrv_cbw_snapshot_error(di->fleecing.cbw);
|
||||
+ if (di->completed_ret == -EACCES && snapshot_error) {
|
||||
+ di->completed_ret = snapshot_error;
|
||||
+ }
|
||||
bdrv_cbw_drop(di->fleecing.cbw);
|
||||
di->fleecing.cbw = NULL;
|
||||
}
|
|
@ -1,12 +1,15 @@
|
|||
extra/0001-monitor-qmp-fix-race-with-clients-disconnecting-earl.patch
|
||||
extra/0002-scsi-megasas-Internal-cdbs-have-16-byte-length.patch
|
||||
extra/0003-ide-avoid-potential-deadlock-when-draining-during-tr.patch
|
||||
extra/0004-ui-return-NULL-when-getting-cursor-without-a-console.patch
|
||||
extra/0005-memory-prevent-dma-reentracy-issues.patch
|
||||
extra/0006-lsi53c895a-disable-reentrancy-detection-for-script-R.patch
|
||||
extra/0007-bcm2835_property-disable-reentrancy-detection-for-io.patch
|
||||
extra/0008-raven-disable-reentrancy-detection-for-iomem.patch
|
||||
extra/0009-apic-disable-reentrancy-detection-for-apic-msi.patch
|
||||
extra/0004-Revert-x86-acpi-workaround-Windows-not-handling-name.patch
|
||||
extra/0005-block-copy-before-write-use-uint64_t-for-timeout-in-.patch
|
||||
extra/0006-virtio-gpu-fix-v2-migration.patch
|
||||
extra/0007-hw-pflash-fix-block-write-start.patch
|
||||
extra/0008-target-i386-fix-operand-size-for-DATA16-REX.W-POPCNT.patch
|
||||
extra/0009-target-i386-rdpkru-wrpkru-are-no-prefix-instructions.patch
|
||||
extra/0010-target-i386-fix-feature-dependency-for-WAITPKG.patch
|
||||
extra/0011-Revert-virtio-pci-fix-use-of-a-released-vector.patch
|
||||
extra/0012-hw-core-machine-move-compatibility-flags-for-VirtIO-.patch
|
||||
bitmap-mirror/0001-drive-mirror-add-support-for-sync-bitmap-mode-never.patch
|
||||
bitmap-mirror/0002-drive-mirror-add-support-for-conditional-and-always-.patch
|
||||
bitmap-mirror/0003-mirror-add-check-for-bitmap-mode-without-bitmap.patch
|
||||
|
@ -50,11 +53,18 @@ pve/0034-PVE-Migrate-dirty-bitmap-state-via-savevm.patch
|
|||
pve/0035-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch
|
||||
pve/0036-PVE-fall-back-to-open-iscsi-initiatorname.patch
|
||||
pve/0037-PVE-block-stream-increase-chunk-size.patch
|
||||
pve/0038-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch
|
||||
pve/0039-block-add-alloc-track-driver.patch
|
||||
pve/0040-Revert-block-rbd-workaround-for-ceph-issue-53784.patch
|
||||
pve/0041-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch
|
||||
pve/0042-Revert-block-rbd-implement-bdrv_co_block_status.patch
|
||||
pve/0043-alloc-track-fix-deadlock-during-drop.patch
|
||||
pve/0044-migration-for-snapshots-hold-the-BQL-during-setup-ca.patch
|
||||
pve/0045-savevm-async-don-t-hold-BQL-during-setup.patch
|
||||
pve/0038-block-add-alloc-track-driver.patch
|
||||
pve/0039-Revert-block-rbd-workaround-for-ceph-issue-53784.patch
|
||||
pve/0040-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch
|
||||
pve/0041-Revert-block-rbd-implement-bdrv_co_block_status.patch
|
||||
pve/0042-alloc-track-error-out-when-auto-remove-is-not-set.patch
|
||||
pve/0043-alloc-track-avoid-seemingly-superfluous-child-permis.patch
|
||||
pve/0044-block-copy-before-write-fix-permission.patch
|
||||
pve/0045-block-copy-before-write-support-unligned-snapshot-di.patch
|
||||
pve/0046-block-copy-before-write-create-block_copy-bitmap-in-.patch
|
||||
pve/0047-qapi-blockdev-backup-add-discard-source-parameter.patch
|
||||
pve/0048-copy-before-write-allow-specifying-minimum-cluster-s.patch
|
||||
pve/0049-backup-add-minimum-cluster-size-to-performance-optio.patch
|
||||
pve/0050-PVE-backup-add-fleecing-option.patch
|
||||
pve/0051-PVE-backup-improve-error-when-copy-before-write-fail.patch
|
||||
pve-qemu-9.0-vitastor.patch
|
||||
|
|
|
@ -38,7 +38,7 @@ endif
|
|||
|
||||
# guest-agent is only required for guest systems
|
||||
./configure \
|
||||
--with-git-submodules=ignore \
|
||||
--disable-download \
|
||||
--docdir=/usr/share/doc/pve-qemu-kvm \
|
||||
--localstatedir=/var \
|
||||
--prefix=/usr \
|
||||
|
|
|
@ -1 +1,2 @@
|
|||
source-is-missing [roms/SLOF/*.oco]
|
||||
source-is-missing [linux-user/*/vdso-*.so]
|
||||
|
|
|
@ -1,27 +0,0 @@
|
|||
Copyright (c) Individual contributors.
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are met:
|
||||
|
||||
1. Redistributions of source code must retain the above copyright notice,
|
||||
this list of conditions and the following disclaimer.
|
||||
|
||||
2. Redistributions in binary form must reproduce the above copyright
|
||||
notice, this list of conditions and the following disclaimer in the
|
||||
documentation and/or other materials provided with the distribution.
|
||||
|
||||
3. Neither the name of PyCA Cryptography nor the names of its contributors
|
||||
may be used to endorse or promote products derived from this software
|
||||
without specific prior written permission.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
||||
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
||||
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
@ -1,339 +0,0 @@
|
|||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 2, June 1991
|
||||
|
||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The licenses for most software are designed to take away your
|
||||
freedom to share and change it. By contrast, the GNU General Public
|
||||
License is intended to guarantee your freedom to share and change free
|
||||
software--to make sure the software is free for all its users. This
|
||||
General Public License applies to most of the Free Software
|
||||
Foundation's software and to any other program whose authors commit to
|
||||
using it. (Some other Free Software Foundation software is covered by
|
||||
the GNU Lesser General Public License instead.) You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
this service if you wish), that you receive source code or can get it
|
||||
if you want it, that you can change the software or use pieces of it
|
||||
in new free programs; and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to make restrictions that forbid
|
||||
anyone to deny you these rights or to ask you to surrender the rights.
|
||||
These restrictions translate to certain responsibilities for you if you
|
||||
distribute copies of the software, or if you modify it.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must give the recipients all the rights that
|
||||
you have. You must make sure that they, too, receive or can get the
|
||||
source code. And you must show them these terms so they know their
|
||||
rights.
|
||||
|
||||
We protect your rights with two steps: (1) copyright the software, and
|
||||
(2) offer you this license which gives you legal permission to copy,
|
||||
distribute and/or modify the software.
|
||||
|
||||
Also, for each author's protection and ours, we want to make certain
|
||||
that everyone understands that there is no warranty for this free
|
||||
software. If the software is modified by someone else and passed on, we
|
||||
want its recipients to know that what they have is not the original, so
|
||||
that any problems introduced by others will not reflect on the original
|
||||
authors' reputations.
|
||||
|
||||
Finally, any free program is threatened constantly by software
|
||||
patents. We wish to avoid the danger that redistributors of a free
|
||||
program will individually obtain patent licenses, in effect making the
|
||||
program proprietary. To prevent this, we have made it clear that any
|
||||
patent must be licensed for everyone's free use or not licensed at all.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
|
||||
0. This License applies to any program or other work which contains
|
||||
a notice placed by the copyright holder saying it may be distributed
|
||||
under the terms of this General Public License. The "Program", below,
|
||||
refers to any such program or work, and a "work based on the Program"
|
||||
means either the Program or any derivative work under copyright law:
|
||||
that is to say, a work containing the Program or a portion of it,
|
||||
either verbatim or with modifications and/or translated into another
|
||||
language. (Hereinafter, translation is included without limitation in
|
||||
the term "modification".) Each licensee is addressed as "you".
|
||||
|
||||
Activities other than copying, distribution and modification are not
|
||||
covered by this License; they are outside its scope. The act of
|
||||
running the Program is not restricted, and the output from the Program
|
||||
is covered only if its contents constitute a work based on the
|
||||
Program (independent of having been made by running the Program).
|
||||
Whether that is true depends on what the Program does.
|
||||
|
||||
1. You may copy and distribute verbatim copies of the Program's
|
||||
source code as you receive it, in any medium, provided that you
|
||||
conspicuously and appropriately publish on each copy an appropriate
|
||||
copyright notice and disclaimer of warranty; keep intact all the
|
||||
notices that refer to this License and to the absence of any warranty;
|
||||
and give any other recipients of the Program a copy of this License
|
||||
along with the Program.
|
||||
|
||||
You may charge a fee for the physical act of transferring a copy, and
|
||||
you may at your option offer warranty protection in exchange for a fee.
|
||||
|
||||
2. You may modify your copy or copies of the Program or any portion
|
||||
of it, thus forming a work based on the Program, and copy and
|
||||
distribute such modifications or work under the terms of Section 1
|
||||
above, provided that you also meet all of these conditions:
|
||||
|
||||
a) You must cause the modified files to carry prominent notices
|
||||
stating that you changed the files and the date of any change.
|
||||
|
||||
b) You must cause any work that you distribute or publish, that in
|
||||
whole or in part contains or is derived from the Program or any
|
||||
part thereof, to be licensed as a whole at no charge to all third
|
||||
parties under the terms of this License.
|
||||
|
||||
c) If the modified program normally reads commands interactively
|
||||
when run, you must cause it, when started running for such
|
||||
interactive use in the most ordinary way, to print or display an
|
||||
announcement including an appropriate copyright notice and a
|
||||
notice that there is no warranty (or else, saying that you provide
|
||||
a warranty) and that users may redistribute the program under
|
||||
these conditions, and telling the user how to view a copy of this
|
||||
License. (Exception: if the Program itself is interactive but
|
||||
does not normally print such an announcement, your work based on
|
||||
the Program is not required to print an announcement.)
|
||||
|
||||
These requirements apply to the modified work as a whole. If
|
||||
identifiable sections of that work are not derived from the Program,
|
||||
and can be reasonably considered independent and separate works in
|
||||
themselves, then this License, and its terms, do not apply to those
|
||||
sections when you distribute them as separate works. But when you
|
||||
distribute the same sections as part of a whole which is a work based
|
||||
on the Program, the distribution of the whole must be on the terms of
|
||||
this License, whose permissions for other licensees extend to the
|
||||
entire whole, and thus to each and every part regardless of who wrote it.
|
||||
|
||||
Thus, it is not the intent of this section to claim rights or contest
|
||||
your rights to work written entirely by you; rather, the intent is to
|
||||
exercise the right to control the distribution of derivative or
|
||||
collective works based on the Program.
|
||||
|
||||
In addition, mere aggregation of another work not based on the Program
|
||||
with the Program (or with a work based on the Program) on a volume of
|
||||
a storage or distribution medium does not bring the other work under
|
||||
the scope of this License.
|
||||
|
||||
3. You may copy and distribute the Program (or a work based on it,
|
||||
under Section 2) in object code or executable form under the terms of
|
||||
Sections 1 and 2 above provided that you also do one of the following:
|
||||
|
||||
a) Accompany it with the complete corresponding machine-readable
|
||||
source code, which must be distributed under the terms of Sections
|
||||
1 and 2 above on a medium customarily used for software interchange; or,
|
||||
|
||||
b) Accompany it with a written offer, valid for at least three
|
||||
years, to give any third party, for a charge no more than your
|
||||
cost of physically performing source distribution, a complete
|
||||
machine-readable copy of the corresponding source code, to be
|
||||
distributed under the terms of Sections 1 and 2 above on a medium
|
||||
customarily used for software interchange; or,
|
||||
|
||||
c) Accompany it with the information you received as to the offer
|
||||
to distribute corresponding source code. (This alternative is
|
||||
allowed only for noncommercial distribution and only if you
|
||||
received the program in object code or executable form with such
|
||||
an offer, in accord with Subsection b above.)
|
||||
|
||||
The source code for a work means the preferred form of the work for
|
||||
making modifications to it. For an executable work, complete source
|
||||
code means all the source code for all modules it contains, plus any
|
||||
associated interface definition files, plus the scripts used to
|
||||
control compilation and installation of the executable. However, as a
|
||||
special exception, the source code distributed need not include
|
||||
anything that is normally distributed (in either source or binary
|
||||
form) with the major components (compiler, kernel, and so on) of the
|
||||
operating system on which the executable runs, unless that component
|
||||
itself accompanies the executable.
|
||||
|
||||
If distribution of executable or object code is made by offering
|
||||
access to copy from a designated place, then offering equivalent
|
||||
access to copy the source code from the same place counts as
|
||||
distribution of the source code, even though third parties are not
|
||||
compelled to copy the source along with the object code.
|
||||
|
||||
4. You may not copy, modify, sublicense, or distribute the Program
|
||||
except as expressly provided under this License. Any attempt
|
||||
otherwise to copy, modify, sublicense or distribute the Program is
|
||||
void, and will automatically terminate your rights under this License.
|
||||
However, parties who have received copies, or rights, from you under
|
||||
this License will not have their licenses terminated so long as such
|
||||
parties remain in full compliance.
|
||||
|
||||
5. You are not required to accept this License, since you have not
|
||||
signed it. However, nothing else grants you permission to modify or
|
||||
distribute the Program or its derivative works. These actions are
|
||||
prohibited by law if you do not accept this License. Therefore, by
|
||||
modifying or distributing the Program (or any work based on the
|
||||
Program), you indicate your acceptance of this License to do so, and
|
||||
all its terms and conditions for copying, distributing or modifying
|
||||
the Program or works based on it.
|
||||
|
||||
6. Each time you redistribute the Program (or any work based on the
|
||||
Program), the recipient automatically receives a license from the
|
||||
original licensor to copy, distribute or modify the Program subject to
|
||||
these terms and conditions. You may not impose any further
|
||||
restrictions on the recipients' exercise of the rights granted herein.
|
||||
You are not responsible for enforcing compliance by third parties to
|
||||
this License.
|
||||
|
||||
7. If, as a consequence of a court judgment or allegation of patent
|
||||
infringement or for any other reason (not limited to patent issues),
|
||||
conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot
|
||||
distribute so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you
|
||||
may not distribute the Program at all. For example, if a patent
|
||||
license would not permit royalty-free redistribution of the Program by
|
||||
all those who receive copies directly or indirectly through you, then
|
||||
the only way you could satisfy both it and this License would be to
|
||||
refrain entirely from distribution of the Program.
|
||||
|
||||
If any portion of this section is held invalid or unenforceable under
|
||||
any particular circumstance, the balance of the section is intended to
|
||||
apply and the section as a whole is intended to apply in other
|
||||
circumstances.
|
||||
|
||||
It is not the purpose of this section to induce you to infringe any
|
||||
patents or other property right claims or to contest validity of any
|
||||
such claims; this section has the sole purpose of protecting the
|
||||
integrity of the free software distribution system, which is
|
||||
implemented by public license practices. Many people have made
|
||||
generous contributions to the wide range of software distributed
|
||||
through that system in reliance on consistent application of that
|
||||
system; it is up to the author/donor to decide if he or she is willing
|
||||
to distribute software through any other system and a licensee cannot
|
||||
impose that choice.
|
||||
|
||||
This section is intended to make thoroughly clear what is believed to
|
||||
be a consequence of the rest of this License.
|
||||
|
||||
8. If the distribution and/or use of the Program is restricted in
|
||||
certain countries either by patents or by copyrighted interfaces, the
|
||||
original copyright holder who places the Program under this License
|
||||
may add an explicit geographical distribution limitation excluding
|
||||
those countries, so that distribution is permitted only in or among
|
||||
countries not thus excluded. In such case, this License incorporates
|
||||
the limitation as if written in the body of this License.
|
||||
|
||||
9. The Free Software Foundation may publish revised and/or new versions
|
||||
of the General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the Program
|
||||
specifies a version number of this License which applies to it and "any
|
||||
later version", you have the option of following the terms and conditions
|
||||
either of that version or of any later version published by the Free
|
||||
Software Foundation. If the Program does not specify a version number of
|
||||
this License, you may choose any version ever published by the Free Software
|
||||
Foundation.
|
||||
|
||||
10. If you wish to incorporate parts of the Program into other free
|
||||
programs whose distribution conditions are different, write to the author
|
||||
to ask for permission. For software which is copyrighted by the Free
|
||||
Software Foundation, write to the Free Software Foundation; we sometimes
|
||||
make exceptions for this. Our decision will be guided by the two goals
|
||||
of preserving the free status of all derivatives of our free software and
|
||||
of promoting the sharing and reuse of software generally.
|
||||
|
||||
NO WARRANTY
|
||||
|
||||
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
||||
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
||||
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
|
||||
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
|
||||
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
|
||||
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
|
||||
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
|
||||
REPAIR OR CORRECTION.
|
||||
|
||||
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
|
||||
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
|
||||
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
|
||||
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
|
||||
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
||||
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
||||
POSSIBILITY OF SUCH DAMAGES.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
convey the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program is interactive, make it output a short notice like this
|
||||
when it starts in an interactive mode:
|
||||
|
||||
Gnomovision version 69, Copyright (C) year name of author
|
||||
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, the commands you use may
|
||||
be called something other than `show w' and `show c'; they could even be
|
||||
mouse-clicks or menu items--whatever suits your program.
|
||||
|
||||
You should also get your employer (if you work as a programmer) or your
|
||||
school, if any, to sign a "copyright disclaimer" for the program, if
|
||||
necessary. Here is a sample; alter the names:
|
||||
|
||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
||||
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
||||
|
||||
<signature of Ty Coon>, 1 April 1989
|
||||
Ty Coon, President of Vice
|
||||
|
||||
This General Public License does not permit incorporating your program into
|
||||
proprietary programs. If your program is a subroutine library, you may
|
||||
consider it more useful to permit linking proprietary applications with the
|
||||
library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License.
|
|
@ -1,114 +0,0 @@
|
|||
Key code / scan code / key symbol mapping database
|
||||
==================================================
|
||||
|
||||
This module provides a database that maps between different
|
||||
key code / scan code / key symbol sets:
|
||||
|
||||
- Linux evdev
|
||||
- OS-X
|
||||
- AT Set 1
|
||||
- AT Set 2
|
||||
- AT Set 3
|
||||
- XT
|
||||
- Linux XT KBD driver
|
||||
- USB HID
|
||||
- Win32
|
||||
- XWin XT
|
||||
- XKBD XT
|
||||
- Xorg Evdev
|
||||
- Xorg KBD
|
||||
- Xorg OS-X
|
||||
- XOrg Cygwin
|
||||
- RFB
|
||||
|
||||
Licensing
|
||||
---------
|
||||
|
||||
The contents of this package are dual licensed under the terms of:
|
||||
|
||||
- GNU General Public License (version 2 or later)
|
||||
- 3-clause BSD License
|
||||
|
||||
The output files generated by keymap-gen may be distributed & used under
|
||||
the terms of either of the above licenses.
|
||||
|
||||
Data formats
|
||||
------------
|
||||
|
||||
The following output formats are possible
|
||||
|
||||
- Code map
|
||||
|
||||
An array mapping between key code sets values
|
||||
|
||||
Indexes in the array are values from the source code set.
|
||||
Entries in the array are values from the target code set
|
||||
|
||||
|
||||
- Code table
|
||||
|
||||
An array listing all values in a key code set
|
||||
|
||||
Indexes in the array are simply a numeric counter
|
||||
Entries in the array are values from the key code set
|
||||
|
||||
The size of the array matches the total number of entries in
|
||||
the keycode database.
|
||||
|
||||
|
||||
- Name map
|
||||
|
||||
An array mapping between key code sets values and names
|
||||
|
||||
Indexes in the array are values from the source code set
|
||||
Entries in the array are names from the target code set
|
||||
|
||||
|
||||
- Name table
|
||||
|
||||
An array listing all names in a key code set
|
||||
|
||||
Indexes in the array are simply a numeric counter
|
||||
Entries in the array are values from the key code set
|
||||
|
||||
The size of the array matches the total number of entries in
|
||||
the keycode database.
|
||||
|
||||
|
||||
Output languages
|
||||
----------------
|
||||
|
||||
The tool is capable of generating data tables for the following
|
||||
programming languages / environments
|
||||
|
||||
- Standard C
|
||||
- GLib2 (standard C, but with GLib2 data types)
|
||||
- Python
|
||||
- Perl
|
||||
|
||||
|
||||
Usage
|
||||
-----
|
||||
|
||||
Map values from AT Set 1 to USB HID, generating tables for the
|
||||
C programming language
|
||||
|
||||
$ keymap-gen --lang stdc code-map data/keymaps.csv atset1 usb
|
||||
|
||||
Generate a tables of names for Linux key codes, OS-X key codes,
|
||||
in python - equivalent array indexes map between the two sets.
|
||||
A variable name override is used
|
||||
|
||||
$ keymap-gen --varname linux_keycodes --lang stdc \
|
||||
code-table data/keymaps.csv linux
|
||||
$ keymap-gen --varname osx_keycodes --lang stdc \
|
||||
code-table data/keymaps.csv os-x
|
||||
|
||||
Generate a mapping from XOrg XWin values to Win32 names
|
||||
|
||||
$ keymap-gen --lang perl name-map data/keymaps.csv xorgxwin win32
|
||||
|
||||
Generate a table of names for Linux key codes in Perl
|
||||
|
||||
$ keymap-gen --lang perl name-table data/keymaps.csv linux
|
||||
|
|
@ -1,89 +0,0 @@
|
|||
This directory contains the raw data for mapping between different
|
||||
keyboard codes. Naming if often based on the US keyboard layout, but
|
||||
does not indicate the symbol actually generated by the key.
|
||||
|
||||
The columns currently in this data set are:
|
||||
|
||||
Linux
|
||||
-----
|
||||
|
||||
Name and value of the hardware independent keycodes used by the linux
|
||||
kernel and exposed through the input subsystem.
|
||||
|
||||
References: linux/input.h
|
||||
|
||||
macOS
|
||||
-----
|
||||
|
||||
Low level key codes as exposed by Mac OS X/macOS.
|
||||
|
||||
References: Carbon/HIToolbox/Events.h
|
||||
|
||||
PC scan code sets
|
||||
-----------------
|
||||
|
||||
Scan codes for the three orignal PC keyboard generations:
|
||||
|
||||
Set 1: XT
|
||||
Set 2: AT
|
||||
Set 3: PS/2
|
||||
|
||||
The sets include codes for modern keys as well and not just the keys
|
||||
present on those original keyboards.
|
||||
|
||||
References: linux/drivers/input/keyboard/atkbd.c
|
||||
|
||||
USB HID
|
||||
-------
|
||||
|
||||
Codes as specified by the HID profile in USB.
|
||||
|
||||
References: linux/drivers/hid/usbhid/usbkbd.c
|
||||
|
||||
Windows Virtual-key codes
|
||||
-------------------------
|
||||
|
||||
The low level, hardware independent "VKEYs" exposed by Windows.
|
||||
|
||||
References: mingw32/winuser.h
|
||||
|
||||
XWin XT
|
||||
-------
|
||||
|
||||
X11 keycodes generated by the XWin server. Based on the XT scan code
|
||||
set.
|
||||
|
||||
References: xorg-server/hw/xwin/{winkeybd.c,winkeynames.h}
|
||||
|
||||
Xfree86 KBD XT
|
||||
--------------
|
||||
|
||||
X11 keycodes generated by the Xfree86 keyboard drivers. Based on the XT
|
||||
scan code set.
|
||||
|
||||
References: xf86-input-keyboard/src/at_scancode.c
|
||||
|
||||
X11 keysyms
|
||||
-----------
|
||||
|
||||
Corresponding X11 keysym value(s) for a US keyboard layout.
|
||||
|
||||
WARNING: These columns represent symbols, not physical keys, and should
|
||||
be used with extreme care.
|
||||
|
||||
References: http://cgit.freedesktop.org/xorg/proto/x11proto/plain/keysymdef.h
|
||||
|
||||
HTML KeyboardEvent.code
|
||||
-----------------------
|
||||
|
||||
Key codes seen in the KeyboardEvent.code attribute as part of the
|
||||
UI Events specification.
|
||||
|
||||
References: https://www.w3.org/TR/uievents-code/
|
||||
|
||||
XKEYBOARD key names
|
||||
-------------------
|
||||
|
||||
Hardware independent key names as used in the XKEYBOARD extension.
|
||||
|
||||
References: /usr/share/X11/xkb/keycodes/
|
|
@ -1,539 +0,0 @@
|
|||
"Linux Name","Linux Keycode","OS-X Name","OS-X Keycode","AT set1 keycode","AT set2 keycode","AT set3 keycode","USB Keycodes","Win32 Name","Win32 Keycode","Xwin XT","Xfree86 KBD XT","X11 keysym name","X11 keysym","HTML code","XKB key name","QEMU QKeyCode","Sun KBD","Apple ADB"
|
||||
KEY_RESERVED,0,,0xff,,,,,,,,,,,,,unmapped,,0xff
|
||||
KEY_ESC,1,Escape,0x35,0x01,0x76,0x08,41,VK_ESCAPE,0x1b,1,1,XK_Escape,0xff1b,Escape,ESC,esc,0x1d,0x35
|
||||
KEY_1,2,ANSI_1,0x12,0x02,0x16,0x16,30,VK_1,0x31,2,2,XK_1,0x0031,Digit1,AE01,1,0x1e,0x12
|
||||
KEY_1,2,ANSI_1,0x12,0x02,0x16,0x16,30,VK_1,0x31,2,2,XK_exclam,0x0021,Digit1,AE01,1,0x1e,0x12
|
||||
KEY_2,3,ANSI_2,0x13,0x03,0x1e,0x1e,31,VK_2,0x32,3,3,XK_2,0x0032,Digit2,AE02,2,0x1f,0x13
|
||||
KEY_2,3,ANSI_2,0x13,0x03,0x1e,0x1e,31,VK_2,0x32,3,3,XK_at,0x0040,Digit2,AE02,2,0x1f,0x13
|
||||
KEY_3,4,ANSI_3,0x14,0x04,0x26,0x26,32,VK_3,0x33,4,4,XK_3,0x0033,Digit3,AE03,3,0x20,0x14
|
||||
KEY_3,4,ANSI_3,0x14,0x04,0x26,0x26,32,VK_3,0x33,4,4,XK_numbersign,0x0023,Digit3,AE03,3,0x20,0x14
|
||||
KEY_4,5,ANSI_4,0x15,0x05,0x25,0x25,33,VK_4,0x34,5,5,XK_4,0x0034,Digit4,AE04,4,0x21,0x15
|
||||
KEY_4,5,ANSI_4,0x15,0x05,0x25,0x25,33,VK_4,0x34,5,5,XK_dollar,0x0024,Digit4,AE04,4,0x21,0x15
|
||||
KEY_5,6,ANSI_5,0x17,0x06,0x2e,0x2e,34,VK_5,0x35,6,6,XK_5,0x0035,Digit5,AE05,5,0x22,0x17
|
||||
KEY_5,6,ANSI_5,0x17,0x06,0x2e,0x2e,34,VK_5,0x35,6,6,XK_percent,0x0025,Digit5,AE05,5,0x22,0x17
|
||||
KEY_6,7,ANSI_6,0x16,0x07,0x36,0x36,35,VK_6,0x36,7,7,XK_6,0x0036,Digit6,AE06,6,0x23,0x16
|
||||
KEY_6,7,ANSI_6,0x16,0x07,0x36,0x36,35,VK_6,0x36,7,7,XK_asciicircum,0x005e,Digit6,AE06,6,0x23,0x16
|
||||
KEY_7,8,ANSI_7,0x1a,0x08,0x3d,0x3d,36,VK_7,0x37,8,8,XK_7,0x0037,Digit7,AE07,7,0x24,0x1a
|
||||
KEY_7,8,ANSI_7,0x1a,0x08,0x3d,0x3d,36,VK_7,0x37,8,8,XK_ampersand,0x0026,Digit7,AE07,7,0x24,0x1a
|
||||
KEY_8,9,ANSI_8,0x1c,0x09,0x3e,0x3e,37,VK_8,0x38,9,9,XK_8,0x0038,Digit8,AE08,8,0x25,0x1c
|
||||
KEY_8,9,ANSI_8,0x1c,0x09,0x3e,0x3e,37,VK_8,0x38,9,9,XK_asterisk,0x002a,Digit8,AE08,8,0x25,0x1c
|
||||
KEY_9,10,ANSI_9,0x19,0x0a,0x46,0x46,38,VK_9,0x39,10,10,XK_9,0x0039,Digit9,AE09,9,0x26,0x19
|
||||
KEY_9,10,ANSI_9,0x19,0x0a,0x46,0x46,38,VK_9,0x39,10,10,XK_parenleft,0x0028,Digit9,AE09,9,0x26,0x19
|
||||
KEY_0,11,ANSI_0,0x1d,0x0b,0x45,0x45,39,VK_0,0x30,11,11,XK_0,0x0030,Digit0,AE10,0,0x27,0x1d
|
||||
KEY_0,11,ANSI_0,0x1d,0x0b,0x45,0x45,39,VK_0,0x30,11,11,XK_parenright,0x0029,Digit0,AE10,0,0x27,0x1d
|
||||
KEY_MINUS,12,ANSI_Minus,0x1b,0x0c,0x4e,0x4e,45,VK_OEM_MINUS,0xbd,12,12,XK_minus,0x002d,Minus,AE11,minus,0x28,0x1b
|
||||
KEY_MINUS,12,ANSI_Minus,0x1b,0x0c,0x4e,0x4e,45,VK_OEM_MINUS,0xbd,12,12,XK_underscore,0x005f,Minus,AE11,minus,0x28,0x1b
|
||||
KEY_EQUAL,13,ANSI_Equal,0x18,0x0d,0x55,0x55,46,VK_OEM_PLUS,0xbb,13,13,XK_equal,0x003d,Equal,AE12,equal,0x29,0x18
|
||||
KEY_EQUAL,13,ANSI_Equal,0x18,0x0d,0x55,0x55,46,VK_OEM_PLUS,0xbb,13,13,XK_plus,0x002b,Equal,AE12,equal,0x29,0x18
|
||||
KEY_BACKSPACE,14,Delete,0x33,0x0e,0x66,0x66,42,VK_BACK,0x08,14,14,XK_BackSpace,0xff08,Backspace,BKSP,backspace,0x2b,0x33
|
||||
KEY_TAB,15,Tab,0x30,0x0f,0x0d,0x0d,43,VK_TAB,0x09,15,15,XK_Tab,0xff09,Tab,TAB,tab,0x35,0x30
|
||||
KEY_Q,16,ANSI_Q,0xc,0x10,0x15,0x15,20,VK_Q,0x51,16,16,XK_Q,0x0051,KeyQ,AD01,q,0x36,0xc
|
||||
KEY_Q,16,ANSI_Q,0xc,0x10,0x15,0x15,20,VK_Q,0x51,16,16,XK_q,0x0071,KeyQ,AD01,q,0x36,0xc
|
||||
KEY_W,17,ANSI_W,0xd,0x11,0x1d,0x1d,26,VK_W,0x57,17,17,XK_W,0x0057,KeyW,AD02,w,0x37,0xd
|
||||
KEY_W,17,ANSI_W,0xd,0x11,0x1d,0x1d,26,VK_W,0x57,17,17,XK_w,0x0077,KeyW,AD02,w,0x37,0xd
|
||||
KEY_E,18,ANSI_E,0xe,0x12,0x24,0x24,8,VK_E,0x45,18,18,XK_E,0x0045,KeyE,AD03,e,0x38,0xe
|
||||
KEY_E,18,ANSI_E,0xe,0x12,0x24,0x24,8,VK_E,0x45,18,18,XK_e,0x0065,KeyE,AD03,e,0x38,0xe
|
||||
KEY_R,19,ANSI_R,0xf,0x13,0x2d,0x2d,21,VK_R,0x52,19,19,XK_R,0x0052,KeyR,AD04,r,0x39,0xf
|
||||
KEY_R,19,ANSI_R,0xf,0x13,0x2d,0x2d,21,VK_R,0x52,19,19,XK_r,0x0072,KeyR,AD04,r,0x39,0xf
|
||||
KEY_T,20,ANSI_T,0x11,0x14,0x2c,0x2c,23,VK_T,0x54,20,20,XK_T,0x0054,KeyT,AD05,t,0x3a,0x11
|
||||
KEY_T,20,ANSI_T,0x11,0x14,0x2c,0x2c,23,VK_T,0x54,20,20,XK_t,0x0074,KeyT,AD05,t,0x3a,0x11
|
||||
KEY_Y,21,ANSI_Y,0x10,0x15,0x35,0x35,28,VK_Y,0x59,21,21,XK_Y,0x0059,KeyY,AD06,y,0x3b,0x10
|
||||
KEY_Y,21,ANSI_Y,0x10,0x15,0x35,0x35,28,VK_Y,0x59,21,21,XK_y,0x0079,KeyY,AD06,y,0x3b,0x10
|
||||
KEY_U,22,ANSI_U,0x20,0x16,0x3c,0x3c,24,VK_U,0x55,22,22,XK_U,0x0055,KeyU,AD07,u,0x3c,0x20
|
||||
KEY_U,22,ANSI_U,0x20,0x16,0x3c,0x3c,24,VK_U,0x55,22,22,XK_u,0x0075,KeyU,AD07,u,0x3c,0x20
|
||||
KEY_I,23,ANSI_I,0x22,0x17,0x43,0x43,12,VK_I,0x49,23,23,XK_I,0x0049,KeyI,AD08,i,0x3d,0x22
|
||||
KEY_I,23,ANSI_I,0x22,0x17,0x43,0x43,12,VK_I,0x49,23,23,XK_i,0x0069,KeyI,AD08,i,0x3d,0x22
|
||||
KEY_O,24,ANSI_O,0x1f,0x18,0x44,0x44,18,VK_O,0x4f,24,24,XK_O,0x004f,KeyO,AD09,o,0x3e,0x1f
|
||||
KEY_O,24,ANSI_O,0x1f,0x18,0x44,0x44,18,VK_O,0x4f,24,24,XK_o,0x006f,KeyO,AD09,o,0x3e,0x1f
|
||||
KEY_P,25,ANSI_P,0x23,0x19,0x4d,0x4d,19,VK_P,0x50,25,25,XK_P,0x0050,KeyP,AD10,p,0x3f,0x23
|
||||
KEY_P,25,ANSI_P,0x23,0x19,0x4d,0x4d,19,VK_P,0x50,25,25,XK_p,0x0070,KeyP,AD10,p,0x3f,0x23
|
||||
KEY_LEFTBRACE,26,ANSI_LeftBracket,0x21,0x1a,0x54,0x54,47,VK_OEM_4,0xdb,26,26,XK_bracketleft,0x005b,BracketLeft,AD11,bracket_left,0x40,0x21
|
||||
KEY_LEFTBRACE,26,ANSI_LeftBracket,0x21,0x1a,0x54,0x54,47,VK_OEM_4,0xdb,26,26,XK_braceleft,0x007b,BracketLeft,AD11,bracket_left,0x40,0x21
|
||||
KEY_RIGHTBRACE,27,ANSI_RightBracket,0x1e,0x1b,0x5b,0x5b,48,VK_OEM_6,0xdd,27,27,XK_bracketright,0x005d,BracketRight,AD12,bracket_right,0x41,0x1e
|
||||
KEY_RIGHTBRACE,27,ANSI_RightBracket,0x1e,0x1b,0x5b,0x5b,48,VK_OEM_6,0xdd,27,27,XK_braceright,0x007d,BracketRight,AD12,bracket_right,0x41,0x1e
|
||||
KEY_ENTER,28,Return,0x24,0x1c,0x5a,0x5a,40,VK_RETURN,0x0d,28,28,XK_Return,0xff0d,Enter,RTRN,ret,0x59,0x24
|
||||
KEY_LEFTCTRL,29,Control,0x3b,0x1d,0x14,0x11,224,VK_LCONTROL,0xa2,29,29,XK_Control_L,0xffe3,ControlLeft,LCTL,ctrl,0x4c,0x36
|
||||
KEY_LEFTCTRL,29,Control,0x3b,0x1d,0x14,0x11,224,VK_CONTROL,0x11,29,29,XK_Control_L,0xffe3,ControlLeft,LCTL,ctrl,0x4c,0x36
|
||||
KEY_A,30,ANSI_A,0x0,0x1e,0x1c,0x1c,4,VK_A,0x41,30,30,XK_A,0x0041,KeyA,AC01,a,0x4d,0x0
|
||||
KEY_A,30,ANSI_A,0x0,0x1e,0x1c,0x1c,4,VK_A,0x41,30,30,XK_a,0x0061,KeyA,AC01,a,0x4d,0x0
|
||||
KEY_S,31,ANSI_S,0x1,0x1f,0x1b,0x1b,22,VK_S,0x53,31,31,XK_S,0x0053,KeyS,AC02,s,0x4e,0x1
|
||||
KEY_S,31,ANSI_S,0x1,0x1f,0x1b,0x1b,22,VK_S,0x53,31,31,XK_s,0x0073,KeyS,AC02,s,0x4e,0x1
|
||||
KEY_D,32,ANSI_D,0x2,0x20,0x23,0x23,7,VK_D,0x44,32,32,XK_D,0x0044,KeyD,AC03,d,0x4f,0x2
|
||||
KEY_D,32,ANSI_D,0x2,0x20,0x23,0x23,7,VK_D,0x44,32,32,XK_d,0x0064,KeyD,AC03,d,0x4f,0x2
|
||||
KEY_F,33,ANSI_F,0x3,0x21,0x2b,0x2b,9,VK_F,0x46,33,33,XK_F,0x0046,KeyF,AC04,f,0x50,0x3
|
||||
KEY_F,33,ANSI_F,0x3,0x21,0x2b,0x2b,9,VK_F,0x46,33,33,XK_f,0x0066,KeyF,AC04,f,0x50,0x3
|
||||
KEY_G,34,ANSI_G,0x5,0x22,0x34,0x34,10,VK_G,0x47,34,34,XK_G,0x0047,KeyG,AC05,g,0x51,0x5
|
||||
KEY_G,34,ANSI_G,0x5,0x22,0x34,0x34,10,VK_G,0x47,34,34,XK_g,0x0067,KeyG,AC05,g,0x51,0x5
|
||||
KEY_H,35,ANSI_H,0x4,0x23,0x33,0x33,11,VK_H,0x48,35,35,XK_H,0x0048,KeyH,AC06,h,0x52,0x4
|
||||
KEY_H,35,ANSI_H,0x4,0x23,0x33,0x33,11,VK_H,0x48,35,35,XK_h,0x0068,KeyH,AC06,h,0x52,0x4
|
||||
KEY_J,36,ANSI_J,0x26,0x24,0x3b,0x3b,13,VK_J,0x4a,36,36,XK_J,0x004a,KeyJ,AC07,j,0x53,0x26
|
||||
KEY_J,36,ANSI_J,0x26,0x24,0x3b,0x3b,13,VK_J,0x4a,36,36,XK_j,0x006a,KeyJ,AC07,j,0x53,0x26
|
||||
KEY_K,37,ANSI_K,0x28,0x25,0x42,0x42,14,VK_K,0x4b,37,37,XK_K,0x004b,KeyK,AC08,k,0x54,0x28
|
||||
KEY_K,37,ANSI_K,0x28,0x25,0x42,0x42,14,VK_K,0x4b,37,37,XK_k,0x006b,KeyK,AC08,k,0x54,0x28
|
||||
KEY_L,38,ANSI_L,0x25,0x26,0x4b,0x4b,15,VK_L,0x4c,38,38,XK_L,0x004c,KeyL,AC09,l,0x55,0x25
|
||||
KEY_L,38,ANSI_L,0x25,0x26,0x4b,0x4b,15,VK_L,0x4c,38,38,XK_l,0x006c,KeyL,AC09,l,0x55,0x25
|
||||
KEY_SEMICOLON,39,ANSI_Semicolon,0x29,0x27,0x4c,0x4c,51,VK_OEM_1,0xba,39,39,XK_semicolon,0x003b,Semicolon,AC10,semicolon,0x56,0x29
|
||||
KEY_SEMICOLON,39,ANSI_Semicolon,0x29,0x27,0x4c,0x4c,51,VK_OEM_1,0xba,39,39,XK_colon,0x003a,Semicolon,AC10,semicolon,0x56,0x29
|
||||
KEY_APOSTROPHE,40,ANSI_Quote,0x27,0x28,0x52,0x52,52,VK_OEM_7,0xde,40,40,XK_apostrophe,0x0027,Quote,AC11,apostrophe,0x57,0x27
|
||||
KEY_APOSTROPHE,40,ANSI_Quote,0x27,0x28,0x52,0x52,52,VK_OEM_7,0xde,40,40,XK_quotedbl,0x0022,Quote,AC11,apostrophe,0x57,0x27
|
||||
KEY_GRAVE,41,ANSI_Grave,0x32,0x29,0x0e,0x0e,53,VK_OEM_3,0xc0,41,41,XK_grave,0x0060,Backquote,TLDE,grave_accent,0x2a,0x32
|
||||
KEY_GRAVE,41,ANSI_Grave,0x32,0x29,0x0e,0x0e,53,VK_OEM_3,0xc0,41,41,XK_grave,0x0060,Backquote,AB00,grave_accent,0x2a,0x32
|
||||
KEY_GRAVE,41,ANSI_Grave,0x32,0x29,0x0e,0x0e,53,VK_OEM_3,0xc0,41,41,XK_asciitilde,0x007e,Backquote,TLDE,grave_accent,0x2a,0x32
|
||||
KEY_GRAVE,41,ANSI_Grave,0x32,0x29,0x0e,0x0e,53,VK_OEM_3,0xc0,41,41,XK_asciitilde,0x007e,Backquote,AB00,grave_accent,0x2a,0x32
|
||||
KEY_SHIFT,42,Shift,0x38,0x2a,0x12,0x12,225,VK_SHIFT,0x10,42,42,XK_Shift_L,0xffe1,ShiftLeft,LFSH,shift,0x63,0x38
|
||||
KEY_LEFTSHIFT,42,Shift,0x38,0x2a,0x12,0x12,225,VK_LSHIFT,0xa0,42,42,XK_Shift_L,0xffe1,ShiftLeft,LFSH,shift,0x63,0x38
|
||||
KEY_BACKSLASH,43,ANSI_Backslash,0x2a,0x2b,0x5d,0x5c,49,VK_OEM_5,0xdc,43,43,XK_backslash,0x005c,Backslash,BKSL,backslash,0x58,0x2a
|
||||
KEY_BACKSLASH,43,ANSI_Backslash,0x2a,0x2b,0x5d,0x5c,49,VK_OEM_5,0xdc,43,43,XK_backslash,0x005c,Backslash,AC12,backslash,0x58,0x2a
|
||||
KEY_BACKSLASH,43,ANSI_Backslash,0x2a,0x2b,0x5d,0x5c,49,VK_OEM_5,0xdc,43,43,XK_bar,0x007c,Backslash,BKSL,backslash,0x58,0x2a
|
||||
KEY_BACKSLASH,43,ANSI_Backslash,0x2a,0x2b,0x5d,0x5c,49,VK_OEM_5,0xdc,43,43,XK_bar,0x007c,Backslash,AC12,backslash,0x58,0x2a
|
||||
KEY_BACKSLASH,43,ANSI_Backslash,0x2a,0x2b,0x5d,0x5c,50,VK_OEM_5,0xdc,43,43,XK_backslash,0x005c,Backslash,BKSL,backslash,0x58,0x2a
|
||||
KEY_BACKSLASH,43,ANSI_Backslash,0x2a,0x2b,0x5d,0x5c,50,VK_OEM_5,0xdc,43,43,XK_backslash,0x005c,Backslash,AC12,backslash,0x58,0x2a
|
||||
KEY_BACKSLASH,43,ANSI_Backslash,0x2a,0x2b,0x5d,0x5c,50,VK_OEM_5,0xdc,43,43,XK_bar,0x007c,Backslash,BKSL,backslash,0x58,0x2a
|
||||
KEY_BACKSLASH,43,ANSI_Backslash,0x2a,0x2b,0x5d,0x5c,50,VK_OEM_5,0xdc,43,43,XK_bar,0x007c,Backslash,AC12,backslash,0x58,0x2a
|
||||
KEY_Z,44,ANSI_Z,0x6,0x2c,0x1a,0x1a,29,VK_Z,0x5a,44,44,XK_Z,0x005a,KeyZ,AB01,z,0x64,0x6
|
||||
KEY_Z,44,ANSI_Z,0x6,0x2c,0x1a,0x1a,29,VK_Z,0x5a,44,44,XK_z,0x007a,KeyZ,AB01,z,0x64,0x6
|
||||
KEY_X,45,ANSI_X,0x7,0x2d,0x22,0x22,27,VK_X,0x58,45,45,XK_X,0x0058,KeyX,AB02,x,0x65,0x7
|
||||
KEY_X,45,ANSI_X,0x7,0x2d,0x22,0x22,27,VK_X,0x58,45,45,XK_x,0x0078,KeyX,AB02,x,0x65,0x7
|
||||
KEY_C,46,ANSI_C,0x8,0x2e,0x21,0x21,6,VK_C,0x43,46,46,XK_C,0x0043,KeyC,AB03,c,0x66,0x8
|
||||
KEY_C,46,ANSI_C,0x8,0x2e,0x21,0x21,6,VK_C,0x43,46,46,XK_c,0x0063,KeyC,AB03,c,0x66,0x8
|
||||
KEY_V,47,ANSI_V,0x9,0x2f,0x2a,0x2a,25,VK_V,0x56,47,47,XK_V,0x0056,KeyV,AB04,v,0x67,0x9
|
||||
KEY_V,47,ANSI_V,0x9,0x2f,0x2a,0x2a,25,VK_V,0x56,47,47,XK_v,0x0076,KeyV,AB04,v,0x67,0x9
|
||||
KEY_B,48,ANSI_B,0xb,0x30,0x32,0x32,5,VK_B,0x42,48,48,XK_B,0x0042,KeyB,AB05,b,0x68,0xb
|
||||
KEY_B,48,ANSI_B,0xb,0x30,0x32,0x32,5,VK_B,0x42,48,48,XK_b,0x0062,KeyB,AB05,b,0x68,0xb
|
||||
KEY_N,49,ANSI_N,0x2d,0x31,0x31,0x31,17,VK_N,0x4e,49,49,XK_N,0x004e,KeyN,AB06,n,0x69,0x2d
|
||||
KEY_N,49,ANSI_N,0x2d,0x31,0x31,0x31,17,VK_N,0x4e,49,49,XK_n,0x006e,KeyN,AB06,n,0x69,0x2d
|
||||
KEY_M,50,ANSI_M,0x2e,0x32,0x3a,0x3a,16,VK_M,0x4d,50,50,XK_M,0x004d,KeyM,AB07,m,0x6a,0x2e
|
||||
KEY_M,50,ANSI_M,0x2e,0x32,0x3a,0x3a,16,VK_M,0x4d,50,50,XK_m,0x006d,KeyM,AB07,m,0x6a,0x2e
|
||||
KEY_COMMA,51,ANSI_Comma,0x2b,0x33,0x41,0x41,54,VK_OEM_COMMA,0xbc,51,51,XK_comma,0x002c,Comma,AB08,comma,0x6b,0x2b
|
||||
KEY_COMMA,51,ANSI_Comma,0x2b,0x33,0x41,0x41,54,VK_OEM_COMMA,0xbc,51,51,XK_less,0x003c,Comma,AB08,comma,0x6b,0x2b
|
||||
KEY_DOT,52,ANSI_Period,0x2f,0x34,0x49,0x49,55,VK_OEM_PERIOD,0xbe,52,52,XK_period,0x002e,Period,AB09,dot,0x6c,0x2f
|
||||
KEY_DOT,52,ANSI_Period,0x2f,0x34,0x49,0x49,55,VK_OEM_PERIOD,0xbe,52,52,XK_greater,0x003e,Period,AB09,dot,0x6c,0x2f
|
||||
KEY_SLASH,53,ANSI_Slash,0x2c,0x35,0x4a,0x4a,56,VK_OEM_2,0xbf,53,53,XK_slash,0x002f,Slash,AB10,slash,0x6d,0x2c
|
||||
KEY_SLASH,53,ANSI_Slash,0x2c,0x35,0x4a,0x4a,56,VK_OEM_2,0xbf,53,53,XK_question,0x003f,Slash,AB10,slash,0x6d,0x2c
|
||||
KEY_RIGHTSHIFT,54,RightShift,0x3c,0x36,0x59,0x59,229,VK_RSHIFT,0xa1,54,54,XK_Shift_R,0xffe2,ShiftRight,RTSH,shift_r,0x6e,0x7b
|
||||
KEY_KPASTERISK,55,ANSI_KeypadMultiply,0x43,0x37,0x7c,0x7e,85,VK_MULTIPLY,0x6a,55,55,XK_multiply,0x00d7,NumpadMultiply,KPMU,asterisk,0x2f,0x43
|
||||
KEY_KPASTERISK,55,ANSI_KeypadMultiply,0x43,0x37,0x7c,0x7e,85,VK_MULTIPLY,0x6a,55,55,XK_multiply,0x00d7,NumpadMultiply,KPMU,kp_multiply,0x2f,0x43
|
||||
KEY_LEFTALT,56,Option,0x3a,0x38,0x11,0x19,226,VK_LMENU,0xa4,56,56,XK_Alt_L,0xffe9,AltLeft,LALT,alt,0x13,0x3a
|
||||
KEY_LEFTALT,56,Option,0x3a,0x38,0x11,0x19,226,VK_MENU,0x12,56,56,XK_Alt_L,0xffe9,AltLeft,LALT,alt,0x13,0x3a
|
||||
KEY_SPACE,57,Space,0x31,0x39,0x29,0x29,44,VK_SPACE,0x20,57,57,XK_space,0x0020,Space,SPCE,spc,0x79,0x31
|
||||
KEY_CAPSLOCK,58,CapsLock,0x39,0x3a,0x58,0x14,57,VK_CAPITAL,0x14,58,58,XK_Caps_Lock,0xffe5,CapsLock,CAPS,caps_lock,0x77,0x39
|
||||
KEY_F1,59,F1,0x7a,0x3b,0x05,0x07,58,VK_F1,0x70,59,59,XK_F1,0xffbe,F1,FK01,f1,0x05,0x7a
|
||||
KEY_F2,60,F2,0x78,0x3c,0x06,0x0f,59,VK_F2,0x71,60,60,XK_F2,0xffbf,F2,FK02,f2,0x06,0x78
|
||||
KEY_F3,61,F3,0x63,0x3d,0x04,0x17,60,VK_F3,0x72,61,61,XK_F3,0xffc0,F3,FK03,f3,0x08,0x63
|
||||
KEY_F4,62,F4,0x76,0x3e,0x0c,0x1f,61,VK_F4,0x73,62,62,XK_F4,0xffc1,F4,FK04,f4,0x0a,0x76
|
||||
KEY_F5,63,F5,0x60,0x3f,0x03,0x27,62,VK_F5,0x74,63,63,XK_F5,0xffc2,F5,FK05,f5,0x0c,0x60
|
||||
KEY_F6,64,F6,0x61,0x40,0x0b,0x2f,63,VK_F6,0x75,64,64,XK_F6,0xffc3,F6,FK06,f6,0x0e,0x61
|
||||
KEY_F7,65,F7,0x62,0x41,0x83,0x37,64,VK_F7,0x76,65,65,XK_F7,0xffc4,F7,FK07,f7,0x10,0x62
|
||||
KEY_F8,66,F8,0x64,0x42,0x0a,0x3f,65,VK_F8,0x77,66,66,XK_F8,0xffc5,F8,FK08,f8,0x11,0x64
|
||||
KEY_F9,67,F9,0x65,0x43,0x01,0x47,66,VK_F9,0x78,67,67,XK_F9,0xffc6,F9,FK09,f9,0x12,0x65
|
||||
KEY_F10,68,F10,0x6d,0x44,0x09,0x4f,67,VK_F10,0x79,68,68,XK_F10,0xffc7,F10,FK10,f10,0x07,0x6d
|
||||
KEY_NUMLOCK,69,ANSI_KeypadClear,0x47,0x45,0x77,0x76,83,VK_NUMLOCK,0x90,69,69,XK_Num_Lock,0xff7f,NumLock,NMLK,num_lock,0x62,0x47
|
||||
KEY_SCROLLLOCK,70,,,0x46,0x7e,0x5f,71,VK_SCROLL,0x91,70,70,XK_Scroll_Lock,0xff14,ScrollLock,SCLK,scroll_lock,0x17,0x6b
|
||||
KEY_KP7,71,ANSI_Keypad7,0x59,0x47,0x6c,0x6c,95,VK_NUMPAD7,0x67,71,71,XK_KP_7,0xffb7,Numpad7,KP7,kp_7,0x44,0x59
|
||||
KEY_KP8,72,ANSI_Keypad8,0x5b,0x48,0x75,0x75,96,VK_NUMPAD8,0x68,72,72,XK_KP_8,0xffb8,Numpad8,KP8,kp_8,0x45,0x5b
|
||||
KEY_KP9,73,ANSI_Keypad9,0x5c,0x49,0x7d,0x7d,97,VK_NUMPAD9,0x69,73,73,XK_KP_9,0xffb9,Numpad9,KP9,kp_9,0x46,0x5c
|
||||
KEY_KPMINUS,74,ANSI_KeypadMinus,0x4e,0x4a,0x7b,0x4e,86,VK_SUBTRACT,0x6d,74,74,XK_KP_Subtract,0xffad,NumpadSubtract,KPSU,kp_subtract,0x47,0x4e
|
||||
KEY_KP4,75,ANSI_Keypad4,0x56,0x4b,0x6b,0x6b,92,VK_NUMPAD4,0x64,75,75,XK_KP_4,0xffb4,Numpad4,KP4,kp_4,0x5b,0x56
|
||||
KEY_KP5,76,ANSI_Keypad5,0x57,0x4c,0x73,0x73,93,VK_NUMPAD5,0x65,76,76,XK_KP_5,0xffb5,Numpad5,KP5,kp_5,0x5c,0x57
|
||||
KEY_KP6,77,ANSI_Keypad6,0x58,0x4d,0x74,0x74,94,VK_NUMPAD6,0x66,77,77,XK_KP_6,0xffb6,Numpad6,KP6,kp_6,0x5d,0x58
|
||||
KEY_KPPLUS,78,ANSI_KeypadPlus,0x45,0x4e,0x79,0x7c,87,VK_ADD,0x6b,78,78,XK_KP_Add,0xffab,NumpadAdd,KPAD,kp_add,0x7d,0x45
|
||||
KEY_KP1,79,ANSI_Keypad1,0x53,0x4f,0x69,0x69,89,VK_NUMPAD1,0x61,79,79,XK_KP_1,0xffb1,Numpad1,KP1,kp_1,0x70,0x53
|
||||
KEY_KP2,80,ANSI_Keypad2,0x54,0x50,0x72,0x72,90,VK_NUMPAD2,0x62,80,80,XK_KP_2,0xffb2,Numpad2,KP2,kp_2,0x71,0x54
|
||||
KEY_KP3,81,ANSI_Keypad3,0x55,0x51,0x7a,0x7a,91,VK_NUMPAD3,0x63,81,81,XK_KP_3,0xffb3,Numpad3,KP3,kp_3,0x72,0x55
|
||||
KEY_KP0,82,ANSI_Keypad0,0x52,0x52,0x70,0x70,98,VK_NUMPAD0,0x60,82,82,XK_KP_0,0xffb0,Numpad0,KP0,kp_0,0x5e,0x52
|
||||
KEY_KPDOT,83,ANSI_KeypadDecimal,0x41,0x53,0x71,0x71,99,VK_DECIMAL,0x6e,83,83,XK_KP_Decimal,0xffae,NumpadDecimal,KPDL,kp_decimal,0x32,0x41
|
||||
KEY_KPDOT,83,ANSI_KeypadDecimal,0x41,0x53,0x71,0x71,99,VK_DECIMAL,0x6e,83,83,XK_KP_Decimal,0xffae,NumpadDecimal,KPDC,kp_decimal,0x32,0x41
|
||||
,84,,,0x54,,,,,,,,,,,,,,
|
||||
KEY_ZENKAKUHANKAKU,85,,,0x76,0x5f,,148,,,,,,,Lang5,HZTG,,,
|
||||
KEY_102ND,86,,,0x56,0x61,0x13,100,VK_OEM_102,0xe2,86,86,,,IntlBackslash,LSGT,less,0x7c,
|
||||
KEY_F11,87,F11,0x67,0x57,0x78,0x56,68,VK_F11,0x7a,87,87,XK_F11,0xffc8,F11,FK11,f11,0x09,0x67
|
||||
KEY_F12,88,F12,0x6f,0x58,0x07,0x5e,69,VK_F12,0x7b,88,88,XK_F12,0xffc9,F12,FK12,f12,0x0b,0x6f
|
||||
KEY_RO,89,JIS_Underscore,0x5e,0x73,0x51,,135,,,,,,,IntlRo,AB11,ro,,
|
||||
KEY_KATAKANA,90,,,0x78,0x63,,146,VK_KANA,0x15,,,,,Katakana,KATA,,,
|
||||
KEY_KATAKANA,90,,,0x78,0x63,,146,VK_KANA,0x15,,,,,Lang3,KATA,,,
|
||||
KEY_HIRAGANA,91,,,0x77,0x62,0x87,147,,,,,,,Hiragana,HIRA,hiragana,,
|
||||
KEY_HIRAGANA,91,,,0x77,0x62,0x87,147,,,,,,,Lang4,HIRA,hiragana,,
|
||||
KEY_HENKAN,92,,,0x79,0x64,0x86,138,,,,,,,Convert,HENK,henkan,,
|
||||
KEY_KATAKANAHIRAGANA,93,,,0x70,0x13,0x87,136,,,0xc8,0xc8,,,KanaMode,HKTG,katakanahiragana,,
|
||||
KEY_MUHENKAN,94,,,0x7b,0x67,0x85,139,,,,,,,NonConvert,NFER,muhenkan,,
|
||||
KEY_MUHENKAN,94,,,0x7b,0x67,0x85,139,,,,,,,NonConvert,MUHE,muhenkan,,
|
||||
KEY_KPJPCOMMA,95,JIS_KeypadComma,0x5f,0x5c,0x27,,140,,,,,XK_KP_Separator,0xffac,,KPSP,,,
|
||||
KEY_KPJPCOMMA,95,JIS_KeypadComma,0x5f,0x5c,0x27,,140,,,,,XK_KP_Separator,0xffac,,JPCM,,,
|
||||
KEY_KPENTER,96,ANSI_KeypadEnter,0x4c,0xe01c,0xe05a,0x79,88,,,0x64,0x64,XK_KP_Enter,0xff8d,NumpadEnter,KPEN,kp_enter,0x5a,0x4c
|
||||
KEY_RIGHTCTRL,97,RightControl,0x3e,0xe01d,0xe014,0x58,228,VK_RCONTROL,0xa3,0x65,0x65,XK_Control_R,0xffe4,ControlRight,RCTL,ctrl_r,0x4c,0x7d
|
||||
KEY_KPSLASH,98,ANSI_KeypadDivide,0x4b,0xe035,0xe04a,0x4a,84,VK_DIVIDE,0x6f,0x68,0x68,XK_KP_Divide,0xffaf,NumpadDivide,KPDV,kp_divide,0x2e,0x4b
|
||||
KEY_SYSRQ,99,,,0x54,0x7f,0x57,70,VK_SNAPSHOT,0x2c,0x67,0x67,XK_Sys_Req,0xff15,PrintScreen,PRSC,print,0x16,0x69
|
||||
KEY_SYSRQ,99,,,0x54,0x7f,0x57,70,VK_SNAPSHOT,0x2c,0x67,0x67,XK_Sys_Req,0xff15,PrintScreen,SYRQ,sysrq,0x16,0x69
|
||||
KEY_RIGHTALT,100,RightOption,0x3d,0xe038,0xe011,0x39,230,VK_RMENU,0xa5,0x69,0x69,XK_Alt_R,0xffea,AltRight,ALGR,alt_r,0x0d,0x7c
|
||||
KEY_RIGHTALT,100,RightOption,0x3d,0xe038,0xe011,0x39,230,VK_RMENU,0xa5,0x69,0x69,XK_Alt_R,0xffea,AltRight,RALT,alt_r,0x0d,0x7c
|
||||
KEY_LINEFEED,101,,,0x5b,,,,,,,,,,,LNFD,lf,0x6f,
|
||||
KEY_HOME,102,Home,0x73,0xe047,0xe06c,0x6e,74,VK_HOME,0x24,0x59,0x59,XK_Home,0xff50,Home,HOME,home,0x34,0x73
|
||||
KEY_UP,103,UpArrow,0x7e,0xe048,0xe075,0x63,82,VK_UP,0x26,0x5a,0x5a,XK_Up,0xff52,ArrowUp,UP,up,0x14,0x3e
|
||||
KEY_PAGEUP,104,PageUp,0x74,0xe049,0xe07d,0x6f,75,VK_PRIOR,0x21,0x5b,0x5b,XK_Page_Up,0xff55,PageUp,PGUP,pgup,0x60,0x74
|
||||
KEY_LEFT,105,LeftArrow,0x7b,0xe04b,0xe06b,0x61,80,VK_LEFT,0x25,0x5c,0x5c,XK_Left,0xff51,ArrowLeft,LEFT,left,0x18,0x3b
|
||||
KEY_RIGHT,106,RightArrow,0x7c,0xe04d,0xe074,0x6a,79,VK_RIGHT,0x27,0x5e,0x5e,XK_Right,0xff53,ArrowRight,RGHT,right,0x1c,0x3c
|
||||
KEY_END,107,End,0x77,0xe04f,0xe069,0x65,77,VK_END,0x23,0x5f,0x5f,XK_End,0xff57,End,END,end,0x4a,0x77
|
||||
KEY_DOWN,108,DownArrow,0x7d,0xe050,0xe072,0x60,81,VK_DOWN,0x28,0x60,0x60,XK_Down,0xff54,ArrowDown,DOWN,down,0x1b,0x3d
|
||||
KEY_PAGEDOWN,109,PageDown,0x79,0xe051,0xe07a,0x6d,78,VK_NEXT,0x22,0x61,0x61,XK_Page_Down,0xff56,PageDown,PGDN,pgdn,0x7b,0x79
|
||||
KEY_INSERT,110,,,0xe052,0xe070,0x67,73,VK_INSERT,0x2d,0x62,0x62,XK_Insert,0xff63,Insert,INS,insert,0x2c,0x72
|
||||
KEY_DELETE,111,ForwardDelete,0x75,0xe053,0xe071,0x64,76,VK_DELETE,0x2e,0x63,0x63,XK_Delete,0xffff,Delete,DEL,delete,0x42,0x75
|
||||
KEY_DELETE,111,ForwardDelete,0x75,0xe053,0xe071,0x64,76,VK_DELETE,0x2e,0x63,0x63,XK_Delete,0xffff,Delete,DELE,,0x42,0x75
|
||||
KEY_MACRO,112,,,0xe06f,0xe06f,0x8e,,,,,,,,,I120,,,
|
||||
KEY_MUTE,113,Mute,0x4a,0xe020,0xe023,0x9c,127,VK_VOLUME_MUTE,0xad,,,,,AudioVolumeMute,MUTE,audiomute,,
|
||||
KEY_MUTE,113,Mute,0x4a,0xe020,0xe023,0x9c,239,VK_VOLUME_MUTE,0xad,,,,,AudioVolumeMute,MUTE,audiomute,,
|
||||
KEY_VOLUMEDOWN,114,VolumeDown,0x49,0xe02e,0xe021,0x9d,129,VK_VOLUME_DOWN,0xae,,,,,AudioVolumeDown,VOL-,volumedown,,
|
||||
KEY_VOLUMEDOWN,114,VolumeDown,0x49,0xe02e,0xe021,0x9d,238,VK_VOLUME_DOWN,0xae,,,,,AudioVolumeDown,VOL-,volumedown,,
|
||||
KEY_VOLUMEUP,115,VolumeUp,0x48,0xe030,0xe032,0x95,128,VK_VOLUME_UP,0xaf,,,,,AudioVolumeUp,VOL+,volumeup,,
|
||||
KEY_VOLUMEUP,115,VolumeUp,0x48,0xe030,0xe032,0x95,237,VK_VOLUME_UP,0xaf,,,,,AudioVolumeUp,VOL+,volumeup,,
|
||||
KEY_POWER,116,,,0xe05e,0xe037,,102,,,,,,,Power,POWR,power,,0x7f7f
|
||||
KEY_KPEQUAL,117,ANSI_KeypadEquals,0x51,0x59,0x0f,,103,,,0x76,0x76,XK_KP_Equal,0xffbd,NumpadEqual,KPEQ,kp_equals,0x2d,0x51
|
||||
KEY_KPPLUSMINUS,118,,,0xe04e,0xe079,,,,,,,,,,I126,,,
|
||||
KEY_PAUSE,119,,,0xe046,0xe077,0x62,72,VK_PAUSE,0x013,0x66,0x66,XK_Pause,0xff13,Pause,PAUS,pause,0x15,0x71
|
||||
KEY_SCALE,120,,,0xe00b,,,,,,,,,,,I128,,,
|
||||
KEY_KPCOMMA,121,,,0x7e,0x6d,,133,VK_SEPARATOR??,0x6c,,,,,NumpadComma,KPCO,kp_comma,,
|
||||
KEY_KPCOMMA,121,,,0x7e,0x6d,,133,VK_SEPARATOR??,0x6c,,,,,NumpadComma,I129,,,
|
||||
KEY_HANGEUL,122,JIS_Kana,0x68,0x72,,,144,VK_HANGEUL,0x15,,0x71,,,Lang1,HNGL,,,
|
||||
KEY_HANJA,123,JIS_Eisu,0x66,0x71,,,145,VK_HANJA,0x19,,0x72,,,Lang2,HJCV,,,
|
||||
KEY_YEN,124,JIS_Yen,0x5d,0x7d,0x6a,0x5d,137,,,0x7d,0x7d,,,IntlYen,AE13,yen,,
|
||||
KEY_LEFTMETA,125,Command,0x37,0xe05b,0xe01f,0x8b,227,VK_LWIN,0x5b,0x6b,0x6b,XK_Meta_L,0xffe7,MetaLeft,LMTA,meta_l,0x78,0x37
|
||||
KEY_LEFTMETA,125,Command,0x37,0xe05b,0xe01f,0x8b,227,VK_LWIN,0x5b,0x6b,0x6b,XK_Meta_L,0xffe7,MetaLeft,LWIN,meta_l,0x78,0x37
|
||||
KEY_RIGHTMETA,126,RightCommand,0x36,0xe05c,0xe027,0x8c,231,VK_RWIN,0x5c,0x6c,0x6c,XK_Meta_R,0xffe8,MetaRight,RMTA,meta_r,0x7a,0x37
|
||||
KEY_RIGHTMETA,126,RightCommand,0x36,0xe05c,0xe027,0x8c,231,VK_RWIN,0x5c,0x6c,0x6c,XK_Meta_R,0xffe8,MetaRight,RWIN,meta_r,0x7a,0x37
|
||||
KEY_COMPOSE,127,,0x6e,0xe05d,0xe02f,0x8d,101,VK_APPS,0x5d,0x6d,0x6d,,,ContextMenu,MENU,compose,0x43,
|
||||
KEY_COMPOSE,127,,0x6e,0xe05d,0xe02f,0x8d,101,VK_APPS,0x5d,0x6d,0x6d,,,ContextMenu,COMP,compose,0x43,
|
||||
KEY_STOP,128,,,0xe068,0xe028,0x0a,120,VK_BROWSER_STOP,0xa9,,,,,BrowserStop,STOP,stop,0x01,
|
||||
KEY_STOP,128,,,0xe068,0xe028,0x0a,243,VK_BROWSER_STOP,0xa9,,,,,BrowserStop,STOP,stop,0x01,
|
||||
KEY_AGAIN,129,,,0xe005,,0x0b,121,,,,,,,Again,AGAI,again,0x03,
|
||||
KEY_PROPS,130,,,0xe006,,0x0c,,,,,,,,Props,PROP,props,0x19,
|
||||
KEY_UNDO,131,,,0xe007,,0x10,122,,,,,,,Undo,UNDO,undo,0x1a,
|
||||
KEY_FRONT,132,,,0xe00c,,,119,,,,,,,,FRNT,front,0x31,
|
||||
KEY_COPY,133,,,0xe078,,0x18,124,,,,,,,Copy,COPY,copy,0x33,
|
||||
KEY_OPEN,134,,,0x64,,0x20,116,,,,,,,Open,OPEN,open,0x48,
|
||||
KEY_PASTE,135,,,0x65,,0x28,125,,,,,,,Paste,PAST,paste,0x49,
|
||||
KEY_FIND,136,,,0xe041,,0x30,126,,,,,,,Find,FIND,find,0x5f,
|
||||
KEY_FIND,136,,,0xe041,,0x30,244,,,,,,,Find,FIND,find,0x5f,
|
||||
KEY_CUT,137,,,0xe03c,,0x38,123,,,,,,,Cut,CUT,cut,0x61,
|
||||
KEY_HELP,138,Help,0x72,0xe075,,0x09,117,VK_HELP,0x2f,,,XK_Help,0xff6a,Help,HELP,help,0x76,
|
||||
KEY_MENU,139,,,0xe01e,,0x91,118,,,,,,,,I147,menu,,
|
||||
KEY_CALC,140,,,0xe021,0xe02b,0xa3,251,,,,,,,LaunchApp2,I148,calculator,,
|
||||
KEY_SETUP,141,,,0x66,,,,,,,,,,,I149,,,
|
||||
KEY_SLEEP,142,,,0xe05f,0xe03f,,248,VK_SLEEP,0x5f,,,,,Sleep,I150,sleep,,
|
||||
KEY_WAKEUP,143,,,0xe063,0xe05e,,,,,,,,,WakeUp,I151,wake,,
|
||||
KEY_FILE,144,,,0x67,,,,,,,,,,,I152,,,
|
||||
KEY_SENDFILE,145,,,0x68,,,,,,,,,,,I153,,,
|
||||
KEY_DELETEFILE,146,,,0x69,,,,,,,,,,,I154,,,
|
||||
KEY_XFER,147,,,0xe013,,0xa2,,,,,,,,,XFER,,,
|
||||
KEY_XFER,147,,,0xe013,,0xa2,,,,,,,,,I155,,,
|
||||
KEY_PROG1,148,,,0xe01f,,0xa0,,,,,,,,,I156,,,
|
||||
KEY_PROG2,149,,,0xe017,,0xa1,,,,,,,,,I157,,,
|
||||
KEY_WWW,150,,,0xe002,,,240,,,,,,,,I158,,,
|
||||
KEY_MSDOS,151,,,0x6a,,,,,,,,,,,I159,,,
|
||||
KEY_SCREENLOCK,152,,,0xe012,,0x96,249,,,,,,,,I160,,,
|
||||
KEY_DIRECTION,153,,,0x6b,,,,,,,,,,,I161,,,
|
||||
KEY_CYCLEWINDOWS,154,,,0xe026,,0x9b,,,,,,,,,I162,,,
|
||||
KEY_MAIL,155,,,0xe06c,0xe048,,,,,,,,,LaunchMail,I163,mail,,
|
||||
KEY_BOOKMARKS,156,,,0xe066,0xe018,,,,,,,,,BrowserFavorites,I164,ac_bookmarks,,
|
||||
KEY_COMPUTER,157,,,0xe06b,0xe040,,,,,,,,,LaunchApp1,I165,computer,,
|
||||
KEY_BACK,158,,,0xe06a,0xe038,,241,VK_BROWSER_BACK,0xa6,,,,,BrowserBack,I166,ac_back,,
|
||||
KEY_FORWARD,159,,,0xe069,0xe030,,242,VK_BROWSER_FORWARD,0xa7,,,,,BrowserForward,I167,ac_forward,,
|
||||
KEY_CLOSECD,160,,,0xe023,,0x9a,,,,,,,,,I168,,,
|
||||
KEY_EJECTCD,161,,,0x6c,,,236,,,,,,,,I169,,,
|
||||
KEY_EJECTCLOSECD,162,,,0xe07d,,,,,,,,,,Eject,I170,,,
|
||||
KEY_NEXTSONG,163,,,0xe019,0xe04d,0x93,235,VK_MEDIA_NEXT_TRACK,0xb0,,,,,MediaTrackNext,I171,audionext,,
|
||||
KEY_PLAYPAUSE,164,,,0xe022,0xe034,,232,VK_MEDIA_PLAY_PAUSE,0xb3,,,,,MediaPlayPause,I172,audioplay,,
|
||||
KEY_PREVIOUSSONG,165,,,0xe010,0xe015,0x94,234,VK_MEDIA_PREV_TRACK,0xb1,,,,,MediaTrackPrevious,I173,audioprev,,
|
||||
KEY_STOPCD,166,,,0xe024,0xe03b,0x98,233,VK_MEDIA_STOP,0xb2,,,,,MediaStop,I174,audiostop,,
|
||||
KEY_RECORD,167,,,0xe031,,0x9e,,,,,,,,,I175,,,
|
||||
KEY_REWIND,168,,,0xe018,,0x9f,,,,,,,,,I176,,,
|
||||
KEY_PHONE,169,,,0x63,,,,,,,,,,,I177,,,
|
||||
KEY_ISO,170,ISO_Section,0xa,,,,,,,,,,,,I178,,,
|
||||
KEY_CONFIG,171,,,0xe001,,,,,,,,,,,I179,,,
|
||||
KEY_HOMEPAGE,172,,,0xe032,0xe03a,0x97,,VK_BROWSER_HOME,0xac,,,,,BrowserHome,I180,ac_home,,
|
||||
KEY_REFRESH,173,,,0xe067,0xe020,,250,VK_BROWSER_REFRESH,0xa8,,,,,BrowserRefresh,I181,ac_refresh,,
|
||||
KEY_EXIT,174,,,,,,,,,,,,,,I182,,,
|
||||
KEY_MOVE,175,,,,,,,,,,,,,,I183,,,
|
||||
KEY_EDIT,176,,,0xe008,,,247,,,,,,,,I184,,,
|
||||
KEY_SCROLLUP,177,,,0x75,,,245,,,,,,,,I185,,,
|
||||
KEY_SCROLLDOWN,178,,,0xe00f,,,246,,,,,,,,I186,,,
|
||||
KEY_KPLEFTPAREN,179,,,0xe076,,,182,,,,,,,NumpadParenLeft,I187,,,
|
||||
KEY_KPRIGHTPAREN,180,,,0xe07b,,,183,,,,,,,NumpadParenRight,I188,,,
|
||||
KEY_NEW,181,,,0xe009,,,,,,,,,,,I189,,,
|
||||
KEY_REDO,182,,,0xe00a,,,,,,,,,,,I190,,,
|
||||
KEY_F13,183,F13,0x69,0x5d,0x2f,0x7f,104,VK_F13,0x7c,0x6e,0x6e,,,F13,FK13,,,0x69
|
||||
KEY_F14,184,F14,0x6b,0x5e,0x37,0x80,105,VK_F14,0x7d,0x6f,0x6f,,,F14,FK14,,,0x6b
|
||||
KEY_F15,185,F15,0x71,0x5f,0x3f,0x81,106,VK_F15,0x7e,0x70,0x70,,,F15,FK15,,,0x71
|
||||
KEY_F16,186,F16,0x6a,0x55,,0x82,107,VK_F16,0x7f,0x71,0x71,,,F16,FK16,,,
|
||||
KEY_F17,187,F17,0x40,0xe003,,0x83,108,VK_F17,0x80,0x72,0x72,,,F17,FK17,,,
|
||||
KEY_F18,188,F18,0x4f,0xe077,,,109,VK_F18,0x81,,,,,F18,FK18,,,
|
||||
KEY_F19,189,F19,0x50,0xe004,,,110,VK_F19,0x82,,,,,F19,FK19,,,
|
||||
KEY_F20,190,F20,0x5a,0x5a,,,111,VK_F20,0x83,,,,,F20,FK20,,,
|
||||
KEY_F21,191,,,0x74,,,112,VK_F21,0x84,,,,,F21,FK21,,,
|
||||
KEY_F22,192,,,0xe079,,,113,VK_F22,0x85,,,,,F22,FK22,,,
|
||||
KEY_F23,193,,,0x6d,,,114,VK_F23,0x86,,,,,F23,FK23,,,
|
||||
KEY_F24,194,,,0x6f,,,115,VK_F24,0x87,,,,,F24,FK24,,,
|
||||
,195,,,0xe015,,,,,,,,,,,,,,
|
||||
,196,,,0xe016,,,,,,,,,,,,,,
|
||||
,197,,,0xe01a,,,,,,,,,,,,,,
|
||||
,198,,,0xe01b,,,,,,,,,,,,,,
|
||||
,199,,,0xe027,,,,,,,,,,,,,,
|
||||
KEY_PLAYCD,200,,,0xe028,,,,,,,,,,,I208,,,
|
||||
KEY_PAUSECD,201,,,0xe029,,,,,,,,,,,I209,,,
|
||||
KEY_PROG3,202,,,0xe02b,,,,,,,,,,,I210,,,
|
||||
KEY_PROG4,203,,,0xe02c,,,,,,,,,,,I211,,,
|
||||
KEY_DASHBOARD,204,,,0xe02d,,,,,,,,,,,I212,,,
|
||||
KEY_SUSPEND,205,,,0xe025,,,,,,,,,,Suspend,I213,,,
|
||||
KEY_CLOSE,206,,,0xe02f,,,,,,,,,,,I214,,,
|
||||
KEY_PLAY,207,,,0xe033,,,,VK_PLAY,0xfa,,,,,,I215,,,
|
||||
KEY_FASTFORWARD,208,,,0xe034,,,,,,,,,,,I216,,,
|
||||
KEY_BASSBOOST,209,,,0xe036,,,,,,,,,,,I217,,,
|
||||
KEY_PRINT,210,,,0xe039,,,,VK_PRINT,0x2a,,,,,,I218,,,
|
||||
KEY_HP,211,,,0xe03a,,,,,,,,,,,I219,,,
|
||||
KEY_CAMERA,212,,,0xe03b,,,,,,,,,,,I220,,,
|
||||
KEY_SOUND,213,,,0xe03d,,,,,,,,,,,I221,,,
|
||||
KEY_QUESTION,214,,,0xe03e,,,,,,,,,,,I222,,,
|
||||
KEY_EMAIL,215,,,0xe03f,,,,VK_LAUNCH_MAIL,0xb4,,,,,,I223,,,
|
||||
KEY_CHAT,216,,,0xe040,,,,,,,,,,,I224,,,
|
||||
KEY_SEARCH,217,,,0xe065,0xe010,,,VK_BROWSER_SEARCH,0xaa,,,,,BrowserSearch,I225,,,
|
||||
KEY_CONNECT,218,,,0xe042,,,,,,,,,,,I226,,,
|
||||
KEY_FINANCE,219,,,0xe043,,,,,,,,,,,I227,,,
|
||||
KEY_SPORT,220,,,0xe044,,,,,,,,,,,I228,,,
|
||||
KEY_SHOP,221,,,0xe045,,,,,,,,,,,I229,,,
|
||||
KEY_ALTERASE,222,,,0xe014,,,,,,,,,,,I230,,,
|
||||
KEY_CANCEL,223,,,0xe04a,,,,,,,,,,,I231,,,
|
||||
KEY_BRIGHTNESSDOWN,224,,,0xe04c,,,,,,,,,,,I232,,,
|
||||
KEY_BRIGHTNESSUP,225,,,0xe054,,,,,,,,,,,I233,,,
|
||||
KEY_MEDIA,226,,,0xe06d,0xe050,,,,,,,,,MediaSelect,I234,mediaselect,,
|
||||
KEY_SWITCHVIDEOMODE,227,,,0xe056,,,,,,,,,,,I235,,,
|
||||
KEY_KBDILLUMTOGGLE,228,,,0xe057,,,,,,,,,,,I236,,,
|
||||
KEY_KBDILLUMDOWN,229,,,0xe058,,,,,,,,,,,I237,,,
|
||||
KEY_KBDILLUMUP,230,,,0xe059,,,,,,,,,,,I238,,,
|
||||
KEY_SEND,231,,,0xe05a,,,,,,,,,,,I239,,,
|
||||
KEY_REPLY,232,,,0xe064,,,,,,,,,,,I240,,,
|
||||
KEY_FORWARDMAIL,233,,,0xe00e,,,,,,,,,,,I241,,,
|
||||
KEY_SAVE,234,,,0xe055,,,,,,,,,,,I242,,,
|
||||
KEY_DOCUMENTS,235,,,0xe070,,,,,,,,,,,I243,,,
|
||||
KEY_BATTERY,236,,,0xe071,,,,,,,,,,,I244,,,
|
||||
KEY_BLUETOOTH,237,,,0xe072,,,,,,,,,,,I245,,,
|
||||
KEY_WLAN,238,,,0xe073,,,,,,,,,,,I246,,,
|
||||
KEY_UWB,239,,,0xe074,,,,,,,,,,,I247,,,
|
||||
KEY_UNKNOWN,240,,,,,,,,,,,,,,I248,,,
|
||||
KEY_VIDEO_NEXT,241,,,,,,,,,,,,,,I249,,,
|
||||
KEY_VIDEO_PREV,242,,,,,,,,,,,,,,I250,,,
|
||||
KEY_BRIGHTNESS_CYCLE,243,,,,,,,,,,,,,,I251,,,
|
||||
KEY_BRIGHTNESS_ZERO,244,,,,,,,,,,,,,,I252,,,
|
||||
KEY_DISPLAY_OFF,245,,,,,,,,,,,,,,I253,,,
|
||||
KEY_WIMAX,246,,,,,,,,,,,,,,,,,
|
||||
,247,,,,,,,,,,,,,,,,,
|
||||
,248,,,,,,,,,,,,,,,,,
|
||||
,249,,,,,,,,,,,,,,,,,
|
||||
,250,,,,,,,,,,,,,,,,,
|
||||
,251,,,,,,,,,,,,,,,,,
|
||||
,252,,,,,,,,,,,,,,,,,
|
||||
,253,,,,,,,,,,,,,,,,,
|
||||
,254,,,,,,,,,,,,,,,,,
|
||||
,255,,,,0xe012,,,,,,,,,,,,,
|
||||
BTN_MISC,0x100,,,,,,,,,,,,,,,,,
|
||||
BTN_0,0x100,,,,,,,VK_LBUTTON,0x01,,,,,,,,,
|
||||
BTN_1,0x101,,,,,,,VK_RBUTTON,0x02,,,,,,,,,
|
||||
BTN_2,0x102,,,,,,,VK_MBUTTON,0x04,,,,,,,,,
|
||||
BTN_3,0x103,,,,,,,VK_XBUTTON1,0x05,,,,,,,,,
|
||||
BTN_4,0x104,,,,,,,VK_XBUTTON2,0x06,,,,,,,,,
|
||||
BTN_5,0x105,,,,,,,,,,,,,,,,,
|
||||
BTN_6,0x106,,,,,,,,,,,,,,,,,
|
||||
BTN_7,0x107,,,,,,,,,,,,,,,,,
|
||||
BTN_8,0x108,,,,,,,,,,,,,,,,,
|
||||
BTN_9,0x109,,,,,,,,,,,,,,,,,
|
||||
BTN_MOUSE,0x110,,,,,,,,,,,,,,,,,
|
||||
BTN_LEFT,0x110,,,,,,,,,,,,,,,,,
|
||||
BTN_RIGHT,0x111,,,,,,,,,,,,,,,,,
|
||||
BTN_MIDDLE,0x112,,,,,,,,,,,,,,,,,
|
||||
BTN_SIDE,0x113,,,,,,,,,,,,,,,,,
|
||||
BTN_EXTRA,0x114,,,,,,,,,,,,,,,,,
|
||||
BTN_FORWARD,0x115,,,,,,,,,,,,,,,,,
|
||||
BTN_BACK,0x116,,,,,,,,,,,,,,,,,
|
||||
BTN_TASK,0x117,,,,,,,,,,,,,,,,,
|
||||
BTN_JOYSTICK,0x120,,,,,,,,,,,,,,,,,
|
||||
BTN_TRIGGER,0x120,,,,,,,,,,,,,,,,,
|
||||
BTN_THUMB,0x121,,,,,,,,,,,,,,,,,
|
||||
BTN_THUMB2,0x122,,,,,,,,,,,,,,,,,
|
||||
BTN_TOP,0x123,,,,,,,,,,,,,,,,,
|
||||
BTN_TOP2,0x124,,,,,,,,,,,,,,,,,
|
||||
BTN_PINKIE,0x125,,,,,,,,,,,,,,,,,
|
||||
BTN_BASE,0x126,,,,,,,,,,,,,,,,,
|
||||
BTN_BASE2,0x127,,,,,,,,,,,,,,,,,
|
||||
BTN_BASE3,0x128,,,,,,,,,,,,,,,,,
|
||||
BTN_BASE4,0x129,,,,,,,,,,,,,,,,,
|
||||
BTN_BASE5,0x12a,,,,,,,,,,,,,,,,,
|
||||
BTN_BASE6,0x12b,,,,,,,,,,,,,,,,,
|
||||
BTN_DEAD,0x12f,,,,,,,,,,,,,,,,,
|
||||
BTN_GAMEPAD,0x130,,,,,,,,,,,,,,,,,
|
||||
BTN_A,0x130,,,,,,,,,,,,,,,,,
|
||||
BTN_B,0x131,,,,,,,,,,,,,,,,,
|
||||
BTN_C,0x132,,,,,,,,,,,,,,,,,
|
||||
BTN_X,0x133,,,,,,,,,,,,,,,,,
|
||||
BTN_Y,0x134,,,,,,,,,,,,,,,,,
|
||||
BTN_Z,0x135,,,,,,,,,,,,,,,,,
|
||||
BTN_TL,0x136,,,,,,,,,,,,,,,,,
|
||||
BTN_TR,0x137,,,,,,,,,,,,,,,,,
|
||||
BTN_TL2,0x138,,,,,,,,,,,,,,,,,
|
||||
BTN_TR2,0x139,,,,,,,,,,,,,,,,,
|
||||
BTN_SELECT,0x13a,,,,,,,,,,,,,,,,,
|
||||
BTN_START,0x13b,,,,,,,,,,,,,,,,,
|
||||
BTN_MODE,0x13c,,,,,,,,,,,,,,,,,
|
||||
BTN_THUMBL,0x13d,,,,,,,,,,,,,,,,,
|
||||
BTN_THUMBR,0x13e,,,,,,,,,,,,,,,,,
|
||||
BTN_DIGI,0x140,,,,,,,,,,,,,,,,,
|
||||
BTN_TOOL_PEN,0x140,,,,,,,,,,,,,,,,,
|
||||
BTN_TOOL_RUBBER,0x141,,,,,,,,,,,,,,,,,
|
||||
BTN_TOOL_BRUSH,0x142,,,,,,,,,,,,,,,,,
|
||||
BTN_TOOL_PENCIL,0x143,,,,,,,,,,,,,,,,,
|
||||
BTN_TOOL_AIRBRUSH,0x144,,,,,,,,,,,,,,,,,
|
||||
BTN_TOOL_FINGER,0x145,,,,,,,,,,,,,,,,,
|
||||
BTN_TOOL_MOUSE,0x146,,,,,,,,,,,,,,,,,
|
||||
BTN_TOOL_LENS,0x147,,,,,,,,,,,,,,,,,
|
||||
BTN_TOUCH,0x14a,,,,,,,,,,,,,,,,,
|
||||
BTN_STYLUS,0x14b,,,,,,,,,,,,,,,,,
|
||||
BTN_STYLUS2,0x14c,,,,,,,,,,,,,,,,,
|
||||
BTN_TOOL_DOUBLETAP,0x14d,,,,,,,,,,,,,,,,,
|
||||
BTN_TOOL_TRIPLETAP,0x14e,,,,,,,,,,,,,,,,,
|
||||
BTN_TOOL_QUADTAP,0x14f,,,,,,,,,,,,,,,,,
|
||||
BTN_WHEEL,0x150,,,,,,,,,,,,,,,,,
|
||||
BTN_GEAR_DOWN,0x150,,,,,,,,,,,,,,,,,
|
||||
BTN_GEAR_UP,0x151,,,,,,,,,,,,,,,,,
|
||||
KEY_OK,0x160,,,,,,,,,,,,,,,,,
|
||||
KEY_SELECT,0x161,,,,,,,VK_SELECT,0x29,,,XK_Select,0xff60,Select,SELE,,,
|
||||
KEY_GOTO,0x162,,,,,,,,,,,,,,,,,
|
||||
KEY_CLEAR,0x163,,,,,,,,,,,,,NumpadClear,CLR,,,
|
||||
KEY_POWER2,0x164,,,,,,,,,,,,,,,,,
|
||||
KEY_OPTION,0x165,,,,,,,,,,,,,,,,,
|
||||
KEY_INFO,0x166,,,,,,,,,,,,,,,,,
|
||||
KEY_TIME,0x167,,,,,,,,,,,,,,,,,
|
||||
KEY_VENDOR,0x168,,,,,,,,,,,,,,,,,
|
||||
KEY_ARCHIVE,0x169,,,,,,,,,,,,,,,,,
|
||||
KEY_PROGRAM,0x16a,,,,,,,,,,,,,,,,,
|
||||
KEY_CHANNEL,0x16b,,,,,,,,,,,,,,,,,
|
||||
KEY_FAVORITES,0x16c,,,,,,,VK_BROWSER_FAVOURITES,0xab,,,,,,,,,
|
||||
KEY_EPG,0x16d,,,,,,,,,,,,,,,,,
|
||||
KEY_PVR,0x16e,,,,,,,,,,,,,,,,,
|
||||
KEY_MHP,0x16f,,,,,,,,,,,,,,,,,
|
||||
KEY_LANGUAGE,0x170,,,,,,,,,,,,,,,,,
|
||||
KEY_TITLE,0x171,,,,,,,,,,,,,,,,,
|
||||
KEY_SUBTITLE,0x172,,,,,,,,,,,,,,,,,
|
||||
KEY_ANGLE,0x173,,,,,,,,,,,,,,,,,
|
||||
KEY_ZOOM,0x174,,,,,,,VK_ZOOM,0xfb,,,,,,,,,
|
||||
KEY_MODE,0x175,,,,,,,,,,,,,,,,,
|
||||
KEY_KEYBOARD,0x176,,,,,,,,,,,,,,,,,
|
||||
KEY_SCREEN,0x177,,,,,,,,,,,,,,,,,
|
||||
KEY_PC,0x178,,,,,,,,,,,,,,,,,
|
||||
KEY_TV,0x179,,,,,,,,,,,,,,,,,
|
||||
KEY_TV2,0x17a,,,,,,,,,,,,,,,,,
|
||||
KEY_VCR,0x17b,,,,,,,,,,,,,,,,,
|
||||
KEY_VCR2,0x17c,,,,,,,,,,,,,,,,,
|
||||
KEY_SAT,0x17d,,,,,,,,,,,,,,,,,
|
||||
KEY_SAT2,0x17e,,,,,,,,,,,,,,,,,
|
||||
KEY_CD,0x17f,,,,,,,,,,,,,,,,,
|
||||
KEY_TAPE,0x180,,,,,,,,,,,,,,,,,
|
||||
KEY_RADIO,0x181,,,,,,,,,,,,,,,,,
|
||||
KEY_TUNER,0x182,,,,,,,,,,,,,,,,,
|
||||
KEY_PLAYER,0x183,,,,,,,,,,,,,,,,,
|
||||
KEY_TEXT,0x184,,,,,,,,,,,,,,,,,
|
||||
KEY_DVD,0x185,,,,,,,,,,,,,,,,,
|
||||
KEY_AUX,0x186,,,,,,,,,,,,,,,,,
|
||||
KEY_MP3,0x187,,,,,,,,,,,,,,,,,
|
||||
KEY_AUDIO,0x188,,,,,,,,,,,,,,,,,
|
||||
KEY_VIDEO,0x189,,,,,,,,,,,,,,,,,
|
||||
KEY_DIRECTORY,0x18a,,,,,,,,,,,,,,,,,
|
||||
KEY_LIST,0x18b,,,,,,,,,,,,,,,,,
|
||||
KEY_MEMO,0x18c,,,,,,,,,,,,,,,,,
|
||||
KEY_CALENDAR,0x18d,,,,,,,,,,,,,,,,,
|
||||
KEY_RED,0x18e,,,,,,,,,,,,,,,,,
|
||||
KEY_GREEN,0x18f,,,,,,,,,,,,,,,,,
|
||||
KEY_YELLOW,0x190,,,,,,,,,,,,,,,,,
|
||||
KEY_BLUE,0x191,,,,,,,,,,,,,,,,,
|
||||
KEY_CHANNELUP,0x192,,,,,,,,,,,,,,,,,
|
||||
KEY_CHANNELDOWN,0x193,,,,,,,,,,,,,,,,,
|
||||
KEY_FIRST,0x194,,,,,,,,,,,,,,,,,
|
||||
KEY_LAST,0x195,,,,,,,,,,,,,,,,,
|
||||
KEY_AB,0x196,,,,,,,,,,,,,,,,,
|
||||
KEY_NEXT,0x197,,,,,,,,,,,,,,,,,
|
||||
KEY_RESTART,0x198,,,,,,,,,,,,,,,,,
|
||||
KEY_SLOW,0x199,,,,,,,,,,,,,,,,,
|
||||
KEY_SHUFFLE,0x19a,,,,,,,,,,,,,,,,,
|
||||
KEY_BREAK,0x19b,,,,,,,,,,,,,,BREA,,,
|
||||
KEY_BREAK,0x19b,,,,,,,,,,,,,,BRK,,,
|
||||
KEY_PREVIOUS,0x19c,,,,,,,,,,,,,,,,,
|
||||
KEY_DIGITS,0x19d,,,,,,,,,,,,,,,,,
|
||||
KEY_TEEN,0x19e,,,,,,,,,,,,,,,,,
|
||||
KEY_TWEN,0x19f,,,,,,,,,,,,,,,,,
|
||||
KEY_VIDEOPHONE,0x1a0,,,,,,,,,,,,,,,,,
|
||||
KEY_GAMES,0x1a1,,,,,,,,,,,,,,,,,
|
||||
KEY_ZOOMIN,0x1a2,,,,,,,,,,,,,,,,,
|
||||
KEY_ZOOMOUT,0x1a3,,,,,,,,,,,,,,,,,
|
||||
KEY_ZOOMRESET,0x1a4,,,,,,,,,,,,,,,,,
|
||||
KEY_WORDPROCESSOR,0x1a5,,,,,,,,,,,,,,,,,
|
||||
KEY_EDITOR,0x1a6,,,,,,,,,,,,,,,,,
|
||||
KEY_SPREADSHEET,0x1a7,,,,,,,,,,,,,,,,,
|
||||
KEY_GRAPHICSEDITOR,0x1a8,,,,,,,,,,,,,,,,,
|
||||
KEY_PRESENTATION,0x1a9,,,,,,,,,,,,,,,,,
|
||||
KEY_DATABASE,0x1aa,,,,,,,,,,,,,,,,,
|
||||
KEY_NEWS,0x1ab,,,,,,,,,,,,,,,,,
|
||||
KEY_VOICEMAIL,0x1ac,,,,,,,,,,,,,,,,,
|
||||
KEY_ADDRESSBOOK,0x1ad,,,,,,,,,,,,,,,,,
|
||||
KEY_MESSENGER,0x1ae,,,,,,,,,,,,,,,,,
|
||||
KEY_DISPLAYTOGGLE,0x1af,,,,,,,,,,,,,,,,,
|
||||
KEY_SPELLCHECK,0x1b0,,,,,,,,,,,,,,,,,
|
||||
KEY_LOGOFF,0x1b1,,,,,,,,,,,,,,,,,
|
||||
KEY_DOLLAR,0x1b2,,,,,,,,,,,,,,,,,
|
||||
KEY_EURO,0x1b3,,,,,,,,,,,,,,,,,
|
||||
KEY_FRAMEBACK,0x1b4,,,,,,,,,,,,,,,,,
|
||||
KEY_FRAMEFORWARD,0x1b5,,,,,,,,,,,,,,,,,
|
||||
KEY_CONTEXT_MENU,0x1b6,,,,,,,,,,,,,,,,,
|
||||
KEY_MEDIA_REPEAT,0x1b7,,,,,,,,,,,,,,,,,
|
||||
KEY_DEL_EOL,0x1c0,,,,,,,,,,,,,,,,,
|
||||
KEY_DEL_EOS,0x1c1,,,,,,,,,,,,,,,,,
|
||||
KEY_INS_LINE,0x1c2,,,,,,,,,,,,,,,,,
|
||||
KEY_DEL_LINE,0x1c3,,,,,,,,,,,,,,,,,
|
||||
KEY_FN,0x1d0,Function,0x3f,,,,,,,,,,,Fn,,,,
|
||||
KEY_FN_ESC,0x1d1,,,,,,,,,,,,,,,,,
|
||||
KEY_FN_F1,0x1d2,,,,,,,,,,,,,,,,,
|
||||
KEY_FN_F2,0x1d3,,,,,,,,,,,,,,,,,
|
||||
KEY_FN_F3,0x1d4,,,,,,,,,,,,,,,,,
|
||||
KEY_FN_F4,0x1d5,,,,,,,,,,,,,,,,,
|
||||
KEY_FN_F5,0x1d6,,,,,,,,,,,,,,,,,
|
||||
KEY_FN_F6,0x1d7,,,,,,,,,,,,,,,,,
|
||||
KEY_FN_F7,0x1d8,,,,,,,,,,,,,,,,,
|
||||
KEY_FN_F8,0x1d9,,,,,,,,,,,,,,,,,
|
||||
KEY_FN_F9,0x1da,,,,,,,,,,,,,,,,,
|
||||
KEY_FN_F10,0x1db,,,,,,,,,,,,,,,,,
|
||||
KEY_FN_F11,0x1dc,,,,,,,,,,,,,,,,,
|
||||
KEY_FN_F12,0x1dd,,,,,,,,,,,,,,,,,
|
||||
KEY_FN_1,0x1de,,,,,,,,,,,,,,,,,
|
||||
KEY_FN_2,0x1df,,,,,,,,,,,,,,,,,
|
||||
KEY_FN_D,0x1e0,,,,,,,,,,,,,,,,,
|
||||
KEY_FN_E,0x1e1,,,,,,,,,,,,,,,,,
|
||||
KEY_FN_F,0x1e2,,,,,,,,,,,,,,,,,
|
||||
KEY_FN_S,0x1e3,,,,,,,,,,,,,,,,,
|
||||
KEY_FN_B,0x1e4,,,,,,,,,,,,,,,,,
|
||||
KEY_BRL_DOT1,0x1f1,,,,,,,,,,,,,,,,,
|
||||
KEY_BRL_DOT2,0x1f2,,,,,,,,,,,,,,,,,
|
||||
KEY_BRL_DOT3,0x1f3,,,,,,,,,,,,,,,,,
|
||||
KEY_BRL_DOT4,0x1f4,,,,,,,,,,,,,,,,,
|
||||
KEY_BRL_DOT5,0x1f5,,,,,,,,,,,,,,,,,
|
||||
KEY_BRL_DOT6,0x1f6,,,,,,,,,,,,,,,,,
|
||||
KEY_BRL_DOT7,0x1f7,,,,,,,,,,,,,,,,,
|
||||
KEY_BRL_DOT8,0x1f8,,,,,,,,,,,,,,,,,
|
||||
KEY_BRL_DOT9,0x1f9,,,,,,,,,,,,,,,,,
|
||||
KEY_BRL_DOT10,0x1fa,,,,,,,,,,,,,,,,,
|
||||
KEY_NUMERIC_0,0x200,,,,,,,,,,,,,,,,,
|
||||
KEY_NUMERIC_1,0x201,,,,,,,,,,,,,,,,,
|
||||
KEY_NUMERIC_2,0x202,,,,,,,,,,,,,,,,,
|
||||
KEY_NUMERIC_3,0x203,,,,,,,,,,,,,,,,,
|
||||
KEY_NUMERIC_4,0x204,,,,,,,,,,,,,,,,,
|
||||
KEY_NUMERIC_5,0x205,,,,,,,,,,,,,,,,,
|
||||
KEY_NUMERIC_6,0x206,,,,,,,,,,,,,,,,,
|
||||
KEY_NUMERIC_7,0x207,,,,,,,,,,,,,,,,,
|
||||
KEY_NUMERIC_8,0x208,,,,,,,,,,,,,,,,,
|
||||
KEY_NUMERIC_9,0x209,,,,,,,,,,,,,,,,,
|
||||
KEY_NUMERIC_STAR,0x20a,,,,,,,,,,,,,NumpadStar,,,,
|
||||
KEY_NUMERIC_POUND,0x20b,,,,,,,,,,,,,NumpadHash,,,,
|
||||
KEY_RFKILL,0x20c,,,,,,,,,,,,,,,,,
|
|
|
@ -1 +0,0 @@
|
|||
project('keycodemapdb')
|
|
@ -1,11 +0,0 @@
|
|||
osx2win32.*
|
||||
osx2win32_name.*
|
||||
osx2xkb.*
|
||||
osx2xkb_name.*
|
||||
html2win32.*
|
||||
html2win32_name.*
|
||||
osx.*
|
||||
osx_name.*
|
||||
stdc
|
||||
stdc++
|
||||
node_modules/
|
|
@ -1,150 +0,0 @@
|
|||
TESTS := stdc stdc++ python2 python3 javascript
|
||||
|
||||
check: $(TESTS)
|
||||
@set -e; for fn in $(TESTS); do \
|
||||
./$$fn; \
|
||||
echo $$fn: OK; \
|
||||
done
|
||||
@echo Done.
|
||||
|
||||
GEN := ../tools/keymap-gen
|
||||
DATA := ../data/keymaps.csv
|
||||
SOURCES := $(GEN) $(DATA)
|
||||
|
||||
.DELETE_ON_ERROR:
|
||||
|
||||
stdc: stdc.c osx2win32.h osx2win32.c osx2win32_name.h osx2win32_name.c \
|
||||
osx2xkb.h osx2xkb.c osx2xkb_name.h osx2xkb_name.c \
|
||||
html2win32.h html2win32.c html2win32_name.h html2win32_name.c \
|
||||
osx.h osx.c osx_name.h osx_name.c
|
||||
$(CC) -Wall -o $@ $(filter %.c, $^)
|
||||
osx2win32.c: $(SOURCES)
|
||||
$(GEN) --lang stdc code-map $(DATA) osx win32 > $@
|
||||
osx2win32.h: $(SOURCES)
|
||||
$(GEN) --lang stdc-header code-map $(DATA) osx win32 > $@
|
||||
osx2win32_name.c: $(SOURCES)
|
||||
$(GEN) --lang stdc name-map $(DATA) osx win32 > $@
|
||||
osx2win32_name.h: $(SOURCES)
|
||||
$(GEN) --lang stdc-header name-map $(DATA) osx win32 > $@
|
||||
osx2xkb.c: $(SOURCES)
|
||||
$(GEN) --lang stdc code-map $(DATA) osx xkb > $@
|
||||
osx2xkb.h: $(SOURCES)
|
||||
$(GEN) --lang stdc-header code-map $(DATA) osx xkb > $@
|
||||
osx2xkb_name.c: $(SOURCES)
|
||||
$(GEN) --lang stdc name-map $(DATA) osx xkb > $@
|
||||
osx2xkb_name.h: $(SOURCES)
|
||||
$(GEN) --lang stdc-header name-map $(DATA) osx xkb > $@
|
||||
html2win32.c: $(SOURCES)
|
||||
$(GEN) --lang stdc code-map $(DATA) html win32 > $@
|
||||
html2win32.h: $(SOURCES)
|
||||
$(GEN) --lang stdc-header code-map $(DATA) html win32 > $@
|
||||
html2win32_name.c: $(SOURCES)
|
||||
$(GEN) --lang stdc name-map $(DATA) html win32 > $@
|
||||
html2win32_name.h: $(SOURCES)
|
||||
$(GEN) --lang stdc-header name-map $(DATA) html win32 > $@
|
||||
osx.c: $(SOURCES)
|
||||
$(GEN) --lang stdc code-table $(DATA) osx > $@
|
||||
osx.h: $(SOURCES)
|
||||
$(GEN) --lang stdc-header code-table $(DATA) osx > $@
|
||||
osx_name.c: $(SOURCES)
|
||||
$(GEN) --lang stdc name-table $(DATA) osx > $@
|
||||
osx_name.h: $(SOURCES)
|
||||
$(GEN) --lang stdc-header name-table $(DATA) osx > $@
|
||||
|
||||
stdc++: stdc++.cc osx2win32.hh osx2win32.cc osx2win32_name.hh osx2win32_name.cc \
|
||||
osx2xkb.hh osx2xkb.cc osx2xkb_name.hh osx2xkb_name.cc \
|
||||
html2win32.hh html2win32.cc html2win32_name.hh html2win32_name.cc \
|
||||
osx.hh osx.cc osx_name.hh osx_name.cc
|
||||
$(CXX) -Wall -std=c++11 -o $@ $(filter %.cc, $^)
|
||||
osx2win32.cc: $(SOURCES)
|
||||
$(GEN) --lang stdc++ code-map $(DATA) osx win32 > $@
|
||||
osx2win32.hh: $(SOURCES)
|
||||
$(GEN) --lang stdc++-header code-map $(DATA) osx win32 > $@
|
||||
osx2win32_name.cc: $(SOURCES)
|
||||
$(GEN) --lang stdc++ name-map $(DATA) osx win32 > $@
|
||||
osx2win32_name.hh: $(SOURCES)
|
||||
$(GEN) --lang stdc++-header name-map $(DATA) osx win32 > $@
|
||||
osx2xkb.cc: $(SOURCES)
|
||||
$(GEN) --lang stdc++ code-map $(DATA) osx xkb > $@
|
||||
osx2xkb.hh: $(SOURCES)
|
||||
$(GEN) --lang stdc++-header code-map $(DATA) osx xkb > $@
|
||||
osx2xkb_name.cc: $(SOURCES)
|
||||
$(GEN) --lang stdc++ name-map $(DATA) osx xkb > $@
|
||||
osx2xkb_name.hh: $(SOURCES)
|
||||
$(GEN) --lang stdc++-header name-map $(DATA) osx xkb > $@
|
||||
html2win32.cc: $(SOURCES)
|
||||
$(GEN) --lang stdc++ code-map $(DATA) html win32 > $@
|
||||
html2win32.hh: $(SOURCES)
|
||||
$(GEN) --lang stdc++-header code-map $(DATA) html win32 > $@
|
||||
html2win32_name.cc: $(SOURCES)
|
||||
$(GEN) --lang stdc++ name-map $(DATA) html win32 > $@
|
||||
html2win32_name.hh: $(SOURCES)
|
||||
$(GEN) --lang stdc++-header name-map $(DATA) html win32 > $@
|
||||
osx.cc: $(SOURCES)
|
||||
$(GEN) --lang stdc++ code-table $(DATA) osx > $@
|
||||
osx.hh: $(SOURCES)
|
||||
$(GEN) --lang stdc++-header code-table $(DATA) osx > $@
|
||||
osx_name.cc: $(SOURCES)
|
||||
$(GEN) --lang stdc++ name-table $(DATA) osx > $@
|
||||
osx_name.hh: $(SOURCES)
|
||||
$(GEN) --lang stdc++-header name-table $(DATA) osx > $@
|
||||
|
||||
python2: osx2win32.py osx2win32_name.py \
|
||||
osx2xkb.py osx2xkb_name.py \
|
||||
html2win32.py html2win32_name.py \
|
||||
osx.py osx_name.py
|
||||
osx2win32.py: $(SOURCES)
|
||||
$(GEN) --lang python2 code-map $(DATA) osx win32 > $@
|
||||
osx2win32_name.py: $(SOURCES)
|
||||
$(GEN) --lang python2 name-map $(DATA) osx win32 > $@
|
||||
osx2xkb.py: $(SOURCES)
|
||||
$(GEN) --lang python2 code-map $(DATA) osx xkb > $@
|
||||
osx2xkb_name.py: $(SOURCES)
|
||||
$(GEN) --lang python2 name-map $(DATA) osx xkb > $@
|
||||
html2win32.py: $(SOURCES)
|
||||
$(GEN) --lang python2 code-map $(DATA) html win32 > $@
|
||||
html2win32_name.py: $(SOURCES)
|
||||
$(GEN) --lang python2 name-map $(DATA) html win32 > $@
|
||||
osx.py: $(SOURCES)
|
||||
$(GEN) --lang python2 code-table $(DATA) osx > $@
|
||||
osx_name.py: $(SOURCES)
|
||||
$(GEN) --lang python2 name-table $(DATA) osx > $@
|
||||
|
||||
javascript: node_modules/babel-core \
|
||||
node_modules/babel-plugin-transform-es2015-modules-commonjs \
|
||||
osx2win32.js osx2win32_name.js \
|
||||
osx2xkb.js osx2xkb_name.js \
|
||||
html2win32.js html2win32_name.js \
|
||||
osx.js osx_name.js
|
||||
node_modules/babel-core:
|
||||
npm install babel-core
|
||||
node_modules/babel-plugin-transform-es2015-modules-commonjs:
|
||||
npm install babel-plugin-transform-es2015-modules-commonjs
|
||||
osx2win32.js: $(SOURCES)
|
||||
$(GEN) --lang js code-map $(DATA) osx win32 > $@
|
||||
osx2win32_name.js: $(SOURCES)
|
||||
$(GEN) --lang js name-map $(DATA) osx win32 > $@
|
||||
osx2xkb.js: $(SOURCES)
|
||||
$(GEN) --lang js code-map $(DATA) osx xkb > $@
|
||||
osx2xkb_name.js: $(SOURCES)
|
||||
$(GEN) --lang js name-map $(DATA) osx xkb > $@
|
||||
html2win32.js: $(SOURCES)
|
||||
$(GEN) --lang js code-map $(DATA) html win32 > $@
|
||||
html2win32_name.js: $(SOURCES)
|
||||
$(GEN) --lang js name-map $(DATA) html win32 > $@
|
||||
osx.js: $(SOURCES)
|
||||
$(GEN) --lang js code-table $(DATA) osx > $@
|
||||
osx_name.js: $(SOURCES)
|
||||
$(GEN) --lang js name-table $(DATA) osx > $@
|
||||
|
||||
clean:
|
||||
rm -rf node_modules
|
||||
rm -f osx2win32.*
|
||||
rm -f osx2win32_name.*
|
||||
rm -f osx2xkb.*
|
||||
rm -f osx2xkb_name.*
|
||||
rm -f html2win32.*
|
||||
rm -f html2win32_name.*
|
||||
rm -f osx.*
|
||||
rm -f osx_name.*
|
||||
rm -f stdc stdc++
|
|
@ -1,53 +0,0 @@
|
|||
#!/usr/bin/env node
|
||||
/*
|
||||
* Keycode Map Generator JavaScript Tests
|
||||
*
|
||||
* Copyright 2017 Pierre Ossman for Cendio AB
|
||||
*
|
||||
* This file is dual license under the terms of the GPLv2 or later
|
||||
* and 3-clause BSD licenses.
|
||||
*/
|
||||
|
||||
"use strict";
|
||||
|
||||
var assert = require('assert');
|
||||
var babel = require('babel-core');
|
||||
var fs = require('fs');
|
||||
|
||||
function include(fn) {
|
||||
var options = {
|
||||
plugins: ["transform-es2015-modules-commonjs"]
|
||||
};
|
||||
|
||||
var code = babel.transformFileSync(fn, options).code;
|
||||
fs.writeFileSync("." + fn + "_nodejs.js", code);
|
||||
var imp = require("./." + fn + "_nodejs.js");
|
||||
fs.unlinkSync("./." + fn + "_nodejs.js");
|
||||
|
||||
return imp
|
||||
}
|
||||
|
||||
var code_map_osx_to_win32 = include("osx2win32.js").default;
|
||||
var name_map_osx_to_win32 = include("osx2win32_name.js").default;
|
||||
|
||||
var code_map_osx_to_xkb = include("osx2xkb.js").default;
|
||||
var name_map_osx_to_xkb = include("osx2xkb_name.js").default;
|
||||
|
||||
var code_map_html_to_win32 = include("html2win32.js").default;
|
||||
var name_map_html_to_win32 = include("html2win32_name.js").default;
|
||||
|
||||
var code_table_osx = include("osx.js").default;
|
||||
var name_table_osx = include("osx_name.js").default;
|
||||
|
||||
assert.equal(code_map_osx_to_win32[0x1d], 0x30);
|
||||
assert.equal(name_map_osx_to_win32[0x1d], "VK_0");
|
||||
|
||||
assert.equal(code_map_osx_to_xkb[0x1d], "AE10");
|
||||
assert.equal(name_map_osx_to_xkb[0x1d], "AE10");
|
||||
|
||||
assert.equal(code_map_html_to_win32["ControlLeft"], 0x11);
|
||||
assert.equal(name_map_html_to_win32["ControlLeft"], "VK_CONTROL");
|
||||
|
||||
assert.equal(code_table_osx[0x1d], 0x3b);
|
||||
assert.equal(name_table_osx[0x1d], "Control");
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
python ./test.py
|
|
@ -1,3 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
python3 ./test.py
|
|
@ -1,40 +0,0 @@
|
|||
/*
|
||||
* Keycode Map Generator C++ Tests
|
||||
*
|
||||
* Copyright 2017 Pierre Ossman for Cendio AB
|
||||
*
|
||||
* This file is dual license under the terms of the GPLv2 or later
|
||||
* and 3-clause BSD licenses.
|
||||
*/
|
||||
|
||||
#include <assert.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "osx2win32.hh"
|
||||
#include "osx2win32_name.hh"
|
||||
|
||||
#include "osx2xkb.hh"
|
||||
#include "osx2xkb_name.hh"
|
||||
|
||||
#include "html2win32.hh"
|
||||
#include "html2win32_name.hh"
|
||||
|
||||
#include "osx.hh"
|
||||
#include "osx_name.hh"
|
||||
|
||||
int main(int argc, char** argv)
|
||||
{
|
||||
assert(code_map_osx_to_win32[0x1d] == 0x30);
|
||||
assert(strcmp(name_map_osx_to_win32[0x1d], "VK_0") == 0);
|
||||
|
||||
assert(strcmp(code_map_osx_to_xkb[0x1d], "AE10") == 0);
|
||||
assert(strcmp(name_map_osx_to_xkb[0x1d], "AE10") == 0);
|
||||
|
||||
assert(code_map_html_to_win32.at("ControlLeft") == 0x11);
|
||||
assert(strcmp(name_map_html_to_win32.at("ControlLeft"), "VK_CONTROL") == 0);
|
||||
|
||||
assert(code_table_osx[0x1d] == 0x3b);
|
||||
assert(strcmp(name_table_osx[0x1d], "Control") == 0);
|
||||
|
||||
return 0;
|
||||
}
|
|
@ -1,64 +0,0 @@
|
|||
/*
|
||||
* Keycode Map Generator C Tests
|
||||
*
|
||||
* Copyright 2017 Pierre Ossman for Cendio AB
|
||||
*
|
||||
* This file is dual license under the terms of the GPLv2 or later
|
||||
* and 3-clause BSD licenses.
|
||||
*/
|
||||
|
||||
#include <assert.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "osx2win32.h"
|
||||
#include "osx2win32_name.h"
|
||||
|
||||
#include "osx2xkb.h"
|
||||
#include "osx2xkb_name.h"
|
||||
|
||||
#include "html2win32.h"
|
||||
#include "html2win32_name.h"
|
||||
|
||||
#include "osx.h"
|
||||
#include "osx_name.h"
|
||||
|
||||
#define ARRAY_SIZE(a) (sizeof(a)/sizeof(a[0]))
|
||||
|
||||
int main(int argc, char** argv)
|
||||
{
|
||||
unsigned i;
|
||||
|
||||
assert(code_map_osx_to_win32_len == ARRAY_SIZE(code_map_osx_to_win32));
|
||||
assert(code_map_osx_to_win32[0x1d] == 0x30);
|
||||
assert(name_map_osx_to_win32_len == ARRAY_SIZE(name_map_osx_to_win32));
|
||||
assert(strcmp(name_map_osx_to_win32[0x1d], "VK_0") == 0);
|
||||
|
||||
assert(code_map_osx_to_xkb_len == ARRAY_SIZE(code_map_osx_to_xkb));
|
||||
assert(strcmp(code_map_osx_to_xkb[0x1d], "AE10") == 0);
|
||||
assert(name_map_osx_to_xkb_len == ARRAY_SIZE(name_map_osx_to_xkb));
|
||||
assert(strcmp(name_map_osx_to_xkb[0x1d], "AE10") == 0);
|
||||
|
||||
assert(code_map_html_to_win32_len == ARRAY_SIZE(code_map_html_to_win32));
|
||||
for (i = 0;i < code_map_html_to_win32_len;i++) {
|
||||
if (strcmp(code_map_html_to_win32[i].from, "ControlLeft") == 0) {
|
||||
assert(code_map_html_to_win32[i].to == 0x11);
|
||||
break;
|
||||
}
|
||||
}
|
||||
assert(i != code_map_html_to_win32_len);
|
||||
assert(name_map_html_to_win32_len == ARRAY_SIZE(name_map_html_to_win32));
|
||||
for (i = 0;i < name_map_html_to_win32_len;i++) {
|
||||
if (strcmp(name_map_html_to_win32[i].from, "ControlLeft") == 0) {
|
||||
assert(strcmp(name_map_html_to_win32[i].to, "VK_CONTROL") == 0);
|
||||
break;
|
||||
}
|
||||
}
|
||||
assert(i != name_map_html_to_win32_len);
|
||||
|
||||
assert(code_table_osx_len == ARRAY_SIZE(code_table_osx));
|
||||
assert(code_table_osx[0x1d] == 0x3b);
|
||||
assert(name_table_osx_len == ARRAY_SIZE(name_table_osx));
|
||||
assert(strcmp(name_table_osx[0x1d], "Control") == 0);
|
||||
|
||||
return 0;
|
||||
}
|
|
@ -1,30 +0,0 @@
|
|||
# Keycode Map Generator Python Tests
|
||||
#
|
||||
# Copyright 2017 Pierre Ossman for Cendio AB
|
||||
#
|
||||
# This file is dual license under the terms of the GPLv2 or later
|
||||
# and 3-clause BSD licenses.
|
||||
|
||||
import osx2win32
|
||||
import osx2win32_name
|
||||
|
||||
import osx2xkb
|
||||
import osx2xkb_name
|
||||
|
||||
import html2win32
|
||||
import html2win32_name
|
||||
|
||||
import osx
|
||||
import osx_name
|
||||
|
||||
assert osx2win32.code_map_osx_to_win32[0x1d] == 0x30
|
||||
assert osx2win32_name.name_map_osx_to_win32[0x1d] == "VK_0"
|
||||
|
||||
assert osx2xkb.code_map_osx_to_xkb[0x1d] == "AE10"
|
||||
assert osx2xkb_name.name_map_osx_to_xkb[0x1d] == "AE10"
|
||||
|
||||
assert html2win32.code_map_html_to_win32["ControlLeft"] == 0x11
|
||||
assert html2win32_name.name_map_html_to_win32["ControlLeft"] == "VK_CONTROL"
|
||||
|
||||
assert osx.code_table_osx[0x1d] == 0x3b;
|
||||
assert osx_name.name_table_osx[0x1d] == "Control";
|
|
@ -1,20 +0,0 @@
|
|||
argparse is (c) 2006-2009 Steven J. Bethard <steven.bethard@gmail.com>.
|
||||
|
||||
The argparse module was contributed to Python as of Python 2.7 and thus
|
||||
was licensed under the Python license. Same license applies to all files in
|
||||
the argparse package project.
|
||||
|
||||
For details about the Python License, please see doc/Python-License.txt.
|
||||
|
||||
History
|
||||
-------
|
||||
|
||||
Before (and including) argparse 1.1, the argparse package was licensed under
|
||||
Apache License v2.0.
|
||||
|
||||
After argparse 1.1, all project files from the argparse project were deleted
|
||||
due to license compatibility issues between Apache License 2.0 and GNU GPL v2.
|
||||
|
||||
The project repository then had a clean start with some files taken from
|
||||
Python 2.7.1, so definitely all files are under Python License now.
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue