diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-03-26 17:13:31 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-03-26 17:13:31 +0100 |
| commit | 62a2b55e8d098d91908b17fc37cb1a4f2a854f8f (patch) | |
| tree | 5e2a810f32f3467bf78fcf4037e80aa03b5b8130 /block/quorum.c | |
| parent | 7b93d78a04aa242d377ae213b79db6c319c71847 (diff) | |
| parent | 0b7e7f66813a7e346e12d47be977a32a530a6316 (diff) | |
| download | qemu-62a2b55e8d098d91908b17fc37cb1a4f2a854f8f.zip qemu-62a2b55e8d098d91908b17fc37cb1a4f2a854f8f.tar.gz qemu-62a2b55e8d098d91908b17fc37cb1a4f2a854f8f.tar.bz2 | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches
# gpg: Signature made Mon 26 Mar 2018 15:33:01 BST
# gpg: using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6
* remotes/kevin/tags/for-upstream:
qemu-iotests: Test vhdx image creation with QMP
vhdx: Check for 4 GB maximum log size on creation
vhdx: Don't use error_setg_errno() with constant errno
vhdx: Require power-of-two block size on create
qemu-iotests: Test parallels image creation with QMP
parallels: Check maximum cluster size on create
qemu-iotests: Test invalid resize on luks
luks: Turn another invalid assertion into check
qemu-iotests: Enable 025 for luks
qemu-iotests: Test vdi image creation with QMP
vdi: Fix build with CONFIG_VDI_DEBUG
vdi: Change 'static' create option to 'preallocation' in QMP
qcow2: Reset free_cluster_index when allocating a new refcount block
include/block/block_int: Document protocol related functions
block/blkreplay: Remove protocol-related fields
block/throttle: Remove protocol-related fields
block/quorum: Remove protocol-related fields
block/replication: Remove protocol_name field
iotests: 163 is not quick
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block/quorum.c')
| -rw-r--r-- | block/quorum.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/block/quorum.c b/block/quorum.c index 14333c1..cfe484a 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -1098,11 +1098,10 @@ static void quorum_refresh_filename(BlockDriverState *bs, QDict *options) static BlockDriver bdrv_quorum = { .format_name = "quorum", - .protocol_name = "quorum", .instance_size = sizeof(BDRVQuorumState), - .bdrv_file_open = quorum_open, + .bdrv_open = quorum_open, .bdrv_close = quorum_close, .bdrv_refresh_filename = quorum_refresh_filename, |