[libvirt] [PATCH 4/5] virsh-domain: Add --live, --config, --current logic to cmdDetachDevice
Use the established approach to improve this function too.
---
tools/virsh-domain.c | 46 +++++++++++++++++++++++++++++++++++++---------
tools/virsh.pod | 15 +++++++++++----
2 files changed, 48 insertions(+), 13 deletions(-)
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index df72c78..7079066 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -9167,14 +9167,27 @@ static const vshCmdOptDef opts_detach_device[] = {
.help = N_("XML file")
},
{.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}
+
};
static bool
@@ -9185,11 +9198,30 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd)
char *buffer = NULL;
int ret;
bool funcRet = false;
- unsigned int flags;
+ 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;
+ if (persistent &&
+ virDomainIsActive(dom) == 1)
+ flags |= VIR_DOMAIN_AFFECT_LIVE;
+
if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0)
goto cleanup;
@@ -9198,14 +9230,10 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd)
goto cleanup;
}
- if (vshCommandOptBool(cmd, "config")) {
- flags = VIR_DOMAIN_AFFECT_CONFIG;
- if (virDomainIsActive(dom) == 1)
- flags |= VIR_DOMAIN_AFFECT_LIVE;
+ if (flags != 0)
ret = virDomainDetachDeviceFlags(dom, buffer, flags);
- } else {
+ else
ret = virDomainDetachDevice(dom, buffer);
- }
if (ret < 0) {
vshError(ctl, _("Failed to detach device from %s"), from);
diff --git a/tools/virsh.pod b/tools/virsh.pod
index ebbe201..760b164 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -1858,16 +1858,23 @@ B<Note>: the optional target value is the name of a device
to be created
as the back-end on the node. If not provided a device named "vnetN" or
"vifN"
will be created automatically.
-=item B<detach-device> I<domain> I<FILE> [I<--config>]
+=item B<detach-device> I<domain> I<FILE>
+[[[I<--live>] [I<--config>] | [I<--current>]] |
[I<--persistent>]]
Detach a device from the domain, takes the same kind of XML descriptions
as command B<attach-device>.
-If I<--config> is specified, alter persistent configuration, effect observed
-on next boot, for compatibility purposes, I<--persistent> is alias of
-I<--config>.
For passthrough host devices, see also B<nodedev-reattach>, needed if
the device does not use managed mode.
+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-disk> I<domain> I<target> [I<--config>]
Detach a disk device from a domain. The I<target> is the device as seen
--
1.8.1.5