- Devel - libvirt List Archives

[libvirt] [PATCH 1/1] virt-aa-helper: add unix channels (esp for qemu-guest-agent)
by Serge Hallyn 14 Apr '15

14 Apr '15

The original bug report was at https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1393842 Signed-off-by: Serge Hallyn <serge.hallyn(a)ubuntu.com> --- src/security/virt-aa-helper.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index e53779e..8ec95c1 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -998,6 +998,7 @@ get_files(vahControl * ctl) (ctl->def->channels[i]->source.type == VIR_DOMAIN_CHR_TYPE_PTY || ctl->def->channels[i]->source.type == VIR_DOMAIN_CHR_TYPE_DEV || ctl->def->channels[i]->source.type == VIR_DOMAIN_CHR_TYPE_FILE || + ctl->def->channels[i]->source.type == VIR_DOMAIN_CHR_TYPE_UNIX || ctl->def->channels[i]->source.type == VIR_DOMAIN_CHR_TYPE_PIPE) && ctl->def->channels[i]->source.data.file.path) if (vah_add_file_chardev(&buf, -- 2.1.4

2 5

[libvirt] [PATCH] sparc: Add default PCI root controller
by Martin Kletzander 14 Apr '15

14 Apr '15

It is there even with -nodefaults and -no-user-config, so count with that so we can start sparc domains. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_domain.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ae632c5..603360f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1,7 +1,7 @@ /* * qemu_domain.c: QEMU domain private state * - * Copyright (C) 2006-2014 Red Hat, Inc. + * Copyright (C) 2006-2015 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -999,6 +999,12 @@ qemuDomainDefPostParse(virDomainDefPtr def, case VIR_ARCH_S390X: addDefaultUSB = false; break; + + case VIR_ARCH_SPARC: + case VIR_ARCH_SPARC64: + addPCIRoot = true; + break; + default: break; } -- 2.3.5

2 1

[libvirt] [PATCH] PowerPC: Replace hardcoded values of 'pseries-2*' machine in schema
by Prerna Saxena 14 Apr '15

14 Apr '15

From: Prerna Saxena <prerna(a)linux.vnet.ibm.com> Date: Mon, 6 Apr 2015 22:56:25 -0500 Qemu-system-ppc64 has introduced new variants of pseries machine type, such as 'pseries', 'pseries-2.1'..'pseries-2.3'. Replace the hardcoded values in the schema with a regex that captures this. Signed-off-by: Prerna Saxena <prerna(a)linux.vnet.ibm.com> --- docs/schemas/domaincommon.rng | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 7406d92..a192637 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -421,9 +421,9 @@ <optional> <attribute name="machine"> <choice> - <value>pseries</value> - <value>pseries-2.1</value> - <value>pseries-2.2</value> + <data type="string"> + <param name="pattern">(pseries)(\-2\.[1-9])?</param> + </data> </choice> </attribute> </optional> -- 1.8.3.1 -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

2 1

[libvirt] [PATCH] qemu: Use 'idx' instead of 'index' for variable name
by John Ferlan 14 Apr '15

14 Apr '15

Apparently for Xen-devel 'index' is a global and causes a build failure, so just use the shortened 'idx' instead to avoid the conflict. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- I did try modify cfg.mk to add a syntax check similar to the ii,jj,kk checks, but it tripped up over 'index' declarations inside structures. I'd be happy to add one, but I need some help formatting it... Here's what I had: sc_prohibit_int_index: @prohibit='\<(int|unsigned) ([^(=]* )*(index)\>(\s|,|;)' \ halt='use different name than 'index' for declaration' \ $(_sc_search_regexp) src/qemu/qemu_driver.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e790664..3510690 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4638,7 +4638,7 @@ static void qemuProcessEventHandler(void *data, void *opaque) static virCgroupPtr qemuDomainAddCgroupForThread(virCgroupPtr cgroup, virCgroupThreadName nameval, - int index, + int idx, char *mem_mask, pid_t pid) { @@ -4646,7 +4646,7 @@ qemuDomainAddCgroupForThread(virCgroupPtr cgroup, int rv = -1; /* Create cgroup */ - if (virCgroupNewThread(cgroup, nameval, index, true, &new_cgroup) < 0) + if (virCgroupNewThread(cgroup, nameval, idx, true, &new_cgroup) < 0) return NULL; if (mem_mask && virCgroupSetCpusetMems(new_cgroup, mem_mask) < 0) @@ -4657,7 +4657,7 @@ qemuDomainAddCgroupForThread(virCgroupPtr cgroup, if (rv < 0) { virReportSystemError(-rv, _("unable to add id %d task %d to cgroup"), - index, pid); + idx, pid); virCgroupRemove(new_cgroup); goto error; } @@ -4671,7 +4671,7 @@ qemuDomainAddCgroupForThread(virCgroupPtr cgroup, static int qemuDomainHotplugAddPin(virBitmapPtr cpumask, - int index, + int idx, virDomainPinDefPtr **pindef_list, size_t *npin) { @@ -4685,7 +4685,7 @@ qemuDomainHotplugAddPin(virBitmapPtr cpumask, VIR_FREE(pindef); goto cleanup; } - pindef->id = index; + pindef->id = idx; if (VIR_APPEND_ELEMENT_COPY(*pindef_list, *npin, pindef) < 0) { virBitmapFree(pindef->cpumask); VIR_FREE(pindef); @@ -4699,7 +4699,7 @@ qemuDomainHotplugAddPin(virBitmapPtr cpumask, static int qemuDomainHotplugPinThread(virBitmapPtr cpumask, - int index, + int idx, pid_t pid, virCgroupPtr cgroup) { @@ -4709,14 +4709,14 @@ qemuDomainHotplugPinThread(virBitmapPtr cpumask, if (qemuSetupCgroupCpusetCpus(cgroup, cpumask) < 0) { virReportError(VIR_ERR_OPERATION_INVALID, _("failed to set cpuset.cpus in cgroup for id %d"), - index); + idx); goto cleanup; } } else { if (virProcessSetAffinity(pid, cpumask) < 0) { virReportError(VIR_ERR_SYSTEM_ERROR, _("failed to set cpu affinity for id %d"), - index); + idx); goto cleanup; } } @@ -4730,12 +4730,12 @@ qemuDomainHotplugPinThread(virBitmapPtr cpumask, static int qemuDomainDelCgroupForThread(virCgroupPtr cgroup, virCgroupThreadName nameval, - int index) + int idx) { virCgroupPtr new_cgroup = NULL; if (cgroup) { - if (virCgroupNewThread(cgroup, nameval, index, false, &new_cgroup) < 0) + if (virCgroupNewThread(cgroup, nameval, idx, false, &new_cgroup) < 0) return -1; /* Remove the offlined cgroup */ -- 2.1.0

2 4

[libvirt] [PATCHv3 0/7] Block job fixes and refactors
by Peter Krempa 14 Apr '15

14 Apr '15

Peter Krempa (7): qemu: monitor: json: Refactor error code class checker qemu: monitor: Extract handling of JSON block job error codes qemu: blockjob: Split qemuDomainBlockJobSetSpeed from qemuDomainBlockJobImpl qemu: blockjob: Separate qemuDomainBlockJobAbort from qemuDomainBlockJobImpl qemu: blockPull: Refactor the rest of qemuDomainBlockJobImpl qemu: drivePivot: Fix assumption when 'block-job-complete' fails qemu: Refactor qemuDomainBlockJobAbort() src/qemu/qemu_driver.c | 367 ++++++++++++++++++++++++------------------- src/qemu/qemu_migration.c | 8 +- src/qemu/qemu_monitor.c | 67 ++++++-- src/qemu/qemu_monitor.h | 29 ++-- src/qemu/qemu_monitor_json.c | 213 ++++++++++++++----------- src/qemu/qemu_monitor_json.h | 24 ++- 6 files changed, 414 insertions(+), 294 deletions(-) -- 2.2.2

2 9

[libvirt] [PATCH 0/5] Refactor vcpupin parser and fix error checking
by Peter Krempa 14 Apr '15

14 Apr '15

Peter Krempa (5): conf: Split out parsing of emulatorpin conf: Split up virDomainVcpuPinDefParseXML conf: Error out if iothread id is missing in iothreadpin conf: Refactor virDomainVcpuPinDefParseXML qemu: Fix condition for checking vcpu when pinning vcpus src/conf/domain_conf.c | 197 +++++++++++++++++++++++++++++-------------------- src/qemu/qemu_driver.c | 13 +++- 2 files changed, 128 insertions(+), 82 deletions(-) -- 2.2.2

2 11

[libvirt] [PATCH] lib: snapshot: Explain that only one layer of images is inserted
by Peter Krempa 14 Apr '15

14 Apr '15

When creating a snapshot with _REUSE_EXTERNAL when the pre-created image does not directly link to the current active layer libvirt would re-detect the backing chain incorrectly and it would not match with qemu's view. Since the configuration is an operator mistake, document that only the top layer image gets inserted. --- src/libvirt-domain-snapshot.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libvirt-domain-snapshot.c b/src/libvirt-domain-snapshot.c index ac858ba..55826fd 100644 --- a/src/libvirt-domain-snapshot.c +++ b/src/libvirt-domain-snapshot.c @@ -177,8 +177,9 @@ virDomainSnapshotGetConnect(virDomainSnapshotPtr snapshot) * the correct image format and metadata including backing store path * (this allows a management app to pre-create files with relative backing * file names, rather than the default of creating with absolute backing - * file names). Note that setting incorrect metadata in the pre-created - * image may lead to the VM being unable to start. + * file names). Note that only the file specified in the snapshot XML is + * inserted as a snapshot thus setting incorrect metadata in the pre-created + * image may lead to the VM being unable to start or other block jobs may fail. * * Be aware that although libvirt prefers to report errors up front with * no other effect, some hypervisors have certain types of failures where -- 2.3.5

2 2

[libvirt] [PATCH 0/2] Fix handling of disk's WWN (world wide name)
by Peter Krempa 14 Apr '15

14 Apr '15

Peter Krempa (2): conf: ABI: Check WWN in disk abi stability check qemu: Enforce WWN to be unique among VM's disks docs/formatdomain.html.in | 3 ++- src/conf/domain_conf.c | 33 +++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 3 +++ src/libvirt_private.syms | 1 + src/qemu/qemu_process.c | 3 +++ 5 files changed, 42 insertions(+), 1 deletion(-) -- 2.2.2

2 4

[libvirt] [PATCH v2 0/9] Implement Add/Del IOThreads
by John Ferlan 14 Apr '15

14 Apr '15

v1: http://www.redhat.com/archives/libvir-list/2015-March/msg01014.html v2 is mostly a completely rewrite of v1 - only smart parts were kept, mostly the "concepts" behind adding/removing a thread Patches 1&2: Couple of simple mods - mostly innocuous Patches 3-5 Since it was determined that just setting the IOThread count and keeping sequential IOThread ID's may not be a desired means to add/remove threads, I decided upon a mechanism which to a degree follows the tune/pin mechanism. Rework the existing IOThread logic to make use of a new domain XML element <iothreadids> which will list each of the <iothread>'s with attributes "id" (required) and "name" (optional). The "id" allows one to generate their own ID number/naming mechanism. If <iothreadids> is not found in the XML, then internally will generate the data structures that support it - IOThreadID's. Work the IOThreadID logic into the "live" iothreadpid lists (or now arrays) to manage the live IOThread data Patches 6-7 Add the API/plumbing for two new API's - virDomainAddIOThread and virDomainDelIOThread to complement the existing virDomainPinIOThread. The "Add" API will take two parameters - an iothread_id and an optional "name". The "Del" API will take just one parameter - the iothread_id Patch 8-9 Implement the qemu backend and virsh front end to manage IOThreads either live or just the config file. I did leave some // comments in Patch 8 as a way to ask a reviewer their thoughts in the add live error path whether 'extra' cleanup should be done or just ignored. Those would be cleaned up and removed for the final version. John Ferlan (9): Rename qemuCheckIothreads to qemuCheckIOThreads Convert virDomainPinIsDuplicate into bool return conf: Add new domain XML element 'iothreadids' qemu: Convert iothreadpids into an array of structures qemu: Use domain iothreadids to populate iothreadpids Implement virDomainAddIOThread and virDomainDelIOThread remote: Add support for AddIOThread and DelIOThread qemu: Add support to Add/Delete IOThreads virsh: Add iothreadadd and iothreaddel commands docs/formatdomain.html.in | 28 ++ docs/schemas/domaincommon.rng | 17 + include/libvirt/libvirt-domain.h | 7 + src/conf/domain_audit.c | 9 + src/conf/domain_audit.h | 6 + src/conf/domain_conf.c | 253 ++++++++++- src/conf/domain_conf.h | 29 +- src/driver-hypervisor.h | 13 + src/libvirt-domain.c | 132 ++++++ src/libvirt_private.syms | 7 + src/libvirt_public.syms | 6 + src/qemu/qemu_cgroup.c | 16 +- src/qemu/qemu_command.c | 108 ++++- src/qemu/qemu_command.h | 4 + src/qemu/qemu_domain.c | 55 ++- src/qemu/qemu_domain.h | 12 +- src/qemu/qemu_driver.c | 467 ++++++++++++++++++++- src/qemu/qemu_process.c | 32 +- src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 31 +- src/remote_protocol-structs | 13 + .../qemuxml2argv-iothreads-ids-partial.args | 10 + .../qemuxml2argv-iothreads-ids-partial.xml | 33 ++ .../qemuxml2argv-iothreads-ids.args | 8 + .../qemuxml2argv-iothreads-ids.xml | 33 ++ .../qemuxml2argv-iothreads-name.args | 17 + .../qemuxml2argv-iothreads-name.xml | 44 ++ tests/qemuxml2argvtest.c | 4 + tests/qemuxml2xmltest.c | 3 + tools/virsh-domain.c | 174 ++++++++ tools/virsh.pod | 32 ++ 31 files changed, 1546 insertions(+), 59 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-name.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-name.xml -- 2.1.0

2 20

[libvirt] [python PATCH] Implement the DEVICE_ADDED event
by Ján Tomko 13 Apr '15

13 Apr '15

--- 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 452f659..2c6ce7b 100755 --- a/examples/event-test.py +++ b/examples/event-test.py @@ -527,6 +527,9 @@ def myDomainEventTunableCallback(conn, dom, params, opaque): print("myDomainEventTunableCallback: Domain %s(%s) %s" % (dom.name(), dom.ID(), params)) def myDomainEventAgentLifecycleCallback(conn, dom, state, reason, opaque): print("myDomainEventAgentLifecycleCallback: Domain %s(%s) %s %s" % (dom.name(), dom.ID(), agentLifecycleStateToString(state), agentLifecycleReasonToString(reason))) +def myDomainEventDeviceAddedCallback(conn, dom, dev, opaque): + print("myDomainEventDeviceAddedCallback: Domain %s(%s) device added: %s" % ( + dom.name(), dom.ID(), dev)) ########################################################################## # Network events @@ -638,6 +641,7 @@ def main(): vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_BLOCK_JOB_2, myDomainEventBlockJob2Callback, None) 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.networkEventRegisterAny(None, libvirt.VIR_NETWORK_EVENT_ID_LIFECYCLE, myNetworkEventLifecycleCallback, None) diff --git a/libvirt-override-virConnect.py b/libvirt-override-virConnect.py index 88c864c..821be87 100644 --- a/libvirt-override-virConnect.py +++ b/libvirt-override-virConnect.py @@ -207,6 +207,15 @@ cb(self, virDomain(self, _obj=dom), state, reason, opaque) return 0 + def _dispatchDomainEventDeviceAddedCallback(self, dom, devAlias, cbData): + """Dispatches event to python user domain device added event callbacks + """ + cb = cbData["cb"] + opaque = cbData["opaque"] + + cb(self, virDomain(self, _obj=dom), devAlias, 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 f770ffe..588dac1 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -6901,6 +6901,58 @@ libvirt_virConnectDomainEventAgentLifecycleCallback(virConnectPtr conn ATTRIBUTE } #endif /* VIR_DOMAIN_EVENT_ID_AGENT_LIFECYCLE */ +#ifdef VIR_DOMAIN_EVENT_ID_DEVICE_ADDED +static int +libvirt_virConnectDomainEventDeviceAddedCallback(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + const char *devAlias, + 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*)"_dispatchDomainEventDeviceAddedCallback", + (char*)"OsO", + pyobj_dom, devAlias, 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_DEVICE_ADDED */ static PyObject * libvirt_virConnectDomainEventRegisterAny(ATTRIBUTE_UNUSED PyObject *self, @@ -6999,6 +7051,11 @@ libvirt_virConnectDomainEventRegisterAny(ATTRIBUTE_UNUSED PyObject *self, cb = VIR_DOMAIN_EVENT_CALLBACK(libvirt_virConnectDomainEventAgentLifecycleCallback); break; #endif /* VIR_DOMAIN_EVENT_ID_AGENT_LIFECYCLE */ +#ifdef VIR_DOMAIN_EVENT_ID_DEVICE_ADDED + case VIR_DOMAIN_EVENT_ID_DEVICE_ADDED: + cb = VIR_DOMAIN_EVENT_CALLBACK(libvirt_virConnectDomainEventDeviceAddedCallback); + break; +#endif /* VIR_DOMAIN_EVENT_ID_DEVICE_ADDED */ case VIR_DOMAIN_EVENT_ID_LAST: break; } -- 2.0.5

2 1