- Devel - libvirt List Archives

[libvirt] [PATCH] network: Use @nnames instead of @got
by John Ferlan 17 Aug '17

17 Aug '17

To make it clearer, let's use @nnames instead of @got for counting the names in the @names array. Keeps things consistent and clear. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- NB: Be sure you're tree is up to date before attempting to apply ;-) src/conf/virnetworkobj.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index 918ef44..b16844d 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -1444,9 +1444,9 @@ struct virNetworkObjListGetHelperData { virConnectPtr conn; virNetworkObjListFilter filter; char **names; + int nnames; int maxnames; bool active; - int got; bool error; }; @@ -1462,7 +1462,7 @@ virNetworkObjListGetHelper(void *payload, return 0; if (data->maxnames >= 0 && - data->got == data->maxnames) + data->nnames == data->maxnames) return 0; virObjectLock(obj); @@ -1474,11 +1474,11 @@ virNetworkObjListGetHelper(void *payload, if ((data->active && virNetworkObjIsActive(obj)) || (!data->active && !virNetworkObjIsActive(obj))) { if (data->names && - VIR_STRDUP(data->names[data->got], obj->def->name) < 0) { + VIR_STRDUP(data->names[data->nnames], obj->def->name) < 0) { data->error = true; goto cleanup; } - data->got++; + data->nnames++; } cleanup: @@ -1498,8 +1498,8 @@ virNetworkObjListGetNames(virNetworkObjListPtr nets, int ret = -1; struct virNetworkObjListGetHelperData data = { - .conn = conn, .filter = filter, .names = names, - .maxnames = maxnames, .active = active, .got = 0, .error = false}; + .conn = conn, .filter = filter, .names = names, .nnames = 0, + .maxnames = maxnames, .active = active, .error = false}; virObjectLock(nets); virHashForEach(nets->objs, virNetworkObjListGetHelper, &data); @@ -1508,11 +1508,11 @@ virNetworkObjListGetNames(virNetworkObjListPtr nets, if (data.error) goto cleanup; - ret = data.got; + ret = data.nnames; cleanup: if (ret < 0) { - while (data.got) - VIR_FREE(data.names[--data.got]); + while (data.nnames) + VIR_FREE(data.names[--data.nnames]); } return ret; } @@ -1525,14 +1525,14 @@ virNetworkObjListNumOfNetworks(virNetworkObjListPtr nets, virConnectPtr conn) { struct virNetworkObjListGetHelperData data = { - .conn = conn, .filter = filter, .names = NULL, - .maxnames = -1, .active = active, .got = 0, .error = false}; + .conn = conn, .filter = filter, .names = NULL, .nnames = 0, + .maxnames = -1, .active = active, .error = false}; virObjectLock(nets); virHashForEach(nets->objs, virNetworkObjListGetHelper, &data); virObjectUnlock(nets); - return data.got; + return data.nnames; } -- 2.9.4

2 1

[libvirt] [PATCH] conf: Use the correct limit for the number of PHBs
by Andrea Bolognani 17 Aug '17

17 Aug '17

I mistakenly thought pSeries guests supported 32 PHBs, but it turns out they only support 31. Validate the target index accordingly. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1479647 Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/conf/domain_conf.c | 4 ++-- src/qemu/qemu_domain_address.c | 4 ++-- .../qemuxml2argv-pseries-phb-too-many.xml | 19 +++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 4 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-too-many.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 281dc68f0..8257f04ab 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9326,10 +9326,10 @@ virDomainControllerDefParseXML(xmlNodePtr node, goto error; } if (def->opts.pciopts.targetIndex < 0 || - def->opts.pciopts.targetIndex > 31) { + def->opts.pciopts.targetIndex > 30) { virReportError(VIR_ERR_XML_ERROR, _("PCI controller target index '%s' out of " - "range - must be 0-31"), + "range - must be 0-30"), targetIndex); goto error; } diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 8066ed123..04438fae9 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -2157,9 +2157,9 @@ qemuDomainAddressFindNewTargetIndex(virDomainDefPtr def) int targetIndex; int ret = -1; - /* Try all indexes between 1 and 31 - QEMU only supports 32 + /* Try all indexes between 1 and 30 - QEMU only supports 31 * PHBs, and 0 is reserved for the default, implicit one */ - for (targetIndex = 1; targetIndex <= 31; targetIndex++) { + for (targetIndex = 1; targetIndex <= 30; targetIndex++) { bool found = false; size_t i; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-too-many.xml b/tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-too-many.xml new file mode 100644 index 000000000..3d99da499 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-too-many.xml @@ -0,0 +1,19 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> + <memory unit='KiB'>524288</memory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='ppc64' machine='pseries'>hvm</type> + </os> + <devices> + <emulator>/usr/bin/qemu-system-ppc64</emulator> +  + <controller type='pci' model='pci-root'> + <target index='31'/> + </controller> + <controller type='usb' model='none'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 77cfe8d28..47ca90f04 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1761,6 +1761,7 @@ mymain(void) DO_TEST("pseries-phb-simple", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); + DO_TEST_PARSE_ERROR("pseries-phb-too-many", NONE); DO_TEST("pseries-phb-default-missing", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); -- 2.13.5

2 1

[libvirt] [PATCH] Don't autogenerate seclabels of type 'none'
by Jim Fehlig 17 Aug '17

17 Aug '17

When security drivers are active and domain def contains no <seclabel> elements, there is no need to autogenerate seclabels when starting the domain, e.g. <seclabel type='none' model='apparmor'/> In fact, autogenerating the label can result in needless save/restore and migration failures when the security driver is not active on the restore/migration target. The virSecurityManagerGenLabel function in src/security_manager.c even has logic to skip autogenerated labels, but the logic is a bit flawed. Autogeneration should be skipped when the domain has not seclabels, i.e. vm->nseclabels == 0. Resolves: https://bugzilla.opensuse.org/show_bug.cgi?id=1051017 Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/security/security_manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/security/security_manager.c b/src/security/security_manager.c index 013bbc37e..441c4d1fd 100644 --- a/src/security/security_manager.c +++ b/src/security/security_manager.c @@ -670,7 +670,7 @@ virSecurityManagerGenLabel(virSecurityManagerPtr mgr, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Unconfined guests are not allowed on this host")); goto cleanup; - } else if (vm->nseclabels && generated) { + } else if (vm->nseclabels == 0 && generated) { VIR_DEBUG("Skipping auto generated seclabel of type none"); virSecurityLabelDefFree(seclabel); seclabel = NULL; -- 2.13.1

2 2

[libvirt] [PATCH v2 00/20] Make the virNetworkObjPtr private
by John Ferlan 16 Aug '17

16 Aug '17

v1: https://www.redhat.com/archives/libvir-list/2017-May/msg00701.html (but reviewed much more recently) NOTE from v1: Patches 1-3 already pushed Former patch 4: * Patch 1 (NEW) - splits out the formatting change in bridge_driver.h * Patch 2 - Remainder of the change for consistent naming NB: Without the split, there was a R-B, but I didn't push so that the split could be "seen". Former patch 5: * Patch 3 (NEW) - from review create virMacMapFileName in src/util/virmacmap.c * Patch 4 - Remainder of the previous change w/ adjusted name of course * Patch 5 (NEW) - from review, alter virNetworkObjUnrefMacMap Former patch 6: * Patch 6 - No change Former patch 7: * Patch 7 (NEW) - Split out the @class_id to @classIdMap change * Patch 8 - Remainder of previous change Former patch 8: * Patch 9 - No change Former patch 9: * Patch 10 - Make suggested naming adjustments Add/use virNetworkObjSetDef API Former patch 10: * Patch 11 - Move code back to driver, just have accessors for @autostart Former patch 11: * Patch 12 - No change Former patch 12: * Patch 13 - Use virNetworkObjIsPersistent in networkSetAutostart Former patch 13: * Patch 14 - No change Former patch 14: * Patch 15 - Just have the virNetworkObjNew lock the object now and make use of that with using virNetworkObjEndAPI in networkxml2conftest NB: Since we'll have a refcnt=1 and lock=true after New the EndAPI is proper * Patch 16 (NEW) - Just move the virObjectRef - makes it clearer why it's being ref'd Former patch 15: * Patch 17 (NEW) - Split out the rename of @nnames to @maxnames and explain the reason better * Patch 18 (NEW) - Split out the rename of @filter to @aclnames and explain the reason better * Patch 19 - The remainder of the former patch Former patch 16: * Patch 20 - No change (other than merge conflict resolution) John Ferlan (20): network: Perform some formatting cleanup in bridge_driver.h network: Use consistent naming in bridge_driver for virNetwork objects network: Move and rename networkMacMgrFileName network: Move macmap mgmt from bridge_driver to virnetworkobj network: Unconditionally initialize macmap when stopping virtual network network: Add virNetworkObj Get/Set API's for @dnsmasqPid and @radvdPid network: Alter virNetworkObj @class_id to be @classIdMap network: Introduce virNetworkObjGetClassIdMap network: Add virNetworkObj Get/Set API's for @floor_sum network: Add virNetworkObj Get/Set API's for @def and @newDef network: Introduce virNetworkObj{Get|Set}Autostart network: Introduce virNetworkObj{Is|Set}Active network: Introduce virNetworkObjIsPersistent network: Consistent use of @obj for virnetworkobj network: Have virNetworkObjNew lock the returned object network: Move virObjectRef during AssignDef processing network: Use @maxnames instead of @nnames network: Rename @filter to @aclfilter network: Modify naming for virNetworkObjList* fetching APIs network: Privatize virNetworkObj src/conf/virnetworkobj.c | 614 +++++++++++++++------- src/conf/virnetworkobj.h | 105 ++-- src/libvirt_private.syms | 21 + src/network/bridge_driver.c | 1218 ++++++++++++++++++++++--------------------- src/network/bridge_driver.h | 50 +- src/test/test_driver.c | 83 +-- src/util/virmacmap.c | 12 + src/util/virmacmap.h | 4 + tests/networkxml2conftest.c | 11 +- 9 files changed, 1231 insertions(+), 887 deletions(-) -- 2.9.4

3 38

[libvirt] [PATCH 0/4] Alter @aclfilter to just @filter
by John Ferlan 16 Aug '17

16 Aug '17

>From recent review comments in the network series, Michal and Pavel have both stated the preference to use @filter, so to be consistent, rename variables that were changed in prior series. John Ferlan (4): nodedev: Alter @aclfilter to just @filter nwfilter: Alter @aclfilter to just @filter secret: Alter @aclfilter to just @filter storage: Alter @aclfilter to just @filter src/conf/virnodedeviceobj.c | 28 ++++++++++++++-------------- src/conf/virnodedeviceobj.h | 6 +++--- src/conf/virnwfilterobj.c | 18 +++++++++--------- src/conf/virnwfilterobj.h | 6 +++--- src/conf/virsecretobj.c | 24 ++++++++++++------------ src/conf/virsecretobj.h | 6 +++--- src/conf/virstorageobj.c | 20 ++++++++++---------- src/conf/virstorageobj.h | 10 +++++----- 8 files changed, 59 insertions(+), 59 deletions(-) -- 2.9.4

2 5

[libvirt] question about locking in qemuDomainObjBeginJobInternal()
by Chris Friesen 16 Aug '17

16 Aug '17

Hi, I'm hitting a scenario (on libvirt 1.2.12, so yeah it's a bit old) where I'm attempting to create two domains at the same time, and they both end up erroring out with "cannot acquire state change lock": 2017-08-14T12:57:00.000 79674: warning : qemuDomainObjBeginJobInternal:1380 : Cannot start job (modify, none) for domain instance-00000001; current job is (modify, none) owned by (79673, 0) 2017-08-14T12:57:00.000 79674: error : qemuDomainObjBeginJobInternal:1385 : Timed out during operation: cannot acquire state change lock 2017-08-14T12:57:01.000 79675: warning : qemuDomainObjBeginJobInternal:1380 : Cannot start job (modify, none) for domain instance-00000002; current job is (modify, none) owned by (79677, 0) 2017-08-14T12:57:01.000 79675: error : qemuDomainObjBeginJobInternal:1385 : Timed out during operation: cannot acquire state change lock Given that the lock appears to be per-domain, I assume this means that something is trying to issue multiple operations in parallel to each domain? Chris

2 1

[libvirt] IRC support thanks
by Rob Whyte 16 Aug '17

16 Aug '17

Hi from Tasmania Australia, I am writing to express gratitude twoard those on the IRC channel for soem hand-holding support iwth FVirt. In turn I would like to commit some patches to tidy up some docus. Until then. cheers Rob

2 1

[libvirt] [PATCH] libvirtd.conf: Drop max_requests
by Michal Privoznik 16 Aug '17

16 Aug '17

Since its introduction in f61341173bdaa2e0 it was never implemented nor there are plans to implement it. Drop it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- daemon/libvirtd-config.c | 3 --- daemon/libvirtd-config.h | 1 - daemon/libvirtd.aug | 1 - daemon/libvirtd.conf | 14 ++------------ daemon/test_libvirtd.aug.in | 1 - 5 files changed, 2 insertions(+), 18 deletions(-) diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c index db283a41f..19b3d168e 100644 --- a/daemon/libvirtd-config.c +++ b/daemon/libvirtd-config.c @@ -153,7 +153,6 @@ daemonConfigNew(bool privileged ATTRIBUTE_UNUSED) data->prio_workers = 5; - data->max_requests = 20; data->max_client_requests = 5; data->audit_level = 1; @@ -348,8 +347,6 @@ daemonConfigLoadOptions(struct daemonConfig *data, if (virConfGetValueUInt(conf, "prio_workers", &data->prio_workers) < 0) goto error; - if (virConfGetValueUInt(conf, "max_requests", &data->max_requests) < 0) - goto error; if (virConfGetValueUInt(conf, "max_client_requests", &data->max_client_requests) < 0) goto error; diff --git a/daemon/libvirtd-config.h b/daemon/libvirtd-config.h index 1edf5fadb..d618c9660 100644 --- a/daemon/libvirtd-config.h +++ b/daemon/libvirtd-config.h @@ -71,7 +71,6 @@ struct daemonConfig { unsigned int prio_workers; - unsigned int max_requests; unsigned int max_client_requests; unsigned int log_level; diff --git a/daemon/libvirtd.aug b/daemon/libvirtd.aug index 24fdf445c..df310d876 100644 --- a/daemon/libvirtd.aug +++ b/daemon/libvirtd.aug @@ -60,7 +60,6 @@ module Libvirtd = | int_entry "max_clients" | int_entry "max_queued_clients" | int_entry "max_anonymous_clients" - | int_entry "max_requests" | int_entry "max_client_requests" | int_entry "prio_workers" diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf index e83e9a1c1..8a1b3a92d 100644 --- a/daemon/libvirtd.conf +++ b/daemon/libvirtd.conf @@ -301,20 +301,10 @@ # (notably domainDestroy) can be executed in this pool. #prio_workers = 5 -# Total global limit on concurrent RPC calls. Should be -# at least as large as max_workers. Beyond this, RPC requests -# will be read into memory and queued. This directly impacts -# memory usage, currently each request requires 256 KB of -# memory. So by default up to 5 MB of memory is used -# -# XXX this isn't actually enforced yet, only the per-client -# limit is used so far -#max_requests = 20 - # Limit on concurrent requests from a single client # connection. To avoid one client monopolizing the server -# this should be a small fraction of the global max_requests -# and max_workers parameter +# this should be a small fraction of the global max_workers +# parameter. #max_client_requests = 5 # Same processing controls, but this time for the admin interface. diff --git a/daemon/test_libvirtd.aug.in b/daemon/test_libvirtd.aug.in index 12009528f..b24b32e33 100644 --- a/daemon/test_libvirtd.aug.in +++ b/daemon/test_libvirtd.aug.in @@ -42,7 +42,6 @@ module Test_libvirtd = { "min_workers" = "5" } { "max_workers" = "20" } { "prio_workers" = "5" } - { "max_requests" = "20" } { "max_client_requests" = "5" } { "admin_min_workers" = "1" } { "admin_max_workers" = "5" } -- 2.13.0

2 1

Re: [libvirt] [Qemu-devel] ask a question
by Stefan Hajnoczi 16 Aug '17

16 Aug '17

On Wed, Aug 16, 2017 at 02:25:19PM +0800, 皮智 wrote: > Hi，I meet a problem with vm, my environment is qemu-kvm-2.3, > virtio-win-0.1.126, host(centos7.2), guest(windows10). > > libvirt xml has four virtio-serial channel as follows: CCing the libvirt mailing list. This may be a libvirt issue. > <channel type='spicevmc'> > <target type='virtio' name='com.redhat.spice.0' state='connected'/> > <alias name='channel0'/> > <address type='virtio-serial' controller='0' bus='0' port='1'/> > </channel> > <channel type='unix'> > <source mode='bind' > path='/var/lib/libvirt/qemu/e597eab9-95db-46e9-96f0-12a84c692569'/> > <target type='virtio' name='pv-mon' state='connected'/> > <alias name='channel1'/> > <address type='virtio-serial' controller='0' bus='0' port='2'/> > </channel> > <channel type='unix'> > <source mode='bind' > path='/var/lib/libvirt/qemu/e597eab9-95db-46e9-96f0-12a84c692569-qga'/> > <target type='virtio' name='org.qemu.guest_agent.0' > state='connected'/> > <alias name='channel2'/> > <address type='virtio-serial' controller='0' bus='0' port='3'/> > </channel> > <channel type='unix'> > <source mode='bind' > path='/var/lib/libvirt/qemu/e597eab9-95db-46e9-96f0-12a84c692569-report'/> > <target type='virtio' name='qga-active-report' state='connected'/> > <alias name='channel3'/> > <address type='virtio-serial' controller='0' bus='0' port='4'/> > </channel> > > If I hard reboot the vm, it may happen as follows: > > 2017-08-14T07:51:18.401008Z qemu-kvm: virtio-serial-bus: Unexpected port id > 1122983520 for device virtio-serial0.0 > 2017-08-14T07:51:18.956482Z qemu-kvm: virtio-serial-bus: Guest failure in > adding device virtio-serial0.0 > 2017-08-14T07:51:29.176795Z qemu-kvm: virtio-serial-bus: Guest failure in > adding device virtio-serial0.0 > 2017-08-14T07:51:34.454819Z qemu-kvm: virtio-serial-bus: Unexpected port id > 2042451128 for device virtio-serial0.0 > 2017-08-14T07:51:44.655068Z qemu-kvm: virtio-serial-bus: Guest failure in > adding device virtio-serial0.0 > 2017-08-14T07:51:49.764201Z qemu-kvm: virtio-serial-bus: Unexpected port id > 1122983520 for device virtio-serial0.0 > 2017-08-14T07:51:59.969836Z qemu-kvm: virtio-serial-bus: Guest failure in > adding device virtio-serial0.0 > 2017-08-14T07:52:21.564461Z qemu-kvm: virtio-serial-bus: Unexpected port id > 1122983520 for device virtio-serial0.0 > 2017-08-14T07:52:47.059452Z qemu-kvm: virtio-serial-bus: Guest failure in > adding device virtio-serial0.0 > 2017-08-14T07:53:22.710677Z qemu-kvm: virtio-serial-bus: Unexpected port id > 1122983520 for device virtio-serial0.0 > 2017-08-14T07:53:32.781204Z qemu-kvm: virtio-serial-bus: Guest failure in > adding device virtio-serial0.0 > 2017-08-14T07:53:48.040513Z qemu-kvm: virtio-serial-bus: Unexpected port id > 3179968584 for device virtio-serial0.0 > 2017-08-14T07:54:23.547393Z qemu-kvm: virtio-serial-bus: Unexpected port id > 1122983520 for device virtio-serial0.0 > 2017-08-14T07:55:54.350754Z qemu-kvm: virtio-serial-bus: Unexpected port id > 1122983520 for device virtio-serial0.0 > 2017-08-14T07:56:09.393056Z qemu-kvm: virtio-serial-bus: Unexpected port id > 1122983520 for device virtio-serial0.0 > 2017-08-14T07:57:39.670850Z qemu-kvm: virtio-serial-bus: Unexpected port id > 1122983520 for device virtio-serial0.0 > 2017-08-14T07:58:09.867650Z qemu-kvm: virtio-serial-bus: Unexpected port id > 1185792 for device virtio-serial0.0 > 2017-08-14T07:59:10.053208Z qemu-kvm: virtio-serial-bus: Unexpected port id > 1122983520 for device virtio-serial0.0 > 2017-08-14T08:00:20.235162Z qemu-kvm: virtio-serial-bus: Guest failure in > adding device virtio-serial0.0 > 2017-08-14T08:01:20.394196Z qemu-kvm: virtio-serial-bus: Guest failure in > adding device virtio-serial0.0 > > So, the virtio-serial port will not be available, it cause my program > doesn't start in guest(windows10). > Can you give me some advices ? > > Looking forward to your reply.

1 0

[libvirt] [RFC v4 00/13] qmp: query-device-slots command
by Eduardo Habkost 15 Aug '17

15 Aug '17

Changelog --------- Changes v3 -> v4: * New compact representation of slot sets. * New generic code to automatically merge similar slots into a single entry in the command output while keeping implementations of the method simpler. * Example implementation of IDE and USB bus enumeration Changes v2 -> v3: * Implemented a "slot set" structure, where multiple slots can be reported by using integer ranges or lists for possible values for each property. Added a ValueSet struct, that can represent a set of values using either a simple list of values, or integer ranges. (Its JSON representation is very verbose, though. See comments below). * Removed the *Properties structs, and replaced them with a simple list of SlotOption structs. * DeviceSlotInfo is not an union anymore, removed the 'type' field only because there are no slot-type-specific fields in the current implementation, but we may add it back if necessary * The implementation is very quick and dirty, the main purpose of this RFC is to evaluate the schema and returned data. Changes v1 -> v2: * Don't show sysbus unless has_dynamic_sysbus is set for the machine type * Removed max-devices and devices properties * Introduced "non-slot" slot type, to explicitly indicate we are returning info on a bus that doesn't implement slot enumeration yet. * Return bus name instead of full QOM path on "bus" field * PCI: Replaced "addr" property (string parsed by property setter) with "device-number" uint32 property * PCI: return only one slot for PCIe ports Summary ------- This adds a new command to QMP: query-device-slots. It will allow management software to query possible slots where devices can be plugged. This implementation of the command will return: * Multiple PCI slots per bus, in the case of PCI buses; * One slot for each entry from query-hotpluggable-cpus. * One slot per bus for the other buses (that don't implement slot enumeration yet), with opts-complete=false Representation of slot sets in JSON ----------------------------------- Slot sets are represented by a list of option names and sets of possible values for each of those options. The command uses a compact representation for the set of valid values for an option. For example, the following set of 5 PCI functions: bus: pcie.0 device-number: 31 functions: 1,4,5,6,7 would be represented in the JSON data as: {"available":false,"count":5, "device-types":["pci-device"],"hotpluggable":false, "opts":[ {"option":"function","values":[1,[4,7]]}, {"option":"device-number","values":31}, {"option":"bus","values":"pcie.0"}], "opts-complete":true} I planned to use QAPI alternates to model/document that in the schema, but it would require implementing a few missing features in QAPI alternate support. TODO ---- * Differentiation between legacy-pci-device and pcie-device * Implement enumeration for other buses * Document the slotinfo.c functions * Optimize the slot/option merging algorithm Example output -------------- Using the following QEMU command-line: $ qemu-system-x86_64 -machine q35,accel=kvm \ -smp 16,maxcpus=32,threads=2,cores=2 query-device-slots will return the following entries: {"available":true,"count":224, "device-types":["pci-device"],"hotpluggable":false, "opts":[ {"option":"function","values":[[0,7]]}, {"option":"device-number","values":[[3,30]]}, {"option":"bus","values":"pcie.0"}], "opts-complete":true} {"available":true,"count":1, "device-types":["ide-device"],"hotpluggable":false, "opts":[ {"option":"unit","values":0}, {"option":"bus","values":"ide.2"}], "opts-complete":true} {"available":true,"count":10, "device-types":["ide-device"],"hotpluggable":false, "opts":[ {"option":"unit","values":[[0,1]]}, {"option":"bus","values":["ide.4","ide.3","ide.5","ide.0","ide.1"]}], "opts-complete":true} {"available":true, "device-types":["isa-device"],"hotpluggable":false, "opts":[ {"option":"bus","values":"isa.0"}], "opts-complete":false} {"available":true,"count":16, "device-types":["qemu64-x86_64-cpu"],"hotpluggable":true, "opts":[ {"option":"socket-id","values":[[4,7]]}, {"option":"thread-id","values":[[0,1]]}, {"option":"core-id","values":[[0,1]]}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[16]", "device-types":["qemu64-x86_64-cpu"],"hotpluggable":true, "opts":[ {"option":"socket-id","values":3}, {"option":"thread-id","values":1}, {"option":"core-id","values":1}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[15]", "device-types":["qemu64-x86_64-cpu"],"hotpluggable":true, "opts":[ {"option":"socket-id","values":3}, {"option":"thread-id","values":0}, {"option":"core-id","values":1}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[14]", "device-types":["qemu64-x86_64-cpu"],"hotpluggable":true, "opts":[ {"option":"socket-id","values":3}, {"option":"thread-id","values":1}, {"option":"core-id","values":0}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[13]", "device-types":["qemu64-x86_64-cpu"],"hotpluggable":true, "opts":[ {"option":"socket-id","values":3}, {"option":"thread-id","values":0}, {"option":"core-id","values":0}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[12]", "device-types":["qemu64-x86_64-cpu"],"hotpluggable":true, "opts":[ {"option":"socket-id","values":2}, {"option":"thread-id","values":1}, {"option":"core-id","values":1}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[11]", "device-types":["qemu64-x86_64-cpu"],"hotpluggable":true, "opts":[ {"option":"socket-id","values":2}, {"option":"thread-id","values":0}, {"option":"core-id","values":1}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[10]", "device-types":["qemu64-x86_64-cpu"],"hotpluggable":true, "opts":[ {"option":"socket-id","values":2}, {"option":"thread-id","values":1}, {"option":"core-id","values":0}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[9]", "device-types":["qemu64-x86_64-cpu"],"hotpluggable":true, "opts":[ {"option":"socket-id","values":2}, {"option":"thread-id","values":0}, {"option":"core-id","values":0}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[8]", "device-types":["qemu64-x86_64-cpu"],"hotpluggable":true, "opts":[ {"option":"socket-id","values":1}, {"option":"thread-id","values":1}, {"option":"core-id","values":1}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[7]", "device-types":["qemu64-x86_64-cpu"],"hotpluggable":true, "opts":[ {"option":"socket-id","values":1}, {"option":"thread-id","values":0}, {"option":"core-id","values":1}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[6]", "device-types":["qemu64-x86_64-cpu"],"hotpluggable":true, "opts":[ {"option":"socket-id","values":1}, {"option":"thread-id","values":1}, {"option":"core-id","values":0}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[5]", "device-types":["qemu64-x86_64-cpu"],"hotpluggable":true, "opts":[ {"option":"socket-id","values":1}, {"option":"thread-id","values":0}, {"option":"core-id","values":0}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[4]", "device-types":["qemu64-x86_64-cpu"],"hotpluggable":true, "opts":[ {"option":"socket-id","values":0}, {"option":"thread-id","values":1}, {"option":"core-id","values":1}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[3]", "device-types":["qemu64-x86_64-cpu"],"hotpluggable":true, "opts":[ {"option":"socket-id","values":0}, {"option":"thread-id","values":0}, {"option":"core-id","values":1}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[2]", "device-types":["qemu64-x86_64-cpu"],"hotpluggable":true, "opts":[ {"option":"socket-id","values":0}, {"option":"thread-id","values":1}, {"option":"core-id","values":0}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[0]", "device-types":["qemu64-x86_64-cpu"],"hotpluggable":true, "opts":[ {"option":"socket-id","values":0}, {"option":"thread-id","values":0}, {"option":"core-id","values":0}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/q35/mch", "device-types":["pci-device"],"hotpluggable":false, "opts":[ {"option":"function","values":0}, {"option":"device-number","values":0}, {"option":"bus","values":"pcie.0"}], "opts-complete":true} {"available":false,"count":21, "device-types":["pci-device"],"hotpluggable":false, "opts":[ {"option":"function","values":[[1,7]]}, {"option":"device-number","values":[[0,2]]}, {"option":"bus","values":"pcie.0"}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[44]", "device-types":["pci-device"],"hotpluggable":false, "opts":[ {"option":"function","values":0}, {"option":"device-number","values":1}, {"option":"bus","values":"pcie.0"}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[45]", "device-types":["pci-device"],"hotpluggable":false, "opts":[ {"option":"function","values":0}, {"option":"device-number","values":2}, {"option":"bus","values":"pcie.0"}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[18]", "device-types":["pci-device"],"hotpluggable":false, "opts":[ {"option":"function","values":0}, {"option":"device-number","values":31}, {"option":"bus","values":"pcie.0"}], "opts-complete":true} {"available":false,"count":5, "device-types":["pci-device"],"hotpluggable":false, "opts":[ {"option":"function","values":[1,[4,7]]}, {"option":"device-number","values":31}, {"option":"bus","values":"pcie.0"}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[33]", "device-types":["pci-device"],"hotpluggable":false, "opts":[ {"option":"function","values":2}, {"option":"device-number","values":31}, {"option":"bus","values":"pcie.0"}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[35]", "device-types":["pci-device"],"hotpluggable":false, "opts":[ {"option":"function","values":3}, {"option":"device-number","values":31}, {"option":"bus","values":"pcie.0"}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[34]", "device-types":["ide-device"],"hotpluggable":false, "opts":[ {"option":"unit","values":1}, {"option":"bus","values":"ide.2"}], "opts-complete":true} {"available":false,"device":"/machine/unattached/device[32]", "device-types":["isa-device"],"hotpluggable":false, "opts":[ {"option":"bus","values":"isa.0"}], "opts-complete":false} {"available":false,"device":"/machine/unattached/device[31]", "device-types":["isa-device"],"hotpluggable":false, "opts":[ {"option":"bus","values":"isa.0"}], "opts-complete":false} {"available":false,"device":"/machine/unattached/device[30]", "device-types":["isa-device"],"hotpluggable":false, "opts":[ {"option":"bus","values":"isa.0"}], "opts-complete":false} {"available":false,"device":"/machine/unattached/device[29]", "device-types":["isa-device"],"hotpluggable":false, "opts":[ {"option":"bus","values":"isa.0"}], "opts-complete":false} {"available":false,"device":"/machine/unattached/device[28]", "device-types":["isa-device"],"hotpluggable":false, "opts":[ {"option":"bus","values":"isa.0"}], "opts-complete":false} {"available":false,"device":"/machine/unattached/device[27]", "device-types":["isa-device"],"hotpluggable":false, "opts":[ {"option":"bus","values":"isa.0"}], "opts-complete":false} {"available":false,"device":"/machine/unattached/device[26]", "device-types":["isa-device"],"hotpluggable":false, "opts":[ {"option":"bus","values":"isa.0"}], "opts-complete":false} {"available":false,"device":"/machine/unattached/device[25]", "device-types":["isa-device"],"hotpluggable":false, "opts":[ {"option":"bus","values":"isa.0"}], "opts-complete":false} {"available":false,"device":"/machine/unattached/device[24]", "device-types":["isa-device"],"hotpluggable":false, "opts":[ {"option":"bus","values":"isa.0"}], "opts-complete":false} {"available":false,"device":"/machine/unattached/device[23]", "device-types":["isa-device"],"hotpluggable":false, "opts":[ {"option":"bus","values":"isa.0"}], "opts-complete":false} {"available":false,"device":"/machine/unattached/device[22]", "device-types":["isa-device"],"hotpluggable":false, "opts":[ {"option":"bus","values":"isa.0"}], "opts-complete":false} {"available":false,"device":"/machine/unattached/device[20]", "device-types":["isa-device"],"hotpluggable":false, "opts":[ {"option":"bus","values":"isa.0"}], "opts-complete":false} {"available":false,"device":"/machine/unattached/device[19]", "device-types":["isa-device"],"hotpluggable":false, "opts":[ {"option":"bus","values":"isa.0"}], "opts-complete":false} Cc: Markus Armbruster <armbru(a)redhat.com> Cc: Marcel Apfelbaum <marcel(a)redhat.com> Cc: libvir-list(a)redhat.com Cc: Igor Mammedov <imammedo(a)redhat.com> Cc: Laine Stump <laine(a)redhat.com> Eduardo Habkost (13): qmp: Define query-device-slots command qapi: qobject_compare() helper qdev: Add BusClass::device_type field qdev: Slot info helpers query-device-slots: Collapse similar entries qdev core: generic enumerate_slots implementation qdev: Enumerate CPU slots on query-device-slots ide: enumerate_slots implementation pci: pci_bus_has_pcie_upstream_port() function pci: device-number & function properties pci: enumerate_slots implementation usb: enumerate_slots implementation tests: Experimental query-device-slots test code qapi-schema.json | 89 ++++++ include/hw/qdev-core.h | 5 + include/hw/qdev-slotinfo.h | 85 ++++++ include/hw/usb.h | 6 +- include/qapi/util.h | 39 +++ hw/audio/intel-hda.c | 7 + hw/block/fdc.c | 15 +- hw/char/virtio-serial-bus.c | 1 + hw/core/bus.c | 42 +++ hw/core/slotinfo.c | 610 ++++++++++++++++++++++++++++++++++++++++++ hw/core/sysbus.c | 8 + hw/i2c/core.c | 7 + hw/ide/qdev.c | 27 ++ hw/input/adb.c | 7 + hw/ipack/ipack.c | 7 + hw/isa/isa-bus.c | 1 + hw/misc/auxbus.c | 1 + hw/pci/pci.c | 120 ++++++++- hw/ppc/spapr_vio.c | 1 + hw/s390x/css-bridge.c | 2 + hw/s390x/event-facility.c | 1 + hw/s390x/s390-pci-bus.c | 7 + hw/scsi/scsi-bus.c | 1 + hw/sd/core.c | 7 + hw/ssi/ssi.c | 7 + hw/usb/bus.c | 37 +++ hw/usb/dev-smartcard-reader.c | 7 + hw/virtio/virtio-bus.c | 1 + qapi/qapi-util.c | 66 +++++ qdev-monitor.c | 109 ++++++++ tests/test-qapi-util.c | 53 ++++ tests/test-slotinfo.c | 398 +++++++++++++++++++++++++++ hw/core/Makefile.objs | 2 + tests/Makefile.include | 14 +- tests/qmp-machine-info.py | 300 +++++++++++++++++++++ 35 files changed, 2075 insertions(+), 15 deletions(-) create mode 100644 include/hw/qdev-slotinfo.h create mode 100644 hw/core/slotinfo.c create mode 100644 tests/test-slotinfo.c create mode 100755 tests/qmp-machine-info.py -- 2.9.4

2 3

[libvirt] [PATCH] qemu: Fix bug assuming usage of default UUID for certificate passphrase
by John Ferlan 15 Aug '17

15 Aug '17

If an environment specific _tls_x509_cert_dir is provided, then do not VIR_STRDUP the defaultTLSx509secretUUID as that would be for the "default" environment and not the vnc, spice, chardev, or migrate environments. If the environment needs a secret to decode it's certificate, then it must provide the secret. If the secrets happen to be the same, then configuration would use the same UUID as the default (but we cannot assume that nor can we assume that the secret would be necessary). Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- While responding to a different patch today regarding Veritas and usage of a default environment w/ or w/o secrets I realized that the existing logic has a flaw in "assuming" that someone would want to use the default secret. What if they defined their own environment without a secret? Then the code would create a secret object to pass to QEMU which would think it needs to use it to decode the server certificate (but it doesn't), so it would seemingly fail the start. I assume based on the lack of complaints about this that everyone just uses the default environment! src/qemu/qemu_conf.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index c4714ed..a7a2aaa 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -526,14 +526,18 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, goto cleanup; \ if (rv == 0) \ cfg->val## TLSx509verify = cfg->defaultTLSx509verify; \ - if (virConfGetValueString(conf, #val "_tls_x509_cert_dir", \ - &cfg->val## TLSx509certdir) < 0) \ + if ((rv = virConfGetValueString(conf, #val "_tls_x509_cert_dir", \ + &cfg->val## TLSx509certdir)) < 0) \ goto cleanup; \ if (virConfGetValueString(conf, \ #val "_tls_x509_secret_uuid", \ &cfg->val## TLSx509secretUUID) < 0) \ goto cleanup; \ - if (!cfg->val## TLSx509secretUUID && \ + /* Only if a *tls_x509_cert_dir wasn't found (e.g. rv == 0), should \ + * we copy the defaultTLSx509secretUUID. If this environment needs \ + * a passphrase to decode the certificate, then it should provide \ + * it's own secretUUID for that. */ \ + if (rv == 0 && !cfg->val## TLSx509secretUUID && \ cfg->defaultTLSx509secretUUID) { \ if (VIR_STRDUP(cfg->val## TLSx509secretUUID, \ cfg->defaultTLSx509secretUUID) < 0) \ -- 2.9.4

2 2

[libvirt] [PATCHv2 0/3] exposing busy polling support for vhost-net
by sferdjao＠redhat.com 15 Aug '17

15 Aug '17

From: Sahid Orentino Ferdjaoui <sahid.ferdjaoui(a)redhat.com> In version 2.7.0, QEMU introduced support of busy polling for vhost-net [0]. To avoid paraphrasing original authors of that feature and the purpose it I prefer to share a pointer [1]. This patch serie exposes throught the NIC driver-specific element a new option 'poll_us'. That option is only available with the backend driver 'vhost' and that because libvirt automatically fallback to QEMU if the driver is not specified where that option is not available. The option 'poll_us' takes a positive. 0 means that the option is not going to be exposed. [0] 69e87b32680a41d9761191443587c595b6f5fc3f [1] https://lists.gnu.org/archive/html/qemu-devel/2016-11/msg04595.html Sahid Orentino Ferdjaoui (3): qemu: detect support for vhost-net busy polling conf: introduce 'poll_us' attribute for domain interface This patch finalizes support of 'poll_us' attribute as an option of the NIC driver-specific element, the commit also takes care of hotplug. docs/formatdomain.html.in | 12 +++++++- docs/schemas/domaincommon.rng | 5 ++++ src/conf/domain_conf.c | 16 +++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 5 ++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 28 ++++++++++++++++++ src/qemu/qemu_hotplug.c | 12 ++++++++ tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + .../qemuxml2argv-net-virtio-netdev-pollus-fail.xml | 23 +++++++++++++++ ...xml2argv-net-virtio-netdev-pollus-qemu-fail.xml | 23 +++++++++++++++ .../qemuxml2argv-net-virtio-netdev-pollus.args | 25 ++++++++++++++++ .../qemuxml2argv-net-virtio-netdev-pollus.xml | 23 +++++++++++++++ .../qemuxml2argv-net-virtio-poll-us.xml | 23 +++++++++++++++ tests/qemuxml2argvtest.c | 9 ++++++ .../qemuxml2xmlout-net-virtio-poll-us.xml | 33 ++++++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 21 files changed, 244 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev-pollus-fail.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev-pollus-qemu-fail.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev-pollus.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev-pollus.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-virtio-poll-us.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-poll-us.xml -- 2.9.4

4 6

[libvirt] [dbus PATCH 0/7] additional cleanups and improvements
by Pavel Hrdina 15 Aug '17

15 Aug '17

Pavel Hrdina (7): maint: cleanup gitignore maint: ignore dist tarball build: fix distcheck build: move test related bits to test/Makefile.am maint: move service file into data directory data: add system dbus service file data: add system dbus service policy configuration .gitignore | 21 +++++++++++---------- Makefile.am | 6 +----- configure.ac | 23 +++++++++++++++++++++++ data/Makefile.am | 33 +++++++++++++++++++++++++++++++++ data/session/org.libvirt.service.in | 3 +++ data/system/org.libvirt.conf | 12 ++++++++++++ data/system/org.libvirt.service.in | 4 ++++ libvirt-dbus.spec.in | 2 ++ src/Makefile.am | 17 ----------------- src/org.libvirt.service.in | 3 --- test/Makefile.am | 16 ++++++++++++++++ test/libvirttest.py | 2 +- 12 files changed, 106 insertions(+), 36 deletions(-) create mode 100644 data/Makefile.am create mode 100644 data/session/org.libvirt.service.in create mode 100644 data/system/org.libvirt.conf create mode 100644 data/system/org.libvirt.service.in delete mode 100644 src/org.libvirt.service.in create mode 100644 test/Makefile.am -- 2.13.4

2 9

[libvirt] [libvirt-php][PATCH] Generate AUTHORS file
by Michal Privoznik 15 Aug '17

15 Aug '17

This is basically taken from libvirt repo. I'm creating .mailmap to avoid doubled entries in the AUTHORS file. Also, AUTHORS is no longer tracked by git. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- .gitignore | 1 + .mailmap | 13 +++++++++++++ AUTHORS => AUTHORS.in | 21 +++++---------------- Makefile.am | 13 ++++++++++++- autogen.sh | 3 +++ 5 files changed, 34 insertions(+), 17 deletions(-) create mode 100644 .mailmap rename AUTHORS => AUTHORS.in (45%) diff --git a/.gitignore b/.gitignore index 8c52e3f..c622359 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,7 @@ /tests/*.trs /tests/functions.phpt /test-driver +/AUTHORS /INSTALL Makefile Makefile.in diff --git a/.mailmap b/.mailmap new file mode 100644 index 0000000..213131d --- /dev/null +++ b/.mailmap @@ -0,0 +1,13 @@ +# '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> +<liyong(a)skybility.com> <4179e1(a)gmail.com> +<dzamirski(a)datto.com> <dzamirski(a)dattobackup.com> +<Remi(a)famillecollet.com> <fedora(a)famillecollet.com> +<mignov(a)gmail.com> <minovotn(a)redhat.com> + +# Name consolidation: +# Preferred author spelling <preferred email> +Tiziano Müller <dev-zero(a)gentoo.org> +Stefan Kuhn <stefan.kuhn(a)foss-group.ch> diff --git a/AUTHORS b/AUTHORS.in similarity index 45% rename from AUTHORS rename to AUTHORS.in index 4004b20..87e619b 100644 --- a/AUTHORS +++ b/AUTHORS.in @@ -3,30 +3,19 @@ Libvirt-php extension Libvirt-php extension is currently maintained and developed by: - Michal Prívozník <mprivozn(a)redhat.com> + Michal Prívozník <mprivozn(a)redhat.com> The original project, called php-libvirt, has been originally developed and maintained by: - Radek Hladik <r.hladik(a)cybersales.cz> + Radek Hladik <r.hladik(a)cybersales.cz> who is still contributing to the project with his patches. There are also other people that have contributed to the project: - David King <e-mail(a)unknown.tld> - Jan-Paul van Burgsteden <e-mail(a)unknown.tld> - Lyre <liyong(a)skybility.com> (or <4179e1(a)gmail.com>) - Daniel P. Berrange <berrange(a)redhat.com> - Tiziano Mueller <dev-zero(a)gentoo.org> - Yukihiro Kawada <warp.kawada(a)gmail.com> - Remi Collet <Remi(a)famillecollet.com> - Ivo van den Abeelen <ivovandenabeelen(a)gmail.com> - Tiziano Müller <dev-zero(a)gentoo.org> - Pavel Odintsov <pavel.odintsov(a)gmail.com> - Tugdual Saunier <tugdual.saunier(a)gmail.com> - Stefan Kuhn <stefan.kuhn(a)foss-group.ch> - Dawid Zamirski <dzrudy(a)gmail.com> - Michal Novotny <minovotn(a)redhat.com> + David King <e-mail(a)unknown.tld> + Jan-Paul van Burgsteden <e-mail(a)unknown.tld> +#authorslist# Thanks goes to all of them with big thanks to Tugdual Saunier for various fixes and OS-X compilation support. diff --git a/Makefile.am b/Makefile.am index e28a96f..4633f43 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,9 +2,20 @@ SUBDIRS = tools src docs tests ACLOCAL_AMFLAGS = -I m4 -EXTRA_DIST = libvirt-php.spec libvirt-php.spec.in winsrc +EXTRA_DIST = libvirt-php.spec libvirt-php.spec.in winsrc AUTHORS.in AM_DISTCHECK_CONFIGURE_FLAGS = --with-distcheck rpm: clean @(unset CDPATH ; $(MAKE) dist && rpmbuild -ta $(distdir).tar.gz) + +dist-hook: gen-AUTHORS + +.PHONY: gen-AUTHORS +gen-AUTHORS: + $(AM_V_GEN)if test -d $(srcdir)/.git; then \ + out="`cd $(srcdir) && git log --pretty=format:'%aN <%aE>' | sort -u | sed 's/^/\t/'`" && \ + perl -p -e "s/#authorslist#// and print '$$out'" \ + < $(srcdir)/AUTHORS.in > $(distdir)/AUTHORS-tmp && \ + mv -f $(distdir)/AUTHORS-tmp $(distdir)/AUTHORS ; \ + fi diff --git a/autogen.sh b/autogen.sh index 2d8179c..4234d1e 100755 --- a/autogen.sh +++ b/autogen.sh @@ -2,5 +2,8 @@ test -n "$srcdir" || srcdir=`dirname "$0"` test -n "$srcdir" || srcdir=. +# Automake requires that ChangeLog and AUTHORS exist. +touch AUTHORS ChangeLog || exit 1 + autoreconf --force --install --verbose "$srcdir" test -n "$NOCONFIGURE" || "$srcdir/configure" "$@" -- 2.13.0

2 4

[libvirt] [PATCH 0/2] qemuDomainUndefineFlags: Two fixes
by Michal Privoznik 15 Aug '17

15 Aug '17

*** BLURB HERE *** Michal Privoznik (2): qemuDomainUndefineFlags: Grab QEMU_JOB_MODIFY qemuDomainUndefineFlags: unlink nvram file regardless of domain state src/qemu/qemu_driver.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) -- 2.13.0

4 9

[libvirt] [PATCH v2 0/6] nwfilter adjustments for common object
by John Ferlan 15 Aug '17

15 Aug '17

v1: https://www.redhat.com/archives/libvir-list/2017-June/msg00079.html Changes since v1 (if I can recall all of them!): Patches 1, 4, 8-13 were pushed Patches 2, 3, 5-7 are dropped This this is a rework of patches 14-17 Patch 1 (former patch14): * Requested adjustments made to ACK'd patch, but since this and the remaining ones were related I didn't yet push it. Patch 2 (new): * From review though... As it turns out, virNWFilterDefEqual doesn't require the @cmpUUIDs patch. Patch 3 (fromer patch 15): * Fixed the line as requested. Patch was ACK'd by like Patch 1 I held onto it since it was related. Patch 4 (former patch 16): * Let's call it a complete rewrite. Rather than rely solely on the refcnt of the object, I've added/implemented a 'trylock' mechanism which essentially will allow the subsequent patch to use the virObjectLockable (e.g. a non recursive lock). Of course as I got further into the code - I think I've come to the conclusion that there isn't a way for a @def to disappear between threads with a refcnt only mechanism because there's a few other serialized locks which would need to be hurdled before hand. Still as I found out while running the Avocado test 'nwfilter_update_vm_running.update_arp_rule' the recursion would occur because the AssignDef code would call the Instantiation with the lock from the def being updated and that's where all the awful magic needs to occur. Additionally, I found that one wouldn't want to attempt to lock the nwfilters list inside the virNWFilterObjListFindInstantiateFilter because AssignDef already had that lock. I debated needing a recursive lock there until I came to the conclusion that the list couldn't change because the DefineXML is protected by a driver level lock (as is the Undefine and Reload paths). Patch 5 (former patch 17): * No changes, it was ACK'd, but without 1-4 is useless Patch 6 (NEW): * Remove the need for the driver level lock for a few API's since we have self locking nwfilters list. Also left comments in the 3 places where that lock remained to hopefully cause someone great anxiety if they decided to attempt to remove the lock without first consulting a specialist. NB: Ran all of the changes through the 'nwfilter' tests found in the Avocado test suite. John Ferlan (6): nwfilter: Add @refs logic to __virNWFilterObj nwfilter: Remove unnecessary UUID comparison bypass nwfilter: Convert _virNWFilterObjList to be a virObjectLockable nwfilter: Remove recursive locking for nwfilter instantiation nwfilter: Convert virNWFilterObj to use virObjectLockable nwfilter: Remove need for nwfilterDriverLock in some API's src/conf/virnwfilterobj.c | 635 ++++++++++++++++++++++++--------- src/conf/virnwfilterobj.h | 12 +- src/libvirt_private.syms | 6 +- src/nwfilter/nwfilter_driver.c | 66 ++-- src/nwfilter/nwfilter_gentech_driver.c | 66 +++- src/util/virobject.c | 24 ++ src/util/virobject.h | 4 + src/util/virthread.c | 5 + src/util/virthread.h | 1 + 9 files changed, 586 insertions(+), 233 deletions(-) -- 2.9.4

1 8

[libvirt] [PATCH] hostdev: display leading zeros of USB vendor/product id's in error messages
by Chen Hanxiao 15 Aug '17

15 Aug '17

From: Chen Hanxiao <chenhanxiao(a)gmail.com> Many vendor id's and product id's have leading zeros. Show them in error messages. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/util/virhostdev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c index 579563c..0e6b5a3 100644 --- a/src/util/virhostdev.c +++ b/src/util/virhostdev.c @@ -1390,7 +1390,7 @@ virHostdevFindUSBDevice(virDomainHostdevDefPtr hostdev, } else if (!autoAddress) { goto out; } else { - VIR_INFO("USB device %x:%x could not be found at previous" + VIR_INFO("USB device %04x:%04x could not be found at previous" " address (bus:%u device:%u)", vendor, product, bus, device); } @@ -1418,12 +1418,12 @@ virHostdevFindUSBDevice(virDomainHostdevDefPtr hostdev, } else if (rc > 1) { if (autoAddress) { virReportError(VIR_ERR_OPERATION_FAILED, - _("Multiple USB devices for %x:%x were found," + _("Multiple USB devices for %04x:%04x were found," " but none of them is at bus:%u device:%u"), vendor, product, bus, device); } else { virReportError(VIR_ERR_OPERATION_FAILED, - _("Multiple USB devices for %x:%x, " + _("Multiple USB devices for %04x:%04x, " "use <address> to specify one"), vendor, product); } @@ -1435,7 +1435,7 @@ virHostdevFindUSBDevice(virDomainHostdevDefPtr hostdev, usbsrc->autoAddress = true; if (autoAddress) { - VIR_INFO("USB device %x:%x found at bus:%u device:%u (moved" + VIR_INFO("USB device %04x:%04x found at bus:%u device:%u (moved" " from bus:%u device:%u)", vendor, product, usbsrc->bus, usbsrc->device, -- 2.7.4

2 4

[libvirt] [PATCH v3 0/3] implement migrate-getmaxdowntime command
by Scott Garfinkle 15 Aug '17

15 Aug '17

Currently, the maximum tolerable downtime for a domain being migrated is write-only. This patch implements a way to query that value nondestructively. Changes from [v2]: * Resequenced and renamed patches * Use updated qemuMonitorJSONGetMigrationParams for querying migration parameters. [v1} https://www.redhat.com/archives/libvir-list/2017-July/msg00908.html [v2} https://www.redhat.com/archives/libvir-list/2017-July/msg01010.html Scott Garfinkle (3) Add virDomainMigrateGetMaxDowntime public API qemu: Implement virDomainMigrateGetMaxDowntime virsh: Add support for virDomainMigrateGetMaxDowntime --- include/libvirt/libvirt-domain.h | 4 ++++ src/driver-hypervisor.h | 6 ++++++ src/libvirt-domain.c | 45 ++++++++++++++++++++++++++++++++++++++++ src/libvirt_public.syms | 4 ++++ src/qemu/qemu_driver.c | 51 ++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.h | 3 +++ src/qemu/qemu_monitor_json.c | 4 ++++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 16 +++++++++++++- src/remote_protocol-structs | 8 +++++++ tools/virsh-domain.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 18 ++++++++++++++++++ 12 files changed, 205 insertions(+), 1 deletion(-)

2 6

[libvirt] [PATCH 0/2] fix some nwfilter deadlocks
by Pavel Hrdina 14 Aug '17

14 Aug '17

Pavel Hrdina (2): qemu: fix nwfilter deadlock while reverting to snapshot qemu: fix nwfilter deadlock in qemuProcessReconnect src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_process.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) -- 2.13.4

2 5

[libvirt] [PATCH 0/8] some parsing cleanup and improvements
by Pavel Hrdina 14 Aug '17

14 Aug '17

Pavel Hrdina (8): util: introduce virXMLNodeNameEqual use virXMLNodeNameEqual instead of xmlStrEqual conf: cleanup virDomainChrSourceDef parsing conf: use virXMLPropString for KeyWrapCipherDef parsing conf: use virXMLPropString for disk geometry parsing conf: use virXMLPropString for IOThread parsing conf: use virXMLPropString for IOThread pin parsing conf: use virXMLPropString for Domain def parsing src/conf/cpu_conf.c | 2 +- src/conf/domain_conf.c | 373 ++++++++++++++++------------------- src/conf/interface_conf.c | 2 +- src/conf/netdev_bandwidth_conf.c | 6 +- src/conf/netdev_vport_profile_conf.c | 2 +- src/conf/network_conf.c | 12 +- src/conf/node_device_conf.c | 2 +- src/conf/nwfilter_conf.c | 6 +- src/conf/nwfilter_params.c | 2 +- src/conf/secret_conf.c | 2 +- src/conf/snapshot_conf.c | 2 +- src/conf/storage_conf.c | 4 +- src/conf/virnetworkobj.c | 2 +- src/conf/virsavecookie.c | 2 +- src/esx/esx_vi_types.c | 9 +- src/libvirt_private.syms | 1 + src/security/virt-aa-helper.c | 2 +- src/test/test_driver.c | 2 +- src/util/virxml.c | 16 ++ src/util/virxml.h | 3 + src/vz/vz_sdk.c | 2 +- tools/virsh-domain.c | 18 +- tools/virsh-interface.c | 12 +- 23 files changed, 236 insertions(+), 248 deletions(-) -- 2.13.5

2 10

[libvirt] [PATCH v2] tests: add qemu x86 kvm 32-on-64 test
by Cole Robinson 14 Aug '17

14 Aug '17

There's some specific logic in qemuBuildCpuCommandLine to support auto adding -cpu qemu 32 for arch=i686 with an x86_64 qemu binary. Add a test case for it Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- v2: Drop unnecessary qemu-kvm path usage .../qemuxml2argv-x86-kvm-32-on-64.args | 21 +++++++++++++++++++++ .../qemuxml2argv-x86-kvm-32-on-64.xml | 13 +++++++++++++ tests/qemuxml2argvtest.c | 1 + 3 files changed, 35 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-x86-kvm-32-on-64.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-x86-kvm-32-on-64.xml diff --git a/tests/qemuxml2argvdata/qemuxml2argv-x86-kvm-32-on-64.args b/tests/qemuxml2argvdata/qemuxml2argv-x86-kvm-32-on-64.args new file mode 100644 index 000000000..5b644b0a6 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-x86-kvm-32-on-64.args @@ -0,0 +1,21 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-x86_64 \ +-name kvm \ +-S \ +-machine pc,accel=kvm \ +-cpu qemu32 \ +-m 4096 \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid d091ea82-29e6-2e34-3005-f02617b36e87 \ +-nographic \ +-nodefaults \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-kvm/monitor.sock,server,\ +nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c diff --git a/tests/qemuxml2argvdata/qemuxml2argv-x86-kvm-32-on-64.xml b/tests/qemuxml2argvdata/qemuxml2argv-x86-kvm-32-on-64.xml new file mode 100644 index 000000000..37f53bf2a --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-x86-kvm-32-on-64.xml @@ -0,0 +1,13 @@ +<domain type='kvm'> + <name>kvm</name> + <uuid>d091ea82-29e6-2e34-3005-f02617b36e87</uuid> + <memory unit='KiB'>4194304</memory> + <os> + <type arch='i686'>hvm</type> + </os> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='usb' model='none'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index aa83013a2..f74d45ba0 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -709,6 +709,7 @@ mymain(void) DO_TEST("kvm", QEMU_CAPS_MACHINE_OPT); DO_TEST("default-kvm-host-arch", QEMU_CAPS_MACHINE_OPT); DO_TEST("default-qemu-host-arch", QEMU_CAPS_MACHINE_OPT); + DO_TEST("x86-kvm-32-on-64", QEMU_CAPS_MACHINE_OPT); DO_TEST("boot-cdrom", NONE); DO_TEST("boot-network", NONE); DO_TEST("boot-floppy", NONE); -- 2.13.3

2 1

[libvirt] Request for review: [PATCH v3 0/3] implement migrate-getmaxdowntime command
by Scott Garfinkle 14 Aug '17

14 Aug '17

I think this may have gotten lost in the 3.6 release. Does someone have the time to review this, please? The patches still apply cleanly (albeit with fuzz) at the current level. -Scott Garfinkle

2 1

[libvirt] [PATCH] vbox: fix typo in warning message
by Guido Günther 14 Aug '17

14 Aug '17

--- src/vbox/vbox_tmpl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 07f25ba24f..dffeabde02 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -1836,7 +1836,7 @@ _mediumCreateDiffStorage(IMedium *medium ATTRIBUTE_UNUSED, if (variantSize == 0) return 0; if (variantSize > 1) - VIR_WARN("Only one variant is avaible in current version"); + VIR_WARN("Only one variant is available in current version"); return medium->vtbl->CreateDiffStorage(medium, target, variant[0], progress); #else /* VBOX_API_VERSION >= 4003000 */ return medium->vtbl->CreateDiffStorage(medium, target, variantSize, variant, progress); -- 2.14.0

3 3

[libvirt] [PATCH 0/2] Two Coverity Fixes (thanks John!)
by Laine Stump 14 Aug '17

14 Aug '17

John found these two problems with Coverity after I pushed my series fixing MAC address saving/setting on Mellanox dual port NICs. Laine Stump (2): util: fix Coverity complaint (and actual bug) in virHostdevReadNetConfig() util: fix Coverity complaint in virNetDevSetNetConfig() src/util/virhostdev.c | 2 +- src/util/virnetdev.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) -- 2.13.3

3 4

[libvirt] [PATCH v2] Update to latest keycodemapdb content
by Daniel P. Berrange 14 Aug '17

14 Aug '17

Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/Makefile.am | 2 +- src/keycodemapdb | 2 +- src/util/virkeycode.c | 5 ++--- tests/virkeycodetest.c | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index b8e875482..45b58c0ad 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -252,7 +252,7 @@ util/virkey%.7: util/virkey%.pod rm -f $@-t1 && \ mv $@-t2 $@ -KEYCODES = linux osx atset1 atset2 atset3 xt xtkbd usb win32 rfb +KEYCODES = linux osx atset1 atset2 atset3 xtkbd usb win32 rfb KEYNAMES = linux osx win32 KEYTABLES = \ diff --git a/src/keycodemapdb b/src/keycodemapdb index 7bf5710b2..267157b96 160000 --- a/src/keycodemapdb +++ b/src/keycodemapdb @@ -1 +1 @@ -Subproject commit 7bf5710b22aa8d58b7eeaaf3dc6960c26cade4f0 +Subproject commit 267157b96c62b5445de9cddd21de42fcd943ffe6 diff --git a/src/util/virkeycode.c b/src/util/virkeycode.c index e09aaadaa..eda263218 100644 --- a/src/util/virkeycode.c +++ b/src/util/virkeycode.c @@ -30,7 +30,6 @@ #include "virkeycodetable_rfb.h" #include "virkeycodetable_usb.h" #include "virkeycodetable_win32.h" -#include "virkeycodetable_xt.h" #include "virkeycodetable_xtkbd.h" #include "virkeynametable_linux.h" #include "virkeynametable_osx.h" @@ -44,7 +43,8 @@ static const char **virKeymapNames[VIR_KEYCODE_SET_LAST] = { static const unsigned short *virKeymapValues[VIR_KEYCODE_SET_LAST] = { [VIR_KEYCODE_SET_LINUX] = virKeyCodeTable_linux, - [VIR_KEYCODE_SET_XT] = virKeyCodeTable_xt, + /* XT is same as AT Set1 - it was included by mistake */ + [VIR_KEYCODE_SET_XT] = virKeyCodeTable_atset1, [VIR_KEYCODE_SET_ATSET1] = virKeyCodeTable_atset1, [VIR_KEYCODE_SET_ATSET2] = virKeyCodeTable_atset2, [VIR_KEYCODE_SET_ATSET3] = virKeyCodeTable_atset3, @@ -57,7 +57,6 @@ static const unsigned short *virKeymapValues[VIR_KEYCODE_SET_LAST] = { #define VIR_KEYMAP_ENTRY_MAX ARRAY_CARDINALITY(virKeyCodeTable_linux) -verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_xt)); verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_atset1)); verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_atset2)); verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_atset3)); diff --git a/tests/virkeycodetest.c b/tests/virkeycodetest.c index d754385be..4092aa119 100644 --- a/tests/virkeycodetest.c +++ b/tests/virkeycodetest.c @@ -56,9 +56,9 @@ static int testKeycodeMapping(const void *data ATTRIBUTE_UNUSED) TRANSLATE(LINUX, USB, 111, 76); TRANSLATE(LINUX, RFB, 88, 88); TRANSLATE(LINUX, RFB, 160, 163); - TRANSLATE(ATSET2, ATSET3, 259, 55); + TRANSLATE(ATSET2, ATSET3, 131, 55); TRANSLATE(OSX, WIN32, 90, 131); - TRANSLATE(OSX, ATSET1, 90, 0); + TRANSLATE(OSX, ATSET1, 90, 90); TRANSLATE(OSX, ATSET1, 3200, -1); #undef TRANSLATE -- 2.13.3

2 1