[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 02/19] block/replication: Remove protocol_name field
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 02/19] block/replication: Remove protocol_name field |
Date: |
Mon, 26 Mar 2018 16:35:43 +0200 |
From: Fabiano Rosas <address@hidden>
The protocol_name field is used when selecting a driver via protocol
syntax (i.e. <protocol_name>:<filename:options:...>). Drivers that are
only selected explicitly (e.g. driver=replication,mode=primary,...)
should not have a protocol_name.
This patch removes the protocol_name field from the brdv_replication
structure so that attempts to invoke this driver using protocol syntax
will fail gracefully:
$ qemu-img info replication:foo
qemu-img: Could not open 'replication:': Unknown protocol 'replication'
Buglink: https://bugs.launchpad.net/qemu/+bug/1726733
Signed-off-by: Fabiano Rosas <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
replication.h | 1 -
block/replication.c | 1 -
2 files changed, 2 deletions(-)
diff --git a/replication.h b/replication.h
index 8faefe005f..4c8354de23 100644
--- a/replication.h
+++ b/replication.h
@@ -67,7 +67,6 @@ typedef struct ReplicationState ReplicationState;
*
* BlockDriver bdrv_replication = {
* .format_name = "replication",
- * .protocol_name = "replication",
* .instance_size = sizeof(BDRVReplicationState),
*
* .bdrv_open = replication_open,
diff --git a/block/replication.c b/block/replication.c
index f98ef094b9..6c0c7186d9 100644
--- a/block/replication.c
+++ b/block/replication.c
@@ -703,7 +703,6 @@ static void replication_stop(ReplicationState *rs, bool
failover, Error **errp)
BlockDriver bdrv_replication = {
.format_name = "replication",
- .protocol_name = "replication",
.instance_size = sizeof(BDRVReplicationState),
.bdrv_open = replication_open,
--
2.13.6
- [Qemu-block] [PULL 00/19] Block layer patches, Kevin Wolf, 2018/03/26
- [Qemu-block] [PULL 03/19] block/quorum: Remove protocol-related fields, Kevin Wolf, 2018/03/26
- [Qemu-block] [PULL 01/19] iotests: 163 is not quick, Kevin Wolf, 2018/03/26
- [Qemu-block] [PULL 05/19] block/blkreplay: Remove protocol-related fields, Kevin Wolf, 2018/03/26
- [Qemu-block] [PULL 06/19] include/block/block_int: Document protocol related functions, Kevin Wolf, 2018/03/26
- [Qemu-block] [PULL 02/19] block/replication: Remove protocol_name field,
Kevin Wolf <=
- [Qemu-block] [PULL 08/19] vdi: Change 'static' create option to 'preallocation' in QMP, Kevin Wolf, 2018/03/26
- [Qemu-block] [PULL 09/19] vdi: Fix build with CONFIG_VDI_DEBUG, Kevin Wolf, 2018/03/26
- [Qemu-block] [PULL 04/19] block/throttle: Remove protocol-related fields, Kevin Wolf, 2018/03/26
- [Qemu-block] [PULL 07/19] qcow2: Reset free_cluster_index when allocating a new refcount block, Kevin Wolf, 2018/03/26
- [Qemu-block] [PULL 10/19] qemu-iotests: Test vdi image creation with QMP, Kevin Wolf, 2018/03/26
- [Qemu-block] [PULL 13/19] qemu-iotests: Test invalid resize on luks, Kevin Wolf, 2018/03/26
- [Qemu-block] [PULL 11/19] qemu-iotests: Enable 025 for luks, Kevin Wolf, 2018/03/26
- [Qemu-block] [PULL 15/19] qemu-iotests: Test parallels image creation with QMP, Kevin Wolf, 2018/03/26
- [Qemu-block] [PULL 12/19] luks: Turn another invalid assertion into check, Kevin Wolf, 2018/03/26
- [Qemu-block] [PULL 18/19] vhdx: Check for 4 GB maximum log size on creation, Kevin Wolf, 2018/03/26