September 2016 - Devel - libvirt List Archives

[libvirt] [[PATCH v2] 0/4] try harder to get dest qemu errors on migation
by Nikolay Shirokovskiy 06 Oct '16

06 Oct '16

Hi, all. In case migration fails due to destination qemu exits unexpectedly user recevies the qemu log in the error message. Unfortunately log is truncated and the most interesting part is missed (below is the example of such a log [1]). Actually for the most cases the first patch will be enough to fix the issue. Originally I thought the problem is qemu logging and reading the log are not in sync (which is true) so I tried to fix it as well in the next patches. * diff from v1: 1. split changes to libvirtd and virtlogd to different patches 2. split virtlogd patch further 3. simplify handling eofs and hangups in draining function [1] log example: CPU Reset (CPU 0) EAX=00000000 EBX=00000000 ECX=00000000 EDX=00000000 ESI=00000000 EDI=00000000 EBP=00000000 ESP=00000000 EIP=00000000 EFL=00000000 [-------] CPL=0 II=0 A20=0 SMM=0 HLT=0 ES =0000 00000000 00000000 00000000 CS =0000 00000000 00000000 00000000 SS =0000 00000000 00000000 00000000 DS =0000 00000000 00000000 00000000 FS =0000 00000000 00000000 00000000 GS =0000 00000000 00000000 00000000 LDT=0000 00000000 00000000 00000000 TR =0000 00000000 00000000 00000000 GDT= 00000000 00000000 IDT= 00000000 00000000 CR0=00000000 CR2=00000000 CR3=00000000 CR4=00000000 DR0=0000000000000000 DR1=0000000000000000 DR2=0000000000000000 DR3=0000000000000000 DR6=0000000000000000 DR7=0000000000000000 CCS=00000000 CCD=00000000 CCO=DYNAMIC EFER=0000000000000000 FCW=0000 FSW=0000 [ST=0] FTW=ff MXCSR=00000000 FPR0=0000000000000000 0000 FPR1=0000000000000000 0000 FPR2=0000000000000000 0000 FPR3=0000000000000000 0000 FPR4=0000000000000000 0000 FPR5=0000000000000000 0000 FPR6=0000000000000000 0000 FPR7=0000000000000000 0000 XMM00=00000000000000000000000000000000 XMM01=00000000000000000000000000000000 XMM02=00000000000000000000000000000000 XMM03=00000000000000000000000000000000 XMM04=00000000000000000000000000000000 XMM05=00000000000000000000000000000000 XMM06=00000000000000000000000000000000 XMM07=00000000000000000000000000000000 CPU Reset (CPU 1) EAX=00000000 EBX=00000000 ECX=00000000 EDX=000206a1 ESI=00000000 EDI=00000000 EBP=00000000 ESP=00000000 EIP=0000fff0 EFL=00000002 [-------] CPL=0 II=0 A20=1 SMM=0 HLT=0 ES =0000 00000000 0000ffff 00009300 CS =f000 ffff0000 0000ffff 00009b00 SS =0000 00000000 0000ffff 00009300 DS =0000 00000000 0000ffff 00009300 FS =0000 00000000 0000ffff 00009300 GS =0000 00000000 0000ffff 00009300 LDT=0000 00000000 0000ffff 00008200 TR =0000 00000000 0000ffff 00008b00 GDT= 00000000 0000ffff IDT= 00000000 0000ffff CR0=60000010 CR2=00000000 CR3=00000000 CR4=00000000 DR0=0000000000000000 DR1=0000000000000000 DR2=0000000000000000 DR3=0000000000000000 DR6=00000000ffff0ff0 DR7=0000000000000400 CCS=00000000 CCD=00000000 CCO=DYNAMIC EFER=0000000000000000 FCW=037f FSW=0000 [ST=0] FTW=00 MXCSR=00001f80 FPR0=0000000000000000 0000 FPR1=0000000000000000 0000 FPR2=0000000000000000 0000 FPR3=0000000000000000 0000 FPR4=0000000000000000 0000 FPR5=0000000000000000 0000 FPR6=0000000000000000 0000 FPR7=0000000000000000 0000 XMM00=00000000000000000000000000000000 XMM01=00000000000000000000000000000000 XMM02=00000000000000000000000000000000 XMM03=00000000000000000000000000000000 XMM04=00000000000000000000000000000000 XMM05=00000000000000000000000000000000 XMM06=00000000000000000000000000000000 XMM07=000 qemu: terminating on signal 15 from pid 168133 Nikolay Shirokovskiy (4): util: remove 1k limit for error messages virtlogd: stop reading on EOF instead of hangup virtlogd: add flag to wait for log end on read qemu: if virtlogd is used then read log tail correctly src/logging/log_handler.c | 46 ++++++++++++++++++++++++++++++++++++++++------ src/logging/log_protocol.x | 5 +++++ src/qemu/qemu_domain.c | 7 ++++++- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_process.c | 2 ++ src/util/virerror.c | 9 ++++----- 6 files changed, 58 insertions(+), 12 deletions(-) -- 1.8.3.1

3 12

[libvirt] [PATCH V2 0/4]] qemu: report actual vcpu state in virVcpuInfo
by Viktor Mihajlovski 06 Oct '16

06 Oct '16

Currently, the virVcpuInfo returned by virDomainGetVcpus() will always report a state of VIR_VCPU_RUNNING for each defined domain vcpu even if the vcpu is currently in the halted state. As the monitor interface is in fact reporting the accurate state, it is rather easy to transport this information with the existing API. This is done by - adding a new state of VIR_VCPU_HALTED - extending the monitor to pass back the halted state for the vcpus - adding a new field to the private domain vcpu object reflecting the halted state for the vcpu - modifying the driver code to report the vcpu state based on the halted indicator - extending virsh vcpuinfo to also display the halted state The vcpu state is however not recorded in the internal XML format, since the state can change asynchronously (without notification). V2 is a rebase on top of Peter Krempa's CPU hotplug modernization. Viktor Mihajlovski (4): domain: Add new VCPU state "halted" qemu: Add monitor support for CPU halted state qemu: Add domain support for VCPU halted state qemu: Ensure reported VCPU state is current in driver API include/libvirt/libvirt-domain.h | 1 + src/qemu/qemu_domain.c | 69 ++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_domain.h | 5 +++ src/qemu/qemu_driver.c | 23 ++++++++++++-- src/qemu/qemu_monitor.c | 6 +++- src/qemu/qemu_monitor.h | 5 +++ src/qemu/qemu_monitor_json.c | 3 ++ src/qemu/qemu_monitor_text.c | 8 ++++- tests/qemumonitorjsontest.c | 8 ++--- tools/virsh-domain.c | 3 +- 10 files changed, 122 insertions(+), 9 deletions(-) -- 1.9.1

3 14

[libvirt] [PATCH 0/6] qemu: fix UDP chardev hotplug and make qemumonitorjsontest less useless
by Peter Krempa 06 Oct '16

06 Oct '16

Most of the time qemumonitorjson test isn't really testing much. Add support for actually testing chardev hotplug and fix it for the UDP case. Peter Krempa (6): conf: Sanitize formatting of UDP chardev source tests: qemu: Add support for testing aguments on monitor verbatim tests: qemumonitorjson: Don't do multiple tests in one virTestRun tests: qemumonitorjsontest: Do some actual testing in qemuMonitorJSONTestAttachChardev qemu: monitor: Simplify construction of chardev backends qemu: monitor: Properly configure backend for UDP chardevs src/conf/domain_conf.c | 42 ++++---- src/qemu/qemu_monitor_json.c | 51 +++++----- tests/qemumonitorjsontest.c | 222 ++++++++++++++++++++++++++++++++----------- tests/qemumonitortestutils.c | 112 ++++++++++++++++++++++ tests/qemumonitortestutils.h | 6 ++ 5 files changed, 326 insertions(+), 107 deletions(-) -- 2.10.0

2 15

[libvirt] [PATCH 00/12] Add length (duration) params for iotune throttling
by John Ferlan 05 Oct '16

05 Oct '16

https://bugzilla.redhat.com/show_bug.cgi?id=1349898 Do a little housekeeping and minor adjustments to existing code, then add the various "-length" options for the <iotune> code. John Ferlan (12): docs: Fix typo in libvirt-domain.h parameter description include: Update description for <iotune> max params tests: Add blkdeviotune-max xml2xmltest qemu: Convert from shorthand to longer throttling names qemu: Adjust how supportMaxOptions is used. include: Add new definitions for duration for bps/iops throttling caps: Add new capability for the bps/iops throttling length qemu: Add length for bps/iops throttling parameters to driver conf: Add a formatting macro for all the blkiotune values conf: Adjust the PARSE_IOTUNE macro conf: Add support for blkiotune "_length" options qemu: Add the length options to the iotune command line docs/formatdomain.html.in | 40 +++++- docs/schemas/domaincommon.rng | 38 ++++++ include/libvirt/libvirt-domain.h | 124 ++++++++++++++++-- src/conf/domain_conf.c | 142 +++++++++++---------- src/conf/domain_conf.h | 6 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 96 ++++++-------- src/qemu/qemu_driver.c | 106 ++++++++++++++- src/qemu/qemu_monitor.c | 7 +- src/qemu/qemu_monitor.h | 3 +- src/qemu/qemu_monitor_json.c | 72 ++++++----- src/qemu/qemu_monitor_json.h | 3 +- .../caps_2.6.0-gicv2.aarch64.xml | 1 + .../caps_2.6.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + tests/qemumonitorjsontest.c | 17 ++- .../qemuxml2argv-blkdeviotune-max-length.args | 34 +++++ .../qemuxml2argv-blkdeviotune-max-length.xml | 65 ++++++++++ .../qemuxml2argv-blkdeviotune-max.args | 10 +- .../qemuxml2argv-blkdeviotune-max.xml | 14 +- .../qemuxml2argv-blkdeviotune.args | 5 +- tests/qemuxml2argvtest.c | 4 + .../qemuxml2xmlout-blkdeviotune-max-length.xml | 1 + .../qemuxml2xmlout-blkdeviotune-max.xml | 1 + tests/qemuxml2xmltest.c | 2 + 28 files changed, 616 insertions(+), 182 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max-length.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max-length.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-max-length.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-max.xml -- 2.7.4

3 30

[libvirt] [PATCH RESEND v2 0/5] Implementation of QEMU vhost-scsi
by Eric Farman 05 Oct '16

05 Oct '16

[Resending after the release of 2.2.0; no changes other than a rebase to current master and the associated tweaking to the capabilities patch] This patch series provides a libvirt implementation of the vhost-scsi interface in QEMU. As near as I can see, this was discussed upstream in July 2014[1], and ended in a desire to replace a vhost-scsi controller in favor of a hostdev element instead[2]. There is no capability check in this series for vhost-scsi in the underlying QEMU. Using a recent QEMU built with --disable-vhost-scsi fails with "not a valid device model name." Host Filesystem Example: # ls /sys/kernel/config/target/vhost/ discovery_auth naa.5001405df3e54061 version # ls /sys/kernel/config/target/vhost/naa.5001405df3e54061/tpgt_1/lun/ lun_0 QEMU Example (snippet): -device vhost-scsi-ccw,wwpn=naa.5001405df3e54061,devno=fe.0.1000 Libvirt Example (snippet): <hostdev mode='subsystem' type='scsi_host'> <source protocol='vhost' wwpn='naa.5001405df3e54061'/> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x1000'/> </hostdev> Guest Viewpoint: # lsscsi [1:0:1:0] disk LIO-ORG disk0 4.0 /dev/sda # dmesg | grep 1: [ 6.065735] scsi host1: Virtio SCSI HBA [ 6.093892] scsi 1:0:1:0: Direct-Access LIO-ORG disk0 4.0 PQ: 0 ANSI: 5 [ 6.313615] sd 1:0:1:0: Attached scsi generic sg0 type 0 [ 6.314981] sd 1:0:1:0: [sda] 29360128 512-byte logical blocks: (15.0 GB/14.0 GiB) [ 6.317290] sd 1:0:1:0: [sda] Write Protect is off [ 6.317566] sd 1:0:1:0: [sda] Mode Sense: 43 00 10 08 [ 6.317853] sd 1:0:1:0: [sda] Write cache: enabled, read cache: enabled, supports DPO and FUA [ 6.352722] sd 1:0:1:0: [sda] Attached SCSI disk Changelog: v2->v2.1: - Rebased to current master (6 September) v1->v2: https://www.redhat.com/archives/libvir-list/2016-August/msg01028.html - Rebase - Applies to current master (20 August) - Added a capability check for QEMU 2.7 - Fixed the qemuxml2argv tests as the -smp options had changed - Reworked ccwaddrs parameter in virDomainCCWAddressAssign call - Comments - Squashed documentation, XML schema, XML parsing, and infrastructure patches into a single patch - Switched from "hostdev type='scsi'" to "hostdev type='scsi_host'"; this removes the refactoring patches since we're not shoe-horning a new SCSI protocol into the existing code - Reworked the handling of the fd's such that we send them to qemu after any possible errors could occur and cause us to back out - s/qemuBuildSCSIVhostHostdevDevStr/qemuBuildHostHostdevDevStr/ - Added virBufferCheckError, and an error message for vhostfdSize > 1, in qemuBuildHostHostdevDevStr - Added qemuBuildDeviceAddressStr in qemuBuildHostHostdevDevStr, thus superceding the last patch in the v1 series - Other - Simplified the vhostfd logic to just be a single int, rather than an alloc'd array (left the vhostfdSize described above as an identifier for if QEMU ever supports multiple vhostfds) - Replaced "qemuMonitorAddDevice" with "qemuMonitorAddDeviceWithFd" in hotplug routine v1: https://www.redhat.com/archives/libvir-list/2016-July/msg01004.html [1] http://www.redhat.com/archives/libvir-list/2014-July/msg01235.html [2] http://www.redhat.com/archives/libvir-list/2014-July/msg01390.html Eric Farman (5): Introduce a "scsi_host" hostdev type qemu: Introduce vhost-scsi capability qemu: Add vhost-scsi string for -device parameter qemu: Allow hotplug of vhost-scsi device tests: Introduce basic vhost-scsi test docs/formatdomain.html.in | 24 ++++ docs/schemas/domaincommon.rng | 23 ++++ src/conf/domain_audit.c | 2 + src/conf/domain_conf.c | 62 ++++++++- src/conf/domain_conf.h | 17 +++ src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 80 +++++++++++ src/qemu/qemu_command.h | 6 + src/qemu/qemu_domain_address.c | 10 ++ src/qemu/qemu_hotplug.c | 149 +++++++++++++++++++++ src/security/security_dac.c | 2 + src/util/virscsi.c | 26 ++++ src/util/virscsi.h | 1 + tests/domaincapsschemadata/full.xml | 1 + tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + .../caps_2.6.0-gicv2.aarch64.xml | 1 + .../caps_2.6.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + .../qemuxml2argv-hostdev-scsi-vhost-scsi.args | 24 ++++ .../qemuxml2argv-hostdev-scsi-vhost-scsi.xml | 33 +++++ tests/qemuxml2argvmock.c | 12 ++ tests/qemuxml2argvtest.c | 3 + 31 files changed, 491 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-vhost-scsi.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-vhost-scsi.xml -- 1.9.1

2 18

[libvirt] [PATCH 0/3] Cleanup/unify RBD backend context setup
by John Ferlan 05 Oct '16

05 Oct '16

While working on a way to create a luks volume on an RBD backend - I figured I'd clean up the initialization of the environment a bit. Rather than a lot of copy/paste code - use a common initializer. John Ferlan (3): rbd: Change virStorageBackendRBDCloseRADOSConn to be static void rbd: Change from static to alloc contexts rbd: Move the encryption check in build src/storage/storage_backend_rbd.c | 150 +++++++++++++++++++------------------- 1 file changed, 73 insertions(+), 77 deletions(-) -- 2.7.4

2 6

[libvirt] [PATCH 0/2] Add support for preallocated fd memory
by Jaroslav Safka 05 Oct '16

05 Oct '16

Hi the xml element to be extended with additional children is the memoryBacking element. We would like to introduce 3 new elements source,access and allocation <memoryBacking> <source type="file|anonymous" path='/path/to/qemu/'/> <access Mode="shared|private"/> <allocation mode="immediate|ondemand"/> </memoryBacking> If allocation is immediate then -mem-prealloc should be added to the qemu commanline. If source is file then -object memory-backend-file,id=mem,size=1024M,mem-path=/var/lib/libvirt/qemu -numa node,memdev=mem Should be added to the qemu commandline If access is shared then the share=on parameter should be added to the memory-backend-file e.g. -object memory-backend-file,id=mem,size=1024M,mem-path=/var/lib/libvirt/qemu,share=on Jaroslav Safka (2): Add support for preallocated fd memory Add support for preallocated fd memory docs/schemas/domaincommon.rng | 37 +++++ src/conf/domain_conf.c | 149 +++++++++++++++----- src/conf/domain_conf.h | 34 +++++ src/qemu/qemu_command.c | 156 ++++++++++++++++----- src/qemu/qemu_command.h | 4 + .../qemuxml2argv-fd-memory-no-numa-topology.args | 34 +++++ .../qemuxml2argv-fd-memory-no-numa-topology.xml | 96 +++++++++++++ .../qemuxml2argv-fd-memory-numa-topology.args | 34 +++++ .../qemuxml2argv-fd-memory-numa-topology.xml | 99 +++++++++++++ .../qemuxml2argv-memorybacking-set.xml | 32 +++++ .../qemuxml2argv-memorybacking-unset.xml | 32 +++++ tests/qemuxml2argvtest.c | 24 ++++ .../qemuxml2xmlout-memorybacking-set.xml | 40 ++++++ .../qemuxml2xmlout-memorybacking-unset.xml | 40 ++++++ tests/qemuxml2xmltest.c | 3 + 15 files changed, 748 insertions(+), 66 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-fd-memory-no-numa-topology.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-fd-memory-no-numa-topology.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memorybacking-set.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memorybacking-unset.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-memorybacking-set.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-memorybacking-unset.xml -- 2.5.5 -------------------------------------------------------------- Intel Research and Development Ireland Limited Registered in Ireland Registered Office: Collinstown Industrial Park, Leixlip, County Kildare Registered Number: 308263 This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.

4 5

[libvirt] Entering freeze for libvirt-2.3.0
by Daniel Veillard 05 Oct '16

05 Oct '16

Since nobody complained about my earlier message with the release plan, I tagged libvirt-2.3.0 candidate release 1 in git and pushed signed tarball and rpms to the usual place: ftp://libvirt.org/libvirt/ As usual my limited testing is really not sufficient so please give it a try, I enjoy the view of a completely green https://ci.centos.org/view/libvirt-project/ :-) but that doesn't test portability to other platforms for example ! Then I will try to push rc2 on Thursday, that way the final release can happen during the week-end or on Monday if all goes well, thanks for testing it ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

4 7

[libvirt] [PATCH 0/3] introduce pull backups
by Nikolay Shirokovskiy 05 Oct '16

05 Oct '16

Hi, everyone. Please take a look at pull backup API and its qemu implementation. There is no any documentation inside yet so I put it here. Backup is described in xml like next: <domainbackup> <address type="ip" host="0.0.0.0" port="7000"/> <disks> <disk name='sda'> <source file="/root/backup.hdd"/> </disk> <disk name='sdb' present='no'/> </disks> </domainbackup> <disks>, <disk>, <source> elements and 'present' attribute are optional. The export address is bare minimum to export all non read only disks with inserted media. This xml description is close to what we have for snapshots. Implementation depends on experimental qemu command 'x-blockdev-del' and 'blockdev-add' which is still described as work-in-progress even it has no 'x-' prefix. I failed to find the information whether client reading disks being backed up is able to detect all failures in the process or not so some efforts are done to track back up blockjobs failures and report them on pull backup stop. At the same time other clean up errors on stop are ignored so that client can know the essence was the backup operation successful or not. There is a work in progress to provide dirty bitmap information thru nbd to be able to make incremental backups in pull backup scheme. Thus the design should be future proof in this aspect. I see next changes to xml description: <domainbackup> <address type="ip" host="0.0.0.0" port="7000"/> <branch name="backup1"/> <disks> <disk name='sda' type='incremental'> <source file="/root/backup.hdd"/> <bitmap granularity='32Kib'/> </disk> </disks> </domainbackup> Branch name essentially becames dirty backup name in terms of qemu. This option makes possible to have independent branches of incremental backups with possibly different schedule and granularity. Stop operation in case of incremental backups should be specified further to finish/cancel the operation - we have flags for that. Nikolay Shirokovskiy (3): qemu: store guest visible disk size from qemu monitor block info qemu: special error code in case of no job on cancel block job introduce pull backup examples/object-events/event-test.c | 3 + include/libvirt/libvirt-domain-backup.h | 45 +++ include/libvirt/libvirt-domain.h | 3 + include/libvirt/libvirt.h | 1 + include/libvirt/virterror.h | 1 + po/POTFILES.in | 2 + src/Makefile.am | 3 + src/access/viraccessperm.c | 3 +- src/access/viraccessperm.h | 6 + src/conf/backup_conf.c | 295 ++++++++++++++ src/conf/backup_conf.h | 85 ++++ src/conf/domain_conf.c | 2 +- src/driver-hypervisor.h | 11 + src/libvirt-domain-backup.c | 86 ++++ src/libvirt_private.syms | 6 + src/libvirt_public.syms | 2 + src/qemu/qemu_blockjob.c | 2 + src/qemu/qemu_conf.h | 1 + src/qemu/qemu_domain.h | 5 + src/qemu/qemu_driver.c | 684 ++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.c | 37 ++ src/qemu/qemu_monitor.h | 12 + src/qemu/qemu_monitor_json.c | 133 ++++++- src/qemu/qemu_monitor_json.h | 16 + src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 33 +- src/util/virerror.c | 1 + tests/qemumonitorjsontest.c | 36 ++ tools/Makefile.am | 1 + tools/virsh-backup.c | 150 +++++++ tools/virsh-backup.h | 28 ++ tools/virsh-domain.c | 3 +- tools/virsh.c | 2 + tools/virsh.h | 1 + 34 files changed, 1693 insertions(+), 8 deletions(-) create mode 100644 include/libvirt/libvirt-domain-backup.h create mode 100644 src/conf/backup_conf.c create mode 100644 src/conf/backup_conf.h create mode 100644 src/libvirt-domain-backup.c create mode 100644 tools/virsh-backup.c create mode 100644 tools/virsh-backup.h -- 1.8.3.1

3 21

[libvirt] [PATCH v2 1/2] NSS: Add explicit check to not report expired lease
by Nehal J Wani 05 Oct '16

05 Oct '16

The NSS module shouldn't rely on custom leases database to not have entries for leases which have expired. Change-Id: Ic3e043003d33ded0da74696a1d27ed4967ddbfb8 --- tools/nss/libvirt_nss.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tools/nss/libvirt_nss.c b/tools/nss/libvirt_nss.c index 54c4a2a..cb3edf5 100644 --- a/tools/nss/libvirt_nss.c +++ b/tools/nss/libvirt_nss.c @@ -42,6 +42,7 @@ #include "virlease.h" #include "viralloc.h" #include "virfile.h" +#include "virtime.h" #include "virerror.h" #include "virstring.h" #include "virsocketaddr.h" @@ -114,6 +115,8 @@ findLease(const char *name, ssize_t i, nleases; leaseAddress *tmpAddress = NULL; size_t ntmpAddress = 0; + time_t currtime; + long long expirytime; *address = NULL; *naddress = 0; @@ -161,6 +164,11 @@ findLease(const char *name, nleases = virJSONValueArraySize(leases_array); DEBUG("Read %zd leases", nleases); + if ((currtime = time(NULL)) == (time_t) - 1) { + ERROR("Failed to get current system time"); + goto cleanup; + } + for (i = 0; i < nleases; i++) { virJSONValuePtr lease; const char *lease_name; @@ -181,6 +189,16 @@ findLease(const char *name, if (STRNEQ_NULLABLE(name, lease_name)) continue; + if (virJSONValueObjectGetNumberLong(lease, "expiry-time", &expirytime) < 0) { + /* A lease cannot be present without expiry-time */ + ERROR("expiry-time field missing for %s", name); + goto cleanup; + } + + /* Do not report expired lease */ + if (expirytime < (long long) currtime) + continue; + DEBUG("Found record for %s", lease_name); *found = true; -- 2.4.11

2 6