405ca57e69
- Include upstream patches targeted for the next stable release (bug fixes only) audio-oss-fix-buffer-pos-calculation.patch blkdebug-Allow-taking-unsharing-permissi.patch block-Add-bdrv_qapi_perm_to_blk_perm.patch block-backup-top-fix-failure-path.patch block-block-copy-fix-progress-calculatio.patch block-fix-crash-on-zero-length-unaligned.patch block-fix-memleaks-in-bdrv_refresh_filen.patch block-Fix-VM-size-field-width-in-snapsho.patch block-nbd-extract-the-common-cleanup-cod.patch block-nbd-fix-memory-leak-in-nbd_open.patch block-qcow2-threads-fix-qcow2_decompress.patch hw-arm-cubieboard-use-ARM-Cortex-A8-as-t.patch hw-intc-arm_gicv3_kvm-Stop-wrongly-progr.patch iotests-add-test-for-backup-top-failure-.patch iotests-Fix-nonportable-use-of-od-endian.patch job-refactor-progress-to-separate-object.patch target-arm-Correct-definition-of-PMCRDP.patch target-arm-fix-TCG-leak-for-fcvt-half-do.patch tpm-ppi-page-align-PPI-RAM.patch vhost-user-blk-delete-virtioqueues-in-un.patch virtio-add-ability-to-delete-vq-through-.patch virtio-crypto-do-delete-ctrl_vq-in-virti.patch virtio-pmem-do-delete-rq_vq-in-virtio_pm.patch - Add Obsoletes directive for qemu-audio-sdl and qemu-ui-sdl since for a qemu package upgrade from SLE12-SP5, support for SDL is dropped OBS-URL: https://build.opensuse.org/request/show/784401 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=534
51 lines
2.0 KiB
Diff
51 lines
2.0 KiB
Diff
From: Max Reitz <mreitz@redhat.com>
|
|
Date: Fri, 17 Jan 2020 11:58:58 +0100
|
|
Subject: block: Fix VM size field width in snapshot dump
|
|
|
|
Git-commit: 804359b8b90f76d9d8fbe8d85a6544b68f107f10
|
|
|
|
When printing the snapshot list (e.g. with qemu-img snapshot -l), the VM
|
|
size field is only seven characters wide. As of de38b5005e9, this is
|
|
not necessarily sufficient: We generally print three digits, and this
|
|
may require a decimal point. Also, the unit field grew from something
|
|
as plain as "M" to " MiB". This means that number and unit may take up
|
|
eight characters in total; but we also want spaces in front.
|
|
|
|
Considering previously the maximum width was four characters and the
|
|
field width was chosen to be three characters wider, let us adjust the
|
|
field width to be eleven now.
|
|
|
|
Fixes: de38b5005e946aa3714963ea4c501e279e7d3666
|
|
Buglink: https://bugs.launchpad.net/qemu/+bug/1859989
|
|
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
Message-Id: <20200117105859.241818-2-mreitz@redhat.com>
|
|
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
block/qapi.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/block/qapi.c b/block/qapi.c
|
|
index 9a5d0c9b27d85d77f3c6d49dcd0e..ffa539250dc8f0d01374517e8e5b 100644
|
|
--- a/block/qapi.c
|
|
+++ b/block/qapi.c
|
|
@@ -657,7 +657,7 @@ void bdrv_snapshot_dump(QEMUSnapshotInfo *sn)
|
|
char *sizing = NULL;
|
|
|
|
if (!sn) {
|
|
- qemu_printf("%-10s%-20s%7s%20s%15s",
|
|
+ qemu_printf("%-10s%-20s%11s%20s%15s",
|
|
"ID", "TAG", "VM SIZE", "DATE", "VM CLOCK");
|
|
} else {
|
|
ti = sn->date_sec;
|
|
@@ -672,7 +672,7 @@ void bdrv_snapshot_dump(QEMUSnapshotInfo *sn)
|
|
(int)(secs % 60),
|
|
(int)((sn->vm_clock_nsec / 1000000) % 1000));
|
|
sizing = size_to_str(sn->vm_state_size);
|
|
- qemu_printf("%-10s%-20s%7s%20s%15s",
|
|
+ qemu_printf("%-10s%-20s%11s%20s%15s",
|
|
sn->id_str, sn->name,
|
|
sizing,
|
|
date_buf,
|