[libvirt] [PATCH 2/2]virsh: remove attach-disk '--shareable' option

[Peter Krempa]

On 10/15/13 05:54, Chen Hanxiao wrote:
> From: Chen Hanxiao <chenhanxiao at cn.fujitsu.com>
> 
> '--mode' option could set shareable tag already.
> We do not need to duplicate options.
> 
> Signed-off-by: Chen Hanxiao <chenhanxiao at cn.fujitsu.com>
> ---
>  tools/virsh-domain.c | 7 -------
>  tools/virsh.pod      | 3 +--
>  2 files changed, 1 insertion(+), 9 deletions(-)
> 
> diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
> index ba67a69..eb5ead1 100644
> --- a/tools/virsh-domain.c
> +++ b/tools/virsh-domain.c
> @@ -311,10 +311,6 @@ static const vshCmdOptDef opts_attach_disk[] = {
>       .type = VSH_OT_STRING,
>       .help = N_("wwn of disk device")
>      },
> -    {.name = "shareable",
> -     .type = VSH_OT_BOOL,
> -     .help = N_("shareable between domains")
> -    },

We can't remove this whole part. The correct approach is to use correct
flags to hide it.

>      {.name = "rawio",
>       .type = VSH_OT_BOOL,
>       .help = N_("needs rawio capability")
> @@ -625,9 +621,6 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd)
>      if (wwn)
>          virBufferAsprintf(&buf, "  <wwn>%s</wwn>\n", wwn);
>  
> -    if (vshCommandOptBool(cmd, "shareable"))
> -        virBufferAddLit(&buf, "  <shareable/>\n");
> -

NACK to this part. As DanPB mentioned, we need to remove the
documentation, to discourage use of it, but we can't remove the argument
as it would break backwards compatibility.

>      if (straddr) {
>          if (str2DiskAddress(straddr, &diskAddr) != 0) {
>              vshError(ctl, _("Invalid address."));

Peter


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 901 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20131015/a10469b8/attachment-0001.sig>