diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index f55dae4bacc1ea43daed5fcf716bd17b8af9d31d..b1ab9117fdd23f324ab7565e7af01ed0976caa58 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -277,6 +277,10 @@ static const vshCmdOptDef opts_attach_disk[] = {
.flags = VSH_OFLAG_REQ,
.help = N_("target of disk device")
},
+ {.name = "targetbus",
+ .type = VSH_OT_STRING,
+ .help = N_("target bus of disk device")
+ },
{.name = "driver",
.type = VSH_OT_STRING,
.help = N_("driver of disk device")
@@ -502,7 +506,7 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd)
const char *source = NULL, *target = NULL, *driver = NULL,
*subdriver = NULL, *type = NULL, *mode = NULL,
*cache = NULL, *serial = NULL, *straddr = NULL,
- *wwn = NULL;
+ *wwn = NULL, *targetbus = NULL;
struct DiskAddress diskAddr;
bool isFile = false, functionReturn = false;
int ret;
@@ -536,6 +540,7 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd)
vshCommandOptStringReq(ctl, cmd, "serial", &serial) < 0 ||
vshCommandOptStringReq(ctl, cmd, "wwn", &wwn) < 0 ||
vshCommandOptStringReq(ctl, cmd, "address", &straddr) < 0 ||
+ vshCommandOptStringReq(ctl, cmd, "targetbus", &targetbus) < 0 ||
vshCommandOptStringReq(ctl, cmd, "sourcetype", &stype) < 0)
goto cleanup;
@@ -590,7 +595,11 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd)
if (source)
virBufferAsprintf(&buf, "\n",
isFile ? "file" : "dev", source);
- virBufferAsprintf(&buf, "\n", target);
+ virBufferAsprintf(&buf, "\n");
+
if (mode)
virBufferAsprintf(&buf, "<%s/>\n", mode);
diff --git a/tools/virsh.pod b/tools/virsh.pod
index b248c9a346e4ebd7dd4568c0bfc1f86c80d0c018..620ea369ebf8e9a06d82c9b4cc310df2046a7897 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -2089,17 +2089,21 @@ B: using of partial device definition XML files may lead to unexpected
results as some fields may be autogenerated and thus match devices other than
expected.
-=item B I I I
-[[[I<--live>] [I<--config>] | [I<--current>]] | [I<--persistent>]]
-[I<--driver driver>] [I<--subdriver subdriver>] [I<--cache cache>]
-[I<--type type>] [I<--mode mode>] [I<--sourcetype sourcetype>]
-[I<--serial serial>] [I<--wwn wwn>] [I<--rawio>]
-[I<--address address>] [I<--multifunction>] [I<--print-xml>]
+=item B I I I [[[I<--live>] [I<--config>]
+| [I<--current>]] | [I<--persistent>]] [I<--targetbus bus>] [I<--driver
+driver>] [I<--subdriver subdriver>] [I<--cache cache>] [I<--type type>]
+[I<--mode mode>] [I<--sourcetype sourcetype>] [I<--serial serial>] [I<--wwn
+wwn>] [I<--rawio>] [I<--address address>] [I<--multifunction>] [I<--print-xml>]
Attach a new disk device to the domain.
I is path for the files and devices. I controls the bus or
device under which the disk is exposed to the guest OS. It indicates the
-"logical" device name. I can be I, I or I for the Xen
+"logical" device name; the optional I attribute specifies the type
+of disk device to emulate; possible values are driver specific, with typical
+values being I, I, I, I, I, I, or I, if
+omitted, the bus type is inferred from the style of the device name (e.g. a
+device named 'sda' will typically be exported using a SCSI bus). I can
+be I, I or I for the Xen
hypervisor depending on the kind of access; or I for the QEMU emulator.
Further details to the driver can be passed using I. For Xen
I can be I, while for QEMU subdriver should match the format