The following changes since commit 23919ddfd56135cad3cb468a8f54d5a595f024f4:

Merge remote-tracking branch 'remotes/aperard/tags/pull-xen-20190827' into staging (2019-08-27 15:52:36 +0100)

https://github.com/XanClic/qemu.git tags/pull-block-2019-08-27

for you to fetch changes up to bb043c056cffcc2f3ce88bfdaf2e76e455c09e2c:

iotests: Unify cache mode quoting (2019-08-27 19:48:44 +0200)

- qemu-io now accepts a file to read a write pattern from

- Ensure that raw files have their first block allocated so we can probe

the O_DIRECT alignment if necessary

Denis Plotnikov (1):

qemu-io: add pattern file for write command

Max Reitz (7):

iotests: Fix _filter_img_create()

vmdk: Use bdrv_dirname() for relative extent paths

iotests: Keep testing broken relative extent paths

vmdk: Reject invalid compressed writes

iotests: Disable broken streamOptimized tests

iotests: Disable 110 for vmdk.twoGbMaxExtentSparse

iotests: Disable 126 for flat vmdk subformats

Nir Soffer (3):

block: posix: Always allocate the first block

iotests: Test allocate_first_block() with O_DIRECT

iotests: Unify cache mode quoting

Stefan Hajnoczi (1):

file-posix: fix request_alignment typo

Thomas Huth (2):

iotests: Check for enabled drivers before testing them

tests/check-block: Skip iotests when sanitizers are enabled

block: fix permission update in bdrv_replace_node

block.c | 5 +-

block/file-posix.c | 53 +++++++++-

block/vmdk.c | 64 ++++++++----

qemu-io-cmds.c | 99 +++++++++++++++++--

tests/check-block.sh | 5 +

tests/qemu-iotests/002 | 1 +

tests/qemu-iotests/003 | 1 +

tests/qemu-iotests/005 | 3 +-

tests/qemu-iotests/009 | 1 +

tests/qemu-iotests/010 | 1 +

tests/qemu-iotests/011 | 1 +

tests/qemu-iotests/017 | 3 +-

tests/qemu-iotests/018 | 3 +-

tests/qemu-iotests/019 | 3 +-

tests/qemu-iotests/020 | 3 +-

tests/qemu-iotests/026 | 4 +-

tests/qemu-iotests/027 | 1 +

tests/qemu-iotests/032 | 1 +

tests/qemu-iotests/033 | 1 +

tests/qemu-iotests/034 | 3 +-

tests/qemu-iotests/037 | 3 +-

tests/qemu-iotests/039 | 4 +-

tests/qemu-iotests/052 | 2 +-

tests/qemu-iotests/059 | 34 ++++++-

tests/qemu-iotests/059.out | 26 +++--

tests/qemu-iotests/063 | 3 +-

tests/qemu-iotests/071 | 1 +

tests/qemu-iotests/072 | 1 +

tests/qemu-iotests/081 | 4 +-

tests/qemu-iotests/091 | 4 +-

tests/qemu-iotests/099 | 1 +

tests/qemu-iotests/105 | 3 +-

tests/qemu-iotests/110 | 3 +-

tests/qemu-iotests/120 | 1 +

tests/qemu-iotests/126 | 2 +

tests/qemu-iotests/{150.out => 150.out.qcow2} | 0

tests/qemu-iotests/150.out.raw | 12 +++

tests/qemu-iotests/162 | 4 +-

tests/qemu-iotests/175 | 47 +++++++--

tests/qemu-iotests/175.out | 16 ++-

tests/qemu-iotests/178.out.qcow2 | 4 +-

tests/qemu-iotests/184 | 1 +

tests/qemu-iotests/186 | 1 +

tests/qemu-iotests/197 | 1 +

tests/qemu-iotests/215 | 1 +

tests/qemu-iotests/221.out | 12 ++-

tests/qemu-iotests/251 | 1 +

tests/qemu-iotests/253.out | 12 ++-

tests/qemu-iotests/common.filter | 4 +-

tests/qemu-iotests/common.rc | 14 +++

50 files changed, 391 insertions(+), 87 deletions(-)

rename tests/qemu-iotests/{150.out => 150.out.qcow2} (100%)

create mode 100644 tests/qemu-iotests/150.out.raw

From: Denis Plotnikov <dplotnikov@virtuozzo.com>

The patch allows to provide a pattern file for write

command. There was no similar ability before.

Signed-off-by: Denis Plotnikov <dplotnikov@virtuozzo.com>

Message-id: 20190820164616.4072-1-dplotnikov@virtuozzo.com

Reviewed-by: Eric Blake <eblake@redhat.com>

[mreitz: Keep optstring in alphabetical order]

qemu-io-cmds.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++---

1 file changed, 93 insertions(+), 6 deletions(-)

diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c

--- a/qemu-io-cmds.c

+++ b/qemu-io-cmds.c

@@ -XXX,XX +XXX,XX @@ static void qemu_io_free(void *p)

qemu_vfree(p);

+/*

+ * qemu_io_alloc_from_file()

+ *

+ * Allocates the buffer and populates it with the content of the given file

+ * up to @len bytes. If the file length is less than @len, then the buffer

+ * is populated with the file content cyclically.

+ *

+ * @blk - the block backend where the buffer content is going to be written to

+ * @len - the buffer length

+ * @file_name - the file to read the content from

+ *

+ * Returns: the buffer pointer on success

+ * NULL on error

+ */

+static void *qemu_io_alloc_from_file(BlockBackend *blk, size_t len,

+ const char *file_name)

+{

+ char *buf, *buf_origin;

+ FILE *f = fopen(file_name, "r");

+ int pattern_len;

+ if (!f) {

+ perror(file_name);

+ return NULL;

+ if (qemuio_misalign) {

+ len += MISALIGN_OFFSET;

+ buf_origin = buf = blk_blockalign(blk, len);

+

+ if (qemuio_misalign) {

+ buf_origin += MISALIGN_OFFSET;

+ buf += MISALIGN_OFFSET;

+ len -= MISALIGN_OFFSET;

+ pattern_len = fread(buf_origin, 1, len, f);

+

+ if (ferror(f)) {

+ perror(file_name);

+ goto error;

+ if (pattern_len == 0) {

+ fprintf(stderr, "%s: file is empty\n", file_name);

+ goto error;

+ }

+

+ fclose(f);

+

+ if (len > pattern_len) {

+ len -= pattern_len;

+ buf += pattern_len;

+

+ while (len > 0) {

+ size_t len_to_copy = MIN(pattern_len, len);

+

+ memcpy(buf, buf_origin, len_to_copy);

+

+ len -= len_to_copy;

+ buf += len_to_copy;

+ return buf_origin;

+error:

+ qemu_io_free(buf_origin);

+ return NULL;

+}

static void dump_buffer(const void *buffer, int64_t offset, int64_t len)

{

uint64_t i;

@@ -XXX,XX +XXX,XX @@ static void write_help(void)

" -n, -- with -z, don't allow slow fallback\n"

" -p, -- ignored for backwards compatibility\n"

" -P, -- use different pattern to fill file\n"

+" -s, -- use a pattern file to fill the write buffer\n"

" -C, -- report statistics in a machine parsable format\n"

" -q, -- quiet mode, do not show I/O statistics\n"

" -u, -- with -z, allow unmapping\n"

@@ -XXX,XX +XXX,XX @@ static const cmdinfo_t write_cmd = {

.perm = BLK_PERM_WRITE,

.argmin = 2,

.argmax = -1,

- .args = "[-bcCfnquz] [-P pattern] off len",

+ .args = "[-bcCfnquz] [-P pattern | -s source_file] off len",

.oneline = "writes a number of bytes at a specified offset",

.help = write_help,

};

@@ -XXX,XX +XXX,XX @@ static int write_f(BlockBackend *blk, int argc, char **argv)

{

struct timespec t1, t2;

bool Cflag = false, qflag = false, bflag = false;

- bool Pflag = false, zflag = false, cflag = false;

+ bool Pflag = false, zflag = false, cflag = false, sflag = false;

int flags = 0;

int c, cnt, ret;

char *buf = NULL;

@@ -XXX,XX +XXX,XX @@ static int write_f(BlockBackend *blk, int argc, char **argv)

/* Some compilers get confused and warn if this is not initialized. */

int64_t total = 0;

int pattern = 0xcd;

+ const char *file_name = NULL;

- while ((c = getopt(argc, argv, "bcCfnpP:quz")) != -1) {

+ while ((c = getopt(argc, argv, "bcCfnpP:qs:uz")) != -1) {

switch (c) {

case 'b':

bflag = true;

@@ -XXX,XX +XXX,XX @@ static int write_f(BlockBackend *blk, int argc, char **argv)

case 'q':

qflag = true;

break;

+ case 's':

+ sflag = true;

+ file_name = optarg;

+ break;

case 'u':

flags |= BDRV_REQ_MAY_UNMAP;

break;

@@ -XXX,XX +XXX,XX @@ static int write_f(BlockBackend *blk, int argc, char **argv)

- if (zflag && Pflag) {

- printf("-z and -P cannot be specified at the same time\n");

+ if (zflag + Pflag + sflag > 1) {

+ printf("Only one of -z, -P, and -s "

+ "can be specified at the same time\n");

return -EINVAL;

@@ -XXX,XX +XXX,XX @@ static int write_f(BlockBackend *blk, int argc, char **argv)

if (!zflag) {

- buf = qemu_io_alloc(blk, count, pattern);

+ if (sflag) {

+ buf = qemu_io_alloc_from_file(blk, count, file_name);

+ if (!buf) {

+ return -EINVAL;

+ }

+ } else {

+ buf = qemu_io_alloc(blk, count, pattern);