- Devel - libvirt List Archives

[libvirt] [PATCH] tests: virstoragetest: fix --without-yajl
by Cole Robinson 21 Jun '17

21 Jun '17

Recently added JSON tests should be skipped if compiled --without-yajl https://bugzilla.redhat.com/show_bug.cgi?id=1463435 Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- tests/virstoragetest.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 6c1287380..f34408395 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -1359,6 +1359,8 @@ mymain(void) "<source protocol='nbd' name='blah'>\n" " <host name='example.org' port='6000'/>\n" "</source>\n"); + +#ifdef WITH_YAJL TEST_BACKING_PARSE("json:", NULL); TEST_BACKING_PARSE("json:asdgsdfg", NULL); TEST_BACKING_PARSE("json:{}", NULL); @@ -1573,6 +1575,7 @@ mymain(void) "<source protocol='sheepdog' name='test'>\n" " <host name='example.com' port='321'/>\n" "</source>\n"); +#endif /* WITH_YAJL */ cleanup: /* Final cleanup */ -- 2.13.0

2 1

[libvirt] [PATCH 0/7] Add new APIs to edit xml configuration of managed save state of a domain
by Kothapally Madhu Pavan 21 Jun '17

21 Jun '17

managedsave command offloads the user from managing the save state file. It does not need the user to specify saved state file location, all it takes is domain name to identify. This makes it much more comfortable to use in emergency where immediate shutdowm is needed. But it doesn't provide a way to edit XML description of the save state file without user going through an extra effort to search manually where the file actually exists. The series aims to overcome the above constraints by adding new APIs and commands to seemlessly edit the managed save state XML description using just the domain name. The Patches mainly make use of the save-image-edit code flow only to simplify the above use case. This patch set provides capability to Dump and Edit the XML configuration associated with a saved state file of a domain which was created by the managedsave command. The new command carry the similar options as the save-image-<XXX> commands to change the running state as to paused state or running on start. This is equivalent to: virsh managedsave-dumpxml domain-name > state-file.xml vi state-file.xml (or make changes with your other text editor) virsh managedsave-define domain-name state-file-xml or you can simply use: virsh managedsave-edit domain-name It is always better when we get more. Kothapally Madhu Pavan (7): lib: Add API to dump xml configuration of managed save state domain lib: Add API to edit domain's managed save state xml configuration qemu: Implement qemuDomainManagedSaveGetXMLDesc qemu: Implement qemuDomainManagedSaveDefineXML virsh: Implement managedsave-define command virsh: Implement managedsave-dumpxml command virsh: Implement managedsave-edit command include/libvirt/libvirt-domain.h | 6 ++ src/driver-hypervisor.h | 11 +++ src/libvirt-domain.c | 107 ++++++++++++++++++++ src/libvirt_public.syms | 6 ++ src/qemu/qemu_driver.c | 78 +++++++++++++++ src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 31 +++++- src/remote_protocol-structs | 14 +++ tools/virsh-domain.c | 207 +++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 41 ++++++++ 10 files changed, 502 insertions(+), 1 deletion(-) -- 1.8.3.1

3 11

[libvirt] [PATCH] qemu: Do not skip virCPUUpdateLive if priv->origCPU is set
by Jiri Denemark 21 Jun '17

21 Jun '17

Even though we got both the original CPU (used for starting a domain) and the updated version (the CPU really provided by QEMU) during incoming migration, restore, or snapshot revert, we still need to update the CPU according to the data we got from the freshly started QEMU. Otherwise we don't know whether the CPU we got from QEMU matches the one before migration. We just need to keep the original CPU in priv->origCPU. Messed up by me in v3.4.0-58-g8e34f4781. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_process.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 63119396b..d669dfb32 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3989,20 +3989,16 @@ qemuProcessUpdateLiveGuestCPU(virQEMUDriverPtr driver, if (qemuProcessVerifyCPUFeatures(def, cpu) < 0) goto cleanup; - /* Don't update the CPU if we already did so when starting a domain - * during migration, restore or snapshot revert. */ - if (priv->origCPU) { - ret = 0; - goto cleanup; - } - if (!(orig = virCPUDefCopy(def->cpu))) goto cleanup; if ((rc = virCPUUpdateLive(def->os.arch, def->cpu, cpu, disabled)) < 0) { goto cleanup; } else if (rc == 0) { - if (!virCPUDefIsEqual(def->cpu, orig, false)) + /* Store the original CPU in priv if QEMU changed it and we didn't + * get the original CPU via migration, restore, or snapshot revert. + */ + if (!priv->origCPU && !virCPUDefIsEqual(def->cpu, orig, false)) VIR_STEAL_PTR(priv->origCPU, orig); def->cpu->check = VIR_CPU_CHECK_FULL; -- 2.13.1

2 1

[libvirt] [PATCH 0/3] Workaround mdev uevent race affecting node device driver
by Erik Skultety 21 Jun '17

21 Jun '17

This series resolves https://bugzilla.redhat.com/show_bug.cgi?id=1463285 Erik Skultety (3): util: Report an error when virFileResolveLinkHelper's lstat fails util: Introduce virFileWaitForAccess nodedev: Work around the uevent race by hooking up virFileWaitForAccess src/libvirt_private.syms | 1 + src/node_device/node_device_udev.c | 48 +++++++++++++++++++++++++++++++++++++- src/util/virfile.c | 40 ++++++++++++++++++++++++++++++- src/util/virfile.h | 2 ++ 4 files changed, 89 insertions(+), 2 deletions(-) -- 2.13.1

5 14

[libvirt] [PATCH] qemuProcessBuildDestroyHugepagesPath: Don't warn on destroying non-existent path
by Michal Privoznik 21 Jun '17

21 Jun '17

This function is called unconditionally from qemuProcessStop to make sure we leave no dangling dirs behind. However, whenever the directory we want to rmdir() is not there (e.g. because it hasn't been created in the first place because domain doesn't use hugepages at all), we produce a warning like this: 2017-06-20 15:58:23.615+0000: 32638: warning : qemuProcessBuildDestroyHugepagesPath:3363 : Unable to remove hugepage path: /dev/hugepages/libvirt/qemu/1-instance-00000001 (errno=2) Fix this by not producing the warning on ENOENT. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_process.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index fa9990e5d..3b7f20be4 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3358,7 +3358,8 @@ qemuProcessBuildDestroyHugepagesPath(virQEMUDriverPtr driver, goto cleanup; } } else { - if (rmdir(hugepagePath) < 0) + if (rmdir(hugepagePath) < 0 && + errno != ENOENT) VIR_WARN("Unable to remove hugepage path: %s (errno=%d)", hugepagePath, errno); } -- 2.13.0

2 1

[libvirt] [RFC] duplicate suspend/resume lifecycle events with QEMU
by Philipp Hahn 21 Jun '17

21 Jun '17

Hello, I'm using the libvirt event mechanism and noticed, that several events are reported twice: > $ python examples/event-test.py qemu:///session > Using uri:qemu:///session > myDomainEventCallback1 EVENT: Domain installer(2) Resumed Unpaused > myDomainEventCallback2 EVENT: Domain installer(2) Resumed Unpaused > myDomainEventCallback1 EVENT: Domain installer(2) Resumed Unpaused > myDomainEventCallback2 EVENT: Domain installer(2) Resumed Unpaused > myDomainEventCallback1 EVENT: Domain installer(2) Suspended Paused > myDomainEventCallback2 EVENT: Domain installer(2) Suspended Paused > myDomainEventCallback1 EVENT: Domain installer(2) Suspended Paused > myDomainEventCallback2 EVENT: Domain installer(2) Suspended Paused > myDomainEventCallback1 EVENT: Domain installer(-1) Stopped Destroyed > myDomainEventCallback2 EVENT: Domain installer(-1) Stopped Destroyed (the Python example program registers 2 handlers, so each event is printed twice, but each handler gets the suspend/resume event twice itself.) Interestingly enough it only "suspend" and "resume", but not "created" or "destroyed". But it isn't Python specific, virsh shows the same behaviour: > $ virsh event --loop --event lifecycle > event 'lifecycle' for domain installer: Started Booted > event 'lifecycle' for domain installer: Suspended Paused > event 'lifecycle' for domain installer: Resumed Unpaused > event 'lifecycle' for domain installer: Resumed Unpaused > event 'lifecycle' for domain installer: Suspended Paused > event 'lifecycle' for domain installer: Suspended Paused > event 'lifecycle' for domain installer: Stopped Destroyed After shutting down libvirtd I used `socat stdio unix-connect:...` to connect the the qemu UNIX socket and used {"execute": "stop"} and {"execute": "cont"} to verify, that QEMU only send one event. So to me it looks like libvirt is duplicating the event. Enabling DEBUG for »log_filters="1:qemu_monitor_json"« shows noting wrong with QEMU: > qemuMonitorJSONCommandWithFd:286 : Send command '{"execute":"cont","id":"libvirt-9"}' for write with FD -1 > qemuMonitorSend:972 : QEMU_MONITOR_SEND_MSG: mon=0x7f1940000910 msg={"execute":"cont","id":"libvirt-9"} > fd=-1 > qemuMonitorIOWrite:503 : QEMU_MONITOR_IO_WRITE: mon=0x7f1940000910 buf={"execute":"cont","id":"libvirt-9"} > len=37 ret=37 errno=11 > qemuMonitorIOProcess:399 : QEMU_MONITOR_IO_PROCESS: mon=0x7f1940000910 buf={"timestamp": {"seconds": 1497326279, "microseconds": 688619}, "event": "RESUME"} > {"return": {}, "id": "libvirt-9"} > len=118 > qemuMonitorJSONIOProcessLine:179 : Line [{"timestamp": {"seconds": 1497326279, "microseconds": 688619}, "event": "RESUME"}] > qemuMonitorJSONIOProcessLine:194 : QEMU_MONITOR_RECV_EVENT: mon=0x7f1940000910 event={"timestamp": {"seconds": 1497326279, "microseconds": 688619}, "event": "RESUME"} > qemuMonitorJSONIOProcessEvent:138 : mon=0x7f1940000910 obj=0x5636fa1f1f00 > qemuMonitorEmitEvent:1186 : mon=0x7f1940000910 event=RESUME > qemuMonitorJSONIOProcessEvent:165 : handle RESUME handler=0x7f19535903d0 data=(nil) > qemuMonitorEmitResume:1237 : mon=0x7f1940000910 Looking at src/qemu/qemu_monitor_json.c:qemuMonitorJSONIOProcessEvent: > 141 qemuMonitorJSONIOProcessEvent(qemuMonitorPtr mon, > 142 virJSONValuePtr obj) > 143 { ... > 170 qemuMonitorEmitEvent(mon, type, seconds, micros, details); This seems to send the first event > 171 VIR_FREE(details); > 172 > 173 handler = bsearch(type, eventHandlers, ARRAY_CARDINALITY(eventHandlers), > 174 sizeof(eventHandlers[0]), qemuMonitorEventCompare); > 175 if (handler) { > 176 VIR_DEBUG("handle %s handler=%p data=%p", type, > 177 handler->handler, data); > 178 (handler->handler)(mon, data); and this the second instance. > 179 } > 180 return 0; > 181 } Looking deeper into the GIT source code I see this: > 98 static qemuEventHandler eventHandlers[] = { ... > 113 { "RESUME", qemuMonitorJSONHandleResume, }, > 544 static void qemuMonitorJSONHandleResume(qemuMonitorPtr mon, virJSONValuePtr data ATTRIBUTE_UNUSED) > 546 qemuMonitorEmitResume(mon); ... > 1267 qemuMonitorEmitEvent(qemuMonitorPtr mon, const char *event, > 1268 long long seconds, unsigned int micros, > 1269 const char *details) ... > 1274 QEMU_MONITOR_CALLBACK(mon, ret, domainEvent, mon->vm, event, seconds, > 1275 micros, details); ... > 1325 qemuMonitorEmitResume(qemuMonitorPtr mon) > 1330 QEMU_MONITOR_CALLBACK(mon, ret, domainResume, mon->vm); but this doesn't yet completely explain, why only some events are reported twice. Is there some way to get rid of the duplication (in Python) or at least to distinguish them, so I can ignore the second one? I've observed this behaviour with both Debian-Jessie > Compiled against library: libvirt 1.2.9 > Using library: libvirt 1.2.9 > Using API: QEMU 1.2.9 > Running hypervisor: QEMU 2.6.0 and also with the newer Debian-Sid > Compiled against library: libvirt 3.0.0 > Using library: libvirt 3.0.0 > Using API: QEMU 3.0.0 > Running hypervisor: QEMU 2.8.1 Thank you in advance. Philipp -- Philipp Hahn Open Source Software Engineer Univention GmbH be open. Mary-Somerville-Str. 1 D-28359 Bremen Tel.: +49 421 22232-0 Fax : +49 421 22232-99 hahn(a)univention.de http://www.univention.de/ Geschäftsführer: Peter H. Ganten HRB 20755 Amtsgericht Bremen Steuer-Nr.: 71-597-02876

2 2

[libvirt] [PATCH] Revert "qemu: Check duplicate WWNs also for hotplugged disks"
by Peter Krempa 21 Jun '17

21 Jun '17

Similarly to commit 5da28cc3069b573f54f0bcaf8eb75476bcfdc6e9 this check actually does not make sense since duplicate WWNs are used e.g. when multipathing disks. This reverts commit 780fe4e4baf7e2f10f65ba1a34f9274fc547cad2. --- src/conf/domain_conf.c | 37 ------------------------------------- 1 file changed, 37 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0409c62ef..fdf85d5dd 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -25510,34 +25510,6 @@ virDomainDeviceInfoCheckBootIndex(virDomainDefPtr def ATTRIBUTE_UNUSED, return 0; } - -/** - * virDomainDefGetDiskByWWN: - * @def: domain definition - * @wwn: wwn of a disk to find - * - * Returns a disk definition pointer corresponding to the given WWN identifier - * or NULL either if @wwn was NULL or if disk with given WWN is not present in - * the domain definition. - */ -static virDomainDiskDefPtr -virDomainDefGetDiskByWWN(virDomainDefPtr def, - const char *wwn) -{ - size_t i; - - if (!wwn) - return NULL; - - for (i = 0; i < def->ndisks; i++) { - if (STREQ_NULLABLE(def->disks[i]->wwn, wwn)) - return def->disks[i]; - } - - return NULL; -} - - int virDomainDefCompatibleDevice(virDomainDefPtr def, virDomainDeviceDefPtr dev, @@ -25581,15 +25553,6 @@ virDomainDefCompatibleDevice(virDomainDefPtr def, } } - if (dev->type == VIR_DOMAIN_DEVICE_DISK) { - if (!!virDomainDefGetDiskByWWN(def, dev->data.disk->wwn)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Domain already has a disk with wwn '%s'"), - dev->data.disk->wwn); - return -1; - } - } - return 0; } -- 2.12.2

2 1

[libvirt] [PATCH] qemu: Change coalesce settings on hotplug when they are different
by Martin Kletzander 21 Jun '17

21 Jun '17

Part of the condition was reverted so no value update was propagated through. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1414627 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: Pushed as trivial src/qemu/qemu_hotplug.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 5247c065711d..a486fb4fe334 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3283,8 +3283,8 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, if (!!olddev->coalesce != !!newdev->coalesce || (olddev->coalesce && newdev->coalesce && - !memcmp(olddev->coalesce, newdev->coalesce, - sizeof(*olddev->coalesce)))) + memcmp(olddev->coalesce, newdev->coalesce, + sizeof(*olddev->coalesce)))) needCoalesceChange = true; /* FINALLY - actually perform the required actions */ -- 2.13.1

1 0

[libvirt] [PATCH] Fix documentation errors about the path of conf files
by Lily Zhu 21 Jun '17

21 Jun '17

The conf files, for example, libvirtd.conf, virtlockd.conf and virtlogd.conf, should be located under the directory "/etc/libvirt", rather than "/etc". Signed-off-by: Lily Zhu <lizhu(a)redhat.com> --- daemon/libvirtd.pod | 2 +- src/locking/virtlockd.pod | 2 +- src/logging/virtlogd.pod | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/daemon/libvirtd.pod b/daemon/libvirtd.pod index 3b819a2..1bca509 100644 --- a/daemon/libvirtd.pod +++ b/daemon/libvirtd.pod @@ -81,7 +81,7 @@ On receipt of B<SIGHUP> libvirtd will reload its configuration. =over -=item F<SYSCONFDIR/libvirtd.conf> +=item F<SYSCONFDIR/libvirt/libvirtd.conf> The default configuration file used by libvirtd, unless overridden on the command line using the B<-f>|B<--config> option. diff --git a/src/locking/virtlockd.pod b/src/locking/virtlockd.pod index a3bb268..2e155f8 100644 --- a/src/locking/virtlockd.pod +++ b/src/locking/virtlockd.pod @@ -67,7 +67,7 @@ upgrades of the virtlockd service. =over -=item F<SYSCONFDIR/virtlockd.conf> +=item F<SYSCONFDIR/libvirt/virtlockd.conf> The default configuration file used by virtlockd, unless overridden on the command line using the B<-f>|B<--config> option. diff --git a/src/logging/virtlogd.pod b/src/logging/virtlogd.pod index 7e55c9e..5fc20db 100644 --- a/src/logging/virtlogd.pod +++ b/src/logging/virtlogd.pod @@ -67,7 +67,7 @@ upgrades of the virtlogd service. =over -=item F<SYSCONFDIR/virtlogd.conf> +=item F<SYSCONFDIR/libvirt/virtlogd.conf> The default configuration file used by virtlogd, unless overridden on the command line using the B<-f>|B<--config> option. -- 1.8.3.1

2 1

[libvirt] [PATCH] qemu: capabilities: Move comments separating groups of capabilities
by Peter Krempa 21 Jun '17

21 Jun '17

Similarly to how we specify the groups of 5 capabilities in the header file move the labels to separate line also for the VIR_ENUM_IMPL part. This simplifies rebase conflict resolution in the capability file since only lines have to be shuffled around, but they don't need to be edited. --- src/qemu/qemu_capabilities.c | 159 ++++++++++++++++++++++++++++--------------- 1 file changed, 106 insertions(+), 53 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a9171893e..61c9a1066 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -61,319 +61,372 @@ VIR_LOG_INIT("qemu.qemu_capabilities"); * daemon restarts */ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, - "kqemu", /* 0 */ + /* 0 */ + "kqemu", "vnc-colon", "no-reboot", "drive", "drive-boot", - "name", /* 5 */ + /* 5 */ + "name", "uuid", "domid", "vnet-hdr", "migrate-kvm-stdio", - "migrate-qemu-tcp", /* 10 */ + /* 10 */ + "migrate-qemu-tcp", "migrate-qemu-exec", "drive-cache-v2", "kvm", "drive-format", - "vga", /* 15 */ + /* 15 */ + "vga", "0.10", "pci-device", "mem-path", "drive-serial", - "xen-domid", /* 20 */ + /* 20 */ + "xen-domid", "migrate-qemu-unix", "chardev", "enable-kvm", "monitor-json", - "balloon", /* 25 */ + /* 25 */ + "balloon", "device", "sdl", "smp-topology", "netdev", - "rtc", /* 30 */ + /* 30 */ + "rtc", "vhost-net", "rtc-td-hack", "no-hpet", "no-kvm-pit", - "tdf", /* 35 */ + /* 35 */ + "tdf", "pci-configfd", "nodefconfig", "boot-menu", "enable-kqemu", - "fsdev", /* 40 */ + /* 40 */ + "fsdev", "nesting", "name-process", "drive-readonly", "smbios-type", - "vga-qxl", /* 45 */ + /* 45 */ + "vga-qxl", "spice", "vga-none", "migrate-qemu-fd", "boot-index", - "hda-duplex", /* 50 */ + /* 50 */ + "hda-duplex", "drive-aio", "pci-multibus", "pci-bootindex", "ccid-emulated", - "ccid-passthru", /* 55 */ + /* 55 */ + "ccid-passthru", "chardev-spicevmc", "device-spicevmc", "virtio-tx-alg", "device-qxl-vga", - "pci-multifunction", /* 60 */ + /* 60 */ + "pci-multifunction", "virtio-blk-pci.ioeventfd", "sga", "virtio-blk-pci.event_idx", "virtio-net-pci.event_idx", - "cache-directsync", /* 65 */ + /* 65 */ + "cache-directsync", "piix3-usb-uhci", "piix4-usb-uhci", "usb-ehci", "ich9-usb-ehci1", - "vt82c686b-usb-uhci", /* 70 */ + /* 70 */ + "vt82c686b-usb-uhci", "pci-ohci", "usb-redir", "usb-hub", "no-shutdown", - "cache-unsafe", /* 75 */ + /* 75 */ + "cache-unsafe", "rombar", "ich9-ahci", "no-acpi", "fsdev-readonly", - "virtio-blk-pci.scsi", /* 80 */ + /* 80 */ + "virtio-blk-pci.scsi", "blk-sg-io", "drive-copy-on-read", "cpu-host", "fsdev-writeout", - "drive-iotune", /* 85 */ + /* 85 */ + "drive-iotune", "system_wakeup", "scsi-disk.channel", "scsi-block", "transaction", - "block-job-sync", /* 90 */ + /* 90 */ + "block-job-sync", "block-job-async", "scsi-cd", "ide-cd", "no-user-config", - "hda-micro", /* 95 */ + /* 95 */ + "hda-micro", "dump-guest-memory", "nec-usb-xhci", "virtio-s390", "balloon-event", - "bridge", /* 100 */ + /* 100 */ + "bridge", "lsi", "virtio-scsi-pci", "blockio", "disable-s3", - "disable-s4", /* 105 */ + /* 105 */ + "disable-s4", "usb-redir.filter", "ide-drive.wwn", "scsi-disk.wwn", "seccomp-sandbox", - "reboot-timeout", /* 110 */ + /* 110 */ + "reboot-timeout", "dump-guest-core", "seamless-migration", "block-commit", "vnc", - "drive-mirror", /* 115 */ + /* 115 */ + "drive-mirror", "usb-redir.bootindex", "usb-host.bootindex", "blockdev-snapshot-sync", "qxl", - "VGA", /* 120 */ + /* 120 */ + "VGA", "cirrus-vga", "vmware-svga", "device-video-primary", "s390-sclp", - "usb-serial", /* 125 */ + /* 125 */ + "usb-serial", "usb-net", "add-fd", "nbd-server", "virtio-rng", - "rng-random", /* 130 */ + /* 130 */ + "rng-random", "rng-egd", "virtio-ccw", "dtb", "megasas", - "ipv6-migration", /* 135 */ + /* 135 */ + "ipv6-migration", "machine-opt", "machine-usb-opt", "tpm-passthrough", "tpm-tis", - "nvram", /* 140 */ + /* 140 */ + "nvram", "pci-bridge", "vfio-pci", "vfio-pci.bootindex", "scsi-generic", - "scsi-generic.bootindex", /* 145 */ + /* 145 */ + "scsi-generic.bootindex", "mem-merge", "vnc-websocket", "drive-discard", "mlock", - "vnc-share-policy", /* 150 */ + /* 150 */ + "vnc-share-policy", "device-del-event", "dmi-to-pci-bridge", "i440fx-pci-hole64-size", "q35-pci-hole64-size", - "usb-storage", /* 155 */ + /* 155 */ + "usb-storage", "usb-storage.removable", "virtio-mmio", "ich9-intel-hda", "kvm-pit-lost-tick-policy", - "boot-strict", /* 160 */ + /* 160 */ + "boot-strict", "pvpanic", "enable-fips", "spice-file-xfer-disable", "spiceport", - "usb-kbd", /* 165 */ + /* 165 */ + "usb-kbd", "host-pci-multidomain", "msg-timestamp", "active-commit", "change-backing-file", - "memory-backend-ram", /* 170 */ + /* 170 */ + "memory-backend-ram", "numa", "memory-backend-file", "usb-audio", "rtc-reset-reinjection", - "splash-timeout", /* 175 */ + /* 175 */ + "splash-timeout", "iothread", "migrate-rdma", "ivshmem", "drive-iotune-max", - "VGA.vgamem_mb", /* 180 */ + /* 180 */ + "VGA.vgamem_mb", "vmware-svga.vgamem_mb", "qxl.vgamem_mb", "qxl-vga.vgamem_mb", "pc-dimm", - "machine-vmport-opt", /* 185 */ + /* 185 */ + "machine-vmport-opt", "aes-key-wrap", "dea-key-wrap", "pci-serial", "aarch64-off", - "vhost-user-multiqueue", /* 190 */ + /* 190 */ + "vhost-user-multiqueue", "migration-event", "gpex-pcihost", "ioh3420", "x3130-upstream", - "xio3130-downstream", /* 195 */ + /* 195 */ + "xio3130-downstream", "rtl8139", "e1000", "virtio-net", "gic-version", - "incoming-defer", /* 200 */ + /* 200 */ + "incoming-defer", "virtio-gpu", "virtio-gpu.virgl", "virtio-keyboard", "virtio-mouse", - "virtio-tablet", /* 205 */ + /* 205 */ + "virtio-tablet", "virtio-input-host", "chardev-file-append", "ich9-disable-s3", "ich9-disable-s4", - "vserport-change-event", /* 210 */ + /* 210 */ + "vserport-change-event", "virtio-balloon-pci.deflate-on-oom", "mptsas1068", "spice-gl", "qxl.vram64_size_mb", - "qxl-vga.vram64_size_mb", /* 215 */ + /* 215 */ + "qxl-vga.vram64_size_mb", "chardev-logfile", "debug-threads", "secret", "pxb", - "pxb-pcie", /* 220 */ + /* 220 */ + "pxb-pcie", "device-tray-moved-event", "nec-usb-xhci-ports", "virtio-scsi-pci.iothread", "name-guest", - "qxl.max_outputs", /* 225 */ + /* 225 */ + "qxl.max_outputs", "qxl-vga.max_outputs", "spice-unix", "drive-detect-zeroes", "tls-creds-x509", - "display", /* 230 */ + /* 230 */ + "display", "intel-iommu", "smm", "virtio-pci-disable-legacy", "query-hotpluggable-cpus", - "virtio-net.rx_queue_size", /* 235 */ + /* 235 */ + "virtio-net.rx_queue_size", "machine-iommu", "virtio-vga", "drive-iotune-max-length", "ivshmem-plain", - "ivshmem-doorbell", /* 240 */ + /* 240 */ + "ivshmem-doorbell", "query-qmp-schema", "gluster.debug_level", "vhost-scsi", "drive-iotune-group", - "query-cpu-model-expansion", /* 245 */ + /* 245 */ + "query-cpu-model-expansion", "virtio-net.host_mtu", "spice-rendernode", "nvdimm", "pcie-root-port", - "query-cpu-definitions", /* 250 */ + /* 250 */ + "query-cpu-definitions", "block-write-threshold", "query-named-block-nodes", "cpu-cache", "qemu-xhci", - "kernel-irqchip", /* 255 */ + /* 255 */ + "kernel-irqchip", "kernel-irqchip.split", "intel-iommu.intremap", "intel-iommu.caching-mode", "intel-iommu.eim", - "intel-iommu.device-iotlb", /* 260 */ + /* 260 */ + "intel-iommu.device-iotlb", "virtio.iommu_platform", "virtio.ats", "loadparm", -- 2.12.2

2 1

[libvirt] [PATCH v2] util: fix locale problem with virStrToDouble().
by Julio Faracco 21 Jun '17

21 Jun '17

This commit fixes a locale problem with locales that use comma as a mantissa separator. Example: 12.34 en_US = 12,34 pt_BR. Since strtod() is a non-safe function, virStrToDouble() will have problems to parse double numbers from kernel settings and other double numbers from static files (XMLs, JSONs, etc). Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1457634 Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1457481 Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/util/virstring.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/util/virstring.c b/src/util/virstring.c index 089b539..6dd5138 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -28,6 +28,7 @@ #include "base64.h" #include "c-ctype.h" #include "virstring.h" +#include "virthread.h" #include "viralloc.h" #include "virbuffer.h" #include "virerror.h" @@ -516,6 +517,22 @@ virStrToLong_ullp(char const *s, char **end_ptr, int base, return 0; } +#if HAVE_NEWLOCALE + +static locale_t virLocale; + +static int +virLocaleOnceInit(void) +{ + virLocale = newlocale(LC_ALL_MASK, "C", (locale_t)0); + if (!virLocale) + return -1; + return 0; +} + +VIR_ONCE_GLOBAL_INIT(virLocale); +#endif + int virStrToDouble(char const *s, char **end_ptr, @@ -526,7 +543,17 @@ virStrToDouble(char const *s, int err; errno = 0; +#if HAVE_NEWLOCALE + locale_t old_loc; + if (virLocaleInitialize() < 0) + return -1; + + old_loc = uselocale(virLocale); +#endif val = strtod(s, &p); /* exempt from syntax-check */ +#if HAVE_NEWLOCALE + uselocale(old_loc); +#endif err = (errno || (!end_ptr && *p) || p == s); if (end_ptr) *end_ptr = p; -- 2.7.4

2 2

[libvirt] [PATCH] util: storage: Make @backingFormat optional in virStorageFileGetMetadataInternal
by Peter Krempa 20 Jun '17

20 Jun '17

Some callers don't need to know the backing format. Make the argument optional by using a dummy int if NULL is passed. --- src/util/virstoragefile.c | 4 ++++ src/util/virstoragefile.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 8047d977f..042698872 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -966,9 +966,13 @@ virStorageFileGetMetadataInternal(virStorageSourcePtr meta, size_t len, int *backingFormat) { + int format; int ret = -1; size_t i; + if (!backingFormat) + backingFormat = &format; + VIR_DEBUG("path=%s, buf=%p, len=%zu, meta->format=%d", meta->path, buf, len, meta->format); diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index ce54a19ce..0bff8671f 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -293,7 +293,7 @@ int virStorageFileGetMetadataInternal(virStorageSourcePtr meta, char *buf, size_t len, int *backingFormat) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4); + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); virStorageSourcePtr virStorageFileGetMetadataFromFD(const char *path, int fd, -- 2.12.2

3 2

[libvirt] [libvirt-python PATCH] Add details for shutdown event
by Martin Kletzander 20 Jun '17

20 Jun '17

In commit a8eba5036cb4b0e2ec827e9e6e019ce70e451377, libvirt added support for two more details. Follow that in python bindings as well. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1463188 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- examples/event-test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/event-test.py b/examples/event-test.py index 3bca9e27c9be..4eb71425cff4 100755 --- a/examples/event-test.py +++ b/examples/event-test.py @@ -477,7 +477,7 @@ def domDetailToString(event, detail): ( "Paused", "Migrated", "IOError", "Watchdog", "Restored", "Snapshot", "API error" ), ( "Unpaused", "Migrated", "Snapshot" ), ( "Shutdown", "Destroyed", "Crashed", "Migrated", "Saved", "Failed", "Snapshot"), - ( "Finished", ), + ( "Finished", "On guest request", "On host request"), ( "Memory", "Disk" ), ( "Panicked", ), ) -- 2.13.1

2 1

[libvirt] [PATCH 0/5] Fix regression when relative block commit does not work after snapshots
by Peter Krempa 20 Jun '17

20 Jun '17

See patch 5/5. Peter Krempa (5): qemu: block commit: Determine relative path of images before initializing qemu: block commit: Don't overwrite error when rolling back disk labels util: storage: Export virStorageIsRelative storage: Add helper to retrieve the backing store string of a storage volume qemu: snapshot: Load data necessary for relative block commit to work src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 51 +++++++++++++++++++++++++++++++------------- src/storage/storage_driver.c | 44 ++++++++++++++++++++++++++++++++++++++ src/storage/storage_driver.h | 3 +++ src/util/virstoragefile.c | 2 +- src/util/virstoragefile.h | 1 + 6 files changed, 86 insertions(+), 16 deletions(-) -- 2.12.2

2 10

[libvirt] [PATCH] check the return value of qemuBuildVirtioOptionsStr
by Ján Tomko 20 Jun '17

20 Jun '17

Only qemuBuildFSDevStr missed the return check. --- src/qemu/qemu_command.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 900239f05..57893cfda 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2527,7 +2527,8 @@ qemuBuildFSDevStr(const virDomainDef *def, QEMU_FSDEV_HOST_PREFIX, fs->info.alias); virBufferAsprintf(&opt, ",mount_tag=%s", fs->dst); - qemuBuildVirtioOptionsStr(&opt, fs->virtio, qemuCaps); + if (qemuBuildVirtioOptionsStr(&opt, fs->virtio, qemuCaps) < 0) + goto error; if (qemuBuildDeviceAddressStr(&opt, def, &fs->info, qemuCaps) < 0) goto error; -- 2.13.0

3 2

[libvirt] [PATCH 0/3] Small patches
by Marc Hartmayer 20 Jun '17

20 Jun '17

2 7

[libvirt] [PATCH v2 0/8] Add new JSON pseudo-protocol support for qemu 2.9 changes
by Peter Krempa 20 Jun '17

20 Jun '17

Patches 1-3 of old series were pushed already. Patch 1 of this series is new and adapts to change in 'SocketAddress' in qemu. Patches 2 and 3 needed to be modified because of patch 1. Patch 4 fixes the 'lun' field and splits the portal into host and port. There are a few changes in the rest of the patches, mostly changes from 'tcp' to 'inet' in the test suite. Peter Krempa (8): util: storage: Add support for type 'inet' in virStorageSourceParseBackingJSONSocketAddress util: storage: Split out parsing of TCP network host from JSON pseudoprotocol util: storage: Report errors when source host data is missing util: storage: Add JSON parser for new options in iSCSI protocol util: storage: adapt to changes in JSON format for NBD util: storage: adapt to changes in JSON format for ceph/rbd util: storage: adapt to changes in JSON format for ssh util: storage: adapt to changes in JSON format for sheepdog src/util/virstoragefile.c | 270 ++++++++++++++++++++++++++++++++++++---------- tests/virstoragetest.c | 73 ++++++++++++- 2 files changed, 283 insertions(+), 60 deletions(-) -- 2.12.2

2 17

[libvirt] [PATCH] bhyve: add vga configuration for video driver
by Roman Bogorodskiy 19 Jun '17

19 Jun '17

Add support for vgaconf driver configuration. In domain xml it looks like this: <video> <driver vgaconf='io|on|off'> <model .../> </video> It was added with bhyve gop video in mind to allow users control how the video device is exposed to the guest, specifically, how VGA I/O is handled. One can refer to the bhyve manual page to get more detailed description of the possible VGA configuration options: https://www.freebsd.org/cgi/man.cgi?query=bhyve&manpath=FreeBSD+12-current The relevant part could be found using the 'vgaconf' keyword. Also, add some tests for this new feature. Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- Changes from v1: * Rebased on top of current master. Specifically, the most important bit was merging with f5384fb4 which has added video/driver element * In conjunction with f5384fb4 use video/driver element instead of video/model/driver * Squash in conf and bhyve patches to make it easier to understand how it's used * Rename *Vgaconf* to *VGAConf* * Add a little more tests docs/schemas/domaincommon.rng | 13 ++++- src/bhyve/bhyve_command.c | 4 ++ src/conf/domain_conf.c | 57 ++++++++++++++++++++-- src/conf/domain_conf.h | 17 +++++++ src/libvirt_private.syms | 2 + .../bhyvexml2argv-vnc-vgaconf-io.args | 12 +++++ .../bhyvexml2argv-vnc-vgaconf-io.ldargs | 1 + .../bhyvexml2argv-vnc-vgaconf-io.xml | 30 ++++++++++++ .../bhyvexml2argv-vnc-vgaconf-off.args | 12 +++++ .../bhyvexml2argv-vnc-vgaconf-off.ldargs | 1 + .../bhyvexml2argv-vnc-vgaconf-off.xml | 30 ++++++++++++ .../bhyvexml2argv-vnc-vgaconf-on.args | 12 +++++ .../bhyvexml2argv-vnc-vgaconf-on.ldargs | 1 + .../bhyvexml2argv-vnc-vgaconf-on.xml | 30 ++++++++++++ tests/bhyvexml2argvtest.c | 3 ++ .../bhyvexml2xmlout-vnc-vgaconf-io.xml | 41 ++++++++++++++++ .../bhyvexml2xmlout-vnc-vgaconf-off.xml | 42 ++++++++++++++++ .../bhyvexml2xmlout-vnc-vgaconf-on.xml | 42 ++++++++++++++++ tests/bhyvexml2xmltest.c | 3 ++ 19 files changed, 348 insertions(+), 5 deletions(-) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-io.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-off.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-on.xml diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 4950ddc10..51acac3ee 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -3220,7 +3220,18 @@ <element name="video"> <optional> <element name="driver"> - <ref name="virtioOptions"/> + <optional> + <ref name="virtioOptions"/> + </optional> + <optional> + <attribute name="vgaconf"> + <choice> + <value>io</value> + <value>on</value> + <value>off</value> + </choice> + </attribute> + </optional> </element> </optional> <optional> diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index eae5cb3ca..b3ae315bd 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -408,6 +408,10 @@ bhyveBuildGraphicsArgStr(const virDomainDef *def ATTRIBUTE_UNUSED, _("Unsupported listen type")); } + if (video->driver) + virBufferAsprintf(&opt, ",vga=%s", + virDomainVideoVGAConfTypeToString(video->driver->vgaconf)); + virCommandAddArg(cmd, "-s"); virCommandAddArgBuffer(cmd, &opt); return 0; diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4f79d3825..1e9f91ca8 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -560,6 +560,11 @@ VIR_ENUM_IMPL(virDomainVideo, VIR_DOMAIN_VIDEO_TYPE_LAST, "virtio", "gop") +VIR_ENUM_IMPL(virDomainVideoVGAConf, VIR_DOMAIN_VIDEO_VGACONF_LAST, + "io", + "on", + "off") + VIR_ENUM_IMPL(virDomainInput, VIR_DOMAIN_INPUT_TYPE_LAST, "mouse", "tablet", @@ -2355,6 +2360,7 @@ void virDomainVideoDefFree(virDomainVideoDefPtr def) VIR_FREE(def->accel); VIR_FREE(def->virtio); + VIR_FREE(def->driver); VIR_FREE(def); } @@ -13529,6 +13535,43 @@ virDomainVideoAccelDefParseXML(xmlNodePtr node) return def; } +static virDomainVideoDriverDefPtr +virDomainVideoDriverDefParseXML(xmlNodePtr node) +{ + xmlNodePtr cur; + virDomainVideoDriverDefPtr def; + char *vgaconf = NULL; + int val; + + cur = node->children; + while (cur != NULL) { + if (cur->type == XML_ELEMENT_NODE) { + if (!vgaconf && + xmlStrEqual(cur->name, BAD_CAST "driver")) { + vgaconf = virXMLPropString(cur, "vgaconf"); + } + } + cur = cur->next; + } + + if (!vgaconf) + return NULL; + + if (VIR_ALLOC(def) < 0) + goto cleanup; + + if ((val = virDomainVideoVGAConfTypeFromString(vgaconf)) <= 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown vgaconf value '%s'"), vgaconf); + goto cleanup; + } + def->vgaconf = val; + + cleanup: + VIR_FREE(vgaconf); + return def; +} + static virDomainVideoDefPtr virDomainVideoDefParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt, @@ -13652,6 +13695,8 @@ virDomainVideoDefParseXML(xmlNodePtr node, if (virDomainVirtioOptionsParseXML(ctxt, &def->virtio) < 0) goto error; + def->driver = virDomainVideoDriverDefParseXML(node); + cleanup: ctxt->node = saved; @@ -23386,7 +23431,6 @@ virDomainVideoAccelDefFormat(virBufferPtr buf, virBufferAddLit(buf, "/>\n"); } - static int virDomainVideoDefFormat(virBufferPtr buf, virDomainVideoDefPtr def, @@ -23406,9 +23450,13 @@ virDomainVideoDefFormat(virBufferPtr buf, virDomainVirtioOptionsFormat(&driverBuf, def->virtio); if (virBufferCheckError(&driverBuf) < 0) return -1; - if (virBufferUse(&driverBuf)) { + if (virBufferUse(&driverBuf) || (def->driver && def->driver->vgaconf)) { virBufferAddLit(buf, "<driver"); - virBufferAddBuffer(buf, &driverBuf); + if (virBufferUse(&driverBuf)) + virBufferAddBuffer(buf, &driverBuf); + if (def->driver && def->driver->vgaconf) + virBufferAsprintf(buf, " vgaconf='%s'", + virDomainVideoVGAConfTypeToString(def->driver->vgaconf)); virBufferAddLit(buf, "/>\n"); } virBufferAsprintf(buf, "<model type='%s'", @@ -23428,7 +23476,8 @@ virDomainVideoDefFormat(virBufferPtr buf, if (def->accel) { virBufferAddLit(buf, ">\n"); virBufferAdjustIndent(buf, 2); - virDomainVideoAccelDefFormat(buf, def->accel); + if (def->accel) + virDomainVideoAccelDefFormat(buf, def->accel); virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "</model>\n"); } else { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 6d9ee9787..964bc02f9 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1359,6 +1359,16 @@ typedef enum { } virDomainVideoType; +typedef enum { + VIR_DOMAIN_VIDEO_VGACONF_IO = 0, + VIR_DOMAIN_VIDEO_VGACONF_ON, + VIR_DOMAIN_VIDEO_VGACONF_OFF, + + VIR_DOMAIN_VIDEO_VGACONF_LAST +} virDomainVideoVGAConf; + +VIR_ENUM_DECL(virDomainVideoVGAConf) + typedef struct _virDomainVideoAccelDef virDomainVideoAccelDef; typedef virDomainVideoAccelDef *virDomainVideoAccelDefPtr; struct _virDomainVideoAccelDef { @@ -1367,6 +1377,12 @@ struct _virDomainVideoAccelDef { }; +typedef struct _virDomainVideoDriverDef virDomainVideoDriverDef; +typedef virDomainVideoDriverDef *virDomainVideoDriverDefPtr; +struct _virDomainVideoDriverDef { + virDomainVideoVGAConf vgaconf; +}; + struct _virDomainVideoDef { int type; unsigned int ram; /* kibibytes (multiples of 1024) */ @@ -1376,6 +1392,7 @@ struct _virDomainVideoDef { unsigned int heads; bool primary; virDomainVideoAccelDefPtr accel; + virDomainVideoDriverDefPtr driver; virDomainDeviceInfo info; virDomainVirtioOptionsPtr virtio; }; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 044510f09..41ca62631 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -530,6 +530,8 @@ virDomainVideoDefaultType; virDomainVideoDefFree; virDomainVideoTypeFromString; virDomainVideoTypeToString; +virDomainVideoVGAConfTypeFromString; +virDomainVideoVGAConfTypeToString; virDomainVirtTypeFromString; virDomainVirtTypeToString; virDomainWatchdogActionTypeFromString; diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.args b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.args new file mode 100644 index 000000000..da3797100 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.args @@ -0,0 +1,12 @@ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-l bootrom,/path/to/test.fd \ +-s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ +-s 4:0,fbuf,tcp=127.0.0.1:5904,vga=io \ +-s 1,lpc bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.ldargs new file mode 100644 index 000000000..421376db9 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.ldargs @@ -0,0 +1 @@ +dummy diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.xml new file mode 100644 index 000000000..b1bb3793d --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.xml @@ -0,0 +1,30 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <os> + <type>hvm</type> + <loader readonly="yes" type="pflash">/path/to/test.fd</loader> + </os> + <devices> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <interface type='bridge'> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + <graphics type='vnc' port='5904'> + <listen type='address' address='127.0.0.1'/> + </graphics> + <video> + <driver vgaconf="io"/> + <model type='gop' heads='1' primary='yes'/> + </video> + </devices> +</domain> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.args b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.args new file mode 100644 index 000000000..70347ee0b --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.args @@ -0,0 +1,12 @@ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-l bootrom,/path/to/test.fd \ +-s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ +-s 4:0,fbuf,tcp=127.0.0.1:5904,vga=off \ +-s 1,lpc bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.ldargs new file mode 100644 index 000000000..421376db9 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.ldargs @@ -0,0 +1 @@ +dummy diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.xml new file mode 100644 index 000000000..6e9582840 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.xml @@ -0,0 +1,30 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <os> + <type>hvm</type> + <loader readonly="yes" type="pflash">/path/to/test.fd</loader> + </os> + <devices> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <interface type='bridge'> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + <graphics type='vnc' port='5904'> + <listen type='address' address='127.0.0.1'/> + </graphics> + <video> + <driver vgaconf="off"/> + <model type='gop' heads='1' primary='yes'/> + </video> + </devices> +</domain> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.args b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.args new file mode 100644 index 000000000..d0e1d81e2 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.args @@ -0,0 +1,12 @@ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-l bootrom,/path/to/test.fd \ +-s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ +-s 4:0,fbuf,tcp=127.0.0.1:5904,vga=on \ +-s 1,lpc bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.ldargs new file mode 100644 index 000000000..421376db9 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.ldargs @@ -0,0 +1 @@ +dummy diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.xml new file mode 100644 index 000000000..a270f6334 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.xml @@ -0,0 +1,30 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <os> + <type>hvm</type> + <loader readonly="yes" type="pflash">/path/to/test.fd</loader> + </os> + <devices> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <interface type='bridge'> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + <graphics type='vnc' port='5904'> + <listen type='address' address='127.0.0.1'/> + </graphics> + <video> + <driver vgaconf="on"/> + <model type='gop' heads='1' primary='yes'/> + </video> + </devices> +</domain> diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index c8f8c685a..72f10ebc1 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -193,6 +193,9 @@ mymain(void) DO_TEST("net-e1000"); DO_TEST("uefi"); DO_TEST("vnc"); + DO_TEST("vnc-vgaconf-on"); + DO_TEST("vnc-vgaconf-off"); + DO_TEST("vnc-vgaconf-io"); /* Address allocation tests */ DO_TEST("addr-single-sata-disk"); diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-io.xml b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-io.xml new file mode 100644 index 000000000..9e470e432 --- /dev/null +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-io.xml @@ -0,0 +1,41 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64'>hvm</type> + <loader readonly='yes' type='pflash'>/path/to/test.fd</loader> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <controller type='pci' index='0' model='pci-root'/> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </controller> + <interface type='bridge'> + <mac address='52:54:00:00:00:00'/> + <source bridge='virbr0'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + <graphics type='vnc' port='5904' autoport='no' listen='127.0.0.1'> + <listen type='address' address='127.0.0.1'/> + </graphics> + <video> + <model type='gop' heads='1' primary='yes'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </video> + </devices> +</domain> diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-off.xml b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-off.xml new file mode 100644 index 000000000..89c4ceac5 --- /dev/null +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-off.xml @@ -0,0 +1,42 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64'>hvm</type> + <loader readonly='yes' type='pflash'>/path/to/test.fd</loader> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <controller type='pci' index='0' model='pci-root'/> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </controller> + <interface type='bridge'> + <mac address='52:54:00:00:00:00'/> + <source bridge='virbr0'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + <graphics type='vnc' port='5904' autoport='no' listen='127.0.0.1'> + <listen type='address' address='127.0.0.1'/> + </graphics> + <video> + <driver vgaconf='off'/> + <model type='gop' heads='1' primary='yes'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </video> + </devices> +</domain> diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-on.xml b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-on.xml new file mode 100644 index 000000000..86d893936 --- /dev/null +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-on.xml @@ -0,0 +1,42 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64'>hvm</type> + <loader readonly='yes' type='pflash'>/path/to/test.fd</loader> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <controller type='pci' index='0' model='pci-root'/> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </controller> + <interface type='bridge'> + <mac address='52:54:00:00:00:00'/> + <source bridge='virbr0'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + <graphics type='vnc' port='5904' autoport='no' listen='127.0.0.1'> + <listen type='address' address='127.0.0.1'/> + </graphics> + <video> + <driver vgaconf='on'/> + <model type='gop' heads='1' primary='yes'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </video> + </devices> +</domain> diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index b3759919e..8e41088a8 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -105,6 +105,9 @@ mymain(void) DO_TEST_DIFFERENT("serial-grub"); DO_TEST_DIFFERENT("serial-grub-nocons"); DO_TEST_DIFFERENT("vnc"); + DO_TEST_DIFFERENT("vnc-vgaconf-on"); + DO_TEST_DIFFERENT("vnc-vgaconf-off"); + DO_TEST_DIFFERENT("vnc-vgaconf-io"); /* Address allocation tests */ DO_TEST_DIFFERENT("addr-single-sata-disk"); -- 2.13.0

2 1

[libvirt] [PATCH] qemu: Remove coverity[negative_returns] annotation
by Andrea Bolognani 19 Jun '17

19 Jun '17

It was added in commit 6c2e4c3856c8ed48c378bf1bf357cab46271a47a so that Coverity would not complain about passing -1 to qemuDomainDetachThisHostDevice(), but the function is question has changed since and so the annotation doesn't apply anymore. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/qemu/qemu_hotplug.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 244dd5e..5247c06 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -5007,7 +5007,6 @@ qemuDomainDetachNetDevice(virQEMUDriverPtr driver, detach = vm->def->nets[detachidx]; if (virDomainNetGetActualType(detach) == VIR_DOMAIN_NET_TYPE_HOSTDEV) { - /* coverity[negative_returns] */ ret = qemuDomainDetachThisHostDevice(driver, vm, virDomainNetGetActualHostdev(detach)); goto cleanup; -- 2.7.5

2 1

[libvirt] [PATCH v2] qemu: Pass the number of heads even with -vga qxl
by Martin Kletzander 19 Jun '17

19 Jun '17

When added in multiple previous commits, it was used only with -device qxl(-vga), but for some QEMUs (< 1.6) we need to add this functionality when using -vga qxl as well. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1283207 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- v2: - Do not change the domain definition - Adjust the code so that it looks the same as other chunks before above v1: - https://www.redhat.com/archives/libvir-list/2017-June/msg00606.html src/qemu/qemu_command.c | 7 ++++ .../qemuxml2argv-video-vga-qxl-heads.args | 30 ++++++++++++++ .../qemuxml2argv-video-vga-qxl-heads.xml | 47 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ 4 files changed, 87 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 8c12b2be086a..88ce3787d968 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4590,6 +4590,7 @@ qemuBuildVgaVideoCommand(virCommandPtr cmd, unsigned int vram = video->vram; unsigned int vram64 = video->vram64; unsigned int vgamem = video->vgamem; + unsigned int heads = video->heads; if (ram) { virCommandAddArg(cmd, "-global"); @@ -4613,6 +4614,12 @@ qemuBuildVgaVideoCommand(virCommandPtr cmd, virCommandAddArgFormat(cmd, "%s.vgamem_mb=%u", dev, vgamem / 1024); } + if (heads && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_QXL_MAX_OUTPUTS)) { + virCommandAddArg(cmd, "-global"); + virCommandAddArgFormat(cmd, "%s.max_outputs=%u", + dev, heads); + } } if (video->vram && diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.args b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.args new file mode 100644 index 000000000000..411a2eedbc4b --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.args @@ -0,0 +1,30 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ +-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +-vga qxl \ +-global qxl-vga.ram_size=67108864 \ +-global qxl-vga.vram_size=67108864 \ +-global qxl-vga.max_outputs=1 \ +-device qxl,id=video1,ram_size=67108864,vram_size=33554432,max_outputs=3,\ +bus=pci.0,addr=0x4 \ +-device qxl,id=video2,ram_size=67108864,vram_size=67108864,max_outputs=7,\ +bus=pci.0,addr=0x5 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.xml b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.xml new file mode 100644 index 000000000000..d878ddcd6d2e --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.xml @@ -0,0 +1,47 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <video> + <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='3'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </video> + <video> + <model type='qxl' ram='65536' vram='65536' vgamem='8192' heads='7'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> + </video> + <video> + <model type='qxl' ram='65536' vram='65536' vgamem='8192' heads='1' primary='yes'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </video> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 799aea9faf54..34edc546b068 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1735,6 +1735,9 @@ mymain(void) QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_QXL_MAX_OUTPUTS); + DO_TEST("video-vga-qxl-heads", + QEMU_CAPS_DEVICE_QXL, + QEMU_CAPS_QXL_MAX_OUTPUTS); DO_TEST("video-qxl-noheads", QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL, -- 2.13.1

2 1

[libvirt] [PATCH] hacking: Improve 'git send-email' documentation
by Andrea Bolognani 19 Jun '17

19 Jun '17

For the benefit of first time contributors, we point out that 'git send-email' might have to be installed separately; however, we omit the fact that some configuration will likely be needed before it can successfully deliver patches to the mailing list. Some minor tweaks to the existing contents are included as well. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- docs/hacking.html.in | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/docs/hacking.html.in b/docs/hacking.html.in index d6a574c..434fb68 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -29,8 +29,8 @@ file from zanata.</p> </li> - <li><p>Post patches using "git send-email", with git rename - detection enabled. You need a one-time setup of:</p> + <li><p>Post patches using <code>git send-email</code>, with git + rename detection enabled. You need a one-time setup of:</p> <pre> git config diff.renames true </pre> @@ -52,20 +52,32 @@ git send-email --cover-letter --no-chain-reply-to --annotate \ --to=libvir-list(a)redhat.com master </pre> - <p>(Note that the "git send-email" subcommand may not be in - the main git package and using it may require installation of a - separate package, for example the "git-email" package in - Fedora.) For a single patch you can omit - <code>--cover-letter</code>, but a series of two or more - patches needs a cover letter. If you get tired of typing - <code>--to=libvir-list(a)redhat.com</code> designation you can - set it in git config:</p> + <p>Note that the <code>git send-email</code> subcommand may not + be in the main git package and using it may require installation + of a separate package, for example the "git-email" package in + Fedora and Debian. If this is your first time using + <code>git send-email</code>, you might need to configure it to + point it to your SMTP server with something like:</p> +<pre> + git config --global sendemail.smtpServer stmp.youremailprovider.net +</pre> + <p>If you get tired of typing + <code>--to=libvir-list(a)redhat.com</code> all the time, you can + configure that to be automatically handled as well:</p> <pre> git config sendemail.to libvir-list(a)redhat.com </pre> + <p>For a single patch you can omit + <code>--cover-letter</code>, but a series of two or more + patches needs a cover letter.</p> + <p>If everything went well, your patch should show up on the + <a href="https://www.redhat.com/archives/libvir-list/">libvir-list + archives</a> in a matter of minutes; if you still can't find it on + there after an hour or so, you should double-check your setup.</p> <p>Please follow this as close as you can, especially the rebase and - git send-email part, as it makes life easier for other developers to - review your patch set. One should avoid sending patches as attachments, + <code>git send-email</code> part, as it makes life easier for other + developers to review your patch set. + One should avoid sending patches as attachments, but rather send them in email body along with commit message. If a developer is sending another version of the patch (e.g. to address review comments), they are advised to note differences to previous -- 2.7.5

4 4

[libvirt] [PATCH 1/2] util: implement virStrToDoubleSafe().
by Julio Faracco 18 Jun '17

18 Jun '17

Following the GNU Documentation, functions to convert double/float to string and vice versa, use the locale to set the mantissa separator. Some languages use comma and other use dot as a separator. For example: 1,212.67 (en_US) = 1.112,67 (pt_BR). This can be used to parse values in float/double from XML and other definition files. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/libvirt_private.syms | 1 + src/util/virstring.c | 31 +++++++++++++++++++++++++++++++ src/util/virstring.h | 4 ++++ 3 files changed, 36 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 044510f..9d791e6 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2659,6 +2659,7 @@ virStringTrimOptionalNewline; virStrncpy; virStrndup; virStrToDouble; +virStrToDoubleSafe; virStrToLong_i; virStrToLong_l; virStrToLong_ll; diff --git a/src/util/virstring.c b/src/util/virstring.c index 089b539..6dad00f 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -537,6 +537,37 @@ virStrToDouble(char const *s, } int +virStrToDoubleSafe(char const *s, + char **end_ptr, + double *result) +{ + char *cur_locale = NULL; + char *saved_locale = NULL; + int ret = -1; + + cur_locale = setlocale (LC_ALL, NULL); + if (!cur_locale) + return ret; + + if (VIR_STRDUP(saved_locale, cur_locale) < 0) + goto cleanup; + + if (!setlocale (LC_ALL, "C")) + goto cleanup; + + ret = virStrToDouble(s, end_ptr, result); + + // Cannot restore the locale. + if (!setlocale (LC_ALL, saved_locale)) + ret = -1; + + cleanup: + VIR_FREE(saved_locale); + VIR_FREE(cur_locale); + return ret; +} + +int virVasprintfInternal(bool report, int domcode, const char *filename, diff --git a/src/util/virstring.h b/src/util/virstring.h index 0038a40..fa551b7 100644 --- a/src/util/virstring.h +++ b/src/util/virstring.h @@ -108,6 +108,10 @@ int virStrToDouble(char const *s, char **end_ptr, double *result) ATTRIBUTE_RETURN_CHECK; +int virStrToDoubleSafe(char const *s, + char **end_ptr, + double *result) + ATTRIBUTE_RETURN_CHECK; void virSkipSpaces(const char **str) ATTRIBUTE_NONNULL(1); void virSkipSpacesAndBackslash(const char **str) ATTRIBUTE_NONNULL(1); -- 2.7.4

2 4

[libvirt] Making DHCP leases available to local DNS server through dnsmasq
by jean-christophe manciot 18 Jun '17

18 Jun '17

Hello everyone, I have multiple virtual networks defined on my Server: # virsh net-list --all Name State Autostart Persistent ---------------------------------------------------------- default active yes yes ... virtual-mgt-5 active yes yes ... When a VM is started on one of them with an interface which needs the dnsmasq DHCP server to get its IP address/len, it remains inaccessible with the FQDN once the IP information is acquired. The default values are used for each dnsmasq instance: ● libvirtd.service - Virtualization daemon Loaded: loaded (/lib/systemd/system/libvirtd.service; enabled; vendor preset: enabled) Active: active (running) since Sat 2017-06-10 19:48:58 CEST; 3ms ago Docs: man:libvirtd(8) http://libvirt.org Main PID: 25365 (libvirtd) Tasks: 35 (limit: 4915) Memory: 27.1M CPU: 28ms CGroup: /system.slice/libvirtd.service ├─22262 /usr/sbin/dnsmasq --conf-file=/var/lib/libvirt/dnsmasq/default.conf --leasefile-ro --dhcp-script=/usr/lib/libvirt/libvirt_leaseshelper ├─22263 /usr/sbin/dnsmasq --conf-file=/var/lib/libvirt/dnsmasq/default.conf --leasefile-ro --dhcp-script=/usr/lib/libvirt/libvirt_leaseshelper ... ├─24061 /usr/sbin/dnsmasq --conf-file=/var/lib/libvirt/dnsmasq/virtual-mgt-5.conf --leasefile-ro --dhcp-script=/usr/lib/libvirt/libvirt_leaseshelper ├─24062 /usr/sbin/dnsmasq --conf-file=/var/lib/libvirt/dnsmasq/virtual-mgt-5.conf --leasefile-ro --dhcp-script=/usr/lib/libvirt/libvirt_leaseshelper ... ├─25365 /usr/sbin/libvirtd └─25384 /usr/sbin/dnsmasq --help I wonder whether the option "--leasefile-ro" gets in the way or not: there must be a key=value in /etc/libvirt/qemu/networks/<virtual_network>.xml to enable this behavior, but could not find it in the Network XML format <https://libvirt.org/formatnetwork.html>. The contents of my XML file are: <network ipv6='yes'> <name>virtual-mgt-5</name> <uuid>193ac2c9-13fc-44a6-83f8-477790f1f470</uuid> <forward mode='route'/> <bridge name='virbr5' stp='on' delay='0'/> <mac address='52:54:00:b9:ea:63'/> <domain name='actionmystique.net'/> <ip address='172.21.0.1' netmask='255.255.0.0'> <dhcp> <range start='172.21.0.1' end='172.21.255.254'/> </dhcp> </ip> <ip family='ipv6' address='fc21::1' prefix='64'> <dhcp> <range start='fc21::1' end='fc21::fffe'/> </dhcp> </ip> </network> Any suggestion? -- Jean-Christophe

3 7

[libvirt] [PATCH v5 0/5] Hyper-V method invocation
by Sri Ramanujam 18 Jun '17

18 Jun '17

Changes from v4: * Changes from review * Added hypervFreeEmbeddedParam Sri Ramanujam (5): hyperv: Functions to work with invocation parameters. hyperv: Generate object property type information. hyperv: add hypervInvokeMethod hyperv: support virDomainSendKey hyperv: Add support for virDomainSetMemory src/hyperv/hyperv_driver.c | 228 +++++++++ src/hyperv/hyperv_wmi.c | 911 ++++++++++++++++++++++++++++++++++ src/hyperv/hyperv_wmi.h | 95 +++- src/hyperv/hyperv_wmi_classes.h | 19 + src/hyperv/hyperv_wmi_generator.input | 116 +++++ src/hyperv/hyperv_wmi_generator.py | 15 +- src/hyperv/openwsman.h | 4 + 7 files changed, 1386 insertions(+), 2 deletions(-) -- 2.9.4

2 11

[libvirt] [PATCH 00/10] Add new JSON pseudo-protocol support for qemu 2.9 changes
by Peter Krempa 16 Jun '17

16 Jun '17

The conversion to proper structures in qemu 2.9 lead to a change in the JSON pseudo protocol fields, which made them unknown to libvirt. This patchset fixes and refactors a few helpers and then adds the new format to the backing store string parser. Peter Krempa (10): util: storage: Output parsed network backing store string to debug log util: storage: Add missing return to virStorageSourceParseBackingJSONGluster util: storage: make virStorageSourceParseBackingJSONGlusterHost universal util: storage: Split out parsing of TCP network host from JSON pseudoprotocol util: storage: Report errors when source host data is missing util: storage: Add JSON parser for new options in iSCSI protocol util: storage: adapt to changes in JSON format for NBD util: storage: adapt to changes in JSON format for ceph/rbd util: storage: adapt to changes in JSON format for ssh util: storage: adapt to changes in JSON format for sheepdog src/util/virstoragefile.c | 256 ++++++++++++++++++++++++++++++++++++---------- tests/virstoragetest.c | 62 +++++++++++ 2 files changed, 266 insertions(+), 52 deletions(-) -- 2.12.2

2 20

[libvirt] [PATCH 0/3] Couple of qemu NS fixes
by Michal Privoznik 16 Jun '17

16 Jun '17

Yet again, some corner cases, nothing critical. But it is certainly nice to fix them regardless. Michal Privoznik (3): qemuDomainBuildNamespace: Clean up temp files qemuDomainGetPreservedMounts: Prune nested mount points qemuDomainGetPreservedMounts: Fix suffixes for corner cases src/qemu/qemu_domain.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) -- 2.13.0

2 14

[libvirt] Mount events are not propagated to namespaces
by Michal Privoznik 16 Jun '17

16 Jun '17

Dear list, while trying to fix a bug of mine, I've realized the mounts are not being propagated into qemu namespaces once domains are running. That is, imagine you have a domain running and then you plug in a flash disk, mount it into host, because you have a file there that you want to hotplug as a disk to your domain. You're not hotplugging the whole flash disk, but a file on it. Problem is, that the mount event of the flash disk is not propagated to qemu namespace even though the root is remounted as MS_SLAVE|MS_REC right after the namespace is created. After some digging. I am able to reproduce this even without libvirt at all: # mount --make-rshared / # mount | grep floppy <empty/> # unshare -m /bin/bash # mount --make-rslave / Now mount floppy from a different terminal: # mount /dev/sdb1 /mnt/floppy/ # mount | grep floppy /dev/sdb1 on /mnt/floppy type ext4 (rw,relatime,data=ordered) At this point, mount should have been propagated into namespace. Well, it isn't: # mount | grep floppy <empty/> Do you have any idea what I am doing wrong? We need this to work not only because of the example described above, but for a whole lot more cases. Michal

2 2

[libvirt] [PATCH v2 00/24] Support multiple PHBs for pSeries guests
by Andrea Bolognani 16 Jun '17

16 Jun '17

Changes from [v1]: * address review comments; * implement a much better isolation algorithm that doesn't require parsing and formatting the isolation group and can handle more dynamic scenarios, such as empty PHBs changing their isolation groups to accomodate hotplugged hostdevs; * add more test cases. Reviewed-by tags have been collected, so figuring out which patches are still in need of reviewing is pretty easy. As an exception, patches 12 and 13 are unchanged but don't carry the tag due to the required documentation being still missing. Known limitations: * hot(un)plug is still not handled - shouldn't be too much work to fix this, but I though it would be better to send out the code now rather than holding it up further, as most of it shouldn't change anyway; * hostdevs in IOMMU group 0 are not handled properly - the default isolation group is currently 0, which means hostdevs in IOMMU group 0 will be assigned addresses as if they were emulated devices and will not be isolated properly. Fixing this will be a lot of work because it requires cleaning up the the code that instantiates pretty much anything embedding a virDomainDeviceInfo, which is... A lot of things. Luckily, IOMMU group 0 will probably not contain any devices that are actually usable as hostdevs, so it should be okay to fix this in a follow-up series rather than upfront; * documentation is still missing - I'll take care of that once the code is feature-complete, eg. the first item has been solved; * no epic cover letter this time around - apologies to all my fans :( [v1] https://www.redhat.com/archives/libvir-list/2017-June/msg00110.html Andrea Bolognani (24): conf: Remove obsolete comment conf: Make virDomainPCIAddressSetGrow() private conf: Make virDomainPCIAddressFlagsCompatible() private conf: Tweak virDomainPCIAddressGetNextAddr() signature tests: Update qemumemlock data tests: Mock IOMMU groups conf: Simplify slot allocation qemu: Allow qemuBuildControllerDevStr() to return NULL qemu: Tweak index number checking conf: Move index number checking to drivers qemu: Relax pci-root index requirement for pSeries guests conf: Parse and format <target index='...'/> conf: Add 'spapr-pci-host-bridge' controller model qemu: Automatically pick target index and model for pci-root controllers qemu: Introduce QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE qemu: Deal with PHB naming convention qemu: Use multiple PHBs for pSeries guests tests: Add tests for pSeries guests with multiple PHBs tests: Add baseline tests for automatic PHB usage qemu: Use PHBs to fill holes in PCI bus numbering qemu: Use PHBs when extending the guest PCI topology conf: Introduce isolation groups conf: Implement isolation rules qemu: Isolate hostdevs on pSeries guests docs/schemas/domaincommon.rng | 7 + src/bhyve/bhyve_device.c | 4 +- src/bhyve/bhyve_domain.c | 15 ++ src/conf/device_conf.h | 14 +- src/conf/domain_addr.c | 199 +++++++++++------ src/conf/domain_addr.h | 38 ++-- src/conf/domain_conf.c | 31 ++- src/conf/domain_conf.h | 2 + src/libvirt_private.syms | 2 - src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 148 ++++++++++-- src/qemu/qemu_command.h | 9 +- src/qemu/qemu_domain.c | 14 ++ src/qemu/qemu_domain_address.c | 248 +++++++++++++++++++-- src/qemu/qemu_hotplug.c | 5 +- .../qemuargv2xmldata/qemuargv2xml-pseries-disk.xml | 5 +- .../qemuargv2xml-pseries-nvram.xml | 5 +- tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 1 + .../qemumemlock-pc-hardlimit+hostdev.xml | 2 +- .../qemumemlock-pc-hardlimit+locked+hostdev.xml | 2 +- tests/qemumemlockdata/qemumemlock-pc-hostdev.xml | 2 +- .../qemumemlock-pc-locked+hostdev.xml | 2 +- .../qemumemlock-pseries-hardlimit+hostdev.xml | 2 +- ...emumemlock-pseries-hardlimit+locked+hostdev.xml | 2 +- .../qemumemlock-pseries-hostdev.xml | 2 +- .../qemumemlock-pseries-locked+hostdev.xml | 2 +- tests/qemumemlocktest.c | 21 +- .../qemuxml2argv-pseries-hostdevs-1.args | 25 +++ .../qemuxml2argv-pseries-hostdevs-1.xml | 38 ++++ .../qemuxml2argv-pseries-hostdevs-2.args | 25 +++ .../qemuxml2argv-pseries-hostdevs-2.xml | 37 +++ .../qemuxml2argv-pseries-hostdevs-3.args | 24 ++ .../qemuxml2argv-pseries-hostdevs-3.xml | 31 +++ .../qemuxml2argv-pseries-many-buses-1.args | 22 ++ .../qemuxml2argv-pseries-many-buses-1.xml | 19 ++ .../qemuxml2argv-pseries-many-buses-2.args | 22 ++ .../qemuxml2argv-pseries-many-buses-2.xml | 18 ++ .../qemuxml2argv-pseries-many-devices.args | 53 +++++ .../qemuxml2argv-pseries-many-devices.xml | 48 ++++ .../qemuxml2argv-pseries-phb-default-missing.args | 22 ++ .../qemuxml2argv-pseries-phb-default-missing.xml | 16 ++ .../qemuxml2argv-pseries-phb-simple.args | 22 ++ .../qemuxml2argv-pseries-phb-simple.xml | 17 ++ tests/qemuxml2argvtest.c | 64 +++++- .../qemuxml2xmlout-panic-pseries.xml | 5 +- .../qemuxml2xmlout-ppc64-usb-controller-legacy.xml | 5 +- .../qemuxml2xmlout-ppc64-usb-controller.xml | 5 +- .../qemuxml2xmlout-pseries-hostdevs-1.xml | 54 +++++ .../qemuxml2xmlout-pseries-hostdevs-2.xml | 50 +++++ .../qemuxml2xmlout-pseries-hostdevs-3.xml | 47 ++++ ...xml => qemuxml2xmlout-pseries-many-buses-1.xml} | 19 +- ...xml => qemuxml2xmlout-pseries-many-buses-2.xml} | 20 +- .../qemuxml2xmlout-pseries-many-devices.xml | 125 +++++++++++ .../qemuxml2xmlout-pseries-nvram.xml | 5 +- .../qemuxml2xmlout-pseries-panic-missing.xml | 5 +- .../qemuxml2xmlout-pseries-panic-no-address.xml | 5 +- ...qemuxml2xmlout-pseries-phb-default-missing.xml} | 18 +- ...m.xml => qemuxml2xmlout-pseries-phb-simple.xml} | 18 +- tests/qemuxml2xmltest.c | 59 ++++- tests/virpcimock.c | 43 +++- 61 files changed, 1562 insertions(+), 211 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-1.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-1.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-2.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-2.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-3.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-3.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-1.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-1.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-2.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-2.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-many-devices.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-many-devices.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-default-missing.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-default-missing.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-simple.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-simple.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hostdevs-1.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hostdevs-2.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hostdevs-3.xml copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-nvram.xml => qemuxml2xmlout-pseries-many-buses-1.xml} (55%) copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-nvram.xml => qemuxml2xmlout-pseries-many-buses-2.xml} (54%) create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-many-devices.xml copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-nvram.xml => qemuxml2xmlout-pseries-phb-default-missing.xml} (56%) copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-nvram.xml => qemuxml2xmlout-pseries-phb-simple.xml} (56%) -- 2.7.5

1 24

[libvirt] Various apparmor related changes (part 2)
by Stefan Bader 16 Jun '17

16 Jun '17

> Over the years there have been a bunch of changes to the > apparmor profiles and/or virt-aa-helper which have been > carried in Debian/Ubuntu but never made it upstream. > > In an attempt to clean this up and generally improve the > apparmor based environments, we (Christian and I) went > over the changes, cleaned out cruft as much as possible > and would be sending out hunks of changes to this list > for upstream inclusion. > This second batch consists partially of some reworked patches from the previous round and some more things which hopefully are simple enough and improve the upstream profiles. 5+6: Although these are Debian/Ubuntu specific, there are other paths which are specific for SuSE. So I wondered why not have both upstream. 9: Jamie, I know it has been a long time but do you remember what this resolved? Thanks, Stefan

3 27

[libvirt] [PATCH v2 0/4] fix labeling for chardev source path
by Pavel Hrdina 16 Jun '17

16 Jun '17

Pavel Hrdina (4): conf: move seclabel for chardev source to the correct sturcture qemu: introduce chardevStdioLogd to qemu private data qemu: propagate chardevStdioLogd to qemuBuildChrChardevStr security: don't relabel chardev source if virtlogd is used as stdio handler src/conf/domain_conf.c | 46 +++++++------- src/conf/domain_conf.h | 9 +-- src/lxc/lxc_process.c | 6 +- src/qemu/qemu_command.c | 132 ++++++++++++++++++++++++++------------- src/qemu/qemu_command.h | 3 +- src/qemu/qemu_domain.c | 6 ++ src/qemu/qemu_domain.h | 3 + src/qemu/qemu_process.c | 15 ++++- src/qemu/qemu_security.c | 9 ++- src/security/security_apparmor.c | 7 ++- src/security/security_dac.c | 74 +++++++++++++++------- src/security/security_driver.h | 6 +- src/security/security_manager.c | 16 +++-- src/security/security_manager.h | 6 +- src/security/security_nop.c | 6 +- src/security/security_selinux.c | 71 ++++++++++++++------- src/security/security_stack.c | 12 ++-- tests/securityselinuxlabeltest.c | 2 +- 18 files changed, 281 insertions(+), 148 deletions(-) -- 2.13.0

3 19

[libvirt] [PATCH] qemu: Allow live-updates of coalesce settings
by Martin Kletzander 16 Jun '17

16 Jun '17

Change the settings from qemuDomainUpdateDeviceLive() as otherwise the call would succeed even though nothing has changed. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1460862 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_hotplug.c | 13 ++++++ src/util/virnetdev.c | 103 +++++++++++++++++++++++++++++++----------------- src/util/virnetdev.h | 3 +- src/util/virnetdevtap.c | 2 +- 4 files changed, 83 insertions(+), 38 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 0b8d3d80f173..244dd5e605e6 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2986,6 +2986,7 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, bool needLinkStateChange = false; bool needReplaceDevDef = false; bool needBandwidthSet = false; + bool needCoalesceChange = false; int ret = -1; int changeidx = -1; @@ -3280,6 +3281,12 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, virDomainNetGetActualBandwidth(newdev))) needBandwidthSet = true; + if (!!olddev->coalesce != !!newdev->coalesce || + (olddev->coalesce && newdev->coalesce && + !memcmp(olddev->coalesce, newdev->coalesce, + sizeof(*olddev->coalesce)))) + needCoalesceChange = true; + /* FINALLY - actually perform the required actions */ if (needReconnect) { @@ -3315,6 +3322,12 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, needReplaceDevDef = true; } + if (needCoalesceChange) { + if (virNetDevSetCoalesce(newdev->ifname, newdev->coalesce, true) < 0) + goto cleanup; + needReplaceDevDef = true; + } + if (needLinkStateChange && qemuDomainChangeNetLinkState(driver, vm, olddev, newdev->linkstate) < 0) { goto cleanup; diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index e75a1c970505..90b7bee34ae7 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -3086,7 +3086,8 @@ virNetDevGetEthtoolGFeatures(virBitmapPtr bitmap ATTRIBUTE_UNUSED, /** * virNetDevSetCoalesce: * @ifname: interface name to modify - * @coalesce: Coalesce settings to set and update + * @coalesce: Coalesce settings to set or update + * @update: Whether this is an update for existing settings or not * * This function sets the various coalesce settings for a given interface * @ifname and updates them back into @coalesce. @@ -3094,40 +3095,44 @@ virNetDevGetEthtoolGFeatures(virBitmapPtr bitmap ATTRIBUTE_UNUSED, * Returns 0 in case of success or -1 on failure */ int virNetDevSetCoalesce(const char *ifname, - virNetDevCoalescePtr coalesce) + virNetDevCoalescePtr coalesce, + bool update) { int fd = -1; int ret = -1; struct ifreq ifr; struct ethtool_coalesce coal = {0}; - if (!coalesce) + if (!coalesce && !update) return 0; - coal = (struct ethtool_coalesce) { - .cmd = ETHTOOL_SCOALESCE, - .rx_max_coalesced_frames = coalesce->rx_max_coalesced_frames, - .rx_coalesce_usecs_irq = coalesce->rx_coalesce_usecs_irq, - .rx_max_coalesced_frames_irq = coalesce->rx_max_coalesced_frames_irq, - .tx_coalesce_usecs = coalesce->tx_coalesce_usecs, - .tx_max_coalesced_frames = coalesce->tx_max_coalesced_frames, - .tx_coalesce_usecs_irq = coalesce->tx_coalesce_usecs_irq, - .tx_max_coalesced_frames_irq = coalesce->tx_max_coalesced_frames_irq, - .stats_block_coalesce_usecs = coalesce->stats_block_coalesce_usecs, - .use_adaptive_rx_coalesce = coalesce->use_adaptive_rx_coalesce, - .use_adaptive_tx_coalesce = coalesce->use_adaptive_tx_coalesce, - .pkt_rate_low = coalesce->pkt_rate_low, - .rx_coalesce_usecs_low = coalesce->rx_coalesce_usecs_low, - .rx_max_coalesced_frames_low = coalesce->rx_max_coalesced_frames_low, - .tx_coalesce_usecs_low = coalesce->tx_coalesce_usecs_low, - .tx_max_coalesced_frames_low = coalesce->tx_max_coalesced_frames_low, - .pkt_rate_high = coalesce->pkt_rate_high, - .rx_coalesce_usecs_high = coalesce->rx_coalesce_usecs_high, - .rx_max_coalesced_frames_high = coalesce->rx_max_coalesced_frames_high, - .tx_coalesce_usecs_high = coalesce->tx_coalesce_usecs_high, - .tx_max_coalesced_frames_high = coalesce->tx_max_coalesced_frames_high, - .rate_sample_interval = coalesce->rate_sample_interval, - }; + if (coalesce) { + coal = (struct ethtool_coalesce) { + .rx_max_coalesced_frames = coalesce->rx_max_coalesced_frames, + .rx_coalesce_usecs_irq = coalesce->rx_coalesce_usecs_irq, + .rx_max_coalesced_frames_irq = coalesce->rx_max_coalesced_frames_irq, + .tx_coalesce_usecs = coalesce->tx_coalesce_usecs, + .tx_max_coalesced_frames = coalesce->tx_max_coalesced_frames, + .tx_coalesce_usecs_irq = coalesce->tx_coalesce_usecs_irq, + .tx_max_coalesced_frames_irq = coalesce->tx_max_coalesced_frames_irq, + .stats_block_coalesce_usecs = coalesce->stats_block_coalesce_usecs, + .use_adaptive_rx_coalesce = coalesce->use_adaptive_rx_coalesce, + .use_adaptive_tx_coalesce = coalesce->use_adaptive_tx_coalesce, + .pkt_rate_low = coalesce->pkt_rate_low, + .rx_coalesce_usecs_low = coalesce->rx_coalesce_usecs_low, + .rx_max_coalesced_frames_low = coalesce->rx_max_coalesced_frames_low, + .tx_coalesce_usecs_low = coalesce->tx_coalesce_usecs_low, + .tx_max_coalesced_frames_low = coalesce->tx_max_coalesced_frames_low, + .pkt_rate_high = coalesce->pkt_rate_high, + .rx_coalesce_usecs_high = coalesce->rx_coalesce_usecs_high, + .rx_max_coalesced_frames_high = coalesce->rx_max_coalesced_frames_high, + .tx_coalesce_usecs_high = coalesce->tx_coalesce_usecs_high, + .tx_max_coalesced_frames_high = coalesce->tx_max_coalesced_frames_high, + .rate_sample_interval = coalesce->rate_sample_interval, + }; + } + + coal.cmd = ETHTOOL_SCOALESCE; if ((fd = virNetDevSetupControl(ifname, &ifr)) < 0) return -1; @@ -3141,12 +3146,36 @@ int virNetDevSetCoalesce(const char *ifname, goto cleanup; } - coal = (struct ethtool_coalesce) { - .cmd = ETHTOOL_GCOALESCE, - }; + if (coalesce) { + coal = (struct ethtool_coalesce) { + .cmd = ETHTOOL_GCOALESCE, + }; - /* Don't fail if the update itself fails */ - virNetDevSendEthtoolIoctl(fd, &ifr); + /* Don't fail if the update itself fails */ + if (virNetDevSendEthtoolIoctl(fd, &ifr) == 0) { + coalesce->rx_max_coalesced_frames = coal.rx_max_coalesced_frames; + coalesce->rx_coalesce_usecs_irq = coal.rx_coalesce_usecs_irq; + coalesce->rx_max_coalesced_frames_irq = coal.rx_max_coalesced_frames_irq; + coalesce->tx_coalesce_usecs = coal.tx_coalesce_usecs; + coalesce->tx_max_coalesced_frames = coal.tx_max_coalesced_frames; + coalesce->tx_coalesce_usecs_irq = coal.tx_coalesce_usecs_irq; + coalesce->tx_max_coalesced_frames_irq = coal.tx_max_coalesced_frames_irq; + coalesce->stats_block_coalesce_usecs = coal.stats_block_coalesce_usecs; + coalesce->use_adaptive_rx_coalesce = coal.use_adaptive_rx_coalesce; + coalesce->use_adaptive_tx_coalesce = coal.use_adaptive_tx_coalesce; + coalesce->pkt_rate_low = coal.pkt_rate_low; + coalesce->rx_coalesce_usecs_low = coal.rx_coalesce_usecs_low; + coalesce->rx_max_coalesced_frames_low = coal.rx_max_coalesced_frames_low; + coalesce->tx_coalesce_usecs_low = coal.tx_coalesce_usecs_low; + coalesce->tx_max_coalesced_frames_low = coal.tx_max_coalesced_frames_low; + coalesce->pkt_rate_high = coal.pkt_rate_high; + coalesce->rx_coalesce_usecs_high = coal.rx_coalesce_usecs_high; + coalesce->rx_max_coalesced_frames_high = coal.rx_max_coalesced_frames_high; + coalesce->tx_coalesce_usecs_high = coal.tx_coalesce_usecs_high; + coalesce->tx_max_coalesced_frames_high = coal.tx_max_coalesced_frames_high; + coalesce->rate_sample_interval = coal.rate_sample_interval; + } + } ret = 0; cleanup: @@ -3155,9 +3184,10 @@ int virNetDevSetCoalesce(const char *ifname, } # else int virNetDevSetCoalesce(const char *ifname, - virNetDevCoalescePtr coalesce) + virNetDevCoalescePtr coalesce, + bool update) { - if (!coalesce) + if (!coalesce && !update) return 0; virReportSystemError(ENOSYS, @@ -3216,9 +3246,10 @@ virNetDevGetFeatures(const char *ifname ATTRIBUTE_UNUSED, } int virNetDevSetCoalesce(const char *ifname, - virNetDevCoalescePtr coalesce) + virNetDevCoalescePtr coalesce, + bool update) { - if (!coalesce) + if (!coalesce && !update) return 0; virReportSystemError(ENOSYS, diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index c7494cd608f3..51fcae544e89 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -180,7 +180,8 @@ int virNetDevRestoreMacAddress(const char *linkdev, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; int virNetDevSetCoalesce(const char *ifname, - virNetDevCoalescePtr coalesce) + virNetDevCoalescePtr coalesce, + bool update) ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; int virNetDevSetMTU(const char *ifname, diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index c8dacfe27b94..175dc2bfaae3 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -663,7 +663,7 @@ int virNetDevTapCreateInBridgePort(const char *brname, if (virNetDevSetOnline(*ifname, !!(flags & VIR_NETDEV_TAP_CREATE_IFUP)) < 0) goto error; - if (virNetDevSetCoalesce(*ifname, coalesce) < 0) + if (virNetDevSetCoalesce(*ifname, coalesce, false) < 0) goto error; return 0; -- 2.13.1

2 2

[libvirt] Accepting RELATED, ESTABLISHED (TCP) connections into VM using Network Filters
by Wido den Hollander 16 Jun '17

16 Jun '17

Hi, Over the past few days I've been trying to get a prototype working of a stateful firewall for a Virtual Machine using Libvirt's network filters. My goal is to replace the current custom Python/Java code in the Apache CloudStack [0] project by Network Filters of Libvirt. Both IPv4 and IPv6 should work, but I started off with IPv4 and I have issues with accepting back RELATED,ESTABLISHED connections into the VM. In the guest's XML I have this defined: <filterref filter='nwfilter-test'> <parameter name='IP' value='192.168.200.250'/> <parameter name='IPV6' value='2001:db8:100:0:5054:ff:fe9c:6ce6'/> <parameter name='IPV6' value='fe80::5054:ff:fe9c:6ce6'/> </filterref> And the filter currently looks like this: <filter name='nwfilter-test' chain='root'> <uuid>a2493284-9dd5-4c20-98b5-7e70745b53de</uuid>  <filterref filter='no-mac-spoofing'/> <filterref filter='no-ip-spoofing'/> <filterref filter='no-arp-spoofing'/> <filterref filter='allow-dhcp'/>  <rule action='accept' direction='in' priority='100'> <all state='RELATED,ESTABLISHED'/> </rule> <rule action='return' direction='in' priority='500'> <icmp/> </rule> <rule action='accept' direction='in' priority='500'> <tcp dstportstart='22'/> </rule> <rule action='accept' direction='in' priority='500'> <tcp dstportstart='80'/> </rule> <rule action='reject' direction='in' priority='1000'> <all/> </rule> </filter> I can SSH into the VM and also visit the Webserver running on it. But going out the VM results in issues: root@nwfilter-test:~# telnet 109.72.92.155 80 Trying 109.72.92.155... telnet: Unable to connect to remote host: Connection refused root@nwfilter-test:~# I can however ping the same target: root@nwfilter-test:~# ping -c 2 109.72.92.155 PING 109.72.92.155 (109.72.92.155) 56(84) bytes of data. 64 bytes from 109.72.92.155: icmp_seq=1 ttl=56 time=13.2 ms 64 bytes from 109.72.92.155: icmp_seq=2 ttl=56 time=14.1 ms --- 109.72.92.155 ping statistics --- 2 packets transmitted, 2 received, 0% packet loss, time 1001ms rtt min/avg/max/mdev = 13.225/13.703/14.182/0.492 ms root@nwfilter-test:~# Looking at iptables-save it seems like the right rules are programmed: -A FI-vnet1 -p icmp -j RETURN -A FI-vnet1 -p tcp -m tcp --sport 22 -m conntrack --ctstate ESTABLISHED -m conntrack --ctdir REPLY -j RETURN -A FI-vnet1 -p tcp -m tcp --sport 80 -m conntrack --ctstate ESTABLISHED -m conntrack --ctdir REPLY -j RETURN -A FI-vnet1 -j REJECT --reject-with icmp-port-unreachable -A FO-vnet1 -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT -A FO-vnet1 -p icmp -j RETURN -A FO-vnet1 -p tcp -m tcp --dport 22 -m conntrack --ctstate NEW,ESTABLISHED -m conntrack --ctdir ORIGINAL -j ACCEPT -A FO-vnet1 -p tcp -m tcp --dport 80 -m conntrack --ctstate NEW,ESTABLISHED -m conntrack --ctdir ORIGINAL -j ACCEPT -A FO-vnet1 -j REJECT --reject-with icmp-port-unreachable -A HI-vnet1 -p icmp -j RETURN -A HI-vnet1 -p tcp -m tcp --sport 22 -m conntrack --ctstate ESTABLISHED -m conntrack --ctdir REPLY -j RETURN -A HI-vnet1 -p tcp -m tcp --sport 80 -m conntrack --ctstate ESTABLISHED -m conntrack --ctdir REPLY -j RETURN -A HI-vnet1 -j REJECT --reject-with icmp-port-unreachable -A libvirt-host-in -m physdev --physdev-in vnet1 -g HI-vnet1 -A libvirt-in -m physdev --physdev-in vnet1 -g FI-vnet1 -A libvirt-in-post -m physdev --physdev-in vnet1 -j ACCEPT -A libvirt-out -m physdev --physdev-out vnet1 --physdev-is-bridged -g FO-vnet1 I tried changing 'accept' into 'return' for the incoming RELATED,ESTABLISHED rules, but that didn't help. I also tried searching for example of more complex network filters, but all I keep finding are the default filters of Libvirt. Does anybody know what I'm doing wrong here? Or are there any examples of working filters out there? Thank you! Wido [0]: http://cloudstack.apache.org/

1 0

[libvirt] [PATCH v2] Report more correct information for cache control
by Martin Kletzander 16 Jun '17

16 Jun '17

On some platforms the number of bits in the cbm_mask might not be divisible by 4 (and not even by 2), so we need to properly count the bits. Similar file, min_cbm_bits, is properly parsed and used, but if the number is greater than one, we lose the information about granularity when reporting the data in capabilities. For that matter always report granularity, but if it is not the same as the minimum, add that information in there as well. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- v2: - More expressive comments for structure members - Cache size adjusted to match the SKX machine (33M) v1: - https://www.redhat.com/archives/libvir-list/2017-June/msg00229.html docs/schemas/capability.rng | 7 ++++- src/conf/capabilities.c | 34 ++++++++++++++++++---- src/conf/capabilities.h | 11 +++++-- .../linux-resctrl-skx/resctrl/info/L3/cbm_mask | 1 + .../linux-resctrl-skx/resctrl/info/L3/min_cbm_bits | 1 + .../linux-resctrl-skx/resctrl/info/L3/num_closids | 1 + .../linux-resctrl-skx/resctrl/schemata | 1 + .../system/cpu/cpu0/cache/index0/id | 1 + .../system/cpu/cpu0/cache/index0/level | 1 + .../system/cpu/cpu0/cache/index0/shared_cpu_list | 1 + .../system/cpu/cpu0/cache/index0/shared_cpu_map | 1 + .../system/cpu/cpu0/cache/index0/size | 1 + .../system/cpu/cpu0/cache/index0/type | 1 + .../linux-resctrl-skx/system/cpu/cpu0/online | 1 + .../system/cpu/cpu0/topology/core_id | 1 + .../system/cpu/cpu0/topology/core_siblings | 1 + .../system/cpu/cpu0/topology/core_siblings_list | 1 + .../system/cpu/cpu0/topology/physical_package_id | 1 + .../system/cpu/cpu0/topology/thread_siblings | 1 + .../system/cpu/cpu0/topology/thread_siblings_list | 1 + .../linux-resctrl-skx/system/cpu/online | 1 + .../linux-resctrl-skx/system/cpu/present | 1 + .../linux-resctrl-skx/system/node/node0/cpu0 | 1 + .../linux-resctrl-skx/system/node/node0/cpulist | 1 + .../linux-resctrl-skx/system/node/node0/cpumap | 1 + .../linux-resctrl-skx/system/node/node0/distance | 1 + .../linux-resctrl-skx/system/node/online | 1 + .../vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml | 8 ++--- .../vircaps2xmldata/vircaps-x86_64-resctrl-skx.xml | 31 ++++++++++++++++++++ tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml | 4 +-- tests/vircaps2xmltest.c | 1 + 31 files changed, 104 insertions(+), 16 deletions(-) create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/resctrl/info/L3/cbm_mask create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/resctrl/info/L3/min_cbm_bits create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/resctrl/info/L3/num_closids create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/resctrl/schemata create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/id create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/level create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/size create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/type create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/online create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/core_id create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/core_siblings create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/core_siblings_list create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/thread_siblings create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/thread_siblings_list create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/online create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/present create mode 120000 tests/vircaps2xmldata/linux-resctrl-skx/system/node/node0/cpu0 create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/node/node0/cpulist create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/node/node0/cpumap create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/node/node0/distance create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/node/online create mode 100644 tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx.xml diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng index e5cbfa362ec0..071090c2d991 100644 --- a/docs/schemas/capability.rng +++ b/docs/schemas/capability.rng @@ -273,9 +273,14 @@ </attribute> <zeroOrMore> <element name='control'> - <attribute name='min'> + <attribute name='granularity'> <ref name='unsignedInt'/> </attribute> + <optional> + <attribute name='min'> + <ref name='unsignedInt'/> + </attribute> + </optional> <attribute name='unit'> <ref name='unit'/> </attribute> diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 3becc7e18c62..0f99f3096292 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -31,6 +31,7 @@ #include <unistd.h> #include "capabilities.h" +#include "c-ctype.h" #include "count-one-bits.h" #include "cpu_conf.h" #include "domain_conf.h" @@ -906,11 +907,24 @@ virCapabilitiesFormatCaches(virBufferPtr buf, virBufferAdjustIndent(&controlBuf, indent + 4); for (j = 0; j < bank->ncontrols; j++) { - bool min_kilos = !(bank->controls[j]->min % 1024); + bool min_kilos = !(bank->controls[j]->granularity % 1024); + + /* Only use KiB if both values are divisible */ + if (bank->controls[j]->min) + min_kilos = min_kilos && !(bank->controls[j]->min % 1024); + + virBufferAsprintf(&controlBuf, + "<control granularity='%llu'", + bank->controls[j]->granularity >> (min_kilos * 10)); + + if (bank->controls[j]->min) { + virBufferAsprintf(&controlBuf, + " min='%llu'", + bank->controls[j]->min >> (min_kilos * 10)); + } + virBufferAsprintf(&controlBuf, - "<control min='%llu' unit='%s' " - "type='%s' maxAllocs='%u'/>\n", - bank->controls[j]->min >> (min_kilos * 10), + " unit='%s' type='%s' maxAllocs='%u'/>\n", min_kilos ? "KiB" : "B", virCacheTypeToString(bank->controls[j]->scope), bank->controls[j]->max_allocation); @@ -1598,9 +1612,11 @@ virCapabilitiesGetCacheControl(virCapsHostCacheBankPtr bank, virCacheType scope) { int ret = -1; + char *tmp = NULL; char *path = NULL; char *cbm_mask = NULL; char *type_upper = NULL; + unsigned int bits = 0; unsigned int min_cbm_bits = 0; virCapsHostCacheControlPtr control; @@ -1632,8 +1648,14 @@ virCapabilitiesGetCacheControl(virCapsHostCacheBankPtr bank, virStringTrimOptionalNewline(cbm_mask); - /* cbm_mask: cache bit mask, it's in hex, eg: fffff */ - control->min = min_cbm_bits * bank->size / (strlen(cbm_mask) * 4); + for (tmp = cbm_mask; *tmp != '\0'; tmp++) { + if (c_isxdigit(*tmp)) + bits += count_one_bits(virHexToBin(*tmp)); + } + + control->granularity = bank->size / bits; + if (min_cbm_bits != 1) + control->min = min_cbm_bits * control->granularity; control->scope = scope; diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index ee87d598ef66..39a9bc689279 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -151,9 +151,14 @@ VIR_ENUM_DECL(virCache); typedef struct _virCapsHostCacheControl virCapsHostCacheControl; typedef virCapsHostCacheControl *virCapsHostCacheControlPtr; struct _virCapsHostCacheControl { - unsigned long long min; /* minimum cache control size in B */ - virCacheType scope; /* data, code or both */ - unsigned int max_allocation; /* max number of supported allocations */ + /* Smallest possible increase of the allocation size in bytes */ + unsigned long long granularity; + /* Minimal allocatable size in bytes (if different from granularity) */ + unsigned long long min; + /* Type of the allocation */ + virCacheType scope; + /* Maximum number of simultaneous allocations */ + unsigned int max_allocation; }; typedef struct _virCapsHostCacheBank virCapsHostCacheBank; diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/resctrl/info/L3/cbm_mask b/tests/vircaps2xmldata/linux-resctrl-skx/resctrl/info/L3/cbm_mask new file mode 100644 index 000000000000..d482bbb26931 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/resctrl/info/L3/cbm_mask @@ -0,0 +1 @@ +7ff diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/resctrl/info/L3/min_cbm_bits b/tests/vircaps2xmldata/linux-resctrl-skx/resctrl/info/L3/min_cbm_bits new file mode 100644 index 000000000000..d00491fd7e5b --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/resctrl/info/L3/min_cbm_bits @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/resctrl/info/L3/num_closids b/tests/vircaps2xmldata/linux-resctrl-skx/resctrl/info/L3/num_closids new file mode 100644 index 000000000000..b6a7d89c68e0 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/resctrl/info/L3/num_closids @@ -0,0 +1 @@ +16 diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/resctrl/schemata b/tests/vircaps2xmldata/linux-resctrl-skx/resctrl/schemata new file mode 100644 index 000000000000..4a4913735386 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/resctrl/schemata @@ -0,0 +1 @@ +L3:0=7ff;1=7ff diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/id b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/id new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/level b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/level new file mode 100644 index 000000000000..00750edc07d6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/level @@ -0,0 +1 @@ +3 diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/shared_cpu_list b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/shared_cpu_list new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/shared_cpu_list @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/shared_cpu_map b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/shared_cpu_map new file mode 100644 index 000000000000..5325a8dff751 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/shared_cpu_map @@ -0,0 +1 @@ +001 diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/size b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/size new file mode 100644 index 000000000000..d23da60c1205 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/size @@ -0,0 +1 @@ +33M diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/type b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/type new file mode 100644 index 000000000000..e4fd9dccda2c --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/type @@ -0,0 +1 @@ +Unified diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/online b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/online new file mode 100644 index 000000000000..d00491fd7e5b --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/online @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/core_id b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/core_id new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/core_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/core_siblings b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/core_siblings new file mode 100644 index 000000000000..5325a8dff751 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/core_siblings @@ -0,0 +1 @@ +001 diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/core_siblings_list b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/core_siblings_list new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/core_siblings_list @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/physical_package_id b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/physical_package_id new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/physical_package_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/thread_siblings b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/thread_siblings new file mode 100644 index 000000000000..5325a8dff751 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/thread_siblings @@ -0,0 +1 @@ +001 diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/thread_siblings_list new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/thread_siblings_list @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/online b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/online new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/online @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/present b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/present new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/present @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/node/node0/cpu0 b/tests/vircaps2xmldata/linux-resctrl-skx/system/node/node0/cpu0 new file mode 120000 index 000000000000..c841bea28b2b --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/node/node0/cpu0 @@ -0,0 +1 @@ +../../cpu/cpu0 \ No newline at end of file diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/node/node0/cpulist b/tests/vircaps2xmldata/linux-resctrl-skx/system/node/node0/cpulist new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/node/node0/cpulist @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/node/node0/cpumap b/tests/vircaps2xmldata/linux-resctrl-skx/system/node/node0/cpumap new file mode 100644 index 000000000000..5325a8dff751 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/node/node0/cpumap @@ -0,0 +1 @@ +001 diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/node/node0/distance b/tests/vircaps2xmldata/linux-resctrl-skx/system/node/node0/distance new file mode 100644 index 000000000000..f599e28b8ab0 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/node/node0/distance @@ -0,0 +1 @@ +10 diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/node/online b/tests/vircaps2xmldata/linux-resctrl-skx/system/node/online new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/node/online @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml index 49aa0b98ca88..7361537bfb56 100644 --- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml +++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml @@ -42,12 +42,12 @@ </topology> <cache> <bank id='0' level='3' type='both' size='15360' unit='KiB' cpus='0-5'> - <control min='768' unit='KiB' type='code' maxAllocs='8'/> - <control min='768' unit='KiB' type='data' maxAllocs='8'/> + <control granularity='768' unit='KiB' type='code' maxAllocs='8'/> + <control granularity='768' unit='KiB' type='data' maxAllocs='8'/> </bank> <bank id='1' level='3' type='both' size='15360' unit='KiB' cpus='6-11'> - <control min='768' unit='KiB' type='code' maxAllocs='8'/> - <control min='768' unit='KiB' type='data' maxAllocs='8'/> + <control granularity='768' unit='KiB' type='code' maxAllocs='8'/> + <control granularity='768' unit='KiB' type='data' maxAllocs='8'/> </bank> </cache> </host> diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx.xml new file mode 100644 index 000000000000..4e91c87de3b1 --- /dev/null +++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx.xml @@ -0,0 +1,31 @@ +<capabilities> + + <host> + <cpu> + <arch>x86_64</arch> + </cpu> + <power_management/> + <migration_features> + <live/> + </migration_features> + <topology> + <cells num='1'> + <cell id='0'> + <memory unit='KiB'>1048576</memory> + <pages unit='KiB' size='4'>2048</pages> + <pages unit='KiB' size='2048'>4096</pages> + <pages unit='KiB' size='1048576'>6144</pages> + <cpus num='1'> + <cpu id='0' socket_id='0' core_id='0' siblings='0'/> + </cpus> + </cell> + </cells> + </topology> + <cache> + <bank id='0' level='3' type='both' size='33792' unit='KiB' cpus='0'> + <control granularity='3072' unit='KiB' type='both' maxAllocs='16'/> + </bank> + </cache> + </host> + +</capabilities> diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml index cb78b4ab788d..eb02ad3322a2 100644 --- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml +++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml @@ -42,10 +42,10 @@ </topology> <cache> <bank id='0' level='3' type='both' size='15360' unit='KiB' cpus='0-5'> - <control min='1536' unit='KiB' type='both' maxAllocs='4'/> + <control granularity='768' min='1536' unit='KiB' type='both' maxAllocs='4'/> </bank> <bank id='1' level='3' type='both' size='15360' unit='KiB' cpus='6-11'> - <control min='1536' unit='KiB' type='both' maxAllocs='4'/> + <control granularity='768' min='1536' unit='KiB' type='both' maxAllocs='4'/> </bank> </cache> </host> diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c index ae1cd521111e..c0a67858fec3 100644 --- a/tests/vircaps2xmltest.c +++ b/tests/vircaps2xmltest.c @@ -120,6 +120,7 @@ mymain(void) DO_TEST_FULL("resctrl", VIR_ARCH_X86_64, true, true, true); DO_TEST_FULL("resctrl-cdp", VIR_ARCH_X86_64, true, true, true); + DO_TEST_FULL("resctrl-skx", VIR_ARCH_X86_64, true, true, true); return ret; } -- 2.13.1

3 2

[libvirt] [PATCH go-xml] support virtualport for interface and add test code
by zhenwei.pi 16 Jun '17

16 Jun '17

--- domain.go | 29 +++++++++++++++++------------ domain_test.go | 4 ++++ 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/domain.go b/domain.go index eb7ff9e..ecb8550 100644 --- a/domain.go +++ b/domain.go @@ -185,19 +185,24 @@ type DomainInterfaceDriver struct { Queues uint `xml:"queues,attr,omitempty"` } +type DomainInterfaceVirtualport struct { + Type string `xml:"type,attr"` +} + type DomainInterface struct { - XMLName xml.Name `xml:"interface"` - Type string `xml:"type,attr"` - MAC *DomainInterfaceMAC `xml:"mac"` - Model *DomainInterfaceModel `xml:"model"` - Source *DomainInterfaceSource `xml:"source"` - Target *DomainInterfaceTarget `xml:"target"` - Alias *DomainInterfaceAlias `xml:"alias"` - Link *DomainInterfaceLink `xml:"link"` - Boot *DomainDeviceBoot `xml:"boot"` - Script *DomainInterfaceScript `xml:"script"` - Driver *DomainInterfaceDriver `xml:"driver"` - Address *DomainAddress `xml:"address"` + XMLName xml.Name `xml:"interface"` + Type string `xml:"type,attr"` + MAC *DomainInterfaceMAC `xml:"mac"` + Model *DomainInterfaceModel `xml:"model"` + Source *DomainInterfaceSource `xml:"source"` + Target *DomainInterfaceTarget `xml:"target"` + Alias *DomainInterfaceAlias `xml:"alias"` + Link *DomainInterfaceLink `xml:"link"` + Boot *DomainDeviceBoot `xml:"boot"` + Script *DomainInterfaceScript `xml:"script"` + Driver *DomainInterfaceDriver `xml:"driver"` + Virtualport *DomainInterfaceVirtualport `xml:"virtualport"` + Address *DomainAddress `xml:"address"` } type DomainChardevSource struct { diff --git a/domain_test.go b/domain_test.go index 6b37719..9de725c 100644 --- a/domain_test.go +++ b/domain_test.go @@ -565,6 +565,9 @@ var domainTestData = []struct { Model: &DomainInterfaceModel{ Type: "virtio", }, + Virtualport: &DomainInterfaceVirtualport{ + Type: "openvswitch", + }, }, }, }, @@ -577,6 +580,7 @@ var domainTestData = []struct { ` <interface type="network">`, ` <mac address="00:11:22:33:44:55"></mac>`, ` <model type="virtio"></model>`, + ` <virtualport type="openvswitch"></virtualport>`, ` </interface>`, ` </devices>`, `</domain>`, -- 2.7.4

1 0

[libvirt] [PATCH v2 0/8] virObject adjustments for common object
by John Ferlan 16 Jun '17

16 Jun '17

v1: https://www.redhat.com/archives/libvir-list/2017-May/msg01178.html rfc: https://www.redhat.com/archives/libvir-list/2017-April/msg00321.html Now that 3.5.0 is out, hopefully this can be considered early and more progress can be made this month. Differences to v1: - Remove the magic_marker, replace with checks vs. existing magic without the object # specific value. Also added a assert for the object# not exceeding 0xcafeffff. - Remove the recursive lock setup.... I believe I've had some success with removing the need for recursive locks in nwfilter. I'll post a series shortly with that removed for scrutiny. Beyond that as in v1: I'm "close enough" to at least convert secrets, nwfilters, nodedevs, and interfaces to use a more common object methodolgy to add/store, fetch/find, search, list, etc. the objects in something other than a linear forward linked list. Converting the storage pool, storage volume, and network is taking longer than hoped since there are so many patches to get from pointA to pointB. So I'll focus on the 4 and work through getting the complete model published/adopted as those have been in my branches for a while now. These patches get as far as the creation of the common object which is a start. The first 4 patches are essentially setup. Patches 5-6 are more or less what patch 7-8 were. Patches 7-8 are essentially the new driver/common object extension. Patches 5-6 from the RFC still exist in my branches and would be the next logical step. It was a conscious decision to just use the "default" string comparison for hash table key. That key could be a UUID, but since the UUID can easily be converted from unsigned to signed - I believe it would be far simpler to keep that mechanism rather than complexity introduced by having "different" key search algorithms when the key isn't a char *. John Ferlan (8): util: Formatting cleanups to virobject API util: Introduce virObjectGetLockableObj util: Generate a common internal only error print util: Add safety net of checks to ensure valid object util: Introduce virObjectPoolableHashElement util: Add virObjectPoolableHashElementGet*Key util: Introduce virObjectPoolableDef util: Add virObjectPoolableDef* accessor API's src/libvirt_private.syms | 11 ++ src/util/virobject.c | 458 +++++++++++++++++++++++++++++++++++++++++++---- src/util/virobject.h | 123 +++++++++++-- 3 files changed, 538 insertions(+), 54 deletions(-) -- 2.9.4

2 20

[libvirt] [PATCH] maint: update to latest gnulib
by Daniel P. Berrange 15 Jun '17

15 Jun '17

This fixes an incompatibility with glibc 2.25.90 Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed as a broken build fix to get CI back online .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index da830b5..ce4ee4c 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit da830b5146cb553ac2a4bcfe76caeb57bda24cc3 +Subproject commit ce4ee4cbb596a9d7de2786cf8c48cf62a4edede7 -- 2.9.3

2 6

[libvirt] [PATCH] Temporarily disable format truncation warnings
by Daniel P. Berrange 15 Jun '17

15 Jun '17

GCC 7.1 introduces a new -Wformat-truncation warning flag that reports if it thinks the maximum possible size of the formatted output will exceed the provided fixed buffer. This is enabled automatically by the -Wformat warning flag. There are quite a few places hit by this in libvirt which need rewriting. This is non-trivial work in some places, so temporarily disable the new warning until those fixes can be implemented. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- m4/virt-compile-warnings.m4 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index d7bb172f3..fa0940fc6 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -169,6 +169,10 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ wantwarn="$wantwarn -Wno-format" fi + # -Wformat enables this by default, and we should keep it, + # but need to rewrite various areas of code first + wantwarn="$wantwarn -Wno-format-truncation" + # This should be < 256 really. Currently we're down to 4096, # but using 1024 bytes sized buffers (mostly for virStrerror) # stops us from going down further -- 2.13.1

2 1

[libvirt] [PATCH] qemu: Remove inactive vm when failed to start it
by Yi Wang 15 Jun '17

15 Jun '17

Libvirt forgets to remove inactive vm when failed to start a defined vm. That may result in residual domain in driver->domains on such condition: during the process of starting a vm, undefine it, and qemu exit because of some exception. As we undefined the vm successfully, the vm->persistent was set to 0, we will always fail to undefine it until restart libvirtd. Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> --- src/qemu/qemu_driver.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ba1dba5..581f02f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7185,6 +7185,8 @@ qemuDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) endjob: qemuProcessEndJob(driver, vm); + if (ret < 0) + qemuDomainRemoveInactive(driver, vm); cleanup: virDomainObjEndAPI(&vm); -- 1.8.3.1

1 0

[libvirt] [PATCH 2/2] qemu: fixing internationalization problem with sched kernel entry.
by Julio Faracco 15 Jun '17

15 Jun '17

In qemuGetSchedInfo(), libvirt is trying to parse some field of /proc/*/sched. Some fields are floating point numbers and their separator is always a dot. When you change the locale of the system, you can change the mantissa separator (to a comma separator) of floating point numbers and it affects the parser. This commit introduces the virStrToDoubleSafe() to avoid comma as a separator. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1457634 Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1457481 Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ba1dba5..f1b104f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1369,7 +1369,7 @@ qemuGetSchedInfo(unsigned long long *cpuWait, while (*line == ' ') line++; - if (virStrToDouble(line, NULL, &val) < 0) { + if (virStrToDoubleSafe(line, NULL, &val) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to parse sched info value '%s'"), line); -- 2.7.4

2 1

[libvirt] [PATCH v5 0/4] Loadparm support
by Farhan Ali 15 Jun '17

15 Jun '17

This patch series introduces the support for new s390x 'loadparm' feature. The 'loadparm' can be used to select the boot entry to boot from, for a boot device. Here is a link to the QEMU patches: https://lists.nongnu.org/archive/html/qemu-devel/2017-05/msg00192.html ChangeLog --------- v4 -> v5: - Separated qemu capabilities data into a separate patch. (patch 3) - Add formatdomain.html.in to patch 1 v3 -> v4 - Break news and documentation updates to a separate patch (patch 3) - Merge test cases with qemu patch (patch 2) - Add xml2xml test case (patch 2) - Add qemucapabilities test (patch 2) - Rebased the patch series on master commit 5970b13 udev: Fix build on older platforms v2 -> v3: - Updated news.xml and formatdomain.html.in with a more architectural description of loadparm (patch 1) v1 -> v2: - Rebased the patch series on the latest master, commit 2f69dd3 virfiletest: include linux/falloc.h Thanks Farhan Ali Farhan Ali (4): conf : Add loadparm boot option for a boot device qemu : Add loadparm to qemu command line string qemu: capabilities: Add data for qemu capabilities for s390x news: Update news for loadparm feature docs/formatdomain.html.in | 9 +- docs/news.xml | 11 + docs/schemas/domaincommon.rng | 7 + src/conf/device_conf.h | 1 + src/conf/domain_conf.c | 69 +- src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 33 + .../qemucapabilitiesdata/caps_2.9.50.s390x.replies | 14587 +++++++++++++++++++ tests/qemucapabilitiesdata/caps_2.9.50.s390x.xml | 302 + ...-machine-loadparm-multiple-disks-nets-s390.args | 28 + ...v-machine-loadparm-multiple-disks-nets-s390.xml | 43 + .../qemuxml2argv-machine-loadparm-net-s390.args | 20 + .../qemuxml2argv-machine-loadparm-net-s390.xml | 26 + ...xml2argv-machine-loadparm-s390-char-invalid.xml | 26 + ...uxml2argv-machine-loadparm-s390-len-invalid.xml | 26 + .../qemuxml2argv-machine-loadparm-s390.args | 20 + .../qemuxml2argv-machine-loadparm-s390.xml | 26 + tests/qemuxml2argvtest.c | 19 + ...t-machine-loadparm-multiple-disks-nets-s390.xml | 44 + tests/qemuxml2xmltest.c | 4 + 21 files changed, 15303 insertions(+), 4 deletions(-) create mode 100644 tests/qemucapabilitiesdata/caps_2.9.50.s390x.replies create mode 100644 tests/qemucapabilitiesdata/caps_2.9.50.s390x.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-multiple-disks-nets-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-multiple-disks-nets-s390.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-net-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-net-s390.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390-char-invalid.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390-len-invalid.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-machine-loadparm-multiple-disks-nets-s390.xml -- 1.9.1

2 10

[libvirt] [PATCH] Disable the -Wduplicated-branches warning
by Daniel P. Berrange 15 Jun '17

15 Jun '17

Depending on the platform/architecture, a number of conditionals in libvirt code expand the same on both branches. This is expected behaviour and harmless, so disable the warning to avoid creating unexpected build failures Two examples, mingw32: ../../src/util/vircommand.c: In function 'virCommandWait': ../../src/util/vircommand.c:2562:51: error: this condition has identical branches [-Werror=duplicated-branches] *exitstatus = cmd->rawStatus ? status : WEXITSTATUS(status); ^ and gcc7.1 In file included from util/virobject.c:28:0: util/virobject.c: In function 'virClassNew': util/viratomic.h:176:46: error: this condition has identical branches [-Werror=duplicated-branches] (void)(0 ? *(atomic) ^ *(atomic) : 0); \ ^ util/virobject.c:144:20: note: in expansion of macro 'virAtomicIntInc' klass->magic = virAtomicIntInc(&magicCounter); ^~~~~~~~~~~~~~~ Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- m4/virt-compile-warnings.m4 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index 768a5c8..d7bb172 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -61,6 +61,9 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ dontwarn="$dontwarn -Wenum-compare" # gcc 5.1 -Wformat-signedness mishandles enums, not ready for prime time dontwarn="$dontwarn -Wformat-signedness" + # Several conditionals expand the same on both branches + # depending on the particular platform/architecture + dontwarn="$dontwarn -Wduplicated-branches" # gcc 4.2 treats attribute(format) as an implicit attribute(nonnull), # which triggers spurious warnings for our usage -- 2.9.3

2 1

[libvirt] [PATCH] qemu: Pass the number of heads even with -vga qxl
by Martin Kletzander 15 Jun '17

15 Jun '17

When added in multiple previous commits, it was used only with -device qxl(-vga), but for some QEMUs (< 1.6) we need to add this functionality when using -vga qxl as well. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1283207 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_command.c | 8 ++++ .../qemuxml2argv-video-vga-qxl-heads.args | 30 ++++++++++++++ .../qemuxml2argv-video-vga-qxl-heads.xml | 47 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ 4 files changed, 88 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3e1552a1b593..9687d367a6d4 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4613,6 +4613,14 @@ qemuBuildVgaVideoCommand(virCommandPtr cmd, virCommandAddArgFormat(cmd, "%s.vgamem_mb=%u", dev, vgamem / 1024); } + + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QXL_MAX_OUTPUTS)) + video->heads = 0; + if (video->heads) { + virCommandAddArg(cmd, "-global"); + virCommandAddArgFormat(cmd, "%s.max_outputs=%u", + dev, video->heads); + } } if (video->vram && diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.args b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.args new file mode 100644 index 000000000000..411a2eedbc4b --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.args @@ -0,0 +1,30 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ +-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +-vga qxl \ +-global qxl-vga.ram_size=67108864 \ +-global qxl-vga.vram_size=67108864 \ +-global qxl-vga.max_outputs=1 \ +-device qxl,id=video1,ram_size=67108864,vram_size=33554432,max_outputs=3,\ +bus=pci.0,addr=0x4 \ +-device qxl,id=video2,ram_size=67108864,vram_size=67108864,max_outputs=7,\ +bus=pci.0,addr=0x5 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.xml b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.xml new file mode 100644 index 000000000000..d878ddcd6d2e --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.xml @@ -0,0 +1,47 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <video> + <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='3'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </video> + <video> + <model type='qxl' ram='65536' vram='65536' vgamem='8192' heads='7'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> + </video> + <video> + <model type='qxl' ram='65536' vram='65536' vgamem='8192' heads='1' primary='yes'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </video> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 43d3f1bd3973..ea8403122feb 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1734,6 +1734,9 @@ mymain(void) QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_QXL_MAX_OUTPUTS); + DO_TEST("video-vga-qxl-heads", + QEMU_CAPS_DEVICE_QXL, + QEMU_CAPS_QXL_MAX_OUTPUTS); DO_TEST("video-qxl-noheads", QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL, -- 2.13.1

2 2

[libvirt] [PATCH] qemu: Avoid parsing empty nodeset string
by Nitesh Konkar 14 Jun '17

14 Jun '17

The advisory nodeset from numad is parsed irrespective of the string being empty or not. Avoid parsing an empty nodeset string. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/qemu/qemu_process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 85b800d..1c49fa6 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5456,7 +5456,7 @@ qemuProcessPrepareDomain(virConnectPtr conn, if (virDomainDefNeedsPlacementAdvice(vm->def)) { nodeset = virNumaGetAutoPlacementAdvice(virDomainDefGetVcpus(vm->def), virDomainDefGetMemoryTotal(vm->def)); - if (!nodeset) + if (virStringIsEmpty(nodeset)) goto cleanup; VIR_DEBUG("Nodeset returned from numad: %s", nodeset); -- 2.9.4

2 1

[libvirt] [PATCH 0/4] Fix regression in migration with custom XML
by Jiri Denemark 14 Jun '17

14 Jun '17

When making ABI stability checks for an active domain, we need to make sure we use the same migratable definition which virDomainGetXMLDesc with the MIGRATABLE flag provides, otherwise the ABI check will fail. https://bugzilla.redhat.com/show_bug.cgi?id=1460952 Jiri Denemark (4): qemu: Introduce qemuDomainDefFromXML helper qemu: Add qemuDomainMigratableDefCheckABIStability qemu: Add qemuDomainCheckABIStability qemu: Use qemuDomainCheckABIStability where needed src/qemu/qemu_domain.c | 108 ++++++++++++++++++++++++++++++++++------------ src/qemu/qemu_domain.h | 4 ++ src/qemu/qemu_driver.c | 71 +++++++++++++++++------------- src/qemu/qemu_migration.c | 2 +- 4 files changed, 126 insertions(+), 59 deletions(-) -- 2.13.1

2 8

[libvirt] [PATCH] qemu: Don't try to use hugepages if not enabled
by Michal Privoznik 14 Jun '17

14 Jun '17

https://bugzilla.redhat.com/show_bug.cgi?id=1214369 My fix 671d18594f4 was incomplete. If domain doesn't have hugepages enalbed, because of missing condition we would still be putting hugepages path onto qemu cmd line. Clean up the conditions so that it's more visible next time. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_command.c | 12 +++++----- .../qemuxml2argv-cpu-numa-memshared.args | 26 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 3 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-memshared.args diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3e1552a1b..8c12b2be0 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3408,23 +3408,23 @@ qemuBuildMemoryBackendStr(virJSONValuePtr *backendProps, if (pagesize || mem->nvdimmPath || memAccess || def->mem.source == VIR_DOMAIN_MEMORY_SOURCE_FILE) { *backendType = "memory-backend-file"; - if (mem->nvdimmPath) { + if (pagesize) { + if (qemuGetDomainHupageMemPath(def, cfg, pagesize, &memPath) < 0) + goto cleanup; + prealloc = true; + } else if (mem->nvdimmPath) { if (VIR_STRDUP(memPath, mem->nvdimmPath) < 0) goto cleanup; prealloc = true; - } else if (!pagesize && def->mem.source == VIR_DOMAIN_MEMORY_SOURCE_FILE) { + } else { /* We can have both pagesize and mem source. If that's the case, * prefer hugepages as those are more specific. */ if (VIR_STRDUP(memPath, cfg->memoryBackingDir) < 0) goto cleanup; - } else { - if (qemuGetDomainHupageMemPath(def, cfg, pagesize, &memPath) < 0) - goto cleanup; - prealloc = true; } if (virJSONValueObjectAdd(props, "B:prealloc", prealloc, "s:mem-path", memPath, diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-memshared.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-memshared.args new file mode 100644 index 000000000..cceffce3a --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-memshared.args @@ -0,0 +1,26 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-x86_64 \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 16,sockets=2,cores=4,threads=2 \ +-object memory-backend-file,id=ram-node0,mem-path=/var/lib/libvirt/qemu/ram,\ +share=yes,size=112197632 \ +-numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ +-object memory-backend-file,id=ram-node1,mem-path=/var/lib/libvirt/qemu/ram,\ +share=no,size=112197632 \ +-numa node,nodeid=1,cpus=8-15,memdev=ram-node1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-no-acpi \ +-boot n \ +-usb \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 43d3f1bd3..799aea9fa 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1539,10 +1539,11 @@ mymain(void) DO_TEST_PARSE_ERROR("cpu-numa3", NONE); DO_TEST_FAILURE("cpu-numa-disjoint", NONE); DO_TEST("cpu-numa-disjoint", QEMU_CAPS_NUMA); DO_TEST_FAILURE("cpu-numa-memshared", QEMU_CAPS_OBJECT_MEMORY_RAM); DO_TEST_FAILURE("cpu-numa-memshared", NONE); + DO_TEST("cpu-numa-memshared", QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST("cpu-host-model", NONE); DO_TEST("cpu-host-model-vendor", NONE); skipLegacyCPUs = true; DO_TEST("cpu-host-model-fallback", NONE); DO_TEST_FAILURE("cpu-host-model-nofallback", NONE); -- 2.13.0

2 2

[libvirt] [PATCH] Use sys/uio.h for writev()
by Daniel P. Berrange 14 Jun '17

14 Jun '17

With glibc >= 2.25.90 writev() is only available if you explicitly include sys/uio.h Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- A build breaker, but not yet pushed in case anyone has opinions... configure.ac | 2 +- src/util/virlog.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 1a73b34..1a48bb0 100644 --- a/configure.ac +++ b/configure.ac @@ -328,7 +328,7 @@ dnl Availability of various common headers (non-fatal if missing). AC_CHECK_HEADERS([pwd.h regex.h sys/un.h \ sys/poll.h syslog.h mntent.h net/ethernet.h linux/magic.h \ sys/un.h sys/syscall.h sys/sysctl.h netinet/tcp.h ifaddrs.h \ - libtasn1.h sys/ucred.h sys/mount.h stdarg.h]) + libtasn1.h sys/ucred.h sys/mount.h stdarg.h sys/uio.h]) dnl Check whether endian provides handy macros. AC_CHECK_DECLS([htole64], [], [], [[#include <endian.h>]]) AC_CHECK_FUNCS([stat stat64 __xstat __xstat64 lstat lstat64 __lxstat __lxstat64]) diff --git a/src/util/virlog.c b/src/util/virlog.c index 7933e1a..3a28e5e 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -32,6 +32,9 @@ #include <unistd.h> #include <execinfo.h> #include <regex.h> +#if HAVE_SYS_UIO_H +# include <sys/uio.h> +#endif #if HAVE_SYSLOG_H # include <syslog.h> #endif -- 2.9.3

2 2

[libvirt] [PATCH] EventRegister: Fix double deference error in libvirt_virConnectDomainEventRegisterAny
by fangying 14 Jun '17

14 Jun '17

As descriped at https://www.spinics.net/linux/fedora/libvir/msg148562.html, even when virConnectDomainEventRegisterAny returns -1 there is still a scenario in which it will trigger the free callback. We fix the problem in the following way: (1) implement a function virObjectEventStateSetFreeCB to add freecallback. (2) call virObjectEventStateSetFreeCB only if the event is successfully added. Signed-off-by: fangying <fangying1(a)huawei.com> --- src/conf/object_event.c | 34 ++++++++++++++++++++++++++++++++++ src/conf/object_event.h | 7 +++++++ src/libvirt_private.syms | 2 +- src/remote/remote_driver.c | 4 ++-- 4 files changed, 44 insertions(+), 3 deletions(-) diff --git a/src/conf/object_event.c b/src/conf/object_event.c index e5f942f..a770978 100644 --- a/src/conf/object_event.c +++ b/src/conf/object_event.c @@ -923,6 +923,40 @@ virObjectEventStateRegisterID(virConnectPtr conn, /** + * virObjectEventStateSetFreeCB: + * @conn: connection to associate with callback + * @state: object event state + * @callbackID: ID of the function to remove from event + * @freecb: freecb to be added + * + * Add the callbalck function @freecb for @callbackID with connection @conn, + * from @state, for events. + */ +void +virObjectEventStateSetFreeCB(virConnectPtr conn, + virObjectEventStatePtr state, + int callbackID, + virFreeCallback freecb) +{ + size_t i; + virObjectEventCallbackListPtr cbList; + + virObjectEventStateLock(state); + cbList = state->callbacks; + for (i = 0; i < cbList->count; i++) { + virObjectEventCallbackPtr cb = cbList->callbacks[i]; + + if (cb->callbackID == callbackID && cb->conn == conn) { + cb->freecb = freecb; + break; + } + } + + virObjectEventStateUnlock(state); +} + + +/** * virObjectEventStateDeregisterID: * @conn: connection to associate with callback * @state: object event state diff --git a/src/conf/object_event.h b/src/conf/object_event.h index 7a9995e..a7d29a0 100644 --- a/src/conf/object_event.h +++ b/src/conf/object_event.h @@ -90,4 +90,11 @@ virObjectEventStateSetRemote(virConnectPtr conn, int remoteID) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); +void +virObjectEventStateSetFreeCB(virConnectPtr conn, + virObjectEventStatePtr state, + int callbackID, + virFreeCallback freecb) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4); + #endif diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 429b095..e9d9cb6 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -791,7 +791,7 @@ virObjectEventStateDeregisterID; virObjectEventStateEventID; virObjectEventStateNew; virObjectEventStateQueue; - +virObjectEventStateSetFreeCB; # conf/secret_conf.h virSecretDefFormat; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index d27e96f..71177bd 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -5947,7 +5947,7 @@ remoteConnectDomainEventRegisterAny(virConnectPtr conn, if ((count = virDomainEventStateRegisterClient(conn, priv->eventState, dom, eventID, callback, - opaque, freecb, false, + opaque, NULL, false, &callbackID, priv->serverEventFilter)) < 0) goto done; @@ -5993,7 +5993,7 @@ remoteConnectDomainEventRegisterAny(virConnectPtr conn, } rv = callbackID; - + virObjectEventStateSetFreeCB(conn, priv->eventState, callbackID, freecb); done: remoteDriverUnlock(priv); return rv; -- 2.10.0.windows.1

2 1

[libvirt] [PATCH] fix memory leak in qemuMonitorJSONAttachCharDevCommand
by Yi Wang 14 Jun '17

14 Jun '17

The @tlsalias allocated in qemuAliasTLSObjFromSrcAlias may lost when append string to json. Signed-off-by: Xi Xu <xu.xi8(a)zte.com.cn> --- src/qemu/qemu_monitor_json.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index f208dd0..773de0f 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -6487,6 +6487,7 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, if (virJSONValueObjectAppendString(data, "tls-creds", tlsalias) < 0) goto error; + VIR_FREE(tlsalias); } break; -- 1.8.3.1

2 1

[libvirt] [PATCH v2] qemu: monitor: Fix a memory leak in qemuMonitorJSONAttachCharDevCommand
by Erik Skultety 14 Jun '17

14 Jun '17

With the current logic, we only free @tlsalias as part of the error label and would have to free it explicitly earlier in the code. Convert the error label to cleanup, so that we have only one sink, where we handle all frees. Since since JSON object append operation consumes pointers, make sure @backend is cleared before we hit the cleanup label. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- src/qemu/qemu_monitor_json.c | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index f208dd05a..5ddc09ca6 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -6430,8 +6430,8 @@ static virJSONValuePtr qemuMonitorJSONAttachCharDevCommand(const char *chrID, const virDomainChrSourceDef *chr) { - virJSONValuePtr ret; - virJSONValuePtr backend; + virJSONValuePtr ret = NULL; + virJSONValuePtr backend = NULL; virJSONValuePtr data = NULL; virJSONValuePtr addr = NULL; const char *backend_type = NULL; @@ -6440,7 +6440,7 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, if (!(backend = virJSONValueNewObject()) || !(data = virJSONValueNewObject())) { - goto error; + goto cleanup; } switch ((virDomainChrType) chr->type) { @@ -6456,14 +6456,14 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, case VIR_DOMAIN_CHR_TYPE_FILE: backend_type = "file"; if (virJSONValueObjectAppendString(data, "out", chr->data.file.path) < 0) - goto error; + goto cleanup; break; case VIR_DOMAIN_CHR_TYPE_DEV: backend_type = STRPREFIX(chrID, "parallel") ? "parallel" : "serial"; if (virJSONValueObjectAppendString(data, "device", chr->data.file.path) < 0) - goto error; + goto cleanup; break; case VIR_DOMAIN_CHR_TYPE_TCP: @@ -6472,7 +6472,7 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, chr->data.tcp.service); if (!addr || virJSONValueObjectAppend(data, "addr", addr) < 0) - goto error; + goto cleanup; addr = NULL; telnet = chr->data.tcp.protocol == VIR_DOMAIN_CHR_TCP_PROTOCOL_TELNET; @@ -6480,13 +6480,13 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, if (virJSONValueObjectAppendBoolean(data, "wait", false) < 0 || virJSONValueObjectAppendBoolean(data, "telnet", telnet) < 0 || virJSONValueObjectAppendBoolean(data, "server", chr->data.tcp.listen) < 0) - goto error; + goto cleanup; if (chr->data.tcp.tlscreds) { if (!(tlsalias = qemuAliasTLSObjFromSrcAlias(chrID))) - goto error; + goto cleanup; if (virJSONValueObjectAppendString(data, "tls-creds", tlsalias) < 0) - goto error; + goto cleanup; } break; @@ -6496,14 +6496,14 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, chr->data.udp.connectService); if (!addr || virJSONValueObjectAppend(data, "remote", addr) < 0) - goto error; + goto cleanup; if (chr->data.udp.bindHost) { addr = qemuMonitorJSONBuildInetSocketAddress(chr->data.udp.bindHost, chr->data.udp.bindService); if (!addr || virJSONValueObjectAppend(data, "local", addr) < 0) - goto error; + goto cleanup; } addr = NULL; break; @@ -6514,12 +6514,12 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, if (!addr || virJSONValueObjectAppend(data, "addr", addr) < 0) - goto error; + goto cleanup; addr = NULL; if (virJSONValueObjectAppendBoolean(data, "wait", false) < 0 || virJSONValueObjectAppendBoolean(data, "server", chr->data.nix.listen) < 0) - goto error; + goto cleanup; break; case VIR_DOMAIN_CHR_TYPE_SPICEVMC: @@ -6527,7 +6527,7 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, if (virJSONValueObjectAppendString(data, "type", virDomainChrSpicevmcTypeToString(chr->data.spicevmc)) < 0) - goto error; + goto cleanup; break; case VIR_DOMAIN_CHR_TYPE_SPICEPORT: @@ -6544,28 +6544,27 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, _("Hotplug unsupported for char device type '%d'"), chr->type); } - goto error; + goto cleanup; } if (virJSONValueObjectAppendString(backend, "type", backend_type) < 0 || virJSONValueObjectAppend(backend, "data", data) < 0) - goto error; + goto cleanup; data = NULL; if (!(ret = qemuMonitorJSONMakeCommand("chardev-add", "s:id", chrID, "a:backend", backend, NULL))) - goto error; + goto cleanup; + backend = NULL; - return ret; - - error: + cleanup: VIR_FREE(tlsalias); virJSONValueFree(addr); virJSONValueFree(data); virJSONValueFree(backend); - return NULL; + return ret; } -- 2.13.1

2 1

[libvirt] [PATCH] qemu: monitor: Fix a memory leak in qemuMonitorJSONAttachCharDevCommand
by Erik Skultety 14 Jun '17

14 Jun '17

With the current logic, we only free @tlsalias as part of the error label and would have to free it explicitly earlier in the code. Convert the error label to cleanup, so that we have only one sink, where we handle all frees. In order to do that we need to clear some JSON obj pointers down the success road to avoid SIGSEGV, since JSON object append operation consumes pointers. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- src/qemu/qemu_monitor_json.c | 47 ++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index f208dd05a..b8b73926f 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -6430,8 +6430,8 @@ static virJSONValuePtr qemuMonitorJSONAttachCharDevCommand(const char *chrID, const virDomainChrSourceDef *chr) { - virJSONValuePtr ret; - virJSONValuePtr backend; + virJSONValuePtr ret = NULL; + virJSONValuePtr backend = NULL; virJSONValuePtr data = NULL; virJSONValuePtr addr = NULL; const char *backend_type = NULL; @@ -6440,7 +6440,7 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, if (!(backend = virJSONValueNewObject()) || !(data = virJSONValueNewObject())) { - goto error; + goto cleanup; } switch ((virDomainChrType) chr->type) { @@ -6456,14 +6456,14 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, case VIR_DOMAIN_CHR_TYPE_FILE: backend_type = "file"; if (virJSONValueObjectAppendString(data, "out", chr->data.file.path) < 0) - goto error; + goto cleanup; break; case VIR_DOMAIN_CHR_TYPE_DEV: backend_type = STRPREFIX(chrID, "parallel") ? "parallel" : "serial"; if (virJSONValueObjectAppendString(data, "device", chr->data.file.path) < 0) - goto error; + goto cleanup; break; case VIR_DOMAIN_CHR_TYPE_TCP: @@ -6472,21 +6472,20 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, chr->data.tcp.service); if (!addr || virJSONValueObjectAppend(data, "addr", addr) < 0) - goto error; - addr = NULL; + goto cleanup; telnet = chr->data.tcp.protocol == VIR_DOMAIN_CHR_TCP_PROTOCOL_TELNET; if (virJSONValueObjectAppendBoolean(data, "wait", false) < 0 || virJSONValueObjectAppendBoolean(data, "telnet", telnet) < 0 || virJSONValueObjectAppendBoolean(data, "server", chr->data.tcp.listen) < 0) - goto error; + goto cleanup; if (chr->data.tcp.tlscreds) { if (!(tlsalias = qemuAliasTLSObjFromSrcAlias(chrID))) - goto error; + goto cleanup; if (virJSONValueObjectAppendString(data, "tls-creds", tlsalias) < 0) - goto error; + goto cleanup; } break; @@ -6496,16 +6495,15 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, chr->data.udp.connectService); if (!addr || virJSONValueObjectAppend(data, "remote", addr) < 0) - goto error; + goto cleanup; if (chr->data.udp.bindHost) { addr = qemuMonitorJSONBuildInetSocketAddress(chr->data.udp.bindHost, chr->data.udp.bindService); if (!addr || virJSONValueObjectAppend(data, "local", addr) < 0) - goto error; + goto cleanup; } - addr = NULL; break; case VIR_DOMAIN_CHR_TYPE_UNIX: @@ -6514,12 +6512,11 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, if (!addr || virJSONValueObjectAppend(data, "addr", addr) < 0) - goto error; - addr = NULL; + goto cleanup; if (virJSONValueObjectAppendBoolean(data, "wait", false) < 0 || virJSONValueObjectAppendBoolean(data, "server", chr->data.nix.listen) < 0) - goto error; + goto cleanup; break; case VIR_DOMAIN_CHR_TYPE_SPICEVMC: @@ -6527,7 +6524,7 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, if (virJSONValueObjectAppendString(data, "type", virDomainChrSpicevmcTypeToString(chr->data.spicevmc)) < 0) - goto error; + goto cleanup; break; case VIR_DOMAIN_CHR_TYPE_SPICEPORT: @@ -6544,28 +6541,30 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, _("Hotplug unsupported for char device type '%d'"), chr->type); } - goto error; + goto cleanup; } if (virJSONValueObjectAppendString(backend, "type", backend_type) < 0 || virJSONValueObjectAppend(backend, "data", data) < 0) - goto error; - data = NULL; + goto cleanup; if (!(ret = qemuMonitorJSONMakeCommand("chardev-add", "s:id", chrID, "a:backend", backend, NULL))) - goto error; + goto cleanup; - return ret; + /* we must not free the following pointers as they've been collectively + * consumed by @ret, so clear them first + */ + addr = data = backend = NULL; - error: + cleanup: VIR_FREE(tlsalias); virJSONValueFree(addr); virJSONValueFree(data); virJSONValueFree(backend); - return NULL; + return ret; } -- 2.13.1

2 2