[libvirt] [PATCH 2/2]virsh: remove attach-disk '--shareable' option
From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com>
'--mode' option could set shareable tag already.
We do not need to duplicate options.
Signed-off-by: Chen Hanxiao <chenhanxiao(a)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")
- },
{.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");
-
if (straddr) {
if (str2DiskAddress(straddr, &diskAddr) != 0) {
vshError(ctl, _("Invalid address."));
diff --git a/tools/virsh.pod b/tools/virsh.pod
index f6a80a3..8a22f23 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -1916,7 +1916,7 @@ expected.
[[[I<--live>] [I<--config>] | [I<--current>]] |
[I<--persistent>]]
[I<--driver driver>] [I<--subdriver subdriver>] [I<--cache cache>]
[I<--type type>] [I<--mode mode[,mode2]>] [I<--config>]
[I<--sourcetype soucetype>]
-[I<--serial serial>] [I<--wwn wwn>] [I<--shareable>]
[I<--rawio>]
+[I<--serial serial>] [I<--wwn wwn>] [I<--rawio>]
[I<--address address>] [I<--multifunction>] [I<--print-xml>]
Attach a new disk device to the domain.
@@ -1938,7 +1938,6 @@ I<sourcetype> can indicate the type of source (block|file)
I<cache> can be one of "default", "none",
"writethrough", "writeback",
"directsync" or "unsafe".
I<serial> is the serial of disk device. I<wwn> is the wwn of disk device.
-I<shareable> indicates the disk device is shareable between domains.
I<rawio> indicates the disk needs rawio capability.
I<address> is the address of disk device in the form of
pci:domain.bus.slot.function,
scsi:controller.bus.unit or ide:controller.bus.unit.
--
1.8.2.1