bf251437e9
Many changes were necessary this time around:
* QAPI was changed to avoid redundant has_* variables, see commit
44ea9d9be3 ("qapi: Start to elide redundant has_FOO in generated C")
for details. This affected many QMP commands added by Proxmox too.
* Pending querying for migration got split into two functions, one to
estimate, one for exact value, see commit c8df4a7aef ("migration:
Split save_live_pending() into state_pending_*") for details. Relevant
for savevm-async and PBS dirty bitmap.
* Some block (driver) functions got converted to coroutines, so the
Proxmox block drivers needed to be adapted.
* Alloc track auto-detaching during PBS live restore got broken by
AioContext-related changes resulting in a deadlock. The current, hacky
method was replaced by a simpler one. Stefan apparently ran into a
problem with that when he wrote the driver, but there were
improvements in the stream job code since then and I didn't manage to
reproduce the issue. It's a separate patch "alloc-track: fix deadlock
during drop" for now, you can find the details there.
* Async snapshot-related changes:
- The pending querying got adapted to the above-mentioned split and
a patch is added to optimize it/make it more similar to what
upstream code does.
- Added initialization of the compression counters (for
future-proofing).
- It's necessary the hold the BQL (big QEMU lock = iothread mutex)
during the setup phase, because block layer functions are used there
and not doing so leads to racy, hard-to-debug crashes or hangs. It's
necessary to change some upstream code too for this, a version of
the patch "migration: for snapshots, hold the BQL during setup
callbacks" is intended to be upstreamed.
- Need to take the bdrv graph read lock before flushing.
* hmp_info_balloon was moved to a different file.
* Needed to include a new headers from time to time to still get the
correct functions.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
103 lines
3.1 KiB
Diff
103 lines
3.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
|
|
Date: Mon, 6 Apr 2020 12:16:41 +0200
|
|
Subject: [PATCH] PVE: [Up] qemu-img dd: add isize parameter
|
|
|
|
for writing small images from stdin to bigger ones
|
|
|
|
In order to distinguish between an actually unexpected and
|
|
an expected end of input.
|
|
|
|
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
|
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
|
---
|
|
qemu-img.c | 28 +++++++++++++++++++++++++---
|
|
1 file changed, 25 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/qemu-img.c b/qemu-img.c
|
|
index c584de648c..a57ceeddfe 100644
|
|
--- a/qemu-img.c
|
|
+++ b/qemu-img.c
|
|
@@ -4886,11 +4886,13 @@ static int img_bitmap(int argc, char **argv)
|
|
#define C_OF 010
|
|
#define C_SKIP 020
|
|
#define C_OSIZE 040
|
|
+#define C_ISIZE 0100
|
|
|
|
struct DdInfo {
|
|
unsigned int flags;
|
|
int64_t count;
|
|
int64_t osize;
|
|
+ int64_t isize;
|
|
};
|
|
|
|
struct DdIo {
|
|
@@ -4979,6 +4981,19 @@ static int img_dd_osize(const char *arg,
|
|
return 0;
|
|
}
|
|
|
|
+static int img_dd_isize(const char *arg,
|
|
+ struct DdIo *in, struct DdIo *out,
|
|
+ struct DdInfo *dd)
|
|
+{
|
|
+ dd->isize = cvtnum("size", arg);
|
|
+
|
|
+ if (dd->isize < 0) {
|
|
+ return 1;
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
static int img_dd(int argc, char **argv)
|
|
{
|
|
int ret = 0;
|
|
@@ -4993,12 +5008,14 @@ static int img_dd(int argc, char **argv)
|
|
int c, i;
|
|
const char *out_fmt = "raw";
|
|
const char *fmt = NULL;
|
|
- int64_t size = 0;
|
|
+ int64_t size = 0, readsize = 0;
|
|
int64_t out_pos, in_pos;
|
|
bool force_share = false;
|
|
struct DdInfo dd = {
|
|
.flags = 0,
|
|
.count = 0,
|
|
+ .osize = 0,
|
|
+ .isize = -1,
|
|
};
|
|
struct DdIo in = {
|
|
.bsz = 512, /* Block size is by default 512 bytes */
|
|
@@ -5020,6 +5037,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 },
|
|
+ { "isize", img_dd_isize, C_ISIZE },
|
|
{ NULL, NULL, 0 }
|
|
};
|
|
const struct option long_options[] = {
|
|
@@ -5216,9 +5234,10 @@ static int img_dd(int argc, char **argv)
|
|
|
|
in.buf = g_new(uint8_t, in.bsz);
|
|
|
|
- for (out_pos = 0; in_pos < size; ) {
|
|
+ readsize = (dd.isize > 0) ? dd.isize : size;
|
|
+ for (out_pos = 0; in_pos < readsize; ) {
|
|
int in_ret, out_ret;
|
|
- int bytes = (in_pos + in.bsz > size) ? size - in_pos : in.bsz;
|
|
+ int bytes = (in_pos + in.bsz > readsize) ? readsize - in_pos : in.bsz;
|
|
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)
|
|
} else {
|
|
in_ret = read(STDIN_FILENO, in.buf, bytes);
|
|
if (in_ret == 0) {
|
|
+ if (dd.isize == 0) {
|
|
+ goto out;
|
|
+ }
|
|
/* early EOF is considered an error */
|
|
error_report("Input ended unexpectedly");
|
|
ret = -1;
|