diff options
| author |   Eric Blake <eblake@redhat.com> | 2011-06-03 10:10:58 -0600 |
|---|---|---|
| committer |   Matthias Bolte <matthias.bolte@googlemail.com> | 2011-06-04 09:58:53 +0200 |
| commit | 33d90bafe73f57663b04a1292f6fbde1feccf1e3 (patch) | |
| tree | 0a595e40327cc7b64e705c3467fcb8464d01e397 /tools | |
| parent | qemu: Avoid use after free in qemuCaps parsing (diff) | |
| download | libvirt-33d90bafe73f57663b04a1292f6fbde1feccf1e3.tar.gz libvirt-33d90bafe73f57663b04a1292f6fbde1feccf1e3.tar.bz2 libvirt-33d90bafe73f57663b04a1292f6fbde1feccf1e3.zip | |
API: consolidate common unreleased enums
This commit is safe precisely because there has been no release
for any of the enum values being deleted (they were added post-0.9.1).
After the 0.9.2 release, we can then take advantage of
virDomainModificationImpact in more places.
* include/libvirt/libvirt.h.in (virDomainModificationImpact): New
enum.
(virDomainSchedParameterFlags, virMemoryParamFlags): Delete, since
these were never released, and the new enum works fine here.
* src/libvirt.c (virDomainGetMemoryParameters)
(virDomainSetMemoryParameters)
(virDomainGetSchedulerParametersFlags)
(virDomainSetSchedulerParametersFlags): Update documentation.
* src/qemu/qemu_driver.c (qemuDomainSetMemoryParameters)
(qemuDomainGetMemoryParameters, qemuSetSchedulerParametersFlags)
(qemuSetSchedulerParameters, qemuGetSchedulerParametersFlags)
(qemuGetSchedulerParameters): Adjust clients.
* tools/virsh.c (cmdSchedinfo, cmdMemtune): Likewise.
Based on ideas by Daniel Veillard and Hu Tao.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/virsh.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/virsh.c b/tools/virsh.c index 5679a2d8c..d98be1c35 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1732,12 +1732,12 @@ cmdSchedinfo(vshControl *ctl, const vshCmd *cmd) vshError(ctl, "%s", _("--current must be specified exclusively")); return false; } - flags = VIR_DOMAIN_SCHEDPARAM_CURRENT; + flags = VIR_DOMAIN_AFFECT_CURRENT; } else { if (config) - flags |= VIR_DOMAIN_SCHEDPARAM_CONFIG; + flags |= VIR_DOMAIN_AFFECT_CONFIG; if (live) - flags |= VIR_DOMAIN_SCHEDPARAM_LIVE; + flags |= VIR_DOMAIN_AFFECT_LIVE; } if (!vshConnectionUsability(ctl, ctl->conn)) @@ -3505,12 +3505,12 @@ cmdMemtune(vshControl * ctl, const vshCmd * cmd) vshError(ctl, "%s", _("--current must be specified exclusively")); return false; } - flags = VIR_DOMAIN_MEMORY_PARAM_CURRENT; + flags = VIR_DOMAIN_AFFECT_CURRENT; } else { if (config) - flags |= VIR_DOMAIN_MEMORY_PARAM_CONFIG; + flags |= VIR_DOMAIN_AFFECT_CONFIG; if (live) - flags |= VIR_DOMAIN_MEMORY_PARAM_LIVE; + flags |= VIR_DOMAIN_AFFECT_LIVE; } if (!vshConnectionUsability(ctl, ctl->conn)) |