- Devel - libvirt List Archives

[libvirt] [PATCH 0/2] use bool type for bool values
by Eric Blake 25 Nov '14

25 Nov '14

I stumbled into this one on work I'm doing with qemu blockinfo. The DBus interaction code was tricky enough to need to be its own patch; but I like the end result that clients reading a 'b' entry from virDBus code can now pass a sane 'bool*' instead of a weird 'int*' variable. Eric Blake (2): virdbus: don't force users to pass int for bool values maint: forbid 'int foo = true' cfg.mk | 6 ++++++ src/conf/snapshot_conf.c | 2 +- src/qemu/qemu_driver.c | 4 ++-- src/test/test_driver.c | 2 +- src/util/vircgroup.c | 2 +- src/util/virdbus.c | 25 ++++++++++++++----------- src/util/virpci.c | 2 +- src/util/virpolkit.c | 6 +++--- src/util/virutil.c | 2 +- tests/virdbustest.c | 4 ++-- tools/virsh-domain-monitor.c | 2 +- tools/virsh-domain.c | 12 ++++++------ 12 files changed, 39 insertions(+), 30 deletions(-) -- 1.9.3

5 12

[libvirt] [libvirt-python PATCH v2] override: Implement bindings for virDomainGetFSInfo as domain.fsInfo
by Tomoki Sekiyama 25 Nov '14

25 Nov '14

Implement the function which returns a list of tuples, that contains members of virDomainFSInfo struct. Signed-off-by: Tomoki Sekiyama <tomoki.sekiyama(a)hds.com> --- generator.py | 5 +++ libvirt-override-api.xml | 6 ++++ libvirt-override.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++ sanitytest.py | 5 +++ 4 files changed, 85 insertions(+), 1 deletion(-) diff --git a/generator.py b/generator.py index c66c6d4..20df54f 100755 --- a/generator.py +++ b/generator.py @@ -476,6 +476,7 @@ skip_impl = ( 'virNetworkGetDHCPLeases', 'virDomainBlockCopy', 'virNodeAllocPages', + 'virDomainGetFSInfo', ) lxc_skip_impl = ( @@ -586,6 +587,7 @@ skip_function = ( 'virNetworkDHCPLeaseFree', # only useful in C, python code uses list 'virDomainStatsRecordListFree', # only useful in C, python uses dict + 'virDomainFSInfoFree', # only useful in C, python code uses list ) lxc_skip_function = ( @@ -1107,6 +1109,9 @@ def nameFixup(name, classe, type, file): elif name[0:20] == "virDomainGetCPUStats": func = name[9:] func = func[0:1].lower() + func[1:] + elif name[0:18] == "virDomainGetFSInfo": + func = name[12:] + func = func[0:2].lower() + func[2:] elif name[0:12] == "virDomainGet": func = name[12:] func = func[0:1].lower() + func[1:] diff --git a/libvirt-override-api.xml b/libvirt-override-api.xml index 4fe3c4d..439cb40 100644 --- a/libvirt-override-api.xml +++ b/libvirt-override-api.xml @@ -658,5 +658,11 @@ <arg name='flags' type='unsigned int' info='an OR'ed set of virNodeAllocPagesFlags'/> <return type='int' info='the number of nodes successfully adjusted or -1 in case of an error'/> </function> + <function name="virDomainGetFSInfo" file='python'> + <info>Get a list of mapping information for each mounted file systems within the specified guest and the disks.</info> + <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> + <arg name='flags' type='unsigned int' info='unused, pass 0'/> + <return type='char *' info="list of mounted filesystems information"/> + </function> </symbols> </api> diff --git a/libvirt-override.c b/libvirt-override.c index 8895289..a91bf0d 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -8266,6 +8266,73 @@ libvirt_virNodeAllocPages(PyObject *self ATTRIBUTE_UNUSED, } #endif /* LIBVIR_CHECK_VERSION(1, 2, 8) */ +#if LIBVIR_CHECK_VERSION(1, 2, 11) + +static PyObject * +libvirt_virDomainGetFSInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { + virDomainPtr domain; + PyObject *pyobj_domain; + unsigned int flags; + virDomainFSInfoPtr *fsinfo = NULL; + char **dev; + int c_retval, i; + PyObject *py_retval; + + if (!PyArg_ParseTuple(args, (char *)"Oi:virDomainFSInfo", + &pyobj_domain, &flags)) + return NULL; + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virDomainGetFSInfo(domain, &fsinfo, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (c_retval < 0) + goto cleanup; + + /* convert to a Python list */ + if ((py_retval = PyList_New(c_retval)) == NULL) + goto cleanup; + + for (i = 0; i < c_retval; i++) { + virDomainFSInfoPtr fs = fsinfo[i]; + PyObject *info, *alias; + + if (fs == NULL) + goto cleanup; + info = PyTuple_New(4); + if (info == NULL) + goto cleanup; + PyList_SetItem(py_retval, i, info); + alias = PyList_New(0); + if (alias == NULL) + goto cleanup; + + PyTuple_SetItem(info, 0, libvirt_constcharPtrWrap(fs->mountpoint)); + PyTuple_SetItem(info, 1, libvirt_constcharPtrWrap(fs->name)); + PyTuple_SetItem(info, 2, libvirt_constcharPtrWrap(fs->type)); + PyTuple_SetItem(info, 3, alias); + + for (dev = fs->devAlias; dev && *dev; dev++) + if (PyList_Append(alias, libvirt_constcharPtrWrap(*dev)) < 0) + goto cleanup; + } + + for (i = 0; i < c_retval; i++) + virDomainFSInfoFree(fsinfo[i]); + VIR_FREE(fsinfo); + return py_retval; + + cleanup: + for (i = 0; i < c_retval; i++) + virDomainFSInfoFree(fsinfo[i]); + VIR_FREE(fsinfo); + Py_XDECREF(py_retval); + return VIR_PY_NONE; +} + +#endif /* LIBVIR_CHECK_VERSION(1, 2, 11) */ + /************************************************************************ * * * The registration stuff * @@ -8459,6 +8526,9 @@ static PyMethodDef libvirtMethods[] = { #if LIBVIR_CHECK_VERSION(1, 2, 9) {(char *) "virNodeAllocPages", libvirt_virNodeAllocPages, METH_VARARGS, NULL}, #endif /* LIBVIR_CHECK_VERSION(1, 2, 9) */ +#if LIBVIR_CHECK_VERSION(1, 2, 11) + {(char *) "virDomainGetFSInfo", libvirt_virDomainGetFSInfo, METH_VARARGS, NULL}, +#endif /* LIBVIR_CHECK_VERSION(1, 2, 11) */ {NULL, NULL, 0, NULL} }; diff --git a/sanitytest.py b/sanitytest.py index b161696..f5337fc 100644 --- a/sanitytest.py +++ b/sanitytest.py @@ -137,6 +137,9 @@ for cname in wantfunctions: if name[0:28] == "virDomainStatsRecordListFree": continue + if name[0:19] == "virDomainFSInfoFree": + continue + if name[0:21] == "virDomainListGetStats": name = "virConnectDomainListGetStats" @@ -269,7 +272,7 @@ for name in sorted(basicklassmap): func = func[0:1].lower() + func[1:] if func[0:8] == "nWFilter": func = "nwfilter" + func[8:] - if func[0:8] == "fSFreeze" or func[0:6] == "fSThaw": + if func[0:8] == "fSFreeze" or func[0:6] == "fSThaw" or func[0:6] == "fSInfo": func = "fs" + func[2:] if klass == "virNetwork":

2 2

[libvirt] [PATCH] storage_driver: fix a comment typo
by Chen Hanxiao 25 Nov '14

25 Nov '14

s/rereshed/refreshed Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/storage/storage_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 4655cde..23b63f5 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1998,7 +1998,7 @@ virStorageVolPoolRefreshThread(void *opaque) * to perform a pool refresh. * * @st Pointer to stream being closed. - * @opaque Buffer to hold the pool name to be rereshed + * @opaque Buffer to hold the pool name to be refreshed */ static void virStorageVolFDStreamCloseCb(virStreamPtr st ATTRIBUTE_UNUSED, -- 1.9.3

2 1

[libvirt] [PATCH] util: Avoid calling closedir(NULL)
by Jiri Denemark 25 Nov '14

25 Nov '14

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/util/virutil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virutil.c b/src/util/virutil.c index 9c40317..3037293 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -1780,7 +1780,7 @@ virFindSCSIHostByPCI(const char *sysfs_prefix, virReportSystemError(errno, _("Failed to opendir path '%s'"), prefix); - goto cleanup; + return NULL; } while (virDirRead(dir, &entry, prefix) > 0) { -- 2.1.3

2 1

[libvirt] [python PATCHv2] event: Add bindings for agent lifecycle event
by Peter Krempa 25 Nov '14

25 Nov '14

Also add the example. --- Version 2: - version 2 actually works ... examples/event-test.py | 11 ++++++++ libvirt-override-virConnect.py | 10 +++++++ libvirt-override.c | 60 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+) mode change 100644 => 100755 examples/event-test.py diff --git a/examples/event-test.py b/examples/event-test.py old mode 100644 new mode 100755 index be7a7d4..6cc33ce --- a/examples/event-test.py +++ b/examples/event-test.py @@ -464,6 +464,14 @@ def blockJobStatusToString(status): blockJobStatus = ( "Completed", "Failed", "Canceled", "Ready", ) return blockJobStatus[status] +def agentLifecycleStateToString(state): + agentStates = ( "unknown", "connected", "disconnected", ) + return agentStates[state] + +def agentLifecycleReasonToString(reason): + agentReasons = ( "unknown", "domain started", "channel event", ) + return agentReasons[reason] + def myDomainEventCallback1 (conn, dom, event, detail, opaque): print("myDomainEventCallback1 EVENT: Domain %s(%s) %s %s" % (dom.name(), dom.ID(), domEventToString(event), @@ -517,6 +525,8 @@ def myDomainEventBlockJob2Callback(conn, dom, disk, type, status, opaque): print("myDomainEventBlockJob2Callback: Domain %s(%s) %s on disk %s %s" % (dom.name(), dom.ID(), blockJobTypeToString(type), disk, blockJobStatusToString(status))) 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))) ########################################################################## # Network events @@ -627,6 +637,7 @@ def main(): vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_DEVICE_REMOVED, myDomainEventDeviceRemovedCallback, None) 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.networkEventRegisterAny(None, libvirt.VIR_NETWORK_EVENT_ID_LIFECYCLE, myNetworkEventLifecycleCallback, None) diff --git a/libvirt-override-virConnect.py b/libvirt-override-virConnect.py index ffb6d6b..88c864c 100644 --- a/libvirt-override-virConnect.py +++ b/libvirt-override-virConnect.py @@ -197,6 +197,16 @@ cb(self, virDomain(self, _obj=dom), params, opaque) return 0 + def _dispatchDomainEventAgentLifecycleCallback(self, dom, state, reason, cbData): + """Dispatches event to python user domain agent lifecycle event callback + """ + + cb = cbData["cb"] + opaque = cbData["opaque"] + + cb(self, virDomain(self, _obj=dom), state, reason, 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 8895289..e00d908 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -6566,6 +6566,61 @@ libvirt_virConnectDomainEventTunableCallback(virConnectPtr conn ATTRIBUTE_UNUSED } #endif /* LIBVIR_CHECK_VERSION(1, 2, 9) */ +#if LIBVIR_CHECK_VERSION(1, 2, 11) +static int +libvirt_virConnectDomainEventAgentLifecycleCallback(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + int state, + int reason, + 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*)"_dispatchDomainEventAgentLifecycleCallback", + (char*)"OiiO", + pyobj_dom, state, reason, 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 /* LIBVIR_CHECK_VERSION(1, 2, 11) */ + + static PyObject * libvirt_virConnectDomainEventRegisterAny(ATTRIBUTE_UNUSED PyObject *self, PyObject *args) @@ -6658,6 +6713,11 @@ libvirt_virConnectDomainEventRegisterAny(ATTRIBUTE_UNUSED PyObject *self, cb = VIR_DOMAIN_EVENT_CALLBACK(libvirt_virConnectDomainEventTunableCallback); break; #endif /* LIBVIR_CHECK_VERSION(1, 2, 9) */ +#if LIBVIR_CHECK_VERSION(1, 2, 11) + case VIR_DOMAIN_EVENT_ID_AGENT_LIFECYCLE: + cb = VIR_DOMAIN_EVENT_CALLBACK(libvirt_virConnectDomainEventAgentLifecycleCallback); + break; +#endif /* LIBVIR_CHECK_VERSION(1, 2, 11) */ case VIR_DOMAIN_EVENT_ID_LAST: break; } -- 2.1.0

2 2

[libvirt] [PATCH 0/8] Add XML validation to the APIs
by Daniel P. Berrange 25 Nov '14

25 Nov '14

This proof of concept patch extends the virDomainDefineXML and virDomainCreateXML APIs so that they can validate the user supplied XML document against the RNG schemas. The virsh command will enable validation by default, it must be turned off with --skip-validation if desired. This series is not complete - The network, interface, storage pool, etc APIs are not wired up to support validation. - Only the QEMU virt driver is wired up to validate - The virsh edit command is not wired up to validate It is enough to demonstrate it working with 'virsh define' and the QEMU driver though. The biggest problem I see is the really awful error messages we get back from libxml2 when validation fails :-( They are essentially useless :-( Daniel P. Berrange (8): Add new virDomainDefineXMLFlags public API Add stub virDomainDefineXMLFlags impls Add virXMLValidateAgainstSchema helper method Fix use of flags when parsing/formatting snapshot domain XML Don't pass VIR_DOMAIN_XML_SECURE to virDomainDefParseString in phyp Fix flags passed to virDomainDefParseString by XenAPI driver Given virDomainDef parser & formatter their own flags Add support for schema validation when passing in XML include/libvirt/libvirt-domain.h | 9 ++ include/libvirt/virterror.h | 1 + src/bhyve/bhyve_driver.c | 21 ++- src/conf/domain_conf.c | 315 +++++++++++++++++++------------------- src/conf/domain_conf.h | 71 ++++++--- src/conf/snapshot_conf.c | 8 +- src/driver-hypervisor.h | 5 + src/esx/esx_driver.c | 23 ++- src/hyperv/hyperv_driver.c | 3 +- src/internal.h | 4 + src/libvirt-domain.c | 48 ++++++ src/libvirt_private.syms | 2 + src/libvirt_public.syms | 5 + src/libxl/libxl_domain.c | 2 +- src/libxl/libxl_driver.c | 35 +++-- src/libxl/libxl_migration.c | 6 +- src/lxc/lxc_driver.c | 25 ++- src/openvz/openvz_driver.c | 23 ++- src/parallels/parallels_driver.c | 11 +- src/phyp/phyp_driver.c | 7 +- src/qemu/qemu_domain.c | 10 +- src/qemu/qemu_driver.c | 48 ++++-- src/qemu/qemu_migration.c | 8 +- src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 19 ++- src/remote_protocol-structs | 8 + src/test/test_driver.c | 31 ++-- src/uml/uml_driver.c | 22 ++- src/util/virerror.c | 6 + src/util/virxml.c | 74 +++++++++ src/util/virxml.h | 5 + src/vbox/vbox_common.c | 25 ++- src/vmware/vmware_driver.c | 19 ++- src/xen/xen_driver.c | 21 ++- src/xen/xend_internal.c | 6 +- src/xen/xm_internal.c | 4 +- src/xenapi/xenapi_driver.c | 15 +- tests/domainsnapshotxml2xmltest.c | 2 +- tests/lxcxml2xmltest.c | 4 +- tests/openvzutilstest.c | 2 +- tests/qemuhotplugtest.c | 6 +- tests/qemuxml2argvtest.c | 2 +- tests/qemuxml2xmltest.c | 9 +- tests/qemuxmlnstest.c | 2 +- tests/vmx2xmltest.c | 2 +- tests/xmconfigtest.c | 4 +- tests/xml2sexprtest.c | 2 +- tests/xml2vmxtest.c | 2 +- tools/virsh-domain.c | 19 ++- 49 files changed, 684 insertions(+), 318 deletions(-) -- 2.1.0

2 17

[libvirt] [PATCH v6] network: Add network bandwidth support to ethernet interfaces
by Anirban Chakraborty 25 Nov '14

25 Nov '14

Ethernet interfaces in libvirt currently do not support bandwidth setting. For example, following xml file for an interface will not apply these settings to corresponding qdiscs. <interface type="ethernet"> <mac address="02:36:1d:18:2a:e4"/> <model type="virtio"/> <script path=""/> <target dev="tap361d182a-e4"/> <bandwidth> <inbound average="984" peak="1024" burst="64"/> <outbound average="2000" peak="2048" burst="128"/> </bandwidth> </interface> Signed-off-by: Anirban Chakraborty <abchak(a)juniper.net> --- src/conf/netdev_bandwidth_conf.c | 14 ++++++++++- src/conf/netdev_bandwidth_conf.h | 25 +++++++++++++++++++ src/libvirt_private.syms | 1 + src/lxc/lxc_driver.c | 8 +++++++ src/lxc/lxc_process.c | 52 +++++++++++++++++++++++----------------- src/qemu/qemu_command.c | 16 ++++++++----- src/qemu/qemu_hotplug.c | 12 ++++++++++ src/qemu/qemu_process.c | 4 ++++ src/util/virnetdevmacvlan.c | 10 -------- src/util/virnetdevmacvlan.h | 1 - 10 files changed, 103 insertions(+), 40 deletions(-) diff --git a/src/conf/netdev_bandwidth_conf.c b/src/conf/netdev_bandwidth_conf.c index 2e5b564..63a39e3 100644 --- a/src/conf/netdev_bandwidth_conf.c +++ b/src/conf/netdev_bandwidth_conf.c @@ -25,7 +25,6 @@ #include "netdev_bandwidth_conf.h" #include "virerror.h" #include "viralloc.h" -#include "domain_conf.h" #include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NONE @@ -269,3 +268,16 @@ virNetDevBandwidthFormat(virNetDevBandwidthPtr def, virBufferPtr buf) cleanup: return ret; } + +void +virDomainClearNetBandwidth(virDomainObjPtr vm) +{ + size_t i; + virDomainNetType type; + + for (i = 0; i < vm->def->nnets; i++) { + type = virDomainNetGetActualType(vm->def->nets[i]); + if (virNetDevSupportBandwidth(type)) + virNetDevBandwidthClear(vm->def->nets[i]->ifname); + } +} diff --git a/src/conf/netdev_bandwidth_conf.h b/src/conf/netdev_bandwidth_conf.h index 23aaaf3..60dacc6 100644 --- a/src/conf/netdev_bandwidth_conf.h +++ b/src/conf/netdev_bandwidth_conf.h @@ -27,6 +27,7 @@ # include "virnetdevbandwidth.h" # include "virbuffer.h" # include "virxml.h" +# include "domain_conf.h" virNetDevBandwidthPtr virNetDevBandwidthParse(xmlNodePtr node, int net_type) @@ -35,4 +36,28 @@ int virNetDevBandwidthFormat(virNetDevBandwidthPtr def, virBufferPtr buf) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); +void virDomainClearNetBandwidth(virDomainObjPtr vm) + ATTRIBUTE_NONNULL(1); + +static inline bool virNetDevSupportBandwidth(virDomainNetType type) +{ + switch (type) { + case VIR_DOMAIN_NET_TYPE_BRIDGE: + case VIR_DOMAIN_NET_TYPE_NETWORK: + case VIR_DOMAIN_NET_TYPE_DIRECT: + case VIR_DOMAIN_NET_TYPE_ETHERNET: + return true; + case VIR_DOMAIN_NET_TYPE_USER: + case VIR_DOMAIN_NET_TYPE_VHOSTUSER: + case VIR_DOMAIN_NET_TYPE_SERVER: + case VIR_DOMAIN_NET_TYPE_CLIENT: + case VIR_DOMAIN_NET_TYPE_MCAST: + case VIR_DOMAIN_NET_TYPE_INTERNAL: + case VIR_DOMAIN_NET_TYPE_HOSTDEV: + case VIR_DOMAIN_NET_TYPE_LAST: + break; + } + return false; +} + #endif /* __VIR_NETDEV_BANDWIDTH_CONF_H__ */ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 0864618..1c0cfb1 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -509,6 +509,7 @@ virInterfaceRemove; # conf/netdev_bandwidth_conf.h virNetDevBandwidthFormat; virNetDevBandwidthParse; +virDomainClearNetBandwidth; # conf/netdev_vlan_conf.h diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index cf2a3c8..e9e0da3 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -72,6 +72,7 @@ #include "viraccessapicheck.h" #include "viraccessapichecklxc.h" #include "virhostdev.h" +#include "netdev_bandwidth_conf.h" #define VIR_FROM_THIS VIR_FROM_LXC @@ -4213,6 +4214,11 @@ lxcDomainAttachDeviceNetLive(virConnectPtr conn, _("Network device type is not supported")); goto cleanup; } + /* set network bandwidth */ + if (virNetDevSupportBandwidth(actualType) && + virNetDevBandwidthSet(net->ifname, + virDomainNetGetActualBandwidth(net), false) < 0) + goto cleanup; if (virNetDevSetNamespace(veth, priv->initpid) < 0) { virDomainAuditNet(vm, NULL, net, "attach", false); @@ -4644,6 +4650,8 @@ lxcDomainDetachDeviceNetLive(virDomainObjPtr vm, detach = vm->def->nets[detachidx]; + virDomainClearNetBandwidth(vm); + switch (virDomainNetGetActualType(detach)) { case VIR_DOMAIN_NET_TYPE_BRIDGE: case VIR_DOMAIN_NET_TYPE_NETWORK: diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 37ddbbc..5bbd696 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -51,6 +51,7 @@ #include "viratomic.h" #include "virprocess.h" #include "virsystemd.h" +#include "netdev_bandwidth_conf.h" #define VIR_FROM_THIS VIR_FROM_LXC @@ -274,11 +275,6 @@ char *virLXCProcessSetupInterfaceBridged(virConnectPtr conn, if (virNetDevSetOnline(parentVeth, true) < 0) goto cleanup; - if (virNetDevBandwidthSet(net->ifname, - virDomainNetGetActualBandwidth(net), - false) < 0) - goto cleanup; - if (net->filter && virDomainConfNWFilterInstantiate(conn, vm->uuid, net) < 0) goto cleanup; @@ -300,6 +296,7 @@ char *virLXCProcessSetupInterfaceDirect(virConnectPtr conn, virNetDevBandwidthPtr bw; virNetDevVPortProfilePtr prof; virLXCDriverConfigPtr cfg = virLXCDriverGetConfig(driver); + const char *linkdev = virDomainNetGetActualDirectDev(net); /* XXX how todo bandwidth controls ? * Since the 'net-ifname' is about to be moved to a different @@ -329,14 +326,13 @@ char *virLXCProcessSetupInterfaceDirect(virConnectPtr conn, if (virNetDevMacVLanCreateWithVPortProfile( net->ifname, &net->mac, - virDomainNetGetActualDirectDev(net), + linkdev, virDomainNetGetActualDirectMode(net), false, def->uuid, - virDomainNetGetActualVirtPortProfile(net), + prof, &res_ifname, VIR_NETDEV_VPORT_PROFILE_OP_CREATE, - cfg->stateDir, - virDomainNetGetActualBandwidth(net), 0) < 0) + cfg->stateDir, 0) < 0) goto cleanup; ret = res_ifname; @@ -368,6 +364,8 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn, int ret = -1; size_t i; size_t niface = 0; + virDomainNetDefPtr net; + virDomainNetType type; for (i = 0; i < def->nnets; i++) { char *veth = NULL; @@ -375,13 +373,15 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn, * network's pool of devices, or resolve bridge device name * to the one defined in the network definition. */ - if (networkAllocateActualDevice(def, def->nets[i]) < 0) + net = def->nets[i]; + if (networkAllocateActualDevice(def, net) < 0) goto cleanup; if (VIR_EXPAND_N(*veths, *nveths, 1) < 0) goto cleanup; - switch (virDomainNetGetActualType(def->nets[i])) { + type = virDomainNetGetActualType(net); + switch (type) { case VIR_DOMAIN_NET_TYPE_NETWORK: { virNetworkPtr network; char *brname = NULL; @@ -389,7 +389,7 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn, virErrorPtr errobj; if (!(network = virNetworkLookupByName(conn, - def->nets[i]->data.network.name))) + net->data.network.name))) goto cleanup; if (!(brname = virNetworkGetBridgeName(network))) fail = true; @@ -405,7 +405,7 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn, if (!(veth = virLXCProcessSetupInterfaceBridged(conn, def, - def->nets[i], + net, brname))) { VIR_FREE(brname); goto cleanup; @@ -414,7 +414,7 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn, break; } case VIR_DOMAIN_NET_TYPE_BRIDGE: { - const char *brname = virDomainNetGetActualBridgeName(def->nets[i]); + const char *brname = virDomainNetGetActualBridgeName(net); if (!brname) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("No bridge name specified")); @@ -422,7 +422,7 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn, } if (!(veth = virLXCProcessSetupInterfaceBridged(conn, def, - def->nets[i], + net, brname))) goto cleanup; } break; @@ -430,31 +430,39 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn, case VIR_DOMAIN_NET_TYPE_DIRECT: if (!(veth = virLXCProcessSetupInterfaceDirect(conn, def, - def->nets[i]))) + net))) goto cleanup; break; - case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_ETHERNET: + break; + + case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_VHOSTUSER: case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: case VIR_DOMAIN_NET_TYPE_MCAST: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_LAST: + case VIR_DOMAIN_NET_TYPE_HOSTDEV: virReportError(VIR_ERR_INTERNAL_ERROR, _("Unsupported network type %s"), - virDomainNetTypeToString( - virDomainNetGetActualType(def->nets[i]) - )); + virDomainNetTypeToString(type)); goto cleanup; + } + /* set network bandwidth */ + if (virNetDevSupportBandwidth(type) && + virNetDevBandwidthSet(net->ifname, + virDomainNetGetActualBandwidth(net), false) < 0) + goto cleanup; + (*veths)[(*nveths)-1] = veth; /* Make sure all net definitions will have a name in the container */ - if (!def->nets[i]->ifname_guest) { - if (virAsprintf(&def->nets[i]->ifname_guest, "eth%zu", niface) < 0) + if (!net->ifname_guest) { + if (virAsprintf(&net->ifname_guest, "eth%zu", niface) < 0) return -1; niface++; } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1399ce4..8025ff6 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -43,6 +43,7 @@ #include "domain_addr.h" #include "domain_audit.h" #include "domain_conf.h" +#include "netdev_bandwidth_conf.h" #include "snapshot_conf.h" #include "storage_conf.h" #include "secret_conf.h" @@ -192,7 +193,6 @@ qemuPhysIfaceConnect(virDomainDefPtr def, virDomainNetGetActualVirtPortProfile(net), &res_ifname, vmop, cfg->stateDir, - virDomainNetGetActualBandwidth(net), macvlan_create_flags); if (rc >= 0) { virDomainAuditNetDevice(def, net, res_ifname, true); @@ -372,11 +372,6 @@ qemuNetworkIfaceConnect(virDomainDefPtr def, &net->mac) < 0) goto cleanup; - if (virNetDevBandwidthSet(net->ifname, - virDomainNetGetActualBandwidth(net), - false) < 0) - goto cleanup; - if (net->filter && virDomainConfNWFilterInstantiate(conn, def->uuid, net) < 0) { goto cleanup; @@ -7501,6 +7496,15 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, goto cleanup; } + /* Set Bandwidth */ + if (net->ifname && strlen(net->ifname)) { + if (virNetDevSupportBandwidth(actualType) && + virNetDevBandwidthSet(net->ifname, + virDomainNetGetActualBandwidth(net), + false) < 0) + goto cleanup; + } + if ((actualType == VIR_DOMAIN_NET_TYPE_NETWORK || actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || actualType == VIR_DOMAIN_NET_TYPE_ETHERNET || diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index b9a0cee..3e7b7da 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -31,6 +31,7 @@ #include "qemu_command.h" #include "qemu_hostdev.h" #include "domain_audit.h" +#include "netdev_bandwidth_conf.h" #include "domain_nwfilter.h" #include "virlog.h" #include "datatypes.h" @@ -947,6 +948,12 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, goto cleanup; } + /* Set Bandwidth */ + if (virNetDevSupportBandwidth(actualType) && + virNetDevBandwidthSet(net->ifname, + virDomainNetGetActualBandwidth(net), false) < 0) + goto cleanup; + for (i = 0; i < tapfdSize; i++) { if (virSecurityManagerSetTapFDLabel(driver->securityManager, vm->def, tapfd[i]) < 0) @@ -3545,6 +3552,11 @@ qemuDomainDetachNetDevice(virQEMUDriverPtr driver, goto cleanup; } + if (virNetDevSupportBandwidth(virDomainNetGetActualType(detach)) && + virNetDevBandwidthClear(detach->ifname) < 0) + VIR_WARN("cannot clear bandwidth setting for device : %s", + detach->ifname); + qemuDomainMarkDeviceForRemoval(vm, &detach->info); qemuDomainObjEnterMonitor(driver, vm); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7518138..b782984 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -69,6 +69,7 @@ #include "storage/storage_driver.h" #include "configmake.h" #include "nwfilter_conf.h" +#include "netdev_bandwidth_conf.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -4843,6 +4844,9 @@ void qemuProcessStop(virQEMUDriverPtr driver, virStrerror(errno, ebuf, sizeof(ebuf))); } + /* Clear network bandwidth */ + virDomainClearNetBandwidth(vm); + virDomainConfVMNWFilterTeardown(vm); if (cfg->macFilter) { diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 89e221d..2ff24b1 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -810,7 +810,6 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *tgifname, char **res_ifname, virNetDevVPortProfileOp vmOp, char *stateDir, - virNetDevBandwidthPtr bandwidth, unsigned int flags) { const char *type = (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) ? @@ -923,14 +922,6 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *tgifname, rc = 0; } - if (virNetDevBandwidthSet(cr_ifname, bandwidth, false) < 0) { - if (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) - VIR_FORCE_CLOSE(rc); /* sets rc to -1 */ - else - rc = -1; - goto disassociate_exit; - } - if (vmOp == VIR_NETDEV_VPORT_PROFILE_OP_CREATE || vmOp == VIR_NETDEV_VPORT_PROFILE_OP_RESTORE) { /* Only directly register upon a create or restore (restarting @@ -1073,7 +1064,6 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *ifname ATTRIBUTE_UNUSED, char **res_ifname ATTRIBUTE_UNUSED, virNetDevVPortProfileOp vmop ATTRIBUTE_UNUSED, char *stateDir ATTRIBUTE_UNUSED, - virNetDevBandwidthPtr bandwidth ATTRIBUTE_UNUSED, unsigned int flags) { virCheckFlags(0, -1); diff --git a/src/util/virnetdevmacvlan.h b/src/util/virnetdevmacvlan.h index 41aa4e2..f08d32b 100644 --- a/src/util/virnetdevmacvlan.h +++ b/src/util/virnetdevmacvlan.h @@ -68,7 +68,6 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *ifname, char **res_ifname, virNetDevVPortProfileOp vmop, char *stateDir, - virNetDevBandwidthPtr bandwidth, unsigned int flags) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(6) ATTRIBUTE_NONNULL(8) ATTRIBUTE_NONNULL(10) ATTRIBUTE_RETURN_CHECK; -- 1.9.1

4 12

[libvirt] ideas on virDomainListBlockStats for allocation numbers
by Eric Blake 25 Nov '14

25 Nov '14

Based on Dan's recommendation [1], I'm looking at enhancing virDomainListBlockStats to report the allocation numbers of a backing file during a virDomainBlockCommit operation. Getting the information from qemu is not difficult, but the question is how should it be represented to the end user. See below for my ideas, and I'm open to feedback. [1] https://www.redhat.com/archives/libvir-list/2014-November/msg00604.html Some background - highest allocation is mainly applicable to using a qcow2 format on top of a raw block device (that's the only time that libvirt reports a different number based on querying qemu, other file formats just go off of stat information), so even setting this up to test can be interesting. Also, while qemu reports wr_highest_offset during 'query-blockstats', a disk has to actually have write activity performed during that given qemu process before the offset will be accurate. It took me a while to figure this out; when I set up a dummy guest with no OS (and therefore no writes), the offset being reported was 0 even when I had used qemu-io to poke data into the file prior to starting qemu. I finally figured out that metadata writes also count as part of the highest offset visited; so using 'blockdev-snapshot-internal-sync' followed by 'blockdev-snapshot-delete-internal-sync' is sufficient to cause qemu to write metadata and therefore reveal the highest offset. So I set up a playground to test things, where I first created two 1G partitions, then use this script to re-create a guest each time I want to reset things: ====== #!/bin/sh cd /tmp rm -f wrapper.qcow2 virsh destroy testvm2 2>/dev/null qemu-img create -f qcow2 /dev/sda6 $((750*1024*1024)) qemu-img create -f qcow2 /dev/sda6 $((1250*1024*1024)) virsh create /dev/stdin <<EOF <domain type='kvm'> <name>testvm2</name> <memory unit='MiB'>256</memory> <vcpu>1</vcpu> <os> <type arch='x86_64'>hvm</type> </os> <devices> <disk type='block' device='disk'> <driver name='qemu' type='qcow2'/> <source dev='/dev/sda6'/> <target dev='vda' bus='virtio'/> </disk> <disk type='block' device='disk'> <driver name='qemu' type='qcow2'/> <source dev='/dev/sda7'/> <target dev='vdb' bus='virtio'/> </disk> <graphics type='vnc'/> </devices> </domain> EOF virsh qemu-monitor-command testvm2 \ '{"execute":"blockdev-snapshot-internal-sync",' \ '"arguments":{"device":"drive-virtio-disk0", "name":"snap1"}}' virsh qemu-monitor-command testvm2 \ '{"execute":"blockdev-snapshot-delete-internal-sync",' \ '"arguments":{"device":"drive-virtio-disk0", "name":"snap1"}}' virsh domblkinfo testvm2 vda virsh domblkinfo testvm2 vdb ======== which shows this for my starting point: # virsh domblkinfo testvm2 vda Capacity: 786432000 Allocation: 458752 Physical: 1073741824 # virsh domblkinfo testvm2 vdb Capacity: 1310720000 Allocation: 0 Physical: 1073741824 After that, I can create external snapshots: # virsh snapshot-create-as testvm2 --disk-only --no-metadata \ --diskspec vda,file=/tmp/wrapper.qcow2 --diskspec vdb,snapshot=no at which point dumpxml shows this subset: <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/tmp/wrapper.qcow2'/> <backingStore type='block' index='1'> <format type='qcow2'/> <source dev='/dev/sda6'/> <backingStore/> </backingStore> <target dev='vda' bus='virtio'/> <alias name='virtio-disk0'/> Next, I can play with blockcommit, where a qemu-monitor-command on 'query-blockstats' will show me the growing allocation when the backing file is being written during the commit. The other useful output is the new virDomainListBlockStats: # virsh domstats --block testvm2Domain: 'testvm2' block.count=2 block.0.name=vda block.0.rd.reqs=1 block.0.rd.bytes=512 block.0.rd.times=31635 block.0.wr.reqs=0 block.0.wr.bytes=0 block.0.wr.times=0 block.0.fl.reqs=0 block.0.fl.times=0 block.0.allocation=458752 block.0.capacity=786432000 block.1.name=vdb block.1.rd.reqs=0 block.1.rd.bytes=0 block.1.rd.times=0 block.1.wr.reqs=0 block.1.wr.bytes=0 block.1.wr.times=0 block.1.fl.reqs=0 block.1.fl.times=0 block.1.allocation=0 block.1.capacity=1310720000 The problem is that once we have a domain with more than one <disk>, and where one or all disks have more than one <backingStore>, then how should virDomainListBlockStats represent that? One idea I have is to just expose a block.count equal to the total number of devices I'm about to report on, where the array can be larger than the number of disks, and using the name field to correlate back to dumpxml layout: block.count=3 block.0.name=vda # information on wrapper.qcow2 ... block.1.name=vda[1] # information on backingStore index 1 of vda block.1.rd.reqs=0 #+ that is, on /dev/sda6 ... block.2.name=vdb # information on /dev/sda7 ... It may make things easier if I also add a block.n.path that lists the file name of the block being described (might get tricky with NBD/gluster/sheepdog network disks). Also, I'm thinking of adding block.n.physical to match the older virDomainGetBlockInfo() information. Another possible layout is to mirror the nesting of XML backingChain. Something like: block.count=2 block.0.name=vda block.0.backing=1 block.0.allocation=... # information on /tmp/wrapper.qcow2 ... block.0.0.allocation=... # information on /dev/sda6 ... block.1.name=vdb block.1.backing=0 block.1.allocation=... # information on /dev/sda7 But there, we run into a possible problem: virTypedParameter has a finite length for field names, so we can only cover a finite depth of backing chain before we run out of space and can't report on the full chain. Any other ideas for the best way to lay this out, and for how to make it as easy as possible for client applications to correlate information on allocation back to the appropriate block device in the chain? I also wonder if adding more information to the existing --block flag for stats is okay, or whether it is better to add yet another statistics flag grouping that must be requested to turn on information about backing files. Technically, it's still block-related statistics, but as we have already got released libvirt that still has a 1:1 block.n mapping to <disk> elements, using a new flag would make it easier to learn if libvirt is new enough to support information on backing chains, all without confusing existing clients that aren't expecting backing chain stats. This question needs answering regardless of which layout we choose above for representing backing chain stats. Thoughts welcome. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

3 3

[libvirt] strange behavior when using iotune
by Vasiliy Tolstov 24 Nov '14

24 Nov '14

Hi. I'm try to shape disk via total_iops_sec in libvirt libvirt 1.2.10 qemu 2.0.0 Firstly when i'm run vm with predefined <total_iops_sec>5000</total_iops_sec> i have around 11000 iops (dd if=/dev/sda bs=512K of=/dev/null) After that i'm try to set via virsh --total_iops_sec 10 to want to minimize io, but nothing changed. After that i'm reboot vm with <total_iops_sec>10</total_iops_sec> and get very slow io, but this expected. But libvirt says that i have is around 600 iops. My questions is - why i can't change total_iops_sec in run-time, and why entered values does not equal values getting from libvirt ? Thanks for any suggestions and any help. -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru jabber: vase(a)selfip.ru

2 4

[libvirt] [PATCH v3 0/5] Guest filesystem information API
by Tomoki Sekiyama 24 Nov '14

24 Nov '14

Hi, This is v3 of patchset to add virDomainGetFSInfo API. * changes in v2->v3: -[all] squashed fixup patches by John Ferlan (thanks!) -[all] added 'ndevAlias' filed instead of NULL-termination of devAlias -[all] renamed 'type' field to 'fstype' to avoid wireshark genxdrstub.pl error -[2/5] use @acl: domain:fs_freeze (v2: http://www.redhat.com/archives/libvir-list/2014-November/msg00559.html ) * changes in v1->v2: -[all] removed redundant NULL element at the last of returned info array -[3/5] make error messages in qemu_agent.c consistent with other commands -[4/5] added a test case for 2 items in info->devAliases -[5/5] added a pod document for virsh domfsinfo command (v1: http://www.redhat.com/archives/libvir-list/2014-October/msg00001.html ) * summary This series implements a new virDomainGetFSInfo API, that returns a list of mounted filesystems information in the guest, collected via the guest agent. The returned info contains mountpoints and disk device alias named in libvirt, so we can know which mountpoints should be frozen by virDomainFSFreeze to take snapshots of a part of disks. --- Tomoki Sekiyama (5): Implement public API for virDomainGetFSInfo remote: Implement the remote protocol for virDomainGetFSInfo qemu: Implement the qemu driver for virDomainGetFSInfo qemu: add test for qemuAgentGetFSInfo virsh: expose virDomainGetFSInfo daemon/remote.c | 113 +++++++++++++++++++ include/libvirt/libvirt-domain.h | 22 ++++ src/conf/domain_conf.c | 71 ++++++++++++ src/conf/domain_conf.h | 6 + src/driver-hypervisor.h | 6 + src/libvirt.c | 68 ++++++++++++ src/libvirt_private.syms | 1 src/libvirt_public.syms | 6 + src/qemu/qemu_agent.c | 176 ++++++++++++++++++++++++++++++ src/qemu/qemu_agent.h | 2 src/qemu/qemu_driver.c | 48 ++++++++ src/remote/remote_driver.c | 93 ++++++++++++++++ src/remote/remote_protocol.x | 32 +++++ src/remote_protocol-structs | 21 ++++ src/rpc/gendispatch.pl | 1 tests/Makefile.am | 1 tests/qemuagentdata/qemuagent-fsinfo.xml | 39 +++++++ tests/qemuagenttest.c | 144 +++++++++++++++++++++++++ tools/virsh-domain.c | 70 ++++++++++++ tools/virsh.pod | 9 ++ 20 files changed, 928 insertions(+), 1 deletion(-) create mode 100644 tests/qemuagentdata/qemuagent-fsinfo.xml -- Tomoki Sekiyama

2 6

[libvirt] [PATCHv2 0/5] Add agent lifecycle event
by Peter Krempa 24 Nov '14

24 Nov '14

I'll post the promised channel state event later in a separate series. Peter Krempa (5): qemu: chardev: Extract more information about character devices qemu: process: Refresh virtio channel guest state when connecting to mon event: Add guest agent lifecycle event examples: Add support for the guest agent lifecycle event qemu: Emit the guest agent lifecycle event daemon/remote.c | 36 +++++++++++++++ examples/object-events/event-test.c | 67 ++++++++++++++++++++++++++- include/libvirt/libvirt-domain.h | 41 +++++++++++++++++ src/conf/domain_event.c | 78 ++++++++++++++++++++++++++++++++ src/conf/domain_event.h | 9 ++++ src/libvirt_private.syms | 2 + src/qemu/qemu_driver.c | 6 +++ src/qemu/qemu_monitor.c | 13 +++++- src/qemu/qemu_monitor.h | 6 +++ src/qemu/qemu_monitor_json.c | 51 ++++++++++++++------- src/qemu/qemu_monitor_text.c | 17 ++++--- src/qemu/qemu_process.c | 90 ++++++++++++++++++++++++++++++++++--- src/remote/remote_driver.c | 31 +++++++++++++ src/remote/remote_protocol.x | 16 ++++++- src/remote_protocol-structs | 7 +++ tests/qemumonitorjsontest.c | 41 ++++++++++++++--- tools/virsh-domain.c | 39 ++++++++++++++++ 17 files changed, 513 insertions(+), 37 deletions(-) -- 2.1.0

2 13

[libvirt] Plan for next releases
by Daniel Veillard 24 Nov '14

24 Nov '14

We are getting close to the end of the month and in theory we should enter freeze around next week if we want to release 1.2.11 early Dec. However: - we have 'only' 150 commits since 1.2.10 - December is usually heavilly truncated due to Xmas/etc... vacations - I'm actually on vacations next week and while I could try to push the release candidates while on the road it's not ideal What about pushing the 1.2.11 release to around 15th December (maybe a bit earlier) then push the following release to the last week of January, just before FOSDEM so it's available then, and also because Feb is really short. Opinions ? I'm tempted to do that '2 release in 3 months' trick, we did that in the past for end of year, Any objections ? 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/

2 2

[libvirt] Error starting domain: internal error: missing IFLA_VF_INFO in netlink response
by Hong-Hua.Yin＠freescale.com 24 Nov '14

24 Nov '14

Hi, We try PCI Passthrough of host network devices on PPC platform. http://wiki.libvirt.org/page/Networking#Assignment_with_.3Cinterface_type.3… But we got a similar issue as below that reported on RedHat before: https://bugzilla.redhat.com/show_bug.cgi?id=1040626 With <hostdev>, it could start VM successfully. <hostdev mode='subsystem' type='pci' managed='yes'> <driver name='vfio'/> <source> <address domain='0x0000' bus='0x01' slot='0x00' function='0x4'/> </source> </hostdev> Logged into VM and checked for VF using lspci root@model : qemu ppce500:~# lspci 00:00.0 PCI bridge: Freescale Semiconductor Inc MPC8533E 00:02.0 Power PC: Freescale Semiconductor Inc Device 0000 (rev 20) 00:03.0 Unclassified device [00ff]: Red Hat, Inc Virtio memory balloon But it will fail if using <interface type="hostdev">: <interface type="hostdev" managed="yes"> <mac address="00:e0:0c:00:20:01"/> <source> <address type="pci" domain="0x0000" bus="0x01" slot="0x00" function="0x4"/> </source> </interface> # virsh create vf.xml 2014-11-24 11:08:31.390+0000: 3556: info : libvirt version: 1.2.2 2014-11-24 11:08:31.390+0000: 3556: debug : virLogParseOutputs:1378 : outputs=1:file:virsh.log error: Failed to create domain from vf.xml error: internal error: missing IFLA_VF_INFO in netlink response Exactly We're using max_vfs=2 and libnl-3.2.22 # ls -l /usr/lib64/libnl-3.so.200.17.0 -rwxr-xr-x 1 root root 154440 Sep 17 07:15 /usr/lib64/libnl-3.so.200.17.0 Why this issue happened on PPC? Is there anything architecture-specific support needed to add? Thanks, Olivia

1 0

[libvirt] [PATCH] spec: Automatically apply all patches with git
by Jiri Denemark 24 Nov '14

24 Nov '14

With this change, any patch declared in libvirt.spec with Patch[0-9]* is automatically applied in %prep. Unlike with the standard %patch[0-9]*, patches are applied with "git am" to avoid some unexpected results. However, as a result of this, all patches must be in the right format for "git am" to be able to apply them; they should ideally be generated from git using "git format-patch". Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- libvirt.spec.in | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 6fcaa3e..0959483 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -425,6 +425,7 @@ BuildRequires: gettext-devel BuildRequires: libtool BuildRequires: /usr/bin/pod2man %endif +BuildRequires: git BuildRequires: perl BuildRequires: python %if %{with_systemd} @@ -1198,6 +1199,41 @@ driver %prep %setup -q +# Patches have to be stored in a temporary file because RPM has +# a limit on the length of the result of any macro expansion; +# if the string is longer, it's silently cropped +%{lua: + tmp = os.tmpname(); + f = io.open(tmp, "w+"); + count = 0; + for i, p in ipairs(patches) do + f:write(p.."\n"); + count = count + 1; + end; + f:close(); + print("PATCHCOUNT="..count.."\n") + print("PATCHLIST="..tmp.."\n") +} + +git init -q +git config user.name rpm-build +git config user.email rpm-build +git config gc.auto 0 +git add . +git commit -q -a --author 'rpm-build <rpm-build>' \ + -m '%{name}-%{version} base' + +COUNT=$(grep '\.patch$' $PATCHLIST | wc -l) +if [ $COUNT -ne $PATCHCOUNT ]; then + echo "Found $COUNT patches in $PATCHLIST, expected $PATCHCOUNT" + exit 1 +fi +if [ $COUNT -gt 0 ]; then + xargs git am <$PATCHLIST || exit 1 +fi +echo "Applied $COUNT patches" +rm -f $PATCHLIST + %build %if ! %{with_xen} %define _without_xen --without-xen -- 2.1.3

3 3

[libvirt] lxcContainerResolveSymlinks failing on cascading FS
by Cedric Bosdonnat 24 Nov '14

24 Nov '14

Hi all, As an example, the following command virt-sandbox-service create --network dhcp,source=default --unitfile sshd.service mysshd -i 512 generates a container definition containing these filesystems (in the same order): <filesystem type='file' accessmode='passthrough'> <source file='/var/lib/libvirt/images/mysshd.raw'/> <target dir='/var/lib/libvirt/filesystems/mysshd'/> </filesystem> <filesystem type='bind' accessmode='passthrough'> <source dir='/var/lib/libvirt/filesystems/mysshd/var'/> <target dir='/var'/> </filesystem> Since /var/lib/libvirt/filesystems/mysshd contains nothing, the second FS needs the first one to be mounted for the source directory to exist. The problem comes with lxcContainerResolveSymlinks() being run before any file system is actually mounted. So the container can't be started and we get the following error: Failed to access '/var/lib/libvirt/filesystems/mysshd/var': No such file or directory This would work if the symlinks were resolved right before mounting the FS instead of before mounting any of them. Any strong opinion against it? -- Cedric

2 1

[libvirt] [PATCH V2 0/4] libxl migration improvements
by Jim Fehlig 22 Nov '14

22 Nov '14

V2 of https://www.redhat.com/archives/libvir-list/2014-November/msg00423.html Patch 1 has been fixed based on Michal's feedback. Patch 2 is new in V2. I mistakenly dropped it when reordering the patches for the V1 submission. Patches 3 and 4 also have some minor adjustments from V1. See individual patches for details. Jim Fehlig (4): libxl: Receive migration data in a thread libxl: acquire job in migration finish phase libxl: start domain paused on migration dst libxl: destroy domain in migration finish phase on failure src/libxl/libxl_driver.c | 17 +++++--- src/libxl/libxl_migration.c | 103 +++++++++++++++++++++++++++++++++----------- 2 files changed, 90 insertions(+), 30 deletions(-) -- 1.8.4.5

2 6

Re: [libvirt] [Xen-devel] dom0 kenrel crashes for openstack + libvirt + libxl
by Ian Campbell 22 Nov '14

22 Nov '14

On Fri, 2014-11-21 at 14:18 +0000, David Vrabel wrote: > On 21/11/14 14:05, Ian Campbell wrote: > > On Fri, 2014-11-21 at 09:28 +0000, Ian Campbell wrote: > >> I think libvirt is wrong to specify an absolute path here, IMHO by > >> default it should just specify "pygrub" and let libxl figure out the > >> correct path. Jim, what do you think? > > > > e.g. something like the following untested (but pretty obvious[0]) > > patch. > [...] > > +# define "pygrub" > > I'm going to go with pretty obviously broken. You're missing the macro > name. Doh! Indeed... Lets try that again... 8<---------- >From 9f2d8da8264b426f54b92378e9e00973694193d4 Mon Sep 17 00:00:00 2001 From: Ian Campbell <ian.campbell(a)citrix.com> Date: Fri, 21 Nov 2014 14:00:38 +0000 Subject: [PATCH] libxl: Allow libxl to find pygrub binary. Specifying an explicit path to pygrub (e.g. BINDIR "/pygrub") only works if Xen and libvirt happen to be installed to the same prefix. A more flexible approach is to simply specify "pygrub" which will cause libxl to use the correct path which it knows (since it is built with the same prefix as pygrub). This is particular problematic in the Debian packaging, since the Debian Xen package relocates pygrub into a libexec dir, however I think this change makes sense upstream. Signed-off-by: Ian Campbell <ian.campbell(a)citrix.com> --- .gnulib | 2 +- src/libxl/libxl_conf.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gnulib b/.gnulib index 9565c3b..2d28074 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 9565c3be73eb6d76b7b42a21d68d2e00a62abb6d +Subproject commit 2d280742a9e30088aa169f53353765d5daafe4c0 diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index 25f77ea..d7a3971 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -53,7 +53,7 @@ # define LIBXL_LIB_DIR LOCALSTATEDIR "/lib/libvirt/libxl" # define LIBXL_SAVE_DIR LIBXL_LIB_DIR "/save" # define LIBXL_DUMP_DIR LIBXL_LIB_DIR "/dump" -# define LIBXL_BOOTLOADER_PATH BINDIR "/pygrub" +# define LIBXL_BOOTLOADER_PATH "pygrub" /* libxl interface for setting VCPU affinity changed in 4.5. In fact, a new * parameter has been added, representative of 'VCPU soft affinity'. If one -- 1.7.10.4

2 2

Re: [libvirt] [Xen-devel] dom0 kenrel crashes for openstack + libvirt + libxl
by Ian Campbell 21 Nov '14

21 Nov '14

On Fri, 2014-11-21 at 09:28 +0000, Ian Campbell wrote: > I think libvirt is wrong to specify an absolute path here, IMHO by > default it should just specify "pygrub" and let libxl figure out the > correct path. Jim, what do you think? e.g. something like the following untested (but pretty obvious[0]) patch. I'm currently rebuilding Debian's libvirt package with this included so I can give it a go. Ian. [0] famous last words, I know! 8<--------------- >From 4edbcbdc7e28896121832d8e226e7aeccf30633c Mon Sep 17 00:00:00 2001 From: Ian Campbell <ian.campbell(a)citrix.com> Date: Fri, 21 Nov 2014 14:00:38 +0000 Subject: [PATCH] libxl: Allow libxl to find pygrub binary. Specifying an explicit path to pygrub (e.g. BINDIR "/pygrub") only works if Xen and libvirt happen to be installed to the same prefix. A more flexible approach is to simply specify "pygrub" which will cause libxl to use the correct path which it knows (since it is built with the same prefix as pygrub). This is particular problematic in the Debian packaging, since the Debian Xen package relocates pygrub into a libexec dir, however I think this change makes sense upstream. Signed-off-by: Ian Campbell <ian.campbell(a)citrix.com> --- src/libxl/libxl_conf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index 25f77ea..3669e68 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -53,7 +53,7 @@ # define LIBXL_LIB_DIR LOCALSTATEDIR "/lib/libvirt/libxl" # define LIBXL_SAVE_DIR LIBXL_LIB_DIR "/save" # define LIBXL_DUMP_DIR LIBXL_LIB_DIR "/dump" -# define LIBXL_BOOTLOADER_PATH BINDIR "/pygrub" +# define "pygrub" /* libxl interface for setting VCPU affinity changed in 4.5. In fact, a new * parameter has been added, representative of 'VCPU soft affinity'. If one -- 1.7.10.4

1 0

[libvirt] [PATCH 00/12] Unbreak vm's backed by RBD disks
by Peter Krempa 21 Nov '14

21 Nov '14

After recent refactors, starting a VM whose disk is backed by RBD storage would fail as the parser for the backing file specification string was not implemented in the metadata crawler. Reuse qemu's parser to do this and fix a few things around. Peter Krempa (12): docs: domain: Move docs for storage hosts under the <source> element test: virstoragetest: Add testing of network disk details util: buffer: Clarify scope of the escape operation in virBufferEscape util: storage: Add notice for extension of struct virStorageSource util: storage: Copy hosts of a storage file only if they exist qemu: Refactor qemuBuildNetworkDriveURI to take a virStorageSourcePtr tests: Reflow the expected output from RBD disk test util: split out qemuParseRBDString into a common helper util: storagefile: Split out parsing of NBD string into a separate func storage: Allow parsing of RBD backing strings when building backing chain storage: rbd: qemu: Add support for specifying internal RBD snapshots storage: rbd: Implement support for passing config file option docs/formatdomain.html.in | 128 +++++---- docs/schemas/domaincommon.rng | 16 ++ src/conf/domain_conf.c | 52 +++- src/conf/domain_conf.h | 1 + src/conf/snapshot_conf.c | 6 +- src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 268 +++++------------- src/util/virbuffer.c | 5 +- src/util/virstoragefile.c | 313 +++++++++++++++++---- src/util/virstoragefile.h | 14 +- .../qemuxml2argv-disk-drive-network-rbd.args | 16 +- .../qemuxml2argv-disk-drive-network-rbd.xml | 25 ++ tests/virstoragetest.c | 65 ++++- 13 files changed, 587 insertions(+), 323 deletions(-) -- 2.1.0

2 27

[libvirt] [PATCH] virsh: sync domdisplay help and manual
by Martin Kletzander 21 Nov '14

21 Nov '14

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- tools/virsh-domain.c | 2 +- tools/virsh.pod | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index cf45a88..0572275 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9915,7 +9915,7 @@ static const vshCmdOptDef opts_domdisplay[] = { }, {.name = "type", .type = VSH_OT_DATA, - .help = N_("select particular graphics display " + .help = N_("select particular graphical display " "(e.g. \"vnc\", \"spice\", \"rdp\")") }, {.name = NULL} diff --git a/tools/virsh.pod b/tools/virsh.pod index d5608cc..5a577f6 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1138,11 +1138,13 @@ I<size> is a scaled integer (see B<NOTES> above) which defaults to KiB "B" to get bytes (note that for historical reasons, this differs from B<vol-resize> which defaults to bytes without a suffix). -=item B<domdisplay> I<domain> [I<--include-password>] +=item B<domdisplay> I<domain> [I<--include-password>] [[I<--type>] B<type>] Output a URI which can be used to connect to the graphical display of the -domain via VNC, SPICE or RDP. If I<--include-password> is specified, the -SPICE channel password will be included in the URI. +domain via VNC, SPICE or RDP. The particular graphical display type can +be selected using the B<type> parameter (e.g. "vnc", "spice", "rdp"). If +I<--include-password> is specified, the SPICE channel password will be +included in the URI. =item B<domfsfreeze> I<domain> [[I<--mountpoint>] B<mountpoint>...] -- 2.1.3

2 1

[libvirt] [PATCH 00/11] Introduce guest agent lifecycle event and impl for qemu
by Peter Krempa 21 Nov '14

21 Nov '14

Peter Krempa (11): qemu: process: report useful error if alias formatting fails conf: Annotate source enums for character device struct members test: xml2xml: Print full filenames if xml2xml test fails qemu: monitor: Rename and improve qemuMonitorGetPtyPaths conf: Add channel state for virtio channels to the XML qemu: Add handling for VSERPORT_CHANGE event qemu: chardev: Extract more information about character devices qemu: process: Refresh virtio channel guest state when connecting to mon event: Add guest agent lifecycle event examples: Add support for the guest agent lifecycle event qemu: Emit the guest agent lifecycle event daemon/remote.c | 36 +++++ docs/formatdomain.html.in | 9 +- docs/schemas/domaincommon.rng | 3 + examples/object-events/event-test.c | 43 +++++- include/libvirt/libvirt-domain.h | 28 ++++ src/conf/domain_conf.c | 35 ++++- src/conf/domain_conf.h | 19 ++- src/conf/domain_event.c | 78 ++++++++++ src/conf/domain_event.h | 9 ++ src/libvirt_private.syms | 2 + src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 62 ++++++++ src/qemu/qemu_monitor.c | 56 ++++++-- src/qemu/qemu_monitor.h | 20 ++- src/qemu/qemu_monitor_json.c | 84 ++++++++--- src/qemu/qemu_monitor_json.h | 4 +- src/qemu/qemu_monitor_text.c | 21 ++- src/qemu/qemu_monitor_text.h | 4 +- src/qemu/qemu_process.c | 157 ++++++++++++++++++--- src/remote/remote_driver.c | 31 ++++ src/remote/remote_protocol.x | 16 ++- src/remote_protocol-structs | 7 + tests/qemumonitorjsontest.c | 59 +++++--- .../qemuxml2argv-channel-virtio-state.args | 17 +++ .../qemuxml2argv-channel-virtio-state.xml | 42 ++++++ tests/qemuxml2argvtest.c | 2 + .../qemuxml2xmlout-channel-virtio-state-active.xml | 43 ++++++ ...emuxml2xmlout-channel-virtio-state-inactive.xml | 42 ++++++ tests/qemuxml2xmltest.c | 3 +- tests/testutils.c | 35 ++++- tests/testutils.h | 5 + tools/virsh-domain.c | 40 ++++++ 32 files changed, 922 insertions(+), 91 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-state-active.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-state-inactive.xml -- 2.1.0

4 33

[libvirt] [PATCH] docs: fix a typo in formatdomain.html
by Chen Fan 21 Nov '14

21 Nov '14

Signed-off-by: Chen Fan <chen.fan.fnst(a)cn.fujitsu.com> --- docs/formatdomain.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 9364eb5..6a15074 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3413,7 +3413,7 @@ setting for the attribute is <code>no</code> for security reasons and support depends on the guest network device model as well as the type of connection on the host - currently it is - only supported for the virtio ddevice model and for macvtap + only supported for the virtio device model and for macvtap connections on the host. -- 1.9.3

2 1

[libvirt] [PATCH] storage: qemu: Fix security labelling of new image chain elements
by Peter Krempa 21 Nov '14

21 Nov '14

When creating a disk image snapshot the libvirt code would blindly copy the parents label to the newly created image. This runs into problems when you start a VM from an image hosted on NFS (or other storage system that doesn't support selinux labels) and the snapshot destination is on a storage system that does support selinux labels. Libvirt's code in that case generates a different security label for the image hosted on NFS. This label is valid only for NFS images and doesn't allow access in case of a locally stored image. To fix this issue libvirt needs to refrain from copying security information in cases where the default domain seclabel is a better choice. This patch repurposes the now unused @force argument of virStorageSourceInitChainElement to denote whether a copy of the security labelling stuff should be attempted or not. This allows to fine-control the copy operation for cases where we need to keep the label of the old disk vs. the cases where we need to keep the label unset to use the default domain imagelabel. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1151718 --- Note: I've opted not to change to use the default label when doing a block-copy via the old API as there is no way to specify a new label all other options now allow to provide a different label via the XML that was provided by the user. src/qemu/qemu_driver.c | 14 ++++++++------ src/qemu/qemu_process.c | 2 +- src/util/virstoragefile.c | 16 +++++++--------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 74d1bdc..0343713 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15861,7 +15861,8 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, unsigned long long bandwidth, unsigned int granularity, unsigned long long buf_size, - unsigned int flags) + unsigned int flags, + bool keepParentLabel) { virQEMUDriverPtr driver = conn->privateData; qemuDomainObjPrivatePtr priv; @@ -15992,7 +15993,8 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, if (mirror->format > 0) format = virStorageFileFormatTypeToString(mirror->format); - if (virStorageSourceInitChainElement(mirror, disk->src, false) < 0) + if (virStorageSourceInitChainElement(mirror, disk->src, + keepParentLabel) < 0) goto endjob; if (qemuDomainPrepareDiskChainElement(driver, vm, mirror, @@ -16104,7 +16106,7 @@ qemuDomainBlockRebase(virDomainPtr dom, const char *path, const char *base, flags &= (VIR_DOMAIN_BLOCK_REBASE_SHALLOW | VIR_DOMAIN_BLOCK_REBASE_REUSE_EXT); ret = qemuDomainBlockCopyCommon(vm, dom->conn, path, dest, - bandwidth, 0, 0, flags); + bandwidth, 0, 0, flags, true); vm = NULL; dest = NULL; @@ -16177,8 +16179,8 @@ qemuDomainBlockCopy(virDomainPtr dom, const char *disk, const char *destxml, VIR_DOMAIN_XML_INACTIVE))) goto cleanup; - ret = qemuDomainBlockCopyCommon(vm, dom->conn, disk, dest, - bandwidth, granularity, buf_size, flags); + ret = qemuDomainBlockCopyCommon(vm, dom->conn, disk, dest, bandwidth, + granularity, buf_size, flags, false); vm = NULL; cleanup: @@ -16353,7 +16355,7 @@ qemuDomainBlockCommit(virDomainPtr dom, goto endjob; if (virStorageSourceInitChainElement(mirror, disk->src, - false) < 0) + true) < 0) goto endjob; } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index b782984..1f22bd0 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1064,7 +1064,7 @@ qemuProcessHandleBlockJob(qemuMonitorPtr mon ATTRIBUTE_UNUSED, copy = virStorageSourceCopy(disk->mirror, false); if (virStorageSourceInitChainElement(copy, persistDisk->src, - false) < 0) { + true) < 0) { VIR_WARN("Unable to update persistent definition " "on vm %s after block job", vm->def->name); diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index aa97f75..5287c51 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1900,28 +1900,26 @@ virStorageSourceCopy(const virStorageSource *src, * virStorageSourceInitChainElement: * @newelem: New backing chain element disk source * @old: Existing top level disk source - * @force: Force-copy the information + * @transferLabels: Transfer security lables. * * Transfers relevant information from the existing disk source to the new * backing chain element if they weren't supplied so that labelling info * and possibly other stuff is correct. * - * If @force is true, user-supplied information for the new backing store - * element is overwritten from @old instead of keeping it. + * If @transferLabels is true, security labels from the existing disk are copied + * to the new disk. Otherwise the default domain imagelabel label will be used. * * Returns 0 on success, -1 on error. */ int virStorageSourceInitChainElement(virStorageSourcePtr newelem, virStorageSourcePtr old, - bool force) + bool transferLables) { int ret = -1; - if (force) - virStorageSourceSeclabelsClear(newelem); - - if (!newelem->seclabels && + if (transferLables && + !newelem->seclabels && virStorageSourceSeclabelsCopy(newelem, old) < 0) goto cleanup; @@ -2367,7 +2365,7 @@ virStorageSourceNewFromBacking(virStorageSourcePtr parent) } /* copy parent's labelling and other top level stuff */ - if (virStorageSourceInitChainElement(ret, parent, false) < 0) + if (virStorageSourceInitChainElement(ret, parent, true) < 0) goto error; } -- 2.1.0

2 2

[libvirt] [PATCH v2 0/5] Guest filesystem information API
by Tomoki Sekiyama 21 Nov '14

21 Nov '14

Hi, This is v2 of patchset to add virDomainGetFSInfo API. * changes in v1->v2: -[all] removed redundant NULL element at the last of returned info array -[3/5] make error messages in qemu_agent.c consistent with other commands -[4/5] added a test case for 2 items in info->devAliases -[5/5] added a pod document for virsh domfsinfo command (v1: http://www.redhat.com/archives/libvir-list/2014-October/msg00001.html ) * summary This series implements a new virDomainGetFSInfo API, that returns a list of mounted filesystems information in the guest, collected via the guest agent. The returned info contains mountpoints and disk device alias named in libvirt, so we can know which mountpoints should be frozen by virDomainFSFreeze to take snapshots of a part of disks. --- Tomoki Sekiyama (5): Implement public API for virDomainGetFSInfo remote: Implement the remote protocol for virDomainGetFSInfo qemu: Implement the qemu driver for virDomainGetFSInfo qemu: add test for qemuAgentGetFSInfo virsh: expose virDomainGetFSInfo daemon/remote.c | 117 ++++++++++++++++++++ include/libvirt/libvirt-domain.h | 21 ++++ src/conf/domain_conf.c | 71 ++++++++++++ src/conf/domain_conf.h | 6 + src/driver-hypervisor.h | 6 + src/libvirt.c | 66 +++++++++++ src/libvirt_private.syms | 1 src/libvirt_public.syms | 6 + src/qemu/qemu_agent.c | 178 ++++++++++++++++++++++++++++++ src/qemu/qemu_agent.h | 2 src/qemu/qemu_driver.c | 48 ++++++++ src/remote/remote_driver.c | 92 ++++++++++++++++ src/remote/remote_protocol.x | 32 +++++ src/remote_protocol-structs | 21 ++++ src/rpc/gendispatch.pl | 1 tests/Makefile.am | 1 tests/qemuagentdata/qemuagent-fsinfo.xml | 39 +++++++ tests/qemuagenttest.c | 143 ++++++++++++++++++++++++ tools/virsh-domain.c | 74 ++++++++++++ tools/virsh.pod | 9 ++ 20 files changed, 933 insertions(+), 1 deletion(-) create mode 100644 tests/qemuagentdata/qemuagent-fsinfo.xml -- Tomoki Sekiyama

5 29

[libvirt] [PATCH] build: avoid 32-bit failure on older gcc
by Eric Blake 21 Nov '14

21 Nov '14

On 32-bit platforms with old gcc (hello RHEL 5 gcc 4.1.2), the build fails with: virsh-domain.c: In function 'cmdBlockCopy': virsh-domain.c:2172: warning: comparison is always false due to limited range of data type Adjust the code to silence the warning. * tools/virsh-domain.c (cmdBlockCopy): Pacify RHEL 5 gcc. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. tools/virsh-domain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 7184784..cf45a88 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -2169,7 +2169,8 @@ cmdBlockCopy(vshControl *ctl, const vshCmd *cmd) if (bandwidth) { /* bandwidth is ulong MiB/s, but the typed parameter is * ullong bytes/s; make sure we don't overflow */ - if (bandwidth + 0ULL > ULLONG_MAX >> 20) { + unsigned long long limit = MIN(ULONG_MAX, ULLONG_MAX >> 20); + if (bandwidth > limit) { virReportError(VIR_ERR_OVERFLOW, _("bandwidth must be less than %llu"), ULLONG_MAX >> 20); -- 1.9.3

1 0

[libvirt] [PATCH] build: fix build when not using dbus
by Eric Blake 20 Nov '14

20 Nov '14

Commit c0e7022 breaks on a machine that lacks dbus headers: In file included from util/virdbus.c:24:0: util/virdbuspriv.h:31:3: error: unknown type name 'dbus_int16_t' * src/util/virdbuspriv.h (DBusBasicValue): Only provide fallback when dbus is compiled. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule (I feel like I'm in whack-a-mole mode right now, where my fix for one problem causes a failure in another environment. Sorry for the churn) src/util/virdbuspriv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virdbuspriv.h b/src/util/virdbuspriv.h index 4247746..74b395f 100644 --- a/src/util/virdbuspriv.h +++ b/src/util/virdbuspriv.h @@ -24,7 +24,7 @@ # include "virdbus.h" -# if !HAVE_DBUSBASICVALUE +# if defined(WITH_DBUS) && !HAVE_DBUSBASICVALUE /* Copied (and simplified) from dbus 1.6.12, for use with older dbus headers */ typedef union { -- 1.9.3

1 0

[libvirt] [PATCH] drvbhyve: Automatically tear down guest domains on shutdown
by Conrad Meyer 20 Nov '14

20 Nov '14

Reboot requires more sophistication and is left as a future work item -- but at least part of the plumbing is in place. --- src/Makefile.am | 2 + src/bhyve/bhyve_monitor.c | 184 ++++++++++++++++++++++++++++++++++++++++++++++ src/bhyve/bhyve_monitor.h | 36 +++++++++ src/bhyve/bhyve_process.c | 14 +++- 4 files changed, 233 insertions(+), 3 deletions(-) create mode 100644 src/bhyve/bhyve_monitor.c create mode 100644 src/bhyve/bhyve_monitor.h diff --git a/src/Makefile.am b/src/Makefile.am index d8fe624..b6c1701 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -833,6 +833,8 @@ BHYVE_DRIVER_SOURCES = \ bhyve/bhyve_domain.h \ bhyve/bhyve_driver.h \ bhyve/bhyve_driver.c \ + bhyve/bhyve_monitor.c \ + bhyve/bhyve_monitor.h \ bhyve/bhyve_process.c \ bhyve/bhyve_process.h \ bhyve/bhyve_utils.h \ diff --git a/src/bhyve/bhyve_monitor.c b/src/bhyve/bhyve_monitor.c new file mode 100644 index 0000000..cd3cf6e --- /dev/null +++ b/src/bhyve/bhyve_monitor.c @@ -0,0 +1,184 @@ +/* + * bhyve_monitor.c: Tear-down or reboot bhyve domains on guest shutdown + * + * Copyright (C) 2014 Conrad Meyer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Author: Conrad Meyer <cse.cem(a)gmail.com> + */ + +#include <config.h> + +#include <sys/types.h> +#include <sys/event.h> +#include <sys/time.h> +#include <sys/wait.h> + +#include "bhyve_monitor.h" +#include "bhyve_process.h" +#include "viralloc.h" +#include "virerror.h" +#include "virfile.h" +#include "virlog.h" + +#define VIR_FROM_THIS VIR_FROM_BHYVE + +VIR_LOG_INIT("bhyve.bhyve_monitor"); + +struct _bhyveMonitor { + int kq; + int watch; + virDomainObjPtr vm; + bhyveConnPtr driver; +}; + +static void +bhyveMonitorIO(int watch, int kq, int events ATTRIBUTE_UNUSED, void *opaque) +{ + const struct timespec zerowait = {}; + bhyveMonitorPtr mon = opaque; + struct kevent kev; + int rc, status; + + if (watch != mon->watch || kq != mon->kq) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("event from unexpected fd %d!=%d / watch %d!=%d"), + mon->kq, kq, mon->watch, watch); + return; + } + + rc = kevent(kq, NULL, 0, &kev, 1, &zerowait); + if (rc < 0) { + virReportSystemError(errno, "%s", _("Unable to query kqueue")); + return; + } + + if (rc == 0) + return; + + if ((kev.flags & EV_ERROR) != 0) { + virReportSystemError(kev.data, "%s", _("Unable to query kqueue")); + return; + } + + if (kev.filter == EVFILT_PROC && (kev.fflags & NOTE_EXIT) != 0) { + if ((pid_t)kev.ident != mon->vm->pid) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("event from unexpected proc %ju!=%ju"), + (uintmax_t)mon->vm->pid, (uintmax_t)kev.ident); + return; + } + + status = kev.data; + if (WIFSIGNALED(status) && WCOREDUMP(status)) { + VIR_ERROR("Guest %s got signal %d and crashed", mon->vm->def->name, + WTERMSIG(status)); + virBhyveProcessStop(mon->driver, mon->vm, + VIR_DOMAIN_SHUTOFF_CRASHED); + } else if (WIFEXITED(status)) { + if (WEXITSTATUS(status) == 0) { + /* 0 - reboot */ + /* TODO: Implementing reboot is a little more complicated. */ + VIR_INFO("Guest %s rebooted; destroying domain.", + mon->vm->def->name); + virBhyveProcessStop(mon->driver, mon->vm, + VIR_DOMAIN_SHUTOFF_SHUTDOWN); + } else if (WEXITSTATUS(status) < 3) { + /* 1 - shutdown, 2 - halt, 3 - triple fault. others - error */ + VIR_INFO("Guest %s shut itself down; destroying domain.", + mon->vm->def->name); + virBhyveProcessStop(mon->driver, mon->vm, + VIR_DOMAIN_SHUTOFF_SHUTDOWN); + } else { + VIR_INFO("Guest %s had an error and exited with status %d; destroying domain.", + mon->vm->def->name, WEXITSTATUS(status)); + virBhyveProcessStop(mon->driver, mon->vm, + VIR_DOMAIN_SHUTOFF_UNKNOWN); + } + } + } +} + +static void +bhyveMonitorRelease(void *opaque) +{ + bhyveMonitorPtr mon = opaque; + + VIR_FORCE_CLOSE(mon->kq); + virObjectUnref(mon->vm); + VIR_FREE(mon); +} + +bhyveMonitorPtr +bhyveMonitorOpen(virDomainObjPtr vm, bhyveConnPtr driver) +{ + bhyveMonitorPtr mon; + struct kevent kev; + int rc; + + if (VIR_ALLOC(mon) < 0) + return NULL; + + mon->vm = virObjectRef(vm); + mon->driver = driver; + + mon->kq = kqueue(); + if (mon->kq < 0) { + virReportError(VIR_ERR_SYSTEM_ERROR, "%s", + _("Unable to create kqueue")); + goto cleanup; + } + + EV_SET(&kev, vm->pid, EVFILT_PROC, EV_ADD, NOTE_EXIT, 0, mon); + rc = kevent(mon->kq, &kev, 1, NULL, 0, NULL); + if (rc < 0) { + virReportError(VIR_ERR_SYSTEM_ERROR, "%s", + _("Unable to register process kevent")); + goto cleanup; + } + + mon->watch = virEventAddHandle(mon->kq, + VIR_EVENT_HANDLE_READABLE | + VIR_EVENT_HANDLE_ERROR | + VIR_EVENT_HANDLE_HANGUP, + bhyveMonitorIO, + mon, + bhyveMonitorRelease); + if (mon->watch < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("unable to register monitor events")); + goto cleanup; + } + + return mon; + + cleanup: + bhyveMonitorRelease(mon); + return NULL; +} + +void +bhyveMonitorClose(bhyveMonitorPtr mon) +{ + + if (mon == NULL) + return; + + if (mon->watch > 0) + virEventRemoveHandle(mon->watch); + else + bhyveMonitorRelease(mon); +} diff --git a/src/bhyve/bhyve_monitor.h b/src/bhyve/bhyve_monitor.h new file mode 100644 index 0000000..226d878 --- /dev/null +++ b/src/bhyve/bhyve_monitor.h @@ -0,0 +1,36 @@ +/* + * bhyve_monitor.h: Tear-down or reboot bhyve domains on guest shutdown + * + * Copyright (C) 2014 Conrad Meyer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Author: Conrad Meyer <cse.cem(a)gmail.com> + */ + +#ifndef BHYVE_MONITOR_H +# define BHYVE_MONITOR_H + +# include "internal.h" +# include "domain_conf.h" +# include "bhyve_utils.h" + +typedef struct _bhyveMonitor bhyveMonitor; +typedef bhyveMonitor *bhyveMonitorPtr; + +bhyveMonitorPtr bhyveMonitorOpen(virDomainObjPtr vm, bhyveConnPtr driver); +void bhyveMonitorClose(bhyveMonitorPtr mon); + +#endif /* BHYVE_MONITOR_H */ diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index a30e36a..284641a 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -32,8 +32,9 @@ #include <net/if_tap.h> #include "bhyve_device.h" -#include "bhyve_process.h" #include "bhyve_command.h" +#include "bhyve_monitor.h" +#include "bhyve_process.h" #include "datatypes.h" #include "virerror.h" #include "virlog.h" @@ -209,6 +210,7 @@ virBhyveProcessStart(virConnectPtr conn, vm->def->id = vm->pid; virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, reason); + vm->privateData = bhyveMonitorOpen(vm, driver); if (virDomainSaveStatus(driver->xmlopt, BHYVE_STATE_DIR, @@ -268,6 +270,9 @@ virBhyveProcessStop(bhyveConnPtr driver, return -1; } + if (vm->privateData != NULL) + bhyveMonitorClose((bhyveMonitorPtr)vm->privateData); + /* First, try to kill 'bhyve' process */ if (virProcessKillPainfully(vm->pid, true) != 0) VIR_WARN("Failed to gracefully stop bhyve VM '%s' (pid: %d)", @@ -371,9 +376,12 @@ virBhyveProcessReconnect(virDomainObjPtr vm, goto cleanup; proc_argv = kvm_getargv(data->kd, kp, 0); - if (proc_argv && proc_argv[0]) - if (STREQ(expected_proctitle, proc_argv[0])) + if (proc_argv && proc_argv[0]) { + if (STREQ(expected_proctitle, proc_argv[0])) { ret = 0; + vm->privateData = bhyveMonitorOpen(vm, data->driver); + } + } cleanup: if (ret < 0) { -- 1.9.3

1 0

[libvirt] [PATCH 0/2] Fix fc_host SCSI pool refresh issues
by John Ferlan 20 Nov '14

20 Nov '14

https://bugzilla.redhat.com/show_bug.cgi?id=1152382 Fix a couple of fc_host SCSI refresh pool issues. The first patch I found while working on the second. It turns out the existing logic to handle 'retval' wasn't correct. Using a default of zero, resulted in a couple of cases where success was returned when it shouldn't have been. The one that caused the issues was when the search of the /sys/bus/scsi/devices/ tree found a new vHBA related device and then "assumed" that the 'block' device would be found in the directory. That assumption resulted in a 10 second pause in virStorageBackendStablePath failing to find a stable path to the device "/dev/(null)" because the getBlockDevice returned zero and a NULL block_device and the processLU code only failed when the return was < 0. The processLU code had similar issues with retval processing which are also fixed. The second patch provides a mechanism to attempt to fill the pool of a libvirt created VPORT_CREATE'd vHBA. The creation takes some time for the udev callback mechanism to find and configure. By adding a thread to attempt to retry to find the LU's (with any luck) after the udev processing has had time to do something means a subsequent 'vol-list' on the pool may actually find a volume without needing to attempt a 'pool-refresh' again. It's too bad the udev mechanism didn't provide a way to indicate it has completed setting up a specific device. John Ferlan (2): storage: Fix issue finding LU's when block doesn't exist storage: Add thread to refresh for createVport src/storage/storage_backend_scsi.c | 147 ++++++++++++++++++++++++++++++++----- 1 file changed, 128 insertions(+), 19 deletions(-) -- 1.9.3

2 6

[libvirt] [PATCH] Fix API docs for header file re-organization
by Daniel P. Berrange 20 Nov '14

20 Nov '14

The API docs generators were broken by the header file re-organization. Specifically * html/libvirt-libvirt.html was empty (and should be deleted) * Makefile.am didn't install html/libvirt-libvirt-*.html * hvsupport.html was mostly empty * sitemap.html.in didn't list the new html/*.html files --- docs/Makefile.am | 17 +++++++-- docs/apibuild.py | 1 - docs/hvsupport.pl | 101 +++++++++++++++++++++++++++++---------------------- docs/sitemap.html.in | 48 ++++++++++++++++++++++-- 4 files changed, 115 insertions(+), 52 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 9de3406..910bfef 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -25,9 +25,20 @@ DOC_SOURCE_DIR=../src DEVHELP_DIR=$(datadir)/gtk-doc/html/libvirt -apihtml = \ - html/index.html \ - html/libvirt-libvirt.html \ +apihtml = \ + html/index.html \ + html/libvirt-libvirt-domain.html \ + html/libvirt-libvirt-domain-snapshot.html \ + html/libvirt-libvirt-event.html \ + html/libvirt-libvirt-host.html \ + html/libvirt-libvirt.html \ + html/libvirt-libvirt-interface.html \ + html/libvirt-libvirt-network.html \ + html/libvirt-libvirt-nodedev.html \ + html/libvirt-libvirt-nwfilter.html \ + html/libvirt-libvirt-secret.html \ + html/libvirt-libvirt-storage.html \ + html/libvirt-libvirt-stream.html \ html/libvirt-virterror.html apipng = \ diff --git a/docs/apibuild.py b/docs/apibuild.py index 797a7a5..7549a63 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -21,7 +21,6 @@ debugsym=None # C parser analysis code # included_files = { - "libvirt.h": "header with general libvirt API definitions", "libvirt-domain.h": "header with general libvirt API definitions", "libvirt-domain-snapshot.h": "header with general libvirt API definitions", "libvirt-event.h": "header with general libvirt API definitions", diff --git a/docs/hvsupport.pl b/docs/hvsupport.pl index 6d8ed9c..96720eb 100755 --- a/docs/hvsupport.pl +++ b/docs/hvsupport.pl @@ -12,7 +12,17 @@ my $srcdir = shift @ARGV; my $symslibvirt = "$srcdir/libvirt_public.syms"; my $symsqemu = "$srcdir/libvirt_qemu.syms"; my $symslxc = "$srcdir/libvirt_lxc.syms"; -my $drivertable = "$srcdir/driver.h"; +my @drivertable = ( + "$srcdir/driver-hypervisor.h", + "$srcdir/driver-interface.h", + "$srcdir/driver-network.h", + "$srcdir/driver-nodedev.h", + "$srcdir/driver-nwfilter.h", + "$srcdir/driver-secret.h", + "$srcdir/driver-state.h", + "$srcdir/driver-storage.h", + "$srcdir/driver-stream.h", + ); my %groupheaders = ( "virHypervisorDriver" => "Hypervisor APIs", @@ -182,41 +192,44 @@ $apis{virDomainMigrateConfirm3Params} = "1.1.0"; # and driver struct fields. This lets us later match # update the driver impls with the public APis. -open FILE, "<$drivertable" - or die "cannot read $drivertable: $!"; - # Group name -> hash of APIs { fields -> api name } my %groups; my $ingrp; -while (defined($line = <FILE>)) { - if ($line =~ /struct _(vir\w*Driver)/) { - my $grp = $1; - if ($grp ne "virStateDriver" && - $grp ne "virStreamDriver") { - $ingrp = $grp; - $groups{$ingrp} = { apis => {}, drivers => {} }; - } - } elsif ($ingrp) { - if ($line =~ /^\s*vir(?:Drv)(\w+)\s+(\w+);\s*$/) { - my $field = $2; - my $name = $1; - - my $api; - if (exists $apis{"vir$name"}) { - $api = "vir$name"; - } elsif ($name =~ /\w+(Open|Close)/) { - next; - } else { - die "driver $name does not have a public API"; +foreach my $drivertable (@drivertable) { + open FILE, "<$drivertable" + or die "cannot read $drivertable: $!"; + + while (defined($line = <FILE>)) { + if ($line =~ /struct _(vir\w*Driver)/) { + my $grp = $1; + if ($grp ne "virStateDriver" && + $grp ne "virStreamDriver") { + $ingrp = $grp; + warn "[$ingrp]"; + $groups{$ingrp} = { apis => {}, drivers => {} }; + } + } elsif ($ingrp) { + if ($line =~ /^\s*vir(?:Drv)(\w+)\s+(\w+);\s*$/) { + my $field = $2; + my $name = $1; + + my $api; + if (exists $apis{"vir$name"}) { + $api = "vir$name"; + } elsif ($name =~ /\w+(Open|Close)/) { + next; + } else { + die "driver $name does not have a public API"; + } + $groups{$ingrp}->{apis}->{$field} = $api; + } elsif ($line =~ /};/) { + $ingrp = undef; } - $groups{$ingrp}->{apis}->{$field} = $api; - } elsif ($line =~ /};/) { - $ingrp = undef; } } -} -close FILE; + close FILE; +} # Finally, we read all the primary driver files and extract @@ -290,43 +303,43 @@ foreach my $src (@srcs) { # have a bit of manual fixup todo with the per-driver versioning # and support matrix -$groups{virDriver}->{apis}->{"openAuth"} = "virConnectOpenAuth"; -$groups{virDriver}->{apis}->{"openReadOnly"} = "virConnectOpenReadOnly"; -$groups{virDriver}->{apis}->{"domainMigrate"} = "virDomainMigrate"; +$groups{virHypervisorDriver}->{apis}->{"openAuth"} = "virConnectOpenAuth"; +$groups{virHypervisorDriver}->{apis}->{"openReadOnly"} = "virConnectOpenReadOnly"; +$groups{virHypervisorDriver}->{apis}->{"domainMigrate"} = "virDomainMigrate"; my $openAuthVers = (0 * 1000 * 1000) + (4 * 1000) + 0; -foreach my $drv (keys %{$groups{"virDriver"}->{drivers}}) { - my $openVersStr = $groups{"virDriver"}->{drivers}->{$drv}->{"connectOpen"}; +foreach my $drv (keys %{$groups{"virHypervisorDriver"}->{drivers}}) { + my $openVersStr = $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"connectOpen"}; my $openVers; if ($openVersStr =~ /(\d+)\.(\d+)\.(\d+)/) { $openVers = ($1 * 1000 * 1000) + ($2 * 1000) + $3; } # virConnectOpenReadOnly always matches virConnectOpen version - $groups{"virDriver"}->{drivers}->{$drv}->{"connectOpenReadOnly"} = - $groups{"virDriver"}->{drivers}->{$drv}->{"connectOpen"}; + $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"connectOpenReadOnly"} = + $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"connectOpen"}; # virConnectOpenAuth is always 0.4.0 if the driver existed # before this time, otherwise it matches the version of # the driver's virConnectOpen entry if ($openVersStr eq "Y" || $openVers >= $openAuthVers) { - $groups{"virDriver"}->{drivers}->{$drv}->{"connectOpenAuth"} = $openVersStr; + $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"connectOpenAuth"} = $openVersStr; } else { - $groups{"virDriver"}->{drivers}->{$drv}->{"connectOpenAuth"} = "0.4.0"; + $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"connectOpenAuth"} = "0.4.0"; } } # Another special case for the virDomainCreateLinux which was replaced # with virDomainCreateXML -$groups{virDriver}->{apis}->{"domainCreateLinux"} = "virDomainCreateLinux"; +$groups{virHypervisorDriver}->{apis}->{"domainCreateLinux"} = "virDomainCreateLinux"; my $createAPIVers = (0 * 1000 * 1000) + (0 * 1000) + 3; -foreach my $drv (keys %{$groups{"virDriver"}->{drivers}}) { - my $createVersStr = $groups{"virDriver"}->{drivers}->{$drv}->{"domainCreateXML"}; +foreach my $drv (keys %{$groups{"virHypervisorDriver"}->{drivers}}) { + my $createVersStr = $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"domainCreateXML"}; next unless defined $createVersStr; my $createVers; if ($createVersStr =~ /(\d+)\.(\d+)\.(\d+)/) { @@ -338,9 +351,9 @@ foreach my $drv (keys %{$groups{"virDriver"}->{drivers}}) { # the driver's virCreateXML entry if ($createVersStr eq "Y" || $createVers >= $createAPIVers) { - $groups{"virDriver"}->{drivers}->{$drv}->{"domainCreateLinux"} = $createVersStr; + $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"domainCreateLinux"} = $createVersStr; } else { - $groups{"virDriver"}->{drivers}->{$drv}->{"domainCreateLinux"} = "0.0.3"; + $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"domainCreateLinux"} = "0.0.3"; } } @@ -367,7 +380,7 @@ in. EOF -foreach my $grp (sort { $a cmp $b } keys %groups) { + foreach my $grp (sort { $a cmp $b } keys %groups) { print "<h2><a name=\"$grp\">", $groupheaders{$grp}, "</a></h2>\n"; print <<EOF; <table class="top_table"> diff --git a/docs/sitemap.html.in b/docs/sitemap.html.in index 1e91869..fad5358 100644 --- a/docs/sitemap.html.in +++ b/docs/sitemap.html.in @@ -291,12 +291,52 @@ --> <ul> <li> - <a href="html/libvirt-libvirt.html">libvirt</a> - core interfaces for the libvirt library + <a href="html/libvirt-libvirt-domain.html">Domain</a> + domain APIs for the libvirt library </li> <li> - <a href="html/libvirt-virterror.html">virterror</a> - error handling interfaces for the libvirt library + <a href="html/libvirt-libvirt-domain-snapshot.html">Domain snapshot</a> + domain snapshot APIs for the libvirt library + </li> + <li> + <a href="html/libvirt-virterror.html">Error</a> + error handling APIs for the libvirt library + </li> + <li> + <a href="html/libvirt-libvirt-event.html">Event</a> + event APIs for the libvirt library + </li> + <li> + <a href="html/libvirt-libvirt-host.html">Host</a> + host APIs for the libvirt library + </li> + <li> + <a href="html/libvirt-libvirt-interface.html">Interface</a> + interface APIs for the libvirt library + </li> + <li> + <a href="html/libvirt-libvirt-network.html">Network</a> + network APIs for the libvirt library + </li> + <li> + <a href="html/libvirt-libvirt-nodedev.html">Node device</a> + node device APIs for the libvirt library + </li> + <li> + <a href="html/libvirt-libvirt-nwfilter.html">Network filter</a> + network filter APIs for the libvirt library + </li> + <li> + <a href="html/libvirt-libvirt-secret.html">Secret</a> + secret APIs for the libvirt library + </li> + <li> + <a href="html/libvirt-libvirt-storage.html">Storage</a> + storage APIs for the libvirt library + </li> + <li> + <a href="html/libvirt-libvirt-stream.html">Stream</a> + stream APIs for the libvirt library </li> <li> <a href="hvsupport.html">Driver support</a> -- 2.1.0

3 3

[libvirt] [PATCH] build: fix build with older dbus headers
by Eric Blake 20 Nov '14

20 Nov '14

Compilation on a RHEL 5 host failed, due to the older dbus headers present on that machine, and triggered by commit 2aa167ca: util/virdbus.c: In function 'virDBusMessageIterDecode': util/virdbus.c:952: error: 'DBusBasicValue' undeclared (first use in this function) * m4/virt-dbus.m4 (LIBVIRT_CHECK_DBUS): Check for DBusBasicValue. * src/util/virdbuspriv.h (DBusBasicValue): Provide fallback. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. m4/virt-dbus.m4 | 3 ++- src/util/virdbuspriv.h | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/m4/virt-dbus.m4 b/m4/virt-dbus.m4 index 4ef0c82..3f9b306 100644 --- a/m4/virt-dbus.m4 +++ b/m4/virt-dbus.m4 @@ -1,6 +1,6 @@ dnl The libdbus.so library dnl -dnl Copyright (C) 2012-2013 Red Hat, Inc. +dnl Copyright (C) 2012-2014 Red Hat, Inc. dnl dnl This library is free software; you can redistribute it and/or dnl modify it under the terms of the GNU Lesser General Public @@ -26,6 +26,7 @@ AC_DEFUN([LIBVIRT_CHECK_DBUS],[ CFLAGS="$CFLAGS $DBUS_CFLAGS" LIBS="$LIBS $DBUS_LIBS" AC_CHECK_FUNCS([dbus_watch_get_unix_fd]) + AC_CHECK_TYPES([DBusBasicValue], [], [], [[#include <dbus/dbus.h>]]) CFLAGS="$old_CFLAGS" LIBS="$old_LIBS" fi diff --git a/src/util/virdbuspriv.h b/src/util/virdbuspriv.h index d45fb25..4247746 100644 --- a/src/util/virdbuspriv.h +++ b/src/util/virdbuspriv.h @@ -1,7 +1,7 @@ /* * virdbuspriv.h: internal APIs for testing DBus code * - * Copyright (C) 2012-2013 Red Hat, Inc. + * Copyright (C) 2012-2014 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,6 +24,21 @@ # include "virdbus.h" +# if !HAVE_DBUSBASICVALUE +/* Copied (and simplified) from dbus 1.6.12, for use with older dbus headers */ +typedef union +{ + dbus_int16_t i16; /**< as int16 */ + dbus_uint16_t u16; /**< as int16 */ + dbus_int32_t i32; /**< as int32 */ + dbus_uint32_t u32; /**< as int32 */ + dbus_bool_t bool_val; /**< as boolean */ + dbus_int64_t i64; /**< as int64 */ + dbus_uint64_t u64; /**< as int64 */ + double dbl; /**< as double */ + unsigned char byt; /**< as byte */ +} DBusBasicValue; +# endif int virDBusMessageEncodeArgs(DBusMessage* msg, const char *types, -- 1.9.3

1 0

[libvirt] [libvirt PATCH] rpc: do not fail if the pid of the connecting process is not set
by Giuseppe Scrivano 20 Nov '14

20 Nov '14

getsockopt(sock->fd, SOL_SOCKET, SO_PEERCRED, ...) sets the pid to 0 when the process that opens the connection is in another container. Signed-off-by: Giuseppe Scrivano <gscrivan(a)redhat.com> --- src/rpc/virnetsocket.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 882fbec..6b019cc 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -1251,10 +1251,14 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock, goto cleanup; } - if (virProcessGetStartTime(cr.pid, timestamp) < 0) + *timestamp = -1; + if (cr.pid && virProcessGetStartTime(cr.pid, timestamp) < 0) goto cleanup; - *pid = cr.pid; + if (cr.pid) + *pid = cr.pid; + else + *pid = -1; *uid = cr.uid; *gid = cr.gid; -- 1.9.3

2 2

[libvirt] [PATCH] util: don't log failure when older iptables lacks -w
by Eric Blake 20 Nov '14

20 Nov '14

Commit dc33e6e4 caused older platforms like Fedora 20 to emit scary log messages at startup: 2014-11-19 23:12:58.800+0000: 28906: error : virCommandWait:2532 : internal error: Child process (/usr/sbin/iptables -w -L -n) unexpected exit status 2: iptables v1.4.19.1: unknown option "-w" Try `iptables -h' or 'iptables --help' for more information. Since we are probing and expect to handle the case where -w is not supported, we should not let virCommand log it as an error. * src/util/virfirewall.c (virFirewallCheckUpdateLock): Handle non-zero status ourselves. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- src/util/virfirewall.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index e82fdc3..8496062 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -112,8 +112,9 @@ static void virFirewallCheckUpdateLock(bool *lockflag, const char *const*args) { + int status; /* Ignore failed commands without logging them */ virCommandPtr cmd = virCommandNewArgs(args); - if (virCommandRun(cmd, NULL) < 0) { + if (virCommandRun(cmd, &status) < 0 || status) { VIR_INFO("locking not supported by %s", args[0]); } else { VIR_INFO("using locking for %s", args[0]); -- 1.9.3

2 2

[libvirt] [PATCH] qemu: Really fix crash in tunnelled migration
by Jiri Denemark 20 Nov '14

20 Nov '14

Oops, I forgot to squash one more instance of the same check into the previous commit (v1.2.10-144-g52691f9). https://bugzilla.redhat.com/show_bug.cgi?id=1147331 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_migration.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 89313df..a1b1458 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2757,7 +2757,7 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, QEMU_ASYNC_JOB_MIGRATION_IN) < 0) goto stop; - if (STREQ(protocol, "rdma") && + if (STREQ_NULLABLE(protocol, "rdma") && virProcessSetMaxMemLock(vm->pid, vm->def->mem.hard_limit << 10) < 0) { goto stop; } -- 2.1.3

2 1

[libvirt] [PATCHv3] virsh: Fix msg: blockjob is aborted from another client
by Erik Skultety 20 Nov '14

20 Nov '14

When a block{pull, copy, commit} is aborted via keyboard interrupt, the job is properly canceled followed by proper error message. However, when the job receives an abort from another client connected to the same domain, the error message incorrectly indicates that a blockjob has been finished successfully, though the abort request took effect. This patch introduces a new blockjob abort handler, which is registered when the client calls block{copy,commit,pull} routine, providing its caller the status of the finished blockjob. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1135442 --- tools/virsh-domain.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 68 insertions(+), 3 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index a7e9151..0891821 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1709,6 +1709,17 @@ static void vshCatchInt(int sig ATTRIBUTE_UNUSED, intCaught = 1; } +static void +vshBlockJobStatusHandler(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom ATTRIBUTE_UNUSED, + const char *disk ATTRIBUTE_UNUSED, + int type ATTRIBUTE_UNUSED, + int status, + void *opaque) +{ + *(int *) opaque = status; +} + /* * "blockcommit" command */ @@ -1808,6 +1819,8 @@ cmdBlockCommit(vshControl *ctl, const vshCmd *cmd) const char *path = NULL; bool quit = false; int abort_flags = 0; + int status = -1; + int cb_id = -1; blocking |= vshCommandOptBool(cmd, "timeout") || pivot || finish; if (blocking) { @@ -1837,6 +1850,17 @@ cmdBlockCommit(vshControl *ctl, const vshCmd *cmd) return false; } + virConnectDomainEventGenericCallback cb = + VIR_DOMAIN_EVENT_CALLBACK(vshBlockJobStatusHandler); + + if ((cb_id = virConnectDomainEventRegisterAny(ctl->conn, + dom, + VIR_DOMAIN_EVENT_ID_BLOCK_JOB, + cb, + &status, + NULL)) < 0) + vshResetLibvirtError(); + if (!blockJobImpl(ctl, cmd, VSH_CMD_BLOCK_JOB_COMMIT, &dom)) goto cleanup; @@ -1878,7 +1902,7 @@ cmdBlockCommit(vshControl *ctl, const vshCmd *cmd) intCaught ? "interrupted" : "timeout"); intCaught = 0; timeout = 0; - quit = true; + status = VIR_DOMAIN_BLOCK_JOB_CANCELED; if (virDomainBlockJobAbort(dom, path, abort_flags) < 0) { vshError(ctl, _("failed to abort job for disk %s"), path); goto cleanup; @@ -1890,6 +1914,9 @@ cmdBlockCommit(vshControl *ctl, const vshCmd *cmd) } } + if (status == VIR_DOMAIN_BLOCK_JOB_CANCELED) + quit = true; + if (verbose && !quit) { /* printf [100 %] */ vshPrintJobProgress(_("Block Commit"), 0, 1); @@ -1920,6 +1947,8 @@ cmdBlockCommit(vshControl *ctl, const vshCmd *cmd) virDomainFree(dom); if (blocking) sigaction(SIGINT, &old_sig_action, NULL); + if (cb_id >= 0) + virConnectDomainEventDeregisterAny(ctl->conn, cb_id); return ret; } @@ -2043,6 +2072,8 @@ cmdBlockCopy(vshControl *ctl, const vshCmd *cmd) char *xmlstr = NULL; virTypedParameterPtr params = NULL; int nparams = 0; + int status = -1; + int cb_id = -1; if (vshCommandOptStringReq(ctl, cmd, "path", &path) < 0) return false; @@ -2083,6 +2114,17 @@ cmdBlockCopy(vshControl *ctl, const vshCmd *cmd) return false; } + virConnectDomainEventGenericCallback cb = + VIR_DOMAIN_EVENT_CALLBACK(vshBlockJobStatusHandler); + + if ((cb_id = virConnectDomainEventRegisterAny(ctl->conn, + dom, + VIR_DOMAIN_EVENT_ID_BLOCK_JOB, + cb, + &status, + NULL)) < 0) + vshResetLibvirtError(); + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) goto cleanup; @@ -2216,7 +2258,7 @@ cmdBlockCopy(vshControl *ctl, const vshCmd *cmd) intCaught ? "interrupted" : "timeout"); intCaught = 0; timeout = 0; - quit = true; + status = VIR_DOMAIN_BLOCK_JOB_CANCELED; if (virDomainBlockJobAbort(dom, path, abort_flags) < 0) { vshError(ctl, _("failed to abort job for disk %s"), path); goto cleanup; @@ -2228,6 +2270,9 @@ cmdBlockCopy(vshControl *ctl, const vshCmd *cmd) } } + if (status == VIR_DOMAIN_BLOCK_JOB_CANCELED) + quit = true; + if (!quit && pivot) { abort_flags |= VIR_DOMAIN_BLOCK_JOB_ABORT_PIVOT; if (virDomainBlockJobAbort(dom, path, abort_flags) < 0) { @@ -2256,6 +2301,8 @@ cmdBlockCopy(vshControl *ctl, const vshCmd *cmd) virDomainFree(dom); if (blocking) sigaction(SIGINT, &old_sig_action, NULL); + if (cb_id >= 0) + virConnectDomainEventDeregisterAny(ctl->conn, cb_id); return ret; } @@ -2513,6 +2560,8 @@ cmdBlockPull(vshControl *ctl, const vshCmd *cmd) const char *path = NULL; bool quit = false; int abort_flags = 0; + int status = -1; + int cb_id = -1; if (blocking) { if (vshCommandOptTimeoutToMs(ctl, cmd, &timeout) < 0) @@ -2538,6 +2587,17 @@ cmdBlockPull(vshControl *ctl, const vshCmd *cmd) return false; } + virConnectDomainEventGenericCallback cb = + VIR_DOMAIN_EVENT_CALLBACK(vshBlockJobStatusHandler); + + if ((cb_id = virConnectDomainEventRegisterAny(ctl->conn, + dom, + VIR_DOMAIN_EVENT_ID_BLOCK_JOB, + cb, + &status, + NULL)) < 0) + vshResetLibvirtError(); + if (!blockJobImpl(ctl, cmd, VSH_CMD_BLOCK_JOB_PULL, &dom)) goto cleanup; @@ -2574,7 +2634,7 @@ cmdBlockPull(vshControl *ctl, const vshCmd *cmd) intCaught ? "interrupted" : "timeout"); intCaught = 0; timeout = 0; - quit = true; + status = VIR_DOMAIN_BLOCK_JOB_CANCELED; if (virDomainBlockJobAbort(dom, path, abort_flags) < 0) { vshError(ctl, _("failed to abort job for disk %s"), path); goto cleanup; @@ -2586,6 +2646,9 @@ cmdBlockPull(vshControl *ctl, const vshCmd *cmd) } } + if (status == VIR_DOMAIN_BLOCK_JOB_CANCELED) + quit = true; + if (verbose && !quit) { /* printf [100 %] */ vshPrintJobProgress(_("Block Pull"), 0, 1); @@ -2598,6 +2661,8 @@ cmdBlockPull(vshControl *ctl, const vshCmd *cmd) virDomainFree(dom); if (blocking) sigaction(SIGINT, &old_sig_action, NULL); + if (cb_id >= 0) + virConnectDomainEventDeregisterAny(ctl->conn, cb_id); return ret; } -- 1.9.3

2 1

[libvirt] [PATCH] qemu: Fix crash in tunnelled migration
by Jiri Denemark 20 Nov '14

20 Nov '14

Any attempt to start a tunnelled migration with libvirtd that supports RDMA migration (specifically commit v1.2.8-226-ged22a47) crashes libvirtd on the destination host. The crash is inevitable because qemuMigrationPrepareAny is always called with NULL protocol in case of tunnelled migration. https://bugzilla.redhat.com/show_bug.cgi?id=1147331 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_migration.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 100600e..89313df 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2707,7 +2707,7 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, QEMU_MIGRATION_COOKIE_NBD))) goto cleanup; - if (STREQ(protocol, "rdma") && !vm->def->mem.hard_limit) { + if (STREQ_NULLABLE(protocol, "rdma") && !vm->def->mem.hard_limit) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("cannot start RDMA migration with no memory hard " "limit set")); -- 2.1.3

2 1

[libvirt] Libvirt Live Migration
by Dhia Abbassi 20 Nov '14

20 Nov '14

I'm trying to implement a virtualization API. I was testing migration with libvirt I got some problems. When I use the following command : *virsh migrate --live --persistent --copy-storage-all vm-clone1 qemu+ssh://server_ip/system* the migration works fine but in the destination host the migrated vm is paused and I can't unpause it and I need to reboot the vm to be able use it in the new host. When I try to unoause it Igot the following error message: << *Error unpausing domain: internal error: unable to execute QEMU command 'cont': Resetting the Virtual Machine is required *>> How can I solve this problem, or is there an other way to make a live migration with libvirt?? Thank you for you consideration. -- Best regards *Dhia Abbassi* Full Stack Engineer | Rosafi Holding <http://tn.linkedin.com/in/dhiaabbassi> <https://github.com/DhiaTN> <https://plus.google.com/u/0/+DhiaAbbassi> <https://twitter.com/DhiaTN>

1 0

[libvirt] [PATCH v4] leaseshelper: improvements to support all events
by Nehal J Wani 20 Nov '14

20 Nov '14

This patch enables the helper program to detect event(s) triggered when there is a change in lease length or expiry and client-id. This transfers complete control of leases database to libvirt and obsoletes use of the lease database file (<network-name>.leases). That file will not be created, read, or written. This is achieved by adding the option --leasefile-ro to dnsmasq and passing a custom env var to leaseshelper, which helps us map events related to leases with their corresponding network bridges, no matter what the event be. Also, this requires the addition of a new non-lease entry in our custom lease database: "server-duid". It is required to identify a DHCPv6 server. Now that dnsmasq doesn't maintain its own leases database, it relies on our helper program to tell it about previous leases and server duid. Thus, this patch makes our leases program honor an extra action: "init", in which it sends the known info in a particular format to dnsmasq by printing it to stdout. --- This is compatible with libvirt 1.2.6 as only additions have been introduced, and the old leases file (*.status) will still be supported. v4: * Removed extra data structures for segregating ipv4 and ipv6 leases. v3: * Add server-duid as an entry in the lease object for every ipv6 lease. * Remove unnecessary variables and double copies. * Take value from DNSMASQ_OLD_HOSTNAME if hostname is not known. http://www.redhat.com/archives/libvir-list/2014-August/msg00028.html v2: http://www.redhat.com/archives/libvir-list/2014-July/msg01109.html v1: https://www.redhat.com/archives/libvir-list/2014-July/msg00568.html --- src/network/bridge_driver.c | 3 + src/network/leaseshelper.c | 142 +++++++++++++++++++++++++++++++++++--------- 2 files changed, 117 insertions(+), 28 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 6cb421c..6ecbc37 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1280,7 +1280,10 @@ networkBuildDhcpDaemonCommandLine(virNetworkObjPtr network, cmd = virCommandNew(dnsmasqCapsGetBinaryPath(caps)); virCommandAddArgFormat(cmd, "--conf-file=%s", configfile); + /* Libvirt gains full control of leases database */ + virCommandAddArgFormat(cmd, "--leasefile-ro"); virCommandAddArgFormat(cmd, "--dhcp-script=%s", leaseshelper_path); + virCommandAddEnvPair(cmd, "VIR_BRIDGE_NAME", network->def->bridge); *cmdout = cmd; ret = 0; diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c index 5b3c9c3..fdd04a3 100644 --- a/src/network/leaseshelper.c +++ b/src/network/leaseshelper.c @@ -50,6 +50,12 @@ */ #define VIR_NETWORK_DHCP_LEASE_FILE_SIZE_MAX (32 * 1024 * 1024) +/* + * Use this when passing possibly-NULL strings to printf-a-likes. + * Required for unknown parameters during init call. + */ +#define EMPTY_STR(s) ((s) ? (s) : "*") + static const char *program_name; /* Display version information. */ @@ -65,7 +71,7 @@ usage(int status) if (status) { fprintf(stderr, _("%s: try --help for more details\n"), program_name); } else { - printf(_("Usage: %s add|old|del mac|clientid ip [hostname]\n" + printf(_("Usage: %s add|old|del|init mac|clientid ip [hostname]\n" "Designed for use with 'dnsmasq --dhcp-script'\n" "Refer to man page of dnsmasq for more details'\n"), program_name); @@ -89,6 +95,7 @@ enum virLeaseActionFlags { VIR_LEASE_ACTION_ADD, /* Create new lease */ VIR_LEASE_ACTION_OLD, /* Lease already exists, renew it */ VIR_LEASE_ACTION_DEL, /* Delete the lease */ + VIR_LEASE_ACTION_INIT, /* Tell dnsmasq of existing leases on restart */ VIR_LEASE_ACTION_LAST }; @@ -96,7 +103,7 @@ enum virLeaseActionFlags { VIR_ENUM_DECL(virLeaseAction); VIR_ENUM_IMPL(virLeaseAction, VIR_LEASE_ACTION_LAST, - "add", "old", "del"); + "add", "old", "del", "init"); int main(int argc, char **argv) @@ -107,12 +114,15 @@ main(int argc, char **argv) char *custom_lease_file = NULL; const char *ip = NULL; const char *mac = NULL; + const char *ip_tmp = NULL; + const char *leases_str = NULL; + const char *server_duid_tmp = NULL; const char *iaid = virGetEnvAllowSUID("DNSMASQ_IAID"); const char *clientid = virGetEnvAllowSUID("DNSMASQ_CLIENT_ID"); const char *interface = virGetEnvAllowSUID("DNSMASQ_INTERFACE"); const char *exptime_tmp = virGetEnvAllowSUID("DNSMASQ_LEASE_EXPIRES"); const char *hostname = virGetEnvAllowSUID("DNSMASQ_SUPPLIED_HOSTNAME"); - const char *leases_str = NULL; + const char *server_duid = virGetEnvAllowSUID("DNSMASQ_SERVER_DUID"); long long currtime = 0; long long expirytime = 0; size_t i = 0; @@ -120,7 +130,6 @@ main(int argc, char **argv) int pid_file_fd = -1; int rv = EXIT_FAILURE; int custom_lease_file_len = 0; - bool add = false; bool delete = false; virJSONValuePtr lease_new = NULL; virJSONValuePtr lease_tmp = NULL; @@ -156,16 +165,17 @@ main(int argc, char **argv) } } - if (argc != 4 && argc != 5) { + if (argc != 4 && argc != 5 && argc != 2) { /* Refer man page of dnsmasq --dhcp-script for more details */ usage(EXIT_FAILURE); } /* Make sure dnsmasq knows the interface. The interface name is not known - * when dnsmasq (re)starts and throws 'del' events for expired leases. - * So, if any old lease has expired, it will be automatically removed the - * next time this program is invoked */ - if (!interface) + * via env variable set by dnsmasq when dnsmasq (re)starts and throws 'del' + * events for expired leases. So, libvirtd sets another env var for this + * purpose */ + if (!interface && + !(interface = virGetEnvAllowSUID("VIR_BRIDGE_NAME"))) goto cleanup; ip = argv[3]; @@ -176,6 +186,10 @@ main(int argc, char **argv) if (argc == 5) hostname = argv[4]; + /* In case hostname is still unknown, use the last known one */ + if (!hostname) + hostname = virGetEnvAllowSUID("DNSMASQ_OLD_HOSTNAME"); + if (VIR_STRDUP(exptime, exptime_tmp) < 0) goto cleanup; @@ -184,7 +198,7 @@ main(int argc, char **argv) exptime[strlen(exptime) - 1] = '\0'; /* Check if it is an IPv6 lease */ - if (virGetEnvAllowSUID("DNSMASQ_IAID")) { + if (iaid) { mac = virGetEnvAllowSUID("DNSMASQ_MAC"); clientid = argv[2]; } @@ -234,7 +248,6 @@ main(int argc, char **argv) delete = true; if (action == VIR_LEASE_ACTION_ADD || action == VIR_LEASE_ACTION_OLD) { - add = true; /* Create new lease */ if (!(lease_new = virJSONValueNewObject())) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -259,11 +272,13 @@ main(int argc, char **argv) goto cleanup; if (clientid && virJSONValueObjectAppendString(lease_new, "client-id", clientid) < 0) goto cleanup; + if (server_duid && virJSONValueObjectAppendString(lease_new, "server-duid", server_duid) < 0) + goto cleanup; if (expirytime && virJSONValueObjectAppendNumberLong(lease_new, "expiry-time", expirytime) < 0) goto cleanup; } } - } else { + } else if (action != VIR_LEASE_ACTION_INIT) { fprintf(stderr, _("Unsupported action: %s\n"), virLeaseActionTypeToString(action)); exit(EXIT_FAILURE); @@ -292,8 +307,6 @@ main(int argc, char **argv) i = 0; while (i < virJSONValueArraySize(leases_array)) { - const char *ip_tmp = NULL; - long long expirytime_tmp = -1; if (!(lease_tmp = virJSONValueArrayGet(leases_array, i))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -302,14 +315,13 @@ main(int argc, char **argv) } if (!(ip_tmp = virJSONValueObjectGetString(lease_tmp, "ip-address")) || - (virJSONValueObjectGetNumberLong(lease_tmp, "expiry-time", &expirytime_tmp) < 0)) { + (virJSONValueObjectGetNumberLong(lease_tmp, "expiry-time", &expirytime) < 0)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to parse json")); goto cleanup; } - /* Check whether lease has expired or not */ - if (expirytime_tmp < currtime) { + if (expirytime < currtime) { i++; continue; } @@ -320,6 +332,25 @@ main(int argc, char **argv) continue; } + if (strchr(ip_tmp, ':')) { + /* This is an ipv6 lease */ + if ((server_duid_tmp + = virJSONValueObjectGetString(lease_tmp, "server-duid"))) { + if (!server_duid) { + /* Control reaches here when the 'action' is not for an + * ipv6 lease or, for some weird reason the env var + * DNSMASQ_SERVER_DUID wasn't set*/ + server_duid = server_duid_tmp; + } + } else { + /* Inject server-duid into those ipv6 leases which + * didn't have it previously, for example, those + * created by leaseshelper from libvirt 1.2.6 */ + if (virJSONValueObjectAppendString(lease_tmp, "server-duid", server_duid) < 0) + goto cleanup; + } + } + /* Move old lease to new array */ if (virJSONValueArrayAppend(leases_array_new, lease_tmp) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -332,25 +363,80 @@ main(int argc, char **argv) } } - if (add) { + switch ((enum virLeaseActionFlags) action) { + case VIR_LEASE_ACTION_INIT: + /* Man page of dnsmasq says: the script (helper program, in our case) + * should write the saved state of the lease database, in dnsmasq + * leasefile format, to stdout and exit with zero exit code, when + * called with argument init. Format: + * $expirytime $mac $ip $hostname $clientid # For all ipv4 leases + * duid $server-duid # If DHCPv6 is present + * $expirytime $iaid $ip $hostname $clientduid # For all ipv6 leases */ + + /* Traversing the ipv4 leases */ + for (i = 0; i < virJSONValueArraySize(leases_array_new); i++) { + lease_tmp = virJSONValueArrayGet(leases_array_new, i); + if (!(ip_tmp = virJSONValueObjectGetString(lease_tmp, "ip-address"))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to parse json")); + goto cleanup; + } + if (!strchr(ip_tmp, ':')) { + virJSONValueObjectGetNumberLong(lease_tmp, "expiry-time", &expirytime); + printf("%lld %s %s %s %s\n", + expirytime, + virJSONValueObjectGetString(lease_tmp, "mac-address"), + virJSONValueObjectGetString(lease_tmp, "ip-address"), + EMPTY_STR(virJSONValueObjectGetString(lease_tmp, "hostname")), + EMPTY_STR(virJSONValueObjectGetString(lease_tmp, "client-id"))); + } + } + + /* Traversing the ipv6 leases */ + if (server_duid) { + printf("duid %s\n", server_duid); + for (i = 0; i < virJSONValueArraySize(leases_array_new); i++) { + lease_tmp = virJSONValueArrayGet(leases_array_new, i); + if (!(ip_tmp = virJSONValueObjectGetString(lease_tmp, "ip-address"))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to parse json")); + goto cleanup; + } + if (strchr(ip_tmp, ':')) { + virJSONValueObjectGetNumberLong(lease_tmp, "expiry-time", &expirytime); + printf("%lld %s %s %s %s\n", + expirytime, + virJSONValueObjectGetString(lease_tmp, "iaid"), + virJSONValueObjectGetString(lease_tmp, "ip-address"), + EMPTY_STR(virJSONValueObjectGetString(lease_tmp, "hostname")), + EMPTY_STR(virJSONValueObjectGetString(lease_tmp, "client-id"))); + } + } + } + + break; + + case VIR_LEASE_ACTION_OLD: + case VIR_LEASE_ACTION_ADD: if (virJSONValueArrayAppend(leases_array_new, lease_new) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to create json")); goto cleanup; } lease_new = NULL; - } - if (!(leases_str = virJSONValueToString(leases_array_new, true))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("empty json array")); - goto cleanup; - } + default: + if (!(leases_str = virJSONValueToString(leases_array_new, true))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("empty json array")); + goto cleanup; + } - /* Write to file */ - if (virFileRewrite(custom_lease_file, 0644, - customLeaseRewriteFile, &leases_str) < 0) - goto cleanup; + /* Write to file */ + if (virFileRewrite(custom_lease_file, 0644, + customLeaseRewriteFile, &leases_str) < 0) + goto cleanup; + } rv = EXIT_SUCCESS; -- 1.9.3

3 4

[libvirt] [PATCHv2] virsh: Fix msg: blockjob is aborted from another client
by Erik Skultety 20 Nov '14

20 Nov '14

When a block{pull, copy, commit} is aborted via keyboard interrupt, the job is properly canceled followed by proper error message. However, when the job receives an abort from another client connected to the same domain, the error message incorrectly indicates that a blockjob has been finished successfully, though the abort request took effect. This patch introduces a new blockjob abort handler, which is registered when the client calls block{copy,commit,pull} routine, providing its caller the status of the finished blockjob. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1135442 --- tools/virsh-domain.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 62 insertions(+), 3 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index a7e9151..90960e9 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1709,6 +1709,17 @@ static void vshCatchInt(int sig ATTRIBUTE_UNUSED, intCaught = 1; } +static void +vshBlockJobStatusHandler(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom ATTRIBUTE_UNUSED, + const char *disk ATTRIBUTE_UNUSED, + int type ATTRIBUTE_UNUSED, + int status, + void *opaque) +{ + *(int *) opaque = status; +} + /* * "blockcommit" command */ @@ -1808,6 +1819,8 @@ cmdBlockCommit(vshControl *ctl, const vshCmd *cmd) const char *path = NULL; bool quit = false; int abort_flags = 0; + int status = -1; + int cb_id = -1; blocking |= vshCommandOptBool(cmd, "timeout") || pivot || finish; if (blocking) { @@ -1837,6 +1850,16 @@ cmdBlockCommit(vshControl *ctl, const vshCmd *cmd) return false; } + virConnectDomainEventGenericCallback cb = + VIR_DOMAIN_EVENT_CALLBACK(vshBlockJobStatusHandler); + + cb_id = virConnectDomainEventRegisterAny(ctl->conn, + dom, + VIR_DOMAIN_EVENT_ID_BLOCK_JOB, + cb, + &status, + NULL); + if (!blockJobImpl(ctl, cmd, VSH_CMD_BLOCK_JOB_COMMIT, &dom)) goto cleanup; @@ -1878,7 +1901,7 @@ cmdBlockCommit(vshControl *ctl, const vshCmd *cmd) intCaught ? "interrupted" : "timeout"); intCaught = 0; timeout = 0; - quit = true; + status = VIR_DOMAIN_BLOCK_JOB_CANCELED; if (virDomainBlockJobAbort(dom, path, abort_flags) < 0) { vshError(ctl, _("failed to abort job for disk %s"), path); goto cleanup; @@ -1890,6 +1913,9 @@ cmdBlockCommit(vshControl *ctl, const vshCmd *cmd) } } + if (status == VIR_DOMAIN_BLOCK_JOB_CANCELED) + quit = true; + if (verbose && !quit) { /* printf [100 %] */ vshPrintJobProgress(_("Block Commit"), 0, 1); @@ -1920,6 +1946,7 @@ cmdBlockCommit(vshControl *ctl, const vshCmd *cmd) virDomainFree(dom); if (blocking) sigaction(SIGINT, &old_sig_action, NULL); + virConnectDomainEventDeregisterAny(ctl->conn, cb_id); return ret; } @@ -2043,6 +2070,8 @@ cmdBlockCopy(vshControl *ctl, const vshCmd *cmd) char *xmlstr = NULL; virTypedParameterPtr params = NULL; int nparams = 0; + int status = -1; + int cb_id = -1; if (vshCommandOptStringReq(ctl, cmd, "path", &path) < 0) return false; @@ -2083,6 +2112,16 @@ cmdBlockCopy(vshControl *ctl, const vshCmd *cmd) return false; } + virConnectDomainEventGenericCallback cb = + VIR_DOMAIN_EVENT_CALLBACK(vshBlockJobStatusHandler); + + cb_id = virConnectDomainEventRegisterAny(ctl->conn, + dom, + VIR_DOMAIN_EVENT_ID_BLOCK_JOB, + cb, + &status, + NULL); + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) goto cleanup; @@ -2216,7 +2255,7 @@ cmdBlockCopy(vshControl *ctl, const vshCmd *cmd) intCaught ? "interrupted" : "timeout"); intCaught = 0; timeout = 0; - quit = true; + status = VIR_DOMAIN_BLOCK_JOB_CANCELED; if (virDomainBlockJobAbort(dom, path, abort_flags) < 0) { vshError(ctl, _("failed to abort job for disk %s"), path); goto cleanup; @@ -2228,6 +2267,9 @@ cmdBlockCopy(vshControl *ctl, const vshCmd *cmd) } } + if (status == VIR_DOMAIN_BLOCK_JOB_CANCELED) + quit = true; + if (!quit && pivot) { abort_flags |= VIR_DOMAIN_BLOCK_JOB_ABORT_PIVOT; if (virDomainBlockJobAbort(dom, path, abort_flags) < 0) { @@ -2256,6 +2298,7 @@ cmdBlockCopy(vshControl *ctl, const vshCmd *cmd) virDomainFree(dom); if (blocking) sigaction(SIGINT, &old_sig_action, NULL); + virConnectDomainEventDeregisterAny(ctl->conn, cb_id); return ret; } @@ -2513,6 +2556,8 @@ cmdBlockPull(vshControl *ctl, const vshCmd *cmd) const char *path = NULL; bool quit = false; int abort_flags = 0; + int status = -1; + int cb_id = -1; if (blocking) { if (vshCommandOptTimeoutToMs(ctl, cmd, &timeout) < 0) @@ -2538,6 +2583,16 @@ cmdBlockPull(vshControl *ctl, const vshCmd *cmd) return false; } + virConnectDomainEventGenericCallback cb = + VIR_DOMAIN_EVENT_CALLBACK(vshBlockJobStatusHandler); + + cb_id = virConnectDomainEventRegisterAny(ctl->conn, + dom, + VIR_DOMAIN_EVENT_ID_BLOCK_JOB, + cb, + &status, + NULL); + if (!blockJobImpl(ctl, cmd, VSH_CMD_BLOCK_JOB_PULL, &dom)) goto cleanup; @@ -2574,7 +2629,7 @@ cmdBlockPull(vshControl *ctl, const vshCmd *cmd) intCaught ? "interrupted" : "timeout"); intCaught = 0; timeout = 0; - quit = true; + status = VIR_DOMAIN_BLOCK_JOB_CANCELED; if (virDomainBlockJobAbort(dom, path, abort_flags) < 0) { vshError(ctl, _("failed to abort job for disk %s"), path); goto cleanup; @@ -2586,6 +2641,9 @@ cmdBlockPull(vshControl *ctl, const vshCmd *cmd) } } + if (status == VIR_DOMAIN_BLOCK_JOB_CANCELED) + quit = true; + if (verbose && !quit) { /* printf [100 %] */ vshPrintJobProgress(_("Block Pull"), 0, 1); @@ -2598,6 +2656,7 @@ cmdBlockPull(vshControl *ctl, const vshCmd *cmd) virDomainFree(dom); if (blocking) sigaction(SIGINT, &old_sig_action, NULL); + virConnectDomainEventDeregisterAny(ctl->conn, cb_id); return ret; } -- 1.9.3

2 1

[libvirt] [PATCH] maint: use portable shell
by Eric Blake 20 Nov '14

20 Nov '14

Reported in https://bugzilla.redhat.com/show_bug.cgi?id=1165827; dash complains: checking for pkcheck... /usr/bin/pkcheck checking whether pkcheck supports uid value... yes ./configure: 63906: test: xno: unexpected operator checking for dtrace... no Broken in commit bf15638 (v0.10.0) * configure.ac: Use '=' not '==' in test. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 5a670eb..9fd44b2 100644 --- a/configure.ac +++ b/configure.ac @@ -1389,7 +1389,7 @@ AC_ARG_WITH([firewalld], if test "x$with_firewalld" = "xcheck" ; then with_firewalld=$with_dbus fi -if test "x$with_firewalld" == "xyes" ; then +if test "x$with_firewalld" = "xyes" ; then if test "x$with_dbus" != "xyes" ; then AC_MSG_ERROR([You must have dbus enabled for firewalld support]) fi -- 1.9.3

1 0

[libvirt] [libvirt-glib] Add gvir_domain_open_graphics_fd()
by Zeeshan Ali (Khattak) 20 Nov '14

20 Nov '14

Add binding for virDomainOpenGraphicsFD. --- libvirt-gobject/libvirt-gobject-domain.c | 36 ++++++++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-domain.h | 4 ++++ libvirt-gobject/libvirt-gobject.sym | 5 +++++ 3 files changed, 45 insertions(+) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 8df30d7..9c1aa6e 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -1222,6 +1222,42 @@ cleanup: } /** + * gvir_domain_open_graphics_fd: + * @dom: the domain + * @idx: the graphics index + * @flags: extra flags, currently unused + * + * This will create a socket pair connected to the graphics backend of @dom. One + * end of the socket will be returned on success, and the other end is handed to + * the hypervisor. If @dom has multiple graphics backends configured, then @idx + * will determine which one is opened, starting from @idx 0. + * + * Returns: An fd on success, -1 on failure. + */ +int gvir_domain_open_graphics_fd(GVirDomain *dom, + guint idx, + unsigned int flags, + GError **err) +{ + GVirDomainPrivate *priv; + int ret = -1; + + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), -1); + g_return_val_if_fail(err == NULL || *err == NULL, -1); + + priv = dom->priv; + + ret = virDomainOpenGraphicsFD(priv->handle, idx, flags); + if (ret <= 0) { + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Unable to open graphics"); + } + + return ret; +} + +/** * gvir_domain_suspend: * @dom: the domain to suspend * @err: Place-holder for possible errors diff --git a/libvirt-gobject/libvirt-gobject-domain.h b/libvirt-gobject/libvirt-gobject-domain.h index 47ed784..4fe381e 100644 --- a/libvirt-gobject/libvirt-gobject-domain.h +++ b/libvirt-gobject/libvirt-gobject-domain.h @@ -332,6 +332,10 @@ gboolean gvir_domain_open_graphics(GVirDomain *dom, int fd, unsigned int flags, GError **err); +int gvir_domain_open_graphics_fd(GVirDomain *dom, + guint idx, + unsigned int flags, + GError **err); gboolean gvir_domain_suspend (GVirDomain *dom, GError **err); diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index d18769b..927cad9 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -260,4 +260,9 @@ LIBVIRT_GOBJECT_0.1.9 { gvir_stream_io_condition_get_type; } LIBVIRT_GOBJECT_0.1.5; +LIBVIRT_GOBJECT_0.2.0 { + global: + gvir_domain_open_graphics_fd; +} LIBVIRT_GOBJECT_0.1.9; + # .... define new API here using predicted next version number .... -- 2.1.0

4 11

[libvirt] [PATCH] qemu: Support OVMF on aarch64 guests
by Michal Privoznik 20 Nov '14

20 Nov '14

Currently, we are whitelisting architectures, that we know how to run OVMF on. So far, only x86_64 was enabled. However, looking at qemu code, the same commandline can be used to enable OVMF for aarch64. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_command.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d2e6991..ca57e35 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7749,7 +7749,8 @@ qemuBuildDomainLoaderCommandLine(virCommandPtr cmd, case VIR_DOMAIN_LOADER_TYPE_PFLASH: /* UEFI is supported only for x86_64 currently */ - if (def->os.arch != VIR_ARCH_X86_64) { + if (def->os.arch != VIR_ARCH_X86_64 && + def->os.arch != VIR_ARCH_AARCH64) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("pflash is not supported for %s guest architecture"), virArchToString(def->os.arch)); -- 2.0.4

4 16

[libvirt] [PATCH v2 0/7] optionally expose disk usage during dumpxml
by Eric Blake 19 Nov '14

19 Nov '14

v1 was here: https://www.redhat.com/archives/libvir-list/2014-September/msg01077.html This adds the framework for exposing disk of all disks from a single dumpxml command. I'm still working on a followup patch to further list usage of disks in the backing chain, rather than just the top-level disk, but want to get review started on this code. Eric Blake (7): dumpxml: add flag to virDomainGetXMLDesc qemu: refactor dumpxml job handling qemu: refactor blockinfo job handling dumpxml: let blockinfo reuse virStorageSource qemu: refactor blockinfo data gathering dumpxml: query disk limits as needed for qemu dumpxml: add output of block info docs/schemas/domaincommon.rng | 22 +++ include/libvirt/libvirt-domain.h | 1 + src/conf/domain_conf.c | 16 +- src/libvirt-domain-snapshot.c | 5 +- src/libvirt-domain.c | 10 +- src/qemu/qemu_driver.c | 397 ++++++++++++++++++++++----------------- src/util/virstoragefile.h | 3 +- tools/virsh-domain.c | 6 + tools/virsh.pod | 6 +- 9 files changed, 284 insertions(+), 182 deletions(-) -- 1.9.3

3 16

[libvirt] [PATCH] storage: wrap storage_driver.c to 80 columns
by Chen Hanxiao 19 Nov '14

19 Nov '14

Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/storage/storage_driver.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index fe6059a..d5485e7 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -174,8 +174,9 @@ storageStateInitialize(bool privileged, } driver->privileged = privileged; - /* Configuration paths are either $USER_CONFIG_HOME/libvirt/storage/... (session) or - * /etc/libvirt/storage/... (system). + /* + * Configuration paths are either $USER_CONFIG_HOME/libvirt/storage/... + * (session) or /etc/libvirt/storage/... (system). */ if (virAsprintf(&driver->configDir, "%s/storage", base) == -1) @@ -338,7 +339,8 @@ storagePoolLookupByVolume(virStorageVolPtr vol) if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - _("no storage pool with matching name '%s'"), vol->pool); + _("no storage pool with matching name '%s'"), + vol->pool); return NULL; } @@ -732,7 +734,9 @@ storagePoolUndefine(virStoragePoolPtr obj) if (virStoragePoolObjDeleteDef(pool) < 0) goto cleanup; - if (unlink(pool->autostartLink) < 0 && errno != ENOENT && errno != ENOTDIR) { + if (unlink(pool->autostartLink) < 0 && + errno != ENOENT && + errno != ENOTDIR) { char ebuf[1024]; VIR_ERROR(_("Failed to delete autostart link '%s': %s"), pool->autostartLink, virStrerror(errno, ebuf, sizeof(ebuf))); @@ -1344,13 +1348,14 @@ storageVolLookupByKey(virConnectPtr conn, virStorageVolDefFindByKey(driver->pools.objs[i], key); if (vol) { - if (virStorageVolLookupByKeyEnsureACL(conn, driver->pools.objs[i]->def, vol) < 0) { + virStoragePoolDefPtr def = driver->pools.objs[i]->def; + if (virStorageVolLookupByKeyEnsureACL(conn, def, vol) < 0) { virStoragePoolObjUnlock(driver->pools.objs[i]); goto cleanup; } ret = virGetStorageVol(conn, - driver->pools.objs[i]->def->name, + def->name, vol->name, vol->key, NULL, NULL); @@ -1774,7 +1779,8 @@ storageVolCreateXMLFrom(virStoragePoolPtr obj, if ((backend = virStorageBackendForType(pool->def->type)) == NULL) goto cleanup; - origvol = virStorageVolDefFindByName(origpool ? origpool : pool, vobj->name); + origvol = virStorageVolDefFindByName(origpool ? + origpool : pool, vobj->name); if (!origvol) { virReportError(VIR_ERR_NO_STORAGE_VOL, _("no storage vol with matching name '%s'"), @@ -1807,7 +1813,8 @@ storageVolCreateXMLFrom(virStoragePoolPtr obj, if (!backend->buildVolFrom) { virReportError(VIR_ERR_NO_SUPPORT, - "%s", _("storage pool does not support volume creation from an existing volume")); + "%s", _("storage pool does not support" + " volume creation from an existing volume")); goto cleanup; } @@ -2333,7 +2340,8 @@ storageConnectListAllStoragePools(virConnectPtr conn, storageDriverLock(); ret = virStoragePoolObjListExport(conn, driver->pools, pools, - virConnectListAllStoragePoolsCheckACL, flags); + virConnectListAllStoragePoolsCheckACL, + flags); storageDriverUnlock(); cleanup: @@ -2642,7 +2650,8 @@ virStorageFileStat(virStorageSourcePtr src, * @buf: buffer to read the data into. buffer shall be freed by caller) * * Returns the count of bytes read on success and -1 on failure, -2 if the - * function isn't supported by the backend. Libvirt error is reported on failure. + * function isn't supported by the backend. + * Libvirt error is reported on failure. */ ssize_t virStorageFileReadHeader(virStorageSourcePtr src, @@ -2898,7 +2907,8 @@ virStorageFileGetMetadata(virStorageSourcePtr src, return -1; if (src->format <= VIR_STORAGE_FILE_NONE) - src->format = allow_probe ? VIR_STORAGE_FILE_AUTO : VIR_STORAGE_FILE_RAW; + src->format = allow_probe ? + VIR_STORAGE_FILE_AUTO : VIR_STORAGE_FILE_RAW; ret = virStorageFileGetMetadataRecurse(src, src, uid, gid, allow_probe, report_broken, cycle); @@ -3113,7 +3123,8 @@ virStorageTranslateDiskSourcePool(virConnectPtr conn, def->src->srcpool->actualtype = VIR_STORAGE_TYPE_NETWORK; def->src->protocol = VIR_STORAGE_NET_PROTOCOL_ISCSI; - if (virStorageTranslateDiskSourcePoolAuth(def, &pooldef->source) < 0) + if (virStorageTranslateDiskSourcePoolAuth(def, + &pooldef->source) < 0) goto cleanup; if (virStorageAddISCSIPoolSourceHost(def, pooldef) < 0) -- 1.9.3

2 1

[libvirt] [PATCH] vbox: fix a bug in _machineStateInactive
by Yohan BELLEGUIC 19 Nov '14

19 Nov '14

This function returned non-inactive domains instead of active domains. This broke virConnectNumOfDefinedDomains() and virConnectListDefinedDomains() functions. --- src/vbox/vbox_tmpl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index de8744d..37ec8e1 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -4607,8 +4607,8 @@ static bool _machineStateOnline(PRUint32 state) static bool _machineStateInactive(PRUint32 state) { - return ((state > MachineState_FirstOnline) && - (state < MachineState_LastOnline)); + return ((state < MachineState_FirstOnline) || + (state > MachineState_LastOnline)); } static bool _machineStateNotStart(PRUint32 state) -- 1.7.10.4

2 1

[libvirt] [PATCH] docs: Document NVRAM behavior on transient domains
by Michal Privoznik 19 Nov '14

19 Nov '14

Since 1.2.8 it's possible to use OVMF on domains. Moreover, it's possible to have libvirt create NVRAM file per domain. Later, when domain is undefined, the file is removed too. However, things are a bit complicated when domain's transient. There's no undefine to transient domains. There are two options: 1) leave the file behind and let mgmt app remove it. 2) remove it automatically as domain dies. But, in some scenarios mgmt app may want to preserve the file, copy it somewhere safe, and then copy it back when the domain is starting again. And this wouldn't be possible with case 2). So, even though case 1) leaves some files behind (possibly undeleted for a long time), the files themselves are small (128K each). And data loss is worse than full disk, isn't it? Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/formatdomain.html.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index d4189e6..705d497 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -147,7 +147,10 @@ started up libvirt copies so called master NVRAM store file defined in <code>qemu.conf</code>. If needed, the <code>template</code> attribute can be used to per domain override map of master NVRAM stores - from the config file. Since 1.2.8</dd> + from the config file. Note, that for transient domains if the NVRAM file + has been created by libvirt it is left behind and it management + application's responsibility to save and remove file (if needed to be + persistent). Since 1.2.8</dd> <dt><code>boot</code></dt> <dd>The <code>dev</code> attribute takes one of the values "fd", "hd", "cdrom" or "network" and is used to specify the next boot device -- 2.0.4

2 2

[libvirt] [PATCH v5] network: Add network bandwidth support to ethernet interfaces
by Anirban Chakraborty 19 Nov '14

19 Nov '14

>From 7db513698bfcc30d2d0b020c3fcf9e0337c66ff4 Mon Sep 17 00:00:00 2001 From: Anirban Chakraborty <abchak(a)juniper.net> Date: Wed, 12 Nov 2014 14:24:43 -0800 Subject: [PATCH] network: Add network bandwidth support to ethernet interfaces Ethernet interfaces in libvirt currently do not support bandwidth setting. For example, following xml file for an interface will not apply these settings to corresponding qdiscs. <interface type="ethernet"> <mac address="02:36:1d:18:2a:e4"/> <model type="virtio"/> <script path=""/> <target dev="tap361d182a-e4"/> <bandwidth> <inbound average="984" peak="1024" burst="64"/> <outbound average="2000" peak="2048" burst="128"/> </bandwidth> </interface> Signed-off-by: Anirban Chakraborty <abchak(a)juniper.net> --- src/conf/netdev_bandwidth_conf.c | 14 ++++++++++- src/conf/netdev_bandwidth_conf.h | 25 +++++++++++++++++++ src/libvirt_private.syms | 1 + src/lxc/lxc_driver.c | 8 +++++++ src/lxc/lxc_process.c | 52 +++++++++++++++++++++++----------------- src/qemu/qemu_command.c | 16 ++++++++----- src/qemu/qemu_hotplug.c | 12 ++++++++++ src/qemu/qemu_process.c | 4 ++++ src/util/virnetdevmacvlan.c | 10 -------- src/util/virnetdevmacvlan.h | 1 - 10 files changed, 104 insertions(+), 41 deletions(-) diff --git a/src/conf/netdev_bandwidth_conf.c b/src/conf/netdev_bandwidth_conf.c index 2e5b564..63a39e3 100644 --- a/src/conf/netdev_bandwidth_conf.c +++ b/src/conf/netdev_bandwidth_conf.c @@ -25,7 +25,6 @@ #include "netdev_bandwidth_conf.h" #include "virerror.h" #include "viralloc.h" -#include "domain_conf.h" #include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NONE @@ -269,3 +268,16 @@ virNetDevBandwidthFormat(virNetDevBandwidthPtr def, virBufferPtr buf) cleanup: return ret; } + +void +virDomainClearNetBandwidth(virDomainObjPtr vm) +{ + size_t i; + virDomainNetType type; + + for (i = 0; i < vm->def->nnets; i++) { + type = virDomainNetGetActualType(vm->def->nets[i]); + if (virNetDevSupportBandwidth(type)) + virNetDevBandwidthClear(vm->def->nets[i]->ifname); + } +} diff --git a/src/conf/netdev_bandwidth_conf.h b/src/conf/netdev_bandwidth_conf.h index 23aaaf3..60dacc6 100644 --- a/src/conf/netdev_bandwidth_conf.h +++ b/src/conf/netdev_bandwidth_conf.h @@ -27,6 +27,7 @@ # include "virnetdevbandwidth.h" # include "virbuffer.h" # include "virxml.h" +# include "domain_conf.h" virNetDevBandwidthPtr virNetDevBandwidthParse(xmlNodePtr node, int net_type) @@ -35,4 +36,28 @@ int virNetDevBandwidthFormat(virNetDevBandwidthPtr def, virBufferPtr buf) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); +void virDomainClearNetBandwidth(virDomainObjPtr vm) + ATTRIBUTE_NONNULL(1); + +static inline bool virNetDevSupportBandwidth(virDomainNetType type) +{ + switch (type) { + case VIR_DOMAIN_NET_TYPE_BRIDGE: + case VIR_DOMAIN_NET_TYPE_NETWORK: + case VIR_DOMAIN_NET_TYPE_DIRECT: + case VIR_DOMAIN_NET_TYPE_ETHERNET: + return true; + case VIR_DOMAIN_NET_TYPE_USER: + case VIR_DOMAIN_NET_TYPE_VHOSTUSER: + case VIR_DOMAIN_NET_TYPE_SERVER: + case VIR_DOMAIN_NET_TYPE_CLIENT: + case VIR_DOMAIN_NET_TYPE_MCAST: + case VIR_DOMAIN_NET_TYPE_INTERNAL: + case VIR_DOMAIN_NET_TYPE_HOSTDEV: + case VIR_DOMAIN_NET_TYPE_LAST: + break; + } + return false; +} + #endif /* __VIR_NETDEV_BANDWIDTH_CONF_H__ */ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 0864618..1c0cfb1 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -509,6 +509,7 @@ virInterfaceRemove; # conf/netdev_bandwidth_conf.h virNetDevBandwidthFormat; virNetDevBandwidthParse; +virDomainClearNetBandwidth; # conf/netdev_vlan_conf.h diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 6a58d50..e418f8e 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -72,6 +72,7 @@ #include "viraccessapicheck.h" #include "viraccessapichecklxc.h" #include "virhostdev.h" +#include "netdev_bandwidth_conf.h" #define VIR_FROM_THIS VIR_FROM_LXC @@ -4212,6 +4213,11 @@ lxcDomainAttachDeviceNetLive(virConnectPtr conn, _("Network device type is not supported")); goto cleanup; } + /* set network bandwidth */ + if (virNetDevSupportBandwidth(actualType) && + virNetDevBandwidthSet(net->ifname, + virDomainNetGetActualBandwidth(net), false) < 0) + goto cleanup; if (virNetDevSetNamespace(veth, priv->initpid) < 0) { virDomainAuditNet(vm, NULL, net, "attach", false); @@ -4643,6 +4649,8 @@ lxcDomainDetachDeviceNetLive(virDomainObjPtr vm, detach = vm->def->nets[detachidx]; + virDomainClearNetBandwidth(vm); + switch (virDomainNetGetActualType(detach)) { case VIR_DOMAIN_NET_TYPE_BRIDGE: case VIR_DOMAIN_NET_TYPE_NETWORK: diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 6c83fdb..77069b9 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -51,6 +51,7 @@ #include "viratomic.h" #include "virprocess.h" #include "virsystemd.h" +#include "netdev_bandwidth_conf.h" #define VIR_FROM_THIS VIR_FROM_LXC @@ -274,11 +275,6 @@ char *virLXCProcessSetupInterfaceBridged(virConnectPtr conn, if (virNetDevSetOnline(parentVeth, true) < 0) goto cleanup; - if (virNetDevBandwidthSet(net->ifname, - virDomainNetGetActualBandwidth(net), - false) < 0) - goto cleanup; - if (net->filter && virDomainConfNWFilterInstantiate(conn, vm->uuid, net) < 0) goto cleanup; @@ -300,6 +296,7 @@ char *virLXCProcessSetupInterfaceDirect(virConnectPtr conn, virNetDevBandwidthPtr bw; virNetDevVPortProfilePtr prof; virLXCDriverConfigPtr cfg = virLXCDriverGetConfig(driver); + const char *linkdev = virDomainNetGetActualDirectDev(net); /* XXX how todo bandwidth controls ? * Since the 'net-ifname' is about to be moved to a different @@ -329,14 +326,13 @@ char *virLXCProcessSetupInterfaceDirect(virConnectPtr conn, if (virNetDevMacVLanCreateWithVPortProfile( net->ifname, &net->mac, - virDomainNetGetActualDirectDev(net), + linkdev, virDomainNetGetActualDirectMode(net), false, def->uuid, - virDomainNetGetActualVirtPortProfile(net), + prof, &res_ifname, VIR_NETDEV_VPORT_PROFILE_OP_CREATE, - cfg->stateDir, - virDomainNetGetActualBandwidth(net), 0) < 0) + cfg->stateDir, 0) < 0) goto cleanup; ret = res_ifname; @@ -368,6 +364,8 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn, int ret = -1; size_t i; size_t niface = 0; + virDomainNetDefPtr net; + virDomainNetType type; for (i = 0; i < def->nnets; i++) { char *veth = NULL; @@ -375,13 +373,15 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn, * network's pool of devices, or resolve bridge device name * to the one defined in the network definition. */ - if (networkAllocateActualDevice(def, def->nets[i]) < 0) + net = def->nets[i]; + if (networkAllocateActualDevice(def, net) < 0) goto cleanup; if (VIR_EXPAND_N(*veths, *nveths, 1) < 0) goto cleanup; - switch (virDomainNetGetActualType(def->nets[i])) { + type = virDomainNetGetActualType(net); + switch (type) { case VIR_DOMAIN_NET_TYPE_NETWORK: { virNetworkPtr network; char *brname = NULL; @@ -389,7 +389,7 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn, virErrorPtr errobj; if (!(network = virNetworkLookupByName(conn, - def->nets[i]->data.network.name))) + net->data.network.name))) goto cleanup; if (!(brname = virNetworkGetBridgeName(network))) fail = true; @@ -405,7 +405,7 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn, if (!(veth = virLXCProcessSetupInterfaceBridged(conn, def, - def->nets[i], + net, brname))) { VIR_FREE(brname); goto cleanup; @@ -414,7 +414,7 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn, break; } case VIR_DOMAIN_NET_TYPE_BRIDGE: { - const char *brname = virDomainNetGetActualBridgeName(def->nets[i]); + const char *brname = virDomainNetGetActualBridgeName(net); if (!brname) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("No bridge name specified")); @@ -422,7 +422,7 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn, } if (!(veth = virLXCProcessSetupInterfaceBridged(conn, def, - def->nets[i], + net, brname))) goto cleanup; } break; @@ -430,31 +430,39 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn, case VIR_DOMAIN_NET_TYPE_DIRECT: if (!(veth = virLXCProcessSetupInterfaceDirect(conn, def, - def->nets[i]))) + net))) goto cleanup; break; - case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_ETHERNET: + break; + + case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_VHOSTUSER: case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: case VIR_DOMAIN_NET_TYPE_MCAST: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_LAST: + case VIR_DOMAIN_NET_TYPE_HOSTDEV: virReportError(VIR_ERR_INTERNAL_ERROR, _("Unsupported network type %s"), - virDomainNetTypeToString( - virDomainNetGetActualType(def->nets[i]) - )); + virDomainNetTypeToString(type)); goto cleanup; + } + /* set network bandwidth */ + if (virNetDevSupportBandwidth(type) && + virNetDevBandwidthSet(net->ifname, + virDomainNetGetActualBandwidth(net), false) < 0) + goto cleanup; + (*veths)[(*nveths)-1] = veth; /* Make sure all net definitions will have a name in the container */ - if (!def->nets[i]->ifname_guest) { - if (virAsprintf(&def->nets[i]->ifname_guest, "eth%zu", niface) < 0) + if (!net->ifname_guest) { + if (virAsprintf(&net->ifname_guest, "eth%zu", niface) < 0) return -1; niface++; } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f674ba9..146f2e2 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -43,6 +43,7 @@ #include "domain_addr.h" #include "domain_audit.h" #include "domain_conf.h" +#include "netdev_bandwidth_conf.h" #include "snapshot_conf.h" #include "storage_conf.h" #include "secret_conf.h" @@ -192,7 +193,6 @@ qemuPhysIfaceConnect(virDomainDefPtr def, virDomainNetGetActualVirtPortProfile(net), &res_ifname, vmop, cfg->stateDir, - virDomainNetGetActualBandwidth(net), macvlan_create_flags); if (rc >= 0) { virDomainAuditNetDevice(def, net, res_ifname, true); @@ -372,11 +372,6 @@ qemuNetworkIfaceConnect(virDomainDefPtr def, &net->mac) < 0) goto cleanup; - if (virNetDevBandwidthSet(net->ifname, - virDomainNetGetActualBandwidth(net), - false) < 0) - goto cleanup; - if (net->filter && virDomainConfNWFilterInstantiate(conn, def->uuid, net) < 0) { goto cleanup; @@ -7499,6 +7494,15 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, goto cleanup; } + /* Set Bandwidth */ + if (net->ifname && strlen(net->ifname)) { + if (virNetDevSupportBandwidth(actualType) && + virNetDevBandwidthSet(net->ifname, + virDomainNetGetActualBandwidth(net), + false) < 0) + goto cleanup; + } + if ((actualType == VIR_DOMAIN_NET_TYPE_NETWORK || actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || actualType == VIR_DOMAIN_NET_TYPE_ETHERNET || diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 13bcd88..d17d860 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -31,6 +31,7 @@ #include "qemu_command.h" #include "qemu_hostdev.h" #include "domain_audit.h" +#include "netdev_bandwidth_conf.h" #include "domain_nwfilter.h" #include "virlog.h" #include "datatypes.h" @@ -948,6 +949,12 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, goto cleanup; } + /* Set Bandwidth */ + if (virNetDevSupportBandwidth(actualType) && + virNetDevBandwidthSet(net->ifname, + virDomainNetGetActualBandwidth(net), false) < 0) + goto cleanup; + for (i = 0; i < tapfdSize; i++) { if (virSecurityManagerSetTapFDLabel(driver->securityManager, vm->def, tapfd[i]) < 0) @@ -3547,6 +3554,11 @@ qemuDomainDetachNetDevice(virQEMUDriverPtr driver, goto cleanup; } + if (virNetDevSupportBandwidth(virDomainNetGetActualType(detach)) && + virNetDevBandwidthClear(detach->ifname) < 0) + VIR_WARN("cannot clear bandwidth setting for device : %s", + detach->ifname); + qemuDomainMarkDeviceForRemoval(vm, &detach->info); qemuDomainObjEnterMonitor(driver, vm); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 24e5f0f..9c1a417 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -68,6 +68,7 @@ #include "virhostdev.h" #include "storage/storage_driver.h" #include "configmake.h" +#include "netdev_bandwidth_conf.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -4842,6 +4843,9 @@ void qemuProcessStop(virQEMUDriverPtr driver, virStrerror(errno, ebuf, sizeof(ebuf))); } + /* Clear network bandwidth */ + virDomainClearNetBandwidth(vm); + virDomainConfVMNWFilterTeardown(vm); if (cfg->macFilter) { diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index c83341c..956a96b 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -811,7 +811,6 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *tgifname, char **res_ifname, virNetDevVPortProfileOp vmOp, char *stateDir, - virNetDevBandwidthPtr bandwidth, unsigned int flags) { const char *type = (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) ? @@ -925,14 +924,6 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *tgifname, rc = 0; } - if (virNetDevBandwidthSet(cr_ifname, bandwidth, false) < 0) { - if (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) - VIR_FORCE_CLOSE(rc); /* sets rc to -1 */ - else - rc = -1; - goto disassociate_exit; - } - if (vmOp == VIR_NETDEV_VPORT_PROFILE_OP_CREATE || vmOp == VIR_NETDEV_VPORT_PROFILE_OP_RESTORE) { /* Only directly register upon a create or restore (restarting @@ -1076,7 +1067,6 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *ifname ATTRIBUTE_UNUSED, char **res_ifname ATTRIBUTE_UNUSED, virNetDevVPortProfileOp vmop ATTRIBUTE_UNUSED, char *stateDir ATTRIBUTE_UNUSED, - virNetDevBandwidthPtr bandwidth ATTRIBUTE_UNUSED, unsigned int flags) { virCheckFlags(0, -1); diff --git a/src/util/virnetdevmacvlan.h b/src/util/virnetdevmacvlan.h index 41aa4e2..f08d32b 100644 --- a/src/util/virnetdevmacvlan.h +++ b/src/util/virnetdevmacvlan.h @@ -68,7 +68,6 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *ifname, char **res_ifname, virNetDevVPortProfileOp vmop, char *stateDir, - virNetDevBandwidthPtr bandwidth, unsigned int flags) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(6) ATTRIBUTE_NONNULL(8) ATTRIBUTE_NONNULL(10) ATTRIBUTE_RETURN_CHECK; -- 1.8.2.3

2 4

[libvirt] [RFC: PATCH 0/2] Display allocation during dumpxml
by Eric Blake 18 Nov '14

18 Nov '14

I'm still working on code to populate the latest numbers for each disk of a domain, including getting numbers for offline domains, but have confirmed that with these two patches alone I'm able to see <capacity> and <allocation> numbers for block volumes of live domains (thanks to how we populate backing chain information). So while there are more patches to come, I'd like to get review started on my proposed API addition. Eric Blake (2): dumpxml: add flag to virDomainGetXMLDesc dumpxml: prepare to output block info docs/schemas/domaincommon.rng | 22 ++++++++++++++++++++++ include/libvirt/libvirt.h.in | 1 + src/conf/domain_conf.c | 16 +++++++++++++++- src/libvirt.c | 15 +++++++++++---- src/util/virstoragefile.h | 3 ++- tools/virsh-domain.c | 6 ++++++ tools/virsh.pod | 6 ++++-- 7 files changed, 61 insertions(+), 8 deletions(-) -- 1.9.3

2 4

[libvirt] [PATCH 0/2] Couple of UEFI fixes
by Michal Privoznik 18 Nov '14

18 Nov '14

Literally couple. Michal Privoznik (2): qemu: Delete nvram store for transient domains too qemuPrepareNVRAM: Save domain conf only if domain's persistent src/conf/domain_conf.c | 10 ++++++++-- src/conf/domain_conf.h | 1 + src/qemu/qemu_driver.c | 3 ++- src/qemu/qemu_process.c | 25 +++++++++++++++++-------- 4 files changed, 28 insertions(+), 11 deletions(-) -- 2.0.4

2 6

[libvirt] [PATCH v2 0/4] use the 'vram' attribute for QEMU video devices
by Pavel Hrdina 18 Nov '14

18 Nov '14

There are some changes from the first version. We will not have a new 'vgamem' attribute for video devices because we can use the 'vram' attribute. So far for QEMU the 'vram' is used only to set the secondary ram for QXL which seems to be correct as the secondary ram is used for pixmaps and surfaces. The 'vgamem_mb' parameter for QXL sets the VGA framebuffer size, but the VGA mode in QXL is used only as fallback if the OS doesn't have any QXL drivers or before the drivers are loaded. The VGA framebuffer is part of the first ram for QXL and for that we have 'ram' attribute. The rest of the first ram is memory for rendering commands and it's data. Default VGA framebuffer size is 8MB which is sufficient. Other QEMU video devices have only 'vgamem_mb' parameter and we will use the 'vram' attribute to set the size of video memory as it's used also for other hypervisors. The first two patches clean the usage of vram attribute and improve the documentation and the rest two patches implements usage of 'vram' attribute for remaining QEMU video devices. Pavel Hrdina (4): video: cleanup usage of vram attribute and update documentation qxl: fix setting ram and vram values for qemu qxl device caps: introduce new qemu capability for vgamem_mb device property qemu-command: introduce new vgamem attribute for video devices docs/formatdomain.html.in | 62 +++++++----- src/conf/domain_conf.c | 19 +++- src/conf/domain_conf.h | 3 +- src/qemu/qemu_capabilities.c | 25 +++++ src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 44 ++++++++- tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 2 + tests/qemucapabilitiesdata/caps_1.2.2-1.replies | 100 +++++++++++++++++-- tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 3 + tests/qemucapabilitiesdata/caps_1.3.1-1.replies | 108 +++++++++++++++++++-- tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 3 + tests/qemucapabilitiesdata/caps_1.4.2-1.replies | 108 +++++++++++++++++++-- tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 3 + tests/qemucapabilitiesdata/caps_1.5.3-1.replies | 108 +++++++++++++++++++-- tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 3 + tests/qemucapabilitiesdata/caps_1.6.0-1.replies | 108 +++++++++++++++++++-- tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 3 + tests/qemucapabilitiesdata/caps_1.6.50-1.replies | 108 +++++++++++++++++++-- tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 3 + tests/qemucapabilitiesdata/caps_2.1.1-1.replies | 108 +++++++++++++++++++-- .../qemuxml2argv-graphics-spice-compression.args | 2 +- .../qemuxml2argv-graphics-spice-sasl.args | 4 +- .../qemuxml2argv-graphics-spice.args | 4 +- .../qemuxml2argv-pcihole64-q35.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-q35.args | 2 +- .../qemuxml2argv-video-qxl-device-vgamem.args | 6 ++ .../qemuxml2argv-video-qxl-device-vgamem.xml | 29 ++++++ .../qemuxml2argv-video-qxl-device.args | 6 ++ .../qemuxml2argv-video-qxl-device.xml | 29 ++++++ .../qemuxml2argv-video-qxl-nodevice.args | 5 + .../qemuxml2argv-video-qxl-nodevice.xml | 29 ++++++ .../qemuxml2argv-video-qxl-sec-device-vgamem.args | 8 ++ .../qemuxml2argv-video-qxl-sec-device-vgamem.xml | 32 ++++++ .../qemuxml2argv-video-qxl-sec-device.args | 7 ++ .../qemuxml2argv-video-qxl-sec-device.xml | 32 ++++++ .../qemuxml2argv-video-qxl-sec-nodevice.xml | 32 ++++++ .../qemuxml2argv-video-vga-device-vgamem.args | 6 ++ .../qemuxml2argv-video-vga-device-vgamem.xml | 29 ++++++ .../qemuxml2argv-video-vga-device.args | 6 ++ .../qemuxml2argv-video-vga-device.xml | 29 ++++++ .../qemuxml2argv-video-vga-nodevice.args | 5 + .../qemuxml2argv-video-vga-nodevice.xml | 29 ++++++ tests/qemuxml2argvtest.c | 16 +++ tools/virsh-domain.c | 4 +- 44 files changed, 1188 insertions(+), 89 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-nodevice.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.xml -- 2.0.4

2 16

[libvirt] How can I get drive_mirror migration progress with non-shared storage on KVM ?
by Wang Rui 18 Nov '14

18 Nov '14

Hi, I want to get a total progress(memory + storage). In none drive mirror migration, I can use virDomainGetJobInfo API to get the total progress. But in drive mirror migration, it seems that I must get file progress by virDomainGetBlockJobInfo and momery progress by virDomainGetJobInfo separately. So does the job status. Is there a way to get the total progress and job status? Thanks.

1 0