- Devel - libvirt List Archives

[libvirt] [PATCH v2] libxl: dispose libxl_dominfo after libxl_domain_info()
by Joao Martins 21 Jan '16

21 Jan '16

As suggested in a previous thread [0] this patch adds some missing calls to libxl_dominfo_{init,dispose} when doing some of the libxl_domain_info operations which would otherwise lead to memory leaks. [0] https://www.redhat.com/archives/libvir-list/2015-September/msg00519.html Signed-off-by: Joao Martins <joao.m.martins(a)oracle.com> --- Changes since v1: - Add missing libxl_dominfo_init() on MemoryStats and GetInfo() --- src/libxl/libxl_driver.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 73ed448..560f2a6 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -358,6 +358,8 @@ libxlReconnectDomain(virDomainObjPtr vm, virObjectLock(vm); + libxl_dominfo_init(&d_info); + /* Does domain still exist? */ rc = libxl_domain_info(cfg->ctx, &d_info, vm->def->id); if (rc == ERROR_INVAL) { @@ -389,11 +391,13 @@ libxlReconnectDomain(virDomainObjPtr vm, /* Enable domain death events */ libxl_evenable_domain_death(cfg->ctx, vm->def->id, 0, &priv->deathW); + libxl_dominfo_dispose(&d_info); virObjectUnlock(vm); virObjectUnref(cfg); return 0; out: + libxl_dominfo_dispose(&d_info); libxlDomainCleanup(driver, vm); if (!vm->persistent) virDomainObjListRemoveLocked(driver->domains, vm); @@ -1589,6 +1593,8 @@ libxlDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) info->memory = vm->def->mem.cur_balloon; info->maxMem = virDomainDefGetMemoryActual(vm->def); } else { + libxl_dominfo_init(&d_info); + if (libxl_domain_info(cfg->ctx, &d_info, vm->def->id) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("libxl_domain_info failed for domain '%d'"), @@ -1598,6 +1604,8 @@ libxlDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) info->cpuTime = d_info.cpu_time; info->memory = d_info.current_memkb; info->maxMem = d_info.max_memkb; + + libxl_dominfo_dispose(&d_info); } info->state = virDomainObjGetState(vm, NULL); @@ -4791,6 +4799,7 @@ libxlDomainMemoryStats(virDomainPtr dom, virCheckFlags(0, -1); + libxl_dominfo_init(&d_info); cfg = libxlDriverConfigGet(driver); if (!(vm = libxlDomObjFromDomain(dom))) @@ -4822,13 +4831,12 @@ libxlDomainMemoryStats(virDomainPtr dom, ret = i; - libxl_dominfo_dispose(&d_info); - endjob: if (!libxlDomainObjEndJob(driver, vm)) vm = NULL; cleanup: + libxl_dominfo_dispose(&d_info); if (vm) virObjectUnlock(vm); virObjectUnref(cfg); -- 2.1.4

2 1

[libvirt] [PATCH 0/2] Xen: cleanup use of virErrorDomain enum
by Jim Fehlig 21 Jan '16

21 Jan '16

While reviewing a patch from Ian Campbell, I noticed the various Xen-related elements in the virErrorDomain enum were not used correctly throughout the corresponding source files. Patch 1 fixes use of existing Xen-related elements in virErrorDomain. Patch 2 adds a new element for Xen XL config and uses it in src/xenconfig/xen_xl.c. Jim Fehlig (2): Xen: VIR_FROM_THIS cleanup Xen: add XENXL to virErrorDomain enum include/libvirt/virterror.h | 1 + src/util/virerror.c | 1 + src/xen/xs_internal.c | 2 +- src/xenconfig/xen_common.c | 1 + src/xenconfig/xen_sxpr.c | 2 ++ src/xenconfig/xen_xl.c | 2 +- src/xenconfig/xen_xm.c | 1 + src/xenconfig/xenxs_private.h | 2 -- 8 files changed, 8 insertions(+), 4 deletions(-) -- 2.6.1

2 5

[libvirt] [PATCH LIBVIRT v2] libxl: Support cmdline= in xl config files
by Ian Campbell 21 Jan '16

21 Jan '16

... and consolidate the cmdline/extra/root parsing to facilitate doing so. The logic is the same as xl's parse_cmdline from the current xen.git master branch (e6f0e099d2c17de47fd86e817b1998db903cab61). In order to introduce a use of VIR_WARN for logging I had to add virerror.h and VIR_LOG_INIT. Signed-off-by: Ian Campbell <ian.campbell(a)citrix.com> --- NB: I was unsure if I was supposed to change VIR_FROM_NONE into VIR_FROM_XEN, so I didn't (but will on advice). v2: Use VIR_INFO (adding necessary infra) Don't initialise things to NULL when there is no need. --- src/xenconfig/xen_xl.c | 66 +++++++++++++++++++++++++++++++------------------- 1 file changed, 41 insertions(+), 25 deletions(-) diff --git a/src/xenconfig/xen_xl.c b/src/xenconfig/xen_xl.c index 91cdff6..3d820cc 100644 --- a/src/xenconfig/xen_xl.c +++ b/src/xenconfig/xen_xl.c @@ -27,6 +27,7 @@ #include "virconf.h" #include "virerror.h" +#include "virlog.h" #include "domain_conf.h" #include "viralloc.h" #include "virstring.h" @@ -35,6 +36,8 @@ #define VIR_FROM_THIS VIR_FROM_NONE +VIR_LOG_INIT("xen.xen_xl"); + /* * Xen provides a libxl utility library, with several useful functions, * specifically xlu_disk_parse for parsing xl disk config strings. @@ -58,11 +61,46 @@ extern int xlu_disk_parse(XLU_Config *cfg, libxl_device_disk *disk); #endif +static int xenParseCmdline(virConfPtr conf, char **r_cmdline) +{ + char *cmdline; + const char *root, *extra, *buf; + + if (xenConfigGetString(conf, "cmdline", &buf, NULL) < 0) + return -1; + + if (xenConfigGetString(conf, "root", &root, NULL) < 0) + return -1; + + if (xenConfigGetString(conf, "extra", &extra, NULL) < 0) + return -1; + + if (buf) { + if (VIR_STRDUP(cmdline, buf) < 0) + return -1; + if (root || extra) + VIR_WARN("ignoring root= and extra= in favour of cmdline="); + } else { + if (root && extra) { + if (virAsprintf(&cmdline, "root=%s %s", root, extra) < 0) + return -1; + } else if (root) { + if (virAsprintf(&cmdline, "root=%s", root) < 0) + return -1; + } else if (extra) { + if (VIR_STRDUP(cmdline, extra) < 0) + return -1; + } + } + + *r_cmdline = cmdline; + return 0; +} + static int xenParseXLOS(virConfPtr conf, virDomainDefPtr def, virCapsPtr caps) { size_t i; - const char *extra, *root; if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) { const char *boot; @@ -84,19 +122,8 @@ xenParseXLOS(virConfPtr conf, virDomainDefPtr def, virCapsPtr caps) if (xenConfigCopyStringOpt(conf, "ramdisk", &def->os.initrd) < 0) return -1; - if (xenConfigGetString(conf, "extra", &extra, NULL) < 0) - return -1; - - if (xenConfigGetString(conf, "root", &root, NULL) < 0) + if (xenParseCmdline(conf, &def->os.cmdline) < 0) return -1; - - if (root) { - if (virAsprintf(&def->os.cmdline, "root=%s %s", root, extra) < 0) - return -1; - } else { - if (VIR_STRDUP(def->os.cmdline, extra) < 0) - return -1; - } #endif if (xenConfigGetString(conf, "boot", &boot, "c") < 0) @@ -132,19 +159,8 @@ xenParseXLOS(virConfPtr conf, virDomainDefPtr def, virCapsPtr caps) if (xenConfigCopyStringOpt(conf, "ramdisk", &def->os.initrd) < 0) return -1; - if (xenConfigGetString(conf, "extra", &extra, NULL) < 0) - return -1; - - if (xenConfigGetString(conf, "root", &root, NULL) < 0) + if (xenParseCmdline(conf, &def->os.cmdline) < 0) return -1; - - if (root) { - if (virAsprintf(&def->os.cmdline, "root=%s %s", root, extra) < 0) - return -1; - } else { - if (VIR_STRDUP(def->os.cmdline, extra) < 0) - return -1; - } } return 0; -- 2.1.4

2 3

[libvirt] [python PATCH] Add support for MIGRATION_ITERATION event
by Jiri Denemark 21 Jan '16

21 Jan '16

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- examples/event-test.py | 4 +++ libvirt-override-virConnect.py | 9 +++++++ libvirt-override.c | 57 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+) diff --git a/examples/event-test.py b/examples/event-test.py index 2c6ce7b..615f86c 100755 --- a/examples/event-test.py +++ b/examples/event-test.py @@ -530,6 +530,9 @@ def myDomainEventAgentLifecycleCallback(conn, dom, state, reason, opaque): def myDomainEventDeviceAddedCallback(conn, dom, dev, opaque): print("myDomainEventDeviceAddedCallback: Domain %s(%s) device added: %s" % ( dom.name(), dom.ID(), dev)) +def myDomainEventMigrationIteration(conn, dom, iteration, opaque): + print("myDomainEventMigrationIteration: Domain %s(%s) started migration iteration %d" % ( + dom.name(), dom.ID(), iteration)) ########################################################################## # Network events @@ -642,6 +645,7 @@ def main(): vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_TUNABLE, myDomainEventTunableCallback, None) vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_AGENT_LIFECYCLE, myDomainEventAgentLifecycleCallback, None) vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_DEVICE_ADDED, myDomainEventDeviceAddedCallback, None) + vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION, myDomainEventMigrationIteration, None) vc.networkEventRegisterAny(None, libvirt.VIR_NETWORK_EVENT_ID_LIFECYCLE, myNetworkEventLifecycleCallback, None) diff --git a/libvirt-override-virConnect.py b/libvirt-override-virConnect.py index 821be87..4231195 100644 --- a/libvirt-override-virConnect.py +++ b/libvirt-override-virConnect.py @@ -216,6 +216,15 @@ cb(self, virDomain(self, _obj=dom), devAlias, opaque) return 0 + def _dispatchDomainEventMigrationIterationCallback(self, dom, iteration, cbData): + """Dispatches event to python user domain migration iteration event callbacks + """ + cb = cbData["cb"] + opaque = cbData["opaque"] + + cb(self, virDomain(self, _obj=dom), iteration, opaque) + return 0 + def domainEventDeregisterAny(self, callbackID): """Removes a Domain Event Callback. De-registering for a domain callback will disable delivery of this event type """ diff --git a/libvirt-override.c b/libvirt-override.c index 5f1c98f..a8c019b 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -6783,6 +6783,58 @@ libvirt_virConnectDomainEventDeviceAddedCallback(virConnectPtr conn ATTRIBUTE_UN } #endif /* VIR_DOMAIN_EVENT_ID_DEVICE_ADDED */ +#ifdef VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION +static int +libvirt_virConnectDomainEventMigrationIterationCallback(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + int iteration, + void *opaque) +{ + PyObject *pyobj_cbData = (PyObject*)opaque; + PyObject *pyobj_dom; + PyObject *pyobj_ret = NULL; + PyObject *pyobj_conn; + PyObject *dictKey; + int ret = -1; + + LIBVIRT_ENSURE_THREAD_STATE; + + if (!(dictKey = libvirt_constcharPtrWrap("conn"))) + goto cleanup; + pyobj_conn = PyDict_GetItem(pyobj_cbData, dictKey); + Py_DECREF(dictKey); + + /* Create a python instance of this virDomainPtr */ + virDomainRef(dom); + if (!(pyobj_dom = libvirt_virDomainPtrWrap(dom))) { + virDomainFree(dom); + goto cleanup; + } + Py_INCREF(pyobj_cbData); + + /* Call the Callback Dispatcher */ + pyobj_ret = PyObject_CallMethod(pyobj_conn, + (char*)"_dispatchDomainEventMigrationIterationCallback", + (char*)"OiO", + pyobj_dom, iteration, pyobj_cbData); + + Py_DECREF(pyobj_cbData); + Py_DECREF(pyobj_dom); + + cleanup: + if (!pyobj_ret) { + DEBUG("%s - ret:%p\n", __FUNCTION__, pyobj_ret); + PyErr_Print(); + } else { + Py_DECREF(pyobj_ret); + ret = 0; + } + + LIBVIRT_RELEASE_THREAD_STATE; + return ret; +} +#endif /* VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION */ + static PyObject * libvirt_virConnectDomainEventRegisterAny(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -6883,6 +6935,11 @@ libvirt_virConnectDomainEventRegisterAny(PyObject *self ATTRIBUTE_UNUSED, cb = VIR_DOMAIN_EVENT_CALLBACK(libvirt_virConnectDomainEventDeviceAddedCallback); break; #endif /* VIR_DOMAIN_EVENT_ID_DEVICE_ADDED */ +#ifdef VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION + case VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION: + cb = VIR_DOMAIN_EVENT_CALLBACK(libvirt_virConnectDomainEventMigrationIterationCallback); + break; +#endif /* VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION */ case VIR_DOMAIN_EVENT_ID_LAST: break; } -- 2.7.0

2 1

[libvirt] [PATCH 0/2] Introduce migration iteration event
by Jiri Denemark 21 Jan '16

21 Jan '16

Jiri Denemark (2): Introduce migration iteration event qemu: Add support for migration iteration event daemon/remote.c | 32 ++++++++++++++++++ include/libvirt/libvirt-domain.h | 22 +++++++++++++ src/conf/domain_event.c | 71 ++++++++++++++++++++++++++++++++++++++++ src/conf/domain_event.h | 8 +++++ src/libvirt_private.syms | 2 ++ src/qemu/qemu_monitor.c | 13 ++++++++ src/qemu/qemu_monitor.h | 8 +++++ src/qemu/qemu_monitor_json.c | 17 ++++++++++ src/qemu/qemu_process.c | 30 +++++++++++++++++ src/remote/remote_driver.c | 33 +++++++++++++++++++ src/remote/remote_protocol.x | 14 +++++++- src/remote_protocol-structs | 6 ++++ tools/virsh-domain.c | 18 ++++++++++ 13 files changed, 273 insertions(+), 1 deletion(-) -- 2.7.0

2 5

[libvirt] [PATCH v3 0/6] admin: Introduce server listing API
by Erik Skultety 21 Jan '16

21 Jan '16

Since v2: - static names of daemons are passed to virNetServerNew directly, instead of creating an array of names like the previous version did - dropped client-side server identification through ID, only name is used - adjusted naming of some methods (prefixes again...) - converted the server listing example to virt-admin command (finally) Erik Skultety (6): rpc: Introduce new element 'name' to virnetserver structure virnetdaemon: Add post exec restart support for multiple servers admin: Move admin_server.{h,c} to admin.{h,c} admin: Introduce virAdmServer structure admin: Introduce adminDaemonConnectListServers API virt-admin: Introduce cmdSrvList daemon/Makefile.am | 6 +- daemon/admin.c | 181 +++++++++++++++++++++ daemon/admin.h | 36 ++++ daemon/admin_server.c | 121 +++++--------- daemon/admin_server.h | 23 ++- daemon/libvirtd.c | 4 +- include/libvirt/libvirt-admin.h | 11 ++ po/POTFILES.in | 2 +- src/admin/admin_protocol.x | 26 ++- src/admin_protocol-structs | 15 ++ src/datatypes.c | 36 ++++ src/datatypes.h | 34 ++++ src/libvirt-admin.c | 148 +++++++++++++++++ src/libvirt_admin_private.syms | 5 + src/libvirt_admin_public.syms | 3 + src/locking/lock_daemon.c | 3 +- src/logging/log_daemon.c | 3 +- src/lxc/lxc_controller.c | 2 +- src/rpc/virnetdaemon.c | 15 ++ src/rpc/virnetdaemon.h | 3 + src/rpc/virnetserver.c | 32 +++- src/rpc/virnetserver.h | 5 + .../input-data-admin-server-names.json | 128 +++++++++++++++ .../virnetdaemondata/output-data-admin-nomdns.json | 2 + .../output-data-admin-server-names.json | 128 +++++++++++++++ .../virnetdaemondata/output-data-anon-clients.json | 1 + .../output-data-initial-nomdns.json | 1 + tests/virnetdaemondata/output-data-initial.json | 1 + tests/virnetdaemontest.c | 40 ++--- tools/virt-admin.c | 62 +++++++ 30 files changed, 946 insertions(+), 131 deletions(-) create mode 100644 daemon/admin.c create mode 100644 daemon/admin.h create mode 100644 tests/virnetdaemondata/input-data-admin-server-names.json create mode 100644 tests/virnetdaemondata/output-data-admin-server-names.json -- 2.4.3

2 12

[libvirt] [PATCH] security_selinux: Fix crash in virSecuritySELinuxRestoreFileLabel
by Shanzhi Yu 21 Jan '16

21 Jan '16

when failed to boot a guest, virSecuritySELinuxRestoreFileLabel will be called eventually to reset security label, which will lead a crash if pass null to virFileResolveLink(path, &newpath). https://bugzilla.redhat.com/show_bug.cgi?id=1300532 Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- src/security/security_selinux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 9e98635..c8a7553 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -1026,7 +1026,7 @@ virSecuritySELinuxRestoreFileLabel(virSecurityManagerPtr mgr, VIR_INFO("Restoring SELinux context on '%s'", path); - if (virFileResolveLink(path, &newpath) < 0) { + if (path && virFileResolveLink(path, &newpath) < 0) { VIR_WARN("cannot resolve symlink %s: %s", path, virStrerror(errno, ebuf, sizeof(ebuf))); goto err; -- 1.8.3.1

2 1

[libvirt] [PATCH] libxl: dispose libxl_dominfo after libxl_domain_info()
by Joao Martins 21 Jan '16

21 Jan '16

As suggested in a previous thread [0] this patch adds some missing calls to libxl_dominfo_dispose when doing some of the libxl_domain_info operations which would otherwise lead to memory leaks. [0] https://www.redhat.com/archives/libvir-list/2015-September/msg00519.html Signed-off-by: Joao Martins <joao.m.martins(a)oracle.com> --- src/libxl/libxl_driver.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 73ed448..a449730 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -358,6 +358,8 @@ libxlReconnectDomain(virDomainObjPtr vm, virObjectLock(vm); + libxl_dominfo_init(&d_info); + /* Does domain still exist? */ rc = libxl_domain_info(cfg->ctx, &d_info, vm->def->id); if (rc == ERROR_INVAL) { @@ -389,11 +391,13 @@ libxlReconnectDomain(virDomainObjPtr vm, /* Enable domain death events */ libxl_evenable_domain_death(cfg->ctx, vm->def->id, 0, &priv->deathW); + libxl_dominfo_dispose(&d_info); virObjectUnlock(vm); virObjectUnref(cfg); return 0; out: + libxl_dominfo_dispose(&d_info); libxlDomainCleanup(driver, vm); if (!vm->persistent) virDomainObjListRemoveLocked(driver->domains, vm); @@ -1598,6 +1602,8 @@ libxlDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) info->cpuTime = d_info.cpu_time; info->memory = d_info.current_memkb; info->maxMem = d_info.max_memkb; + + libxl_dominfo_dispose(&d_info); } info->state = virDomainObjGetState(vm, NULL); -- 2.1.4

2 2

[libvirt] [PATCH] virsh: Don't fetch status for all domains in cmdList
by Michal Privoznik 21 Jan '16

21 Jan '16

We are getting the list of domains and after that we iterate over the list and try to get status for each domain hoping it will skip over domains that disappeared meanwhile. However, this solution to race is bogus - domain may disappear right after we have checked its state and before we exec another API over it (e.g. virDomainHasManagedSaveImage()). Also, when printing just names or uuids (list --name / --uuid) we issue APIs to obtain the values, however these require no RPC call as all requested info is in virDomain object that client already has. Therefore move the status obtaining only to the place that really needs it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/virsh-domain-monitor.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 7eb387d..7dcbc5c 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -1876,17 +1876,17 @@ cmdList(vshControl *ctl, const vshCmd *cmd) else ignore_value(virStrcpyStatic(id_buf, "-")); - state = virshDomainState(ctl, dom, NULL); - - /* Domain could've been removed in the meantime */ - if (state < 0) - continue; - - if (optTable && managed && state == VIR_DOMAIN_SHUTOFF && - virDomainHasManagedSaveImage(dom, 0) > 0) - state = -2; - if (optTable) { + state = virshDomainState(ctl, dom, NULL); + + /* Domain could've been removed in the meantime */ + if (state < 0) + continue; + + if (managed && state == VIR_DOMAIN_SHUTOFF && + virDomainHasManagedSaveImage(dom, 0) > 0) + state = -2; + if (optTitle) { if (!(title = virshGetDomainDescription(ctl, dom, true, 0))) goto cleanup; -- 2.4.10

2 1

[libvirt] [PATCH] build: predictably generate systemtap tapsets (bz 1173641)
by Cole Robinson 20 Jan '16

20 Jan '16

The generated output is dependent on perl hashtable ordering, which gives different results for i686 and x86_64. Fix this by sorting the hash keys before iterating over them https://bugzilla.redhat.com/show_bug.cgi?id=1173641 --- src/rpc/gensystemtap.pl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/rpc/gensystemtap.pl b/src/rpc/gensystemtap.pl index 2467300..7b80fbf 100755 --- a/src/rpc/gensystemtap.pl +++ b/src/rpc/gensystemtap.pl @@ -72,7 +72,7 @@ function libvirt_rpc_auth_name(type, verbose) { EOF my $first = 1; -foreach my $type (keys %auth) { +foreach my $type (sort(keys %auth)) { my $cond = $first ? "if" : "} else if"; $first = 0; print " $cond (type == ", $type, ") {\n"; @@ -95,7 +95,7 @@ function libvirt_rpc_type_name(type, verbose) { EOF $first = 1; -foreach my $type (keys %type) { +foreach my $type (sort(keys %type)) { my $cond = $first ? "if" : "} else if"; $first = 0; print " $cond (type == ", $type, ") {\n"; @@ -118,7 +118,7 @@ function libvirt_rpc_status_name(status, verbose) { EOF $first = 1; -foreach my $status (keys %status) { +foreach my $status (sort(keys %status)) { my $cond = $first ? "if" : "} else if"; $first = 0; print " $cond (status == ", $status, ") {\n"; @@ -141,7 +141,7 @@ function libvirt_rpc_program_name(program, verbose) { EOF $first = 1; -foreach my $prog (keys %funcs) { +foreach my $prog (sort(keys %funcs)) { my $cond = $first ? "if" : "} else if"; $first = 0; print " $cond (program == ", $funcs{$prog}->{id}, ") {\n"; @@ -165,7 +165,7 @@ function libvirt_rpc_procedure_name(program, version, proc, verbose) { EOF $first = 1; -foreach my $prog (keys %funcs) { +foreach my $prog (sort(keys %funcs)) { my $cond = $first ? "if" : "} else if"; $first = 0; print " $cond (program == ", $funcs{$prog}->{id}, " && version == ", $funcs{$prog}->{version}, ") {\n"; -- 2.5.0

2 2

[libvirt] [PATCH] docs: fix syntax-check long line error
by Cole Robinson 20 Jan '16

20 Jan '16

--- Pushed as trivial docs/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 231aa4e..02eca64 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -220,7 +220,8 @@ $(srcdir)/hvsupport.html.in: $(srcdir)/hvsupport.pl $(api_DATA) \ %.png: %.fig convert -rotate 90 $< $@ -%.html.tmp: %.html.in site.xsl subsite.xsl page.xsl sitemap.html.in $(acl_generated) +%.html.tmp: %.html.in site.xsl subsite.xsl page.xsl \ + sitemap.html.in $(acl_generated) @if [ -x $(XSLTPROC) ] ; then \ echo "Generating $@"; \ name=`echo $@ | sed -e 's/.tmp//'`; \ -- 2.5.0

1 0

[libvirt] [PATCH v3] libvirtd: Increase NL buffer size for lots of interface
by Leno Hou 20 Jan '16

20 Jan '16

1. When switching CPUs to offline/online in a system more than 128 cpus 2. When using virsh to destroy domain in a system with more interface All of above happens nl_recv returned with error: No buffer space available. This patch sets the socket buffer size to 128K and turns on message peeking for nl_recv,as this would solve this problem totally and permanetly. Signed-off-by: Leno Hou <houqy(a)linux.vnet.ibm.com> Cc: Wenyi Gao <wenyi(a)linux.vnet.ibm.com> CC: Laine Stump <laine(a)laine.org> CC: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virnetlink.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index 679b48e..ea65cbc 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -65,10 +65,12 @@ struct virNetlinkEventHandle { # ifdef HAVE_LIBNL1 # define virNetlinkAlloc nl_handle_alloc +# define virSocketSetBufferSize nl_set_buffer_size # define virNetlinkFree nl_handle_destroy typedef struct nl_handle virNetlinkHandle; # else # define virNetlinkAlloc nl_socket_alloc +# define virSocketSetBufferSize nl_socket_set_buffer_size # define virNetlinkFree nl_socket_free typedef struct nl_sock virNetlinkHandle; # endif @@ -696,6 +698,14 @@ virNetlinkEventServiceStart(unsigned int protocol, unsigned int groups) goto error_server; } + if (virSocketSetBufferSize(srv->netlinknh, 131702, 0) < 0) { + virReportSystemError(errno, + "%s",_("cannot set netlink socket buffer size to 128k")); + goto error_server; + } + + nl_socket_enable_msg_peek(srv->netlinknh); + if ((srv->eventwatch = virEventAddHandle(fd, VIR_EVENT_HANDLE_READABLE, virNetlinkEventCallback, -- 1.9.1

3 6

[libvirt] [PATCH] qemuDomainReboot: use fakeReboot=true only for acpi mode
by Dmitry Andreev 20 Jan '16

20 Jan '16

When acpi is used to reboot/shutdown qemu domain, qemu emits SHUTDOWN event. Libvirt uses fakeReboot variable in order to differentiate reboot or shutdown. fakeReboot value is reseted to false after domain restart/reset. When mode=agent is used to reboot qemu domain, qemu doesn't emit SHUTDOWN event and libvirt doesn't reset fakeReboot value to false. In this case next 'shutdown -h now' performs reboot. That's why we don't need to set fakeReboot=true for mode=agent. --- src/qemu/qemu_driver.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8ccf68b..e46404b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2068,8 +2068,6 @@ qemuDomainReboot(virDomainPtr dom, unsigned int flags) goto endjob; } - qemuDomainSetFakeReboot(driver, vm, isReboot); - if (useAgent) { qemuDomainObjEnterAgent(vm); ret = qemuAgentShutdown(priv->agent, agentFlag); @@ -2096,6 +2094,7 @@ qemuDomainReboot(virDomainPtr dom, unsigned int flags) #if WITH_YAJL } #endif + qemuDomainSetFakeReboot(driver, vm, isReboot); qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorSystemPowerdown(priv->mon); if (qemuDomainObjExitMonitor(driver, vm) < 0) -- 1.8.3.1

2 1

[libvirt] [PATCH] docs: fix generation of docs from VPATH build
by Daniel P. Berrange 20 Jan '16

20 Jan '16

When generating docs in a VPATH build we get a failure to create a file due to the 'internals' subdir not existing: Generating internals/locking.html.tmp /bin/sh: line 3: internals/locking.html.tmp: No such file or directory rm: cannot remove ‘internals/locking.html.tmp’: No such file or directory Makefile:2229: recipe for target 'internals/locking.html.tmp' failed make: *** [internals/locking.html.tmp] Error 1 For some reason, make has decided to run the target %.html.tmp: %.html.in site.xsl page.xsl sitemap.html.in $(acl_generated) instead of the target internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in Removing '$(acl_generated)' from the first target, inexplicably causes make to now run the correct target for the internals/ files. Rather than figure this out, lets just combine the two targets into one. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- docs/Makefile.am | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index fb53a45..231aa4e 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -220,21 +220,20 @@ $(srcdir)/hvsupport.html.in: $(srcdir)/hvsupport.pl $(api_DATA) \ %.png: %.fig convert -rotate 90 $< $@ -internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in +%.html.tmp: %.html.in site.xsl subsite.xsl page.xsl sitemap.html.in $(acl_generated) @if [ -x $(XSLTPROC) ] ; then \ echo "Generating $@"; \ - $(MKDIR_P) internals; \ name=`echo $@ | sed -e 's/.tmp//'`; \ + dir=`dirname $@` ; \ + if test "$$dir" = "."; \ + then \ + style=site.xsl; \ + else \ + $(MKDIR_P) $$dir; \ + style=subsite.xsl; \ + fi; \ $(XSLTPROC) --stringparam pagename $$name --nonet \ - $(top_srcdir)/docs/subsite.xsl $< > $@ \ - || { rm $@ && exit 1; }; fi - -%.html.tmp: %.html.in site.xsl page.xsl sitemap.html.in $(acl_generated) - @if [ -x $(XSLTPROC) ] ; then \ - echo "Generating $@"; \ - name=`echo $@ | sed -e 's/.tmp//'`; \ - $(XSLTPROC) --stringparam pagename $$name --nonet \ - $(top_srcdir)/docs/site.xsl $< > $@ \ + $(top_srcdir)/docs/$$style $< > $@ \ || { rm $@ && exit 1; }; fi %.html: %.html.tmp -- 2.5.0

2 1

Re: [libvirt] [PATCH LIBVIRT] libxl: Support cmdline= in xl config files
by Ian Campbell 20 Jan '16

20 Jan '16

I went to ping this but noticed that I had sent it to "jimfehlig" (i.e. no domain), so no wonder there was no reply! To: line fixed here, let me know if you would prefer a resend. Ian. On Wed, 2015-12-16 at 12:09 +0000, Ian Campbell wrote: > ... and consolidate the cmdline/extra/root parsing to facilitate doing > so. > > The logic is the same as xl's parse_cmdline from the current xen.git master > branch (e6f0e099d2c17de47fd86e817b1998db903cab61), except I was unable > to figure out how/where to route the warning about ignoring > root+extra if cmdline was specified. > > Signed-off-by: Ian Campbell <ian.campbell(a)citrix.com> > --- > src/xenconfig/xen_xl.c | 62 ++++++++++++++++++++++++++++++------------ > -------- > 1 file changed, 37 insertions(+), 25 deletions(-) > > diff --git a/src/xenconfig/xen_xl.c b/src/xenconfig/xen_xl.c > index 91cdff6..ba8b938 100644 > --- a/src/xenconfig/xen_xl.c > +++ b/src/xenconfig/xen_xl.c > @@ -58,11 +58,45 @@ extern int xlu_disk_parse(XLU_Config *cfg, > libxl_device_disk *disk); > #endif > > +static int xenParseCmdline(virConfPtr conf, char **r_cmdline) > +{ > + char *cmdline = NULL; > + const char *root = NULL, *extra = NULL, *buf = NULL; > + > + if (xenConfigGetString(conf, "cmdline", &buf, NULL) < 0) > + return -1; > + > + if (xenConfigGetString(conf, "root", &root, NULL) < 0) > + return -1; > + > + if (xenConfigGetString(conf, "extra", &extra, NULL) < 0) > + return -1; > + > + if (buf) { > + if (VIR_STRDUP(cmdline, buf) < 0) > + return -1; > + /* root or extra are ignored in this case. */ > + } else { > + if (root && extra) { > + if (virAsprintf(&cmdline, "root=%s %s", root, extra) < 0) > + return -1; > + } else if (root) { > + if (virAsprintf(&cmdline, "root=%s", root) < 0) > + return -1; > + } else if (extra) { > + if (VIR_STRDUP(cmdline, extra) < 0) > + return -1; > + } > + } > + > + *r_cmdline = cmdline; > + return 0; > +} > + > static int > xenParseXLOS(virConfPtr conf, virDomainDefPtr def, virCapsPtr caps) > { > size_t i; > - const char *extra, *root; > > if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) { > const char *boot; > @@ -84,19 +118,8 @@ xenParseXLOS(virConfPtr conf, virDomainDefPtr def, > virCapsPtr caps) > if (xenConfigCopyStringOpt(conf, "ramdisk", &def->os.initrd) < > 0) > return -1; > > - if (xenConfigGetString(conf, "extra", &extra, NULL) < 0) > - return -1; > - > - if (xenConfigGetString(conf, "root", &root, NULL) < 0) > + if (xenParseCmdline(conf, &def->os.cmdline) < 0) > return -1; > - > - if (root) { > - if (virAsprintf(&def->os.cmdline, "root=%s %s", root, extra) > < 0) > - return -1; > - } else { > - if (VIR_STRDUP(def->os.cmdline, extra) < 0) > - return -1; > - } > #endif > > if (xenConfigGetString(conf, "boot", &boot, "c") < 0) > @@ -132,19 +155,8 @@ xenParseXLOS(virConfPtr conf, virDomainDefPtr def, > virCapsPtr caps) > if (xenConfigCopyStringOpt(conf, "ramdisk", &def->os.initrd) < > 0) > return -1; > > - if (xenConfigGetString(conf, "extra", &extra, NULL) < 0) > - return -1; > - > - if (xenConfigGetString(conf, "root", &root, NULL) < 0) > + if (xenParseCmdline(conf, &def->os.cmdline) < 0) > return -1; > - > - if (root) { > - if (virAsprintf(&def->os.cmdline, "root=%s %s", root, extra) > < 0) > - return -1; > - } else { > - if (VIR_STRDUP(def->os.cmdline, extra) < 0) > - return -1; > - } > } > > return 0;

2 2

[libvirt] [PATCH 0/2] Fix problem generating partition names for multipath device
by John Ferlan 19 Jan '16

19 Jan '16

Originally posted as an RFC: http://www.redhat.com/archives/libvir-list/2015-December/msg00200.html I've made further adjustments/changes and actually tested in a multipath environment configured with the issue. For these patches, rather than making a "general" flag for the pool, I chose to add an attribute to the <source> 'device'. This way it was much more clear what the attribute was affecting. Additionally, it turned out that the issue was showing up for both 'user_friendly_names' and for custom 'alias' name entries in the /etc/multipath.conf file so rather than being a user_friendly_name type flag - I just chose to specific state what it was - a way to not have the partition separator flag "p" added to the generated name. Also it was a bit more difficult to describe the use of the flag especially when it was so specific to one backing store type. John Ferlan (2): conf: Add storage pool device attribute part_separator storage: Add new flag for libvirt_parthelper docs/formatstorage.html.in | 30 ++++++++++++++++++++-- docs/schemas/storagepool.rng | 5 ++++ src/conf/storage_conf.c | 26 +++++++++++++++++-- src/conf/storage_conf.h | 3 ++- src/storage/parthelper.c | 15 ++++++++--- src/storage/storage_backend_disk.c | 11 +++++++- .../pool-disk-device-nopartsep.xml | 14 ++++++++++ .../pool-disk-device-nopartsep.xml | 14 ++++++++++ tests/storagepoolxml2xmltest.c | 1 + 9 files changed, 110 insertions(+), 9 deletions(-) create mode 100644 tests/storagepoolxml2xmlin/pool-disk-device-nopartsep.xml create mode 100644 tests/storagepoolxml2xmlout/pool-disk-device-nopartsep.xml -- 2.5.0

2 4

[libvirt] [PATCH libguestfs v3] lib: Handle slow USB devices more gracefully.
by Richard W.M. Jones 19 Jan '16

19 Jan '16

Libvirt has a fixed 15 second timeout for qemu to exit. If qemu is writing to a slow USB key, it can hang (in D state) for much longer than this - many minutes usually. The solution is to check specifically for the libvirt EBUSY error when this happens, and retry the virDomainDestroyFlags operation (indefinitely). See also the description here: https://www.redhat.com/archives/libvir-list/2016-January/msg00767.html Similar to the following OpenStack Nova commit: http://git.openstack.org/cgit/openstack/nova/commit/?id=3907867 Thanks: Kashyap Chamarthy and Daniel Berrange. --- src/launch-libvirt.c | 45 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/src/launch-libvirt.c b/src/launch-libvirt.c index 8215e02..90b6c49 100644 --- a/src/launch-libvirt.c +++ b/src/launch-libvirt.c @@ -25,6 +25,7 @@ #include <unistd.h> #include <fcntl.h> #include <grp.h> +#include <errno.h> #include <sys/types.h> #include <sys/stat.h> #include <assert.h> @@ -2015,6 +2016,8 @@ ignore_errors (void *ignore, virErrorPtr ignore2) /* empty */ } +static int destroy_domain (guestfs_h *g, virDomainPtr dom, int check_for_errors); + static int shutdown_libvirt (guestfs_h *g, void *datav, int check_for_errors) { @@ -2023,23 +2026,14 @@ shutdown_libvirt (guestfs_h *g, void *datav, int check_for_errors) virDomainPtr dom = data->dom; size_t i; int ret = 0; - int flags; /* Note that we can be called back very early in launch (specifically * from launch_libvirt itself), when conn and dom might be NULL. */ - if (dom != NULL) { - flags = check_for_errors ? VIR_DOMAIN_DESTROY_GRACEFUL : 0; - debug (g, "calling virDomainDestroy \"%s\" flags=%s", - data->name, check_for_errors ? "VIR_DOMAIN_DESTROY_GRACEFUL" : "0"); - if (virDomainDestroyFlags (dom, flags) == -1) { - libvirt_error (g, _("could not destroy libvirt domain")); - ret = -1; - } + ret = destroy_domain (g, dom, check_for_errors); virDomainFree (dom); } - if (conn != NULL) virConnectClose (conn); @@ -2068,6 +2062,37 @@ shutdown_libvirt (guestfs_h *g, void *datav, int check_for_errors) return ret; } +/* Wrapper around virDomainDestroy which handles errors and retries.. */ +static int +destroy_domain (guestfs_h *g, virDomainPtr dom, int check_for_errors) +{ + const int flags = check_for_errors ? VIR_DOMAIN_DESTROY_GRACEFUL : 0; + virErrorPtr err; + + again: + debug (g, "calling virDomainDestroy flags=%s", + check_for_errors ? "VIR_DOMAIN_DESTROY_GRACEFUL" : "0"); + if (virDomainDestroyFlags (dom, flags) == -1) { + err = virGetLastError (); + + /* Second chance if we're just waiting for qemu to shut down. See: + * https://www.redhat.com/archives/libvir-list/2016-January/msg00767.html + */ + if ((flags & VIR_DOMAIN_DESTROY_GRACEFUL) && + err && err->code == VIR_ERR_SYSTEM_ERROR && err->int1 == EBUSY) + goto again; + + /* "Domain not found" is not treated as an error. */ + if (err && err->code == VIR_ERR_NO_DOMAIN) + return 0; + + libvirt_error (g, _("could not destroy libvirt domain")); + return -1; + } + + return 0; +} + /* Wrapper around error() which produces better errors for * libvirt functions. */ -- 2.5.0

2 3

[libvirt] Failed to terminate process 1275 with SIGTERM: Device or resource busy
by Richard W.M. Jones 19 Jan '16

19 Jan '16

I didn't file a bug about this because it's not really clear what the bug is. Anyway, here goes ... $ virt-builder fedora-23 -o /dev/sdX [ 2.3] Downloading: http://libguestfs.org/download/builder/fedora-23.xz [ 3.0] Planning how to build this image [ 3.0] Uncompressing [ 18.1] Resizing (using virt-resize) to expand the disk to 14.9G virt-resize: error: libguestfs error: could not destroy libvirt domain: Failed to terminate process 1275 with SIGTERM: Device or resource busy [code=38 domain=0] $ ps ax | grep qemu 1275 ? Dl 0:49 /usr/bin/qemu-system-x86_64 -machine accel=kvm [...] What's actually happening here is that /dev/sdX is an incredibly slow[1] USB key. The virt-resize operation completes successfully, but qemu is blocked writing/fsyncing to the USB key, and takes a few minutes to exit. libvirt has a loop (src/util/virprocess.c:virProcessKillPainfully) which waits 15 seconds [comment says 10 seconds], and this wait is not configurable. There seem to be several possible solutions, none of them very nice: - Hard-code a longer wait in libvirt. - Make the wait in libvirt configurable. - If the process is in 'D' state, wait indefinitely. I tried another workaround which was to get virt-resize to fsync the output file before closing the libvirt connection, but that doesn't work for reasons I don't understand so far - still studying this. Rich. [1] "Incredibly slow" ... but it's just a regular USB key, they are all very slow! -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into KVM guests. http://libguestfs.org/virt-v2v

3 8

[libvirt] [PATCH 00/16] Implement post-copy migration
by Jiri Denemark 19 Jan '16

19 Jan '16

(See "Add public APIs for post-copy migration" patch for more details about post-copy migration.) Post-copy support was originally written by Cristian Klein in 2014, but no one touched the series since then. Some patches in this series are modified versions of the old patches from Cristian, some patches had to be rewritten from scratch since libvirt code changed a lot (we started using migration events), and some patches are completely new. While post-copy migration is included in QEMU 2.5.0, it didn't support everything libvirt needs. Thus you need QEMU from git to use post-copy. Luckily, the QEMU migration capability we need to enable to use post-copy is still prefixed with "x-", which means it's still considered experimental. Once we are sure QEMU gives us all we need, the "x-" prefix will be removed. Seamless SPICE migration doesn't work with post-copy now, but I'll look at that. This series (VIR_MIGRATE_POSTCOPY_AFTER_PRECOPY support) depends on "Introduce migration iteration event" series I sent yesterday. Cristian Klein (6): Add public APIs for post-copy migration qemu: Add QMP functions for post-copy migration qemu: Add support for VIR_MIGRATE_POSTCOPY flag qemu: Implement virDomainMigrateStartPostCopy virsh: Add support for post-copy migration virsh: Add --postcopy-after-precopy option to migrate Jiri Denemark (10): Add event and state details for post-copy qemu: Don't explicitly stop CPUs after migration qemu: Handle postcopy-active migration state qemu: Add flags to qemuMigrationWaitForCompletion qemu: Add support for VIR_MIGRATE_POSTCOPY_AFTER_PRECOPY flag virsh: Configurable migrate --timeout action qemu: Don't kill running migrated domain on daemon restart qemu: Refactor qemuProcessRecoverMigration qemu: Handle post-copy migration failures qemu: Refuse to abort migration in post-copy mode examples/object-events/event-test.c | 9 ++ include/libvirt/libvirt-domain.h | 12 ++ src/conf/domain_conf.c | 7 +- src/driver-hypervisor.h | 5 + src/libvirt-domain.c | 140 +++++++++++++++++ src/libvirt_public.syms | 4 + src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain.h | 3 + src/qemu/qemu_driver.c | 72 ++++++++- src/qemu/qemu_migration.c | 299 +++++++++++++++++++++++++++++++----- src/qemu/qemu_migration.h | 7 +- src/qemu/qemu_monitor.c | 16 +- src/qemu/qemu_monitor.h | 4 + src/qemu/qemu_monitor_json.c | 23 +++ src/qemu/qemu_monitor_json.h | 3 + src/qemu/qemu_process.c | 252 +++++++++++++++++++----------- src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 13 +- src/remote_protocol-structs | 5 + tools/virsh-domain-monitor.c | 7 +- tools/virsh-domain.c | 131 ++++++++++++++-- tools/virsh.pod | 31 +++- 22 files changed, 884 insertions(+), 161 deletions(-) -- 2.7.0

2 18

[libvirt] [PATCH] leaseshelper: fix crash when no mac is specified
by Ján Tomko 19 Jan '16

19 Jan '16

If dnsmasq specified DNSMASQ_IAID (so we're dealing with an IPv6 lease) but no DNSMASQ_MAC, we skip creation of the new lease object. Also skip adding it to the leases array. https://bugzilla.redhat.com/show_bug.cgi?id=1202350 https://bugzilla.redhat.com/show_bug.cgi?id=1292941 --- src/network/leaseshelper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c index 2d528f7..6930310 100644 --- a/src/network/leaseshelper.c +++ b/src/network/leaseshelper.c @@ -439,7 +439,7 @@ main(int argc, char **argv) case VIR_LEASE_ACTION_OLD: case VIR_LEASE_ACTION_ADD: - if (virJSONValueArrayAppend(leases_array_new, lease_new) < 0) { + if (lease_new && virJSONValueArrayAppend(leases_array_new, lease_new) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to create json")); goto cleanup; -- 2.4.6

2 1

[libvirt] [PATCH 0/6] Refactor leaseshelper
by Ján Tomko 19 Jan '16

19 Jan '16

Split out some functions to make main() more readable. May depend on https://www.redhat.com/archives/libvir-list/2016-January/msg00595.html No functional change intented. Ján Tomko (6): leaseshelper: store server_duid as an allocated string leaseshelper: split out custom leases file read leaseshelper: split out virLeasePrintLeases leaseshelper: remove useless comparison leaseshelper: split out virLeaseNewFromArgv leaseshelper: reduce indentation level in virLeaseReadCustomLeaseFile src/network/leaseshelper.c | 500 +++++++++++++++++++++++++-------------------- 1 file changed, 284 insertions(+), 216 deletions(-) -- 2.4.6

2 12

[libvirt] [PATCH] cpu_map.xml: Expose svm flag for nested kvm on AMD CPU model
by Lin Ma 19 Jan '16

19 Jan '16

QEMU commit 75d373e disables svm by default since PC machine 2.2. So with PC machine version > 2.1, When a user wants to expose the svm flag to a guest, says: ...... <feature policy='require' name='svm'/> ...... The svm flag wont be passed to qemu command line, This patch fixes it. Signed-off-by: Lin Ma <lma(a)suse.com> --- src/cpu/cpu_map.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index 0b6d424..8f96843 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -686,7 +686,6 @@ <feature name='sep'/> <feature name='sse'/> <feature name='sse2'/> - <feature name='svm'/> <feature name='syscall'/> <feature name='tsc'/> </model> @@ -1195,7 +1194,6 @@ <feature name='sep'/> <feature name='sse'/> <feature name='sse2'/> - <feature name='svm'/> <feature name='syscall'/> <feature name='tsc'/> </model> @@ -1257,7 +1255,6 @@ <feature name='sep'/> <feature name='sse'/> <feature name='sse2'/> - <feature name='svm'/> <feature name='syscall'/> <feature name='tsc'/> </model> @@ -1295,7 +1292,6 @@ <feature name='sse'/> <feature name='sse2'/> <feature name='sse4a'/> - <feature name='svm'/> <feature name='syscall'/> <feature name='tsc'/> </model> @@ -1341,7 +1337,6 @@ <feature name='sse4.2'/> <feature name='sse4a'/> <feature name='ssse3'/> - <feature name='svm'/> <feature name='syscall'/> <feature name='tsc'/> <feature name='xop'/> @@ -1391,7 +1386,6 @@ <feature name='sse4.2'/> <feature name='sse4a'/> <feature name='ssse3'/> - <feature name='svm'/> <feature name='syscall'/> <feature name='tbm'/> <feature name='tsc'/> -- 2.1.4

2 1

[libvirt] [PATCH v2] resize, builder: fsync the output file before closing the libvirt connection.
by Richard W.M. Jones 18 Jan '16

18 Jan '16

Libvirt has a fixed 15 second timeout for qemu to exit. If qemu is writing to a slow USB key, it can hang (in D state) for much longer than this - many minutes usually. To work around this, fsync the output file before closing the libvirt connection so that qemu shouldn't have anything (much) to write. We have to do this in a few places in the code. This is a hack - it would be better to find a way to fix this in libvirt. See also the description here: https://www.redhat.com/archives/libvir-list/2016-January/msg00767.html --- builder/builder.ml | 8 +++++++- resize/resize.ml | 10 ++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/builder/builder.ml b/builder/builder.ml index 1f9a472..093982d 100644 --- a/builder/builder.ml +++ b/builder/builder.ml @@ -722,7 +722,13 @@ let main () = (* Unmount everything and we're done! *) message (f_"Finishing off"); - g#umount_all (); + if cmdline.sync then ( + (* Work around libvirt 15 second timeout waiting for qemu + https://www.redhat.com/archives/libvir-list/2016-January/msg00767.html *) + g#sync (); + Fsync.file output_filename + ); + g#shutdown (); g#close (); diff --git a/resize/resize.ml b/resize/resize.ml index d6dd9a5..84e38be 100644 --- a/resize/resize.ml +++ b/resize/resize.ml @@ -1283,6 +1283,11 @@ read the man page virt-resize(1). let g = if to_be_expanded then ( + (* Work around libvirt 15 second timeout waiting for qemu + https://www.redhat.com/archives/libvir-list/2016-January/msg00767.html *) + g#sync (); + Fsync.file outfile; + g#shutdown (); g#close (); @@ -1354,6 +1359,11 @@ read the man page virt-resize(1). ) lvs ); + (* Work around libvirt 15 second timeout waiting for qemu + https://www.redhat.com/archives/libvir-list/2016-January/msg00767.html *) + g#sync (); + Fsync.file outfile; + (* Finished. Unmount disks and exit. *) g#shutdown (); g#close (); -- 2.5.0

1 0

[libvirt] [PATCH 0/2] Fix log related crasher
by Michal Privoznik 18 Jan '16

18 Jan '16

*** BLURB HERE *** Michal Privoznik (2): qemuProcessReadLog: Fix memcpy arguments virLogManagerDomainReadLogFile: Don't do dummy allocs src/logging/log_manager.c | 4 +--- src/qemu/qemu_process.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) -- 2.4.10

3 6

[libvirt] [PATCH v2] qemuTestDriverInit: fill driver with zeroes
by Michal Privoznik 18 Jan '16

18 Jan '16

In the commit aea47e48c473a we have fixed a single pointer within driver structure. Since all callers pass statically allocated driver on stack other pointers within driver may contain random values too. Before touching it lets overwrite it with zeroes and thus fix all dangling pointers. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v1: -Jirka's review worked in tests/testutilsqemu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index f2eacdd..ae69a18 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -555,11 +555,11 @@ int qemuTestCapsCacheInsert(virQEMUCapsCachePtr cache, const char *binary, int qemuTestDriverInit(virQEMUDriver *driver) { + memset(driver, 0, sizeof(*driver)); + if (virMutexInit(&driver->lock) < 0) return -1; - driver->securityManager = NULL; - driver->config = virQEMUDriverConfigNew(false); if (!driver->config) goto error; -- 2.4.10

3 2