mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-05 16:53:55 -06:00
Block patches
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
iQIcBAABAgAGBQJUEwy3AAoJEH8JsnLIjy/WqkUQALPsR68w2bB6aiN6zUaJt1X3
VaksCQGgtZdN6itDvn6v6ktayFXXfjRE+U0hK7joXUiokq17YZmKqf+1V4LPJRSW
Tv21gIAHuIyf+8LL/xGS3W9+EEXAaKbp1t6AT/VDWv/mQ4KY5xrvhn2E/+7r0wKr
EBOHrKd4tQualV12MtrZsrWZy3oMQvkimcVIfnjFZ2gJg5dmUBXQ35Kdj9+AxDiX
1hDizBRbozvzSBCnS9PUcJ1OfCxoCRewbHn43LeCYWyB8m3ttpdPpuMaUoSNGrVY
Tw7aYvYjMArr/ChrF8eH2vKJSeHabSPbYqgNsGqpS2n5KYJbzoyv8iQQCSHjtKZe
vagoIRomF/BtOWT8mvUSHGw2vmQm6JZJdHJsXNeyDJ/P8ZSSm0vsZMjqh6vwS7sB
+AURb5BaFWNnThwm80tJl23uJLjohNsdrmuLvAiHX0e03dyyQFDBS1zqb9BTbOsP
SdBPFZy1hA0deYnJlyeLj94iyIosdsMihLkDJrIdNzn6qMF9QCdFs+rgOepwsfml
ZNG1h2V+Wo3LS1SkKpK0mhiTBFLCit8Cq03+n95zBTcPCBMGgoJVC2VZef8XXKDn
v6vuSYikCkEIDEWhsUrIZmDWKv/83AwSW+i+ir3IOVgxOJ51Z/mr5PAQQ+3/Gaat
G5gSIDmW4rGgYDk/coDf
=3He1
-----END PGP SIGNATURE-----
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block patches
# gpg: Signature made Fri 12 Sep 2014 16:09:43 BST using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
* remotes/kevin/tags/for-upstream: (22 commits)
qcow2: Add falloc and full preallocation option
raw-posix: Add falloc and full preallocation option
qapi: introduce PreallocMode and new PreallocModes full and falloc.
block: don't convert file size to sector size
block: round up file size to nearest sector
iotests: Send the correct fd in socket_scm_helper
blockdev: Refuse to drive_del something added with blockdev-add
block: extend BLOCK_IO_ERROR with reason string
dataplane: fix virtio_blk_data_plane_create() op blocker error path
qemu-iotests: Run 025 for Archipelago block driver
block/archipelago: Implement bdrv_truncate()
block: Make the block accounting functions operate on BlockAcctStats
block: rename BlockAcctType members to start with BLOCK_ instead of BDRV_
block: Extract the block accounting code
block: Extract the BlockAcctStats structure
IDE: MMIO IDE device control should be little endian
thread-pool: Drop unnecessary includes
xen: Drop redundant bdrv_close() from pci_piix3_xen_ide_unplug()
xen_disk: Plug memory leak on error path
qemu-io: Clean up openfile() after commit 2e40134
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
commit
f2bcdc8de0
53 changed files with 709 additions and 284 deletions
|
|
@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
|
|||
. ./common.pattern
|
||||
|
||||
_supported_fmt raw qcow2 qed
|
||||
_supported_proto file sheepdog rbd nfs
|
||||
_supported_proto file sheepdog rbd nfs archipelago
|
||||
_supported_os Linux
|
||||
|
||||
echo "=== Creating image"
|
||||
|
|
|
|||
|
|
@ -179,7 +179,7 @@ qemu-img create -f qcow2 -o preallocation=metadata TEST_DIR/t.qcow2 64M
|
|||
Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 encryption=off cluster_size=65536 preallocation='metadata' lazy_refcounts=off
|
||||
|
||||
qemu-img create -f qcow2 -o preallocation=1234 TEST_DIR/t.qcow2 64M
|
||||
qemu-img: TEST_DIR/t.qcow2: Invalid preallocation mode: '1234'
|
||||
qemu-img: TEST_DIR/t.qcow2: invalid parameter value: 1234
|
||||
Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 encryption=off cluster_size=65536 preallocation='1234' lazy_refcounts=off
|
||||
|
||||
== Check encryption option ==
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ backing_file File name of a base image
|
|||
backing_fmt Image format of the base image
|
||||
encryption Encrypt the image
|
||||
cluster_size qcow2 cluster size
|
||||
preallocation Preallocation mode (allowed values: off, metadata)
|
||||
preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
|
||||
lazy_refcounts Postpone refcount updates
|
||||
nocow Turn off copy-on-write (valid only on btrfs)
|
||||
|
||||
|
|
@ -76,7 +76,7 @@ backing_file File name of a base image
|
|||
backing_fmt Image format of the base image
|
||||
encryption Encrypt the image
|
||||
cluster_size qcow2 cluster size
|
||||
preallocation Preallocation mode (allowed values: off, metadata)
|
||||
preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
|
||||
lazy_refcounts Postpone refcount updates
|
||||
nocow Turn off copy-on-write (valid only on btrfs)
|
||||
|
||||
|
|
@ -88,7 +88,7 @@ backing_file File name of a base image
|
|||
backing_fmt Image format of the base image
|
||||
encryption Encrypt the image
|
||||
cluster_size qcow2 cluster size
|
||||
preallocation Preallocation mode (allowed values: off, metadata)
|
||||
preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
|
||||
lazy_refcounts Postpone refcount updates
|
||||
nocow Turn off copy-on-write (valid only on btrfs)
|
||||
|
||||
|
|
@ -100,7 +100,7 @@ backing_file File name of a base image
|
|||
backing_fmt Image format of the base image
|
||||
encryption Encrypt the image
|
||||
cluster_size qcow2 cluster size
|
||||
preallocation Preallocation mode (allowed values: off, metadata)
|
||||
preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
|
||||
lazy_refcounts Postpone refcount updates
|
||||
nocow Turn off copy-on-write (valid only on btrfs)
|
||||
|
||||
|
|
@ -112,7 +112,7 @@ backing_file File name of a base image
|
|||
backing_fmt Image format of the base image
|
||||
encryption Encrypt the image
|
||||
cluster_size qcow2 cluster size
|
||||
preallocation Preallocation mode (allowed values: off, metadata)
|
||||
preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
|
||||
lazy_refcounts Postpone refcount updates
|
||||
nocow Turn off copy-on-write (valid only on btrfs)
|
||||
|
||||
|
|
@ -124,7 +124,7 @@ backing_file File name of a base image
|
|||
backing_fmt Image format of the base image
|
||||
encryption Encrypt the image
|
||||
cluster_size qcow2 cluster size
|
||||
preallocation Preallocation mode (allowed values: off, metadata)
|
||||
preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
|
||||
lazy_refcounts Postpone refcount updates
|
||||
nocow Turn off copy-on-write (valid only on btrfs)
|
||||
|
||||
|
|
@ -136,7 +136,7 @@ backing_file File name of a base image
|
|||
backing_fmt Image format of the base image
|
||||
encryption Encrypt the image
|
||||
cluster_size qcow2 cluster size
|
||||
preallocation Preallocation mode (allowed values: off, metadata)
|
||||
preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
|
||||
lazy_refcounts Postpone refcount updates
|
||||
nocow Turn off copy-on-write (valid only on btrfs)
|
||||
|
||||
|
|
@ -148,7 +148,7 @@ backing_file File name of a base image
|
|||
backing_fmt Image format of the base image
|
||||
encryption Encrypt the image
|
||||
cluster_size qcow2 cluster size
|
||||
preallocation Preallocation mode (allowed values: off, metadata)
|
||||
preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
|
||||
lazy_refcounts Postpone refcount updates
|
||||
nocow Turn off copy-on-write (valid only on btrfs)
|
||||
|
||||
|
|
@ -175,7 +175,7 @@ backing_file File name of a base image
|
|||
backing_fmt Image format of the base image
|
||||
encryption Encrypt the image
|
||||
cluster_size qcow2 cluster size
|
||||
preallocation Preallocation mode (allowed values: off, metadata)
|
||||
preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
|
||||
lazy_refcounts Postpone refcount updates
|
||||
|
||||
Testing: create -o help
|
||||
|
|
@ -253,7 +253,7 @@ backing_file File name of a base image
|
|||
backing_fmt Image format of the base image
|
||||
encryption Encrypt the image
|
||||
cluster_size qcow2 cluster size
|
||||
preallocation Preallocation mode (allowed values: off, metadata)
|
||||
preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
|
||||
lazy_refcounts Postpone refcount updates
|
||||
nocow Turn off copy-on-write (valid only on btrfs)
|
||||
|
||||
|
|
@ -265,7 +265,7 @@ backing_file File name of a base image
|
|||
backing_fmt Image format of the base image
|
||||
encryption Encrypt the image
|
||||
cluster_size qcow2 cluster size
|
||||
preallocation Preallocation mode (allowed values: off, metadata)
|
||||
preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
|
||||
lazy_refcounts Postpone refcount updates
|
||||
nocow Turn off copy-on-write (valid only on btrfs)
|
||||
|
||||
|
|
@ -277,7 +277,7 @@ backing_file File name of a base image
|
|||
backing_fmt Image format of the base image
|
||||
encryption Encrypt the image
|
||||
cluster_size qcow2 cluster size
|
||||
preallocation Preallocation mode (allowed values: off, metadata)
|
||||
preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
|
||||
lazy_refcounts Postpone refcount updates
|
||||
nocow Turn off copy-on-write (valid only on btrfs)
|
||||
|
||||
|
|
@ -289,7 +289,7 @@ backing_file File name of a base image
|
|||
backing_fmt Image format of the base image
|
||||
encryption Encrypt the image
|
||||
cluster_size qcow2 cluster size
|
||||
preallocation Preallocation mode (allowed values: off, metadata)
|
||||
preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
|
||||
lazy_refcounts Postpone refcount updates
|
||||
nocow Turn off copy-on-write (valid only on btrfs)
|
||||
|
||||
|
|
@ -301,7 +301,7 @@ backing_file File name of a base image
|
|||
backing_fmt Image format of the base image
|
||||
encryption Encrypt the image
|
||||
cluster_size qcow2 cluster size
|
||||
preallocation Preallocation mode (allowed values: off, metadata)
|
||||
preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
|
||||
lazy_refcounts Postpone refcount updates
|
||||
nocow Turn off copy-on-write (valid only on btrfs)
|
||||
|
||||
|
|
@ -313,7 +313,7 @@ backing_file File name of a base image
|
|||
backing_fmt Image format of the base image
|
||||
encryption Encrypt the image
|
||||
cluster_size qcow2 cluster size
|
||||
preallocation Preallocation mode (allowed values: off, metadata)
|
||||
preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
|
||||
lazy_refcounts Postpone refcount updates
|
||||
nocow Turn off copy-on-write (valid only on btrfs)
|
||||
|
||||
|
|
@ -325,7 +325,7 @@ backing_file File name of a base image
|
|||
backing_fmt Image format of the base image
|
||||
encryption Encrypt the image
|
||||
cluster_size qcow2 cluster size
|
||||
preallocation Preallocation mode (allowed values: off, metadata)
|
||||
preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
|
||||
lazy_refcounts Postpone refcount updates
|
||||
nocow Turn off copy-on-write (valid only on btrfs)
|
||||
|
||||
|
|
@ -337,7 +337,7 @@ backing_file File name of a base image
|
|||
backing_fmt Image format of the base image
|
||||
encryption Encrypt the image
|
||||
cluster_size qcow2 cluster size
|
||||
preallocation Preallocation mode (allowed values: off, metadata)
|
||||
preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
|
||||
lazy_refcounts Postpone refcount updates
|
||||
nocow Turn off copy-on-write (valid only on btrfs)
|
||||
|
||||
|
|
@ -364,7 +364,7 @@ backing_file File name of a base image
|
|||
backing_fmt Image format of the base image
|
||||
encryption Encrypt the image
|
||||
cluster_size qcow2 cluster size
|
||||
preallocation Preallocation mode (allowed values: off, metadata)
|
||||
preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
|
||||
lazy_refcounts Postpone refcount updates
|
||||
|
||||
Testing: convert -o help
|
||||
|
|
@ -431,7 +431,7 @@ backing_file File name of a base image
|
|||
backing_fmt Image format of the base image
|
||||
encryption Encrypt the image
|
||||
cluster_size qcow2 cluster size
|
||||
preallocation Preallocation mode (allowed values: off, metadata)
|
||||
preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
|
||||
lazy_refcounts Postpone refcount updates
|
||||
nocow Turn off copy-on-write (valid only on btrfs)
|
||||
|
||||
|
|
@ -443,7 +443,7 @@ backing_file File name of a base image
|
|||
backing_fmt Image format of the base image
|
||||
encryption Encrypt the image
|
||||
cluster_size qcow2 cluster size
|
||||
preallocation Preallocation mode (allowed values: off, metadata)
|
||||
preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
|
||||
lazy_refcounts Postpone refcount updates
|
||||
nocow Turn off copy-on-write (valid only on btrfs)
|
||||
|
||||
|
|
@ -455,7 +455,7 @@ backing_file File name of a base image
|
|||
backing_fmt Image format of the base image
|
||||
encryption Encrypt the image
|
||||
cluster_size qcow2 cluster size
|
||||
preallocation Preallocation mode (allowed values: off, metadata)
|
||||
preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
|
||||
lazy_refcounts Postpone refcount updates
|
||||
nocow Turn off copy-on-write (valid only on btrfs)
|
||||
|
||||
|
|
@ -467,7 +467,7 @@ backing_file File name of a base image
|
|||
backing_fmt Image format of the base image
|
||||
encryption Encrypt the image
|
||||
cluster_size qcow2 cluster size
|
||||
preallocation Preallocation mode (allowed values: off, metadata)
|
||||
preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
|
||||
lazy_refcounts Postpone refcount updates
|
||||
nocow Turn off copy-on-write (valid only on btrfs)
|
||||
|
||||
|
|
@ -479,7 +479,7 @@ backing_file File name of a base image
|
|||
backing_fmt Image format of the base image
|
||||
encryption Encrypt the image
|
||||
cluster_size qcow2 cluster size
|
||||
preallocation Preallocation mode (allowed values: off, metadata)
|
||||
preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
|
||||
lazy_refcounts Postpone refcount updates
|
||||
nocow Turn off copy-on-write (valid only on btrfs)
|
||||
|
||||
|
|
@ -491,7 +491,7 @@ backing_file File name of a base image
|
|||
backing_fmt Image format of the base image
|
||||
encryption Encrypt the image
|
||||
cluster_size qcow2 cluster size
|
||||
preallocation Preallocation mode (allowed values: off, metadata)
|
||||
preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
|
||||
lazy_refcounts Postpone refcount updates
|
||||
nocow Turn off copy-on-write (valid only on btrfs)
|
||||
|
||||
|
|
@ -503,7 +503,7 @@ backing_file File name of a base image
|
|||
backing_fmt Image format of the base image
|
||||
encryption Encrypt the image
|
||||
cluster_size qcow2 cluster size
|
||||
preallocation Preallocation mode (allowed values: off, metadata)
|
||||
preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
|
||||
lazy_refcounts Postpone refcount updates
|
||||
nocow Turn off copy-on-write (valid only on btrfs)
|
||||
|
||||
|
|
@ -515,7 +515,7 @@ backing_file File name of a base image
|
|||
backing_fmt Image format of the base image
|
||||
encryption Encrypt the image
|
||||
cluster_size qcow2 cluster size
|
||||
preallocation Preallocation mode (allowed values: off, metadata)
|
||||
preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
|
||||
lazy_refcounts Postpone refcount updates
|
||||
nocow Turn off copy-on-write (valid only on btrfs)
|
||||
|
||||
|
|
@ -544,7 +544,7 @@ backing_file File name of a base image
|
|||
backing_fmt Image format of the base image
|
||||
encryption Encrypt the image
|
||||
cluster_size qcow2 cluster size
|
||||
preallocation Preallocation mode (allowed values: off, metadata)
|
||||
preallocation Preallocation mode (allowed values: off, metadata, falloc, full)
|
||||
lazy_refcounts Postpone refcount updates
|
||||
|
||||
Testing: convert -o help
|
||||
|
|
|
|||
57
tests/qemu-iotests/104
Executable file
57
tests/qemu-iotests/104
Executable file
|
|
@ -0,0 +1,57 @@
|
|||
#!/bin/bash
|
||||
#
|
||||
# Test image creation with aligned and unaligned sizes
|
||||
#
|
||||
# Copyright (C) 2014 Fujitsu.
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
|
||||
# creator
|
||||
owner=hutao@cn.fujitsu.com
|
||||
|
||||
seq=`basename $0`
|
||||
echo "QA output created by $seq"
|
||||
|
||||
here=`pwd`
|
||||
tmp=/tmp/$$
|
||||
status=1 # failure is the default!
|
||||
|
||||
_cleanup()
|
||||
{
|
||||
_cleanup_test_img
|
||||
}
|
||||
trap "_cleanup; exit \$status" 0 1 2 3 15
|
||||
|
||||
# get standard environment, filters and checks
|
||||
. ./common.rc
|
||||
. ./common.filter
|
||||
|
||||
_supported_fmt generic
|
||||
_supported_proto generic
|
||||
_supported_os Linux
|
||||
|
||||
echo "=== Check qemu-img info output ==="
|
||||
echo
|
||||
image_sizes="1024 1234"
|
||||
|
||||
for s in $image_sizes; do
|
||||
_make_test_img $s | _filter_img_create
|
||||
_img_info | _filter_img_info
|
||||
done
|
||||
|
||||
# success, all done
|
||||
echo "*** done"
|
||||
rm -f $seq.full
|
||||
status=0
|
||||
12
tests/qemu-iotests/104.out
Normal file
12
tests/qemu-iotests/104.out
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
QA output created by 104
|
||||
=== Check qemu-img info output ===
|
||||
|
||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1024
|
||||
image: TEST_DIR/t.IMGFMT
|
||||
file format: IMGFMT
|
||||
virtual size: 1.0K (1024 bytes)
|
||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1234
|
||||
image: TEST_DIR/t.IMGFMT
|
||||
file format: IMGFMT
|
||||
virtual size: 1.5K (1536 bytes)
|
||||
***done
|
||||
|
|
@ -192,5 +192,26 @@ _filter_img_create()
|
|||
-e "s/archipelago:a/TEST_DIR\//g"
|
||||
}
|
||||
|
||||
_filter_img_info()
|
||||
{
|
||||
sed -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \
|
||||
-e "s#$TEST_DIR#TEST_DIR#g" \
|
||||
-e "s#$IMGFMT#IMGFMT#g" \
|
||||
-e "/encrypted: yes/d" \
|
||||
-e "/cluster_size: [0-9]\\+/d" \
|
||||
-e "/table_size: [0-9]\\+/d" \
|
||||
-e "/compat: '[^']*'/d" \
|
||||
-e "/compat6: \\(on\\|off\\)/d" \
|
||||
-e "/static: \\(on\\|off\\)/d" \
|
||||
-e "/zeroed_grain: \\(on\\|off\\)/d" \
|
||||
-e "/subformat: '[^']*'/d" \
|
||||
-e "/adapter_type: '[^']*'/d" \
|
||||
-e "/lazy_refcounts: \\(on\\|off\\)/d" \
|
||||
-e "/block_size: [0-9]\\+/d" \
|
||||
-e "/block_state_zero: \\(on\\|off\\)/d" \
|
||||
-e "/log_size: [0-9]\\+/d" \
|
||||
-e "s/archipelago:a/TEST_DIR\//g"
|
||||
}
|
||||
|
||||
# make sure this script returns success
|
||||
/bin/true
|
||||
|
|
|
|||
|
|
@ -104,3 +104,4 @@
|
|||
100 rw auto quick
|
||||
101 rw auto quick
|
||||
103 rw auto quick
|
||||
104 rw auto
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ static int send_fd(int fd, int fd_to_send)
|
|||
cmsg->cmsg_len = CMSG_LEN(sizeof(int));
|
||||
cmsg->cmsg_level = SOL_SOCKET;
|
||||
cmsg->cmsg_type = SCM_RIGHTS;
|
||||
memcpy(CMSG_DATA(cmsg), &fd, sizeof(int));
|
||||
memcpy(CMSG_DATA(cmsg), &fd_to_send, sizeof(int));
|
||||
|
||||
do {
|
||||
ret = sendmsg(fd, &msg, 0);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue