2019-11-08 11:46:03 +03:00
|
|
|
QA output created by 273
|
|
|
|
|
Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=67108864
|
iotests: Specify explicit backing format where sensible
There are many existing qcow2 images that specify a backing file but
no format. This has been the source of CVEs in the past, but has
become more prominent of a problem now that libvirt has switched to
-blockdev. With older -drive, at least the probing was always done by
qemu (so the only risk of a changed format between successive boots of
a guest was if qemu was upgraded and probed differently). But with
newer -blockdev, libvirt must specify a format; if libvirt guesses raw
where the image was formatted, this results in data corruption visible
to the guest; conversely, if libvirt guesses qcow2 where qemu was
using raw, this can result in potential security holes, so modern
libvirt instead refuses to use images without explicit backing format.
The change in libvirt to reject images without explicit backing format
has pointed out that a number of tools have been far too reliant on
probing in the past. It's time to set a better example in our own
iotests of properly setting this parameter.
iotest calls to create, rebase, and convert are all impacted to some
degree. It's a bit annoying that we are inconsistent on command line
- while all of those accept -o backing_file=...,backing_fmt=..., the
shortcuts are different: create and rebase have -b and -F, while
convert has -B but no -F. (amend has no shortcuts, but the previous
patch just deprecated the use of amend to change backing chains).
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200706203954.341758-9-eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2020-07-06 23:39:52 +03:00
|
|
|
Formatting 'TEST_DIR/t.IMGFMT.mid', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t.IMGFMT.base backing_fmt=IMGFMT
|
|
|
|
|
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t.IMGFMT.mid backing_fmt=IMGFMT
|
2019-11-08 11:46:03 +03:00
|
|
|
Testing: -blockdev file,node-name=base,filename=TEST_DIR/t.IMGFMT.base -blockdev file,node-name=midf,filename=TEST_DIR/t.IMGFMT.mid -blockdev {"driver":"IMGFMT","node-name":"mid","file":"midf","backing":null} -blockdev file,node-name=topf,filename=TEST_DIR/t.IMGFMT -blockdev {"driver":"IMGFMT","file":"topf","node-name":"top","backing":null}
|
|
|
|
|
{
|
|
|
|
|
QMP_VERSION
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
"return": {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
"return": {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
"return": {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
"return": [
|
|
|
|
|
{
|
|
|
|
|
"iops_rd": 0,
|
|
|
|
|
"detect_zeroes": "off",
|
|
|
|
|
"image": {
|
|
|
|
|
"backing-image": {
|
|
|
|
|
"backing-image": {
|
|
|
|
|
"virtual-size": 197120,
|
|
|
|
|
"filename": "TEST_DIR/t.IMGFMT.base",
|
|
|
|
|
"format": "file",
|
|
|
|
|
"actual-size": SIZE,
|
|
|
|
|
"dirty-flag": false
|
|
|
|
|
},
|
block: Leave BDS.backing_{file,format} constant
Parts of the block layer treat BDS.backing_file as if it were whatever
the image header says (i.e., if it is a relative path, it is relative to
the overlay), other parts treat it like a cache for
bs->backing->bs->filename (relative paths are relative to the CWD).
Considering bs->backing->bs->filename exists, let us make it mean the
former.
Among other things, this now allows the user to specify a base when
using qemu-img to commit an image file in a directory that is not the
CWD (assuming, everything uses relative filenames).
Before this patch:
$ ./qemu-img create -f qcow2 foo/bot.qcow2 1M
$ ./qemu-img create -f qcow2 -b bot.qcow2 foo/mid.qcow2
$ ./qemu-img create -f qcow2 -b mid.qcow2 foo/top.qcow2
$ ./qemu-img commit -b mid.qcow2 foo/top.qcow2
qemu-img: Did not find 'mid.qcow2' in the backing chain of 'foo/top.qcow2'
$ ./qemu-img commit -b foo/mid.qcow2 foo/top.qcow2
qemu-img: Did not find 'foo/mid.qcow2' in the backing chain of 'foo/top.qcow2'
$ ./qemu-img commit -b $PWD/foo/mid.qcow2 foo/top.qcow2
qemu-img: Did not find '[...]/foo/mid.qcow2' in the backing chain of 'foo/top.qcow2'
After this patch:
$ ./qemu-img commit -b mid.qcow2 foo/top.qcow2
Image committed.
$ ./qemu-img commit -b foo/mid.qcow2 foo/top.qcow2
qemu-img: Did not find 'foo/mid.qcow2' in the backing chain of 'foo/top.qcow2'
$ ./qemu-img commit -b $PWD/foo/mid.qcow2 foo/top.qcow2
Image committed.
With this change, bdrv_find_backing_image() must look at whether the
user has overridden a BDS's backing file. If so, it can no longer use
bs->backing_file, but must instead compare the given filename against
the backing node's filename directly.
Note that this changes the QAPI output for a node's backing_file. We
had very inconsistent output there (sometimes what the image header
said, sometimes the actual filename of the backing image). This
inconsistent output was effectively useless, so we have to decide one
way or the other. Considering that bs->backing_file usually at runtime
contained the path to the image relative to qemu's CWD (or absolute),
this patch changes QAPI's backing_file to always report the
bs->backing->bs->filename from now on. If you want to receive the image
header information, you have to refer to full-backing-filename.
This necessitates a change to iotest 228. The interesting information
it really wanted is the image header, and it can get that now, but it
has to use full-backing-filename instead of backing_file. Because of
this patch's changes to bs->backing_file's behavior, we also need some
reference output changes.
Along with the changes to bs->backing_file, stop updating
BDS.backing_format in bdrv_backing_attach() as well. This way,
ImageInfo's backing-filename and backing-filename-format fields will
represent what the image header says and nothing else.
iotest 245 changes in behavior: With the backing node no longer
overriding the parent node's backing_file string, you can now omit the
@backing option when reopening a node with neither a default nor a
current backing file even if it used to have a backing node at some
point.
273 also changes: The base image is opened without a format layer, so
ImageInfo.backing-filename-format used to report "file" for the base
image's overlay after blockdev-snapshot. However, the image header
never says "file" anywhere, so it now reports $IMGFMT.
Signed-off-by: Max Reitz <mreitz@redhat.com>
2018-08-01 21:34:11 +03:00
|
|
|
"backing-filename-format": "IMGFMT",
|
2019-11-08 11:46:03 +03:00
|
|
|
"virtual-size": 67108864,
|
|
|
|
|
"filename": "TEST_DIR/t.IMGFMT.mid",
|
|
|
|
|
"cluster-size": 65536,
|
|
|
|
|
"format": "IMGFMT",
|
|
|
|
|
"actual-size": SIZE,
|
|
|
|
|
"full-backing-filename": "TEST_DIR/t.IMGFMT.base",
|
|
|
|
|
"backing-filename": "TEST_DIR/t.IMGFMT.base",
|
|
|
|
|
"dirty-flag": false
|
|
|
|
|
},
|
|
|
|
|
"backing-filename-format": "IMGFMT",
|
|
|
|
|
"virtual-size": 67108864,
|
|
|
|
|
"filename": "TEST_DIR/t.IMGFMT",
|
|
|
|
|
"cluster-size": 65536,
|
|
|
|
|
"format": "IMGFMT",
|
|
|
|
|
"actual-size": SIZE,
|
|
|
|
|
"full-backing-filename": "TEST_DIR/t.IMGFMT.mid",
|
|
|
|
|
"backing-filename": "TEST_DIR/t.IMGFMT.mid",
|
|
|
|
|
"dirty-flag": false
|
|
|
|
|
},
|
|
|
|
|
"iops_wr": 0,
|
|
|
|
|
"ro": false,
|
|
|
|
|
"node-name": "top",
|
|
|
|
|
"backing_file_depth": 2,
|
|
|
|
|
"drv": "IMGFMT",
|
|
|
|
|
"iops": 0,
|
|
|
|
|
"bps_wr": 0,
|
|
|
|
|
"write_threshold": 0,
|
|
|
|
|
"backing_file": "TEST_DIR/t.IMGFMT.mid",
|
|
|
|
|
"encrypted": false,
|
|
|
|
|
"bps": 0,
|
|
|
|
|
"bps_rd": 0,
|
|
|
|
|
"cache": {
|
|
|
|
|
"no-flush": false,
|
|
|
|
|
"direct": false,
|
|
|
|
|
"writeback": true
|
|
|
|
|
},
|
|
|
|
|
"file": "TEST_DIR/t.IMGFMT",
|
|
|
|
|
"encryption_key_missing": false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"iops_rd": 0,
|
|
|
|
|
"detect_zeroes": "off",
|
|
|
|
|
"image": {
|
|
|
|
|
"virtual-size": 197120,
|
|
|
|
|
"filename": "TEST_DIR/t.IMGFMT",
|
|
|
|
|
"format": "file",
|
|
|
|
|
"actual-size": SIZE,
|
|
|
|
|
"dirty-flag": false
|
|
|
|
|
},
|
|
|
|
|
"iops_wr": 0,
|
|
|
|
|
"ro": false,
|
|
|
|
|
"node-name": "topf",
|
|
|
|
|
"backing_file_depth": 0,
|
|
|
|
|
"drv": "file",
|
|
|
|
|
"iops": 0,
|
|
|
|
|
"bps_wr": 0,
|
|
|
|
|
"write_threshold": 0,
|
|
|
|
|
"encrypted": false,
|
|
|
|
|
"bps": 0,
|
|
|
|
|
"bps_rd": 0,
|
|
|
|
|
"cache": {
|
|
|
|
|
"no-flush": false,
|
|
|
|
|
"direct": false,
|
|
|
|
|
"writeback": true
|
|
|
|
|
},
|
|
|
|
|
"file": "TEST_DIR/t.IMGFMT",
|
|
|
|
|
"encryption_key_missing": false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"iops_rd": 0,
|
|
|
|
|
"detect_zeroes": "off",
|
|
|
|
|
"image": {
|
|
|
|
|
"backing-image": {
|
|
|
|
|
"virtual-size": 197120,
|
|
|
|
|
"filename": "TEST_DIR/t.IMGFMT.base",
|
|
|
|
|
"format": "file",
|
|
|
|
|
"actual-size": SIZE,
|
|
|
|
|
"dirty-flag": false
|
|
|
|
|
},
|
block: Leave BDS.backing_{file,format} constant
Parts of the block layer treat BDS.backing_file as if it were whatever
the image header says (i.e., if it is a relative path, it is relative to
the overlay), other parts treat it like a cache for
bs->backing->bs->filename (relative paths are relative to the CWD).
Considering bs->backing->bs->filename exists, let us make it mean the
former.
Among other things, this now allows the user to specify a base when
using qemu-img to commit an image file in a directory that is not the
CWD (assuming, everything uses relative filenames).
Before this patch:
$ ./qemu-img create -f qcow2 foo/bot.qcow2 1M
$ ./qemu-img create -f qcow2 -b bot.qcow2 foo/mid.qcow2
$ ./qemu-img create -f qcow2 -b mid.qcow2 foo/top.qcow2
$ ./qemu-img commit -b mid.qcow2 foo/top.qcow2
qemu-img: Did not find 'mid.qcow2' in the backing chain of 'foo/top.qcow2'
$ ./qemu-img commit -b foo/mid.qcow2 foo/top.qcow2
qemu-img: Did not find 'foo/mid.qcow2' in the backing chain of 'foo/top.qcow2'
$ ./qemu-img commit -b $PWD/foo/mid.qcow2 foo/top.qcow2
qemu-img: Did not find '[...]/foo/mid.qcow2' in the backing chain of 'foo/top.qcow2'
After this patch:
$ ./qemu-img commit -b mid.qcow2 foo/top.qcow2
Image committed.
$ ./qemu-img commit -b foo/mid.qcow2 foo/top.qcow2
qemu-img: Did not find 'foo/mid.qcow2' in the backing chain of 'foo/top.qcow2'
$ ./qemu-img commit -b $PWD/foo/mid.qcow2 foo/top.qcow2
Image committed.
With this change, bdrv_find_backing_image() must look at whether the
user has overridden a BDS's backing file. If so, it can no longer use
bs->backing_file, but must instead compare the given filename against
the backing node's filename directly.
Note that this changes the QAPI output for a node's backing_file. We
had very inconsistent output there (sometimes what the image header
said, sometimes the actual filename of the backing image). This
inconsistent output was effectively useless, so we have to decide one
way or the other. Considering that bs->backing_file usually at runtime
contained the path to the image relative to qemu's CWD (or absolute),
this patch changes QAPI's backing_file to always report the
bs->backing->bs->filename from now on. If you want to receive the image
header information, you have to refer to full-backing-filename.
This necessitates a change to iotest 228. The interesting information
it really wanted is the image header, and it can get that now, but it
has to use full-backing-filename instead of backing_file. Because of
this patch's changes to bs->backing_file's behavior, we also need some
reference output changes.
Along with the changes to bs->backing_file, stop updating
BDS.backing_format in bdrv_backing_attach() as well. This way,
ImageInfo's backing-filename and backing-filename-format fields will
represent what the image header says and nothing else.
iotest 245 changes in behavior: With the backing node no longer
overriding the parent node's backing_file string, you can now omit the
@backing option when reopening a node with neither a default nor a
current backing file even if it used to have a backing node at some
point.
273 also changes: The base image is opened without a format layer, so
ImageInfo.backing-filename-format used to report "file" for the base
image's overlay after blockdev-snapshot. However, the image header
never says "file" anywhere, so it now reports $IMGFMT.
Signed-off-by: Max Reitz <mreitz@redhat.com>
2018-08-01 21:34:11 +03:00
|
|
|
"backing-filename-format": "IMGFMT",
|
2019-11-08 11:46:03 +03:00
|
|
|
"virtual-size": 67108864,
|
|
|
|
|
"filename": "TEST_DIR/t.IMGFMT.mid",
|
|
|
|
|
"cluster-size": 65536,
|
|
|
|
|
"format": "IMGFMT",
|
|
|
|
|
"actual-size": SIZE,
|
|
|
|
|
"full-backing-filename": "TEST_DIR/t.IMGFMT.base",
|
|
|
|
|
"backing-filename": "TEST_DIR/t.IMGFMT.base",
|
|
|
|
|
"dirty-flag": false
|
|
|
|
|
},
|
|
|
|
|
"iops_wr": 0,
|
|
|
|
|
"ro": true,
|
|
|
|
|
"node-name": "mid",
|
|
|
|
|
"backing_file_depth": 1,
|
|
|
|
|
"drv": "IMGFMT",
|
|
|
|
|
"iops": 0,
|
|
|
|
|
"bps_wr": 0,
|
|
|
|
|
"write_threshold": 0,
|
|
|
|
|
"backing_file": "TEST_DIR/t.IMGFMT.base",
|
|
|
|
|
"encrypted": false,
|
|
|
|
|
"bps": 0,
|
|
|
|
|
"bps_rd": 0,
|
|
|
|
|
"cache": {
|
|
|
|
|
"no-flush": false,
|
|
|
|
|
"direct": false,
|
|
|
|
|
"writeback": true
|
|
|
|
|
},
|
|
|
|
|
"file": "TEST_DIR/t.IMGFMT.mid",
|
|
|
|
|
"encryption_key_missing": false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"iops_rd": 0,
|
|
|
|
|
"detect_zeroes": "off",
|
|
|
|
|
"image": {
|
|
|
|
|
"virtual-size": 197120,
|
|
|
|
|
"filename": "TEST_DIR/t.IMGFMT.mid",
|
|
|
|
|
"format": "file",
|
|
|
|
|
"actual-size": SIZE,
|
|
|
|
|
"dirty-flag": false
|
|
|
|
|
},
|
|
|
|
|
"iops_wr": 0,
|
|
|
|
|
"ro": false,
|
|
|
|
|
"node-name": "midf",
|
|
|
|
|
"backing_file_depth": 0,
|
|
|
|
|
"drv": "file",
|
|
|
|
|
"iops": 0,
|
|
|
|
|
"bps_wr": 0,
|
|
|
|
|
"write_threshold": 0,
|
|
|
|
|
"encrypted": false,
|
|
|
|
|
"bps": 0,
|
|
|
|
|
"bps_rd": 0,
|
|
|
|
|
"cache": {
|
|
|
|
|
"no-flush": false,
|
|
|
|
|
"direct": false,
|
|
|
|
|
"writeback": true
|
|
|
|
|
},
|
|
|
|
|
"file": "TEST_DIR/t.IMGFMT.mid",
|
|
|
|
|
"encryption_key_missing": false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"iops_rd": 0,
|
|
|
|
|
"detect_zeroes": "off",
|
|
|
|
|
"image": {
|
|
|
|
|
"virtual-size": 197120,
|
|
|
|
|
"filename": "TEST_DIR/t.IMGFMT.base",
|
|
|
|
|
"format": "file",
|
|
|
|
|
"actual-size": SIZE,
|
|
|
|
|
"dirty-flag": false
|
|
|
|
|
},
|
|
|
|
|
"iops_wr": 0,
|
|
|
|
|
"ro": true,
|
|
|
|
|
"node-name": "base",
|
|
|
|
|
"backing_file_depth": 0,
|
|
|
|
|
"drv": "file",
|
|
|
|
|
"iops": 0,
|
|
|
|
|
"bps_wr": 0,
|
|
|
|
|
"write_threshold": 0,
|
|
|
|
|
"encrypted": false,
|
|
|
|
|
"bps": 0,
|
|
|
|
|
"bps_rd": 0,
|
|
|
|
|
"cache": {
|
|
|
|
|
"no-flush": false,
|
|
|
|
|
"direct": false,
|
|
|
|
|
"writeback": true
|
|
|
|
|
},
|
|
|
|
|
"file": "TEST_DIR/t.IMGFMT.base",
|
|
|
|
|
"encryption_key_missing": false
|
|
|
|
|
}
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
"return": {
|
|
|
|
|
"edges": [
|
|
|
|
|
{
|
|
|
|
|
"name": "file",
|
|
|
|
|
"parent": 5,
|
|
|
|
|
"shared-perm": [
|
|
|
|
|
"graph-mod",
|
|
|
|
|
"write-unchanged",
|
|
|
|
|
"consistent-read"
|
|
|
|
|
],
|
|
|
|
|
"perm": [
|
|
|
|
|
"resize",
|
|
|
|
|
"write",
|
|
|
|
|
"consistent-read"
|
|
|
|
|
],
|
|
|
|
|
"child": 4
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "backing",
|
|
|
|
|
"parent": 5,
|
|
|
|
|
"shared-perm": [
|
|
|
|
|
"graph-mod",
|
|
|
|
|
"resize",
|
|
|
|
|
"write-unchanged",
|
|
|
|
|
"write",
|
|
|
|
|
"consistent-read"
|
|
|
|
|
],
|
|
|
|
|
"perm": [
|
|
|
|
|
],
|
|
|
|
|
"child": 3
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "file",
|
|
|
|
|
"parent": 3,
|
|
|
|
|
"shared-perm": [
|
|
|
|
|
"graph-mod",
|
|
|
|
|
"write-unchanged",
|
|
|
|
|
"consistent-read"
|
|
|
|
|
],
|
|
|
|
|
"perm": [
|
|
|
|
|
"consistent-read"
|
|
|
|
|
],
|
|
|
|
|
"child": 2
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "backing",
|
|
|
|
|
"parent": 3,
|
|
|
|
|
"shared-perm": [
|
|
|
|
|
"graph-mod",
|
|
|
|
|
"resize",
|
|
|
|
|
"write-unchanged",
|
|
|
|
|
"write",
|
|
|
|
|
"consistent-read"
|
|
|
|
|
],
|
|
|
|
|
"perm": [
|
|
|
|
|
],
|
|
|
|
|
"child": 1
|
|
|
|
|
}
|
|
|
|
|
],
|
|
|
|
|
"nodes": [
|
|
|
|
|
{
|
|
|
|
|
"name": "top",
|
|
|
|
|
"type": "block-driver",
|
|
|
|
|
"id": 5
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "topf",
|
|
|
|
|
"type": "block-driver",
|
|
|
|
|
"id": 4
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "mid",
|
|
|
|
|
"type": "block-driver",
|
|
|
|
|
"id": 3
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "midf",
|
|
|
|
|
"type": "block-driver",
|
|
|
|
|
"id": 2
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "base",
|
|
|
|
|
"type": "block-driver",
|
|
|
|
|
"id": 1
|
|
|
|
|
}
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
"return": {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
"timestamp": {
|
|
|
|
|
"seconds": TIMESTAMP,
|
|
|
|
|
"microseconds": TIMESTAMP
|
|
|
|
|
},
|
|
|
|
|
"event": "SHUTDOWN",
|
|
|
|
|
"data": {
|
|
|
|
|
"guest": false,
|
|
|
|
|
"reason": "host-qmp-quit"
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*** done
|