summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorFabiano Rosas <farosas@linux.vnet.ibm.com>2018-03-12 19:07:49 -0300
committerKevin Wolf <kwolf@redhat.com>2018-03-26 12:16:00 +0200
commitcb83d2efe1f591cdc7ff2e8fbc67544155f264d6 (patch)
tree65ab39600e50c02d256e88a1668acc0bdaea9dbc
parent71b74b25444ed3ddfe7b025d059ca882916a4b02 (diff)
downloadfocaccia-qemu-cb83d2efe1f591cdc7ff2e8fbc67544155f264d6.tar.gz
focaccia-qemu-cb83d2efe1f591cdc7ff2e8fbc67544155f264d6.zip
block/replication: Remove protocol_name field
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 <farosas@linux.vnet.ibm.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--block/replication.c1
-rw-r--r--replication.h1
2 files changed, 0 insertions, 2 deletions
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,
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,