| Message ID | 1474561774-19256-1-git-send-email-kwolf@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 22 September 2016 at 17:29, Kevin Wolf <kwolf@redhat.com> wrote: > The following changes since commit 430da7a81d356e368ccd88dcca60f38da9aa5b9a: > > Merge remote-tracking branch 'remotes/riku/tags/pull-linux-user-20160915' into staging (2016-09-22 15:39:54 +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 5dccdc1b1e0c57746e5f90c69f697029a3686b5f: > > block: Remove BB interface from blockdev-add/del (2016-09-22 18:02:15 +0200) > > ---------------------------------------------------------------- > Block layer patches > > ---------------------------------------------------------------- Hi; I'm afraid this fails to build on OSX: it looks like you changed the arguments to some qmp functions but forgot to change their callsites in ui/cocoa.m. /Users/pm215/src/qemu-for-merges/ui/cocoa.m:1088:86: error: too few arguments to function call, expected 7, have 4 qmp_eject([drive cStringUsingEncoding: NSASCIIStringEncoding], false, false, &err); ~~~~~~~~~ ^ ./qmp-commands.h:109:1: note: 'qmp_eject' declared here void qmp_eject(bool has_device, const char *device, bool has_id, const char *id, bool has_force, bool force, Error **errp); ^ /Users/pm215/src/qemu-for-merges/ui/cocoa.m:1127:40: error: too few arguments to function call, expected 10, have 7 &err); ^ ./qmp-commands.h:61:1: note: 'qmp_blockdev_change_medium' declared here void qmp_blockdev_change_medium(bool has_device, const char *device, bool has_id, const char *id, const char *filename, bool has_format, const char *fo... ^ thanks -- PMM
Am 23.09.2016 um 13:12 hat Peter Maydell geschrieben: > On 22 September 2016 at 17:29, Kevin Wolf <kwolf@redhat.com> wrote: > > The following changes since commit 430da7a81d356e368ccd88dcca60f38da9aa5b9a: > > > > Merge remote-tracking branch 'remotes/riku/tags/pull-linux-user-20160915' into staging (2016-09-22 15:39:54 +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 5dccdc1b1e0c57746e5f90c69f697029a3686b5f: > > > > block: Remove BB interface from blockdev-add/del (2016-09-22 18:02:15 +0200) > > > > ---------------------------------------------------------------- > > Block layer patches > > > > ---------------------------------------------------------------- > > Hi; I'm afraid this fails to build on OSX: it looks like you > changed the arguments to some qmp functions but forgot to change > their callsites in ui/cocoa.m. I can't test compile any of this, but I'll give it a try... Kevin
The following changes since commit 430da7a81d356e368ccd88dcca60f38da9aa5b9a: Merge remote-tracking branch 'remotes/riku/tags/pull-linux-user-20160915' into staging (2016-09-22 15:39:54 +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 5dccdc1b1e0c57746e5f90c69f697029a3686b5f: block: Remove BB interface from blockdev-add/del (2016-09-22 18:02:15 +0200) ---------------------------------------------------------------- Block layer patches ---------------------------------------------------------------- Alberto Garcia (7): block: Remove bdrv_is_snapshot block: Set BDRV_O_ALLOW_RDWR and snapshot_options before storing the flags block: Update bs->open_flags earlier in bdrv_open_common() block: Add "read-only" to the options QDict block: Don't queue the same BDS twice in bdrv_reopen_queue_child() commit: Add 'base' to the reopen queue before 'overlay_bs' block: rename "read-only" to BDRV_OPT_READ_ONLY Daniel P. Berrange (1): qcow2: fix encryption during cow of sectors Denis V. Lunev (1): tests: allow to specify list of formats to test for check-block.sh Kevin Wolf (24): hmp: Remove dead code in hmp_qemu_io() block: Fix 'since' for compressed Drive/BlockdevBackup block: Add blk_by_dev() qdev-monitor: Factor out find_device_state() qdev-monitor: Add blk_by_qdev_id() block: Accept device model name for blockdev-open/close-tray block: Accept device model name for x-blockdev-insert-medium block: Accept device model name for x-blockdev-remove-medium block: Accept device model name for eject block: Accept device model name for blockdev-change-medium block: Accept device model name for block_set_io_throttle qemu-iotests/118: Test media change with qdev name qemu-iotests/041: Avoid blockdev-add with id qemu-iotests/067: Avoid blockdev-add with id qemu-iotests/071: Avoid blockdev-add with id qemu-iotests/081: Avoid blockdev-add with id qemu-iotests/087: Avoid blockdev-add with id qemu-iotests/117: Avoid blockdev-add with id qemu-iotests/118: Avoid blockdev-add with id qemu-iotests/124: Avoid blockdev-add with id qemu-iotests/139: Avoid blockdev-add with id block: Avoid printing NULL string in error messages qemu-iotests/141: Avoid blockdev-add with id block: Remove BB interface from blockdev-add/del block.c | 89 ++++++++---- block/block-backend.c | 19 +++ block/commit.c | 8 +- block/qcow2-cluster.c | 2 +- block/vvfat.c | 3 +- blockdev.c | 309 ++++++++++++++++++++--------------------- docs/qmp-commands.txt | 78 ++++++----- hmp.c | 21 ++- include/block/block.h | 2 +- include/sysemu/block-backend.h | 2 + qapi/block-core.json | 78 +++++------ qapi/block.json | 9 +- qdev-monitor.c | 34 ++++- qmp.c | 4 +- tests/check-block.sh | 13 +- tests/qemu-iotests/041 | 71 +++++----- tests/qemu-iotests/067 | 6 +- tests/qemu-iotests/067.out | 211 +++++++++++++++++----------- tests/qemu-iotests/071 | 8 +- tests/qemu-iotests/081 | 2 +- tests/qemu-iotests/085.out | 6 +- tests/qemu-iotests/087 | 62 +-------- tests/qemu-iotests/087.out | 8 +- tests/qemu-iotests/117 | 4 +- tests/qemu-iotests/118 | 91 +++++++++--- tests/qemu-iotests/124 | 17 ++- tests/qemu-iotests/139 | 178 ++++++++---------------- tests/qemu-iotests/139.out | 4 +- tests/qemu-iotests/141 | 24 ++-- tests/qemu-iotests/141.out | 24 ++-- tests/qemu-iotests/158 | 80 +++++++++++ tests/qemu-iotests/158.out | 36 +++++ tests/qemu-iotests/group | 1 + tests/qemu-iotests/iotests.py | 5 + 34 files changed, 843 insertions(+), 666 deletions(-) create mode 100755 tests/qemu-iotests/158 create mode 100644 tests/qemu-iotests/158.out