- Devel - libvirt List Archives

[libvirt] [PATCH v3 0/1] domain_conf: check device address before attach
by Daniel Henrique Barboza 25 Mar '19

25 Mar '19

v3: - changed to a simpler and more generic approach - v2 can be found here: https://www.redhat.com/archives/libvir-list/2019-January/msg00673.html Daniel Henrique Barboza (1): domain_conf: check device address before attach src/conf/domain_conf.c | 8 ++++++++ 1 file changed, 8 insertions(+) -- 2.20.1

2 2

[libvirt] [PATCH libvirt-python v2] Implement virDomainGetStateParams API
by Bjoern Walk 25 Mar '19

25 Mar '19

From: Marc Hartmayer <mhartmay(a)linux.ibm.com> This patch adds the Python binding for the virDomainGetStateParams API. The Python side can be generated automatically, the C side cannot. Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> Signed-off-by: Marc Hartmayer <mhartmay(a)linux.ibm.com> Signed-off-by: Bjoern Walk <bwalk(a)linux.ibm.com> --- Patch series for libvirt is here: https://www.redhat.com/archives/libvir-list/2019-March/msg01648.html generator.py | 1 + libvirt-override-api.xml | 6 +++++ libvirt-override.c | 48 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+) diff --git a/generator.py b/generator.py index ffa3ce56..005be502 100755 --- a/generator.py +++ b/generator.py @@ -496,6 +496,7 @@ skip_impl = ( 'virConnectBaselineHypervisorCPU', 'virDomainGetLaunchSecurityInfo', 'virNodeGetSEVInfo', + 'virDomainGetStateParams', ) lxc_skip_impl = ( diff --git a/libvirt-override-api.xml b/libvirt-override-api.xml index 7f578e01..fab62447 100644 --- a/libvirt-override-api.xml +++ b/libvirt-override-api.xml @@ -754,5 +754,11 @@ <arg name='conn' type='virConnectPtr' info='pointer to hypervisor connection'/> <arg name='flags' type='int' info='unused, always pass 0'/> </function> + <function name='virDomainGetStateParams' file='python'> + <info>Extract domain state and additional information (if available).</info> + <arg name='dom' type='virDomainPtr' info='pointer to the domain'/> + <arg name='flags' type='unsigned int' info='extra flags; not used yet, so callers should always pass 0'/> + <return type='char *' info="dictionary of state data"/> + </function> </symbols> </api> diff --git a/libvirt-override.c b/libvirt-override.c index c5e2908c..7ae10874 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -9946,6 +9946,51 @@ libvirt_virNodeGetSEVInfo(PyObject *self ATTRIBUTE_UNUSED, #endif /* LIBVIR_CHECK_VERSION(4, 5, 0) */ +#if LIBVIR_CHECK_VERSION(5, 2, 0) +static PyObject * +libvirt_virDomainGetStateParams(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + PyObject *py_retval = VIR_PY_NONE; + PyObject *pyobj_domain; + virDomainPtr domain; + int state; + int reason; + virTypedParameterPtr params = NULL; + int nparams = 0; + unsigned int flags; + int c_retval; + + if (!PyArg_ParseTuple(args, (char *)"OI:virDomainGetStateParams", + &pyobj_domain, &flags)) + return NULL; + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virDomainGetStateParams(domain, &state, &reason, &params, + &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (c_retval < 0) + goto error; + + if ((py_retval = PyTuple_New(3)) == NULL) + goto error; + + VIR_PY_TUPLE_SET_GOTO(py_retval, 0, libvirt_intWrap(state), error); + VIR_PY_TUPLE_SET_GOTO(py_retval, 1, libvirt_intWrap(reason), error); + VIR_PY_TUPLE_SET_GOTO(py_retval, 2, getPyVirTypedParameter(params, nparams), error); + + return py_retval; + +error: + Py_XDECREF(py_retval); + virTypedParamsFree(params, nparams); + return VIR_PY_NONE; +} +#endif /* LIBVIR_CHECK_VERSION(5, 2, 0) */ + + /************************************************************************ * * * The registration stuff * @@ -10192,6 +10237,9 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virDomainGetLaunchSecurityInfo", libvirt_virDomainGetLaunchSecurityInfo, METH_VARARGS, NULL}, {(char *) "virNodeGetSEVInfo", libvirt_virNodeGetSEVInfo, METH_VARARGS, NULL}, #endif /* LIBVIR_CHECK_VERSION(4, 5, 0) */ +#if LIBVIR_CHECK_VERSION(5, 2, 0) + {(char *) "virDomainGetStateParams", libvirt_virDomainGetStateParams, METH_VARARGS, NULL}, +#endif /* LIBVIR_CHECK_VERSION(5, 2, 0) */ {NULL, NULL, 0, NULL} }; -- 2.17.0

1 0

[libvirt] [PATCH] test: Avoid use-after-free on virDomainSnapshotDelete
by Eric Blake 22 Mar '19

22 Mar '19

The following virsh command was triggering a use-after-free: $ virsh -c test:///default ' snapshot-create-as test s1 snapshot-create-as test s2 snapshot-delete --children-only test s1 snapshot-current --name test' Domain snapshot s1 created Domain snapshot s2 created Domain snapshot s1 children deleted error: name in virGetDomainSnapshot must not be NULL I got lucky on that run - although the error message is quite unexpected. On other runs, I was able to get a core dump, and valgrind confirms there is a definitive problem. The culprit? We were inconsistent about whether we set vm->current_snapshot, snap->def->current, or both when updating how the current snapshot was being tracked. As a result, deletion did not see that snapshot s2 was previously current, and failed to update vm->current_snapshot, so that the next API using the current snapshot failed because it referenced stale memory for the now-gone s2 (instead of the intended s1). The test driver code was copied from the qemu code (which DOES track both pieces of state everywhere), but was purposefully simplified because the test driver does not have to write persistent snapshot state to the file system. But when you realize that the only reason snap->def->current needs to exist is when writing out one file per snapshot for qemu, it's just as easy to state that the test driver never has to mess with the field (rather than chasing down which places forgot to set the field), and have vm->current_snapshot be the sole source of truth in the test driver. Ideally, I'd get rid of the 'current' member in virDomainSnapshotDef, as well as the 'current_snapshot' member in virDomainDef, and instead track the current member in virDomainSnapshotObjList, coupled with writing ALL snapshot state for qemu in a single file (where I can use <snapshots current='...'> as a wrapper, rather than VIR_DOMAIN_SNAPSHOT_FORMAT_INTERNAL to output <current>1</current> XML on a per-snapshot file basis). But that's a bigger change, so for now I'm just patching things to avoid the test driver segfault. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- src/test/test_driver.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 0bb48b4364..8e2a9dcff6 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1,7 +1,7 @@ /* * test_driver.c: A "mock" hypervisor for use by application unit tests * - * Copyright (C) 2006-2015 Red Hat, Inc. + * Copyright (C) 2006-2019 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -6441,7 +6441,7 @@ testDomainSnapshotDiscardAll(void *payload, virDomainSnapshotObjPtr snap = payload; testSnapRemoveDataPtr curr = data; - if (snap->def->current) + if (curr->vm->current_snapshot == snap) curr->current = true; virDomainSnapshotObjListRemove(curr->vm->snapshots, snap); return 0; @@ -6508,8 +6508,6 @@ testDomainSnapshotDelete(virDomainSnapshotPtr snapshot, testDomainSnapshotDiscardAll, &rem); if (rem.current) { - if (flags & VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY) - snap->def->current = true; vm->current_snapshot = snap; } } else if (snap->nchildren) { @@ -6542,8 +6540,6 @@ testDomainSnapshotDelete(virDomainSnapshotPtr snapshot, if (!parentsnap) { VIR_WARN("missing parent snapshot matching name '%s'", snap->def->parent); - } else { - parentsnap->def->current = true; } } vm->current_snapshot = parentsnap; @@ -6623,12 +6619,9 @@ testDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, } - if (vm->current_snapshot) { - vm->current_snapshot->def->current = false; + if (vm->current_snapshot) vm->current_snapshot = NULL; - } - snap->def->current = true; config = virDomainDefCopy(snap->def->dom, privconn->caps, privconn->xmlopt, NULL, true); if (!config) -- 2.20.1

3 4

[libvirt] [PATCH 0/2] tests: qemuxml2argv updates and tweaks
by Andrea Bolognani 22 Mar '19

22 Mar '19

Andrea Bolognani (2): tests: Update aarch64-virt-graphics for virtio-blk tests: Add s390x-ccw-graphics test case .../aarch64-virt-graphics.aarch64-latest.args | 9 ++-- .../aarch64-virt-graphics.xml | 3 +- .../s390x-ccw-graphics.s390x-latest.args | 49 +++++++++++++++++++ ...rt-graphics.xml => s390x-ccw-graphics.xml} | 21 +++----- tests/qemuxml2argvtest.c | 1 + 5 files changed, 62 insertions(+), 21 deletions(-) create mode 100644 tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args copy tests/qemuxml2argvdata/{aarch64-virt-graphics.xml => s390x-ccw-graphics.xml} (61%) -- 2.20.1

2 3

[libvirt] [PATCH 00/21] qemu_hotplug: refactor device detach functions to fix one serious and other minor bugs
by Laine Stump 22 Mar '19

22 Mar '19

This all started with the observation that we were sending the DEVICE_REMOVED events for unplugged devices too soon (reported in https://bugzilla.redhat.com/1658198 ). While noticing that *all* of the device types send their DEVICE_REMOVED event too early, I also noticed how eerily similar all the different detach functions are (they have converged over time, as legacy code supporting old qemus with different methods of deleting different types of devices has been removed - pkrempa and mprivozn committed patches just in the last week that contributed to this convergence and removed some duplicated code). I also saw a few other definite bugs, as well as a couple that I think are bugs, but am not enough informed about zPCI to be certain (I've Cc'ed the author and reviewers of the original patch adding that code to the patches so that they can verify, or negate, my suspicions). Many/most of these patches are either very simple / easily verifiable code movement / removal / renaming of variables. Patch 20 is a bit more involved; viewing the new versions of the functions along with the patch would probably help it go much quicker. The first two patches in the series eliminate what I'm 99% certain is erroneous calling of the qemuDomainDetachExtensionDevice() when detaching a PCI device on S390. The commit log details my reasons for believing this code should be removed. The rest of the series eliminates small differences iteratively, arriving at a set of detach functions which are completely identical at the end (and only called from one place), and then replaces all those duplicates with a single block of common code in a higher level function that calls all of the individual functions (it was their only caller anyway). This eliminated the inconsistent application of checking for multifunction PCI devices and for the existence of a device alias. It also eliminated individual calls to qemuDomainRemove*Device() calls, and replaced them with a single call to qemuDomainRemoveDevice(). Eliminating all the calls (except one) to the individual qemuDomainRemove*Device() functions in turn made it possible to move the code that builds and queues the DEVICE_REMOVED event into a single place in the one remaining higher level caller - qemuDomainRemoveDevice() - thus eliminating the "premature event" for *all* device types at once. Laine Stump (21): qemu_hotplug: remove erroneous call to qemuDomainDetachExtensionDevice() qemu_hotplug: remove another erroneous qemuDomainDetachExtensionDevice() call qemu_hotplug: remove unnecessary check for valid PCI address qemu_hotplug: rename a virDomainDeviceInfoPtr to avoid confusion qemu_hotplug: eliminate multiple identical qemuDomainDetachHost*Device() functions qemu_hotplug: eliminate unnecessary call to qemuDomainDetachNetDevice() qemu_hotplug: refactor qemuDomainDetachDiskLive and qemuDomainDetachDiskDevice qemu_hotplug: don't call DetachThisHostDevice for hostdev network devices qemu_hotplug: merge qemuDomainDetachThisHostDevice into qemuDomainDetachHostDevice qemu_hotplug: move qemuDomainChangeGraphicsPasswords() qemu_hotplug: move (almost) all qemuDomainDetach*() functions together qemu_hotplug: move (Attach|Detach)Lease functions with others of same type qemu_hotplug: move qemuDomainDetachDeviceLive() to qemu_hotplug.c qemu_hotplug: remove extra function in middle of DetachController call chain qemu_hotplug: pull qemuDomainUpdateDeviceList out of qemuDomainDetachDeviceLive test: replace calls to individual detach functions with one call to main detach qemu_hotplug: rename dev to match in qemuDomainDetachDeviceLive qemu_hotplug: standardize the names/args/calling of qemuDomainDetach*() qemu_hotplug: new function qemuDomainRemoveAuditDevice() qemu_hotplug: consolidate all common detach code in qemuDomainDetachDeviceLive qemu_hotplug: delay sending DEVICE_REMOVED event until after *all* teardown src/qemu/qemu_driver.c | 102 +-- src/qemu/qemu_hotplug.c | 1407 ++++++++++++++++++--------------------- src/qemu/qemu_hotplug.h | 56 +- tests/qemuhotplugtest.c | 8 +- 4 files changed, 655 insertions(+), 918 deletions(-) Yay! jtomko would be proud - more deletions than insertions!!! -- 2.20.1

4 63

[libvirt] Bite sized task: #pragma once
by Daniel P. Berrangé 22 Mar '19

22 Mar '19

A heads up that I added a trivial bite sized task to convert header files to use #pragma once https://wiki.libvirt.org/page/BiteSizedTasks#Switch_headers_to_use_.23pragm… Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

1 0

[libvirt] [PATCH] virDomainMomentAssignDef: Don't dereference a NULL pointer
by Michal Privoznik 22 Mar '19

22 Mar '19

This functions tries to add a domain moment (love the name!) onto a list of domain moments. Firstly, it checks if another moment with the same name already exists. Then, it creates an empty moment (without initializing its definition) and tries to add the moment onto the list dereferencing moment definition in that process. If it succeeds (which it never can), only after that it sets moment->def. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/virdomainmomentobjlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/virdomainmomentobjlist.c b/src/conf/virdomainmomentobjlist.c index b2122e7292..01e50ae1d4 100644 --- a/src/conf/virdomainmomentobjlist.c +++ b/src/conf/virdomainmomentobjlist.c @@ -227,7 +227,7 @@ virDomainMomentAssignDef(virDomainMomentObjListPtr moments, if (!(moment = virDomainMomentObjNew())) return NULL; - if (virHashAddEntry(moments->objs, moment->def->name, moment) < 0) { + if (virHashAddEntry(moments->objs, def->name, moment) < 0) { VIR_FREE(moment); return NULL; } -- 2.19.2

3 2

[libvirt] [PATCH] nwfilter: fix adding std MAC and IP values to filter binding
by Nikolay Shirokovskiy 22 Mar '19

22 Mar '19

Commit d1a7c08eb changed filter instantiation code to ignore MAC and IP variables explicitly specified for filter binding. It just replaces explicit values with values associated with the binding. Before the commit virNWFilterCreateVarsFrom was used so that explicit value take precedence. Let's bring old behavior back. This is useful. For example if domain has two interfaces it makes sense to list both mac adresses in MAC var of every interface filterref. So that if guest make a bond of these interfaces and start sending frames with one of the mac adresses from both interfaces we can pass outgress traffic from both interfaces too. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- src/nwfilter/nwfilter_gentech_driver.c | 92 ++++++++++++---------------------- 1 file changed, 32 insertions(+), 60 deletions(-) diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index 655f088..6d68189 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -127,60 +127,6 @@ virNWFilterRuleInstFree(virNWFilterRuleInstPtr inst) /** - * virNWFilterVarHashmapAddStdValues: - * @tables: pointer to hash tabel to add values to - * @macaddr: The string of the MAC address to add to the hash table, - * may be NULL - * @ipaddr: The string of the IP address to add to the hash table; - * may be NULL - * - * Returns 0 in case of success, -1 in case an error happened with - * error having been reported. - * - * Adds a couple of standard keys (MAC, IP) to the hash table. - */ -static int -virNWFilterVarHashmapAddStdValues(virHashTablePtr table, - const char *macaddr, - const virNWFilterVarValue *ipaddr) -{ - virNWFilterVarValue *val; - - if (macaddr) { - val = virNWFilterVarValueCreateSimpleCopyValue(macaddr); - if (!val) - return -1; - - if (virHashUpdateEntry(table, - NWFILTER_STD_VAR_MAC, - val) < 0) { - virNWFilterVarValueFree(val); - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("Could not add variable 'MAC' to hashmap")); - return -1; - } - } - - if (ipaddr) { - val = virNWFilterVarValueCopy(ipaddr); - if (!val) - return -1; - - if (virHashUpdateEntry(table, - NWFILTER_STD_VAR_IP, - val) < 0) { - virNWFilterVarValueFree(val); - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("Could not add variable 'IP' to hashmap")); - return -1; - } - } - - return 0; -} - - -/** * Convert a virHashTable into a string of comma-separated * variable names. */ @@ -705,6 +651,28 @@ virNWFilterDoInstantiate(virNWFilterTechDriverPtr techdriver, } +static int +virNWFilterVarHashmapAddStdValue(virHashTablePtr table, + const char *var, + const char *value) +{ + virNWFilterVarValue *val; + + if (virHashLookup(table, var)) + return 0; + + if (!(val = virNWFilterVarValueCreateSimpleCopyValue(value))) + return -1; + + if (virHashAddEntry(table, var, val) < 0) { + virNWFilterVarValueFree(val); + return -1; + } + + return 0; +} + + /* * Call this function while holding the NWFilter filter update lock */ @@ -717,7 +685,7 @@ virNWFilterInstantiateFilterUpdate(virNWFilterDriverStatePtr driver, bool forceWithPendingReq, bool *foundNewFilter) { - int rc; + int rc = -1; const char *drvname = EBIPTABLES_DRIVER_ID; virNWFilterTechDriverPtr techdriver; virNWFilterObjPtr obj; @@ -743,14 +711,18 @@ virNWFilterInstantiateFilterUpdate(virNWFilterDriverStatePtr driver, return -1; virMacAddrFormat(&binding->mac, vmmacaddr); + if (virNWFilterVarHashmapAddStdValue(binding->filterparams, + NWFILTER_STD_VAR_MAC, + vmmacaddr) < 0) + goto err_exit; ipaddr = virNWFilterIPAddrMapGetIPAddr(binding->portdevname); - - if (virNWFilterVarHashmapAddStdValues(binding->filterparams, - vmmacaddr, ipaddr) < 0) { - rc = -1; + if (ipaddr && + virNWFilterVarHashmapAddStdValue(binding->filterparams, + NWFILTER_STD_VAR_IP, + virNWFilterVarValueGetSimple(ipaddr)) < 0) goto err_exit; - } + filter = virNWFilterObjGetDef(obj); -- 1.8.3.1

2 4

[libvirt] [PATCH] xml: nodedev: make pci capability class element optional
by Nikolay Shirokovskiy 22 Mar '19

22 Mar '19

Commit 3bd4ed46 introduced this element as required which breaks backcompat for test driver. Let's make the element optional. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- docs/formatnode.html.in | 2 +- docs/schemas/nodedev.rng | 12 ++++++----- src/conf/node_device_conf.c | 23 +++++++++++----------- src/conf/node_device_conf.h | 2 +- src/node_device/node_device_udev.c | 2 +- .../pci_0000_02_10_7_sriov_pf_vfs_all.xml | 1 - 6 files changed, 22 insertions(+), 20 deletions(-) diff --git a/docs/formatnode.html.in b/docs/formatnode.html.in index 5095b97..c2a8f8f 100644 --- a/docs/formatnode.html.in +++ b/docs/formatnode.html.in @@ -71,7 +71,7 @@ include: <dl> <dt><code>class</code></dt> - <dd>Combined class, subclass and + <dd>Optional element for combined class, subclass and programming interface codes as 6-digit hexadecimal number. <span class="since">Since 5.2.0</span></dd> <dt><code>domain</code></dt> diff --git a/docs/schemas/nodedev.rng b/docs/schemas/nodedev.rng index 0f45d79..fe6ffa0 100644 --- a/docs/schemas/nodedev.rng +++ b/docs/schemas/nodedev.rng @@ -133,11 +133,13 @@ <value>pci</value> </attribute> - <element name='class'> - <data type="string"> - <param name="pattern">0x[0-9a-fA-F]{6}</param> - </data> - </element> + <optional> + <element name='class'> + <data type="string"> + <param name="pattern">0x[0-9a-fA-F]{6}</param> + </data> + </element> + </optional> <element name='domain'> <ref name='unsignedLong'/> </element> diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 19c601a..b96d10c 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -208,7 +208,8 @@ virNodeDeviceCapPCIDefFormat(virBufferPtr buf, { size_t i; - virBufferAsprintf(buf, "<class>0x%.6x</class>\n", data->pci_dev.klass); + if (data->pci_dev.klass >= 0) + virBufferAsprintf(buf, "<class>0x%.6x</class>\n", data->pci_dev.klass); virBufferAsprintf(buf, "<domain>%d</domain>\n", data->pci_dev.domain); virBufferAsprintf(buf, "<bus>%d</bus>\n", data->pci_dev.bus); @@ -1645,16 +1646,16 @@ virNodeDevCapPCIDevParseXML(xmlXPathContextPtr ctxt, orignode = ctxt->node; ctxt->node = node; - if (virNodeDevCapsDefParseHexId("string(./class[1])", ctxt, - &pci_dev->klass, def, - _("no PCI class supplied for '%s'"), - _("invalid PCI class supplied for '%s'")) < 0) - goto out; - - if (pci_dev->klass > 0xffffff) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("invalid PCI class supplied for '%s'"), def->name); - goto out; + if ((tmp = virXPathString("string(./class[1])", ctxt))) { + if (virStrToLong_i(tmp, NULL, 16, &pci_dev->klass) < 0 || + pci_dev->klass > 0xffffff) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("invalid PCI class supplied for '%s'"), def->name); + goto out; + } + VIR_FREE(tmp); + } else { + pci_dev->klass = -1; } if (virNodeDevCapsDefParseULong("number(./domain[1])", ctxt, diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h index b13bc13..e8cb315 100644 --- a/src/conf/node_device_conf.h +++ b/src/conf/node_device_conf.h @@ -153,7 +153,7 @@ struct _virNodeDevCapPCIDev { unsigned int function; unsigned int product; unsigned int vendor; - unsigned int klass; + int klass; char *product_name; char *vendor_name; virPCIDeviceAddressPtr physical_function; diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index f0e61e4..5ed3463 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -402,7 +402,7 @@ udevProcessPCI(struct udev_device *device, privileged = driver->privileged; nodeDeviceUnlock(); - if (udevGetUintProperty(device, "PCI_CLASS", &pci_dev->klass, 16) < 0) + if (udevGetIntProperty(device, "PCI_CLASS", &pci_dev->klass, 16) < 0) goto cleanup; if ((p = strrchr(def->sysfs_path, '/')) == NULL || diff --git a/tests/nodedevschemadata/pci_0000_02_10_7_sriov_pf_vfs_all.xml b/tests/nodedevschemadata/pci_0000_02_10_7_sriov_pf_vfs_all.xml index 74036a6..9e8dace 100644 --- a/tests/nodedevschemadata/pci_0000_02_10_7_sriov_pf_vfs_all.xml +++ b/tests/nodedevschemadata/pci_0000_02_10_7_sriov_pf_vfs_all.xml @@ -2,7 +2,6 @@ <name>pci_0000_02_10_7</name> <parent>pci_0000_00_04_0</parent> <capability type='pci'> - <class>0xffffff</class> <domain>0</domain> <bus>2</bus> <slot>16</slot> -- 1.8.3.1

2 6

[libvirt] [PATCH v2 0/4] tests: qemuxml2argv: support optional arguments
by Cole Robinson 22 Mar '19

22 Mar '19

Small/completion follow up to v1 here, which is mostly pushed: https://www.redhat.com/archives/libvir-list/2019-March/msg00943.html Patch 1 and 3 are new additions based on Andrea's reviews. Rest of the review comments should be addressed Cole Robinson (4): tests: qemuxml2argv: Tweak TEST_CAPS_PATH tests: qemuxml2argv: move DO_CAPS_TEST* qemuCaps init tests: qemuxml2argv: report error on ARG_* collisions tests: qemuxml2argv: add DO_TEST_INTERNAL tests/qemuxml2argvtest.c | 102 +++++++++++++++++++++++++-------------- 1 file changed, 66 insertions(+), 36 deletions(-) -- 2.21.0

2 8