block/replication: Remove protocol_name field
authorFabiano Rosas <farosas@linux.vnet.ibm.com>
Mon, 12 Mar 2018 22:07:49 +0000 (19:07 -0300)
committerKevin Wolf <kwolf@redhat.com>
Mon, 26 Mar 2018 10:16:00 +0000 (12:16 +0200)
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>
block/replication.c
replication.h

index f98ef094b9da59d5c578696ee693a4a45fca2cc3..6c0c7186d9a2c0c1c30e534e0437bcc7eb42d378 100644 (file)
@@ -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,
index 8faefe005f83584c39e66e5a80cbb2aa1bc0c1ca..4c8354de23ca2c9c1255ecd881f62de1a384fed7 100644 (file)
@@ -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,