| Message ID | 1459264128-12761-1-git-send-email-kwolf@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 29 March 2016 at 16:08, Kevin Wolf <kwolf@redhat.com> wrote: > The following changes since commit b68a80139e37e806f004237e55311ebc42151434: > > Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160324' into staging (2016-03-24 16:24:02 +0000) > > are available in the git repository at: > > > git://repo.or.cz/qemu/kevin.git tags/for-upstream > > for you to fetch changes up to b63f2a6772ca774ec58b2fc6e26fdeeda44a99c1: > > iotests: Test qemu-img convert -S 0 behavior (2016-03-29 16:30:13 +0200) > > ---------------------------------------------------------------- > Block layer patches Hi. I'm afraid this doesn't compile: /Users/pm215/src/qemu-for-merges/block/blkreplay.c:38:9: warning: implicit declaration of function 'error_propagate' is invalid in C99 [-Wimplicit-function-declaration] error_propagate(errp, local_err); ^ /Users/pm215/src/qemu-for-merges/block/crypto.c:68:9: warning: implicit declaration of function 'error_setg_errno' is invalid in C99 [-Wimplicit-function-declaration] error_setg_errno(errp, -ret, "Could not read encryption header"); ^ /Users/pm215/src/qemu-for-merges/block/crypto.c:116:66: error: use of undeclared identifier 'error_abort' qemu_opt_set_number(data->opts, BLOCK_OPT_SIZE, data->size, &error_abort); ^ /Users/pm215/src/qemu-for-merges/block/crypto.c:217:9: warning: implicit declaration of function 'error_setg' is invalid in C99 [-Wimplicit-function-declaration] error_setg(&local_err, "Unsupported block format %d", format); ^ /Users/pm215/src/qemu-for-merges/block/crypto.c:220:5: warning: implicit declaration of function 'error_propagate' is invalid in C99 [-Wimplicit-function-declaration] error_propagate(errp, local_err); ^ /Users/pm215/src/qemu-for-merges/block/crypto.c:296:50: error: use of undeclared identifier 'error_abort' opts = qemu_opts_create(opts_spec, NULL, 0, &error_abort); ^ Looks like you've also been hit by commit da34e65cb4025, which means you now need to explicitly include qapi/error.h if you need it. thanks -- PMM
Am 29.03.2016 um 21:56 hat Peter Maydell geschrieben: > On 29 March 2016 at 16:08, Kevin Wolf <kwolf@redhat.com> wrote: > > The following changes since commit b68a80139e37e806f004237e55311ebc42151434: > > > > Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160324' into staging (2016-03-24 16:24:02 +0000) > > > > are available in the git repository at: > > > > > > git://repo.or.cz/qemu/kevin.git tags/for-upstream > > > > for you to fetch changes up to b63f2a6772ca774ec58b2fc6e26fdeeda44a99c1: > > > > iotests: Test qemu-img convert -S 0 behavior (2016-03-29 16:30:13 +0200) > > > > ---------------------------------------------------------------- > > Block layer patches > > Hi. I'm afraid this doesn't compile: > [...] > Looks like you've also been hit by commit da34e65cb4025, which > means you now need to explicitly include qapi/error.h if you need it. Ok, I can (and will, unless you tell me not to) send a v2 of the pull request; but generally speaking, wouldn't it make more sense and be easier for everyone involved (including yourself) if such merge conflicts where you know exactly what trivial fixup needs to be done were handled in the merge commit? Kevin
On 30 March 2016 at 09:57, Kevin Wolf <kwolf@redhat.com> wrote: > Am 29.03.2016 um 21:56 hat Peter Maydell geschrieben: >> Hi. I'm afraid this doesn't compile: >> [...] >> Looks like you've also been hit by commit da34e65cb4025, which >> means you now need to explicitly include qapi/error.h if you need it. > > Ok, I can (and will, unless you tell me not to) send a v2 of the pull > request; but generally speaking, wouldn't it make more sense and be > easier for everyone involved (including yourself) if such merge > conflicts where you know exactly what trivial fixup needs to be done > were handled in the merge commit? Sometimes, yes, but I often prefer not to for two reasons: (1) I often have a big queue of merges to process and time spent by me trying to by-hand fix up bad merges is time not spent processing somebody else's merge (2) I may be able to get the merge to compile but my testing process for the affected code is likely to be much less comprehensive than the submaintainer's So mostly I reserve fixes during the merge for trivial textual-only conflicts. thanks -- PMM
Am 30.03.2016 um 13:29 hat Peter Maydell geschrieben: > On 30 March 2016 at 09:57, Kevin Wolf <kwolf@redhat.com> wrote: > > Am 29.03.2016 um 21:56 hat Peter Maydell geschrieben: > >> Hi. I'm afraid this doesn't compile: > >> [...] > >> Looks like you've also been hit by commit da34e65cb4025, which > >> means you now need to explicitly include qapi/error.h if you need it. > > > > Ok, I can (and will, unless you tell me not to) send a v2 of the pull > > request; but generally speaking, wouldn't it make more sense and be > > easier for everyone involved (including yourself) if such merge > > conflicts where you know exactly what trivial fixup needs to be done > > were handled in the merge commit? > > Sometimes, yes, but I often prefer not to for two reasons: > (1) I often have a big queue of merges to process and time > spent by me trying to by-hand fix up bad merges is time not > spent processing somebody else's merge Right, but so is time spent for sending an email describing the problem and later processing a v2. In more complicated cases that certainly still saves time for you and you should continue to do that. I was talking only about the really obvious cases where you already tell me in your email what the exact problem is and how I need to fix it. > (2) I may be able to get the merge to compile but my testing > process for the affected code is likely to be much less > comprehensive than the submaintainer's Okay, that's a fair point. Kevin
The following changes since commit b68a80139e37e806f004237e55311ebc42151434: Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160324' into staging (2016-03-24 16:24:02 +0000) are available in the git repository at: git://repo.or.cz/qemu/kevin.git tags/for-upstream for you to fetch changes up to b63f2a6772ca774ec58b2fc6e26fdeeda44a99c1: iotests: Test qemu-img convert -S 0 behavior (2016-03-29 16:30:13 +0200) ---------------------------------------------------------------- Block layer patches ---------------------------------------------------------------- Daniel P. Berrange (8): block: add flag to indicate that no I/O will be performed qemu-img/qemu-io: don't prompt for passwords if not required tests: redirect stderr to stdout for iotests tests: refactor python I/O tests helper main method tests: add output filter to python I/O tests helper block: add generic full disk encryption driver block: move encryption deprecation warning into qcow code block: an interoperability test for luks vs dm-crypt/cryptsetup Kevin Wolf (27): block: Remove bdrv_make_anon() block: Remove copy-on-read from bdrv_move_feature_fields() block: Remove dirty bitmaps from bdrv_move_feature_fields() block: Remove cache.writeback from blockdev-add block: Make backing files always writeback block: Reject writethrough mode except at the root block: Remove blk_set_bs() block: Add bdrv_parse_cache_mode() qemu-nbd: Call blk_set_enable_write_cache() explicitly qemu-io: Call blk_set_enable_write_cache() explicitly qemu-img: Expand all BDRV_O_FLAGS uses qemu-img: Call blk_set_enable_write_cache() explicitly xen_disk: Call blk_set_enable_write_cache() explicitly block: blockdev_init(): Call blk_set_enable_write_cache() explicitly block: Always set writeback mode in blk_new_open() block: Handle flush error in bdrv_pwrite_sync() block: Move enable_write_cache to BB level block/qapi: Use blk_enable_write_cache() block: Introduce bdrv_co_writev_flags() iscsi: Support BDRV_REQ_FUA nbd: Support BDRV_REQ_FUA raw: Support BDRV_REQ_FUA block: Use bdrv_parse_cache_mode() in drive_init() qemu-io: Use bdrv_parse_cache_mode() in reopen_f() block: Remove bdrv_parse_cache_flags() block: Remove BDRV_O_CACHE_WB block: Remove bdrv_(set_)enable_write_cache() Max Reitz (6): block/qapi: Set s->device in bdrv_query_stats() block/qapi: Pass bdrv_query_blk_stats() s->stats qemu-img: Fix preallocation with -S 0 for convert block/null-{co,aio}: Allow reading zeroes block/null-{co,aio}: Implement get_block_status() iotests: Test qemu-img convert -S 0 behavior Pavel Dovgalyuk (4): block: add flush callback replay: bh scheduling fix replay: fix error message replay: introduce block devices record/replay Peter Xu (2): block/qapi: make two printf() formats literal block/qapi: fix unbounded stack for dump_qdict Programmingkid (1): block/raw-posix.c: Make physical devices usable in QEMU under Mac OS X host block.c | 111 +-- block/Makefile.objs | 4 +- block/backup.c | 1 - block/blkreplay.c | 159 ++++ block/block-backend.c | 62 +- block/crypto.c | 585 +++++++++++++ block/io.c | 24 +- block/iscsi.c | 30 +- block/mirror.c | 1 - block/nbd-client.c | 13 +- block/nbd-client.h | 2 +- block/nbd.c | 27 +- block/null.c | 42 + block/parallels.c | 3 +- block/qapi.c | 75 +- block/qcow.c | 12 +- block/qcow2.c | 17 +- block/qed.c | 3 +- block/raw-posix.c | 165 +++- block/raw_bsd.c | 17 +- block/sheepdog.c | 5 +- block/vdi.c | 3 +- block/vhdx.c | 3 +- block/vmdk.c | 8 +- block/vpc.c | 3 +- block/vvfat.c | 3 +- blockdev.c | 26 +- docs/replay.txt | 20 + hw/block/xen_disk.c | 5 +- include/block/block.h | 11 +- include/block/block_int.h | 17 +- include/block/qapi.h | 3 +- include/sysemu/replay.h | 2 + qapi/block-core.json | 26 +- qemu-img.c | 120 +-- qemu-io-cmds.c | 13 +- qemu-io.c | 23 +- qemu-nbd.c | 5 +- replay/replay-events.c | 24 +- replay/replay-internal.h | 1 + replay/replay.c | 2 +- stubs/replay.c | 4 + tests/qemu-iotests/049.out | 6 - tests/qemu-iotests/051 | 2 +- tests/qemu-iotests/051.pc.out | 10 +- tests/qemu-iotests/087 | 3 +- tests/qemu-iotests/087.out | 26 +- tests/qemu-iotests/122.out | 6 +- tests/qemu-iotests/134.out | 18 - tests/qemu-iotests/142 | 63 +- tests/qemu-iotests/142.out | 175 ++-- tests/qemu-iotests/149 | 519 ++++++++++++ tests/qemu-iotests/149.out | 1880 +++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/150 | 105 +++ tests/qemu-iotests/150.out | 14 + tests/qemu-iotests/common | 1 + tests/qemu-iotests/group | 2 + tests/qemu-iotests/iotests.py | 48 +- 58 files changed, 4013 insertions(+), 545 deletions(-) create mode 100755 block/blkreplay.c create mode 100644 block/crypto.c create mode 100755 tests/qemu-iotests/149 create mode 100644 tests/qemu-iotests/149.out create mode 100755 tests/qemu-iotests/150 create mode 100644 tests/qemu-iotests/150.out