- Devel - libvirt List Archives

[libvirt] [PATCH] virsh: fix 'help event'
by Eric Blake 31 Mar '14

31 Mar '14

'virsh help event' included a summary line "event - (null)" due to a misnamed info field. * tools/virsh-domain.c (info_event): Use correct name. * tools/virsh-network.c (info_network_event): Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Deserves to be in 1.2.3 tools/virsh-domain.c | 2 +- tools/virsh-network.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index d9aa4fa..73414f8 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -11030,7 +11030,7 @@ static vshEventCallback vshEventCallbacks[] = { verify(VIR_DOMAIN_EVENT_ID_LAST == ARRAY_CARDINALITY(vshEventCallbacks)); static const vshCmdInfo info_event[] = { - {.name = "event", + {.name = "help", .data = N_("Domain Events") }, {.name = "desc", diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 078a3cf..4b0df62 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -1180,7 +1180,7 @@ vshEventLifecyclePrint(virConnectPtr conn ATTRIBUTE_UNUSED, } static const vshCmdInfo info_network_event[] = { - {.name = "net-event", + {.name = "help", .data = N_("Network Events") }, {.name = "desc", -- 1.9.0

3 3

[libvirt] [PATCH] Drop dependency on pm-is-supported
by Cédric Bosdonnat 31 Mar '14

31 Mar '14

From: Cédric Bosdonnat <cedric.bosdonnat(a)free.fr> pm-is-supported is the only thing needed in pm-utils, better get rid of it since systemd is heavily used for libvirt. --- src/util/virnodesuspend.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c index 8088931..9839de2 100644 --- a/src/util/virnodesuspend.c +++ b/src/util/virnodesuspend.c @@ -29,6 +29,8 @@ #include "viralloc.h" #include "virlog.h" #include "virerror.h" +#include "virfile.h" +#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NONE @@ -263,41 +265,45 @@ int nodeSuspendForDuration(unsigned int target, static int virNodeSuspendSupportsTarget(unsigned int target, bool *supported) { - virCommandPtr cmd; - int status; int ret = -1; + char *buf = NULL; + char **states = NULL; + bool canSuspend = false; + bool canHibernate = false; if (virNodeSuspendInitialize() < 0) return -1; *supported = false; + if (virFileReadAll("/sys/power/state", 1024, &buf) < 0) + goto cleanup; + + states = virStringSplit(buf, " ", 0); + + canSuspend = (virStringArrayHasString(states, "mem") || + virStringArrayHasString(states, "standby")); + canHibernate = virStringArrayHasString(states, "disk"); + switch (target) { case VIR_NODE_SUSPEND_TARGET_MEM: - cmd = virCommandNewArgList("pm-is-supported", "--suspend", NULL); + *supported = canSuspend; break; case VIR_NODE_SUSPEND_TARGET_DISK: - cmd = virCommandNewArgList("pm-is-supported", "--hibernate", NULL); + *supported = canHibernate; break; case VIR_NODE_SUSPEND_TARGET_HYBRID: - cmd = virCommandNewArgList("pm-is-supported", "--suspend-hybrid", NULL); + *supported = canSuspend && canHibernate; break; default: return ret; } - if (virCommandRun(cmd, &status) < 0) - goto cleanup; - - /* - * Check return code of command == 0 for success - * (i.e., the PM capability is supported) - */ - *supported = (status == 0); ret = 0; cleanup: - virCommandFree(cmd); + VIR_FREE(buf); + virStringFreeList(states); return ret; } -- 1.8.4.5

6 6

[libvirt] [PATCH] bhyve: don't leak tap devices on failures
by Roman Bogorodskiy 31 Mar '14

31 Mar '14

On failures, virBhyveProcessStart() does not cleanup network interfaces that could be created by virBhyveProcessBuildBhyveCmd(), which results in a leaked tap device. To fix that, extract network cleanup code to bhyveNetCleanup() and use it in cleanup stage of virBhyveProcessStart(). --- src/bhyve/bhyve_process.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index b37855e..a557bc5 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -63,6 +63,24 @@ bhyveProcessAutoDestroy(virDomainObjPtr vm, return vm; } +static void +bhyveNetCleanup(virDomainObjPtr vm) +{ + size_t i; + + for (i = 0; i < vm->def->nnets; i++) { + virDomainNetDefPtr net = vm->def->nets[i]; + int actualType = virDomainNetGetActualType(net); + + if (actualType == VIR_DOMAIN_NET_TYPE_BRIDGE) { + ignore_value(virNetDevBridgeRemovePort( + virDomainNetGetActualBridgeName(net), + net->ifname)); + ignore_value(virNetDevTapDelete(net->ifname)); + } + } +} + int virBhyveProcessStart(virConnectPtr conn, bhyveConnPtr driver, @@ -167,6 +185,8 @@ virBhyveProcessStart(virConnectPtr conn, ignore_value(virCommandRun(destroy_cmd, NULL)); virCommandFree(destroy_cmd); } + + bhyveNetCleanup(vm); } virCommandFree(load_cmd); @@ -181,7 +201,6 @@ virBhyveProcessStop(bhyveConnPtr driver, virDomainObjPtr vm, virDomainShutoffReason reason ATTRIBUTE_UNUSED) { - size_t i; int ret = -1; virCommandPtr cmd = NULL; @@ -203,17 +222,8 @@ virBhyveProcessStop(bhyveConnPtr driver, vm->def->name, (int)vm->pid); - for (i = 0; i < vm->def->nnets; i++) { - virDomainNetDefPtr net = vm->def->nets[i]; - int actualType = virDomainNetGetActualType(net); - - if (actualType == VIR_DOMAIN_NET_TYPE_BRIDGE) { - ignore_value(virNetDevBridgeRemovePort( - virDomainNetGetActualBridgeName(net), - net->ifname)); - ignore_value(virNetDevTapDelete(net->ifname)); - } - } + /* Cleanup network interfaces */ + bhyveNetCleanup(vm); /* No matter if shutdown was successful or not, we * need to unload the VM */ -- 1.8.4.2

2 2

[libvirt] [PATCH] util: remove useless comment for virCgroupMoveTask in vircgroup.c
by Hongwei Bi 31 Mar '14

31 Mar '14

Signed-off-by: Hongwei Bi <hwbi2008(a)gmail.com> --- src/util/vircgroup.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index a0904d6..b881c8c 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -1148,7 +1148,6 @@ virCgroupAddTaskStrController(virCgroupPtr group, * * @src_group: The source cgroup where all tasks are removed from * @dest_group: The destination where all tasks are added to - * @controller: The cgroup controller to be operated on * * Returns: 0 on success or -1 on failure */ -- 1.7.9.5

2 1

[libvirt] [PATCH] Fix potential crash when setting partial cpu/memory/numa/interface limits on domains
by Brian Rak 31 Mar '14

31 Mar '14

The number of parameters in new_params is not guaranteed to be the same as the number of parameters in params. Use the correct count when freeing new_params to avoid crashes --- libvirt-override.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index 9dc6ad4..3fa9b9b 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -914,7 +914,7 @@ libvirt_virDomainSetSchedulerParameters(PyObject *self ATTRIBUTE_UNUSED, int i_retval; int nparams = 0; Py_ssize_t size = 0; - virTypedParameterPtr params, new_params = NULL; + virTypedParameterPtr params = NULL, new_params = NULL; if (!PyArg_ParseTuple(args, (char *)"OO:virDomainSetScedulerParameters", &pyobj_domain, &info)) @@ -973,7 +973,7 @@ libvirt_virDomainSetSchedulerParameters(PyObject *self ATTRIBUTE_UNUSED, cleanup: virTypedParamsFree(params, nparams); - virTypedParamsFree(new_params, nparams); + virTypedParamsFree(new_params, size); return ret; } @@ -1064,7 +1064,7 @@ libvirt_virDomainSetBlkioParameters(PyObject *self ATTRIBUTE_UNUSED, int nparams = 0; Py_ssize_t size = 0; unsigned int flags; - virTypedParameterPtr params, new_params = NULL; + virTypedParameterPtr params = NULL, new_params = NULL; if (!PyArg_ParseTuple(args, (char *)"OOi:virDomainSetBlkioParameters", @@ -1123,7 +1123,7 @@ libvirt_virDomainSetBlkioParameters(PyObject *self ATTRIBUTE_UNUSED, cleanup: virTypedParamsFree(params, nparams); - virTypedParamsFree(new_params, nparams); + virTypedParamsFree(new_params, size); return ret; } @@ -1184,7 +1184,7 @@ libvirt_virDomainSetMemoryParameters(PyObject *self ATTRIBUTE_UNUSED, int nparams = 0; Py_ssize_t size = 0; unsigned int flags; - virTypedParameterPtr params, new_params = NULL; + virTypedParameterPtr params = NULL, new_params = NULL; if (!PyArg_ParseTuple(args, (char *)"OOi:virDomainSetMemoryParameters", @@ -1243,7 +1243,7 @@ libvirt_virDomainSetMemoryParameters(PyObject *self ATTRIBUTE_UNUSED, cleanup: virTypedParamsFree(params, nparams); - virTypedParamsFree(new_params, nparams); + virTypedParamsFree(new_params, size); return ret; } @@ -1304,7 +1304,7 @@ libvirt_virDomainSetNumaParameters(PyObject *self ATTRIBUTE_UNUSED, int nparams = 0; Py_ssize_t size = 0; unsigned int flags; - virTypedParameterPtr params, new_params = NULL; + virTypedParameterPtr params = NULL, new_params = NULL; if (!PyArg_ParseTuple(args, (char *)"OOi:virDomainSetNumaParameters", @@ -1363,7 +1363,7 @@ libvirt_virDomainSetNumaParameters(PyObject *self ATTRIBUTE_UNUSED, cleanup: virTypedParamsFree(params, nparams); - virTypedParamsFree(new_params, nparams); + virTypedParamsFree(new_params, size); return ret; } @@ -1425,7 +1425,7 @@ libvirt_virDomainSetInterfaceParameters(PyObject *self ATTRIBUTE_UNUSED, Py_ssize_t size = 0; unsigned int flags; const char *device = NULL; - virTypedParameterPtr params, new_params = NULL; + virTypedParameterPtr params = NULL, new_params = NULL; if (!PyArg_ParseTuple(args, (char *)"OzOi:virDomainSetInterfaceParameters", @@ -1484,7 +1484,7 @@ libvirt_virDomainSetInterfaceParameters(PyObject *self ATTRIBUTE_UNUSED, cleanup: virTypedParamsFree(params, nparams); - virTypedParamsFree(new_params, nparams); + virTypedParamsFree(new_params, size); return ret; } @@ -4782,7 +4782,7 @@ libvirt_virDomainSetBlockIoTune(PyObject *self ATTRIBUTE_UNUSED, Py_ssize_t size = 0; const char *disk; unsigned int flags; - virTypedParameterPtr params, new_params = NULL; + virTypedParameterPtr params = NULL, new_params = NULL; if (!PyArg_ParseTuple(args, (char *)"OzOi:virDomainSetBlockIoTune", &pyobj_domain, &disk, &info, &flags)) @@ -4840,7 +4840,7 @@ libvirt_virDomainSetBlockIoTune(PyObject *self ATTRIBUTE_UNUSED, cleanup: virTypedParamsFree(params, nparams); - virTypedParamsFree(new_params, nparams); + virTypedParamsFree(new_params, size); return ret; } -- 1.7.1

2 1

[libvirt] [PATCH] Fix snapshot-create-as in man page
by shyu 31 Mar '14

31 Mar '14

Fix bug https://bugzilla.redhat.com/show_bug.cgi?id=1080859 about snapshot type in man page. Snapshot type should be no, internal, or external --- tools/virsh.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 20352cb..ba2da20 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -3070,7 +3070,7 @@ is specified, the snapshot will not include vm state. The I<--memspec> option can be used to control whether a checkpoint is internal or external. The I<--memspec> flag is mandatory, followed by a B<memspec> of the form B<[file=]name[,snapshot=type]>, where -type can be B<none>, B<internal>, or B<external>. To include a literal +type can be B<no>, B<internal>, or B<external>. To include a literal comma in B<file=name>, escape it with a second comma. I<--memspec> cannot be used together with I<--disk-only>. -- 1.8.5.3

2 1

[libvirt] [PATCH 0/2] ESX: Implement virDomainScreenshot
by Dawid Zamirski 31 Mar '14

31 Mar '14

Hello, The following patches implement virDomainScreenshot for the ESX driver. The screenshot VI API call was added in version 4.0, therefore, I had to make changes to esx_vi_generator.py in order to allow VI method calls for versions newer than 2.5. This was done by adding an optional "apiVersion" token to the method header definition in the .input file. If it is not specified, "2.5" will be used so existing VI calls will work "as is" without any code updates. Regards, Dawid Zamirski (2): ESX: Allow method calls for VI version > 2.5 ESX: Implement virDomainScreenshot src/esx/esx_driver.c | 173 +++++++++++++++++++++++++++++++++++++++++ src/esx/esx_vi.c | 26 ++++++- src/esx/esx_vi.h | 2 +- src/esx/esx_vi_generator.input | 19 ++++- src/esx/esx_vi_generator.py | 20 +++-- src/esx/esx_vi_methods.c | 12 +-- 6 files changed, 238 insertions(+), 14 deletions(-) -- 1.9.0

2 4

[libvirt] Entering freeze for libvirt-1.2.3
by Daniel Veillard 30 Mar '14

30 Mar '14

I'm one day late but i have tagged the tree and pushed a release candidate 1 tarball and associated rpms to the usual place: ftp://libvirt.org/libvirt/ Being optimistic maybe we can push it on April 1st but maybe it will be safer to wait for Wed for more feedback. I gave it a bit of testing, it looks fine with my limited check, but please give it a try :-) ! thanks, Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 1

[libvirt] [PATCH] ESX: Add support for virtualHW version 10
by Dawid Zamirski 30 Mar '14

30 Mar '14

This follows the same pattern when v8 and v9 were added. I've tested this with my ESX 5.5 and seems to work fine. --- src/vmx/vmx.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 32ddd05..5dc9925 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -49,6 +49,7 @@ domain-xml <=> vmx virtualHW.version = "7" # essential for ESX 4.0 virtualHW.version = "8" # essential for ESX 5.0 virtualHW.version = "9" # essential for ESX 5.1 + virtualHW.version = "10" # essential for ESX 5.5 ??? <=> guestOS = "<value>" # essential, FIXME: not representable @@ -1316,10 +1317,11 @@ virVMXParseConfig(virVMXContext *ctx, } if (virtualHW_version != 4 && virtualHW_version != 7 && - virtualHW_version != 8 && virtualHW_version != 9) { + virtualHW_version != 8 && virtualHW_version != 9 && + virtualHW_version != 10) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Expecting VMX entry 'virtualHW.version' to be " - "4, 7, 8 or 9 but found %lld"), + "4, 7, 8, 9 or 10 but found %lld"), virtualHW_version); goto cleanup; } -- 1.9.0

2 1

[libvirt] [PATCH 0/5] Another attempt at improving virsh autocompletion
by Solly Ross 30 Mar '14

30 Mar '14

This patch set represents yet another attempt to improve the virsh autocompletion. When writing this patch, I tried to take into account the comments on the previous attempt at autocompletion by Tomas Meszaros. Specifically, it was reccomended that any completion use the existing methods that virsh has in place to parse the partial line being completed. When doing so, I found that I was duplicating a significant portion of the code in vshCommandParse. Since the comments on Tomas's code suggested refactoring common code into a separate function, I attempted to do so with vshCommandParse. One of the primary issues with simply just moving the parsing logic from vshCommandParse into a separate function was that vshCommandParse throws errors when it encounters unknown or invalid information. While this is the correct behavior for parsing a command to be executed, it is not appropriate for autocompletion. Essentially, the new function represents one iteration of the main loop from vshCommandParse. However, instead of constructing a parsed option or command object at the end, or returning errors, it returns a "state" value and sets pointers. Then, a calling function may choose to deal with the state values (like vshCommandParse) or ignore most of the state values (like the completion code, which ignores most state and errors, as it is just interested in which flags have already been used). This is perhaps the most "dangerous" and controversial part of the patch set, so I figured I'd get some feedback before progressing any further. The other significant changes in the patch set (besides richer completion support) are as follows: - completion no longer automatically falls back to readline's default filename completion. Instead, if filename completion is desired, an option may be explicitly marked as requiring filename completion. - when readline support is enable, a global vshControl object is made available by way of a macro/function. When readline support is disabled, the global is not included and the macro simply returns NULL. This global is required for smart completers. - the code which is used by the "list" command has been moved from virsh-domain-monitor to virsh-completer. This way, it is accessible to both the "list" command code and the domain completer. Note that none of the options which use the domain completer currently have flags set to indicate whether active or inactive domains should be completed. If this completion patch-set is OKed, then I will go back and add these flags. Currently, the commit is there simply to make testing out the new completion easier. Solly Ross (5): Improve virsh autocompletion (extract parser) Improve virsh autocompletion (base framework) Improve virsh autocompletion (global ctl object) Improve virsh autocompletion (domain completer) Improve virsh autocompletion (enum completer macro) outgoing/0000-cover-letter.patch | 68 + ...prove-virsh-autocompletion-extract-parser.patch | 428 ++++++ ...prove-virsh-autocompletion-base-framework.patch | 278 ++++ ...ve-virsh-autocompletion-global-ctl-object.patch | 116 ++ ...ove-virsh-autocompletion-domain-completer.patch | 1479 ++++++++++++++++++++ ...virsh-autocompletion-enum-completer-macro.patch | 131 ++ tools/Makefile.am | 3 +- tools/virsh-completer.c | 353 +++++ tools/virsh-completer.h | 86 ++ tools/virsh-domain-monitor.c | 287 +--- tools/virsh-domain.c | 72 + tools/virsh-snapshot.c | 11 + tools/virsh.c | 517 +++++-- tools/virsh.h | 13 + 14 files changed, 3447 insertions(+), 395 deletions(-) create mode 100644 outgoing/0000-cover-letter.patch create mode 100644 outgoing/0001-Improve-virsh-autocompletion-extract-parser.patch create mode 100644 outgoing/0002-Improve-virsh-autocompletion-base-framework.patch create mode 100644 outgoing/0003-Improve-virsh-autocompletion-global-ctl-object.patch create mode 100644 outgoing/0004-Improve-virsh-autocompletion-domain-completer.patch create mode 100644 outgoing/0005-Improve-virsh-autocompletion-enum-completer-macro.patch create mode 100644 tools/virsh-completer.c create mode 100644 tools/virsh-completer.h -- 1.8.3.2

2 7