The following changes since commit b384cd95eb9c6f73ad84ed1bb0717a26e29cc78f:

Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging (2018-01-19 16:35:25 +0000)

git://github.com/stefanha/qemu.git tags/block-pull-request

for you to fetch changes up to bcbb3866da19cce4360c828b6ec1c2a137757927:

block/parallels: add backing support to readv/writev (2018-01-22 14:02:33 +0000)

Edgar Kaziakhmedov (1):

block/parallels: add backing support to readv/writev

Klim Kireev (4):

docs/interop/prl-xml: description of Parallels Disk format

configure: add dependency

block/parallels: move some structures into header

block/parallels: replace some magic numbers

Stefan Hajnoczi (1):

block: add block_set_io_throttle virtio-blk-pci QMP example

docs/interop/prl-xml.txt | 158 +++++++++++++++++++++++++++++++++++++++++++++++

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

configure | 27 ++++++++

block/Makefile.objs | 2 +

block/parallels.h | 88 ++++++++++++++++++++++++++

block/parallels.c | 108 ++++++++++++++------------------

scripts/checkpatch.pl | 1 +

7 files changed, 342 insertions(+), 60 deletions(-)

create mode 100644 docs/interop/prl-xml.txt

create mode 100644 block/parallels.h

2.14.3

The block_set_io_throttle command can look up BlockBackends by the

attached qdev device ID. virtio-blk-pci is a special case because the

actual VirtIOBlock device is the "/virtio-backend" child of the PCI

adapter device.

Reviewed-by: Alberto Garcia <berto@igalia.com>

Message-id: 20180117090700.25811-1-stefanha@redhat.com

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

1 file changed, 18 insertions(+)

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

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

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

# Example:

#

# -> { "execute": "block_set_io_throttle",

+# "arguments": { "id": "virtio-blk-pci0/virtio-backend",

+# "bps": 0,

+# "bps_rd": 0,

+# "bps_wr": 0,

+# "iops": 512,

+# "iops_rd": 0,

+# "iops_wr": 0,

+# "bps_max": 0,

+# "bps_rd_max": 0,

+# "bps_wr_max": 0,

+# "iops_max": 0,

+# "iops_rd_max": 0,

+# "iops_wr_max": 0,

+# "bps_max_length": 0,

+# "iops_size": 0 } }

+# <- { "return": {} }

+#

+# -> { "execute": "block_set_io_throttle",

# "arguments": { "id": "ide0-1-0",

# "bps": 1000000,

# "bps_rd": 0,

2.14.3

From: Klim Kireev <klim.kireev@virtuozzo.com>

This patch adds main information about Parallels Disk

format, which consists of DiskDescriptor.xml and other files.

Signed-off-by: Edgar Kaziakhmedov <edgar.kaziakhmedov@virtuozzo.com>

Signed-off-by: Klim Kireev <klim.kireev@virtuozzo.com>

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

Signed-off-by: Denis V. Lunev <den@openvz.org>

Message-id: 20180112090122.1702-2-klim.kireev@virtuozzo.com

CC: Stefan Hajnoczi <stefanha@redhat.com>

docs/interop/prl-xml.txt | 158 +++++++++++++++++++++++++++++++++++++++++++++++

1 file changed, 158 insertions(+)

create mode 100644 docs/interop/prl-xml.txt

diff --git a/docs/interop/prl-xml.txt b/docs/interop/prl-xml.txt

new file mode 100644

index XXXXXXX..XXXXXXX

--- /dev/null

+++ b/docs/interop/prl-xml.txt

+= License =

+

+Copyright (c) 2015-2017, Virtuozzo, Inc.

+Authors:

+ 2015 Denis Lunev <den@openvz.org>

+ 2015 Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

+ 2016-2017 Klim Kireev <klim.kireev@virtuozzo.com>

+ 2016-2017 Edgar Kaziakhmedov <edgar.kaziakhmedov@virtuozzo.com>

+

+This work is licensed under the terms of the GNU GPL, version 2 or later.

+See the COPYING file in the top-level directory.

+

+This specification contains minimal information about Parallels Disk Format,

+which is enough to proper work with QEMU. Nevertheless, Parallels Cloud Server

+and Parallels Desktop are able to add some unspecified nodes to xml and use

+them, but they are for internal work and don't affect functionality. Also it

+uses auxiliary xml "Snapshot.xml", which allows to store optional snapshot

+information, but it doesn't influence open/read/write functionality. QEMU and

+other software should not use fields not covered in this document and

+Snapshot.xml file and must leave them as is.

+

+= Parallels Disk Format =

+

+Parallels disk consists of two parts: the set of snapshots and the disk

+descriptor file, which stores information about all files and snapshots.

+

+== Definitions ==

+ Snapshot a record of the contents captured at a particular time,

+ capable of storing current state. A snapshot has UUID and

+ parent UUID.

+

+ Snapshot image an overlay representing the difference between this

+ snapshot and some earlier snapshot.

+

+ Overlay an image storing the different sectors between two captured

+ states.

+

+ Root image snapshot image with no parent, the root of snapshot tree.

+

+ Storage the backing storage for a subset of the virtual disk. When

+ there is more than one storage in a Parallels disk then that

+ is referred to as a split image. In this case every storage

+ covers specific address space area of the disk and has its

+ particular root image. Split images are not considered here

+ and are not supported. Each storage consists of disk

+ parameters and a list of images. The list of images always

+ contains a root image and may also contain overlays. The

+ root image can be an expandable Parallels image file or

+ plain. Overlays must be expandable.

+

+ Description DiskDescriptor.xml stores information about disk parameters,

+ file snapshots, storages.

+

+ Top The overlay between actual state and some previous snapshot.

+ Snapshot It is not a snapshot in the classical sense because it

+ serves as the active image that the guest writes to.

+

+ Sector a 512-byte data chunk.

+

+== Description file ==

+All information is placed in a single XML element Parallels_disk_image.

+The element has only one attribute "Version", that must be 1.0.

+Schema of DiskDescriptor.xml:

+

+<Parallels_disk_image Version="1.0">

+ <Disk_Parameters>

+ ...

+ </Disk_Parameters>

+ <StorageData>

+ ...

+ </StorageData>

+ <Snapshots>

+ ...

+ </Snapshots>

+</Parallels_disk_image>

+

+== Disk_Parameters element ==

+The Disk_Parameters element describes the physical layout of the virtual disk

+and some general settings.

+

+The Disk_Parameters element MUST contain the following child elements:

+ * Disk_size - number of sectors in the disk,

+ desired size of the disk.

+ * Cylinders - number of the disk cylinders.

+ * Heads - number of the disk heads.

+ * Sectors - number of the disk sectors per cylinder

+ (sector size is 512 bytes)

+ Limitation: Product of the Heads, Sectors and Cylinders

+ values MUST be equal to the value of the Disk_size parameter.

+ * Padding - must be 0. Parallels Cloud Server and Parallels Desktop may

+ use padding set to 1, however this case is not covered

+ by this spec, QEMU and other software should not open

+ such disks and should not create them.

+

+== StorageData element ==

+This element of the file describes the root image and all snapshot images.

+

+The StorageData element consists of the Storage child element, as shown below:

+<StorageData>

+ <Storage>

+ ...

+ </Storage>

+</StorageData>

+

+A Storage element has following child elements:

+ * Start - start sector of the storage, in case of non split storage

+ equals to 0.

+ * End - number of sector following the last sector, in case of non

+ split storage equals to Disk_size.

+ * Blocksize - storage cluster size, number of sectors per one cluster.

+ Cluster size for each "Compressed" (see below) image in

+ parallels disk must be equal to this field. Note: cluster

+ size for Parallels Expandable Image is in 'tracks' field of

+ its header (see docs/interop/parallels.txt).

+ * Several Image child elements.

+

+Each Image element has following child elements:

+ * GUID - image identifier, UUID in curly brackets.

+ For instance, {12345678-9abc-def1-2345-6789abcdef12}.

+ The GUID is used by the Snapshots element to reference images

+ (see below)

+ * Type - image type of the element. It can be:

+ "Plain" for raw files.

+ "Compressed" for expanding disks.

+ * File - path to image file. Path can be relative to DiskDecriptor.xml or

+ absolute.

+

+== Snapshots element ==

+The Snapshots element describes the snapshot relations with the snapshot tree.

+

+The element contains the set of Shot child elements, as shown below:

+<Snapshots>

+ <TopGUID> ... </TopGUID> /* Optional child element */

+ <Shot>

+ ...

+ </Shot>

+ <Shot>

+ ...

+ </Shot>

+ ...

+</Snapshots>

+

+Each Shot element contains the following child elements:

+ * GUID - an image GUID.

+ * ParentGUID - GUID of the image of the parent snapshot.

+

+The software may traverse snapshots from child to parent using <ParentGUID>

+field as reference. ParentGUID of root snapshot is

+{00000000-0000-0000-0000-000000000000}. There should be only one root

+snapshot. Top snapshot could be described via two ways: via TopGUID child

+element of the Snapshots element or via predefined GUID

+{5fbaabe3-6958-40ff-92a7-860e329aab41}. If TopGUID is defined, predefined GUID is

+interpreted as usual GUID. All snapshot images (except Top Snapshot) should be

+opened read-only. There is another predefined GUID,

+BackupID = {704718e1-2314-44c8-9087-d78ed36b0f4e}, which is used by original and

+some third-party software for backup, QEMU and other software may operate with

+images with GUID = BackupID as usual, however, it is not recommended to use this

+GUID for new disks. Top snapshot cannot have this GUID.

2.14.3

From: Klim Kireev <klim.kireev@virtuozzo.com>

This dependency is required for adequate Parallels images support.

Typically the disk consists of several images which are glued by

XML disk descriptor. Also XML hides inside several important parameters

which are not available in the image header.

The patch also adds clause to checkpatch.pl to understand libxml2 types.

Signed-off-by: Denis V. Lunev <den@openvz.org>

Signed-off-by: Klim Kireev <klim.kireev@virtuozzo.com>

Signed-off-by: Edgar Kaziakhmedov <edgar.kaziakhmedov@virtuozzo.com>

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

Message-id: 20180112090122.1702-3-klim.kireev@virtuozzo.com

CC: Stefan Hajnoczi <stefanha@redhat.com>

configure | 27 +++++++++++++++++++++++++++

block/Makefile.objs | 2 ++

scripts/checkpatch.pl | 1 +

3 files changed, 30 insertions(+)

diff --git a/configure b/configure

index XXXXXXX..XXXXXXX 100755

--- a/configure

+++ b/configure

@@ -XXX,XX +XXX,XX @@ tcmalloc="no"

jemalloc="no"

replication="yes"

vxhs=""

+libxml2=""

supported_cpu="no"

supported_os="no"

@@ -XXX,XX +XXX,XX @@ for opt do

;;

--enable-numa) numa="yes"

;;

+ --disable-libxml2) libxml2="no"

+ ;;

+ --enable-libxml2) libxml2="yes"

+ ;;

--disable-tcmalloc) tcmalloc="no"

;;

--enable-tcmalloc) tcmalloc="yes"

@@ -XXX,XX +XXX,XX @@ disabled with --disable-FEATURE, default is enabled if available:

tpm TPM support

libssh2 ssh block device support

numa libnuma support

+ libxml2 for Parallels image format

tcmalloc tcmalloc support

jemalloc jemalloc support

replication replication support

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

fi

fi

+##########################################

+# libxml2 probe

+if test "$libxml2" != "no" ; then

+ if $pkg_config --exists libxml-2.0; then

+ libxml2="yes"

+ libxml2_cflags=$($pkg_config --cflags libxml-2.0)

+ libxml2_libs=$($pkg_config --libs libxml-2.0)

+ else

+ if test "$libxml2" = "yes"; then

+ feature_not_found "libxml2" "Install libxml2 devel"

+ fi

+ libxml2="no"

+ fi

+fi

##########################################

# glusterfs probe

@@ -XXX,XX +XXX,XX @@ echo "lzo support $lzo"

echo "snappy support $snappy"

echo "bzip2 support $bzip2"

echo "NUMA host support $numa"

+echo "libxml2 $libxml2"

echo "tcmalloc support $tcmalloc"

echo "jemalloc support $jemalloc"

echo "avx2 optimization $avx2_opt"

@@ -XXX,XX +XXX,XX @@ if test "$have_rtnetlink" = "yes" ; then

echo "CONFIG_RTNETLINK=y" >> $config_host_mak

fi

+if test "$libxml2" = "yes" ; then

+ echo "CONFIG_LIBXML2=y" >> $config_host_mak

+ echo "LIBXML2_CFLAGS=$libxml2_cflags" >> $config_host_mak

+ echo "LIBXML2_LIBS=$libxml2_libs" >> $config_host_mak

+fi

+

if test "$replication" = "yes" ; then

echo "CONFIG_REPLICATION=y" >> $config_host_mak

fi

diff --git a/block/Makefile.objs b/block/Makefile.objs

--- a/block/Makefile.objs

+++ b/block/Makefile.objs

@@ -XXX,XX +XXX,XX @@ block-obj-$(if $(CONFIG_BZIP2),m,n) += dmg-bz2.o

dmg-bz2.o-libs := $(BZIP2_LIBS)

qcow.o-libs := -lz

linux-aio.o-libs := -laio

+parallels.o-cflags := $(LIBXML2_CFLAGS)

+parallels.o-libs := $(LIBXML2_LIBS)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl

index XXXXXXX..XXXXXXX 100755

--- a/scripts/checkpatch.pl

+++ b/scripts/checkpatch.pl

@@ -XXX,XX +XXX,XX @@ our @typeList = (

    qr{${Ident}_handler_fn},

    qr{target_(?:u)?long},

    qr{hwaddr},

+    qr{xml${Ident}},

);

# This can be modified by sub possible. Since it can be empty, be careful

2.14.3

From: Klim Kireev <klim.kireev@virtuozzo.com>

To implement xml format, some defines and structures

from parallels.c are required.

Signed-off-by: Klim Kireev <klim.kireev@virtuozzo.com>

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

Signed-off-by: Denis V. Lunev <den@openvz.org>

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

Signed-off-by: Edgar Kaziakhmedov <edgar.kaziakhmedov@virtuozzo.com>

Message-id: 20180112090122.1702-4-klim.kireev@virtuozzo.com

CC: Stefan Hajnoczi <stefanha@redhat.com>