d03e1b3ce3
User-facing breaking change:
The slirp submodule for user networking got removed. It would be
necessary to add the --enable-slirp option to the build and/or install
the appropriate library to continue building it. Since PVE is not
explicitly supporting it, it would require additionally installing the
libslirp0 package on all installations and there is *very* little
mention on the community forum when searching for "slirp" or
"netdev user", the plan is to only enable it again if there is some
real demand for it.
Notable changes:
* The big change for this release is the rework of job locking, using
a job mutex and introducing _locked() variants of job API functions
moving away from call-side AioContext locking. See (in the qemu
submodule) commit 6f592e5aca ("job.c: enable job lock/unlock and
remove Aiocontext locks") and previous commits for context.
Changes required for the backup patches:
* Use WITH_JOB_LOCK_GUARD() and call the _locked() variant of job
API functions where appropriate (many are only availalbe as
a _locked() variant).
* Remove acquiring/releasing AioContext around functions taking the
job mutex lock internally.
The patch introducing sequential transaction support for jobs needs
to temporarily unlock the job mutex to call job_start() when
starting the next job in the transaction.
* The zeroinit block driver now marks its child as primary.
The documentation in include/block/block-common.h states:
> Filter node has exactly one FILTERED|PRIMARY child, and may have
> other children which must not have these bits
Without this, an assert will trigger when copying to a zeroinit target
with qemu-img convert, because bdrv_child_cb_attach() expects any
non-PRIMARY child to be not FILTERED:
> qemu-img convert -n -p -f raw -O raw input.raw zeroinit:output.raw
> qemu-img: ../block.c:1476: bdrv_child_cb_attach: Assertion
> `!(child->role & BDRV_CHILD_FILTERED)' failed.
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 221b9d6a16..c1306385a8 100644
|
|
--- a/qemu-img.c
|
|
+++ b/qemu-img.c
|
|
@@ -4830,11 +4830,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 {
|
|
@@ -4923,6 +4925,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;
|
|
@@ -4937,12 +4952,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 */
|
|
@@ -4964,6 +4981,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[] = {
|
|
@@ -5160,9 +5178,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) {
|
|
@@ -5171,6 +5190,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;
|