* [Qemu-devel] [PULL 0/4] Block patches
@ 2018-09-12 13:18 Jeff Cody
2018-09-12 13:18 ` [Qemu-devel] [PULL 1/4] block/rbd: pull out qemu_rbd_convert_options Jeff Cody
` (3 more replies)
0 siblings, 4 replies; 31+ messages in thread
From: Jeff Cody @ 2018-09-12 13:18 UTC (permalink / raw)
To: qemu-block; +Cc: peter.maydell, jcody, Kevin Wolf, qemu-devel, Max Reitz
The following changes since commit 19b599f7664b2ebfd0f405fb79c14dd241557452:
Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2018-08-27-v2' into staging (2018-08-27 16:44:20 +0100)
are available in the Git repository at:
git://github.com/codyprime/qemu-kvm-jtc.git tags/block-pull-request
for you to fetch changes up to 8af2eb7b43a1b694fd6d1d090025027d6b72caac:
block/rbd: add deprecation documentation for filename keyvalue pairs (2018-09-12 08:51:45 -0400)
----------------------------------------------------------------
Block patches for RBD
----------------------------------------------------------------
Jeff Cody (4):
block/rbd: pull out qemu_rbd_convert_options
block/rbd: Attempt to parse legacy filenames
block/rbd: add iotest for rbd legacy keyvalue filename parsing
block/rbd: add deprecation documentation for filename keyvalue pairs
block/rbd.c | 89 ++++++++++++++++++++++++++++++++------
qemu-deprecated.texi | 15 +++++++
tests/qemu-iotests/231 | 62 ++++++++++++++++++++++++++
tests/qemu-iotests/231.out | 9 ++++
tests/qemu-iotests/group | 1 +
5 files changed, 162 insertions(+), 14 deletions(-)
create mode 100755 tests/qemu-iotests/231
create mode 100644 tests/qemu-iotests/231.out
--
2.17.1
^ permalink raw reply [flat|nested] 31+ messages in thread* [Qemu-devel] [PULL 1/4] block/rbd: pull out qemu_rbd_convert_options
2018-09-12 13:18 [Qemu-devel] [PULL 0/4] Block patches Jeff Cody
@ 2018-09-12 13:18 ` Jeff Cody
2018-09-12 13:18 ` [Qemu-devel] [PULL 2/4] block/rbd: Attempt to parse legacy filenames Jeff Cody
` (2 subsequent siblings)
3 siblings, 0 replies; 31+ messages in thread
From: Jeff Cody @ 2018-09-12 13:18 UTC (permalink / raw)
To: qemu-block; +Cc: peter.maydell, jcody, Kevin Wolf, qemu-devel, Max Reitz
Code movement to pull the conversion from Qdict to BlockdevOptionsRbd
into a helper function.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
Message-id: 5b49a980f2cde6610ab1df41bb0277d00b5db893.1536704901.git.jcody@redhat.com
Signed-off-by: Jeff Cody <jcody@redhat.com>
---
block/rbd.c | 36 ++++++++++++++++++++++++------------
1 file changed, 24 insertions(+), 12 deletions(-)
diff --git a/block/rbd.c b/block/rbd.c
index ca8e5bbace..b199450f9f 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -655,12 +655,34 @@ failed_opts:
return r;
}
+static int qemu_rbd_convert_options(QDict *options, BlockdevOptionsRbd **opts,
+ Error **errp)
+{
+ Visitor *v;
+ Error *local_err = NULL;
+
+ /* Convert the remaining options into a QAPI object */
+ v = qobject_input_visitor_new_flat_confused(options, errp);
+ if (!v) {
+ return -EINVAL;
+ }
+
+ visit_type_BlockdevOptionsRbd(v, NULL, opts, &local_err);
+ visit_free(v);
+
+ if (local_err) {
+ error_propagate(errp, local_err);
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
Error **errp)
{
BDRVRBDState *s = bs->opaque;
BlockdevOptionsRbd *opts = NULL;
- Visitor *v;
const QDictEntry *e;
Error *local_err = NULL;
char *keypairs, *secretid;
@@ -676,19 +698,9 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
qdict_del(options, "password-secret");
}
- /* Convert the remaining options into a QAPI object */
- v = qobject_input_visitor_new_flat_confused(options, errp);
- if (!v) {
- r = -EINVAL;
- goto out;
- }
-
- visit_type_BlockdevOptionsRbd(v, NULL, &opts, &local_err);
- visit_free(v);
-
+ r = qemu_rbd_convert_options(options, &opts, &local_err);
if (local_err) {
error_propagate(errp, local_err);
- r = -EINVAL;
goto out;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PULL 2/4] block/rbd: Attempt to parse legacy filenames
2018-09-12 13:18 [Qemu-devel] [PULL 0/4] Block patches Jeff Cody
2018-09-12 13:18 ` [Qemu-devel] [PULL 1/4] block/rbd: pull out qemu_rbd_convert_options Jeff Cody
@ 2018-09-12 13:18 ` Jeff Cody
2018-09-14 17:49 ` Eric Blake
2018-09-12 13:18 ` [Qemu-devel] [PULL 3/4] block/rbd: add iotest for rbd legacy keyvalue filename parsing Jeff Cody
2018-09-12 13:18 ` [Qemu-devel] [PULL 4/4] block/rbd: add deprecation documentation for filename keyvalue pairs Jeff Cody
3 siblings, 1 reply; 31+ messages in thread
From: Jeff Cody @ 2018-09-12 13:18 UTC (permalink / raw)
To: qemu-block; +Cc: peter.maydell, jcody, Kevin Wolf, qemu-devel, Max Reitz
When we converted rbd to get rid of the older key/value-centric
encoding format, we broke compatibility with image files with backing
file strings encoded in the old format.
This leaves a bit of an ugly conundrum, and a hacky solution.
If the initial attempt to parse the "proper" options fails, it assumes
that we may have an older key/value encoded filename. Fall back to
attempting to parse the filename, and extract the required options from
it. If that fails, pass along the original error message.
We do not support mixed modern usage alongside legacy keyvalue pair
usage.
A deprecation warning has been added, although care should be taken
when actually deprecating since the impact is not limited to
commandline or qapi usage, but also opening existing images.
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
Message-id: 15b332e5432ad069441f7275a46080f465d789a0.1536704901.git.jcody@redhat.com
Signed-off-by: Jeff Cody <jcody@redhat.com>
---
block/rbd.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 51 insertions(+), 2 deletions(-)
diff --git a/block/rbd.c b/block/rbd.c
index b199450f9f..5090e4f662 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -678,6 +678,33 @@ static int qemu_rbd_convert_options(QDict *options, BlockdevOptionsRbd **opts,
return 0;
}
+static int qemu_rbd_attempt_legacy_options(QDict *options,
+ BlockdevOptionsRbd **opts,
+ char **keypairs)
+{
+ char *filename;
+ int r;
+
+ filename = g_strdup(qdict_get_try_str(options, "filename"));
+ if (!filename) {
+ return -EINVAL;
+ }
+ qdict_del(options, "filename");
+
+ qemu_rbd_parse_filename(filename, options, NULL);
+
+ /* keypairs freed by caller */
+ *keypairs = g_strdup(qdict_get_try_str(options, "=keyvalue-pairs"));
+ if (*keypairs) {
+ qdict_del(options, "=keyvalue-pairs");
+ }
+
+ r = qemu_rbd_convert_options(options, opts, NULL);
+
+ g_free(filename);
+ return r;
+}
+
static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
Error **errp)
{
@@ -700,8 +727,30 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
r = qemu_rbd_convert_options(options, &opts, &local_err);
if (local_err) {
- error_propagate(errp, local_err);
- goto out;
+ /* If keypairs are present, that means some options are present in
+ * the modern option format. Don't attempt to parse legacy option
+ * formats, as we won't support mixed usage. */
+ if (keypairs) {
+ error_propagate(errp, local_err);
+ goto out;
+ }
+
+ /* If the initial attempt to convert and process the options failed,
+ * we may be attempting to open an image file that has the rbd options
+ * specified in the older format consisting of all key/value pairs
+ * encoded in the filename. Go ahead and attempt to parse the
+ * filename, and see if we can pull out the required options. */
+ r = qemu_rbd_attempt_legacy_options(options, &opts, &keypairs);
+ if (r < 0) {
+ error_propagate(errp, local_err);
+ goto out;
+ }
+ /* Take care whenever deciding to actually deprecate; once this ability
+ * is removed, we will not be able to open any images with legacy-styled
+ * backing image strings. */
+ error_report("RBD options encoded in the filename as keyvalue pairs "
+ "is deprecated. Future versions may cease to parse "
+ "these options in the future.");
}
/* Remove the processed options from the QDict (the visitor processes
--
2.17.1
^ permalink raw reply related [flat|nested] 31+ messages in thread* Re: [Qemu-devel] [PULL 2/4] block/rbd: Attempt to parse legacy filenames
2018-09-12 13:18 ` [Qemu-devel] [PULL 2/4] block/rbd: Attempt to parse legacy filenames Jeff Cody
@ 2018-09-14 17:49 ` Eric Blake
0 siblings, 0 replies; 31+ messages in thread
From: Eric Blake @ 2018-09-14 17:49 UTC (permalink / raw)
To: Jeff Cody, qemu-block; +Cc: Kevin Wolf, peter.maydell, qemu-devel, Max Reitz
On 9/12/18 8:18 AM, Jeff Cody wrote:
> When we converted rbd to get rid of the older key/value-centric
> encoding format, we broke compatibility with image files with backing
> file strings encoded in the old format.
>
> This leaves a bit of an ugly conundrum, and a hacky solution.
>
> + /* Take care whenever deciding to actually deprecate; once this ability
> + * is removed, we will not be able to open any images with legacy-styled
> + * backing image strings. */
> + error_report("RBD options encoded in the filename as keyvalue pairs "
> + "is deprecated. Future versions may cease to parse "
> + "these options in the future.");
Fam spotted offline that " in the future" is redundant with "Future
versions", if you want to respin the pull request.
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
^ permalink raw reply [flat|nested] 31+ messages in thread
* [Qemu-devel] [PULL 3/4] block/rbd: add iotest for rbd legacy keyvalue filename parsing
2018-09-12 13:18 [Qemu-devel] [PULL 0/4] Block patches Jeff Cody
2018-09-12 13:18 ` [Qemu-devel] [PULL 1/4] block/rbd: pull out qemu_rbd_convert_options Jeff Cody
2018-09-12 13:18 ` [Qemu-devel] [PULL 2/4] block/rbd: Attempt to parse legacy filenames Jeff Cody
@ 2018-09-12 13:18 ` Jeff Cody
2018-09-12 13:18 ` [Qemu-devel] [PULL 4/4] block/rbd: add deprecation documentation for filename keyvalue pairs Jeff Cody
3 siblings, 0 replies; 31+ messages in thread
From: Jeff Cody @ 2018-09-12 13:18 UTC (permalink / raw)
To: qemu-block; +Cc: peter.maydell, jcody, Kevin Wolf, qemu-devel, Max Reitz
This is a small test that will check for the ability to parse
both legacy and modern options for rbd.
The way the test is set up is for failure to occur, but without
having to wait to timeout on a non-existent rbd server. The error
messages in the success path show that the arguments were parsed.
The failure behavior prior to the patch series that has this test, is
qemu-img complaining about mandatory options (e.g. 'pool') not being
provided.
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
Message-id: f830580e339b974a83ed4870d11adcdc17f49a47.1536704901.git.jcody@redhat.com
Signed-off-by: Jeff Cody <jcody@redhat.com>
---
tests/qemu-iotests/231 | 62 ++++++++++++++++++++++++++++++++++++++
tests/qemu-iotests/231.out | 9 ++++++
tests/qemu-iotests/group | 1 +
3 files changed, 72 insertions(+)
create mode 100755 tests/qemu-iotests/231
create mode 100644 tests/qemu-iotests/231.out
diff --git a/tests/qemu-iotests/231 b/tests/qemu-iotests/231
new file mode 100755
index 0000000000..3e283708b4
--- /dev/null
+++ b/tests/qemu-iotests/231
@@ -0,0 +1,62 @@
+#!/bin/bash
+#
+# Test legacy and modern option parsing for rbd/ceph. This will not
+# actually connect to a ceph server, but rather looks for the appropriate
+# error message that indicates we parsed the options correctly.
+#
+# Copyright (C) 2018 Red Hat, Inc.
+#
+# 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=jcody@redhat.com
+
+seq=`basename $0`
+echo "QA output created by $seq"
+
+here=`pwd`
+status=1 # failure is the default!
+
+_cleanup()
+{
+ rm "${BOGUS_CONF}"
+}
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+. ./common.rc
+. ./common.filter
+
+_supported_fmt generic
+_supported_proto rbd
+_supported_os Linux
+
+BOGUS_CONF=${TEST_DIR}/ceph-$$.conf
+touch "${BOGUS_CONF}"
+
+_filter_conf()
+{
+ sed -e "s#$BOGUS_CONF#BOGUS_CONF#g"
+}
+
+# We expect this to fail, with no monitor ip provided and a null conf file. Just want it
+# to fail in the right way.
+$QEMU_IMG info "json:{'file.driver':'rbd','file.filename':'rbd:rbd/bogus:conf=${BOGUS_CONF}'}" 2>&1 | _filter_conf
+$QEMU_IMG info "json:{'file.driver':'rbd','file.pool':'rbd','file.image':'bogus','file.conf':'${BOGUS_CONF}'}" 2>&1 | _filter_conf
+
+# success, all done
+echo "*** done"
+rm -f $seq.full
+status=0
diff --git a/tests/qemu-iotests/231.out b/tests/qemu-iotests/231.out
new file mode 100644
index 0000000000..579ba11c16
--- /dev/null
+++ b/tests/qemu-iotests/231.out
@@ -0,0 +1,9 @@
+QA output created by 231
+qemu-img: RBD options encoded in the filename as keyvalue pairs is deprecated. Future versions may cease to parse these options in the future.
+unable to get monitor info from DNS SRV with service name: ceph-mon
+no monitors specified to connect to.
+qemu-img: Could not open 'json:{'file.driver':'rbd','file.filename':'rbd:rbd/bogus:conf=BOGUS_CONF'}': error connecting: No such file or directory
+unable to get monitor info from DNS SRV with service name: ceph-mon
+no monitors specified to connect to.
+qemu-img: Could not open 'json:{'file.driver':'rbd','file.pool':'rbd','file.image':'bogus','file.conf':'BOGUS_CONF'}': error connecting: No such file or directory
+*** done
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index 743790745b..31f6e77dcb 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -226,3 +226,4 @@
226 auto quick
227 auto quick
229 auto quick
+231 auto quick
--
2.17.1
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PULL 4/4] block/rbd: add deprecation documentation for filename keyvalue pairs
2018-09-12 13:18 [Qemu-devel] [PULL 0/4] Block patches Jeff Cody
` (2 preceding siblings ...)
2018-09-12 13:18 ` [Qemu-devel] [PULL 3/4] block/rbd: add iotest for rbd legacy keyvalue filename parsing Jeff Cody
@ 2018-09-12 13:18 ` Jeff Cody
3 siblings, 0 replies; 31+ messages in thread
From: Jeff Cody @ 2018-09-12 13:18 UTC (permalink / raw)
To: qemu-block; +Cc: peter.maydell, jcody, Kevin Wolf, qemu-devel, Max Reitz
Signed-off-by: Jeff Cody <jcody@redhat.com>
Message-id: 647f5b5ab7efd8bf567a504c832b1d2d6f719b23.1536704901.git.jcody@redhat.com
Signed-off-by: Jeff Cody <jcody@redhat.com>
---
qemu-deprecated.texi | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi
index 1b9c007f12..8d285b281e 100644
--- a/qemu-deprecated.texi
+++ b/qemu-deprecated.texi
@@ -190,6 +190,21 @@ used instead.
In order to prevent QEMU from automatically opening an image's backing
chain, use ``"backing": null'' instead.
+@subsubsection rbd keyvalue pair encoded filenames: "" (since 3.1.0)
+
+Options for ``rbd'' should be specified according to its runtime options,
+like other block drivers. Legacy parsing of keyvalue pair encoded
+filenames is useful to open images with the old format for backing files;
+These image files should be updated to use the current format.
+
+Example of legacy encoding:
+
+@code{json:@{"file.driver":"rbd", "file.filename":"rbd:rbd/name"@}}
+
+The above, converted to the current supported format:
+
+@code{json:@{"file.driver":"rbd", "file.pool":"rbd", "file.image":"name"@}}
+
@subsection vio-spapr-device device options
@subsubsection "irq": "" (since 3.0.0)
--
2.17.1
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [Qemu-devel] [PULL 0/4] Block patches
@ 2019-01-04 11:21 Stefan Hajnoczi
2019-01-04 14:54 ` Peter Maydell
0 siblings, 1 reply; 31+ messages in thread
From: Stefan Hajnoczi @ 2019-01-04 11:21 UTC (permalink / raw)
To: qemu-devel
Cc: Max Reitz, Stefan Hajnoczi, Kevin Wolf, Peter Maydell, qemu-block
The following changes since commit 20d6c7312f1b812bb9c750f4087f69ac8485cc90:
Merge remote-tracking branch 'remotes/palmer/tags/riscv-for-master-3.2-part1' into staging (2019-01-03 13:26:30 +0000)
are available in the Git repository at:
git://github.com/stefanha/qemu.git tags/block-pull-request
for you to fetch changes up to 39a0408e768cd00142f5b57d27ab234282bf4df5:
dmg: don't skip zero chunk (2019-01-04 11:15:09 +0000)
----------------------------------------------------------------
Pull request
Bug fixes for the .dmg image file format.
----------------------------------------------------------------
Julio Faracco (1):
dmg: Fixing wrong dmg block type value for block terminator.
yuchenlin (3):
dmg: fix binary search
dmg: use enumeration type instead of hard coding number
dmg: don't skip zero chunk
block/dmg.c | 31 ++++++++++++++++++++-----------
1 file changed, 20 insertions(+), 11 deletions(-)
--
2.20.1
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [Qemu-devel] [PULL 0/4] Block patches
2019-01-04 11:21 [Qemu-devel] [PULL 0/4] Block patches Stefan Hajnoczi
@ 2019-01-04 14:54 ` Peter Maydell
0 siblings, 0 replies; 31+ messages in thread
From: Peter Maydell @ 2019-01-04 14:54 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: QEMU Developers, Max Reitz, Kevin Wolf, Qemu-block
On Fri, 4 Jan 2019 at 11:21, Stefan Hajnoczi <stefanha@redhat.com> wrote:
>
> The following changes since commit 20d6c7312f1b812bb9c750f4087f69ac8485cc90:
>
> Merge remote-tracking branch 'remotes/palmer/tags/riscv-for-master-3.2-part1' into staging (2019-01-03 13:26:30 +0000)
>
> are available in the Git repository at:
>
> git://github.com/stefanha/qemu.git tags/block-pull-request
>
> for you to fetch changes up to 39a0408e768cd00142f5b57d27ab234282bf4df5:
>
> dmg: don't skip zero chunk (2019-01-04 11:15:09 +0000)
>
> ----------------------------------------------------------------
> Pull request
>
> Bug fixes for the .dmg image file format.
>
> ----------------------------------------------------------------
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/4.0
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 31+ messages in thread
* [Qemu-devel] [PULL 0/4] Block patches
@ 2018-05-16 17:42 Jeff Cody
2018-05-17 12:18 ` Peter Maydell
0 siblings, 1 reply; 31+ messages in thread
From: Jeff Cody @ 2018-05-16 17:42 UTC (permalink / raw)
To: qemu-block; +Cc: peter.maydell, jcody, Kevin Wolf, qemu-devel, Stefan Hajnoczi
The following changes since commit c416eecea5f3aea863ab8fda5a36a24157b8f704:
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2018-05-15 17:02:00 +0100)
are available in the git repository at:
git://github.com/codyprime/qemu-kvm-jtc.git tags/block-pull-request
for you to fetch changes up to c82be42cc803b36fd7aed5dceec68312c7056fd5:
nfs: Remove processed options from QDict (2018-05-16 13:37:47 -0400)
----------------------------------------------------------------
Block patches
----------------------------------------------------------------
Kevin Wolf (2):
nfs: Fix error path in nfs_options_qdict_to_qapi()
nfs: Remove processed options from QDict
Stefan Hajnoczi (2):
qemu-iotests: reduce chance of races in 185
blockjob: do not cancel timer in resume
block/nfs.c | 8 ++++++++
blockjob.c | 22 +++++++++++++++-------
tests/qemu-iotests/185 | 17 +++++++++++++----
tests/qemu-iotests/185.out | 12 +++++-------
4 files changed, 41 insertions(+), 18 deletions(-)
--
2.13.6
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [Qemu-devel] [PULL 0/4] Block patches
2018-05-16 17:42 Jeff Cody
@ 2018-05-17 12:18 ` Peter Maydell
0 siblings, 0 replies; 31+ messages in thread
From: Peter Maydell @ 2018-05-17 12:18 UTC (permalink / raw)
To: Jeff Cody; +Cc: Qemu-block, Kevin Wolf, QEMU Developers, Stefan Hajnoczi
On 16 May 2018 at 18:42, Jeff Cody <jcody@redhat.com> wrote:
> The following changes since commit c416eecea5f3aea863ab8fda5a36a24157b8f704:
>
> Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2018-05-15 17:02:00 +0100)
>
> are available in the git repository at:
>
> git://github.com/codyprime/qemu-kvm-jtc.git tags/block-pull-request
>
> for you to fetch changes up to c82be42cc803b36fd7aed5dceec68312c7056fd5:
>
> nfs: Remove processed options from QDict (2018-05-16 13:37:47 -0400)
>
> ----------------------------------------------------------------
> Block patches
> ----------------------------------------------------------------
>
> Kevin Wolf (2):
> nfs: Fix error path in nfs_options_qdict_to_qapi()
> nfs: Remove processed options from QDict
>
> Stefan Hajnoczi (2):
> qemu-iotests: reduce chance of races in 185
> blockjob: do not cancel timer in resume
Applied, thanks.
-- PMM
^ permalink raw reply [flat|nested] 31+ messages in thread
* [Qemu-devel] [PULL 0/4] Block patches
@ 2018-05-08 15:19 Jeff Cody
2018-05-08 16:54 ` Peter Maydell
0 siblings, 1 reply; 31+ messages in thread
From: Jeff Cody @ 2018-05-08 15:19 UTC (permalink / raw)
To: qemu-block
Cc: peter.maydell, sheepdog, Hitoshi Mitake, Kevin Wolf, qemu-devel,
Jeff Cody, Max Reitz, Liu Yuan
The following changes since commit d01beac177d44491d7db8747b79d94e1b53d173b:
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20180507-pull-request' into staging (2018-05-08 14:23:02 +0100)
are available in the git repository at:
git://github.com/codyprime/qemu-kvm-jtc.git tags/block-pull-request
for you to fetch changes up to a2cb9239b7610ffb00f9ced5cd7640d40b0e1ccf:
sheepdog: Fix sd_co_create_opts() memory leaks (2018-05-08 10:47:27 -0400)
----------------------------------------------------------------
Block patches
----------------------------------------------------------------
Kevin Wolf (1):
sheepdog: Fix sd_co_create_opts() memory leaks
Max Reitz (2):
block/mirror: Make cancel always cancel pre-READY
iotests: Add test for cancelling a mirror job
Stefan Hajnoczi (1):
block/mirror: honor ratelimit again
block/mirror.c | 14 +++--
block/sheepdog.c | 4 +-
tests/qemu-iotests/185.out | 4 +-
tests/qemu-iotests/218 | 138 +++++++++++++++++++++++++++++++++++++++++++++
tests/qemu-iotests/218.out | 30 ++++++++++
tests/qemu-iotests/group | 1 +
6 files changed, 183 insertions(+), 8 deletions(-)
create mode 100644 tests/qemu-iotests/218
create mode 100644 tests/qemu-iotests/218.out
--
2.13.6
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [Qemu-devel] [PULL 0/4] Block patches
2018-05-08 15:19 Jeff Cody
@ 2018-05-08 16:54 ` Peter Maydell
0 siblings, 0 replies; 31+ messages in thread
From: Peter Maydell @ 2018-05-08 16:54 UTC (permalink / raw)
To: Jeff Cody
Cc: Qemu-block, sheepdog, Hitoshi Mitake, Kevin Wolf,
QEMU Developers, Max Reitz, Liu Yuan
On 8 May 2018 at 16:19, Jeff Cody <jcody@redhat.com> wrote:
> The following changes since commit d01beac177d44491d7db8747b79d94e1b53d173b:
>
> Merge remote-tracking branch 'remotes/kraxel/tags/vga-20180507-pull-request' into staging (2018-05-08 14:23:02 +0100)
>
> are available in the git repository at:
>
> git://github.com/codyprime/qemu-kvm-jtc.git tags/block-pull-request
>
> for you to fetch changes up to a2cb9239b7610ffb00f9ced5cd7640d40b0e1ccf:
>
> sheepdog: Fix sd_co_create_opts() memory leaks (2018-05-08 10:47:27 -0400)
>
> ----------------------------------------------------------------
> Block patches
> ----------------------------------------------------------------
>
Applied, thanks.
-- PMM
^ permalink raw reply [flat|nested] 31+ messages in thread
* [Qemu-devel] [PULL 0/4] Block patches
@ 2018-03-27 14:41 Stefan Hajnoczi
2018-03-27 18:20 ` Peter Maydell
2018-03-31 7:12 ` no-reply
0 siblings, 2 replies; 31+ messages in thread
From: Stefan Hajnoczi @ 2018-03-27 14:41 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, Stefan Hajnoczi
The following changes since commit f58d9620aa4a514b1227074ff56eefd1334a6225:
Merge remote-tracking branch 'remotes/rth/tags/pull-dt-20180326' into staging (2018-03-27 10:27:34 +0100)
are available in the Git repository at:
git://github.com/stefanha/qemu.git tags/block-pull-request
for you to fetch changes up to f5a53faad4bfbf1b86012a13055d2a1a774a42b6:
MAINTAINERS: add include/block/aio-wait.h (2018-03-27 13:05:48 +0100)
----------------------------------------------------------------
----------------------------------------------------------------
Stefan Hajnoczi (4):
queue: add QSIMPLEQ_PREPEND()
coroutine: avoid co_queue_wakeup recursion
coroutine: add test-aio coroutine queue chaining test case
MAINTAINERS: add include/block/aio-wait.h
MAINTAINERS | 1 +
include/qemu/coroutine_int.h | 1 -
include/qemu/queue.h | 8 ++++
block/io.c | 3 +-
tests/test-aio.c | 65 ++++++++++++++++++++-----
util/qemu-coroutine-lock.c | 34 -------------
util/qemu-coroutine.c | 110 +++++++++++++++++++++++--------------------
7 files changed, 121 insertions(+), 101 deletions(-)
--
2.14.3
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [Qemu-devel] [PULL 0/4] Block patches
2018-03-27 14:41 Stefan Hajnoczi
@ 2018-03-27 18:20 ` Peter Maydell
2018-03-31 7:12 ` no-reply
1 sibling, 0 replies; 31+ messages in thread
From: Peter Maydell @ 2018-03-27 18:20 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: QEMU Developers
On 27 March 2018 at 15:41, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> The following changes since commit f58d9620aa4a514b1227074ff56eefd1334a6225:
>
> Merge remote-tracking branch 'remotes/rth/tags/pull-dt-20180326' into staging (2018-03-27 10:27:34 +0100)
>
> are available in the Git repository at:
>
> git://github.com/stefanha/qemu.git tags/block-pull-request
>
> for you to fetch changes up to f5a53faad4bfbf1b86012a13055d2a1a774a42b6:
>
> MAINTAINERS: add include/block/aio-wait.h (2018-03-27 13:05:48 +0100)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
>
> Stefan Hajnoczi (4):
> queue: add QSIMPLEQ_PREPEND()
> coroutine: avoid co_queue_wakeup recursion
> coroutine: add test-aio coroutine queue chaining test case
> MAINTAINERS: add include/block/aio-wait.h
>
> MAINTAINERS | 1 +
> include/qemu/coroutine_int.h | 1 -
> include/qemu/queue.h | 8 ++++
> block/io.c | 3 +-
> tests/test-aio.c | 65 ++++++++++++++++++++-----
> util/qemu-coroutine-lock.c | 34 -------------
> util/qemu-coroutine.c | 110 +++++++++++++++++++++++--------------------
> 7 files changed, 121 insertions(+), 101 deletions(-)
>
Applied, thanks.
-- PMM
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [Qemu-devel] [PULL 0/4] Block patches
2018-03-27 14:41 Stefan Hajnoczi
2018-03-27 18:20 ` Peter Maydell
@ 2018-03-31 7:12 ` no-reply
1 sibling, 0 replies; 31+ messages in thread
From: no-reply @ 2018-03-31 7:12 UTC (permalink / raw)
To: stefanha; +Cc: famz, qemu-devel, peter.maydell
Hi,
This series failed docker-build@min-glib build test. Please find the testing commands and
their output below. If you have Docker installed, you can probably reproduce it
locally.
Type: series
Message-id: 20180327144124.32533-1-stefanha@redhat.com
Subject: [Qemu-devel] [PULL 0/4] Block patches
=== TEST SCRIPT BEGIN ===
#!/bin/bash
set -e
git submodule update --init dtc
# Let docker tests dump environment info
export SHOW_ENV=1
export J=8
time make docker-test-build@min-glib
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
Switched to a new branch 'test'
58d76f2171 queue: add QSIMPLEQ_PREPEND()
=== OUTPUT BEGIN ===
Submodule 'dtc' (git://git.qemu-project.org/dtc.git) registered for path 'dtc'
Cloning into '/var/tmp/patchew-tester-tmp-6awfngpj/src/dtc'...
Submodule path 'dtc': checked out 'e54388015af1fb4bf04d0bca99caba1074d9cc42'
BUILD min-glib
make[1]: Entering directory '/var/tmp/patchew-tester-tmp-6awfngpj/src'
GEN /var/tmp/patchew-tester-tmp-6awfngpj/src/docker-src.2018-03-31-03.11.27.1848/qemu.tar
Cloning into '/var/tmp/patchew-tester-tmp-6awfngpj/src/docker-src.2018-03-31-03.11.27.1848/qemu.tar.vroot'...
done.
Checking out files: 33% (2006/6066)
Checking out files: 34% (2063/6066)
Checking out files: 35% (2124/6066)
Checking out files: 36% (2184/6066)
Checking out files: 37% (2245/6066)
Checking out files: 38% (2306/6066)
Checking out files: 39% (2366/6066)
Checking out files: 40% (2427/6066)
Checking out files: 41% (2488/6066)
Checking out files: 42% (2548/6066)
Checking out files: 43% (2609/6066)
Checking out files: 44% (2670/6066)
Checking out files: 45% (2730/6066)
Checking out files: 46% (2791/6066)
Checking out files: 47% (2852/6066)
Checking out files: 48% (2912/6066)
Checking out files: 49% (2973/6066)
Checking out files: 50% (3033/6066)
Checking out files: 51% (3094/6066)
Checking out files: 52% (3155/6066)
Checking out files: 53% (3215/6066)
Checking out files: 54% (3276/6066)
Checking out files: 55% (3337/6066)
Checking out files: 56% (3397/6066)
Checking out files: 57% (3458/6066)
Checking out files: 58% (3519/6066)
Checking out files: 59% (3579/6066)
Checking out files: 59% (3623/6066)
Checking out files: 60% (3640/6066)
Checking out files: 61% (3701/6066)
Checking out files: 62% (3761/6066)
Checking out files: 63% (3822/6066)
Checking out files: 64% (3883/6066)
Checking out files: 65% (3943/6066)
Checking out files: 66% (4004/6066)
Checking out files: 67% (4065/6066)
Checking out files: 68% (4125/6066)
Checking out files: 69% (4186/6066)
Checking out files: 70% (4247/6066)
Checking out files: 71% (4307/6066)
Checking out files: 72% (4368/6066)
Checking out files: 73% (4429/6066)
Checking out files: 74% (4489/6066)
Checking out files: 75% (4550/6066)
Checking out files: 76% (4611/6066)
Checking out files: 77% (4671/6066)
Checking out files: 78% (4732/6066)
Checking out files: 79% (4793/6066)
Checking out files: 80% (4853/6066)
Checking out files: 81% (4914/6066)
Checking out files: 82% (4975/6066)
Checking out files: 83% (5035/6066)
Checking out files: 84% (5096/6066)
Checking out files: 85% (5157/6066)
Checking out files: 86% (5217/6066)
Checking out files: 87% (5278/6066)
Checking out files: 88% (5339/6066)
Checking out files: 89% (5399/6066)
Checking out files: 90% (5460/6066)
Checking out files: 90% (5517/6066)
Checking out files: 91% (5521/6066)
Checking out files: 92% (5581/6066)
Checking out files: 93% (5642/6066)
Checking out files: 94% (5703/6066)
Checking out files: 94% (5725/6066)
Checking out files: 95% (5763/6066)
Checking out files: 96% (5824/6066)
Checking out files: 97% (5885/6066)
Checking out files: 98% (5945/6066)
Checking out files: 98% (5988/6066)
Checking out files: 99% (6006/6066)
Checking out files: 100% (6066/6066)
Checking out files: 100% (6066/6066), done.
Your branch is up-to-date with 'origin/test'.
Submodule 'dtc' (git://git.qemu-project.org/dtc.git) registered for path 'dtc'
Cloning into '/var/tmp/patchew-tester-tmp-6awfngpj/src/docker-src.2018-03-31-03.11.27.1848/qemu.tar.vroot/dtc'...
Submodule path 'dtc': checked out 'e54388015af1fb4bf04d0bca99caba1074d9cc42'
Submodule 'ui/keycodemapdb' (git://git.qemu.org/keycodemapdb.git) registered for path 'ui/keycodemapdb'
Cloning into '/var/tmp/patchew-tester-tmp-6awfngpj/src/docker-src.2018-03-31-03.11.27.1848/qemu.tar.vroot/ui/keycodemapdb'...
Submodule path 'ui/keycodemapdb': checked out '6b3d716e2b6472eb7189d3220552280ef3d832ce'
tar: /var/tmp/patchew-tester-tmp-6awfngpj/src/docker-src.2018-03-31-03.11.27.1848/qemu.tar: Wrote only 2048 of 10240 bytes
tar: Error is not recoverable: exiting now
failed to create tar file
COPY RUNNER
RUN test-build in qemu:min-glib
tar: Unexpected EOF in archive
tar: Unexpected EOF in archive
tar: Error is not recoverable: exiting now
/var/tmp/qemu/run: line 32: prep_fail: command not found
Environment variables:
HOSTNAME=7ec65e6e427d
MAKEFLAGS= -j8
J=8
CCACHE_DIR=/var/tmp/ccache
EXTRA_CONFIGURE_OPTS=
V=
SHOW_ENV=1
PATH=/usr/lib/ccache:/usr/lib64/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
PWD=/
TARGET_LIST=
SHLVL=1
HOME=/root
TEST_DIR=/tmp/qemu-test
FEATURES= dtc
DEBUG=
_=/usr/bin/env
Configure options:
--enable-werror --target-list=x86_64-softmmu,aarch64-softmmu --prefix=/tmp/qemu-test/install
ERROR: DTC (libfdt) version >= 1.4.2 not present.
Please install the DTC (libfdt) devel package
Traceback (most recent call last):
File "./tests/docker/docker.py", line 407, in <module>
sys.exit(main())
File "./tests/docker/docker.py", line 404, in main
return args.cmdobj.run(args, argv)
File "./tests/docker/docker.py", line 261, in run
return Docker().run(argv, args.keep, quiet=args.quiet)
File "./tests/docker/docker.py", line 229, in run
quiet=quiet)
File "./tests/docker/docker.py", line 147, in _do_check
return subprocess.check_call(self._command + cmd, **kwargs)
File "/usr/lib64/python2.7/subprocess.py", line 186, in check_call
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['docker', 'run', '--label', 'com.qemu.instance.uuid=c90672f634b211e88e0f52540069c830', '-u', '0', '--security-opt', 'seccomp=unconfined', '--rm', '--net=none', '-e', 'TARGET_LIST=', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=8', '-e', 'DEBUG=', '-e', 'SHOW_ENV=1', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/root/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-6awfngpj/src/docker-src.2018-03-31-03.11.27.1848:/var/tmp/qemu:z,ro', 'qemu:min-glib', '/var/tmp/qemu/run', 'test-build']' returned non-zero exit status 1
make[1]: *** [tests/docker/Makefile.include:129: docker-run] Error 1
make[1]: Leaving directory '/var/tmp/patchew-tester-tmp-6awfngpj/src'
make: *** [tests/docker/Makefile.include:163: docker-run-test-build@min-glib] Error 2
real 0m51.126s
user 0m9.121s
sys 0m6.557s
=== OUTPUT END ===
Test command exited with code: 2
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 31+ messages in thread
* [Qemu-devel] [PULL 0/4] Block patches
@ 2017-09-05 13:29 Stefan Hajnoczi
2017-09-05 15:36 ` Peter Maydell
0 siblings, 1 reply; 31+ messages in thread
From: Stefan Hajnoczi @ 2017-09-05 13:29 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, Stefan Hajnoczi
The following changes since commit 2b483739791b33c46e6084b51edcf62107058ae1:
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20170904-2' into staging (2017-09-04 17:21:24 +0100)
are available in the git repository at:
git://github.com/stefanha/qemu.git tags/block-pull-request
for you to fetch changes up to b461151ff31c7925f271c297e8abed20231ac7d3:
block: document semantics of bdrv_co_preadv|pwritev (2017-09-05 11:07:02 +0100)
----------------------------------------------------------------
----------------------------------------------------------------
Daniel P. Berrange (1):
block: document semantics of bdrv_co_preadv|pwritev
Stefan Hajnoczi (3):
qemu.py: make VM() a context manager
iotests.py: add FilePath context manager
qemu-iotests: use context managers for resource cleanup in 194
include/block/block_int.h | 31 +++++++++++
scripts/qemu.py | 16 +++++-
tests/qemu-iotests/194 | 117 +++++++++++++++++++++---------------------
tests/qemu-iotests/iotests.py | 26 ++++++++++
4 files changed, 130 insertions(+), 60 deletions(-)
--
2.13.5
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [Qemu-devel] [PULL 0/4] Block patches
2017-09-05 13:29 Stefan Hajnoczi
@ 2017-09-05 15:36 ` Peter Maydell
0 siblings, 0 replies; 31+ messages in thread
From: Peter Maydell @ 2017-09-05 15:36 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: QEMU Developers
On 5 September 2017 at 14:29, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> The following changes since commit 2b483739791b33c46e6084b51edcf62107058ae1:
>
> Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20170904-2' into staging (2017-09-04 17:21:24 +0100)
>
> are available in the git repository at:
>
> git://github.com/stefanha/qemu.git tags/block-pull-request
>
> for you to fetch changes up to b461151ff31c7925f271c297e8abed20231ac7d3:
>
> block: document semantics of bdrv_co_preadv|pwritev (2017-09-05 11:07:02 +0100)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
>
> Daniel P. Berrange (1):
> block: document semantics of bdrv_co_preadv|pwritev
>
> Stefan Hajnoczi (3):
> qemu.py: make VM() a context manager
> iotests.py: add FilePath context manager
> qemu-iotests: use context managers for resource cleanup in 194
>
> include/block/block_int.h | 31 +++++++++++
> scripts/qemu.py | 16 +++++-
> tests/qemu-iotests/194 | 117 +++++++++++++++++++++---------------------
> tests/qemu-iotests/iotests.py | 26 ++++++++++
> 4 files changed, 130 insertions(+), 60 deletions(-)
Applied, thanks.
-- PMM
^ permalink raw reply [flat|nested] 31+ messages in thread
* [Qemu-devel] [PULL 0/4] Block patches
@ 2017-02-27 16:34 Stefan Hajnoczi
2017-02-28 10:38 ` Peter Maydell
0 siblings, 1 reply; 31+ messages in thread
From: Stefan Hajnoczi @ 2017-02-27 16:34 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, Stefan Hajnoczi
The following changes since commit d992f2f1368ceb92e6bfd8efece174110f4236ff:
Merge remote-tracking branch 'remotes/artyom/tags/pull-sun4v-20170226' into staging (2017-02-26 22:40:23 +0000)
are available in the git repository at:
git://github.com/stefanha/qemu.git tags/block-pull-request
for you to fetch changes up to 1ab17f9f5c63c2798d707aeb22588e4fcc17b2cd:
tests-aio-multithread: use atomic_read properly (2017-02-27 14:00:53 +0000)
----------------------------------------------------------------
----------------------------------------------------------------
Paolo Bonzini (4):
curl: do not use aio_context_acquire/release
nfs: do not use aio_context_acquire/release
iscsi: do not use aio_context_acquire/release
tests-aio-multithread: use atomic_read properly
block/curl.c | 24 ++++++++-----
block/iscsi.c | 83 ++++++++++++++++++++++++++++++++++----------
block/nfs.c | 23 +++++++++---
tests/test-aio-multithread.c | 4 +--
4 files changed, 100 insertions(+), 34 deletions(-)
--
2.9.3
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [Qemu-devel] [PULL 0/4] Block patches
2017-02-27 16:34 Stefan Hajnoczi
@ 2017-02-28 10:38 ` Peter Maydell
0 siblings, 0 replies; 31+ messages in thread
From: Peter Maydell @ 2017-02-28 10:38 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: QEMU Developers
On 27 February 2017 at 16:34, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> The following changes since commit d992f2f1368ceb92e6bfd8efece174110f4236ff:
>
> Merge remote-tracking branch 'remotes/artyom/tags/pull-sun4v-20170226' into staging (2017-02-26 22:40:23 +0000)
>
> are available in the git repository at:
>
> git://github.com/stefanha/qemu.git tags/block-pull-request
>
> for you to fetch changes up to 1ab17f9f5c63c2798d707aeb22588e4fcc17b2cd:
>
> tests-aio-multithread: use atomic_read properly (2017-02-27 14:00:53 +0000)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
>
> Paolo Bonzini (4):
> curl: do not use aio_context_acquire/release
> nfs: do not use aio_context_acquire/release
> iscsi: do not use aio_context_acquire/release
> tests-aio-multithread: use atomic_read properly
Applied, thanks.
-- PMM
^ permalink raw reply [flat|nested] 31+ messages in thread
* [Qemu-devel] [PULL 0/4] Block patches
@ 2016-07-19 22:47 Max Reitz
2016-07-20 16:05 ` Peter Maydell
0 siblings, 1 reply; 31+ messages in thread
From: Max Reitz @ 2016-07-19 22:47 UTC (permalink / raw)
To: qemu-devel; +Cc: Max Reitz, Peter Maydell
The following changes since commit 5d3217340adcb6c4f0e4af5d2b865331eb2ff63d:
disas: Fix ATTRIBUTE_UNUSED define clash with ALSA headers (2016-07-19 16:40:39 +0100)
are available in the git repository at:
git://github.com/XanClic/qemu.git tags/pull-block-2016-07-20
for you to fetch changes up to bafea5b7c26dd14895f7be64685a12645a75f4cf:
block: export LUKS specific data to qemu-img info (2016-07-20 00:34:03 +0200)
----------------------------------------------------------------
Block patches for master
----------------------------------------------------------------
Cao jin (1):
AioContext: correct comments
Daniel P. Berrange (2):
crypto: add support for querying parameters for block encryption
block: export LUKS specific data to qemu-img info
Vladimir Sementsov-Ogievskiy (1):
qcow2: do not allocate extra memory
block/crypto.c | 49 ++++++++++++++++++++++++++++++++
block/qcow.c | 2 +-
block/qcow2.c | 2 +-
crypto/block-luks.c | 67 ++++++++++++++++++++++++++++++++++++++++++++
crypto/block.c | 17 +++++++++++
crypto/blockpriv.h | 4 +++
include/block/aio.h | 2 +-
include/crypto/block.h | 16 +++++++++++
qapi/block-core.json | 6 +++-
qapi/crypto.json | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++
10 files changed, 237 insertions(+), 4 deletions(-)
--
2.9.0
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [Qemu-devel] [PULL 0/4] Block patches
2016-07-19 22:47 Max Reitz
@ 2016-07-20 16:05 ` Peter Maydell
2016-07-20 21:16 ` Eric Blake
0 siblings, 1 reply; 31+ messages in thread
From: Peter Maydell @ 2016-07-20 16:05 UTC (permalink / raw)
To: Max Reitz; +Cc: QEMU Developers
On 19 July 2016 at 23:47, Max Reitz <mreitz@redhat.com> wrote:
> The following changes since commit 5d3217340adcb6c4f0e4af5d2b865331eb2ff63d:
>
> disas: Fix ATTRIBUTE_UNUSED define clash with ALSA headers (2016-07-19 16:40:39 +0100)
>
> are available in the git repository at:
>
> git://github.com/XanClic/qemu.git tags/pull-block-2016-07-20
>
> for you to fetch changes up to bafea5b7c26dd14895f7be64685a12645a75f4cf:
>
> block: export LUKS specific data to qemu-img info (2016-07-20 00:34:03 +0200)
>
> ----------------------------------------------------------------
> Block patches for master
>
> ----------------------------------------------------------------
Fails to build on everything:
GEN qapi-visit.h
In file included from /Users/pm215/src/qemu-for-merges/qapi-schema.json:9:
/Users/pm215/src/qemu-for-merges/qapi/crypto.json:299: Union
'QCryptoBlockInfo' data missing 'qcow' branch
thanks
-- PMM
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [Qemu-devel] [PULL 0/4] Block patches
2016-07-20 16:05 ` Peter Maydell
@ 2016-07-20 21:16 ` Eric Blake
2016-07-21 19:14 ` Peter Maydell
0 siblings, 1 reply; 31+ messages in thread
From: Eric Blake @ 2016-07-20 21:16 UTC (permalink / raw)
To: Peter Maydell, Max Reitz; +Cc: QEMU Developers
[-- Attachment #1: Type: text/plain, Size: 1461 bytes --]
On 07/20/2016 10:05 AM, Peter Maydell wrote:
> On 19 July 2016 at 23:47, Max Reitz <mreitz@redhat.com> wrote:
>> The following changes since commit 5d3217340adcb6c4f0e4af5d2b865331eb2ff63d:
>>
>> disas: Fix ATTRIBUTE_UNUSED define clash with ALSA headers (2016-07-19 16:40:39 +0100)
>>
>> are available in the git repository at:
>>
>> git://github.com/XanClic/qemu.git tags/pull-block-2016-07-20
>>
>> for you to fetch changes up to bafea5b7c26dd14895f7be64685a12645a75f4cf:
>>
>> block: export LUKS specific data to qemu-img info (2016-07-20 00:34:03 +0200)
>>
>> ----------------------------------------------------------------
>> Block patches for master
>>
>> ----------------------------------------------------------------
>
> Fails to build on everything:
>
> GEN qapi-visit.h
> In file included from /Users/pm215/src/qemu-for-merges/qapi-schema.json:9:
> /Users/pm215/src/qemu-for-merges/qapi/crypto.json:299: Union
> 'QCryptoBlockInfo' data missing 'qcow' branch
Aha. Cause is two branches developed in parallel; commit d0b18239 forces
all branches of a flat union to be listed (to avoid an abort() if the
user passes a branch that was not listed); solution is to expand the
crypto.json addition to cover all branches, even if it means an empty
type for the branches that have no additional data.
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [Qemu-devel] [PULL 0/4] Block patches
2016-07-20 21:16 ` Eric Blake
@ 2016-07-21 19:14 ` Peter Maydell
2016-07-22 12:41 ` Max Reitz
0 siblings, 1 reply; 31+ messages in thread
From: Peter Maydell @ 2016-07-21 19:14 UTC (permalink / raw)
To: Eric Blake; +Cc: Max Reitz, QEMU Developers
On 20 July 2016 at 22:16, Eric Blake <eblake@redhat.com> wrote:
> On 07/20/2016 10:05 AM, Peter Maydell wrote:
>> On 19 July 2016 at 23:47, Max Reitz <mreitz@redhat.com> wrote:
>>> The following changes since commit 5d3217340adcb6c4f0e4af5d2b865331eb2ff63d:
>>>
>>> disas: Fix ATTRIBUTE_UNUSED define clash with ALSA headers (2016-07-19 16:40:39 +0100)
>>>
>>> are available in the git repository at:
>>>
>>> git://github.com/XanClic/qemu.git tags/pull-block-2016-07-20
>>>
>>> for you to fetch changes up to bafea5b7c26dd14895f7be64685a12645a75f4cf:
>>>
>>> block: export LUKS specific data to qemu-img info (2016-07-20 00:34:03 +0200)
>>>
>>> ----------------------------------------------------------------
>>> Block patches for master
>>>
>>> ----------------------------------------------------------------
>>
>> Fails to build on everything:
>>
>> GEN qapi-visit.h
>> In file included from /Users/pm215/src/qemu-for-merges/qapi-schema.json:9:
>> /Users/pm215/src/qemu-for-merges/qapi/crypto.json:299: Union
>> 'QCryptoBlockInfo' data missing 'qcow' branch
>
> Aha. Cause is two branches developed in parallel; commit d0b18239 forces
> all branches of a flat union to be listed (to avoid an abort() if the
> user passes a branch that was not listed); solution is to expand the
> crypto.json addition to cover all branches, even if it means an empty
> type for the branches that have no additional data.
I'm just processing the last other outstanding pullreq now,
so unless a respin of this arrives by tomorrow lunchtime UK
time it's going to miss rc0, I think.
thanks
-- PMM
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [Qemu-devel] [PULL 0/4] Block patches
2016-07-21 19:14 ` Peter Maydell
@ 2016-07-22 12:41 ` Max Reitz
0 siblings, 0 replies; 31+ messages in thread
From: Max Reitz @ 2016-07-22 12:41 UTC (permalink / raw)
To: Peter Maydell, Eric Blake; +Cc: QEMU Developers, Daniel P. Berrange
[-- Attachment #1: Type: text/plain, Size: 1929 bytes --]
On 21.07.2016 21:14, Peter Maydell wrote:
> On 20 July 2016 at 22:16, Eric Blake <eblake@redhat.com> wrote:
>> On 07/20/2016 10:05 AM, Peter Maydell wrote:
>>> On 19 July 2016 at 23:47, Max Reitz <mreitz@redhat.com> wrote:
>>>> The following changes since commit 5d3217340adcb6c4f0e4af5d2b865331eb2ff63d:
>>>>
>>>> disas: Fix ATTRIBUTE_UNUSED define clash with ALSA headers (2016-07-19 16:40:39 +0100)
>>>>
>>>> are available in the git repository at:
>>>>
>>>> git://github.com/XanClic/qemu.git tags/pull-block-2016-07-20
>>>>
>>>> for you to fetch changes up to bafea5b7c26dd14895f7be64685a12645a75f4cf:
>>>>
>>>> block: export LUKS specific data to qemu-img info (2016-07-20 00:34:03 +0200)
>>>>
>>>> ----------------------------------------------------------------
>>>> Block patches for master
>>>>
>>>> ----------------------------------------------------------------
>>>
>>> Fails to build on everything:
>>>
>>> GEN qapi-visit.h
>>> In file included from /Users/pm215/src/qemu-for-merges/qapi-schema.json:9:
>>> /Users/pm215/src/qemu-for-merges/qapi/crypto.json:299: Union
>>> 'QCryptoBlockInfo' data missing 'qcow' branch
>>
>> Aha. Cause is two branches developed in parallel; commit d0b18239 forces
>> all branches of a flat union to be listed (to avoid an abort() if the
>> user passes a branch that was not listed); solution is to expand the
>> crypto.json addition to cover all branches, even if it means an empty
>> type for the branches that have no additional data.
>
> I'm just processing the last other outstanding pullreq now,
> so unless a respin of this arrives by tomorrow lunchtime UK
> time it's going to miss rc0, I think.
Since there's nothing critical in this pull request, I'll drop the
crypto patches and keep the non-offending patches for the next pull
request (for rc1).
So no need to wait for another pull request from me for rc0.
Max
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 498 bytes --]
^ permalink raw reply [flat|nested] 31+ messages in thread
* [Qemu-devel] [PULL 0/4] Block patches
@ 2016-07-15 17:59 Stefan Hajnoczi
2016-07-18 10:23 ` Peter Maydell
0 siblings, 1 reply; 31+ messages in thread
From: Stefan Hajnoczi @ 2016-07-15 17:59 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, Stefan Hajnoczi
The following changes since commit 14c7d99333e4a474c65bdae6f99aa8837e8078e6:
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20160714' into staging (2016-07-14 17:32:53 +0100)
are available in the git repository at:
git://github.com/stefanha/qemu.git tags/block-pull-request
for you to fetch changes up to 325e00006139a30a4c747cf35489ea5bee8da272:
linux-aio: prevent submitting more than MAX_EVENTS (2016-07-15 12:45:47 +0100)
----------------------------------------------------------------
----------------------------------------------------------------
Cao jin (1):
aio_ctx_check: follow CODING_STYLE
Paolo Bonzini (1):
linux-aio: share one LinuxAioState within an AioContext
Roman Pen (1):
linux-aio: prevent submitting more than MAX_EVENTS
Vladimir Sementsov-Ogievskiy (1):
spec/parallels: fix a mistake
async.c | 25 +++++++++-
block/linux-aio.c | 36 ++++++++------
block/raw-aio.h | 68 ---------------------------
block/raw-posix.c | 119 ++++++-----------------------------------------
block/raw-win32.c | 2 +-
docs/specs/parallels.txt | 2 +-
include/block/aio.h | 13 ++++++
include/block/raw-aio.h | 68 +++++++++++++++++++++++++++
8 files changed, 143 insertions(+), 190 deletions(-)
delete mode 100644 block/raw-aio.h
create mode 100644 include/block/raw-aio.h
--
2.7.4
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [Qemu-devel] [PULL 0/4] Block patches
2016-07-15 17:59 Stefan Hajnoczi
@ 2016-07-18 10:23 ` Peter Maydell
2016-07-18 14:57 ` Paolo Bonzini
0 siblings, 1 reply; 31+ messages in thread
From: Peter Maydell @ 2016-07-18 10:23 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: QEMU Developers
On 15 July 2016 at 18:59, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> The following changes since commit 14c7d99333e4a474c65bdae6f99aa8837e8078e6:
>
> Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20160714' into staging (2016-07-14 17:32:53 +0100)
>
> are available in the git repository at:
>
> git://github.com/stefanha/qemu.git tags/block-pull-request
>
> for you to fetch changes up to 325e00006139a30a4c747cf35489ea5bee8da272:
>
> linux-aio: prevent submitting more than MAX_EVENTS (2016-07-15 12:45:47 +0100)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
I'm afraid this fails to build for w32:
/home/petmay01/linaro/qemu-for-merges/block/win32-aio.c:30:21: fatal
error: raw-aio.h: No such file or directory
#include "raw-aio.h"
^
compilation terminated.
Looks like that should be "block/raw-aio.h".
thanks
-- PMM
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [Qemu-devel] [PULL 0/4] Block patches
2016-07-18 10:23 ` Peter Maydell
@ 2016-07-18 14:57 ` Paolo Bonzini
2016-07-18 14:58 ` Peter Maydell
0 siblings, 1 reply; 31+ messages in thread
From: Paolo Bonzini @ 2016-07-18 14:57 UTC (permalink / raw)
To: Peter Maydell, Stefan Hajnoczi; +Cc: QEMU Developers
On 18/07/2016 12:23, Peter Maydell wrote:
> I'm afraid this fails to build for w32:
>
> /home/petmay01/linaro/qemu-for-merges/block/win32-aio.c:30:21: fatal
> error: raw-aio.h: No such file or directory
> #include "raw-aio.h"
> ^
> compilation terminated.
>
> Looks like that should be "block/raw-aio.h".
But that's in the patch:
diff --git a/block/raw-win32.c b/block/raw-win32.c
index 62edb1a..9b813d9 100644
--- a/block/raw-win32.c
+++ b/block/raw-win32.c
@@ -27,7 +27,7 @@
#include "qemu/timer.h"
#include "block/block_int.h"
#include "qemu/module.h"
-#include "raw-aio.h"
+#include "block/raw-aio.h"
#include "trace.h"
#include "block/thread-pool.h"
#include "qemu/iov.h"
Did you get a conflict, or did git screw up some resolution?
Paolo
^ permalink raw reply related [flat|nested] 31+ messages in thread
* Re: [Qemu-devel] [PULL 0/4] Block patches
2016-07-18 14:57 ` Paolo Bonzini
@ 2016-07-18 14:58 ` Peter Maydell
2016-07-19 8:58 ` Stefan Hajnoczi
0 siblings, 1 reply; 31+ messages in thread
From: Peter Maydell @ 2016-07-18 14:58 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: Stefan Hajnoczi, QEMU Developers
On 18 July 2016 at 15:57, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
>
> On 18/07/2016 12:23, Peter Maydell wrote:
>> I'm afraid this fails to build for w32:
>>
>> /home/petmay01/linaro/qemu-for-merges/block/win32-aio.c:30:21: fatal
>> error: raw-aio.h: No such file or directory
>> #include "raw-aio.h"
>> ^
>> compilation terminated.
>>
>> Looks like that should be "block/raw-aio.h".
>
> But that's in the patch:
>
> diff --git a/block/raw-win32.c b/block/raw-win32.c
This is not the .c file which is mentioned in the above
compiler error message :-)
thanks
-- PMM
^ permalink raw reply [flat|nested] 31+ messages in thread
* [Qemu-devel] [PULL 0/4] Block patches
@ 2015-04-09 9:55 Stefan Hajnoczi
2015-04-09 12:03 ` Peter Maydell
0 siblings, 1 reply; 31+ messages in thread
From: Stefan Hajnoczi @ 2015-04-09 9:55 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, Stefan Hajnoczi
The following changes since commit 5a24f20a7208a58fb80d78ca0521bba6f4d7b145:
Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2015-04-04' into staging (2015-04-07 14:33:46 +0100)
are available in the git repository at:
git://github.com/stefanha/qemu.git tags/block-pull-request
for you to fetch changes up to 05b685fbabb7fdcab72cb42b27db916fd74b2265:
block/iscsi: handle zero events from iscsi_which_events (2015-04-09 10:31:45 +0100)
----------------------------------------------------------------
----------------------------------------------------------------
Kevin Wolf (1):
qcow2: Fix header update with overridden backing file
Paolo Bonzini (2):
virtio-blk: correctly dirty guest memory
aio: strengthen memory barriers for bottom half scheduling
Peter Lieven (1):
block/iscsi: handle zero events from iscsi_which_events
async.c | 28 ++++++------
block/iscsi.c | 33 +++++++++++---
block/qcow2.c | 29 ++++++++++---
block/qcow2.h | 6 +++
hw/block/dataplane/virtio-blk.c | 3 +-
hw/block/virtio-blk.c | 13 +++++-
include/hw/virtio/virtio-blk.h | 1 +
tests/qemu-iotests/130 | 95 +++++++++++++++++++++++++++++++++++++++++
tests/qemu-iotests/130.out | 43 +++++++++++++++++++
tests/qemu-iotests/group | 1 +
10 files changed, 220 insertions(+), 32 deletions(-)
create mode 100755 tests/qemu-iotests/130
create mode 100644 tests/qemu-iotests/130.out
--
2.1.0
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [Qemu-devel] [PULL 0/4] Block patches
2015-04-09 9:55 Stefan Hajnoczi
@ 2015-04-09 12:03 ` Peter Maydell
0 siblings, 0 replies; 31+ messages in thread
From: Peter Maydell @ 2015-04-09 12:03 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: QEMU Developers
On 9 April 2015 at 10:55, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> The following changes since commit 5a24f20a7208a58fb80d78ca0521bba6f4d7b145:
>
> Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2015-04-04' into staging (2015-04-07 14:33:46 +0100)
>
> are available in the git repository at:
>
> git://github.com/stefanha/qemu.git tags/block-pull-request
>
> for you to fetch changes up to 05b685fbabb7fdcab72cb42b27db916fd74b2265:
>
> block/iscsi: handle zero events from iscsi_which_events (2015-04-09 10:31:45 +0100)
Applied, thanks.
-- PMM
^ permalink raw reply [flat|nested] 31+ messages in thread
end of thread, other threads:[~2019-01-04 14:55 UTC | newest]
Thread overview: 31+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-12 13:18 [Qemu-devel] [PULL 0/4] Block patches Jeff Cody
2018-09-12 13:18 ` [Qemu-devel] [PULL 1/4] block/rbd: pull out qemu_rbd_convert_options Jeff Cody
2018-09-12 13:18 ` [Qemu-devel] [PULL 2/4] block/rbd: Attempt to parse legacy filenames Jeff Cody
2018-09-14 17:49 ` Eric Blake
2018-09-12 13:18 ` [Qemu-devel] [PULL 3/4] block/rbd: add iotest for rbd legacy keyvalue filename parsing Jeff Cody
2018-09-12 13:18 ` [Qemu-devel] [PULL 4/4] block/rbd: add deprecation documentation for filename keyvalue pairs Jeff Cody
-- strict thread matches above, loose matches on Subject: below --
2019-01-04 11:21 [Qemu-devel] [PULL 0/4] Block patches Stefan Hajnoczi
2019-01-04 14:54 ` Peter Maydell
2018-05-16 17:42 Jeff Cody
2018-05-17 12:18 ` Peter Maydell
2018-05-08 15:19 Jeff Cody
2018-05-08 16:54 ` Peter Maydell
2018-03-27 14:41 Stefan Hajnoczi
2018-03-27 18:20 ` Peter Maydell
2018-03-31 7:12 ` no-reply
2017-09-05 13:29 Stefan Hajnoczi
2017-09-05 15:36 ` Peter Maydell
2017-02-27 16:34 Stefan Hajnoczi
2017-02-28 10:38 ` Peter Maydell
2016-07-19 22:47 Max Reitz
2016-07-20 16:05 ` Peter Maydell
2016-07-20 21:16 ` Eric Blake
2016-07-21 19:14 ` Peter Maydell
2016-07-22 12:41 ` Max Reitz
2016-07-15 17:59 Stefan Hajnoczi
2016-07-18 10:23 ` Peter Maydell
2016-07-18 14:57 ` Paolo Bonzini
2016-07-18 14:58 ` Peter Maydell
2016-07-19 8:58 ` Stefan Hajnoczi
2015-04-09 9:55 Stefan Hajnoczi
2015-04-09 12:03 ` Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.