Re: [Qemu-devel] [PULL 0/4] Block patches for rc0

2019-07-02 Thread Peter Maydell 
On Tue, 2 Jul 2019 at 03:39, Max Reitz  wrote:
>
> The following changes since commit 7d0e02405fc02a181319b1ab8681d2f72246b7c6:
>
>   Merge remote-tracking branch 
> 'remotes/vivier2/tags/trivial-patches-pull-request' into staging (2019-07-01 
> 17:40:32 +0100)
>
> are available in the Git repository at:
>
>   https://github.com/XanClic/qemu.git tags/pull-block-2019-07-02
>
> for you to fetch changes up to c624b015bf14fe01f1e6452a36e63b3ea1ae4998:
>
>   block/stream: introduce a bottom node (2019-07-02 03:53:05 +0200)
>
> 
> Block patches for 4.1-rc0:
> - The stream job no longer relies on a fixed base node
> - The rbd block driver can now accomodate growing formats like qcow2
>


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/4.1
for any user-visible changes.

-- PMM

Re: [Qemu-devel] [PULL 0/4] Block patches for rc0

2019-07-02 Thread Max Reitz 
(s/rc0/softfreeze/)



signature.asc
Description: OpenPGP digital signature

Re: [Qemu-devel] [PULL 0/4] Block patches

2019-01-04 Thread Peter Maydell 
On Fri, 4 Jan 2019 at 11:21, Stefan Hajnoczi  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 +)
>
> 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 +)
>
> 
> 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

Re: [Qemu-devel] [PULL 0/4] Block patches

2018-09-24 Thread Jeff Cody 
On Wed, Sep 12, 2018 at 09:18:49AM -0400, Jeff Cody wrote:
> 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
>

NACK.

There is a minor update to one of the patches, and I'll toss another
block patch in with a v2 (Richard Jones' curl patch).

Re: [Qemu-devel] [PULL 0/4] Block patches

2018-05-17 Thread Peter Maydell 
On 16 May 2018 at 18:42, Jeff Cody  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

Re: [Qemu-devel] [PULL 0/4] Block patches

2018-05-08 Thread Peter Maydell 
On 8 May 2018 at 16:19, Jeff Cody  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

Re: [Qemu-devel] [PULL 0/4] Block patches

2018-03-31 Thread no-reply 
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-stefa...@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
  COPYRUNNER
RUN test-build in qemu:min-glib 
tar:

Re: [Qemu-devel] [PULL 0/4] Block patches for 2.12.0-rc1

2018-03-31 Thread no-reply 
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: 20180326202039.21070-1-mre...@redhat.com
Subject: [Qemu-devel] [PULL 0/4] Block patches for 2.12.0-rc1

=== 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'
88d49f9d64 Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20180328' 
into staging
d9d2cb9840 tcg: Mark muluh_i64 and mulsh_i64 as 64-bit ops

=== OUTPUT BEGIN ===
Submodule 'dtc' (git://git.qemu-project.org/dtc.git) registered for path 'dtc'
Cloning into '/var/tmp/patchew-tester-tmp-w6rnif1s/src/dtc'...
Submodule path 'dtc': checked out 'e54388015af1fb4bf04d0bca99caba1074d9cc42'
  BUILD   min-glib
make[1]: Entering directory '/var/tmp/patchew-tester-tmp-w6rnif1s/src'
  GEN 
/var/tmp/patchew-tester-tmp-w6rnif1s/src/docker-src.2018-03-31-02.50.30.10766/qemu.tar
Cloning into 
'/var/tmp/patchew-tester-tmp-w6rnif1s/src/docker-src.2018-03-31-02.50.30.10766/qemu.tar.vroot'...
done.
Checking out files:  39% (2385/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:  44% (2673/6066)   
Checking out files:  44% (2708/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:  50% (3034/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:  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:  91% (5521/6066)   
Checking out files:  92% (5581/6066)   
Checking out files:  93% (5642/6066)   
Checking out files:  94% (5703/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-w6rnif1s/src/docker-src.2018-03-31-02.50.30.10766/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-w6rnif1s/src/docker-src.2018-03-31-02.50.30.10766/qemu.tar.vroot/ui/keycodemapdb'...
Submodule path 'ui/keycodemapdb': checked out 
'6b3d716e2b6472eb7189d3220552280ef3d832ce'
tar: 
/var/tmp/patchew-tester-tmp-w6rnif1s/src/docker-src.2018-03-31-02.50.30.10766/qemu.tar:
 Wrote only 2048 of 10240 bytes
tar: Error is not recoverable: exiting now
failed to create tar file
  COPYRUNNER
RUN test-build in qemu:min-glib 
tar: Unexpected EOF in archive
tar: rmtlseek not stopped at a record boundary
tar: Error is not recoverable: exiting now

Re: [Qemu-devel] [PULL 0/4] Block patches

2018-03-27 Thread Peter Maydell 
On 27 March 2018 at 15:41, Stefan Hajnoczi  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

Re: [Qemu-devel] [PULL 0/4] Block patches for 2.12.0-rc1

2018-03-27 Thread Peter Maydell 
On 26 March 2018 at 21:20, Max Reitz  wrote:
> The following changes since commit 7b93d78a04aa242d377ae213b79db6c319c71847:
>
>   Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into 
> staging (2018-03-26 15:17:25 +0100)
>
> are available in the Git repository at:
>
>   git://github.com/XanClic/qemu.git tags/pull-block-2018-03-26
>
> for you to fetch changes up to a77672ea3d95094a0cb4f974de84fb7353c67cc0:
>
>   vmdk: return ERROR when cluster sector is larger than vmdk limitation 
> (2018-03-26 21:17:24 +0200)
>
> 
> A fix for dirty bitmap migration through shared storage, and a VMDK
> patch keeping us from creating too large extents.
>
> 

Applied, thanks.

-- PMM

Re: [Qemu-devel] [PULL 0/4] Block patches

2017-09-05 Thread Peter Maydell 
On 5 September 2017 at 14:29, Stefan Hajnoczi  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

Re: [Qemu-devel] [PULL 0/4] Block patches

2017-02-28 Thread Peter Maydell 
On 27 February 2017 at 16:34, Stefan Hajnoczi  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 +)
>
> 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 +)
>
> 
>
> 
>
> 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

Re: [Qemu-devel] [PULL 0/4] Block patches

2016-07-22 Thread Max Reitz 
On 21.07.2016 21:14, Peter Maydell wrote:
> On 20 July 2016 at 22:16, Eric Blake  wrote:
>> On 07/20/2016 10:05 AM, Peter Maydell wrote:
>>> On 19 July 2016 at 23:47, Max Reitz  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



signature.asc
Description: OpenPGP digital signature

Re: [Qemu-devel] [PULL 0/4] Block patches

2016-07-21 Thread Peter Maydell 
On 20 July 2016 at 22:16, Eric Blake  wrote:
> On 07/20/2016 10:05 AM, Peter Maydell wrote:
>> On 19 July 2016 at 23:47, Max Reitz  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

Re: [Qemu-devel] [PULL 0/4] Block patches

2016-07-20 Thread Eric Blake 
On 07/20/2016 10:05 AM, Peter Maydell wrote:
> On 19 July 2016 at 23:47, Max Reitz  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



signature.asc
Description: OpenPGP digital signature

Re: [Qemu-devel] [PULL 0/4] Block patches

2016-07-20 Thread Peter Maydell 
On 19 July 2016 at 23:47, Max Reitz  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

Re: [Qemu-devel] [PULL 0/4] Block patches

2016-07-19 Thread Stefan Hajnoczi 
On Mon, Jul 18, 2016 at 03:58:29PM +0100, Peter Maydell wrote:
> On 18 July 2016 at 15:57, Paolo Bonzini  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 :-)

I resolved the issue yesterday and sent a new block pull request.

Stefan


signature.asc
Description: PGP signature

Re: [Qemu-devel] [PULL 0/4] Block patches

2016-07-18 Thread Paolo Bonzini 


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

Re: [Qemu-devel] [PULL 0/4] Block patches

2016-07-18 Thread Peter Maydell 
On 18 July 2016 at 15:57, Paolo Bonzini  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

Re: [Qemu-devel] [PULL 0/4] Block patches

2016-07-18 Thread Peter Maydell 
On 15 July 2016 at 18:59, Stefan Hajnoczi  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 325e6139a30a4c747cf35489ea5bee8da272:
>
>   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

Re: [Qemu-devel] [PULL 0/4] Block patches for 2.5.0-rc1

2015-11-18 Thread Peter Maydell 
On 18 November 2015 at 16:08, Kevin Wolf  wrote:
> The following changes since commit ab9b872ab3147faf3c04e91d525815b9139dd996:
>
>   Merge remote-tracking branch 
> 'remotes/mdroth/tags/qga-pull-2015-11-13-v2-tag' into staging (2015-11-18 
> 12:47:29 +)
>
> are available in the git repository at:
>
>
>   git://repo.or.cz/qemu/kevin.git tags/for-upstream
>
> for you to fetch changes up to ca4fa82fe66076284f702adcfe7c319ebbf909ec:
>
>   Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2015-11-18' 
> into queue-block (2015-11-18 16:27:44 +0100)
>
> 
>
> Block layer patches
>
> 
> Alberto Garcia (1):
>   block: Call external_snapshot_clean after blockdev-snapshot
>
> John Snow (1):
>   iotests: fix race in 030
>
> Kevin Wolf (1):
>   Merge remote-tracking branch 
> 'mreitz/tags/pull-block-for-kevin-2015-11-18' into queue-block
>
> Max Reitz (1):
>   blockdev: Add missing bdrv_unref() in drive-backup
>
> Rabin Vincent (1):
>   nand: fix address overflow

Applied, thanks.

-- PMM

Re: [Qemu-devel] [PULL 0/4] Block patches

2015-04-09 Thread Peter Maydell 
On 9 April 2015 at 10:55, Stefan Hajnoczi stefa...@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

Re: [Qemu-devel] [PULL 0/4] Block patches for 2.0.0-rc3

2014-04-11 Thread Peter Maydell 
On 11 April 2014 13:39, Kevin Wolf kw...@redhat.com wrote:
 The following changes since commit f516a5cc051db6e999e9e60dc968dcb5aeffe11f:

   Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging 
 (2014-04-10 23:07:56 +0100)

 are available in the git repository at:


   git://repo.or.cz/qemu/kevin.git tags/for-upstream

 for you to fetch changes up to 5450466394c95cea8b661fb197ed215a4ab5d700:

   block-commit: speed is an optional parameter (2014-04-11 13:59:49 +0200)

Applied, thanks.

-- PMM

Re: [Qemu-devel] [PULL 0/4] Block patches (includes build fix for non-Linux)

2011-09-22 Thread Anthony Liguori 

On 09/21/2011 08:21 AM, Kevin Wolf wrote:

The following changes since commit 27cdad67a1bc23b38c765b677ed8064bfb8d3e44:

   Revert alpha-softmmu: Disable for the 0.15 release branch. (2011-09-21 
00:50:32 +0200)


Pulled.  Thanks.

Regards,

Anthony Liguori



are available in the git repository at:
   git://repo.or.cz/qemu/kevin.git for-anthony

Daniel Verkamp (1):
   ahci: add port I/O index-data pair

Nick Thomas (2):
   block/curl: Implement a flush function on the fd handlers
   block/curl: Don't finish AIOCBs too early

Paolo Bonzini (1):
   nbd: fix non-Linux build failure

  block/curl.c  |   94 +++--
  hw/ide/ahci.c |   42 +-
  hw/ide/ahci.h |9 +-
  hw/ide/ich.c  |   27 -
  hw/pci_regs.h |1 +
  nbd.c |2 +-
  6 files changed, 148 insertions(+), 27 deletions(-)