diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-01-23 18:25:30 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-01-23 18:25:30 +0000 |
| commit | d109f80af3ad5c64c8c30e7ab21f2e342b5e9a8d (patch) | |
| tree | f0a649b3d92e256ee83eee82bf8bc47f24166cfc /include | |
| parent | a46b3aaf6bb038d4f6f192a84df204f10929e75c (diff) | |
| parent | bc63781ca350cad4c9eb142ce8f55bfaded4276e (diff) | |
| download | focaccia-qemu-d109f80af3ad5c64c8c30e7ab21f2e342b5e9a8d.tar.gz focaccia-qemu-d109f80af3ad5c64c8c30e7ab21f2e342b5e9a8d.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block patches for 2.3 # gpg: Signature made Fri 23 Jan 2015 17:53:06 GMT using RSA key ID C88F2FD6 # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" * remotes/kevin/tags/for-upstream: iotests: Lower 064's memory usage block: vhdx - force FileOffsetMB field to '0' for certain block states block: update string sizes for filename,backing_file,exact_filename block: mirror - change string allocation to 2-bytes block: remove unused variable in bdrv_commit block: qapi - move string allocation from stack to the heap block: vmdk - move string allocations from stack to the heap block: vmdk - make ret variable usage clear iotests: Add tests for more corruption cases qcow2: Add two more unalignment checks virtio-blk: Use blk_aio_ioctl virtio-blk: Pass req to virtio_blk_handle_scsi_req Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/block/block_int.h | 8 | ||||
| -rw-r--r-- | include/hw/virtio/virtio-blk.h | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/include/block/block_int.h b/include/block/block_int.h index 06a21dd13d..e264be97b2 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -339,13 +339,13 @@ struct BlockDriverState { * regarding this BDS's context */ QLIST_HEAD(, BdrvAioNotifier) aio_notifiers; - char filename[1024]; - char backing_file[1024]; /* if non zero, the image is a diff of - this file image */ + char filename[PATH_MAX]; + char backing_file[PATH_MAX]; /* if non zero, the image is a diff of + this file image */ char backing_format[16]; /* if non-zero and backing_file exists */ QDict *full_open_options; - char exact_filename[1024]; + char exact_filename[PATH_MAX]; BlockDriverState *backing_hd; BlockDriverState *file; diff --git a/include/hw/virtio/virtio-blk.h b/include/hw/virtio/virtio-blk.h index 3979dc41af..4652b70b5d 100644 --- a/include/hw/virtio/virtio-blk.h +++ b/include/hw/virtio/virtio-blk.h @@ -153,9 +153,6 @@ VirtIOBlockReq *virtio_blk_alloc_request(VirtIOBlock *s); void virtio_blk_free_request(VirtIOBlockReq *req); -int virtio_blk_handle_scsi_req(VirtIOBlock *blk, - VirtQueueElement *elem); - void virtio_blk_handle_request(VirtIOBlockReq *req, MultiReqBuffer *mrb); void virtio_submit_multiwrite(BlockBackend *blk, MultiReqBuffer *mrb); |