- Devel - libvirt List Archives

[libvirt] [PATCH] nwfilter: Remove redundant check if object exists
by Pavel Hrdina 28 Jun '18

28 Jun '18

The same check is done by virNWFilterBindingObjListAdd(). The main issue with the current code is that if the object already exists we would leak 'def' because 'obj' would be set and the cleanup code frees 'def' only if 'obj' is NULL. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/nwfilter/nwfilter_driver.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index ed34586105..ac3a964388 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -752,13 +752,6 @@ nwfilterBindingCreateXML(virConnectPtr conn, if (virNWFilterBindingCreateXMLEnsureACL(conn, def) < 0) goto cleanup; - obj = virNWFilterBindingObjListFindByPortDev(driver->bindings, def->portdevname); - if (obj) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Filter already present for NIC %s"), def->portdevname); - goto cleanup; - } - obj = virNWFilterBindingObjListAdd(driver->bindings, def); if (!obj) -- 2.17.1

2 1

[libvirt] [PATCH] nwfilter: variable 'obj' must be initialized inside nwfilterBindingCreateXML().
by Julio Faracco 28 Jun '18

28 Jun '18

The function nwfilterBindingCreateXML() is failing to compile due to a conditional branch which leads to a undefined 'obj' variable. So 'obj' must have a initial value to avoid compilation errors. See the problem: CC nwfilter/libvirt_driver_nwfilter_impl_la-nwfilter_driver.lo nwfilter/nwfilter_driver.c:752:9: error: variable 'obj' is used uninitialized whenever 'if' condition is true [-Werror,-Wsometimes-uninitialized] if (virNWFilterBindingCreateXMLEnsureACL(conn, def) < 0) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ nwfilter/nwfilter_driver.c:779:10: note: uninitialized use occurs here if (!obj) ^~~ nwfilter/nwfilter_driver.c:752:5: note: remove the 'if' if its condition is always false if (virNWFilterBindingCreateXMLEnsureACL(conn, def) < 0) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ nwfilter/nwfilter_driver.c:742:33: note: initialize the variable 'obj' to silence this warning virNWFilterBindingObjPtr obj; ^ = NULL This commit initialized 'obj' with NULL to fix the error properly. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/nwfilter/nwfilter_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index d385b46f5f..ed34586105 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -739,8 +739,8 @@ nwfilterBindingCreateXML(virConnectPtr conn, const char *xml, unsigned int flags) { - virNWFilterBindingObjPtr obj; virNWFilterBindingDefPtr def; + virNWFilterBindingObjPtr obj = NULL; virNWFilterBindingPtr ret = NULL; virCheckFlags(0, NULL); -- 2.17.1

2 1

[libvirt] [python PATCH] Add support for nwfilter binding objects / apis
by Daniel P. Berrangé 28 Jun '18

28 Jun '18

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- generator.py | 33 ++++++++++++++++++++-- libvirt-override-api.xml | 6 ++++ libvirt-override-virConnect.py | 12 ++++++++ libvirt-override.c | 51 ++++++++++++++++++++++++++++++++++ typewrappers.c | 13 +++++++++ typewrappers.h | 10 +++++++ 6 files changed, 122 insertions(+), 3 deletions(-) diff --git a/generator.py b/generator.py index 353adab..ae0e45c 100755 --- a/generator.py +++ b/generator.py @@ -356,6 +356,10 @@ py_types = { 'virNWFilter *': ('O', "virNWFilter", "virNWFilterPtr", "virNWFilterPtr"), 'const virNWFilter *': ('O', "virNWFilter", "virNWFilterPtr", "virNWFilterPtr"), + 'virNWFilterBindingPtr': ('O', "virNWFilterBinding", "virNWFilterBindingPtr", "virNWFilterBindingPtr"), + 'virNWFilterBinding *': ('O', "virNWFilterBinding", "virNWFilterBindingPtr", "virNWFilterBindingPtr"), + 'const virNWFilterBinding *': ('O', "virNWFilterBinding", "virNWFilterBindingPtr", "virNWFilterBindingPtr"), + 'virStreamPtr': ('O', "virStream", "virStreamPtr", "virStreamPtr"), 'virStream *': ('O', "virStream", "virStreamPtr", "virStreamPtr"), 'const virStream *': ('O', "virStream", "virStreamPtr", "virStreamPtr"), @@ -539,6 +543,7 @@ skip_function = ( 'virConnectListAllInterfaces', # overridden in virConnect.py 'virConnectListAllNodeDevices', # overridden in virConnect.py 'virConnectListAllNWFilters', # overridden in virConnect.py + 'virConnectListAllNWFilterBindings', # overridden in virConnect.py 'virConnectListAllSecrets', # overridden in virConnect.py 'virConnectGetAllDomainStats', # overridden in virConnect.py 'virDomainListGetStats', # overriden in virConnect.py @@ -572,6 +577,7 @@ skip_function = ( "virNodeDeviceRef", "virSecretRef", "virNWFilterRef", + "virNWFilterBindingRef", "virStoragePoolRef", "virStorageVolRef", "virStreamRef", @@ -1010,6 +1016,8 @@ classes_type = { "virSecret *": ("._o", "virSecret(self, _obj=%s)", "virSecret"), "virNWFilterPtr": ("._o", "virNWFilter(self, _obj=%s)", "virNWFilter"), "virNWFilter *": ("._o", "virNWFilter(self, _obj=%s)", "virNWFilter"), + "virNWFilterBindingPtr": ("._o", "virNWFilterBinding(self, _obj=%s)", "virNWFilterBinding"), + "virNWFilterBinding *": ("._o", "virNWFilterBinding(self, _obj=%s)", "virNWFilterBinding"), "virStreamPtr": ("._o", "virStream(self, _obj=%s)", "virStream"), "virStream *": ("._o", "virStream(self, _obj=%s)", "virStream"), "virConnectPtr": ("._o", "virConnect(_obj=%s)", "virConnect"), @@ -1021,7 +1029,8 @@ classes_type = { primary_classes = ["virDomain", "virNetwork", "virInterface", "virStoragePool", "virStorageVol", "virConnect", "virNodeDevice", "virSecret", - "virNWFilter", "virStream", "virDomainSnapshot"] + "virNWFilter", "virNWFilterBinding", + "virStream", "virDomainSnapshot"] classes_destructors = { "virDomain": "virDomainFree", @@ -1032,6 +1041,7 @@ classes_destructors = { "virNodeDevice" : "virNodeDeviceFree", "virSecret": "virSecretFree", "virNWFilter": "virNWFilterFree", + "virNWFilterBinding": "virNWFilterBindingFree", "virDomainSnapshot": "virDomainSnapshotFree", # We hand-craft __del__ for this one #"virStream": "virStreamFree", @@ -1058,6 +1068,8 @@ functions_noexcept = { 'virSecretGetUsageType': True, 'virSecretGetUsageID': True, 'virNWFilterGetName': True, + 'virNWFilterBindingGetFilterName': True, + 'virNWFilterBindingGetPortDev': True, } function_classes = {} @@ -1113,6 +1125,15 @@ def nameFixup(name, classe, type, file): elif name[0:15] == "virSecretLookup": func = name[3:] func = func[0:1].lower() + func[1:] + elif name[0:27] == "virNWFilterBindingCreateXML": + func = name[3:] + func = func[0:1].lower() + func[1:] + elif name[0:24] == "virNWFilterBindingDefine": + func = name[3:] + func = func[0:3].lower() + func[3:] + elif name[0:24] == "virNWFilterBindingLookup": + func = name[3:] + func = func[0:3].lower() + func[3:] elif name[0:17] == "virNWFilterDefine": func = name[3:] func = func[0:3].lower() + func[3:] @@ -1189,6 +1210,12 @@ def nameFixup(name, classe, type, file): elif name[0:9] == 'virSecret': func = name[9:] func = func[0:1].lower() + func[1:] + elif name[0:21] == 'virNWFilterBindingGet': + func = name[21:] + func = func[0:1].lower() + func[1:] + elif name[0:18] == 'virNWFilterBinding': + func = name[18:] + func = func[0:1].lower() + func[1:] elif name[0:14] == 'virNWFilterGet': func = name[14:] func = func[0:1].lower() + func[1:] @@ -1468,7 +1495,7 @@ def buildWrappers(module): classes.write("class %s(object):\n" % (classname)) if classname in [ "virDomain", "virNetwork", "virInterface", "virStoragePool", "virStorageVol", "virNodeDevice", "virSecret","virStream", - "virNWFilter" ]: + "virNWFilter", "virNWFilterBinding" ]: classes.write(" def __init__(self, conn, _obj=None):\n") elif classname in [ 'virDomainSnapshot' ]: classes.write(" def __init__(self, dom, _obj=None):\n") @@ -1476,7 +1503,7 @@ def buildWrappers(module): classes.write(" def __init__(self, _obj=None):\n") if classname in [ "virDomain", "virNetwork", "virInterface", "virNodeDevice", "virSecret", "virStream", - "virNWFilter" ]: + "virNWFilter", "virNWFilterBinding" ]: classes.write(" self._conn = conn\n") elif classname in [ "virStorageVol", "virStoragePool" ]: classes.write(" self._conn = conn\n" + \ diff --git a/libvirt-override-api.xml b/libvirt-override-api.xml index ecbdac2..4e8d6c0 100644 --- a/libvirt-override-api.xml +++ b/libvirt-override-api.xml @@ -485,6 +485,12 @@ <arg name='flags' type='unsigned int' info='optional flags'/> <return type='char *' info='the list of network filters or None in case of error'/> </function> + <function name='virConnectListAllNWFilterBindings' file='python'> + <info>returns list of all network fitler bindings</info> + <arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/> + <arg name='flags' type='unsigned int' info='optional flags'/> + <return type='char *' info='the list of network filter bindings or None in case of error'/> + </function> <function name='virNWFilterLookupByUUID' file='python'> <info>Try to lookup a network filter on the given hypervisor based on its UUID.</info> <return type='virNWFilterPtr' info='a new network filter object or NULL in case of failure'/> diff --git a/libvirt-override-virConnect.py b/libvirt-override-virConnect.py index a24eae7..7fe08e0 100644 --- a/libvirt-override-virConnect.py +++ b/libvirt-override-virConnect.py @@ -531,6 +531,18 @@ return retlist + def listAllNWFilterBindings(self, flags=0): + """Returns a list of network filter binding objects""" + ret = libvirtmod.virConnectListAllNWFilterBindings(self._o, flags) + if ret is None: + raise libvirtError("virConnectListAllNWFilterBindings() failed", conn=self) + + retlist = list() + for filter_ptr in ret: + retlist.append(virNWFilterBinding(self, _obj=filter_ptr)) + + return retlist + def listAllSecrets(self, flags=0): """Returns a list of secret objects""" ret = libvirtmod.virConnectListAllSecrets(self._o, flags) diff --git a/libvirt-override.c b/libvirt-override.c index 012de3f..e74c7dd 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -4446,6 +4446,54 @@ libvirt_virConnectListAllNWFilters(PyObject *self ATTRIBUTE_UNUSED, } #endif /* LIBVIR_CHECK_VERSION(0, 10, 2) */ +#if LIBVIR_CHECK_VERSION(4, 5, 0) +static PyObject * +libvirt_virConnectListAllNWFilterBindings(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + PyObject *pyobj_conn; + PyObject *py_retval = NULL; + virConnectPtr conn; + virNWFilterBindingPtr *bindings = NULL; + int c_retval = 0; + ssize_t i; + unsigned int flags; + + if (!PyArg_ParseTuple(args, (char *)"OI:virConnectListAllNWFilterBindings", + &pyobj_conn, &flags)) + return NULL; + conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virConnectListAllNWFilterBindings(conn, &bindings, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (c_retval < 0) + return VIR_PY_NONE; + + if (!(py_retval = PyList_New(c_retval))) + goto cleanup; + + for (i = 0; i < c_retval; i++) { + VIR_PY_LIST_SET_GOTO(py_retval, i, + libvirt_virNWFilterBindingPtrWrap(bindings[i]), error); + /* python steals the pointer */ + bindings[i] = NULL; + } + + cleanup: + for (i = 0; i < c_retval; i++) + if (bindings[i]) + virNWFilterBindingFree(bindings[i]); + VIR_FREE(bindings); + return py_retval; + + error: + Py_CLEAR(py_retval); + goto cleanup; +} +#endif /* LIBVIR_CHECK_VERSION(4, 5, 0) */ + static PyObject * libvirt_virConnectListInterfaces(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -9971,6 +10019,9 @@ static PyMethodDef libvirtMethods[] = { #if LIBVIR_CHECK_VERSION(0, 10, 2) {(char *) "virConnectListAllNWFilters", libvirt_virConnectListAllNWFilters, METH_VARARGS, NULL}, #endif /* LIBVIR_CHECK_VERSION(0, 10, 2) */ +#if LIBVIR_CHECK_VERSION(4, 5, 0) + {(char *) "virConnectListAllNWFilterBindings", libvirt_virConnectListAllNWFilterBindings, METH_VARARGS, NULL}, +#endif /* LIBVIR_CHECK_VERSION(4, 5, 0) */ {(char *) "virConnectListInterfaces", libvirt_virConnectListInterfaces, METH_VARARGS, NULL}, {(char *) "virConnectListDefinedInterfaces", libvirt_virConnectListDefinedInterfaces, METH_VARARGS, NULL}, #if LIBVIR_CHECK_VERSION(0, 10, 2) diff --git a/typewrappers.c b/typewrappers.c index 99a8fb8..9ba14b4 100644 --- a/typewrappers.c +++ b/typewrappers.c @@ -542,6 +542,19 @@ libvirt_virNWFilterPtrWrap(virNWFilterPtr node) return ret; } +PyObject * +libvirt_virNWFilterBindingPtrWrap(virNWFilterBindingPtr node) +{ + PyObject *ret; + + if (node == NULL) { + return VIR_PY_NONE; + } + + ret = libvirt_buildPyObject(node, "virNWFilterBindingPtr", NULL); + return ret; +} + PyObject * libvirt_virStreamPtrWrap(virStreamPtr node) { diff --git a/typewrappers.h b/typewrappers.h index ed1e4a3..1570c6a 100644 --- a/typewrappers.h +++ b/typewrappers.h @@ -106,6 +106,15 @@ typedef struct { } PyvirNWFilter_Object; +#define PyvirNWFilterBinding_Get(v) (((v) == Py_None) ? NULL : \ + (((PyvirNWFilterBinding_Object *)(v))->obj)) + +typedef struct { + PyObject_HEAD + virNWFilterBindingPtr obj; +} PyvirNWFilterBinding_Object; + + #define PyvirStream_Get(v) (((v) == Py_None) ? NULL : \ (((PyvirStream_Object *)(v))->obj)) @@ -189,6 +198,7 @@ PyObject * libvirt_virVoidPtrWrap(void* node); PyObject * libvirt_virNodeDevicePtrWrap(virNodeDevicePtr node); PyObject * libvirt_virSecretPtrWrap(virSecretPtr node); PyObject * libvirt_virNWFilterPtrWrap(virNWFilterPtr node); +PyObject * libvirt_virNWFilterBindingPtrWrap(virNWFilterBindingPtr node); PyObject * libvirt_virStreamPtrWrap(virStreamPtr node); PyObject * libvirt_virDomainSnapshotPtrWrap(virDomainSnapshotPtr node); -- 2.17.1

2 1

[libvirt] [PATCH v2 00/12] PCI passthrough support on s390
by Yi Min Zhao 28 Jun '18

28 Jun '18

Abstract ======== The PCI representation in QEMU has recently been extended for S390 allowing configuration of zPCI attributes like uid (user-defined identifier) and fid (PCI function identifier). The details can be found here: https://lists.gnu.org/archive/html/qemu-devel/2016-06/msg07262.html To support the new zPCI feature of the S390 platform, two new XML attributes, @uid and @fid, are introduced for device addresses of type 'pci', i.e.: <hostdev mode='subsystem' type='pci'> <driver name='vfio'/> <source> <address domain='0x0001' bus='0x00' slot='0x00' function='0x0'/> </source> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' uid='0x0003' fid='0x00000027'/> </hostdev> uid and fid are optional attributes. If they are defined by the user, unique values within the guest domain must be used. If they are not specified and the architecture requires them, they are automatically generated with non-conflicting values. Current implementation is the most seamless one for the user as it unites the address specific data of a PCI device on one XML element. It could accommodate both specifying our special parameters (uid and fid) and re-using standard statements (domain, bus, slot and function) for PCI devices. User can still specify bus/slot/function for the virtualized PCI devices in the XML. Thus uid/fid act as an extension to the PCI address and are stored in a new structure 'virZPCIDeviceAddress' which is a member of common PCI Address structure. Additionally, two hashtables are used for assignment and reservation of uid/fid. In support of extending the PCI address, a new PCI address extension flag is introduced. This extension flag allows is not only dedicated for the S390 platform but also other architectures needing certain extensions to PCI address space. Code Base ========= commit in master: 0c4408c832368b45c8246175e2a75132d3ff0302 qemu: Don't use asyncJob after stop during snapshot revert Change Log ========== v1->v2: 1. Separate test commit and merge testcases into corresponding commits that introduce the functionalities firstly. 2. Spare some checks for zpci device. 3. Add vsock and controller support. 4. Add uin32 type schema. 5. Rename zpciuid and zpcifid to zpci_uid and zpci_fid. 6. Always return multibus support on S390. Yi Min Zhao (12): conf: Add definitions for 'uid' and 'fid' PCI address attributes qemu: Introduce zPCI capability conf: Introduce a new PCI address extension flag qemu: Enable PCI multi bus for S390 guests qemu: Auto add pci-root for s390/s390x guests conf: Introduce address caching for PCI extensions conf: Introduce parser, formatter for uid and fid conf: Allocate/release 'uid' and 'fid' in PCI address qemu: Generate and use zPCI device in QEMU command line qemu: Add hotpluging support for PCI devices on S390 guests docs: Add 'uid' and 'fid' information news: Update news for PCI address extension attributes docs/formatdomain.html.in | 9 +- docs/news.xml | 11 + docs/schemas/basictypes.rng | 31 ++ docs/schemas/domaincommon.rng | 1 + src/conf/device_conf.c | 73 +++++ src/conf/device_conf.h | 1 + src/conf/domain_addr.c | 346 +++++++++++++++++++++ src/conf/domain_addr.h | 29 ++ src/conf/domain_conf.c | 6 + src/libvirt_private.syms | 4 + src/qemu/qemu_capabilities.c | 6 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 105 +++++++ src/qemu/qemu_command.h | 4 + src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain_address.c | 181 ++++++++++- src/qemu/qemu_hotplug.c | 201 ++++++++++-- src/util/virpci.h | 13 + tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + tests/qemuxml2argvdata/disk-virtio-s390-zpci.args | 27 ++ tests/qemuxml2argvdata/disk-virtio-s390-zpci.xml | 17 + .../hostdev-vfio-zpci-autogenerate.args | 26 ++ .../hostdev-vfio-zpci-autogenerate.xml | 18 ++ .../hostdev-vfio-zpci-boundaries.args | 30 ++ .../hostdev-vfio-zpci-boundaries.xml | 26 ++ .../hostdev-vfio-zpci-multidomain-many.args | 40 +++ .../hostdev-vfio-zpci-multidomain-many.xml | 67 ++++ tests/qemuxml2argvdata/hostdev-vfio-zpci.args | 26 ++ tests/qemuxml2argvdata/hostdev-vfio-zpci.xml | 19 ++ tests/qemuxml2argvtest.c | 14 + tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.xml | 29 ++ tests/qemuxml2xmloutdata/hostdev-vfio-zpci.xml | 30 ++ tests/qemuxml2xmltest.c | 3 + 38 files changed, 1377 insertions(+), 24 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-virtio-s390-zpci.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-s390-zpci.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci.xml create mode 100644 tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-zpci.xml -- Yi Min

1 12

[libvirt] [dbus PATCH] mailmap: Add mailmap file
by Andrea Bolognani 27 Jun '18

27 Jun '18

The AUTHORS file included in releases contains some duplicated or incorrect information; having a mailmap file will make sure future ones wont't suffer from the same issue. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- .mailmap | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .mailmap diff --git a/.mailmap b/.mailmap new file mode 100644 index 0000000..9a35b7c --- /dev/null +++ b/.mailmap @@ -0,0 +1,9 @@ +# 'git shortlog --help' and look for mailmap for the format of each line + +# Email consolidation: +# <Preferred address in AUTHORS> <other alias used by same author> +<martin(a)piware.de> <martinpitt(a)users.noreply.github.com> + +# Name consolidation: +# Preferred author spelling <preferred email> +Daniel P. Berrangé <berrange(a)redhat.com> -- 2.17.1

2 1

[libvirt] [PATCH v2 0/3] Deny live device alias change
by Michal Privoznik 27 Jun '18

27 Jun '18

v2 of: https://www.redhat.com/archives/libvir-list/2018-June/msg00971.html Note that 1/3 is already reviewed (not pushed though, yet). diff to v1: - Fixed <interface/> hotplug issue raised during review of v1, - Removed alias change checks for disks and interfaces since there's one common place for that now. Michal Privoznik (3): qemuDomainUpdateDeviceFlags: Parse device as live if needed conf: Reintroduce action to virDomainDefCompatibleDevice conf: Forbid device alias change on device-update src/conf/domain_conf.c | 14 +++++++++++++- src/conf/domain_conf.h | 4 +++- src/lxc/lxc_driver.c | 12 +++++++++--- src/qemu/qemu_domain.c | 8 -------- src/qemu/qemu_driver.c | 44 ++++++++++++++++++++++++++++++++------------ src/qemu/qemu_hotplug.c | 5 ----- 6 files changed, 57 insertions(+), 30 deletions(-) -- 2.16.4

2 10

[libvirt] [PATCH python] libvirtaio: Fix compat with python 3.7
by Cole Robinson 27 Jun '18

27 Jun '18

In python 3.7, async is now a keyword, so this throws a syntax error: File "/usr/lib64/python3.7/site-packages/libvirtaio.py", line 49 from asyncio import async as ensure_future ^ SyntaxError: invalid syntax Switch to getattr trickery to accomplish the same goal Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- libvirtaio.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) If we don't care about python3 < 3.4.4 compat, we can just do from asyncio import ensure_future diff --git a/libvirtaio.py b/libvirtaio.py index 1c432dd..9d517e6 100644 --- a/libvirtaio.py +++ b/libvirtaio.py @@ -43,10 +43,12 @@ import warnings import libvirt -try: - from asyncio import ensure_future -except ImportError: - from asyncio import async as ensure_future +# python < 3.4.4: we want 'async' +# python >= 3.4.4 < 3.7, we want 'ensure_future' +# python >= 3.7, 'async' is a reserved keyword, so we can't import it +ensure_future = getattr(asyncio, "ensure_future", None) +if not ensure_future: + ensure_future = getattr(asyncio, "async") class Callback(object): -- 2.17.1

3 5

[libvirt] [PATCH] Fix syntax error on Python 3.7
by Miro Hrončok 27 Jun '18

27 Jun '18

From 0d3b7cc9ba787a139ecbe6dac490b1f5bb021b7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro(a)hroncok.cz> Date: Wed, 27 Jun 2018 13:00:28 +0200 Subject: [PATCH] Fix syntax error on Python 3.7 async is a keyword now. `asyncio import ensure_future` works on Python 3.4 to 3.7 `from asyncio import async as ensure_future` is not needed. --- libvirtaio.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libvirtaio.py b/libvirtaio.py index 1c432dd..b100a5f 100644 --- a/libvirtaio.py +++ b/libvirtaio.py @@ -43,10 +43,7 @@ import warnings import libvirt -try: - from asyncio import ensure_future -except ImportError: - from asyncio import async as ensure_future +from asyncio import ensure_future class Callback(object): -- 2.17.0

2 3

[libvirt] [PATCH] qemu:Add support L2 table cache for qcow2 disk
by Allen Do 27 Jun '18

27 Jun '18

The patch add support L2 table cache for qcow2 disk. L2 table cache can improve IO read and write performance for qcow2 img. Diff follows: src/conf/domain_conf.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 5 +++++ src/qemu/qemu_command.c | 7 +++++++ src/qemu/qemu_domain.c | 6 ++++++ tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml | 3 ++- 6 files changed, 68 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index beca0be..0a6afca 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8058,6 +8058,8 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, char *domain_name = NULL; int expected_secret_usage = -1; int auth_secret_usage = -1; + char *disk_l2_cache_size = NULL; + char *disk_cache_clean_interval = NULL; if (!(def = virDomainDiskDefNew(xmlopt))) return NULL; @@ -8233,6 +8235,27 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, } } else if (xmlStrEqual(cur->name, BAD_CAST "boot")) { /* boot is parsed as part of virDomainDeviceInfoParseXML */ + } else if (xmlStrEqual(cur->name, BAD_CAST "diskCache")) { + disk_l2_cache_size = + virXMLPropString(cur, "disk_l2_cache_size"); + if (disk_l2_cache_size && + virStrToLong_ui(disk_l2_cache_size, NULL, 0, + &def->disk_cache.disk_l2_cache_size) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("invalid disk L2 cache size '%s'"), + disk_l2_cache_size); + goto error; + } + disk_cache_clean_interval = + virXMLPropString(cur, "disk_cache_clean_interval"); + if (disk_cache_clean_interval && + virStrToLong_ui(disk_cache_clean_interval, NULL, 0, + &def->disk_cache.disk_cache_clean_interval) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("invalid disk cache clean interval '%s'"), + disk_cache_clean_interval); + goto error; + } } } @@ -8472,6 +8495,8 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, VIR_FREE(vendor); VIR_FREE(product); VIR_FREE(domain_name); + VIR_FREE(disk_l2_cache_size); + VIR_FREE(disk_cache_clean_interval); ctxt->node = save_ctxt; return def; @@ -20646,6 +20671,27 @@ virDomainDiskBlockIoDefFormat(virBufferPtr buf, } } +static void +virDomainDiskCacheDefFormat(virBufferPtr buf, + virDomainDiskDefPtr def) +{ + if (def->disk_cache.disk_l2_cache_size > 0 || + def->disk_cache.disk_cache_clean_interval > 0) { + virBufferAddLit(buf, "<diskCache"); + if (def->disk_cache.disk_l2_cache_size > 0) { + virBufferAsprintf(buf, + " disk_l2_cache_size='%u'", + def->disk_cache.disk_l2_cache_size); + } + if (def->disk_cache.disk_cache_clean_interval > 0) { + virBufferAsprintf(buf, + " disk_cache_clean_interval='%u'", + def->disk_cache.disk_cache_clean_interval); + } + virBufferAddLit(buf, "/>\n"); + } +} + /* virDomainSourceDefFormatSeclabel: * @@ -20990,6 +21036,7 @@ virDomainDiskDefFormat(virBufferPtr buf, virDomainDiskGeometryDefFormat(buf, def); virDomainDiskBlockIoDefFormat(buf, def); + virDomainDiskCacheDefFormat(buf, def); /* For now, mirroring is currently output-only: we only output it * for live domains, therefore we ignore it on input except for diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 91a33cb..83ea9d3 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -647,6 +647,11 @@ struct _virDomainDiskDef { unsigned int physical_block_size; } blockio; + struct { + unsigned int disk_l2_cache_size; + unsigned int disk_cache_clean_interval; + } disk_cache; + virDomainBlockIoTuneInfo blkdeviotune; char *serial; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e087891..7c47cd3 100755 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1662,6 +1662,13 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, if (qemuBuildDriveSourceStr(disk, cfg, &opt, qemuCaps) < 0) goto error; + if (disk->disk_cache.disk_l2_cache_size > 0) + virBufferAsprintf(&opt, "l2-cache-size=%u,", + disk->disk_cache.disk_l2_cache_size); + if (disk->disk_cache.disk_cache_clean_interval > 0) + virBufferAsprintf(&opt, "cache-clean-interval=%u,", + disk->disk_cache.disk_cache_clean_interval); + if (emitDeviceSyntax) virBufferAddLit(&opt, "if=none"); else diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 9f165c1..de334a7 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5408,6 +5408,12 @@ qemuDomainDiskChangeSupported(virDomainDiskDefPtr disk, CHECK_EQ(ioeventfd, "ioeventfd", true); CHECK_EQ(event_idx, "event_idx", true); CHECK_EQ(copy_on_read, "copy_on_read", true); + + CHECK_EQ(disk_cache.disk_l2_cache_size, + "diskCache disk_l2_cache_size", true); + CHECK_EQ(disk_cache.disk_cache_clean_interval, + "diskCache disk_cache_clean_interval", true); + /* "snapshot" is a libvirt internal field and thus can be changed */ /* startupPolicy is allowed to be updated. Therefore not checked here. */ CHECK_EQ(transient, "transient", true); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args index b405242..b968302 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args @@ -22,7 +22,7 @@ QEMU_AUDIO_DRV=none \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,media=cdrom,\ id=drive-ide0-1-0,readonly=on \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ --drive file=/tmp/data.img,format=raw,if=none,id=drive-virtio-disk0 \ +-drive file=/tmp/data.img,format=qcow2,l2-cache-size=536870912,cache-clean-interval=900,if=none,id=drive-virtio-disk0 \ -device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\ id=virtio-disk0 \ -drive file=/tmp/logs.img,format=raw,if=none,id=drive-virtio-disk1 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml index b843878..43298fb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml @@ -28,8 +28,9 @@ <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> <disk type='file' device='disk'> - <driver name='qemu' type='raw'/> + <driver name='qemu' type='qcow2'/> <source file='/tmp/data.img'/> + <diskCache disk_l2_cache_size='53687' disk_cache_clean_interval='900' /> <target dev='vda' bus='virtio'/> </disk> <disk type='file' device='disk'> Thanks

3 2

[libvirt] [PATCH v2 00/11] RISC-V Guest Support
by Lubomir Rintel 27 Jun '18

27 Jun '18

Hello, here's a second version of the RISV-V support patch set, initally submitted just under a month ago [1]. [1] https://www.redhat.com/archives/libvir-list/2018-May/thread.html#01008 Thanks to the Andrea's suggestions the patch is now considerably thinner, and split to hopefully more manageable changes. Aside from the test suite, my test case is this (with images from [2]): virt-install \ --import --name riscv64 \ --arch riscv64 --machine virt \ --memory 2048 \ --rng /dev/urandom \ --disk /var/lib/libvirt/images/stage4-disk.img,bus=virtio \ --boot kernel=/var/lib/libvirt/images/bbl,kernel_args="console=ttyS0 ro root=/dev/vda" [2] https://fedorapeople.org/groups/risc-v/disk-images/ Note that the large test suite changes that touch the '*.replies' files seem to upset the mail server, thus you're unlikely to receive them from the list. You can get them straight from my repository instead: git fetch https://github.com/lkundrak/libvirt.git lr/riscv-v2:riscv-v2 git checkout riscv-v2 Thanks! Lubo Diffstat follows. Lubomir Rintel (11): qemu: rename qemuDomainMachineIsVirt() qemu: rename qemuDomainArmVirt() util: add RISC-V architectures docs/schemas: add RISC-V architectures qemu: no USB by default on RISC-V machines qemu: assign addresses to virtio devices on RISC-V tests/capabilitiestest: add RISC-V capability tests tests/util: add RISC-V capabilities tests/captest: check RISC-V capabilities lookup tests/qemuxml2argvtest: test RISC-V virt machine arguments tests/virschematest: add RISC-V to capabilityschemadata/caps-qemu-kvm docs/schemas/basictypes.rng | 2 + src/qemu/qemu_capabilities.c | 6 +- src/qemu/qemu_command.c | 4 +- src/qemu/qemu_domain.c | 27 +- src/qemu/qemu_domain.h | 6 +- src/qemu/qemu_domain_address.c | 23 +- src/util/virarch.c | 3 + src/util/virarch.h | 6 + tests/capabilityschemadata/caps-qemu-kvm.xml | 36 + .../caps_2.12.0.riscv32.replies | 14679 ++++++++++++++++ .../caps_2.12.0.riscv32.xml | 126 + .../caps_2.12.0.riscv64.replies | 14679 ++++++++++++++++ .../caps_2.12.0.riscv64.xml | 126 + tests/qemucapabilitiestest.c | 2 + tests/qemuxml2argvdata/riscv64-virt.args | 31 + tests/qemuxml2argvdata/riscv64-virt.xml | 32 + tests/qemuxml2argvtest.c | 3 + .../riscv64-virt.xml | 39 + tests/testutilsqemu.c | 72 + tests/vircapstest.c | 6 + 20 files changed, 29887 insertions(+), 21 deletions(-) create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.riscv32.replies create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.riscv32.xml create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.riscv64.replies create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.riscv64.xml create mode 100644 tests/qemuxml2argvdata/riscv64-virt.args create mode 100644 tests/qemuxml2argvdata/riscv64-virt.xml create mode 100644 tests/qemuxml2startupxmloutdata/riscv64-virt.xml -- 2.17.1

2 22