11:42 a.m.
Use the established approach to improve this function too.
---
tools/virsh-domain.c | 59 +++++++++++++++++++++++++++++++++++++---------------
tools/virsh.pod | 15 +++++++++----
2 files changed, 53 insertions(+), 21 deletions(-)
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 7079066..35c3961 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -9782,13 +9782,25 @@ static const vshCmdOptDef opts_detach_disk[] = {
.help = N_("target of disk device")
},
{.name = "persistent",
- .type = VSH_OT_ALIAS,
- .help = "config"
+ .type = VSH_OT_BOOL,
+ .help = N_("make live change persistent")
},
{.name = "config",
.type = VSH_OT_BOOL,
.help = N_("affect next boot")
},
+ {.name = "live",
+ .type = VSH_OT_BOOL,
+ .help = N_("affect running domain")
+ },
+ {.name = "current",
+ .type = VSH_OT_BOOL,
+ .help = N_("affect current domain")
+ },
+ {.name = "force",
+ .type = VSH_OT_BOOL,
+ .help = N_("force device update")
+ },
{.name = NULL}
};
@@ -9801,8 +9813,23 @@ cmdDetachDisk(vshControl *ctl, const vshCmd *cmd)
char *doc = NULL;
int ret;
bool functionReturn = false;
- unsigned int flags;
xmlNodePtr disk_node = NULL;
+ bool current = vshCommandOptBool(cmd, "current");
+ bool config = vshCommandOptBool(cmd, "config");
+ bool live = vshCommandOptBool(cmd, "live");
+ bool persistent = vshCommandOptBool(cmd, "persistent");
+ unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT;
+
+ VSH_EXCLUSIVE_OPTIONS_VAR(persistent, live);
+ VSH_EXCLUSIVE_OPTIONS_VAR(persistent, current);
+
+ VSH_EXCLUSIVE_OPTIONS_VAR(current, live);
+ VSH_EXCLUSIVE_OPTIONS_VAR(current, config);
+
+ if (config || persistent)
+ flags |= VIR_DOMAIN_AFFECT_CONFIG;
+ if (live)
+ flags |= VIR_DOMAIN_AFFECT_LIVE;
if (!(dom = vshCommandOptDomain(ctl, cmd, NULL)))
return false;
@@ -9810,10 +9837,13 @@ cmdDetachDisk(vshControl *ctl, const vshCmd *cmd)
if (vshCommandOptStringReq(ctl, cmd, "target", &target) < 0)
goto cleanup;
- doc = virDomainGetXMLDesc(dom, 0);
- if (!doc)
+ if (!(doc = virDomainGetXMLDesc(dom, 0)))
goto cleanup;
+ if (persistent &&
+ virDomainIsActive(dom) == 1)
+ flags |= VIR_DOMAIN_AFFECT_LIVE;
+
if (!(disk_node = vshFindDisk(doc, target, VSH_FIND_DISK_NORMAL)))
goto cleanup;
@@ -9821,24 +9851,19 @@ cmdDetachDisk(vshControl *ctl, const vshCmd *cmd)
VSH_PREPARE_DISK_XML_NONE)))
goto cleanup;
- if (vshCommandOptBool(cmd, "config")) {
- flags = VIR_DOMAIN_AFFECT_CONFIG;
- if (virDomainIsActive(dom) == 1)
- flags |= VIR_DOMAIN_AFFECT_LIVE;
- ret = virDomainDetachDeviceFlags(dom,
- disk_xml,
- flags);
- } else {
+ if (flags != 0)
+ ret = virDomainDetachDeviceFlags(dom, disk_xml, flags);
+ else
ret = virDomainDetachDevice(dom, disk_xml);
- }
if (ret != 0) {
vshError(ctl, "%s", _("Failed to detach disk"));
- } else {
- vshPrint(ctl, "%s", _("Disk detached successfully\n"));
- functionReturn = true;
+ goto cleanup;
}
+ vshPrint(ctl, "%s", _("Disk detached successfully\n"));
+ functionReturn = true;
+
cleanup:
xmlFreeNode(disk_node);
VIR_FREE(disk_xml);
diff --git a/tools/virsh.pod b/tools/virsh.pod
index 760b164..04df31b 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -1875,13 +1875,20 @@ exclusive. Not specifying any flag is the same as specifying
I<--current>.
For compatibility purposes, I<--persistent> behaves like I<--config> for
an offline domain, and like I<--live> I<--config> for a running domain.
-=item B<detach-disk> I<domain> I<target> [I<--config>]
+=item B<detach-disk> I<domain> I<target>
+[[[I<--live>] [I<--config>] | [I<--current>]] |
[I<--persistent>]]
Detach a disk device from a domain. The I<target> is the device as seen
from the domain.
-If I<--config> is specified, alter persistent configuration, effect observed
-on next boot, for compatibility purposes, I<--persistent> is alias of
-I<--config>.
+
+If I<--live> is specified, affect a running domain.
+If I<--config> is specified, affect the next startup of a persistent domain.
+If I<--current> is specified, affect the current domain state.
+Both I<--live> and I<--config> flags may be given, but I<--current> is
+exclusive. Not specifying any flag is the same as specifying I<--current>.
+
+For compatibility purposes, I<--persistent> behaves like I<--config> for
+an offline domain, and like I<--live> I<--config> for a running domain.
=item B<detach-interface> I<domain> I<type> [I<--mac mac>]
[[[I<--live>] [I<--config>] | [I<--current>]] |
[I<--persistent>]]
--
1.8.1.5