diff options
| author | Anthony Liguori | 2013-10-11 18:29:58 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2013-10-11 18:29:58 +0200 |
| commit | 33c6cae44eccea5e627c2dc5cbf31456db90fc38 (patch) | |
| tree | 26f994c9f78144b2a6f12da686a2235d0df1dd21 /block/commit.c | |
| parent | Merge remote-tracking branch 'afaerber/tags/qom-cpu-for-anthony' into staging (diff) | |
| parent | qemu-iotests: Add test for inactive L2 overlap (diff) | |
| download | qemu-33c6cae44eccea5e627c2dc5cbf31456db90fc38.tar.gz qemu-33c6cae44eccea5e627c2dc5cbf31456db90fc38.tar.xz qemu-33c6cae44eccea5e627c2dc5cbf31456db90fc38.zip | |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
# By Max Reitz (30) and others
# Via Kevin Wolf
* kwolf/for-anthony: (61 commits)
qemu-iotests: Add test for inactive L2 overlap
qemu-io: Let "open" pass options to block driver
vmdk: Fix vmdk_parse_extents
blockdev: blockdev_init() error conversion
blockdev: Don't disable COR automatically with blockdev-add
blockdev: Remove 'media' parameter from blockdev_init()
qemu-iotests: Check autodel behaviour for device_del
blockdev: Remove IF_* check for read-only blockdev_init
blockdev: Move virtio-blk device creation to drive_init
blockdev: Move bus/unit/index processing to drive_init
blockdev: Move parsing of 'boot' option to drive_init
blockdev: Moving parsing of geometry options to drive_init
blockdev: Move parsing of 'if' option to drive_init
blockdev: Move parsing of 'media' option to drive_init
blockdev: Pass QDict to blockdev_init()
blockdev: Separate ID generation from DriveInfo creation
blockdev: 'blockdev-add' QMP command
blockdev: Introduce DriveInfo.enable_auto_del
qapi-types/visit.py: Inheritance for structs
qapi-types/visit.py: Pass whole expr dict for structs
...
Message-id: 1381503951-27985-1-git-send-email-kwolf@redhat.com
Signed-off-by: Anthony Liguori <aliguori@amazon.com>
Diffstat (limited to 'block/commit.c')
| -rw-r--r-- | block/commit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/block/commit.c b/block/commit.c index ac4b7ccbc9..d4090cbf7d 100644 --- a/block/commit.c +++ b/block/commit.c @@ -173,9 +173,9 @@ static void commit_set_speed(BlockJob *job, int64_t speed, Error **errp) ratelimit_set_speed(&s->limit, speed / BDRV_SECTOR_SIZE, SLICE_TIME); } -static const BlockJobType commit_job_type = { +static const BlockJobDriver commit_job_driver = { .instance_size = sizeof(CommitBlockJob), - .job_type = "commit", + .job_type = BLOCK_JOB_TYPE_COMMIT, .set_speed = commit_set_speed, }; @@ -238,7 +238,7 @@ void commit_start(BlockDriverState *bs, BlockDriverState *base, } - s = block_job_create(&commit_job_type, bs, speed, cb, opaque, errp); + s = block_job_create(&commit_job_driver, bs, speed, cb, opaque, errp); if (!s) { return; } |