| Message ID | 1420798626-11428-1-git-send-email-stefanha@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 9 January 2015 at 10:16, Stefan Hajnoczi <stefanha@redhat.com> wrote: > This pull request depends on the previous block pull request which has not been > merged yet. It was sent on Monday, 5th of January (Message-id: > <1420458696-1885-1-git-send-email-stefanha@redhat.com>). > > The following changes since commit 3bd54e576f40f1d5bf45b4828c7316efd76a4db6: > > migration/block: fix pending() return value (2015-01-05 11:34:52 +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 4cba4284918145de66e27959725559f8aaf764ef: > > NVMe: Set correct VS Value for 1.1 Compliant Controllers (2015-01-09 10:12:23 +0000) I'm confused. You say this pull depends on the other one, but the emails give the same tag name for both, so I can't pull the other one first. (In fact, if not for this one failing I would have applied it under the assumption that it *was* the previous pullreq...) In any case, this one fails 'make check': GTESTER check-qtest-arm WARNING: Image format was not specified for '/tmp/qtest.ZDWVz0' and probing guessed raw. Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted. Specify the 'raw' format explicitly to remove the restrictions. ** ERROR:/home/petmay01/linaro/qemu-for-merges/tests/libqos/virtio.c:91:qvirtio_wait_queue_isr: assertion failed: (g_get_monotonic_time() - start_time <= timeout_us) GTester: last random seed: R02Scf242b6e43396cc299f6f06431644f8f make: *** [check-qtest-arm] Error 1 make: Leaving directory `/home/petmay01/linaro/qemu-for-merges/build/all' thanks -- PMM
On 10 January 2015 at 19:05, Peter Maydell <peter.maydell@linaro.org> wrote: > On 9 January 2015 at 10:16, Stefan Hajnoczi <stefanha@redhat.com> wrote: >> This pull request depends on the previous block pull request which has not been >> merged yet. It was sent on Monday, 5th of January (Message-id: >> <1420458696-1885-1-git-send-email-stefanha@redhat.com>). >> >> The following changes since commit 3bd54e576f40f1d5bf45b4828c7316efd76a4db6: >> >> migration/block: fix pending() return value (2015-01-05 11:34:52 +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 4cba4284918145de66e27959725559f8aaf764ef: >> >> NVMe: Set correct VS Value for 1.1 Compliant Controllers (2015-01-09 10:12:23 +0000) > > I'm confused. You say this pull depends on the other one, but > the emails give the same tag name for both, so I can't pull > the other one first. (In fact, if not for this one failing I > would have applied it under the assumption that it *was* the > previous pullreq...) > > In any case, this one fails 'make check': Failed also and differently on my 32 bit ARM board, though that may just be because I run this set with V=1; last part of the log below. Looks like something is trying to run qemu-system-arm without specifying a machine to use... === Testing plain filename for blkdebug === -blkdebug:TEST_DIR/blkdebug.conf:TEST_DIR/t.IMGFMT === Testing plain filename for blkdebug without configuration file === -blkdebug::TEST_DIR/t.IMGFMT *** done 100 [20:40:41] [20:40:45] 101 [20:40:45] [20:40:45] [not run] 101 -- not suitable for this image format: qcow2 102 [20:40:45] [20:40:46] [failed, exit status 141] - output mismatch (see 102.out.bad) --- /root/qemu/tests/qemu-iotests/102.out 2014-11-03 18:34:23.000000000 +0000 +++ 102.out.bad 2015-01-09 20:40:46.000000000 +0000 @@ -15,7 +15,6 @@ wrote 65536/65536 bytes at offset 0 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) Image resized. -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qemu-io drv0 map -[ 0] 128/ 128 sectors allocated at offset 0 bytes (1) -*** done +No machine specified, and there is no default. +Use -machine help to list supported machines! +Timeout waiting for allocated on handle 0 103 [20:40:46] [20:40:47] 105 [20:40:47] [20:40:48] 107 [20:40:48] [20:40:49] 108 [20:40:49] [20:40:52] 110 [20:40:52] [20:40:53] 111 [20:40:53] [20:40:53] 113 [20:40:53] [20:40:53] [not run] 113 -- not suitable for this image format: qcow2 114 [20:40:53] [20:40:54] Not run: 016 045 059 064 065 070 075 077 078 081 084 088 092 101 113 Failures: 028 067 068 071 087 095 099 102 Failed 8 of 65 tests make: *** [check-tests/qemu-iotests-quick.sh] Error 1 -- PMM
On Sat, 01/10 19:10, Peter Maydell wrote: > On 10 January 2015 at 19:05, Peter Maydell <peter.maydell@linaro.org> wrote: > > On 9 January 2015 at 10:16, Stefan Hajnoczi <stefanha@redhat.com> wrote: > >> This pull request depends on the previous block pull request which has not been > >> merged yet. It was sent on Monday, 5th of January (Message-id: > >> <1420458696-1885-1-git-send-email-stefanha@redhat.com>). > >> > >> The following changes since commit 3bd54e576f40f1d5bf45b4828c7316efd76a4db6: > >> > >> migration/block: fix pending() return value (2015-01-05 11:34:52 +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 4cba4284918145de66e27959725559f8aaf764ef: > >> > >> NVMe: Set correct VS Value for 1.1 Compliant Controllers (2015-01-09 10:12:23 +0000) > > > > I'm confused. You say this pull depends on the other one, but > > the emails give the same tag name for both, so I can't pull > > the other one first. (In fact, if not for this one failing I > > would have applied it under the assumption that it *was* the > > previous pullreq...) > > > > In any case, this one fails 'make check': > > Failed also and differently on my 32 bit ARM board, though that > may just be because I run this set with V=1; last part > of the log below. Looks like something is trying to run > qemu-system-arm without specifying a machine to use... > Ouch! This is something that proves really hard to do. Stefan, please drop the make check-block series in next revision. Fam > === Testing plain filename for blkdebug === > > -blkdebug:TEST_DIR/blkdebug.conf:TEST_DIR/t.IMGFMT > > === Testing plain filename for blkdebug without configuration file === > > -blkdebug::TEST_DIR/t.IMGFMT > *** done > 100 [20:40:41] [20:40:45] > 101 [20:40:45] [20:40:45] [not run] > 101 -- not suitable for this image format: qcow2 > 102 [20:40:45] [20:40:46] [failed, exit status 141] - > output mismatch (see 102.out.bad) > --- /root/qemu/tests/qemu-iotests/102.out 2014-11-03 > 18:34:23.000000000 +0000 > +++ 102.out.bad 2015-01-09 20:40:46.000000000 +0000 > @@ -15,7 +15,6 @@ > wrote 65536/65536 bytes at offset 0 > 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > Image resized. > -QEMU X.Y.Z monitor - type 'help' for more information > -(qemu) qemu-io drv0 map > -[ 0] 128/ 128 sectors allocated at > offset 0 bytes (1) > -*** done > +No machine specified, and there is no default. > +Use -machine help to list supported machines! > +Timeout waiting for allocated on handle 0 > 103 [20:40:46] [20:40:47] > 105 [20:40:47] [20:40:48] > 107 [20:40:48] [20:40:49] > 108 [20:40:49] [20:40:52] > 110 [20:40:52] [20:40:53] > 111 [20:40:53] [20:40:53] > 113 [20:40:53] [20:40:53] [not run] > 113 -- not suitable for this image format: qcow2 > 114 [20:40:53] [20:40:54] > Not run: 016 045 059 064 065 070 075 077 078 081 084 088 092 101 113 > Failures: 028 067 068 071 087 095 099 102 > Failed 8 of 65 tests > make: *** [check-tests/qemu-iotests-quick.sh] Error 1 > > > -- PMM >
On 12/01/2015 10:52, Fam Zheng wrote: > On Sat, 01/10 19:10, Peter Maydell wrote: >> On 10 January 2015 at 19:05, Peter Maydell <peter.maydell@linaro.org> wrote: >>> On 9 January 2015 at 10:16, Stefan Hajnoczi <stefanha@redhat.com> wrote: >>>> This pull request depends on the previous block pull request which has not been >>>> merged yet. It was sent on Monday, 5th of January (Message-id: >>>> <1420458696-1885-1-git-send-email-stefanha@redhat.com>). >>>> >>>> The following changes since commit 3bd54e576f40f1d5bf45b4828c7316efd76a4db6: >>>> >>>> migration/block: fix pending() return value (2015-01-05 11:34:52 +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 4cba4284918145de66e27959725559f8aaf764ef: >>>> >>>> NVMe: Set correct VS Value for 1.1 Compliant Controllers (2015-01-09 10:12:23 +0000) >>> >>> I'm confused. You say this pull depends on the other one, but >>> the emails give the same tag name for both, so I can't pull >>> the other one first. (In fact, if not for this one failing I >>> would have applied it under the assumption that it *was* the >>> previous pullreq...) >>> >>> In any case, this one fails 'make check': >> >> Failed also and differently on my 32 bit ARM board, though that >> may just be because I run this set with V=1; last part >> of the log below. Looks like something is trying to run >> qemu-system-arm without specifying a machine to use... >> > > Ouch! This is something that proves really hard to do. > > Stefan, please drop the make check-block series in next revision. No need to drop the bug fixes. One can just drop patch 11 ("tests/Makefile: Add check-block to make check on Linux"). Paolo
On Sat, Jan 10, 2015 at 07:05:47PM +0000, Peter Maydell wrote: > On 9 January 2015 at 10:16, Stefan Hajnoczi <stefanha@redhat.com> wrote: > > This pull request depends on the previous block pull request which has not been > > merged yet. It was sent on Monday, 5th of January (Message-id: > > <1420458696-1885-1-git-send-email-stefanha@redhat.com>). > > > > The following changes since commit 3bd54e576f40f1d5bf45b4828c7316efd76a4db6: > > > > migration/block: fix pending() return value (2015-01-05 11:34:52 +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 4cba4284918145de66e27959725559f8aaf764ef: > > > > NVMe: Set correct VS Value for 1.1 Compliant Controllers (2015-01-09 10:12:23 +0000) > > I'm confused. You say this pull depends on the other one, but > the emails give the same tag name for both, so I can't pull > the other one first. (In fact, if not for this one failing I > would have applied it under the assumption that it *was* the > previous pullreq...) I used a script that overwrites the pull request tag. Sorry for the confusion. You can look at the "for you to fetch changes up to 4cba4284918145de66e27959725559f8aaf764ef" lines to identify which commits are part of each pull request. I'm resending a new (combined) revision without the make check-block commit. Stefan
This pull request depends on the previous block pull request which has not been merged yet. It was sent on Monday, 5th of January (Message-id: <1420458696-1885-1-git-send-email-stefanha@redhat.com>). The following changes since commit 3bd54e576f40f1d5bf45b4828c7316efd76a4db6: migration/block: fix pending() return value (2015-01-05 11:34:52 +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 4cba4284918145de66e27959725559f8aaf764ef: NVMe: Set correct VS Value for 1.1 Compliant Controllers (2015-01-09 10:12:23 +0000) ---------------------------------------------------------------- ---------------------------------------------------------------- Alex Friedman (1): nvme: Fix get/set number of queues feature Anubhav Rakshit (1): NVMe: Set correct VS Value for 1.1 Compliant Controllers Chrysostomos Nanakos (1): MAINTAINERS: Update email addresses for Chrysostomos Nanakos Fam Zheng (7): .gitignore: Ignore generated "common.env" qemu-iotests: Replace "/bin/true" with "true" qemu-iotests: Add "_supported_os Linux" to 058 tests/Makefile: Add check-block to make check on Linux qemu-iotests: Add supported os parameter for python tests block: Split BLOCK_OP_TYPE_COMMIT to BLOCK_OP_TYPE_COMMIT_{SOURCE, TARGET} MAINTAINERS: Add migration/block* to block subsystem John Snow (1): ide: Implement VPD response for ATAPI Marc Marí (6): libqos: Convert malloc-pc allocator to a generic allocator libqos: Change use of pointers to uint64_t in virtio tests: Prepare virtio-blk-test for multi-arch implementation libqos: Remove PCI assumptions in constants of virtio driver libqos: Add malloc generic libqos: Add virtio MMIO support Paolo Bonzini (6): coroutine-ucontext: use __thread qemu-thread: add per-thread atexit functions test-coroutine: avoid overflow on 32-bit systems QSLIST: add lock-free operations coroutine: rewrite pool to avoid mutex coroutine: drop qemu_coroutine_adjust_pool_size Peter Lieven (2): coroutine: try harder not to delete coroutines block: limited request size in write zeroes unsupported path Programmingkid (1): block/raw-posix.c: Fixes raw_getlength() on Mac OS X so that it reports the correct length of a real CD .gitignore | 1 + MAINTAINERS | 2 +- block.c | 11 +- block/block-backend.c | 4 - block/raw-posix.c | 18 ++- blockdev.c | 6 +- configure | 2 +- coroutine-ucontext.c | 69 +++------- hw/block/dataplane/virtio-blk.c | 3 +- hw/block/nvme.c | 8 +- hw/ide/atapi.c | 111 ++++++++++++++-- hw/ide/internal.h | 1 + include/block/block.h | 3 +- include/block/coroutine.h | 10 -- include/qemu/queue.h | 15 ++- include/qemu/thread.h | 4 + qemu-coroutine.c | 103 +++++++------- tests/Makefile | 9 +- tests/libqos/malloc-generic.c | 50 +++++++ tests/libqos/malloc-generic.h | 21 +++ tests/libqos/malloc-pc.c | 280 +-------------------------------------- tests/libqos/malloc-pc.h | 11 +- tests/libqos/malloc.c | 270 +++++++++++++++++++++++++++++++++++++ tests/libqos/malloc.h | 45 ++++--- tests/libqos/virtio-mmio.c | 190 ++++++++++++++++++++++++++ tests/libqos/virtio-mmio.h | 46 +++++++ tests/libqos/virtio-pci.c | 50 +++---- tests/libqos/virtio-pci.h | 24 ++-- tests/libqos/virtio.c | 8 +- tests/libqos/virtio.h | 16 +-- tests/qemu-iotests/058 | 1 + tests/qemu-iotests/common.config | 2 +- tests/qemu-iotests/common.filter | 2 +- tests/qemu-iotests/common.rc | 2 +- tests/qemu-iotests/iotests.py | 5 +- tests/test-coroutine.c | 2 +- tests/virtio-blk-test.c | 249 +++++++++++++++++++++++----------- util/qemu-thread-posix.c | 37 ++++++ util/qemu-thread-win32.c | 48 +++++-- 39 files changed, 1154 insertions(+), 585 deletions(-) create mode 100644 tests/libqos/malloc-generic.c create mode 100644 tests/libqos/malloc-generic.h create mode 100644 tests/libqos/malloc.c create mode 100644 tests/libqos/virtio-mmio.c create mode 100644 tests/libqos/virtio-mmio.h