Use the approach established in commit 69ce3ffa8d431e9810607c6e00b7cfcc481b491d to improve this function too. --- tools/virsh-domain.c | 41 ++++++++++++++++++++++++++++++++--------- tools/virsh.pod | 16 +++++++++++++--- 2 files changed, 45 insertions(+), 12 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 0402aef..b965c11 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -173,13 +173,21 @@ static const vshCmdOptDef opts_attach_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 = NULL} }; @@ -191,7 +199,21 @@ cmdAttachDevice(vshControl *ctl, const vshCmd *cmd) char *buffer; int rv; bool ret = false; - unsigned int flags; + unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; + bool current = vshCommandOptBool(cmd, "current"); + bool config = vshCommandOptBool(cmd, "config"); + bool live = vshCommandOptBool(cmd, "live"); + bool persistent = vshCommandOptBool(cmd, "persistent"); + + 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; @@ -199,19 +221,20 @@ cmdAttachDevice(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) goto cleanup; + if (persistent && + virDomainIsActive(dom) == 1) + flags |= VIR_DOMAIN_AFFECT_LIVE; + if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) { vshReportError(ctl); goto cleanup; } - if (vshCommandOptBool(cmd, "config")) { - flags = VIR_DOMAIN_AFFECT_CONFIG; - if (virDomainIsActive(dom) == 1) - flags |= VIR_DOMAIN_AFFECT_LIVE; + if (flags) rv = virDomainAttachDeviceFlags(dom, buffer, flags); - } else { + else rv = virDomainAttachDevice(dom, buffer); - } + VIR_FREE(buffer); if (rv < 0) { diff --git a/tools/virsh.pod b/tools/virsh.pod index 11984bc..a002623 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1809,7 +1809,8 @@ format of the device sections to get the most accurate set of accepted values. =over 4 -=item B<attach-device> I<domain> I<FILE> [I<--config>] +=item B<attach-device> I<domain> I<FILE> +[[[I<--live>] [I<--config>] | [I<--current>]] | [I<--persistent>]] Attach a device to the domain, using a device definition in an XML file using a device definition element such as <disk> or <interface> @@ -1817,13 +1818,22 @@ as the top-level element. See the documentation at L<http://libvirt.org/formatdomain.html#elementsDevices> to learn about libvirt XML format for a device. If I<--config> is specified the command alters the persistent domain configuration with the device -attach taking effect the next time libvirt starts the domain. For -compatibility purposes, I<--persistent> is an alias of I<--config>. +attach taking effect the next time libvirt starts the domain. For cdrom and floppy devices, this command only replaces the media within an existing device; consider using B<update-device> for this usage. For passthrough host devices, see also B<nodedev-detach>, 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. When no flag is specified legacy API is used whose behavior depends +on the hypervisor driver. + +For compatibility purposes, I<--persistent> behaves like I<--config> for +an offline domain, and like I<--live> I<--config> for a running domain. + B<Note>: 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. -- 1.8.2.1

Use the approach established in commit 69ce3ffa8d431e9810607c6e00b7cfcc481b491d to improve this function too. --- tools/virsh-domain.c | 53 ++++++++++++++++++++++++++++++++++++---------------- tools/virsh.pod | 13 +++++++++++-- 2 files changed, 48 insertions(+), 18 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index b965c11..4de5dd5 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -299,14 +299,6 @@ static const vshCmdOptDef opts_attach_disk[] = { .type = VSH_OT_STRING, .help = N_("mode of device reading and writing") }, - {.name = "persistent", - .type = VSH_OT_ALIAS, - .help = "config" - }, - {.name = "config", - .type = VSH_OT_BOOL, - .help = N_("affect next boot") - }, {.name = "sourcetype", .type = VSH_OT_STRING, .help = N_("type of source (block|file)") @@ -335,7 +327,22 @@ static const vshCmdOptDef opts_attach_disk[] = { .type = VSH_OT_BOOL, .help = N_("print XML document rather than attach the disk") }, - + {.name = "persistent", + .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 = NULL} }; @@ -496,15 +503,33 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) struct DiskAddress diskAddr; bool isFile = false, functionReturn = false; int ret; - unsigned int flags; + unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; const char *stype = NULL; virBuffer buf = VIR_BUFFER_INITIALIZER; char *xml = NULL; struct stat st; + bool current = vshCommandOptBool(cmd, "current"); + bool config = vshCommandOptBool(cmd, "config"); + bool live = vshCommandOptBool(cmd, "live"); + bool persistent = vshCommandOptBool(cmd, "persistent"); + + 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, "source", &source) < 0 || vshCommandOptStringReq(ctl, cmd, "target", &target) < 0 || vshCommandOptStringReq(ctl, cmd, "driver", &driver) < 0 || @@ -635,14 +660,10 @@ cmdAttachDisk(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) ret = virDomainAttachDeviceFlags(dom, xml, flags); - } else { + else ret = virDomainAttachDevice(dom, xml); - } if (ret != 0) { vshError(ctl, "%s", _("Failed to attach disk")); diff --git a/tools/virsh.pod b/tools/virsh.pod index a002623..9ae96d1 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1839,6 +1839,7 @@ results as some fields may be autogenerated and thus match devices other than expected. =item B<attach-disk> I<domain> I<source> I<target> +[[[I<--live>] [I<--config>] | [I<--current>]] | [I<--persistent>]] [I<--driver driver>] [I<--subdriver subdriver>] [I<--cache cache>] [I<--type type>] [I<--mode mode>] [I<--config>] [I<--sourcetype soucetype>] [I<--serial serial>] [I<--shareable>] [I<--rawio>] [I<--address address>] @@ -1859,8 +1860,6 @@ alternative to the disk default, although this use only replaces the media within the existing virtual cdrom or floppy device; consider using B<update-device> for this usage instead. I<mode> can specify the two specific mode I<readonly> or I<shareable>. -I<--config> indicates the changes will affect the next boot of the domain, -for compatibility purposes, I<--persistent> is alias of I<--config>. I<sourcetype> can indicate the type of source (block|file) I<cache> can be one of "default", "none", "writethrough", "writeback", "directsync" or "unsafe". @@ -1875,6 +1874,16 @@ address. If I<--print-xml> is specified, then the XML of the disk that would be attached is printed instead. +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. When no flag is specified legacy API is used whose behavior depends +on the hypervisor driver. + +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<attach-interface> I<domain> I<type> I<source> [I<--target target>] [I<--mac mac>] [I<--script script>] [I<--model model>] [I<--config>] [I<--inbound average,peak,burst>] [I<--outbound average,peak,burst>] -- 1.8.2.1

Use the approach established in commit 69ce3ffa8d431e9810607c6e00b7cfcc481b491d to improve this function too. --- tools/virsh-domain.c | 59 +++++++++++++++++++++++++++++++++++----------------- tools/virsh.pod | 34 +++++++++++++++++------------- 2 files changed, 60 insertions(+), 33 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 4de5dd5..96f6765 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -724,14 +724,6 @@ static const vshCmdOptDef opts_attach_interface[] = { .type = VSH_OT_DATA, .help = N_("model type") }, - {.name = "persistent", - .type = VSH_OT_ALIAS, - .help = "config" - }, - {.name = "config", - .type = VSH_OT_BOOL, - .help = N_("affect next boot") - }, {.name = "inbound", .type = VSH_OT_DATA, .help = N_("control domain's incoming traffics") @@ -740,6 +732,22 @@ static const vshCmdOptDef opts_attach_interface[] = { .type = VSH_OT_DATA, .help = N_("control domain's outgoing traffics") }, + {.name = "persistent", + .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 = NULL} }; @@ -789,12 +797,30 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) int typ; int ret; bool functionReturn = false; - unsigned int flags; virBuffer buf = VIR_BUFFER_INITIALIZER; char *xml; + unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; + bool current = vshCommandOptBool(cmd, "current"); + bool config = vshCommandOptBool(cmd, "config"); + bool live = vshCommandOptBool(cmd, "live"); + bool persistent = vshCommandOptBool(cmd, "persistent"); + + 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))) - goto cleanup; + return false; + + if (persistent && + virDomainIsActive(dom) == 1) + flags |= VIR_DOMAIN_AFFECT_LIVE; if (vshCommandOptStringReq(ctl, cmd, "type", &type) < 0 || vshCommandOptStringReq(ctl, cmd, "source", &source) < 0 || @@ -887,14 +913,10 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) xml = virBufferContentAndReset(&buf); - if (vshCommandOptBool(cmd, "config")) { - flags = VIR_DOMAIN_AFFECT_CONFIG; - if (virDomainIsActive(dom) == 1) - flags |= VIR_DOMAIN_AFFECT_LIVE; + if (flags) ret = virDomainAttachDeviceFlags(dom, xml, flags); - } else { + else ret = virDomainAttachDevice(dom, xml); - } VIR_FREE(xml); @@ -905,9 +927,8 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) functionReturn = true; } - cleanup: - if (dom) - virDomainFree(dom); +cleanup: + virDomainFree(dom); virBufferFreeAndReset(&buf); return functionReturn; } diff --git a/tools/virsh.pod b/tools/virsh.pod index 9ae96d1..0fd546d 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1885,25 +1885,31 @@ 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<attach-interface> I<domain> I<type> I<source> +[[[I<--live>] [I<--config>] | [I<--current>]] | [I<--persistent>]] [I<--target target>] [I<--mac mac>] [I<--script script>] [I<--model model>] [I<--config>] [I<--inbound average,peak,burst>] [I<--outbound average,peak,burst>] -Attach a new network interface to the domain. -I<type> can be either I<network> to indicate a physical network device or -I<bridge> to indicate a bridge to a device. -I<source> indicates the source device. -I<target> allows to indicate the target device in the guest. Names starting -with 'vnet' are considered as auto-generated an hence blanked out. -I<mac> allows to specify the MAC address of the network interface. -I<script> allows to specify a path to a script handling a bridge instead of -the default one. -I<model> allows to specify the model type. -I<--config> indicates the changes will affect the next boot of the domain, -for compatibility purposes, I<--persistent> is alias of I<--config>. -I<inbound> and I<outbound> control the bandwidth of the interface. I<peak> -and I<burst> are optional, so "average,peak", "average,,burst" and +Attach a new network interface to the domain. I<type> can be either I<network> +to indicate a physical network device or I<bridge> to indicate a bridge to a +device. I<source> indicates the source device. I<target> allows to indicate +the target device in the guest. Names starting with 'vnet' are considered as +auto-generated an hence blanked out. I<mac> allows to specify the MAC address +of the network interface. I<script> allows to specify a path to a script +handling a bridge instead of the default one. I<model> allows to specify the +model type. I<inbound> and I<outbound> control the bandwidth of the interface. +I<peak> and I<burst> are optional, so "average,peak", "average,,burst" and "average" are also legal. +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. When no flag is specified legacy API is used whose behavior depends +on the hypervisor driver. + +For compatibility purposes, I<--persistent> behaves like I<--config> for +an offline domain, and like I<--live> I<--config> for a running domain. + 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. -- 1.8.2.1