diff options
| author | Markus Armbruster <armbru@redhat.com> | 2017-03-30 19:43:17 +0200 |
|---|---|---|
| committer | Max Reitz <mreitz@redhat.com> | 2017-04-03 17:11:39 +0200 |
| commit | d1c136885ba5b302f9781b8927a8ea2ee38cccd2 (patch) | |
| tree | 3a131f6fc3c62fc73fd576cb04b63fc9393033f2 /qapi | |
| parent | 9445673ea67c272616b9f718396e267caa6446b7 (diff) | |
| download | qemu-d1c136885ba5b302f9781b8927a8ea2ee38cccd2.tar.gz | |
sheepdog: Fix blockdev-add
Commit 831acdc "sheepdog: Implement bdrv_parse_filename()" and commit
d282f34 "sheepdog: Support blockdev-add" have different ideas on how
the QemuOpts parameters for the server address are named. Fix that.
While there, rename BlockdevOptionsSheepdog member addr to server, for
consistency with BlockdevOptionsSsh, BlockdevOptionsGluster,
BlockdevOptionsNbd.
Commit 831acdc's example becomes
--drive driver=sheepdog,server.type=inet,server.host=fido,server.port=7000,vdi=dolly
instead of
--drive driver=sheepdog,host=fido,vdi=dolly
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Tested-by: Kashyap Chamarthy <kchamart@redhat.com>
Message-id: 1490895797-29094-10-git-send-email-armbru@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'qapi')
| -rw-r--r-- | qapi/block-core.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qapi/block-core.json b/qapi/block-core.json index e4d8a63575..033457ce86 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -2623,7 +2623,7 @@ # Driver specific block device options for sheepdog # # @vdi: Virtual disk image name -# @addr: The Sheepdog server to connect to +# @server: The Sheepdog server to connect to # @snap-id: Snapshot ID # @tag: Snapshot tag name # @@ -2632,7 +2632,7 @@ # Since: 2.9 ## { 'struct': 'BlockdevOptionsSheepdog', - 'data': { 'addr': 'SocketAddressFlat', + 'data': { 'server': 'SocketAddressFlat', 'vdi': 'str', '*snap-id': 'uint32', '*tag': 'str' } } |