qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 02/19] block/replication: Remove protocol_name field
Date: Mon, 26 Mar 2018 16:35:43 +0200	[thread overview]
Message-ID: <20180326143600.7724-3-kwolf@redhat.com> (raw)
In-Reply-To: <20180326143600.7724-1-kwolf@redhat.com>

From: Fabiano Rosas <farosas@linux.vnet.ibm.com>

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>
---
 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

  parent reply	other threads:[~2018-03-26 14:36 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-26 14:35 [Qemu-devel] [PULL 00/19] Block layer patches Kevin Wolf
2018-03-26 14:35 ` [Qemu-devel] [PULL 01/19] iotests: 163 is not quick Kevin Wolf
2018-03-26 14:35 ` Kevin Wolf [this message]
2018-03-26 14:35 ` [Qemu-devel] [PULL 03/19] block/quorum: Remove protocol-related fields Kevin Wolf
2018-03-26 14:35 ` [Qemu-devel] [PULL 04/19] block/throttle: " Kevin Wolf
2018-03-26 14:35 ` [Qemu-devel] [PULL 05/19] block/blkreplay: " Kevin Wolf
2018-03-26 14:35 ` [Qemu-devel] [PULL 06/19] include/block/block_int: Document protocol related functions Kevin Wolf
2018-03-26 14:35 ` [Qemu-devel] [PULL 07/19] qcow2: Reset free_cluster_index when allocating a new refcount block Kevin Wolf
2018-03-26 14:35 ` [Qemu-devel] [PULL 08/19] vdi: Change 'static' create option to 'preallocation' in QMP Kevin Wolf
2018-03-26 14:35 ` [Qemu-devel] [PULL 09/19] vdi: Fix build with CONFIG_VDI_DEBUG Kevin Wolf
2018-03-26 14:35 ` [Qemu-devel] [PULL 10/19] qemu-iotests: Test vdi image creation with QMP Kevin Wolf
2018-03-26 14:35 ` [Qemu-devel] [PULL 11/19] qemu-iotests: Enable 025 for luks Kevin Wolf
2018-03-26 14:35 ` [Qemu-devel] [PULL 12/19] luks: Turn another invalid assertion into check Kevin Wolf
2018-03-26 14:35 ` [Qemu-devel] [PULL 13/19] qemu-iotests: Test invalid resize on luks Kevin Wolf
2018-03-26 14:35 ` [Qemu-devel] [PULL 14/19] parallels: Check maximum cluster size on create Kevin Wolf
2018-03-26 14:35 ` [Qemu-devel] [PULL 15/19] qemu-iotests: Test parallels image creation with QMP Kevin Wolf
2018-03-26 14:35 ` [Qemu-devel] [PULL 16/19] vhdx: Require power-of-two block size on create Kevin Wolf
2018-03-26 14:35 ` [Qemu-devel] [PULL 17/19] vhdx: Don't use error_setg_errno() with constant errno Kevin Wolf
2018-03-26 14:35 ` [Qemu-devel] [PULL 18/19] vhdx: Check for 4 GB maximum log size on creation Kevin Wolf
2018-03-26 14:36 ` [Qemu-devel] [PULL 19/19] qemu-iotests: Test vhdx image creation with QMP Kevin Wolf
2018-03-27  9:27 ` [Qemu-devel] [PULL 00/19] Block layer patches Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180326143600.7724-3-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).