The following changes since commit 8cb41fda78c7ebde0dd248c6afe1d336efb0de50:

Merge remote-tracking branch 'remotes/philmd/tags/machine-20211101' into staging (2021-11-02 05:53:45 -0400)

https://github.com/XanClic/qemu.git tags/pull-block-2021-11-02

for you to fetch changes up to 7da9623cc078229caf07c290e16401ccdb9408d2:

block/vpc: Add a sanity check that fixed-size images have the right type (2021-11-02 12:47:51 +0100)

Emanuele Giuseppe Esposito (1):

pylint: fix errors and warnings generated by tests/qemu-iotests/297

Eric Blake (1):

qemu-img: Consistent docs for convert -F

Thomas Huth (1):

block/vpc: Add a sanity check that fixed-size images have the right

type

Thomas Weißschuh (1):

vmdk: allow specification of tools version

docs/tools/qemu-img.rst | 2 +-

qapi/block-core.json | 3 +++

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

block/vpc.c | 3 ++-

qemu-img-cmds.hx | 2 +-

tests/qemu-iotests/129 | 18 +++++++++---------

tests/qemu-iotests/310 | 16 ++++++++--------

tests/qemu-iotests/check | 11 ++++++-----

tests/qemu-iotests/iotests.py | 7 ++++---

tests/qemu-iotests/tests/image-fleecing | 4 ++--

10 files changed, 56 insertions(+), 34 deletions(-)

2.31.1

From: Eric Blake <eblake@redhat.com>

Use consistent capitalization, and fix a missed line (we duplicate the

qemu-img synopses in too many places).

Fixes: 1899bf4737 (qemu-img: Add -F shorthand to convert)

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

Message-Id: <20210921142812.2631605-1-eblake@redhat.com>

Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

Signed-off-by: Hanna Reitz <hreitz@redhat.com>

docs/tools/qemu-img.rst | 2 +-

qemu-img-cmds.hx | 2 +-

2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/tools/qemu-img.rst b/docs/tools/qemu-img.rst

--- a/docs/tools/qemu-img.rst

+++ b/docs/tools/qemu-img.rst

@@ -XXX,XX +XXX,XX @@ Command description:

4

Error on reading data

-.. option:: convert [--object OBJECTDEF] [--image-opts] [--target-image-opts] [--target-is-zero] [--bitmaps [--skip-broken-bitmaps]] [-U] [-C] [-c] [-p] [-q] [-n] [-f FMT] [-t CACHE] [-T SRC_CACHE] [-O OUTPUT_FMT] [-B BACKING_FILE [-F backing_fmt]] [-o OPTIONS] [-l SNAPSHOT_PARAM] [-S SPARSE_SIZE] [-r RATE_LIMIT] [-m NUM_COROUTINES] [-W] FILENAME [FILENAME2 [...]] OUTPUT_FILENAME

+.. option:: convert [--object OBJECTDEF] [--image-opts] [--target-image-opts] [--target-is-zero] [--bitmaps [--skip-broken-bitmaps]] [-U] [-C] [-c] [-p] [-q] [-n] [-f FMT] [-t CACHE] [-T SRC_CACHE] [-O OUTPUT_FMT] [-B BACKING_FILE [-F BACKING_FMT]] [-o OPTIONS] [-l SNAPSHOT_PARAM] [-S SPARSE_SIZE] [-r RATE_LIMIT] [-m NUM_COROUTINES] [-W] FILENAME [FILENAME2 [...]] OUTPUT_FILENAME

Convert the disk image *FILENAME* or a snapshot *SNAPSHOT_PARAM*

to disk image *OUTPUT_FILENAME* using format *OUTPUT_FMT*. It can

diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx

index XXXXXXX..XXXXXXX 100644

--- a/qemu-img-cmds.hx

+++ b/qemu-img-cmds.hx

@@ -XXX,XX +XXX,XX @@ ERST

DEF("convert", img_convert,

"convert [--object objectdef] [--image-opts] [--target-image-opts] [--target-is-zero] [--bitmaps] [-U] [-C] [-c] [-p] [-q] [-n] [-f fmt] [-t cache] [-T src_cache] [-O output_fmt] [-B backing_file [-F backing_fmt]] [-o options] [-l snapshot_param] [-S sparse_size] [-r rate_limit] [-m num_coroutines] [-W] [--salvage] filename [filename2 [...]] output_filename")

SRST

-.. option:: convert [--object OBJECTDEF] [--image-opts] [--target-image-opts] [--target-is-zero] [--bitmaps] [-U] [-C] [-c] [-p] [-q] [-n] [-f FMT] [-t CACHE] [-T SRC_CACHE] [-O OUTPUT_FMT] [-B BACKING_FILE] [-o OPTIONS] [-l SNAPSHOT_PARAM] [-S SPARSE_SIZE] [-r RATE_LIMIT] [-m NUM_COROUTINES] [-W] [--salvage] FILENAME [FILENAME2 [...]] OUTPUT_FILENAME

+.. option:: convert [--object OBJECTDEF] [--image-opts] [--target-image-opts] [--target-is-zero] [--bitmaps] [-U] [-C] [-c] [-p] [-q] [-n] [-f FMT] [-t CACHE] [-T SRC_CACHE] [-O OUTPUT_FMT] [-B BACKING_FILE [-F BACKING_FMT]] [-o OPTIONS] [-l SNAPSHOT_PARAM] [-S SPARSE_SIZE] [-r RATE_LIMIT] [-m NUM_COROUTINES] [-W] [--salvage] FILENAME [FILENAME2 [...]] OUTPUT_FILENAME

ERST

DEF("create", img_create,

2.31.1

From: Emanuele Giuseppe Esposito <eesposit@redhat.com>

Test 297 in tests/qemu-iotests currently fails: pylint has

learned new things to check, or we simply missed them.

All fixes in this patch are related to additional spaces used

or wrong indentation. No functional change intended.

Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>

Message-Id: <20211008062821.1010967-2-eesposit@redhat.com>

Signed-off-by: Hanna Reitz <hreitz@redhat.com>

tests/qemu-iotests/129 | 18 +++++++++---------

tests/qemu-iotests/310 | 16 ++++++++--------

tests/qemu-iotests/check | 11 ++++++-----

tests/qemu-iotests/iotests.py | 7 ++++---

tests/qemu-iotests/tests/image-fleecing | 4 ++--

5 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/tests/qemu-iotests/129 b/tests/qemu-iotests/129

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/129

+++ b/tests/qemu-iotests/129

@@ -XXX,XX +XXX,XX @@ class TestStopWithBlockJob(iotests.QMPTestCase):

self.do_test_stop("drive-backup", device="drive0",

target=self.target_img, format=iotests.imgfmt,

sync="full",

- x_perf={ 'max-chunk': 65536,

- 'max-workers': 8 })

+ x_perf={'max-chunk': 65536,

+ 'max-workers': 8})

def test_block_commit(self):

# Add overlay above the source node so that we actually use a

@@ -XXX,XX +XXX,XX @@ class TestStopWithBlockJob(iotests.QMPTestCase):

'1G')

result = self.vm.qmp('blockdev-add', **{

- 'node-name': 'overlay',

- 'driver': iotests.imgfmt,

- 'file': {

- 'driver': 'file',

- 'filename': self.overlay_img

- }

- })

+ 'node-name': 'overlay',

+ 'driver': iotests.imgfmt,

+ 'file': {

+ 'driver': 'file',

+ 'filename': self.overlay_img

+ }

+ })

self.assert_qmp(result, 'return', {})

result = self.vm.qmp('blockdev-snapshot',

diff --git a/tests/qemu-iotests/310 b/tests/qemu-iotests/310

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/310

+++ b/tests/qemu-iotests/310

@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('base.img') as base_img_path, \

assert qemu_io_silent(base_img_path, '-c', 'write -P 1 3M 1M') == 0

assert qemu_img('create', '-f', iotests.imgfmt, '-b', base_img_path,

'-F', iotests.imgfmt, mid_img_path) == 0

- assert qemu_io_silent(mid_img_path, '-c', 'write -P 3 2M 1M') == 0

- assert qemu_io_silent(mid_img_path, '-c', 'write -P 3 4M 1M') == 0

+ assert qemu_io_silent(mid_img_path, '-c', 'write -P 3 2M 1M') == 0

+ assert qemu_io_silent(mid_img_path, '-c', 'write -P 3 4M 1M') == 0

assert qemu_img('create', '-f', iotests.imgfmt, '-b', mid_img_path,

'-F', iotests.imgfmt, top_img_path) == 0

- assert qemu_io_silent(top_img_path, '-c', 'write -P 2 1M 1M') == 0

+ assert qemu_io_silent(top_img_path, '-c', 'write -P 2 1M 1M') == 0

# 0 1 2 3 4

# top 2

@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('base.img') as base_img_path, \

assert qemu_img('rebase', '-u', '-b', '', '-f', iotests.imgfmt,

top_img_path) == 0

- assert qemu_io_silent(top_img_path, '-c', 'read -P 0 0 1M') == 0

- assert qemu_io_silent(top_img_path, '-c', 'read -P 2 1M 1M') == 0

- assert qemu_io_silent(top_img_path, '-c', 'read -P 3 2M 1M') == 0

- assert qemu_io_silent(top_img_path, '-c', 'read -P 0 3M 1M') == 0

- assert qemu_io_silent(top_img_path, '-c', 'read -P 3 4M 1M') == 0

+ assert qemu_io_silent(top_img_path, '-c', 'read -P 0 0 1M') == 0

+ assert qemu_io_silent(top_img_path, '-c', 'read -P 2 1M 1M') == 0

+ assert qemu_io_silent(top_img_path, '-c', 'read -P 3 2M 1M') == 0

+ assert qemu_io_silent(top_img_path, '-c', 'read -P 0 3M 1M') == 0

+ assert qemu_io_silent(top_img_path, '-c', 'read -P 3 4M 1M') == 0

log('Done')

diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/check

+++ b/tests/qemu-iotests/check

@@ -XXX,XX +XXX,XX @@ def make_argparser() -> argparse.ArgumentParser:

p.add_argument('-d', dest='debug', action='store_true', help='debug')

p.add_argument('-p', dest='print', action='store_true',

- help='redirects qemu\'s stdout and stderr to the test output')

+ help='redirects qemu\'s stdout and stderr to '

+ 'the test output')

p.add_argument('-gdb', action='store_true',

- help="start gdbserver with $GDB_OPTIONS options \

- ('localhost:12345' if $GDB_OPTIONS is empty)")

+ help="start gdbserver with $GDB_OPTIONS options "

+ "('localhost:12345' if $GDB_OPTIONS is empty)")

p.add_argument('-valgrind', action='store_true',

- help='use valgrind, sets VALGRIND_QEMU environment '

- 'variable')

+ help='use valgrind, sets VALGRIND_QEMU environment '

+ 'variable')

p.add_argument('-misalign', action='store_true',

help='misalign memory allocations')

diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py

--- a/tests/qemu-iotests/iotests.py

+++ b/tests/qemu-iotests/iotests.py

@@ -XXX,XX +XXX,XX @@ def _post_shutdown(self) -> None:

super()._post_shutdown()

if not qemu_valgrind or not self._popen:

return

- valgrind_filename = f"{test_dir}/{self._popen.pid}.valgrind"

+ valgrind_filename = f"{test_dir}/{self._popen.pid}.valgrind"

if self.exitcode() == 99:

with open(valgrind_filename, encoding='utf-8') as f:

print(f.read())

@@ -XXX,XX +XXX,XX @@ def write(self, arg=None):

class ReproducibleTestRunner(unittest.TextTestRunner):

def __init__(self, stream: Optional[TextIO] = None,

- resultclass: Type[unittest.TestResult] = ReproducibleTestResult,

- **kwargs: Any) -> None:

+ resultclass: Type[unittest.TestResult] =

+ ReproducibleTestResult,

+ **kwargs: Any) -> None:

rstream = ReproducibleStreamWrapper(stream or sys.stdout)

super().__init__(stream=rstream, # type: ignore

descriptions=True,

diff --git a/tests/qemu-iotests/tests/image-fleecing b/tests/qemu-iotests/tests/image-fleecing

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/tests/image-fleecing

+++ b/tests/qemu-iotests/tests/image-fleecing

@@ -XXX,XX +XXX,XX @@ def do_test(use_cbw, base_img_path, fleece_img_path, nbd_sock_path, vm):

nbd_uri = 'nbd+unix:///%s?socket=%s' % (tmp_node, nbd_sock_path)

log(vm.qmp('nbd-server-start',

- {'addr': { 'type': 'unix',

- 'data': { 'path': nbd_sock_path } } }))

+ {'addr': {'type': 'unix',

+ 'data': {'path': nbd_sock_path}}}))

log(vm.qmp('nbd-server-add', device=tmp_node))

2.31.1

From: Thomas Weißschuh <thomas.weissschuh.ext@zeiss.com>

VMDK files support an attribute that represents the version of the guest

tools that are installed on the disk.

This attribute is used by vSphere before a machine has been started to

determine if the VM has the guest tools installed.

This is important when configuring "Operating system customizations" in

vSphere, as it checks for the presence of the guest tools before

allowing those customizations.

Thus when the VM has not yet booted normally it would be impossible to

customize it, therefore preventing a customized first-boot.

The attribute should not hurt on disks that do not have the guest tools

installed and indeed the VMware tools also unconditionally add this

attribute.

(Defaulting to the value "2147483647", as is done in this patch)

Signed-off-by: Thomas Weißschuh <thomas.weissschuh.ext@zeiss.com>

Message-Id: <20210913130419.13241-1-thomas.weissschuh.ext@zeiss.com>

[hreitz: Added missing '#' in block-core.json]

Signed-off-by: Hanna Reitz <hreitz@redhat.com>

qapi/block-core.json | 3 +++

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

2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/qapi/block-core.json b/qapi/block-core.json

--- a/qapi/block-core.json

+++ b/qapi/block-core.json

@@ -XXX,XX +XXX,XX @@

# @adapter-type: The adapter type used to fill in the descriptor. Default: ide.

# @hwversion: Hardware version. The meaningful options are "4" or "6".

# Default: "4".

+# @toolsversion: VMware guest tools version.

+# Default: "2147483647" (Since 6.2)

# @zeroed-grain: Whether to enable zeroed-grain feature for sparse subformats.

# Default: false.

#

@@ -XXX,XX +XXX,XX @@

'*backing-file': 'str',

'*adapter-type': 'BlockdevVmdkAdapterType',

'*hwversion': 'str',

+ '*toolsversion': 'str',

'*zeroed-grain': 'bool' } }

diff --git a/block/vmdk.c b/block/vmdk.c

index XXXXXXX..XXXXXXX 100644

--- a/block/vmdk.c

+++ b/block/vmdk.c

@@ -XXX,XX +XXX,XX @@

#define VMDK_ZEROED (-3)

#define BLOCK_OPT_ZEROED_GRAIN "zeroed_grain"

+#define BLOCK_OPT_TOOLSVERSION "toolsversion"

typedef struct {

uint32_t version;

@@ -XXX,XX +XXX,XX @@ static int coroutine_fn vmdk_co_do_create(int64_t size,

BlockdevVmdkAdapterType adapter_type,

const char *backing_file,

const char *hw_version,

+ const char *toolsversion,

bool compat6,

bool zeroed_grain,

vmdk_create_extent_fn extent_fn,

@@ -XXX,XX +XXX,XX @@ static int coroutine_fn vmdk_co_do_create(int64_t size,

"ddb.geometry.cylinders = \"%" PRId64 "\"\n"

"ddb.geometry.heads = \"%" PRIu32 "\"\n"

"ddb.geometry.sectors = \"63\"\n"

- "ddb.adapterType = \"%s\"\n";

+ "ddb.adapterType = \"%s\"\n"

+ "ddb.toolsVersion = \"%s\"\n";

ext_desc_lines = g_string_new(NULL);

@@ -XXX,XX +XXX,XX @@ static int coroutine_fn vmdk_co_do_create(int64_t size,

if (!hw_version) {

hw_version = "4";

}

+ if (!toolsversion) {

+ toolsversion = "2147483647";

if (adapter_type != BLOCKDEV_VMDK_ADAPTER_TYPE_IDE) {

/* that's the number of heads with which vmware operates when

@@ -XXX,XX +XXX,XX @@ static int coroutine_fn vmdk_co_do_create(int64_t size,

size /

(int64_t)(63 * number_heads * BDRV_SECTOR_SIZE),

number_heads,

- BlockdevVmdkAdapterType_str(adapter_type));

+ BlockdevVmdkAdapterType_str(adapter_type),

+ toolsversion);

desc_len = strlen(desc);

/* the descriptor offset = 0x200 */

if (!split && !flat) {

@@ -XXX,XX +XXX,XX @@ static int coroutine_fn vmdk_co_create_opts(BlockDriver *drv,

BlockdevVmdkAdapterType adapter_type_enum;

char *backing_file = NULL;

char *hw_version = NULL;

+ char *toolsversion = NULL;

char *fmt = NULL;

BlockdevVmdkSubformat subformat;

int ret = 0;

@@ -XXX,XX +XXX,XX @@ static int coroutine_fn vmdk_co_create_opts(BlockDriver *drv,

adapter_type = qemu_opt_get_del(opts, BLOCK_OPT_ADAPTER_TYPE);

backing_file = qemu_opt_get_del(opts, BLOCK_OPT_BACKING_FILE);

hw_version = qemu_opt_get_del(opts, BLOCK_OPT_HWVERSION);

+ toolsversion = qemu_opt_get_del(opts, BLOCK_OPT_TOOLSVERSION);

compat6 = qemu_opt_get_bool_del(opts, BLOCK_OPT_COMPAT6, false);

if (strcmp(hw_version, "undefined") == 0) {

g_free(hw_version);

@@ -XXX,XX +XXX,XX @@ static int coroutine_fn vmdk_co_create_opts(BlockDriver *drv,

.opts = opts,

};

ret = vmdk_co_do_create(total_size, subformat, adapter_type_enum,

- backing_file, hw_version, compat6, zeroed_grain,

- vmdk_co_create_opts_cb, &data, errp);

+ backing_file, hw_version, toolsversion, compat6,

+ zeroed_grain, vmdk_co_create_opts_cb, &data, errp);

exit:

g_free(backing_fmt);

g_free(adapter_type);

g_free(backing_file);

g_free(hw_version);

+ g_free(toolsversion);

g_free(fmt);

g_free(desc);

g_free(path);

@@ -XXX,XX +XXX,XX @@ static int coroutine_fn vmdk_co_create(BlockdevCreateOptions *create_options,

opts->adapter_type,

opts->backing_file,

opts->hwversion,

+ opts->toolsversion,

false,

opts->zeroed_grain,

vmdk_co_create_cb,

@@ -XXX,XX +XXX,XX @@ static QemuOptsList vmdk_create_opts = {

.help = "VMDK hardware version",

.def_value_str = "undefined"

},

+ {

+ .name = BLOCK_OPT_TOOLSVERSION,

+ .type = QEMU_OPT_STRING,

+ .help = "VMware guest tools version",

+ },

{

.name = BLOCK_OPT_SUBFMT,

.type = QEMU_OPT_STRING,

2.31.1

From: Thomas Huth <thuth@redhat.com>

The code in vpc.c uses BDRVVPCState->footer.type in various places

to decide whether the image is a fixed-size (VHD_FIXED) or a dynamic

(VHD_DYNAMIC) image. However, we never check that this field really

contains VHD_FIXED if we detected a fixed size image in vpc_open(),

so a wrong value here could cause quite some trouble during runtime.

Suggested-by: Kevin Wolf <kwolf@redhat.com>

Signed-off-by: Thomas Huth <thuth@redhat.com>

Message-Id: <20211012082702.792259-1-thuth@redhat.com>

Signed-off-by: Hanna Reitz <hreitz@redhat.com>

---

block/vpc.c | 3 ++-

1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/block/vpc.c b/block/vpc.c

--- a/block/vpc.c

+++ b/block/vpc.c

@@ -XXX,XX +XXX,XX @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags,

if (ret < 0) {

goto fail;

}

- if (strncmp(footer->creator, "conectix", 8)) {

+ if (strncmp(footer->creator, "conectix", 8) ||

+ be32_to_cpu(footer->type) != VHD_FIXED) {

error_setg(errp, "invalid VPC image");

ret = -EINVAL;

goto fail;

2.31.1