- Devel - libvirt List Archives

[libvirt] [PATCH 00/10] Another set of qemu namespace fixes
by Michal Privoznik 07 Feb '17

07 Feb '17

The major problem was with symlinks. Imagine the following chain of symlinks: /dev/my_awesome_disk -> /home/user/blaah -> /dev/disk/by-uuid/$uuid -> /dev/sda We really need to create all those /dev/* symlinks and /dev/sda device. Also, some other (less critical) bugs are fixed. Michal Privoznik (10): virProcessRunInMountNamespace: Report errors from child util: Introduce virFileReadLink qemuDomainPrepareDisk: Fix ordering qemuSecurityRestoreAllLabel: Don't use transactions qemu_security: Use more transactions qemuDomain{Attach,Detach}Device NS helpers: Don't relabel devices qemuDomainCreateDevice: Properly deal with symlinks qemuDomainCreateDevice: Don't loop endlessly qemuDomainAttachDeviceMknod: Deal with symlinks qemuDomainAttachDeviceMknod: Don't loop endlessly src/libvirt_private.syms | 1 + src/qemu/qemu_domain.c | 438 +++++++++++++++++++++++++++-------------------- src/qemu/qemu_hotplug.c | 20 +-- src/qemu/qemu_security.c | 137 +++++++++------ src/util/virfile.c | 12 ++ src/util/virfile.h | 2 + src/util/virprocess.c | 8 +- 7 files changed, 374 insertions(+), 244 deletions(-) -- 2.11.0

4 34

[libvirt] [PATCH] qemu: Forbid <memoryBacking><locked> without <memtune><hard_limit>
by Andrea Bolognani 07 Feb '17

07 Feb '17

In order for memory locking to work, the hard limit on memory locking (and usage) has to be set appropriately by the user. The documentation mentions the requirement already: with this patch, it's going to be enforced by runtime checks as well. Note that this will make existing guests that don't satisfy the requirement disappear; that said, such guests have never been able to start in the first place. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1316774 --- src/qemu/qemu_domain.c | 20 ++++++++++++++++++++ tests/qemuxml2argvdata/qemuxml2argv-mlock-on.xml | 3 +++ ....xml => qemuxml2argv-mlock-without-hardlimit.xml} | 0 tests/qemuxml2argvtest.c | 1 + 4 files changed, 24 insertions(+) copy tests/qemuxml2argvdata/{qemuxml2argv-mlock-on.xml => qemuxml2argv-mlock-without-hardlimit.xml} (100%) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index c6ce090..bb29cfe 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2629,6 +2629,23 @@ qemuDomainDefVcpusPostParse(virDomainDefPtr def) static int +qemuDomainDefMemoryLockingPostParse(virDomainDefPtr def) +{ + /* Memory locking can only work properly if the memory locking limit + * for the QEMU process has been raised appropriately: the default one + * is extrememly low, so there's no way the guest will fit in there */ + if (def->mem.locked && !virMemoryLimitIsSet(def->mem.hard_limit)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Setting <memoryBacking><locked> requires " + "<memtune><hard_limit> to be set as well")); + return -1; + } + + return 0; +} + + +static int qemuDomainDefPostParse(virDomainDefPtr def, virCapsPtr caps, unsigned int parseFlags, @@ -2692,6 +2709,9 @@ qemuDomainDefPostParse(virDomainDefPtr def, if (qemuDomainDefVcpusPostParse(def) < 0) goto cleanup; + if (qemuDomainDefMemoryLockingPostParse(def) < 0) + goto cleanup; + ret = 0; cleanup: virObjectUnref(qemuCaps); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.xml b/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.xml index 20a5eaa..2046663 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.xml @@ -3,6 +3,9 @@ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>219136</memory> <currentMemory unit='KiB'>219136</currentMemory> + <memtune> + <hard_limit unit='KiB'>256000</hard_limit> + </memtune> <memoryBacking> <locked/> </memoryBacking> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.xml b/tests/qemuxml2argvdata/qemuxml2argv-mlock-without-hardlimit.xml similarity index 100% copy from tests/qemuxml2argvdata/qemuxml2argv-mlock-on.xml copy to tests/qemuxml2argvdata/qemuxml2argv-mlock-without-hardlimit.xml diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 3532cb5..9b2fec5 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2129,6 +2129,7 @@ mymain(void) DO_TEST_FAILURE("mlock-on", NONE); DO_TEST("mlock-off", QEMU_CAPS_REALTIME_MLOCK); DO_TEST("mlock-unsupported", NONE); + DO_TEST_PARSE_ERROR("mlock-without-hardlimit", NONE); DO_TEST_PARSE_ERROR("pci-bridge-negative-index-invalid", QEMU_CAPS_DEVICE_PCI_BRIDGE); -- 2.7.4

3 3

[libvirt] [PATCH v2] qemu: Forbid <memoryBacking><locked> without <memtune><hard_limit>
by Andrea Bolognani 07 Feb '17

07 Feb '17

In order for memory locking to work, the hard limit on memory locking (and usage) has to be set appropriately by the user. The documentation mentions the requirement already: with this patch, it's going to be enforced by runtime checks as well, by forbidding a non-compliant guest from starting at all. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1316774 --- Changes from [v1] * Address review feeback: - check in BuildCommandLine rather than in PostParse, so that non-compliant guests will merely fail to start rather than disappear completely. [v1] https://www.redhat.com/archives/libvir-list/2017-February/msg00180.html src/qemu/qemu_command.c | 9 +++++++++ tests/qemuxml2argvdata/qemuxml2argv-mlock-on.xml | 3 +++ 2 files changed, 12 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1396661..ca3bcdc 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7340,6 +7340,15 @@ qemuBuildMemCommandLine(virCommandPtr cmd, qemuBuildMemPathStr(cfg, def, qemuCaps, cmd) < 0) return -1; + /* Memory locking can only work properly if the memory locking limit + * for the QEMU process has been raised appropriately: the default one + * is extrememly low, so there's no way the guest will fit in there */ + if (def->mem.locked && !virMemoryLimitIsSet(def->mem.hard_limit)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Setting <memoryBacking><locked> requires " + "<memtune><hard_limit> to be set as well")); + return -1; + } if (def->mem.locked && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_REALTIME_MLOCK)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("memory locking not supported by QEMU binary")); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.xml b/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.xml index 20a5eaa..2046663 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.xml @@ -3,6 +3,9 @@ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>219136</memory> <currentMemory unit='KiB'>219136</currentMemory> + <memtune> + <hard_limit unit='KiB'>256000</hard_limit> + </memtune> <memoryBacking> <locked/> </memoryBacking> -- 2.7.4

2 1

[libvirt] [PATCH] docs: mention bhyve SATA address changes in news.xml
by Roman Bogorodskiy 06 Feb '17

06 Feb '17

--- docs/news.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index f408293a1..9e3c4ec3d 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -56,6 +56,22 @@ a fabric name has been removed by making it optional. </description> </change> + <change> + <summary> + bhyve: change address allocation schema for SATA disks + </summary> + <description> + Previously, the bhyve driver assigned PCI addresses to SATA disks directly + rather than assigning that to a controller and using SATA addresses for disks. + It was implemented this way because bhyve has no notion of an explicit SATA + controller. However, this doesn't go inline with the internal libvirt model, + it was changed for the bhyve driver to follow the common schema and + have PCI addresses for SATA controllers and SATA addresses for disks. If you're having + issues because of this, it's recommended to edit the domain's XML and remove + <address type='xml'> from the <disk> elements with + <target bus="sata"/> and let libvirt regenerate it properly. + </description> + </change> </section> </release> <release version="v3.0.0" date="2017-01-17"> -- 2.11.0

2 2

Re: [libvirt] Issue with libvirtd
by Michal Privoznik 06 Feb '17

06 Feb '17

On 01/10/2017 07:48 AM, Faysal Ali wrote: > Hi Michal, [It is usually good idea to keep the list CCed - it may help others finding a solution to their problems] > > Well I have created my little python/libivrt app to manage my virtual > machines. I am using python socket to check libivrt port availability, and > the error End of file while reading data: Input/output error* only happens > whenever that python socket script is trigger. > > Here is the script of python socket > > import libvirt, socket, sys > > hostname='kvm09' > port = 16509 > > try: > socket_host = socket.socket(socket.AF_INET, socket.SOCK_STREAM) > socket_host.settimeout(1) > socket_host.connect((hostname, port)) > socket_host.close() > print 'true' > except Exception as err: > print err Ah, I haven't expected this. Of course your are seeing the error message. Libvirt has its own protocol on the top of TCP and since you are connecting and dying immediately - without sending any valid libvirt packet, the daemon logs an error. This is perfectly expected. Also, this is *not* how you connect to libvirt. You want to open a libvirt connection: conn = libvirt.open(uri) dom = conn.lookupByName(name) ... Michal

2 2

[libvirt] [PATCH] char: drop data written to a disconnected pty
by Ed Swierk 06 Feb '17

06 Feb '17

When a serial port writes data to a pty that's disconnected, drop the data and return the length dropped. This avoids triggering pointless retries in callers like the 16550A serial_xmit(), and causes qemu_chr_fe_write() to write all data to the log file, rather than logging only while a pty client like virsh console happens to be connected. Signed-off-by: Ed Swierk <eswierk(a)skyportsystems.com> --- qemu-char.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu-char.c b/qemu-char.c index 676944a..ccb6923 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -1528,7 +1528,7 @@ static int pty_chr_write(CharDriverState *chr, const uint8_t *buf, int len) /* guest sends data, check for (re-)connect */ pty_chr_update_read_handler_locked(chr); if (!s->connected) { - return 0; + return len; } } return io_channel_send(s->ioc, buf, len); -- 1.9.1

3 5

[libvirt] [PATCH v2 0/3] add per cpu stats to all domain stats
by Nikolay Shirokovskiy 06 Feb '17

06 Feb '17

Info provided in virDomainGetCPUStats is currently missed in all domain stats. This patch removes this discrepancy. You may need not yet merged patch 'qemu: fix crash on getting block stats for empty cdrom' to test this series. diff from v1: ================ 1. reuse code (patches 1, 2) 2. move per cpu stats to a distinct stats group 3. add documentation Nikolay Shirokovskiy (3): cgroup: extract interface part from virCgroupGetPercpuStats cgroup: reuse virCgroupGetPercpuTime in virCgroupGetPercpuVcpuSum add per cpu stats to all domain stats docs/news.xml | 9 ++ include/libvirt/libvirt-domain.h | 1 + src/libvirt-domain.c | 7 ++ src/libvirt_private.syms | 2 + src/qemu/qemu_driver.c | 64 ++++++++++++++ src/util/vircgroup.c | 178 +++++++++++++++++++++++++++------------ src/util/vircgroup.h | 17 ++++ tools/virsh-domain-monitor.c | 7 ++ tools/virsh.pod | 11 ++- 9 files changed, 238 insertions(+), 58 deletions(-) -- 1.8.3.1

2 7

[libvirt] OSX Homebrew support note ;)
by Justin Clift 06 Feb '17

06 Feb '17

Hi all, Compiling Libvirt directly from latest git master head is now supported on OSX Homebrew. It's as simple as: $ brew install --HEAD libvirt ... $ virsh -v 3.0.0 This should make development of Libvirt and related virtualisation things much easier on OSX. :) The credit for this goes to Roman Bogorodskiy and Homebrew developer "ilovezfs" (CC-d), for adding a functional rpcgen to Homebrew so we can generate the needed RPC bindings during the build (previously missing). Thanks heaps! :) Regards and best wishes, Justin Clift

4 7

[libvirt] [PATCH] libxl: fix dom0 autoballooning with Xen 4.8
by Jim Fehlig 03 Feb '17

03 Feb '17

xen.git commit 57f8b13c changed several of the libxl memory get/set functions to take 64 bit parameters. The libvirt libxl driver still uses uint32_t variables for these various parameters, which is particularly problematic for the libxl_set_memory_target() function. When dom0 autoballooning is enabled, libvirt (like xl) determines the memory needed to start a domain and the memory available. If memory available is less than memory needed, dom0 is ballooned down by passing a negative value to libxl_set_memory_target() 'target_memkb' parameter. Prior to xen.git commit 57f8b13c, 'target_memkb' was an int32_t. Subtracting a larger uint32 from a smaller uint32 and assigning it to int32 resulted in a negative number. After commit 57f8b13c, the same subtraction is widened to a int64, resulting in a large positive number. The simple fix taken by this patch is to assign the difference of the uint32 values to a temporary int32 variable, which is then passed to 'target_memkb' parameter of libxl_set_memory_target(). Note that it is undesirable to change libvirt to use 64 bit variables since it requires setting LIBXL_API_VERSION to 0x040800. Currently libvirt supports LIBXL_API_VERSION >= 0x040400, essentially Xen >= 4.4. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_domain.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index a5314b0..ed73cd2 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -909,6 +909,7 @@ libxlDomainFreeMem(libxl_ctx *ctx, libxl_domain_config *d_config) { uint32_t needed_mem; uint32_t free_mem; + int32_t target_mem; int tries = 3; int wait_secs = 10; @@ -922,7 +923,8 @@ libxlDomainFreeMem(libxl_ctx *ctx, libxl_domain_config *d_config) if (free_mem >= needed_mem) return 0; - if (libxl_set_memory_target(ctx, 0, free_mem - needed_mem, + target_mem = free_mem - needed_mem; + if (libxl_set_memory_target(ctx, 0, target_mem, /* relative */ 1, 0) < 0) goto error; -- 2.9.2

3 4

[libvirt] [RFC] Vhost-user backends cross-version migration support
by Maxime Coquelin 03 Feb '17

03 Feb '17

Hi, Few months ago, Michael reported a problem about migrating VMs relying on vhost-user between hosts supporting different backend versions: - Message-Id: <20161011173526-mutt-send-email-mst(a)kernel.org> - https://lists.gnu.org/archive/html/qemu-devel/2016-10/msg03026.html The goal of this thread is to draft a proposal based on the outcomes of discussions with contributors of the different parties (DPDK/OVS /libvirt/...). Problem statement: ================== When migrating a VM from one host to another, the interfaces exposed by QEMU must stay unchanged in order to guarantee a successful migration. In the case of vhost-user interface, parameters like supported Virtio feature set, max number of queues, max vring sizes,... must remain compatible. Indeed, the frontend not being re-initialized, no renegotiation happens at migration time. For example, we have a VM that runs on host A, which has its vhost-user backend advertising VIRTIO_F_RING_INDIRECT_DESC feature. Since the Guest also support this feature, it is successfully negotiated, and guest transmit packets using indirect descriptor tables, that the backend knows to handle. At some point, the VM is being migrated to host B, which runs an older version of the backend not supporting this VIRTIO_F_RING_INDIRECT_DESC feature. The migration would break, because the Guest still have the VIRTIO_F_RING_INDIRECT_DESC bit sets, and the virtqueue contains some decriptors pointing to indirect tables, that backend B doesn't know to handle. This is just an example about Virtio features compatibility, but other backend implementation details could cause other failures. What we need is to be able to query the destination host's backend to ensure migration is possible. Also, we would need to query this statically, even before the VM is started, to be sure it could be migrated elsewhere for any reason. Solution 1: Libvirt queries DPDK vhost lib: *KO* ================================================ Initial idea was to have the management tool (libvirt) to query DPDK vhost lib and get key/value pairs and check whether migration is possible. This solution doesn't work for several reasons: 1. Vhost lib API provide a way for the application to disable features at runtime (understand, not at build time). So coming back to previous example, DPDK v16.11 supports indirect descriptor features, but it could be disabled by OVS. We had a look at whether this API was mandatory, and it turns out to be, as TSO feature is supported on DPDK but not in OVS. So we cannot rely on DPDK only. 2. Some parameter may be not only DPDK specific, such as the maximum number of queues for example. Solution 2: Libvirt queries OVS for vhost backend key/value pairs: *KO* ======================================================================= Second idea was for OVS to expose its vhost backend implementation parameters as key/value pairs, for example in the DB or by a dedicated tool. For example, you could have this kind of information: - virtio-features: 0x12045694 - max-rx-queues: 1024 - max-rx-ring-size: 512 Doing this, Libvirt has the information to take decision whether migration is possible or not. The problem is that Libvirt doesn't know (and want) to interpret these values (should it be equal/lower/greater/...?), and each time a new key is introduced in OVS, Libvirt will have to be updated to handle it, adding an unwanted synchronization constraint between the projects. Solution 3: Libvirt queries OVS for vhost backend version string: *OK* ====================================================================== The idea is to have a table of supported versions, associated to key/value pairs. Libvirt could query the list of supported versions strings for each hosts, and select the first common one among all hosts. Then, libvirt would ask OVS to probe the vhost-user interfaces in the selected version (compatibility mode). For example host A runs OVS-2.7, and host B OVS-2.6. Host A's OVS-2.7 has an OVS-2.6 compatibility mode (e.g. with indirect descriptors disabled), which should be selected at vhost-user interface probe time. Advantage of doing so is that libvirt does not need any update if new keys are introduced (i.e. it does not need to know how the new keys have to be handled), all these checks remain in OVS's vhost-user implementation. Ideally, we would support per vhost-user interface compatibility mode, which may have an impact also on DPDK API, as the Virtio feature update API is global, and not per port. - Implementation: ----------------- Goal here is just to illustrate this proposal, I'm sure you will have good suggestion to improve it. In OVS vhost-user library, we would introduce a new structure, for example (neither compiled nor tested): struct vhostuser_compat { char *version; uint64_t virtio_features; uint32_t max_rx_queue_sz; uint32_t max_nr_queues; }; *version* field is the compatibility version string. It could be something like: "upstream.ovs-dpdk.v2.6" In case for example Fedora adds some more patches to its package that would break migration to upstream version, it could have a dedicated compatibility string: "fc26.ovs-dpdk.v2.6". In case OVS-v2.7 does not break compatibility with previous OVS-v2.6 version, then no need to create a new compatibility entry, just keep v2.6 one. *virtio_features* field is the Virtio features set for a given compatibility version. When an OVS tag is to be created, it would be associated to a DPDK version. The Virtio features for these version would be stored in this field. It would allow to upgrade the DPDK package for example from v16.07 to v16.11 without breaking migration. In case the distribution wants to benefit from latests Virtio features, it would have to create a new entry to ensure migration won't be broken. *max_rx_queue_sz* *max_nr_queues* fields are just here for example, don't think this is needed today. I just want to illustrate that we have to anticipate other parameters than the Virtio feature set, even if not necessary at the moment. We create a table with different compatibility versions in OVS vhost-user lib: static struct vhostuser_compat vu_compat[] = { { .version = "upstream.ovs-dpdk.v2.7", .virtio_features = 0x12045694, .max_rx_queue_sz = 512, }, { .version = "upstream.ovs-dpdk.v2.6", .virtio_features = 0x10045694, .max_rx_queue_sz = 1024, }, } At some time during installation, or system init, the table would be parsed, and compatibility version strings would be stored into the OVS database, or a new tool would be created to list these strings. Before launching the VM, libvirt will query the version strings for each hosts using for example the JSON RPC API of OVS (maybe not the best solution, looking forward for your comments on this). Libvirt would then select the first common supported version, and insert this string into the vhost-user interfaces parameters in the OVS DBs of each host. When the vhost-user connection is initiated, OVS would know in which compatibility mode to init the interface, for example by restricting the support Virtio features of the interface. Do you think this is reasonable? Or maybe you have alternative ideas that would be best fit to ensure successful migration? Cheers, Maxime

6 29

[libvirt] [PATCH] HACKING: Update after recent change of the html file
by Peter Krempa 03 Feb '17

03 Feb '17

--- Pushed as trivial. HACKING | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/HACKING b/HACKING index ff545a8fa..fff003b9e 100644 --- a/HACKING +++ b/HACKING @@ -231,7 +231,8 @@ feature or changing the output of a program. such as adding new XML elements or fixing all but the most obscure bugs, must be (briefly) described in a release notes entry; changes that are only relevant to other libvirt developers, such as code refactoring, don't belong -in the release notes. +in the release notes. Note that "docs/news.xml" should be updated in its own +commit not to get in the way of backports. There is more on this subject, including lots of links to background reading on the subject, on Richard Jones' guide to working with open source projects -- 2.11.0

2 1

[libvirt] [PATCH] virtlockd: fix systemd unit file dependancies
by Daniel P. Berrange 03 Feb '17

03 Feb '17

After deploying virtlogd by default we identified a number of mistakes in the systemd unit file. virtlockd's relationship to libvirtd is the same as virtlogd, so we must apply the same unit file fixes to virtlockd Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- daemon/libvirtd.service.in | 1 + src/locking/virtlockd.service.in | 1 + src/locking/virtlockd.socket.in | 1 + 3 files changed, 3 insertions(+) diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in index bbf27da..c72dde5 100644 --- a/daemon/libvirtd.service.in +++ b/daemon/libvirtd.service.in @@ -6,6 +6,7 @@ [Unit] Description=Virtualization daemon Requires=virtlogd.socket +Requires=virtlockd.socket Before=libvirt-guests.service After=network.target After=dbus.service diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in index 57089b0..69b568f 100644 --- a/src/locking/virtlockd.service.in +++ b/src/locking/virtlockd.service.in @@ -1,6 +1,7 @@ [Unit] Description=Virtual machine lock manager Requires=virtlockd.socket +Before=libvirtd.service Documentation=man:virtlockd(8) Documentation=http://libvirt.org diff --git a/src/locking/virtlockd.socket.in b/src/locking/virtlockd.socket.in index 9808bbb..45e0f20 100644 --- a/src/locking/virtlockd.socket.in +++ b/src/locking/virtlockd.socket.in @@ -1,5 +1,6 @@ [Unit] Description=Virtual machine lock manager socket +Before=libvirtd.service [Socket] ListenStream=@localstatedir@/run/libvirt/virtlockd-sock -- 2.9.3

3 2

[libvirt] [PATCH] docs: Release notes should be updated in a separate commit
by Andrea Bolognani 03 Feb '17

03 Feb '17

Updating docs/news.xml in the same commit that performs the documented change makes backports needlessly complicated, both for mainteinance branches and downstream distributions, because it introduces additional potential for merge conflicts. Document in the contributor guidelines that the release notes should be updated in a separate commit instead, so that it's easy to backport just the code change. --- docs/hacking.html.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/hacking.html.in b/docs/hacking.html.in index c7bbcbd..b1bb149 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -302,7 +302,8 @@ or fixing all but the most obscure bugs, must be (briefly) described in a release notes entry; changes that are only relevant to other libvirt developers, such as code refactoring, don't belong in the - release notes.</p> + release notes. Note that <code>docs/news.xml</code> should be updated + in its own commit not to get in the way of backports.</p> </li> </ol> -- 2.7.4

2 1

[libvirt] [V2 0/5] Support cache tune in libvirt
by Eli Qiao 03 Feb '17

03 Feb '17

This series patches are for supportting CAT featues, which also called cache tune in libvirt. First to expose cache information which could be tuned in capabilites XML. Then add new domain xml element support to add cacahe bank which will apply on this libvirt domain. This series patches add a util file `resctrl.c/h`, an interface to talk with linux kernel's sys fs. There are some TODO work such as logic of supportting l3code/l3data, expose new public interface to get free cache information. Some discussion about this feature support can be found from: https://www.redhat.com/archives/libvir-list/2017-January/msg00644.html Eli Qiao (5): Resctrl: Add some utils functions Resctrl: expose cache information to capabilities Resctrl: Add new xml element to support cache tune Resctrl: Add private interface to set cachebanks Qemu: Set cache banks docs/schemas/domaincommon.rng | 41 ++ include/libvirt/virterror.h | 1 + src/Makefile.am | 1 + src/conf/capabilities.c | 56 +++ src/conf/capabilities.h | 23 + src/conf/domain_conf.c | 134 ++++++ src/conf/domain_conf.h | 18 + src/libvirt_private.syms | 10 + src/qemu/qemu_capabilities.c | 68 +++ src/qemu/qemu_driver.c | 4 + src/qemu/qemu_process.c | 10 + src/util/virerror.c | 1 + src/util/virresctrl.c | 994 ++++++++++++++++++++++++++++++++++++++++++ src/util/virresctrl.h | 135 ++++++ 14 files changed, 1496 insertions(+) create mode 100644 src/util/virresctrl.c create mode 100644 src/util/virresctrl.h -- 1.9.1

1 5

[libvirt] [PATCH 0/2] Fix random crash in qemuhotplugtest
by Peter Krempa 02 Feb '17

02 Feb '17

First patch makes the bug 100%[1] reproducible. *[1]: Race conditions may apply. Peter Krempa (2): DON'T APPLY: Reproducer to serialize threads "correctly" tests: qemuhotplug: Don't free the monitor object as part of @vm tests/qemuhotplugtest.c | 10 +++++++++- tests/qemumonitortestutils.c | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) -- 2.11.0

2 4

[libvirt] [PATCH] tests: qemuhotplug: Fix memory leaks after cpu hotplug testing patches
by Peter Krempa 02 Feb '17

02 Feb '17

testQemuHotplugCpuDataFree leaked @data always and testQemuHotplugCpuPrepare leaked @prefix on success --- Pushed as trivial. tests/qemuhotplugtest.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 9a203bd44..8cceb883e 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -377,6 +377,7 @@ testQemuHotplugCpuDataFree(struct testQemuHotplugCpuData *data) virObjectUnref(data->vm); qemuMonitorTestFree(data->mon); + VIR_FREE(data); } @@ -434,6 +435,8 @@ testQemuHotplugCpuPrepare(const char *test, if (qemuDomainRefreshVcpuInfo(&driver, data->vm, 0, false) < 0) goto error; + VIR_FREE(prefix); + return data; error: -- 2.11.0

1 0

[libvirt] [PATCH] qemu: turn on virtlockd by default
by Daniel P. Berrange 02 Feb '17

02 Feb '17

The virtlockd daemon has existed for years now, but we have never turned it on by default, requiring explicit user opt-in. This leaves users unprotected against accidents out of the box. By turning it on by default, users will at least be protected for mistakes involving local files, and files on shared filesystems that support fcntl() (eg NFS). In turning it on the various services files are updated to have the same dependancies for virtlockd as we have for virtlogd now, since turning the latter on exposed some gaps. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- daemon/libvirtd.service.in | 1 + src/locking/virtlockd.service.in | 1 + src/locking/virtlockd.socket.in | 1 + src/qemu/qemu.conf | 2 +- src/qemu/qemu_conf.c | 3 +++ 5 files changed, 7 insertions(+), 1 deletion(-) diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in index bbf27da..c72dde5 100644 --- a/daemon/libvirtd.service.in +++ b/daemon/libvirtd.service.in @@ -6,6 +6,7 @@ [Unit] Description=Virtualization daemon Requires=virtlogd.socket +Requires=virtlockd.socket Before=libvirt-guests.service After=network.target After=dbus.service diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in index 57089b0..69b568f 100644 --- a/src/locking/virtlockd.service.in +++ b/src/locking/virtlockd.service.in @@ -1,6 +1,7 @@ [Unit] Description=Virtual machine lock manager Requires=virtlockd.socket +Before=libvirtd.service Documentation=man:virtlockd(8) Documentation=http://libvirt.org diff --git a/src/locking/virtlockd.socket.in b/src/locking/virtlockd.socket.in index 9808bbb..45e0f20 100644 --- a/src/locking/virtlockd.socket.in +++ b/src/locking/virtlockd.socket.in @@ -1,5 +1,6 @@ [Unit] Description=Virtual machine lock manager socket +Before=libvirtd.service [Socket] ListenStream=@localstatedir@/run/libvirt/virtlockd-sock diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index a8cd369..3239f7b 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -535,7 +535,7 @@ # share one writable disk, libvirt offers two approaches for # locking files. The first one is sanlock, the other one, # virtlockd, is then our own implementation. Accepted values -# are "sanlock" and "lockd". +# are "sanlock", "lockd", "nop". The default is "lockd". # #lock_manager = "lockd" diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 6613d59..d4c6cdc 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -314,6 +314,9 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) cfg->glusterDebugLevel = 4; cfg->stdioLogD = true; + if (VIR_STRDUP(cfg->lockManagerName, "lockd") < 0) + goto error; + if (!(cfg->namespaces = virBitmapNew(QEMU_DOMAIN_NS_LAST))) goto error; -- 2.9.3

3 9

[libvirt] [PATCH] qemu: enforce maximum ports value for nec-xhci
by Ján Tomko 02 Feb '17

02 Feb '17

This controller only allows up to 15 ports. https://bugzilla.redhat.com/show_bug.cgi?id=1375417 --- src/qemu/qemu_domain.c | 8 ++++++++ .../qemuxml2argv-usb-controller-xhci-limit.xml | 16 ++++++++++++++++ tests/qemuxml2argvtest.c | 3 +++ 3 files changed, 27 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-controller-xhci-limit.xml diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index c6ce090..61489e0 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3147,6 +3147,14 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, if (dev->type == VIR_DOMAIN_DEVICE_CONTROLLER) { virDomainControllerDefPtr cont = dev->data.controller; + if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_USB && + cont->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHCI && + cont->opts.usbopts.ports > 15) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("nec-xhci controller only supports up to 15 ports")); + goto cleanup; + } + if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI) { if (cont->model == VIR_DOMAIN_CONTROLLER_MODEL_PCI_EXPANDER_BUS && !qemuDomainMachineIsI440FX(def)) { diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-xhci-limit.xml b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-xhci-limit.xml new file mode 100644 index 0000000..5ff2de7 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-xhci-limit.xml @@ -0,0 +1,16 @@ +<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> + <devices> + <emulator>/usr/bin/qemu</emulator> + <controller type='usb' index='0' model='nec-xhci' ports='16'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 3532cb5..78cb609 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1415,6 +1415,9 @@ mymain(void) QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_NEC_USB_XHCI, QEMU_CAPS_NEC_USB_XHCI_PORTS, QEMU_CAPS_USB_HUB); + DO_TEST_PARSE_ERROR("usb-controller-xhci-limit", + QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PIIX3_USB_UHCI, + QEMU_CAPS_NEC_USB_XHCI, QEMU_CAPS_NEC_USB_XHCI_PORTS); DO_TEST("smbios", QEMU_CAPS_SMBIOS_TYPE); DO_TEST_PARSE_ERROR("smbios-date", QEMU_CAPS_SMBIOS_TYPE); -- 2.10.2

2 1

[libvirt] [PATCH v3] Add support for Veritas HyperScale (VxHS) block device protocol
by Ashish Mittal 01 Feb '17

01 Feb '17

Sample XML for a vxhs vdisk is as follows: <disk type='network' device='disk'> <driver name='qemu' type='raw' cache='none'/> <source protocol='vxhs' name='eb90327c-8302-4725-9e1b-4e85ed4dc251'> <host name='192.168.0.1' port='9999'/> </source> <backingStore/> <target dev='vda' bus='virtio'/> <serial>eb90327c-8302-4725-9e1b-4e85ed4dc251</serial> <alias name='virtio-disk0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </disk> Signed-off-by: Ashish Mittal <Ashish.Mittal(a)veritas.com> --- v2 changelog: (1) Added code for JSON parsing of a VxHS vdisk. (2) Added test case to verify JSON parsing. (3) Added missing switch-case checks for VIR_STORAGE_NET_PROTOCOL_VXHS. (4) Fixed line wrap in qemuxml2argv-disk-drive-network-vxhs.args. v3 changelog: (1) Implemented the modern syntax for VxHS disk specification. (2) Changed qemuxml2argvdata VxHS test case to verify the new syntax. (3) Added a negative test case to check failure when multiple hosts are specified for a VxHS disk. docs/formatdomain.html.in | 15 ++++- docs/schemas/domaincommon.rng | 1 + src/libxl/libxl_conf.c | 1 + src/qemu/qemu_command.c | 68 ++++++++++++++++++++++ src/qemu/qemu_driver.c | 3 + src/qemu/qemu_parse_command.c | 26 +++++++++ src/util/virstoragefile.c | 63 +++++++++++++++++++- src/util/virstoragefile.h | 1 + src/xenconfig/xen_xl.c | 1 + ...xml2argv-disk-drive-network-vxhs-multi-host.xml | 35 +++++++++++ .../qemuxml2argv-disk-drive-network-vxhs.args | 25 ++++++++ .../qemuxml2argv-disk-drive-network-vxhs.xml | 34 +++++++++++ tests/qemuxml2argvtest.c | 2 + tests/virstoragetest.c | 16 +++++ 14 files changed, 287 insertions(+), 4 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs-multi-host.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index f7bef51..2a071c9 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2319,9 +2319,9 @@ <dd> The <code>protocol</code> attribute specifies the protocol to access to the requested image. Possible values are "nbd", - "iscsi", "rbd", "sheepdog" or "gluster". If the - <code>protocol</code> attribute is "rbd", "sheepdog" or - "gluster", an additional attribute <code>name</code> is + "iscsi", "rbd", "sheepdog", "gluster" or "vxhs". If the + <code>protocol</code> attribute is "rbd", "sheepdog", "gluster" + or "vxhs", an additional attribute <code>name</code> is mandatory to specify which volume/image will be used. For "nbd", the <code>name</code> attribute is optional. For "iscsi" (<span class="since">since 1.0.4</span>), the <code>name</code> @@ -2329,6 +2329,9 @@ target's name by a slash (e.g., <code>iqn.2013-07.com.example:iscsi-pool/1</code>). If not specified, the default LUN is zero. + For "vxhs" (<span class="since">since 2.5.0</span>), the + <code>name</code> is the UUID of the volume, assigned by the + HyperScale sever. <span class="since">Since 0.8.7</span> </dd> <dt><code>volume</code></dt> @@ -2431,6 +2434,12 @@ <td> one or more (<span class="since">Since 2.1.0</span>), just one prior to that </td> <td> 24007 </td> </tr> + <tr> + <td> vxhs </td> + <td> a server running Veritas HyperScale daemon </td> + <td> only one </td> + <td> 9999 </td> + </tr> </table> <p> gluster supports "tcp", "rdma", "unix" as valid values for the diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 4d76315..cdc39ca 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1470,6 +1470,7 @@ <value>ftp</value> <value>ftps</value> <value>tftp</value> + <value>vxhs</value> </choice> </attribute> <optional> diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index b569dda..7e12d32 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -604,6 +604,7 @@ libxlMakeNetworkDiskSrcStr(virStorageSourcePtr src, case VIR_STORAGE_NET_PROTOCOL_GLUSTER: case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG: case VIR_STORAGE_NET_PROTOCOL_SSH: + case VIR_STORAGE_NET_PROTOCOL_VXHS: case VIR_STORAGE_NET_PROTOCOL_LAST: case VIR_STORAGE_NET_PROTOCOL_NONE: virReportError(VIR_ERR_NO_SUPPORT, diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f8e48d2..08bad8e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -491,6 +491,9 @@ qemuNetworkDriveGetPort(int protocol, /* no default port specified */ return 0; + case VIR_STORAGE_NET_PROTOCOL_VXHS: + return 9999; + case VIR_STORAGE_NET_PROTOCOL_RBD: case VIR_STORAGE_NET_PROTOCOL_LAST: case VIR_STORAGE_NET_PROTOCOL_NONE: @@ -899,6 +902,65 @@ qemuBuildGlusterDriveJSON(virStorageSourcePtr src) } +#define QEMU_DEFAULT_VXHS_PORT "9999" + +/* Build the VxHS host object */ +static virJSONValuePtr +qemuBuildVxHSDriveJSONHost(virStorageSourcePtr src) +{ + virJSONValuePtr server = NULL; + virStorageNetHostDefPtr host; + const char *portstr; + + if (src->nhosts != 1) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("VxHS supports only one server")); + goto cleanup; + } + + host = src->hosts; + portstr = host->port; + + if (!portstr) + portstr = QEMU_DEFAULT_VXHS_PORT; + + if (virJSONValueObjectCreate(&server, + "s:host", host->name, + "s:port", portstr, + NULL) < 0) + server = NULL; + + cleanup: + return server; +} + + +static virJSONValuePtr +qemuBuildVxHSDriveJSON(virStorageSourcePtr src) +{ + const char *protocol = virStorageNetProtocolTypeToString(src->protocol); + virJSONValuePtr server = NULL; + virJSONValuePtr ret = NULL; + + if (!(server = qemuBuildVxHSDriveJSONHost(src))) + return NULL; + + /* VxHS disk sepecification example: + * { driver:"vxhs", + * vdisk-id:"eb90327c-8302-4725-4e85ed4dc251", + * server.host:"1.2.3.4", + * server.port:1234} + */ + if (virJSONValueObjectCreate(&ret, + "s:driver", protocol, + "s:vdisk-id", src->path, + "a:server", server, NULL) < 0) + virJSONValueFree(server); + + return ret; +} + + static char * qemuBuildNetworkDriveURI(virStorageSourcePtr src, qemuDomainSecretInfoPtr secinfo) @@ -1034,6 +1096,7 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src, case VIR_STORAGE_NET_PROTOCOL_TFTP: case VIR_STORAGE_NET_PROTOCOL_ISCSI: case VIR_STORAGE_NET_PROTOCOL_GLUSTER: + case VIR_STORAGE_NET_PROTOCOL_VXHS: ret = qemuBuildNetworkDriveURI(src, secinfo); break; @@ -1148,6 +1211,11 @@ qemuGetDriveSourceProps(virStorageSourcePtr src, if (!(fileprops = qemuBuildGlusterDriveJSON(src))) return -1; } + + if (src->protocol == VIR_STORAGE_NET_PROTOCOL_VXHS) { + if (!(fileprops = qemuBuildVxHSDriveJSON(src))) + return -1; + } break; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b359e77..c76e9d4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -13788,6 +13788,7 @@ qemuDomainSnapshotPrepareDiskExternalBackingInactive(virDomainDiskDefPtr disk) case VIR_STORAGE_NET_PROTOCOL_FTPS: case VIR_STORAGE_NET_PROTOCOL_TFTP: case VIR_STORAGE_NET_PROTOCOL_SSH: + case VIR_STORAGE_NET_PROTOCOL_VXHS: case VIR_STORAGE_NET_PROTOCOL_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("external inactive snapshots are not supported on " @@ -13851,6 +13852,7 @@ qemuDomainSnapshotPrepareDiskExternalOverlayActive(virDomainSnapshotDiskDefPtr d case VIR_STORAGE_NET_PROTOCOL_FTPS: case VIR_STORAGE_NET_PROTOCOL_TFTP: case VIR_STORAGE_NET_PROTOCOL_SSH: + case VIR_STORAGE_NET_PROTOCOL_VXHS: case VIR_STORAGE_NET_PROTOCOL_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("external active snapshots are not supported on " @@ -13996,6 +13998,7 @@ qemuDomainSnapshotPrepareDiskInternal(virConnectPtr conn, case VIR_STORAGE_NET_PROTOCOL_FTPS: case VIR_STORAGE_NET_PROTOCOL_TFTP: case VIR_STORAGE_NET_PROTOCOL_SSH: + case VIR_STORAGE_NET_PROTOCOL_VXHS: case VIR_STORAGE_NET_PROTOCOL_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("internal inactive snapshots are not supported on " diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c index 405e655..aab287a 100644 --- a/src/qemu/qemu_parse_command.c +++ b/src/qemu/qemu_parse_command.c @@ -263,6 +263,17 @@ qemuParseNBDString(virDomainDiskDefPtr disk) return -1; } +static int +qemuParseVxHSString(virDomainDiskDefPtr def) +{ + virURIPtr uri = NULL; + + if (!(uri = virURIParse(def->src->path))) + return -1; + + return qemuParseDriveURIString(def, uri, "vxhs"); +} + /* * This method takes a string representing a QEMU command line ARGV set @@ -737,6 +748,12 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt, if (VIR_STRDUP(def->src->path, vdi) < 0) goto error; } + } else if (STRPREFIX(def->src->path, "vxhs:")) { + def->src->type = VIR_STORAGE_TYPE_NETWORK; + def->src->protocol = VIR_STORAGE_NET_PROTOCOL_VXHS; + + if (qemuParseVxHSString(def) < 0) + goto error; } else { def->src->type = VIR_STORAGE_TYPE_FILE; } @@ -1947,6 +1964,10 @@ qemuParseCommandLine(virCapsPtr caps, disk->src->type = VIR_STORAGE_TYPE_NETWORK; disk->src->protocol = VIR_STORAGE_NET_PROTOCOL_SHEEPDOG; val += strlen("sheepdog:"); + } else if (STRPREFIX(val, "vxhs:")) { + disk->src->type = VIR_STORAGE_TYPE_NETWORK; + disk->src->protocol = VIR_STORAGE_NET_PROTOCOL_VXHS; + val += strlen("vxhs:"); } else { disk->src->type = VIR_STORAGE_TYPE_FILE; } @@ -2023,6 +2044,11 @@ qemuParseCommandLine(virCapsPtr caps, goto error; break; + case VIR_STORAGE_NET_PROTOCOL_VXHS: + if (qemuParseVxHSString(disk) < 0) + goto error; + + break; case VIR_STORAGE_NET_PROTOCOL_HTTP: case VIR_STORAGE_NET_PROTOCOL_HTTPS: case VIR_STORAGE_NET_PROTOCOL_FTP: diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index ce6d213..e62f4e6 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -85,7 +85,8 @@ VIR_ENUM_IMPL(virStorageNetProtocol, VIR_STORAGE_NET_PROTOCOL_LAST, "ftp", "ftps", "tftp", - "ssh") + "ssh", + "vxhs") VIR_ENUM_IMPL(virStorageNetHostTransport, VIR_STORAGE_NET_HOST_TRANS_LAST, "tcp", @@ -2633,6 +2634,7 @@ virStorageSourceParseBackingColon(virStorageSourcePtr src, case VIR_STORAGE_NET_PROTOCOL_ISCSI: case VIR_STORAGE_NET_PROTOCOL_GLUSTER: case VIR_STORAGE_NET_PROTOCOL_SSH: + case VIR_STORAGE_NET_PROTOCOL_VXHS: virReportError(VIR_ERR_INTERNAL_ERROR, _("malformed backing store path for protocol %s"), protocol); @@ -2964,6 +2966,64 @@ virStorageSourceParseBackingJSONRBD(virStorageSourcePtr src, } +static int +virStorageSourceParseBackingJSONVXHS(virStorageSourcePtr src, + virJSONValuePtr json, + int opaque ATTRIBUTE_UNUSED) +{ + virJSONValuePtr server; + const char *hostname, *port; + const char *uri = virJSONValueObjectGetString(json, "filename"); + const char *vdisk_id = virJSONValueObjectGetString(json, "vdisk-id"); + + src->type = VIR_STORAGE_TYPE_NETWORK; + src->protocol = VIR_STORAGE_NET_PROTOCOL_VXHS; + + /* legacy URI based syntax passed via 'filename' option */ + if (uri) + return virStorageSourceParseBackingJSONUriStr(src, uri, + VIR_STORAGE_NET_PROTOCOL_VXHS); + + server = virJSONValueObjectGetObject(json, "server"); + hostname = virJSONValueObjectGetString(server, "host"); + port = virJSONValueObjectGetString(server, "port"); + + if (!vdisk_id) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("missing 'vdisk-id' attribute in " + "JSON backing definition for VxHS volume")); + return -1; + } + if (!server) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("missing 'server' attribute in " + "JSON backing definition for VxHS volume")); + return -1; + } + if (!hostname) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("missing hostname for tcp backing server in " + "JSON backing definition for VxHS volume")); + return -1; + } + + + if (VIR_STRDUP(src->path, vdisk_id) < 0) + return -1; + + if (VIR_ALLOC_N(src->hosts, 1) < 0) + return -1; + src->nhosts = 1; + + src->hosts[0].transport = VIR_STORAGE_NET_HOST_TRANS_TCP; + + if (VIR_STRDUP(src->hosts[0].name, hostname) < 0 || + VIR_STRDUP(src->hosts[0].port, port) < 0) + return -1; + + return 0; +} + struct virStorageSourceJSONDriverParser { const char *drvname; int (*func)(virStorageSourcePtr src, virJSONValuePtr json, int opaque); @@ -2985,6 +3045,7 @@ static const struct virStorageSourceJSONDriverParser jsonParsers[] = { {"sheepdog", virStorageSourceParseBackingJSONSheepdog, 0}, {"ssh", virStorageSourceParseBackingJSONSSH, 0}, {"rbd", virStorageSourceParseBackingJSONRBD, 0}, + {"vxhs", virStorageSourceParseBackingJSONVXHS, 0}, }; diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index 1f62244..e60b6e9 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -134,6 +134,7 @@ typedef enum { VIR_STORAGE_NET_PROTOCOL_FTPS, VIR_STORAGE_NET_PROTOCOL_TFTP, VIR_STORAGE_NET_PROTOCOL_SSH, + VIR_STORAGE_NET_PROTOCOL_VXHS, VIR_STORAGE_NET_PROTOCOL_LAST } virStorageNetProtocol; diff --git a/src/xenconfig/xen_xl.c b/src/xenconfig/xen_xl.c index 18d9fe3..9fe24d6 100644 --- a/src/xenconfig/xen_xl.c +++ b/src/xenconfig/xen_xl.c @@ -942,6 +942,7 @@ xenFormatXLDiskSrcNet(virStorageSourcePtr src) case VIR_STORAGE_NET_PROTOCOL_GLUSTER: case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG: case VIR_STORAGE_NET_PROTOCOL_SSH: + case VIR_STORAGE_NET_PROTOCOL_VXHS: case VIR_STORAGE_NET_PROTOCOL_LAST: case VIR_STORAGE_NET_PROTOCOL_NONE: virReportError(VIR_ERR_NO_SUPPORT, diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs-multi-host.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs-multi-host.xml new file mode 100644 index 0000000..660bcde --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs-multi-host.xml @@ -0,0 +1,35 @@ +<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/libexec/qemu-kvm</emulator> + <disk type='network' device='disk'> + <driver name='qemu' type='raw' cache='none'/> + <source protocol='vxhs' name='eb90327c-8302-4725-9e1b-4e85ed4dc251'> + <host name='192.168.0.1' port='9999'/> + <host name='192.168.0.2' port='9999'/> + </source> + <backingStore/> + <target dev='vda' bus='virtio'/> + <serial>eb90327c-8302-4725-9e1b-4e85ed4dc251</serial> + <alias name='virtio-disk0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.args new file mode 100644 index 0000000..23045e1 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.args @@ -0,0 +1,25 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/libexec/qemu-kvm \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-cpu qemu32 \ +-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.driver=vxhs,file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc251,\ +file.server.host=192.168.0.1,file.server.port=9999,format=raw,if=none,\ +id=drive-virtio-disk0,cache=none \ +-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ +id=virtio-disk0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.xml new file mode 100644 index 0000000..45c807f --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.xml @@ -0,0 +1,34 @@ +<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/libexec/qemu-kvm</emulator> + <disk type='network' device='disk'> + <driver name='qemu' type='raw' cache='none'/> + <source protocol='vxhs' name='eb90327c-8302-4725-9e1b-4e85ed4dc251'> + <host name='192.168.0.1' port='9999'/> + </source> + <backingStore/> + <target dev='vda' bus='virtio'/> + <serial>eb90327c-8302-4725-9e1b-4e85ed4dc251</serial> + <alias name='virtio-disk0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index ab3ad08..f751ec9 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -892,6 +892,8 @@ mymain(void) # endif DO_TEST("disk-drive-network-rbd-ipv6", NONE); DO_TEST_FAILURE("disk-drive-network-rbd-no-colon", NONE); + DO_TEST("disk-drive-network-vxhs", NONE); + DO_TEST_FAILURE("disk-drive-network-vxhs-multi-host", NONE); DO_TEST("disk-drive-no-boot", QEMU_CAPS_BOOTINDEX); DO_TEST_PARSE_ERROR("disk-device-lun-type-invalid", diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index f766df1..a28fbd9 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -1492,6 +1492,22 @@ mymain(void) "<source protocol='rbd' name='testshare'>\n" " <host name='example.com'/>\n" "</source>\n"); + TEST_BACKING_PARSE("json:{\"file.driver\":\"vxhs\"," + "\"file.filename\":\"vxhs://192.168.0.1:9999/c6718f6b-0401-441d-a8c3-1f0064d75ee0\"" + "}", + "<source protocol='vxhs' name='c6718f6b-0401-441d-a8c3-1f0064d75ee0'>\n" + " <host name='192.168.0.1' port='9999'/>\n" + "</source>\n"); + TEST_BACKING_PARSE("json:{\"file\":{\"driver\":\"vxhs\"," + "\"vdisk-id\":\"c6718f6b-0401-441d-a8c3-1f0064d75ee0\"," + "\"server\": { \"host\":\"example.com\"," + "\"port\":\"1234\"" + "}" + "}" + "}", + "<source protocol='vxhs' name='c6718f6b-0401-441d-a8c3-1f0064d75ee0'>\n" + " <host name='example.com' port='1234'/>\n" + "</source>\n"); cleanup: /* Final cleanup */ -- 2.5.5

4 6

[libvirt] [PATCH] qemu: add host per cpu info to all domain stats
by Nikolay Shirokovskiy 01 Feb '17

01 Feb '17

Info provided in virDomainGetCPUStats is now missed in all domain stats. This patch removes this discrepancy. Output example: cpu.count=2 cpu.0.time=536163399467 cpu.1.time=453846564946 cpu.0.vtime=530053197220 cpu.1.vtime=446078894510 --- src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++- src/util/vircgroup.c | 2 +- src/util/vircgroup.h | 5 ++++ 4 files changed, 77 insertions(+), 2 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index a2866a3..40f284c 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1343,6 +1343,7 @@ virCgroupGetMemoryUsage; virCgroupGetMemSwapHardLimit; virCgroupGetMemSwapUsage; virCgroupGetPercpuStats; +virCgroupGetPercpuVcpuSum; virCgroupHasController; virCgroupHasEmptyTasks; virCgroupKill; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 16b435a..61ae60e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18768,7 +18768,16 @@ qemuDomainGetStatsCpu(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, unsigned long long cpu_time = 0; unsigned long long user_time = 0; unsigned long long sys_time = 0; + unsigned long long *sum_cpu_time = NULL; + virBitmapPtr cpumap = NULL; + virBitmapPtr guestvcpus = NULL; + char *buf = NULL; + char *pos; + char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; + int ncpu; int err = 0; + int ret = -1; + size_t i; if (!priv->cgroup) return 0; @@ -18795,7 +18804,67 @@ qemuDomainGetStatsCpu(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, sys_time) < 0) return -1; - return 0; + if ((cpumap = virHostCPUGetPresentBitmap())) { + ncpu = virBitmapSize(cpumap); + + if (virTypedParamsAddULLong(&record->params, + &record->nparams, + maxparams, + "cpu.count", + ncpu) < 0) + goto cleanup; + + if (!virCgroupGetCpuacctPercpuUsage(priv->cgroup, &buf)) { + pos = buf; + for (i = 0; i < ncpu; i++) { + unsigned long long time = 0; + + if (virBitmapIsBitSet(cpumap, i) && + virStrToLong_ull(pos, &pos, 10, &time) < 0) { + VIR_WARN("cpuacct parse error"); + continue; + } + + snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, + "cpu.%zu.time", i); + if (virTypedParamsAddULLong(&record->params, + &record->nparams, + maxparams, + param_name, + time) < 0) + goto cleanup; + } + } + + if (qemuDomainHasVcpuPids(dom) && + (guestvcpus = virDomainDefGetOnlineVcpumap(dom->def)) && + !VIR_ALLOC_N(sum_cpu_time, ncpu) && + !virCgroupGetPercpuVcpuSum(priv->cgroup, guestvcpus, + sum_cpu_time, ncpu, cpumap)) { + for (i = 0; i < ncpu; i++) { + snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, + "cpu.%zu.vtime", i); + if (virTypedParamsAddULLong(&record->params, + &record->nparams, + maxparams, + param_name, + sum_cpu_time[i]) < 0) + goto cleanup; + } + } + } + + ret = 0; + + cleanup: + if (!ret && virGetLastError()) + virResetLastError(); + virBitmapFree(cpumap); + virBitmapFree(guestvcpus); + VIR_FREE(sum_cpu_time); + VIR_FREE(buf); + + return ret; } static int diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 5aa1db5..0b36609 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -3122,7 +3122,7 @@ virCgroupDenyDevicePath(virCgroupPtr group, * s2 = t02 + t12 * s3 = t03 + t13 */ -static int +int virCgroupGetPercpuVcpuSum(virCgroupPtr group, virBitmapPtr guestvcpus, unsigned long long *sum_cpu_time, diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h index 2de1bf2..5f71618 100644 --- a/src/util/vircgroup.h +++ b/src/util/vircgroup.h @@ -297,4 +297,9 @@ int virCgroupSetOwner(virCgroupPtr cgroup, int virCgroupHasEmptyTasks(virCgroupPtr cgroup, int controller); bool virCgroupControllerAvailable(int controller); +int virCgroupGetPercpuVcpuSum(virCgroupPtr group, + virBitmapPtr guestvcpus, + unsigned long long *sum_cpu_time, + size_t nsum, + virBitmapPtr cpumap); #endif /* __VIR_CGROUP_H__ */ -- 1.8.3.1

2 2

[libvirt] [PATCH] qemu: Fix indentation in qemu_interface.h
by Nitesh Konkar 01 Feb '17

01 Feb '17

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/qemu/qemu_interface.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_interface.h b/src/qemu/qemu_interface.h index 66ead2a..a7faa0b 100644 --- a/src/qemu/qemu_interface.h +++ b/src/qemu/qemu_interface.h @@ -35,16 +35,17 @@ int qemuInterfaceStopDevice(virDomainNetDefPtr net); int qemuInterfaceStopDevices(virDomainDefPtr def); int qemuInterfaceDirectConnect(virDomainDefPtr def, - virQEMUDriverPtr driver, - virDomainNetDefPtr net, - int *tapfd, - size_t tapfdSize, - virNetDevVPortProfileOp vmop); -int qemuInterfaceEthernetConnect(virDomainDefPtr def, virQEMUDriverPtr driver, virDomainNetDefPtr net, int *tapfd, - size_t tapfdSize); + size_t tapfdSize, + virNetDevVPortProfileOp vmop); + +int qemuInterfaceEthernetConnect(virDomainDefPtr def, + virQEMUDriverPtr driver, + virDomainNetDefPtr net, + int *tapfd, + size_t tapfdSize); int qemuInterfaceBridgeConnect(virDomainDefPtr def, virQEMUDriverPtr driver, -- 2.1.0

2 1

[libvirt] char: Logging serial pty output when disconnected
by Ed Swierk 31 Jan '17

31 Jan '17

Interactive access to a guest serial console can be enabled by hooking the serial device to a pty backend, e.g. -device isa-serial,chardev=cs0 -chardev pty,id=cs0. With libvirt this can be configured via <console type='pty'><target type='serial' port='0'/></console>. Output from the same serial device can also be logged to a file by adding logfile=/somefile to the -chardev option (<log file=/somefile/> in libvirt). Unfortunately output gets logged only when a client like virsh console is connected to the pty; otherwise qemu drops it on the floor. This makes chardev logging much less useful than it could be for debugging guest problems after the fact. Currently qemu_chr_fe_write() calls qemu_chr_fe_write_log() only for data consumed by the backend chr_write function. With the pty backend, pty_chr_write() returns 0 indicating that the data was not consumed when the pty is disconnected. Simply changing it to return len instead of 0 tricks the caller into logging the data even when the pty is disconnected. I don't know what problems this might cause, but one data point is that tcp_chr_write() already happens to work this way. Alternatively, qemu_chr_fe_write() could be modified to log everything passed to it, regardless of how much data chr_write claims to have consumed. The trouble is that the serial device retries writing unconsumed data, so when the pty is disconnected you'd see every character duplicated 4 times in the log file. Any opinions on either approach, or other suggestions? If there are no objections to the first one, I'll prepare a patch. --Ed

3 5

[libvirt] CfP 12th Virtualization in High-Performance Cloud Computing Workshop (VHPC '17)
by VHPC 17 31 Jan '17

31 Jan '17

==================================================================== CALL FOR PAPERS 12th Workshop on Virtualization in High-Performance Cloud Computing (VHPC '17) held in conjunction with the International Supercomputing Conference - High Performance, June 18-22, 2017, Frankfurt, Germany. (Springer LNCS Proceedings) ==================================================================== Date: June 22, 2017 Workshop URL: http://vhpc.org Abstract Submission Deadline: February 28, 2017 Paper Submission Deadline: April 25, 2017 (Springer LNCS) Abstract/Paper Submission Link: https://edas.info/newPaper.php?c=23179 Call for Papers Virtualization technologies constitute a key enabling factor for flexible resource management in modern data centers, and particularly in cloud environments. Cloud providers need to manage complex infrastructures in a seamless fashion to support the highly dynamic and heterogeneous workloads and hosted applications customers deploy. Similarly, HPC environments have been increasingly adopting techniques that enable flexible management of vast computing and networking resources, close to marginal provisioning cost, which is unprecedented in the history of scientific and commercial computing. Various virtualization technologies contribute to the overall picture in different ways: machine virtualization, with its capability to enable consolidation of multiple underutilized servers with heterogeneous software and operating systems (OSes), and its capability to live-migrate a fully operating virtual machine (VM) with a very short downtime, enables novel and dynamic ways to manage physical servers; OS-level virtualization (i.e., containerization), with its capability to isolate multiple user-space environments and to allow for their coexistence within the same OS kernel, promises to provide many of the advantages of machine virtualization with high levels of responsiveness and performance; I/O Virtualization allows physical NICs/HBAs to take traffic from multiple VMs or containers; network virtualization, with its capability to create logical network overlays that are independent of the underlying physical topology and IP addressing, provides the fundamental ground on top of which evolved network services can be realized with an unprecedented level of dynamicity and flexibility; the increasingly adopted paradigm of Software-Defined Networking (SDN) promises to extend this flexibility to the control and data planes of network paths. Publication Accepted papers will be published in a Springer LNCS proceedings volume. Topics of Interest The VHPC program committee solicits original, high-quality submissions related to virtualization across the entire software stack with a special focus on the intersection of HPC and the cloud. Major Topics - Virtualization in supercomputing environments, HPC clusters, HPC in the cloud and grids - OS-level virtualization and containers (Docker, rkt, Singularity, Shifter, i.a.) - Lightweight/specialized operating systems, unikernels - Optimizations of virtual machine monitor platforms and hypervisors - Hypervisor support for heterogenous resources (GPUs, co-processors, FPGAs, etc.) - Virtualization support for emerging memory technologies - Virtualization in enterprise HPC and microvisors - Software defined networks and network virtualization - Management, deployment of virtualized environments and orchestration (Kubernetes i.a.), - Workflow-pipeline container-based composability - Performance measurement, modelling and monitoring of virtualized/cloud workloads - Virtualization in data intensive computing and Big Data processing - HPC convergence - Adaptation of HPC technologies in the cloud (high performance networks, RDMA, etc.) - ARM-based hypervisors, ARM virtualization extensions - I/O virtualization and cloud based storage systems - GPU, FPGA and many-core accelerator virtualization - Job scheduling/control/policy and container placement in virtualized environments - Cloud reliability, fault-tolerance and high-availability - QoS and SLA in virtualized environments - IaaS platforms, cloud frameworks and APIs - Large-scale virtualization in domains such as finance and government - Energy-efficient and power-aware virtualization - Container security - Configuration management tools for containers (including CFEngine, Puppet, i.a.) - Emerging topics including multi-kernel approaches and,NUMA in hypervisors The Workshop on Virtualization in High-Performance Cloud Computing (VHPC) aims to bring together researchers and industrial practitioners facing the challenges posed by virtualization in order to foster discussion, collaboration, mutual exchange of knowledge and experience, enabling research to ultimately provide novel solutions for virtualized computing systems of tomorrow. The workshop will be one day in length, composed of 20 min paper presentations, each followed by 10 min discussion sections, plus lightning talks that are limited to 5 minutes. Presentations may be accompanied by interactive demonstrations. Important Dates February 28, 2017 - Abstract Submission Deadline April 25, 2017 - Paper submission deadline May 30, 2017 - Acceptance notification June 22, 2017 - Workshop Day June 25, 2017 - Camera-ready version due Chair Michael Alexander (chair), scaledinfra technologies, Austria Anastassios Nanos (co-chair), NTUA, Greece Balazs Gerofi (co-chair), RIKEN Advanced Institute for Computational Science, Japan Program committee Stergios Anastasiadis, University of Ioannina, Greece Jakob Blomer, CERN, Europe Ron Brightwell, Sandia National Laboratories, USA Eduardo César, Universidad Autonoma de Barcelona, Spain Julian Chesterfield, OnApp, UK Stephen Crago, USC ISI, USA Christoffer Dall, Columbia University, USA Patrick Dreher, MIT, USA Robert Futrick, Cycle Computing, USA Maria Girone, CERN, Europe Kyle Hale, Northwestern University, USA Romeo Kinzler, IBM, Switzerland Brian Kocoloski, University of Pittsburgh, USA Nectarios Koziris, National Technical University of Athens, Greece John Lange, University of Pittsburgh, USA Che-Rung Lee, National Tsing Hua University, Taiwan Giuseppe Lettieri, University of Pisa, Italy Qing Liu, Oak Ridge National Laboratory, USA Nikos Parlavantzas, IRISA, France Kevin Pedretti, Sandia National Laboratories, USA Amer Qouneh, University of Florida, USA Carlos Reaño, Technical University of Valencia, Spain Thomas Ryd, CFEngine, Norway Josh Simons, VMWare, USA Borja Sotomayor, University of Chicago, USA Craig Stewart, Indiana University, USA Anata Tiwari, San Diego Supercomputer Center, USA Kurt Tutschku, Blekinge Institute of Technology, Sweden Yasuhiro Watashiba, Osaka University, Japan Nicholas Wright, Lawrence Berkeley National Laboratory, USA Chao-Tung Yang, Tunghai University, Taiwan Paper Submission-Publication Papers submitted to the workshop will be reviewed by at least two members of the program committee and external reviewers. Submissions should include abstract, key words, the e-mail address of the corresponding author, and must not exceed 10 pages, including tables and figures at a main font size no smaller than 11 point. Submission of a paper should be regarded as a commitment that, should the paper be accepted, at least one of the authors will register and attend the conference to present the work. Accepted papers will be published in a Springer LNCS volume. . The format must be according to the Springer LNCS Style. Initial submissions are in PDF; authors of accepted papers will be requested to provide source files. Format Guidelines: ftp://ftp.springer.de/pub/tex/latex/llncs/latex2e/llncs2e.zip Abstract, Paper Submission Link: https://edas.info/newPaper.php?c=23179 Lightning Talks Lightning Talks are non-paper track, synoptical in nature and are strictly limited to 5 minutes. They can be used to gain early feedback on ongoing research, for demonstrations, to present research results, early research ideas, perspectives and positions of interest to the community. Submit abstract via the main submission link. General Information The workshop is one day in length and will be held in conjunction with the International Supercomputing Conference - High Performance (ISC) 2017, June 18-22, Frankfurt, Germany.

1 0

[libvirt] [PATCH] util: Fix domain object leaks on closecallbacks
by John Ferlan 31 Jan '17

31 Jan '17

Originally/discovered proposed by "Wang King <king.wang(a)huawei.com>" When the virCloseCallbacksSet is first called, it increments the refcnt on the domain object to ensure it doesn't get deleted before the callback is called. The refcnt would be decremented in virCloseCallbacksUnset once the entry is removed from the closeCallbacks has table. When (mostly) normal shutdown occurs, the qemuProcessStop will end up calling qemuProcessAutoDestroyRemove and will remove the callback from the list and hash table normally and decrement the refcnt. However, when qemuConnectClose calls virCloseCallbacksRun, it will scan the (locked) closeCallbacks list for matching domain and callback function. If an entry is found, it will be removed from the closeCallbacks list and placed into a lookaside list to be processed when the closeCallbacks lock is dropped. The callback function (e.g. qemuProcessAutoDestroy) is called and will run qemuProcessStop. That code will fail to find the callback in the list when qemuProcessAutoDestroyRemove is called and thus not decrement the domain refcnt. Instead since the entry isn't found the code will just return (mostly) harmlessly. This patch will resolve the issue by taking another ref during the search UUID process during virCloseCallackRun, decrementing the refcnt taken by virCloseCallbacksSet, calling the callback routine and returning overwriting the vm (since it could return NULL). Finally, it will call the virDomainObjEndAPI to lower the refcnt and remove the lock taken during the search UUID processing. This may cause the vm to be destroyed. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/util/virclosecallbacks.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/util/virclosecallbacks.c b/src/util/virclosecallbacks.c index 2f430cf..4db50e8 100644 --- a/src/util/virclosecallbacks.c +++ b/src/util/virclosecallbacks.c @@ -346,17 +346,24 @@ virCloseCallbacksRun(virCloseCallbacksPtr closeCallbacks, for (i = 0; i < list->nentries; i++) { virDomainObjPtr vm; - if (!(vm = virDomainObjListFindByUUID(domains, - list->entries[i].uuid))) { + /* Grab a ref and lock to the vm */ + if (!(vm = virDomainObjListFindByUUIDRef(domains, + list->entries[i].uuid))) { char uuidstr[VIR_UUID_STRING_BUFLEN]; virUUIDFormat(list->entries[i].uuid, uuidstr); VIR_DEBUG("No domain object with UUID %s", uuidstr); continue; } - vm = list->entries[i].callback(vm, conn, opaque); - if (vm) - virObjectUnlock(vm); + /* Remove the ref taken out during virCloseCallbacksSet since + * we're about to call the callback function and we have another + * ref anyway (so it cannot be deleted). + * + * Call the callback function, ignoring the return since it might be + * NULL. Once we're done with the object, then end the API usage. */ + virObjectUnref(vm); + ignore_value(list->entries[i].callback(vm, conn, opaque)); + virDomainObjEndAPI(&vm); } VIR_FREE(list->entries); VIR_FREE(list); -- 2.7.4

2 1

[libvirt] [PATCH 0/2] qemu: Don't lose group_name
by Martin Kletzander 31 Jan '17

31 Jan '17

Don't lose group_name: the movie. I mean, the series. Martin Kletzander (2): conf: Add virDomainDiskSetBlockIOTune qemu: Don't lose group_name src/conf/domain_conf.c | 27 +++++++++++++++++++++++++++ src/conf/domain_conf.h | 4 ++++ src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 31 +++++++++++++++++++------------ 4 files changed, 51 insertions(+), 12 deletions(-) -- 2.11.0

2 3

[libvirt] [PATCH 0/5] Yet another qemu namespace fixes
by Michal Privoznik 31 Jan '17

31 Jan '17

*** BLURB HERE *** Michal Privoznik (5): lxc: Move lxcContainerAvailable to virprocess lxc_container: Drop userns_supported util: Introduce virFileMoveMount qemu: Use namespaces iff available on the host kernel qemuDomainCreateDevice: Canonicalize paths src/libvirt_private.syms | 2 ++ src/lxc/lxc_container.c | 54 ++--------------------------- src/lxc/lxc_container.h | 2 -- src/lxc/lxc_driver.c | 7 ++-- src/qemu/qemu_conf.c | 6 +++- src/qemu/qemu_domain.c | 90 ++++++++++++++++++------------------------------ src/util/virfile.c | 28 +++++++++++++++ src/util/virfile.h | 3 ++ src/util/virprocess.c | 72 ++++++++++++++++++++++++++++++++++++++ src/util/virprocess.h | 10 ++++++ 10 files changed, 162 insertions(+), 112 deletions(-) -- 2.11.0

4 19

[libvirt] [PATCH] qemu: Fix indentation in qemu_domain.h for RNG Namespaces
by Martin Kletzander 31 Jan '17

31 Jan '17

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed as trivial src/qemu/qemu_domain.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 041149167c08..39731826e0f5 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -833,10 +833,10 @@ int qemuDomainNamespaceTeardownChardev(virQEMUDriverPtr driver, virDomainChrDefPtr chr); int qemuDomainNamespaceSetupRNG(virQEMUDriverPtr driver, - virDomainObjPtr vm, - virDomainRNGDefPtr rng); + virDomainObjPtr vm, + virDomainRNGDefPtr rng); int qemuDomainNamespaceTeardownRNG(virQEMUDriverPtr driver, - virDomainObjPtr vm, - virDomainRNGDefPtr rng); + virDomainObjPtr vm, + virDomainRNGDefPtr rng); #endif /* __QEMU_DOMAIN_H__ */ -- 2.11.0

1 0

[libvirt] [PATCH] util: fix off-by-one when expanding a bitmap
by Ján Tomko 31 Jan '17

31 Jan '17

To make sure bit 'b' fits into the bitmap, we need to allocate b+1 bits, since we number from 0. Adjust the bitmap test to use a multiple of 8 to catch this invalid write. --- src/util/virbitmap.c | 2 +- tests/virbitmaptest.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c index 0c04f1a..1b47d74 100644 --- a/src/util/virbitmap.c +++ b/src/util/virbitmap.c @@ -187,7 +187,7 @@ int virBitmapSetBit(virBitmapPtr bitmap, size_t b) */ static int virBitmapExpand(virBitmapPtr map, size_t b) { - size_t new_len = VIR_DIV_UP(b, VIR_BITMAP_BITS_PER_UNIT); + size_t new_len = VIR_DIV_UP(b + 1, VIR_BITMAP_BITS_PER_UNIT); /* resize the memory if necessary */ if (map->map_len < new_len) { diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c index a17ef82..c2a06df 100644 --- a/tests/virbitmaptest.c +++ b/tests/virbitmaptest.c @@ -639,15 +639,15 @@ test12(const void *opaque ATTRIBUTE_UNUSED) TEST_MAP(0, ""); - if (virBitmapSetBitExpand(map, 100) < 0) + if (virBitmapSetBitExpand(map, 120) < 0) goto cleanup; - TEST_MAP(101, "100"); + TEST_MAP(121, "120"); if (virBitmapClearBitExpand(map, 150) < 0) goto cleanup; - TEST_MAP(151, "100"); + TEST_MAP(151, "120"); virBitmapFree(map); if (virBitmapParseUnlimited("34,1023", &map) < 0) -- 2.10.2

2 1

[libvirt] [PATCH] vz: change printing format specifier for network statistics
by Maxim Nestratov 31 Jan '17

31 Jan '17

This is necessary to be able to get statistics for venet0 or "host-routed" adapter, which has -1 index and thus, its statistics is shown as "net.nic4294967295". Signed-off-by: Maxim Nestratov <mnestratov(a)virtuozzo.com> --- src/vz/vz_sdk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index f63b9a3..d5688e1 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -4388,7 +4388,7 @@ prlsdkGetNetStats(PRL_HANDLE sdkstats, PRL_HANDLE sdkdom, const char *path, prlsdkCheckRetGoto(pret, cleanup); #define PRLSDK_GET_NET_COUNTER(VAL, NAME) \ - if (virAsprintf(&name, "net.nic%d.%s", net_index, NAME) < 0) \ + if (virAsprintf(&name, "net.nic%u.%s", net_index, NAME) < 0) \ goto cleanup; \ if (prlsdkExtractStatsParam(sdkstats, name, &stats->VAL) < 0) \ goto cleanup; \ -- 2.4.11

2 2

[libvirt] [PATCH 0/2] vz: support more API calls
by Nikolay Shirokovskiy 31 Jan '17

31 Jan '17

Nikolay Shirokovskiy (2): vz: support virDomainAbortJob vz: support virDomainReset src/vz/vz_driver.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/vz/vz_sdk.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ src/vz/vz_sdk.h | 2 ++ src/vz/vz_utils.c | 1 + src/vz/vz_utils.h | 2 ++ 5 files changed, 106 insertions(+) -- 1.8.3.1

2 3

[libvirt] [GSoC] FAQ page
by Michal Privoznik 31 Jan '17

31 Jan '17

I've put together some info for students: http://wiki.libvirt.org/page/Google_Summer_of_Code_FAQ If there's something missing, please feel free to edit the page. Michal

1 0

[libvirt] [PATCH] cpu: fix typo: rename __kvm_hv_spinlock to __kvm_hv_spinlocks
by Maxim Nestratov 31 Jan '17

31 Jan '17

Corresponding hv cpu feature name is 'spinlocks' thus, we should have similar name with __kvm_hv_ prefix. Otherwise we have misleading warning: "host doesn't support hyperv 'spinlocks' feature" even when it's supported. Signed-off-by: Maxim Nestratov <mnestratov(a)virtuozzo.com> --- src/cpu/cpu_x86_data.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cpu/cpu_x86_data.h b/src/cpu/cpu_x86_data.h index 4660ab6..4f3940b 100644 --- a/src/cpu/cpu_x86_data.h +++ b/src/cpu/cpu_x86_data.h @@ -53,7 +53,7 @@ struct _virCPUx86CPUID { # define VIR_CPU_x86_KVM_HV_SYNIC "__kvm_hv_synic" # define VIR_CPU_x86_KVM_HV_STIMER "__kvm_hv_stimer" # define VIR_CPU_x86_KVM_HV_RELAXED "__kvm_hv_relaxed" -# define VIR_CPU_x86_KVM_HV_SPINLOCK "__kvm_hv_spinlock" +# define VIR_CPU_x86_KVM_HV_SPINLOCK "__kvm_hv_spinlocks" # define VIR_CPU_x86_KVM_HV_VAPIC "__kvm_hv_vapic" # define VIR_CPU_x86_KVM_HV_VPINDEX "__kvm_hv_vpindex" # define VIR_CPU_x86_KVM_HV_RESET "__kvm_hv_reset" -- 2.4.11

2 2

[libvirt] [PATCHv4 0/3] Add support for file memorybacking
by Jaroslav Safka 31 Jan '17

31 Jan '17

Hi, we would like to introduce 3 new elements source,access and allocation in memoryBacking element. For now it was made for numa topology. <memoryBacking> <source type="file|anonymous"/> <access mode="shared|private"/> <allocation mode="immediate|ondemand"/> </memoryBacking> If allocation is immediate then -mem-prealloc should be added to the qemu commanline. If source is file then -object memory-backend-file,id=mem,size=1024M,mem-path=*lib dir path* -numa node,memdev=mem Will be added to the qemu commandline If access is shared then the "share=on" parameter will be added to the memory-backend-file e.g. -object memory-backend-file,id=mem,size=1024M,mem-path=/var/lib/libvirt/qemu,share=on The access mode can be overriden by specifying token memAccess in numa cell. The test cpu-numa-memshared was removed, because behaviour was changed and is not needed anymore Jaroslav Safka (3): qemu,conf: Rename virNumaMemAccess to virDomainMemoryAccess conf: Add new xml elements for file memorybacking support qemu: Add args generation for file memory backing docs/formatdomain.html.in | 9 ++ docs/schemas/domaincommon.rng | 30 +++++ src/conf/domain_conf.c | 133 ++++++++++++++++----- src/conf/domain_conf.h | 22 ++++ src/conf/numa_conf.c | 15 +-- src/conf/numa_conf.h | 14 +-- src/qemu/qemu_command.c | 123 ++++++++++++------- src/qemu/qemu_process.c | 2 +- .../qemuxml2argv-fd-memory-no-numa-topology.args | 21 ++++ .../qemuxml2argv-fd-memory-no-numa-topology.xml | 27 +++++ .../qemuxml2argv-fd-memory-numa-topology.args | 24 ++++ .../qemuxml2argv-fd-memory-numa-topology.xml | 30 +++++ .../qemuxml2argv-fd-memory-numa-topology2.args | 26 ++++ .../qemuxml2argv-fd-memory-numa-topology2.xml | 31 +++++ .../qemuxml2argv-fd-memory-numa-topology3.args | 30 +++++ .../qemuxml2argv-fd-memory-numa-topology3.xml | 32 +++++ .../qemuxml2argv-memorybacking-set.xml | 24 ++++ .../qemuxml2argv-memorybacking-unset.xml | 24 ++++ tests/qemuxml2argvtest.c | 12 +- .../qemuxml2xmlout-memorybacking-set.xml | 32 +++++ .../qemuxml2xmlout-memorybacking-unset.xml | 32 +++++ tests/qemuxml2xmltest.c | 4 +- 22 files changed, 605 insertions(+), 92 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-fd-memory-no-numa-topology.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-fd-memory-no-numa-topology.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology2.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology2.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology3.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology3.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memorybacking-set.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memorybacking-unset.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-memorybacking-set.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-memorybacking-unset.xml -- 2.7.4 -------------------------------------------------------------- Intel Research and Development Ireland Limited Registered in Ireland Registered Office: Collinstown Industrial Park, Leixlip, County Kildare Registered Number: 308263 This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.

5 23

[libvirt] [PATCH 0/2] qemu: auto-add all necessary hubs
by Ján Tomko 31 Jan '17

31 Jan '17

not just one. https://bugzilla.redhat.com/show_bug.cgi?id=1410188 Ján Tomko (2): conf: move VIR_DOMAIN_USB_HUB_PORTS to the header file qemu: Add enough USB hubs to accomodate all devices src/conf/domain_addr.c | 2 -- src/conf/domain_addr.h | 2 ++ src/qemu/qemu_domain_address.c | 15 +++++--- .../qemuxml2argv-usb-hub-autoadd-deluxe.args | 42 ++++++++++++++++++++++ .../qemuxml2argv-usb-hub-autoadd-deluxe.xml | 35 ++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ 6 files changed, 92 insertions(+), 7 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-hub-autoadd-deluxe.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-hub-autoadd-deluxe.xml -- 2.10.2

2 3

[libvirt] [PATCH v1 0/4] bhyve: rework SATA address allocation
by Roman Bogorodskiy 30 Jan '17

30 Jan '17

This series reworks SATA address allocation in the bhyve driver. While commit messages provide enough details (I hope), there are some general important notes: - currently, sata devices get PCI addresses and this no longer works, so right now bhyve driver fails on any SATA device - While this series fixes SATA devices' addresses (I hope *again*), old Domain XMLs with already generated PCI addresses will not work. Also, it will not work for XMLs where user manually specified PCI address for a disk, though it worked before. This is not good and I'm open for suggestions how to handle that. I'm thinking about writing a tiny Python script that will drop incorrect addresses from domain XMLs. Fabian Freyer (1): bhyve: detect 32 SATA devices per controller support Roman Bogorodskiy (3): bhyve: add virBhyveDriverCreateXMLConf bhyve: fix SATA address allocation bhyve: add tests for SATA address allocation po/POTFILES.in | 1 + src/bhyve/bhyve_capabilities.c | 59 ++++- src/bhyve/bhyve_capabilities.h | 3 +- src/bhyve/bhyve_command.c | 143 +++++++++--- src/bhyve/bhyve_device.c | 33 ++- src/bhyve/bhyve_domain.c | 69 +++++- src/bhyve/bhyve_domain.h | 2 + src/bhyve/bhyve_driver.c | 4 +- .../bhyvexml2argvdata/bhyvexml2argv-acpiapic.args | 4 +- ...bhyvexml2argv-addr-more-than-32-sata-disks.args | 21 ++ ...yvexml2argv-addr-more-than-32-sata-disks.ldargs | 3 + .../bhyvexml2argv-addr-more-than-32-sata-disks.xml | 196 ++++++++++++++++ .../bhyvexml2argv-addr-multiple-sata-disks.args | 9 + .../bhyvexml2argv-addr-multiple-sata-disks.ldargs | 3 + .../bhyvexml2argv-addr-multiple-sata-disks.xml | 31 +++ ...2argv-addr-no32devs-more-than-32-sata-disks.xml | 196 ++++++++++++++++ ...xml2argv-addr-no32devs-multiple-sata-disks.args | 11 + ...l2argv-addr-no32devs-multiple-sata-disks.ldargs | 3 + ...exml2argv-addr-no32devs-multiple-sata-disks.xml | 31 +++ ...yvexml2argv-addr-no32devs-single-sata-disk.args | 9 + ...exml2argv-addr-no32devs-single-sata-disk.ldargs | 3 + ...hyvexml2argv-addr-no32devs-single-sata-disk.xml | 21 ++ .../bhyvexml2argv-addr-single-sata-disk.args | 9 + .../bhyvexml2argv-addr-single-sata-disk.ldargs | 3 + .../bhyvexml2argv-addr-single-sata-disk.xml | 21 ++ tests/bhyvexml2argvdata/bhyvexml2argv-base.args | 4 +- .../bhyvexml2argv-bhyveload-bootorder.args | 5 +- .../bhyvexml2argv-bhyveload-bootorder1.args | 5 +- .../bhyvexml2argv-bhyveload-bootorder3.args | 5 +- .../bhyvexml2argv-bhyveload-explicitargs.args | 4 +- tests/bhyvexml2argvdata/bhyvexml2argv-console.args | 2 +- .../bhyvexml2argv-custom-loader.args | 4 +- .../bhyvexml2argv-disk-cdrom-grub.args | 4 +- .../bhyvexml2argv-disk-cdrom.args | 4 +- .../bhyvexml2argv-grub-bootorder.args | 6 +- .../bhyvexml2argv-grub-bootorder2.args | 6 +- .../bhyvexml2argv-grub-defaults.args | 4 +- .../bhyvexml2argvdata/bhyvexml2argv-localtime.args | 4 +- tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args | 4 +- .../bhyvexml2argv-serial-grub-nocons.args | 2 +- .../bhyvexml2argv-serial-grub.args | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-serial.args | 2 +- tests/bhyvexml2argvtest.c | 25 ++- .../bhyvexml2xmlout-acpiapic.xml | 5 +- ...hyvexml2xmlout-addr-more-than-32-sata-disks.xml | 246 +++++++++++++++++++++ .../bhyvexml2xmlout-addr-multiple-sata-disks.xml | 45 ++++ ...ml2xmlout-addr-no32devs-multiple-sata-disks.xml | 51 +++++ ...vexml2xmlout-addr-no32devs-single-sata-disk.xml | 33 +++ .../bhyvexml2xmlout-addr-single-sata-disk.xml | 33 +++ tests/bhyvexml2xmloutdata/bhyvexml2xmlout-base.xml | 5 +- .../bhyvexml2xmlout-bhyveload-bootorder.xml | 5 +- .../bhyvexml2xmlout-bhyveload-bootorder1.xml | 5 +- .../bhyvexml2xmlout-bhyveload-bootorder2.xml | 5 +- .../bhyvexml2xmlout-bhyveload-bootorder3.xml | 5 +- .../bhyvexml2xmlout-bhyveload-bootorder4.xml | 5 +- .../bhyvexml2xmlout-bhyveload-explicitargs.xml | 5 +- .../bhyvexml2xmlout-console.xml | 5 +- .../bhyvexml2xmlout-custom-loader.xml | 5 +- .../bhyvexml2xmlout-disk-cdrom-grub.xml | 5 +- .../bhyvexml2xmlout-disk-cdrom.xml | 5 +- .../bhyvexml2xmlout-disk-virtio.xml | 1 + .../bhyvexml2xmlout-grub-bootorder.xml | 5 +- .../bhyvexml2xmlout-grub-bootorder2.xml | 5 +- .../bhyvexml2xmlout-grub-defaults.xml | 5 +- .../bhyvexml2xmlout-localtime.xml | 5 +- .../bhyvexml2xmlout-macaddr.xml | 5 +- .../bhyvexml2xmlout-metadata.xml | 6 +- .../bhyvexml2xmlout-serial-grub-nocons.xml | 5 +- .../bhyvexml2xmlout-serial-grub.xml | 5 +- .../bhyvexml2xmloutdata/bhyvexml2xmlout-serial.xml | 5 +- tests/bhyvexml2xmltest.c | 42 +++- 71 files changed, 1398 insertions(+), 139 deletions(-) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-more-than-32-sata-disks.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-more-than-32-sata-disks.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-multiple-sata-disks.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-no32devs-multiple-sata-disks.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-no32devs-single-sata-disk.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-single-sata-disk.xml -- 2.11.0

4 15

[libvirt] [PATCH] vz: don't show bootorder for containers
by Nikolay Shirokovskiy 30 Jan '17

30 Jan '17

Because this is invalid xml for containers. This patch almost reverts 7eda8369, but still skips converting vz sdk bootorder for containers to libvirt bootorder because we use boot order in containers for quite different purpurse. --- I know I reviewed this code just recently. It is just got out of my sight. src/vz/vz_sdk.c | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index ced58e5..43a6340 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -1695,21 +1695,6 @@ prlsdkBootOrderCheck(PRL_HANDLE sdkdom, PRL_DEVICE_TYPE sdkType, int sdkIndex, return ret; } -static void -prlsdkConvertBootOrderCt(virDomainDefPtr def) -{ - size_t i; - for (i = 0; i < def->nfss; i++) { - - if (STREQ(def->fss[i]->dst, "/")) { - def->os.nBootDevs = 0; - return; - } - } - def->os.nBootDevs = 1; - def->os.bootDevs[0] = VIR_DOMAIN_BOOT_DISK; -} - static int prlsdkConvertBootOrderVm(PRL_HANDLE sdkdom, virDomainDefPtr def) { @@ -1870,12 +1855,8 @@ prlsdkLoadDomain(vzDriverPtr driver, goto error; /* depends on prlsdkAddDomainHardware */ - if (IS_CT(def)) { - prlsdkConvertBootOrderCt(def); - } else { - if (prlsdkConvertBootOrderVm(sdkdom, def) < 0) - goto error; - } + if (!IS_CT(def) && prlsdkConvertBootOrderVm(sdkdom, def) < 0) + goto error; pret = PrlVmCfg_GetEnvId(sdkdom, &envId); prlsdkCheckRetGoto(pret, error); -- 1.8.3.1

2 2

[libvirt] [PATCH 0/5] implement .connectGetAllDomainStats
by Nikolay Shirokovskiy 30 Jan '17

30 Jan '17

Nikolay Shirokovskiy (5): vz: provide block stats for all domain stats vz: add net group to all domain stats vz: add vcpu group to all domain stats vz: add balloon group to all domain stats vz: add state group to all domain stats src/vz/vz_driver.c | 366 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/vz/vz_sdk.c | 8 ++ 2 files changed, 374 insertions(+) -- 1.8.3.1

2 8

[libvirt] [PATCH] Add libvirt-go-xml and libvirt-console-proxy to downloads
by Daniel P. Berrange 30 Jan '17

30 Jan '17

Add recently created modules to the download page list. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- docs/downloads.html.in | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/docs/downloads.html.in b/docs/downloads.html.in index 25dc54d..99da7a6 100644 --- a/docs/downloads.html.in +++ b/docs/downloads.html.in @@ -198,6 +198,40 @@ <td></td> </tr> <tr> + <td>Go XML</td> + <td> + <a href="ftp://libvirt.org/libvirt/go/">ftp</a> + <a href="http://libvirt.org/sources/go/">http</a> + <a href="https://libvirt.org/sources/go/">https</a> + </td> + <td> + <a href="http://libvirt.org/git/?p=libvirt-go-xml.git;a=summary">libvirt</a> + </td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-go-xml">gitlab</a> + <a href="https://github.com/libvirt/libvirt-go-xml">github</a> + </td> + <td> + <a href="https://godoc.org/github.com/libvirt/libvirt-go-xml">api ref</a> + </td> + </tr> + <tr> + <td>Console Proxy</td> + <td> + <a href="ftp://libvirt.org/libvirt/consoleproxy/">ftp</a> + <a href="http://libvirt.org/sources/consoleproxy/">http</a> + <a href="https://libvirt.org/sources/consoleproxy/">https</a> + </td> + <td> + <a href="http://libvirt.org/git/?p=libvirt-console-proxy.git;a=summary">libvirt</a> + </td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-console-proxy">gitlab</a> + <a href="https://github.com/libvirt/libvirt-console-proxy">github</a> + </td> + <td></td> + </tr> + <tr> <td>CIM provider</td> <td> <a href="ftp://libvirt.org/libvirt/CIM/">ftp</a> -- 2.9.3

2 1

[libvirt] [PATCH] qemuBuildChrChardevStr: Don't leak @charAlias
by Michal Privoznik 30 Jan '17

30 Jan '17

==12618== 110 bytes in 10 blocks are definitely lost in loss record 269 of 295 ==12618== at 0x4C2AE5F: malloc (vg_replace_malloc.c:297) ==12618== by 0x1CFC6DD7: vasprintf (vasprintf.c:73) ==12618== by 0x1912B2FC: virVasprintfInternal (virstring.c:551) ==12618== by 0x1912B411: virAsprintfInternal (virstring.c:572) ==12618== by 0x50B1FF: qemuAliasChardevFromDevAlias (qemu_alias.c:638) ==12618== by 0x518CCE: qemuBuildChrChardevStr (qemu_command.c:4973) ==12618== by 0x522DA0: qemuBuildShmemBackendChrStr (qemu_command.c:8674) ==12618== by 0x523209: qemuBuildShmemCommandLine (qemu_command.c:8789) ==12618== by 0x526135: qemuBuildCommandLine (qemu_command.c:9843) ==12618== by 0x48B4BA: qemuProcessCreatePretendCmd (qemu_process.c:5897) ==12618== by 0x4378C9: testCompareXMLToArgv (qemuxml2argvtest.c:498) ==12618== by 0x44D5A6: virTestRun (testutils.c:180) Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_command.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6d6587235..1396661ca 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4969,9 +4969,10 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, virBuffer buf = VIR_BUFFER_INITIALIZER; bool telnet; char *charAlias = NULL; + char *ret = NULL; if (!(charAlias = qemuAliasChardevFromDevAlias(alias))) - goto error; + goto cleanup; switch (dev->type) { case VIR_DOMAIN_CHR_TYPE_NULL: @@ -4999,13 +5000,13 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, !virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_FILE_APPEND)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("append not supported in this QEMU binary")); - goto error; + goto cleanup; } if (qemuBuildChrChardevFileStr(virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_FILE_APPEND) ? logManager : NULL, cmd, def, &buf, "path", dev->data.file.path, "append", dev->data.file.append) < 0) - goto error; + goto cleanup; break; case VIR_DOMAIN_CHR_TYPE_PIPE: @@ -5062,17 +5063,17 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, if (chrSourcePriv && chrSourcePriv->secinfo && qemuBuildObjectSecretCommandLine(cmd, chrSourcePriv->secinfo) < 0) - goto error; + goto cleanup; if (qemuBuildTLSx509CommandLine(cmd, cfg->chardevTLSx509certdir, dev->data.tcp.listen, cfg->chardevTLSx509verify, !!cfg->chardevTLSx509secretUUID, charAlias, qemuCaps) < 0) - goto error; + goto cleanup; if (!(objalias = qemuAliasTLSObjFromChardevAlias(charAlias))) - goto error; + goto cleanup; virBufferAsprintf(&buf, ",tls-creds=%s", objalias); VIR_FREE(objalias); } @@ -5089,7 +5090,7 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEVMC)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("spicevmc not supported in this QEMU binary")); - goto error; + goto cleanup; } virBufferAsprintf(&buf, "spicevmc,id=%s,name=%s", charAlias, virDomainChrSpicevmcTypeToString(dev->data.spicevmc)); @@ -5099,7 +5100,7 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEPORT)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("spiceport not supported in this QEMU binary")); - goto error; + goto cleanup; } virBufferAsprintf(&buf, "spiceport,id=%s,name=%s", charAlias, dev->data.spiceport.channel); @@ -5109,30 +5110,29 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported chardev '%s'"), virDomainChrTypeToString(dev->type)); - goto error; + goto cleanup; } if (dev->logfile) { if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_LOGFILE)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("logfile not supported in this QEMU binary")); - goto error; + goto cleanup; } if (qemuBuildChrChardevFileStr(logManager, cmd, def, &buf, "logfile", dev->logfile, "logappend", dev->logappend) < 0) - goto error; + goto cleanup; } if (virBufferCheckError(&buf) < 0) - goto error; + goto cleanup; - return virBufferContentAndReset(&buf); - - error: + ret = virBufferContentAndReset(&buf); + cleanup: VIR_FREE(charAlias); virBufferFreeAndReset(&buf); - return NULL; + return ret; } -- 2.11.0

2 1

[libvirt] [PATCH] spec: Enable qemu driver for RHEL-7 on aarch64
by Jiri Denemark 30 Jan '17

30 Jan '17

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- libvirt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 7d8858d3f..e8c272bd7 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -36,7 +36,7 @@ %define with_qemu_tcg 0 %define qemu_kvm_arches x86_64 %if 0%{?rhel} >= 7 - %define qemu_kvm_arches x86_64 %{power64} + %define qemu_kvm_arches x86_64 %{power64} aarch64 %endif %endif -- 2.11.0

2 1

[libvirt] [PATCH 0/5] Various blkdeviotune fixes (but mostly group_name, well, almost exclusively)
by Martin Kletzander 29 Jan '17

29 Jan '17

So I wanted to fix the last thing in Bug 1344897 [1], just two error messages. But I couldn't test it out because recent addition of group_name broke setting blkdeviotune on new enough QEMU. Yes, that means 3.0.0 doesn't work with new enough QEMU. Or namespaces. Still not totally a brown-bag release though. Let's see if we can find more things like that =) [1] https://bugzilla.redhat.com/show_bug.cgi?id=1344897 Martin Kletzander (5): qemu: Only set group_name when actually requested qemu: Don't lose group_name virsh: Actually make blkdeviotune --group_name work virsh: Use consistent naming for blkdeviotune options qemu: Add better message for some invalid block I/O settings src/qemu/qemu_driver.c | 62 ++++++++++++++++++++++++++++++++++---------------- tools/virsh-domain.c | 11 ++++++--- tools/virsh.pod | 4 ++-- 3 files changed, 53 insertions(+), 24 deletions(-) -- 2.11.0

3 26

[libvirt] [PATCH] qemu: assign USB addresses on redirdev hotplug too
by Ján Tomko 27 Jan '17

27 Jan '17

https://bugzilla.redhat.com/show_bug.cgi?id=1375410 --- src/qemu/qemu_hotplug.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index a6de254..57ecc02 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1587,6 +1587,7 @@ int qemuDomainAttachRedirdevDevice(virConnectPtr conn, virJSONValuePtr secProps = NULL; char *tlsAlias = NULL; char *secAlias = NULL; + bool need_release = false; virErrorPtr orig_err; qemuDomainPrepareChardevSourceTLS(redirdev->source, cfg); @@ -1597,6 +1598,11 @@ int qemuDomainAttachRedirdevDevice(virConnectPtr conn, if (!(charAlias = qemuAliasChardevFromDevAlias(redirdev->info.alias))) goto cleanup; + if ((rc = virDomainUSBAddressEnsure(priv->usbaddrs, &redirdev->info)) < 0) + goto cleanup; + if (rc == 1) + need_release = true; + if (!(devstr = qemuBuildRedirdevDevStr(def, redirdev, priv->qemuCaps))) goto cleanup; @@ -1649,6 +1655,8 @@ int qemuDomainAttachRedirdevDevice(virConnectPtr conn, audit: virDomainAuditRedirdev(vm, redirdev, "attach", ret == 0); cleanup: + if (ret < 0 && need_release) + qemuDomainReleaseDeviceAddress(vm, &redirdev->info, NULL); VIR_FREE(tlsAlias); virJSONValueFree(tlsProps); VIR_FREE(secAlias); -- 2.10.2

2 1

[libvirt] [PATCH] [PATCH go] Add support for more perf events
by Nitesh Konkar 27 Jan '17

27 Jan '17

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- connect.go | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ domain.go | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ domain_compat.h | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 144 insertions(+) diff --git a/connect.go b/connect.go index a95cf18..425b3c7 100644 --- a/connect.go +++ b/connect.go @@ -2253,6 +2253,24 @@ type DomainStatsPerf struct { StalledCyclesBackend uint64 RefCpuCyclesSet bool RefCpuCycles uint64 + CpuClockSet bool + CpuClock uint64 + TaskClockSet bool + TaskClock uint64 + PageFaultsSet bool + PageFaults uint64 + ContextSwitchesSet bool + ContextSwitches uint64 + CpuMigrationsSet bool + CpuMigrations uint64 + PageFaultsMinSet bool + PageFaultsMin uint64 + PageFaultsMajSet bool + PageFaultsMaj uint64 + AlignmentFaultsSet bool + AlignmentFaults uint64 + EmulationFaultsSet bool + EmulationFaults uint64 } func getDomainStatsPerfFieldInfo(params *DomainStatsPerf) map[string]typedParamsFieldInfo { @@ -2309,6 +2327,42 @@ func getDomainStatsPerfFieldInfo(params *DomainStatsPerf) map[string]typedParams set: &params.RefCpuCyclesSet, ul: &params.RefCpuCycles, }, + "perf.cpu_clock": typedParamsFieldInfo{ + set: &params.CpuClockSet, + ul: &params.CpuClock, + }, + "perf.task_clock": typedParamsFieldInfo{ + set: &params.TaskClockSet, + ul: &params.TaskClock, + }, + "perf.page_faults": typedParamsFieldInfo{ + set: &params.PageFaultsSet, + ul: &params.PageFaults, + }, + "perf.context_switches": typedParamsFieldInfo{ + set: &params.ContextSwitchesSet, + ul: &params.ContextSwitches, + }, + "perf.cpu_migrations": typedParamsFieldInfo{ + set: &params.CpuMigrationsSet, + ul: &params.CpuMigrations, + }, + "perf.page_faults_min": typedParamsFieldInfo{ + set: &params.PageFaultsMinSet, + ul: &params.PageFaultsMin, + }, + "perf.page_faults_maj": typedParamsFieldInfo{ + set: &params.PageFaultsMajSet, + ul: &params.PageFaultsMaj, + }, + "perf.alignment_faults": typedParamsFieldInfo{ + set: &params.AlignmentFaultsSet, + ul: &params.AlignmentFaults, + }, + "perf.emulation_faults": typedParamsFieldInfo{ + set: &params.EmulationFaultsSet, + ul: &params.EmulationFaults, + }, } } diff --git a/domain.go b/domain.go index cf2d007..a31eeff 100644 --- a/domain.go +++ b/domain.go @@ -3187,6 +3187,24 @@ type DomainPerfEvents struct { StalledCyclesBackend bool RefCpuCyclesSet bool RefCpuCycles bool + CpuClockSet bool + CpuClock bool + TaskClockSet bool + TaskClock bool + PageFaultsSet bool + PageFaults bool + ContextSwitchesSet bool + ContextSwitches bool + CpuMigrationsSet bool + CpuMigrations bool + PageFaultsMinSet bool + PageFaultsMin bool + PageFaultsMajSet bool + PageFaultsMaj bool + AlignmentFaultsSet bool + AlignmentFaults bool + EmulationFaultsSet bool + EmulationFaults bool } /* Remember to also update DomainStatsPerf in connect.go when adding to the stuct above */ @@ -3245,6 +3263,42 @@ func getDomainPerfEventsFieldInfo(params *DomainPerfEvents) map[string]typedPara set: &params.RefCpuCyclesSet, b: &params.RefCpuCycles, }, + C.VIR_PERF_PARAM_CPU_CLOCK: typedParamsFieldInfo{ + set: &params.CpuClockSet, + b: &params.CpuClock, + }, + C.VIR_PERF_PARAM_TASK_CLOCK: typedParamsFieldInfo{ + set: &params.TaskClockSet, + b: &params.TaskClock, + }, + C.VIR_PERF_PARAM_PAGE_FAULTS: typedParamsFieldInfo{ + set: &params.PageFaultsSet, + b: &params.PageFaults, + }, + C.VIR_PERF_PARAM_CONTEXT_SWITCHES: typedParamsFieldInfo{ + set: &params.ContextSwitchesSet, + b: &params.ContextSwitches, + }, + C.VIR_PERF_PARAM_CPU_MIGRATIONS: typedParamsFieldInfo{ + set: &params.CpuMigrationsSet, + b: &params.CpuMigrations, + }, + C.VIR_PERF_PARAM_PAGE_FAULTS_MIN: typedParamsFieldInfo{ + set: &params.PageFaultsMinSet, + b: &params.PageFaultsMin, + }, + C.VIR_PERF_PARAM_PAGE_FAULTS_MAJ: typedParamsFieldInfo{ + set: &params.PageFaultsMajSet, + b: &params.PageFaultsMaj, + }, + C.VIR_PERF_PARAM_ALIGNMENT_FAULTS: typedParamsFieldInfo{ + set: &params.AlignmentFaultsSet, + b: &params.AlignmentFaults, + }, + C.VIR_PERF_PARAM_REF_EMULATION_FAULTS: typedParamsFieldInfo{ + set: &params.EmulationFaultsSet, + b: &params.EmulationFaults, + }, } } diff --git a/domain_compat.h b/domain_compat.h index 14072d0..55dd1ea 100644 --- a/domain_compat.h +++ b/domain_compat.h @@ -45,6 +45,42 @@ #define VIR_PERF_PARAM_REF_CPU_CYCLES "ref_cpu_cycles" #endif +#ifndef VIR_PERF_PARAM_CPU_CLOCK +#define VIR_PERF_PARAM_CPU_CLOCK "cpu_clock" +#endif + +#ifndef VIR_PERF_PARAM_TASK_CLOCK +#define VIR_PERF_PARAM_TASK_CLOCK "task_clock" +#endif + +#ifndef VIR_PERF_PARAM_PAGE_FAULTS +#define VIR_PERF_PARAM_PAGE_FAULTS "page_faults" +#endif + +#ifndef VIR_PERF_PARAM_CONTEXT_SWITCHES +#define VIR_PERF_PARAM_CONTEXT_SWITCHES "context_switches" +#endif + +#ifndef VIR_PERF_PARAM_CPU_MIGRATIONS +#define VIR_PERF_PARAM_CPU_MIGRATIONS "cpu_migrations" +#endif + +#ifndef VIR_PERF_PARAM_PAGE_FAULTS_MIN +#define VIR_PERF_PARAM_PAGE_FAULTS_MIN "page_faults_min" +#endif + +#ifndef VIR_PERF_PARAM_PAGE_FAULTS_MAJ +#define VIR_PERF_PARAM_PAGE_FAULTS_MAJ "page_faults_maj" +#endif + +#ifndef VIR_PERF_PARAM_ALIGNMENT_FAULTS +#define VIR_PERF_PARAM__ALIGNMENT_FAULTS "alignment_faults" +#endif + +#ifndef VIR_PERF_PARAM_EMULATION_FAULTS +#define VIR_PERF_PARAM_EMULATION_FAULTS "emulation_faults" +#endif + #ifndef VIR_DOMAIN_EVENT_ID_METADATA_CHANGE #define VIR_DOMAIN_EVENT_ID_METADATA_CHANGE 23 #endif -- 1.9.3

2 1

[libvirt] [PATCH] [PATCH perl] Add support for more perf events
by Nitesh Konkar 27 Jan '17

27 Jan '17

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- connect.go | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ domain.go | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ domain_compat.h | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 144 insertions(+) diff --git a/connect.go b/connect.go index a95cf18..425b3c7 100644 --- a/connect.go +++ b/connect.go @@ -2253,6 +2253,24 @@ type DomainStatsPerf struct { StalledCyclesBackend uint64 RefCpuCyclesSet bool RefCpuCycles uint64 + CpuClockSet bool + CpuClock uint64 + TaskClockSet bool + TaskClock uint64 + PageFaultsSet bool + PageFaults uint64 + ContextSwitchesSet bool + ContextSwitches uint64 + CpuMigrationsSet bool + CpuMigrations uint64 + PageFaultsMinSet bool + PageFaultsMin uint64 + PageFaultsMajSet bool + PageFaultsMaj uint64 + AlignmentFaultsSet bool + AlignmentFaults uint64 + EmulationFaultsSet bool + EmulationFaults uint64 } func getDomainStatsPerfFieldInfo(params *DomainStatsPerf) map[string]typedParamsFieldInfo { @@ -2309,6 +2327,42 @@ func getDomainStatsPerfFieldInfo(params *DomainStatsPerf) map[string]typedParams set: &params.RefCpuCyclesSet, ul: &params.RefCpuCycles, }, + "perf.cpu_clock": typedParamsFieldInfo{ + set: &params.CpuClockSet, + ul: &params.CpuClock, + }, + "perf.task_clock": typedParamsFieldInfo{ + set: &params.TaskClockSet, + ul: &params.TaskClock, + }, + "perf.page_faults": typedParamsFieldInfo{ + set: &params.PageFaultsSet, + ul: &params.PageFaults, + }, + "perf.context_switches": typedParamsFieldInfo{ + set: &params.ContextSwitchesSet, + ul: &params.ContextSwitches, + }, + "perf.cpu_migrations": typedParamsFieldInfo{ + set: &params.CpuMigrationsSet, + ul: &params.CpuMigrations, + }, + "perf.page_faults_min": typedParamsFieldInfo{ + set: &params.PageFaultsMinSet, + ul: &params.PageFaultsMin, + }, + "perf.page_faults_maj": typedParamsFieldInfo{ + set: &params.PageFaultsMajSet, + ul: &params.PageFaultsMaj, + }, + "perf.alignment_faults": typedParamsFieldInfo{ + set: &params.AlignmentFaultsSet, + ul: &params.AlignmentFaults, + }, + "perf.emulation_faults": typedParamsFieldInfo{ + set: &params.EmulationFaultsSet, + ul: &params.EmulationFaults, + }, } } diff --git a/domain.go b/domain.go index cf2d007..a31eeff 100644 --- a/domain.go +++ b/domain.go @@ -3187,6 +3187,24 @@ type DomainPerfEvents struct { StalledCyclesBackend bool RefCpuCyclesSet bool RefCpuCycles bool + CpuClockSet bool + CpuClock bool + TaskClockSet bool + TaskClock bool + PageFaultsSet bool + PageFaults bool + ContextSwitchesSet bool + ContextSwitches bool + CpuMigrationsSet bool + CpuMigrations bool + PageFaultsMinSet bool + PageFaultsMin bool + PageFaultsMajSet bool + PageFaultsMaj bool + AlignmentFaultsSet bool + AlignmentFaults bool + EmulationFaultsSet bool + EmulationFaults bool } /* Remember to also update DomainStatsPerf in connect.go when adding to the stuct above */ @@ -3245,6 +3263,42 @@ func getDomainPerfEventsFieldInfo(params *DomainPerfEvents) map[string]typedPara set: &params.RefCpuCyclesSet, b: &params.RefCpuCycles, }, + C.VIR_PERF_PARAM_CPU_CLOCK: typedParamsFieldInfo{ + set: &params.CpuClockSet, + b: &params.CpuClock, + }, + C.VIR_PERF_PARAM_TASK_CLOCK: typedParamsFieldInfo{ + set: &params.TaskClockSet, + b: &params.TaskClock, + }, + C.VIR_PERF_PARAM_PAGE_FAULTS: typedParamsFieldInfo{ + set: &params.PageFaultsSet, + b: &params.PageFaults, + }, + C.VIR_PERF_PARAM_CONTEXT_SWITCHES: typedParamsFieldInfo{ + set: &params.ContextSwitchesSet, + b: &params.ContextSwitches, + }, + C.VIR_PERF_PARAM_CPU_MIGRATIONS: typedParamsFieldInfo{ + set: &params.CpuMigrationsSet, + b: &params.CpuMigrations, + }, + C.VIR_PERF_PARAM_PAGE_FAULTS_MIN: typedParamsFieldInfo{ + set: &params.PageFaultsMinSet, + b: &params.PageFaultsMin, + }, + C.VIR_PERF_PARAM_PAGE_FAULTS_MAJ: typedParamsFieldInfo{ + set: &params.PageFaultsMajSet, + b: &params.PageFaultsMaj, + }, + C.VIR_PERF_PARAM_ALIGNMENT_FAULTS: typedParamsFieldInfo{ + set: &params.AlignmentFaultsSet, + b: &params.AlignmentFaults, + }, + C.VIR_PERF_PARAM_REF_EMULATION_FAULTS: typedParamsFieldInfo{ + set: &params.EmulationFaultsSet, + b: &params.EmulationFaults, + }, } } diff --git a/domain_compat.h b/domain_compat.h index 14072d0..55dd1ea 100644 --- a/domain_compat.h +++ b/domain_compat.h @@ -45,6 +45,42 @@ #define VIR_PERF_PARAM_REF_CPU_CYCLES "ref_cpu_cycles" #endif +#ifndef VIR_PERF_PARAM_CPU_CLOCK +#define VIR_PERF_PARAM_CPU_CLOCK "cpu_clock" +#endif + +#ifndef VIR_PERF_PARAM_TASK_CLOCK +#define VIR_PERF_PARAM_TASK_CLOCK "task_clock" +#endif + +#ifndef VIR_PERF_PARAM_PAGE_FAULTS +#define VIR_PERF_PARAM_PAGE_FAULTS "page_faults" +#endif + +#ifndef VIR_PERF_PARAM_CONTEXT_SWITCHES +#define VIR_PERF_PARAM_CONTEXT_SWITCHES "context_switches" +#endif + +#ifndef VIR_PERF_PARAM_CPU_MIGRATIONS +#define VIR_PERF_PARAM_CPU_MIGRATIONS "cpu_migrations" +#endif + +#ifndef VIR_PERF_PARAM_PAGE_FAULTS_MIN +#define VIR_PERF_PARAM_PAGE_FAULTS_MIN "page_faults_min" +#endif + +#ifndef VIR_PERF_PARAM_PAGE_FAULTS_MAJ +#define VIR_PERF_PARAM_PAGE_FAULTS_MAJ "page_faults_maj" +#endif + +#ifndef VIR_PERF_PARAM_ALIGNMENT_FAULTS +#define VIR_PERF_PARAM__ALIGNMENT_FAULTS "alignment_faults" +#endif + +#ifndef VIR_PERF_PARAM_EMULATION_FAULTS +#define VIR_PERF_PARAM_EMULATION_FAULTS "emulation_faults" +#endif + #ifndef VIR_DOMAIN_EVENT_ID_METADATA_CHANGE #define VIR_DOMAIN_EVENT_ID_METADATA_CHANGE 23 #endif -- 1.9.3

1 1

[libvirt] [PATCH 0/2] vstorage: fix configure script and tests
by Peter Krempa 27 Jan '17

27 Jan '17

Apparently this was not tested prior to being pushed. Fix a configure problem and the test output file. Pushed under the trivial (1/2) and build-breaker (2/2) rules. Peter Krempa (2): configure: Fix copy-paste error in vstorage backend check tests: storage: Fix storage xml2xml test for vstorage pool m4/virt-storage-vstorage.m4 | 2 +- tests/storagepoolxml2xmlout/pool-vstorage.xml | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) -- 2.11.0

2 4

[libvirt] [PATCH v2 0/5] storage: Virtuozzo storage backend for storage pool
by Olga Krishtal 27 Jan '17

27 Jan '17

This series of patches support pool and volume management within Virtuozzo Storage. Virtuozzo Storage is a highly-available distributed software defined storage with built-in replication and disaster recovery. More information about vzstorage can be found here: https://openvz.org/Virtuozzo_Storage >From client's point of view it looks like network attached storage (NFS or GlusterFS). It supports the same volume formats as directory, nfs. Default format ifor volume is raw. Because of such similarities all a lot of functions from storage backend fs can be used with no change: all functions that deals with volumes and pool refresh function. >From the other hand, Virtuozzo storage demands special packages like vstorage-client to be installed. So all functions that work with it are in separate file. v2: - resplitted patches - all functions to work with Virtuozzo storage are in separate file - added possibility to mout cluster for pool for ures/with specific perms. - added documetation Olga Krishtal (5): storage: adds with_storage_vstorage buils option storage: vstorage empty backend storage: vstorage pool operations storage: added vstorage pool backend volume functions storage: vstorage pool documentation and simple test configure.ac | 5 + docs/formatstorage.html.in | 7 +- docs/schemas/storagepool.rng | 21 + docs/storage.html.in | 28 +- include/libvirt/libvirt-storage.h | 1 + m4/virt-storage-vstorage.m4 | 73 +++ po/POTFILES.in | 1 + src/Makefile.am | 9 + src/conf/storage_conf.c | 17 +- src/conf/storage_conf.h | 1 + src/storage/storage_backend.c | 6 + src/storage/storage_backend_vstorage.c | 888 ++++++++++++++++++++++++++ src/storage/storage_backend_vstorage.h | 27 + src/storage/storage_driver.c | 2 + tests/storagepoolxml2xmlin/pool-vstorage.xml | 10 + tests/storagepoolxml2xmlout/pool-vstorage.xml | 18 + tests/storagepoolxml2xmltest.c | 3 + tools/virsh-pool.c | 3 + tools/virsh.c | 3 + 19 files changed, 1118 insertions(+), 5 deletions(-) create mode 100644 m4/virt-storage-vstorage.m4 create mode 100644 src/storage/storage_backend_vstorage.c create mode 100644 src/storage/storage_backend_vstorage.h create mode 100644 tests/storagepoolxml2xmlin/pool-vstorage.xml create mode 100644 tests/storagepoolxml2xmlout/pool-vstorage.xml -- 1.8.3.1

3 22

[libvirt] [PATCH python 0/7] Remove unused code from generator
by Daniel P. Berrange 27 Jan '17

27 Jan '17

All this functionality is inherited from libxml, but is not required to generate libvirt python bindings. Daniel P. Berrange (7): Removed unused 'reference_keepers' code from generator Removed unused 'function_post' code from generator Removed unused 'foreign_encoding_args' code from generator Removed unused 'py_return_types' code from generator Removed unused 'classes_ancestor' code from generator Removed unused 'converter_type' code from generator Removed unused 'functions_list_exception_test' code from generator generator.py | 170 +++++++++++------------------------------------------------ 1 file changed, 30 insertions(+), 140 deletions(-) -- 2.9.3

2 9

[libvirt] [PATCH] domain_conf: vnc: preserve autoport value if no port was specified
by Pavel Hrdina 27 Jan '17

27 Jan '17

The issue is that if this graphics definition is provided: <graphics type='vnc' port='0'/> it's parsed as: <graphics type='vnc' autoport='no'> <listen type='address'/> </graphics> but if the resulting XML is parsed again the output is: <graphics type='vnc' port='-1' autoport='yes'> <listen type='address'/> </graphics> and this should not happen. The XML have to always remain the same after it was already parsed by libvirt. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1383039 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/conf/domain_conf.c | 2 ++ .../generic-graphics-vnc-autoport-no.xml | 30 ++++++++++++++++++++++ tests/genericxml2xmltest.c | 1 + 3 files changed, 33 insertions(+) create mode 100644 tests/genericxml2xmlindata/generic-graphics-vnc-autoport-no.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 26bb0fdd0a..ffd020f641 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11716,6 +11716,8 @@ virDomainGraphicsDefParseXMLVNC(virDomainGraphicsDefPtr def, if (flags & VIR_DOMAIN_DEF_PARSE_INACTIVE) def->data.vnc.port = 0; def->data.vnc.autoport = true; + } else { + def->data.vnc.autoport = false; } } diff --git a/tests/genericxml2xmlindata/generic-graphics-vnc-autoport-no.xml b/tests/genericxml2xmlindata/generic-graphics-vnc-autoport-no.xml new file mode 100644 index 0000000000..748e7f489d --- /dev/null +++ b/tests/genericxml2xmlindata/generic-graphics-vnc-autoport-no.xml @@ -0,0 +1,30 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</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</emulator> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <graphics type='vnc' autoport='no'> + <listen type='address'/> + </graphics> + <video> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> + </video> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/genericxml2xmltest.c b/tests/genericxml2xmltest.c index 2ea2396480..488190270f 100644 --- a/tests/genericxml2xmltest.c +++ b/tests/genericxml2xmltest.c @@ -91,6 +91,7 @@ mymain(void) DO_TEST_DIFFERENT("graphics-vnc-socket-attr-listen-socket"); DO_TEST_FULL("graphics-vnc-socket-attr-listen-socket-mismatch", 0, false, TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE); + DO_TEST("graphics-vnc-autoport-no"); DO_TEST_FULL("name-slash-fail", 0, false, TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE); -- 2.11.0

2 2

[libvirt] [PATCH] doc: improve VNC/SPICE password documentation
by Pavel Hrdina 27 Jan '17

27 Jan '17

If the passwd attribute is set to empty string it disables VNC/SPICE access to the guest. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- docs/formatdomain.html.in | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 3f7f87524a..1cb94d0253 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -5499,9 +5499,10 @@ qemu-kvm -net nic,model=? /dev/null should be auto-allocated). The <code>autoport</code> attribute is the new preferred syntax for indicating auto-allocation of the TCP port to use. The <code>passwd</code> attribute provides a VNC - password in clear text. The <code>keymap</code> attribute specifies - the keymap to use. It is possible to set a limit on the validity of - the password by giving an timestamp + password in clear text, if the <code>passwd</code> is set to empty + string the VNC access is disabled. The <code>keymap</code> attribute + specifies the keymap to use. It is possible to set a limit on the + validity of the password by giving an timestamp <code>passwdValidTo='2010-04-09T15:51:00'</code> assumed to be in UTC. The <code>connected</code> attribute allows control of connected client during password changes. VNC accepts @@ -5540,11 +5541,13 @@ qemu-kvm -net nic,model=? /dev/null an alternative secure port number. The <code>autoport</code> attribute is the new preferred syntax for indicating auto-allocation of needed port numbers. The <code>passwd</code> - attribute provides a SPICE password in clear text. The - <code>keymap</code> attribute specifies the keymap to use. It is - possible to set a limit on the validity of the password by giving - an timestamp <code>passwdValidTo='2010-04-09T15:51:00'</code> - assumed to be in UTC. + attribute provides a SPICE password in clear text, if the + <code>passwd</code> is set to empty string the SPICE access is + disabled. The <code>keymap</code> attribute specifies the keymap + to use. It is possible to set a limit on the validity of the + password by giving an timestamp + <code>passwdValidTo='2010-04-09T15:51:00'</code> assumed to be + in UTC. </p> <p> The <code>connected</code> attribute allows control of connected -- 2.11.0

2 2

[libvirt] Refactoring of storage pool
by Olga Krishtal 26 Jan '17

26 Jan '17

Hi everyone! Half a year ago we started discussion about filesystem pools: https://www.redhat.com/archives/libvir-list/2016-April/msg01941.html https://www.redhat.com/archives/libvir-list/2016-May/msg00208.html https://www.redhat.com/archives/libvir-list/2016-September/msg00463.html At the end we have decided not to use copy/paste and try to merge code: https://www.redhat.com/archives/libvir-list/2016-December/msg00051.html However, after first try it had became obvious (the discussion is in the link above) that pools can be describe as a separate object, that later will be used in storage pool, filesystem pool, vgpu pool, etc. This latter is an extension of previous discussion; I just want to separate refactoring of storage pools and the implementation of filesystem pools a bit. Before sending any patch with such huge refactoring I want to agree about pools Here is an example of pool structures and prototypes of some management functions that were discussed before (thanks a lot to John Ferlan for good advice). I tried to tie everything together and here it is: /* * virpool.h: pool utility to manage structures commonly used for pools. * */ /* The dscription of pool element * For storage pool it used to be virStorageVolDef * instead of key we use uuid, because key is specific * for storage pools, and for other pool types (filesystem pools) * or gpu pool we do nor have key. * type field is also specific - that is why we put it into * void* ElementTypeDef. * ElementTypeDef - stores internal information about pool element(volume, item, etc) * (the same as privateData for virConnectPtr) * For example, for storage pool voluems it consists from: * int type; * virStorageVolSource source; * virStorageSource target; */ #include "virhash.h" typedef enum { VIR_POOL_ELEMENT_VOLUME, VIR_POOL_ELEMENT_FILESYSTEM, VIR_POOL_ELEMENT_LAST, } virPoolElemenType; VIR_ENUM_DECL(virPoolElementType) typedef void (*virPoolElementTypeDefFree) (void *PoolElementDef); typedef struct _virPoolElementDef virPoolElementDef; typedef virPoolElementDef *virPoolElementDefPtr; struct _virPoolElementDef { char *name; char *uuid; bool building; unsigned int in_use; int type; void* ElementTypeDef; virPoolElementTypeDefFree PoolElementDefFree; }; typedef struct _virPoolElementDefList virPoolElementDefList; typedef virPoolElementDefList *virPoolElementDefListPtr; struct _virPoolElementDefList { size_t count; virPoolElementDefPtr *elements; }; /* General information about pool source*/ typedef struct _virPoolSourceHost virPoolSourceHost; typedef virPoolSourceHost *virPoolSourceHostPtr; struct _virPoolSourceHost { char *name; int port; }; typedef struct _virPoolAuthDef virPoolAuthDef; typedef virPoolAuthDef *virPoolAuthDefPtr; struct _virPoolAuthDef { char *username; char *secrettype; /* <secret type='%s' for disk source */ int authType; /* virStorageAuthType */ virSecretLookupTypeDef seclookupdef; }; typedef enum { VIR_POOL_SOURCE_DIR, VIR_POOL_SOURCE_DEVICE, VIR_POOL_SOURCE_NAME, VIR_POOL_SOURCE_LAST, } virPoolSourcePathType; VIR_ENUM_DECL(virPoolSourcePathType) typedef struct _virPoolSourcePath virPoolSourcePath; typedef virPoolSourcePath *virPoolSourcePathPtr; struct _virPoolSourcePath { virPoolSourcePathType sourcetype; char *path; }; typedef void(*virPoolPrivDataFree) (void *privePoolData); typedef struct _virPoolSource virPoolSource; typedef virPoolSource *virPoolSourcePtr; struct _virPoolSource{ /* One or more host definitions */ size_t nhost; virPoolSourceHostPtr hosts; /* Authentication information */ virPoolAuthDefPtr auth; /* One or more devices */ size_t nsrcpath; virPoolSourcePathPtr srcpaths; /* Name of the source */ char *name; /* Vendor of the source */ char *vendor; /* Product name of the source */ char *product; /*Some private data */ void *privatePoolData; virPoolPrivDataFree privDataFree; }; typedef struct _virPoolPathPerms virPoolPathPerms; typedef virPoolPathPerms *virPoolPathPermsPtr; struct _virPoolPathPerms { mode_t mode; uid_t uid; gid_t gid; char *label; } typedef struct _virPoolTarget virPoolTarget; typedef virPoolTarget *virPoolTargetPtr; struct _virPoolTarget{ char *path; /* Optional path to target */ virPoolPathPerms perms; /* Default permissions for path */ }; typedef struct _virPoolDef virPoolDef; typedef virPoolDef *virPoolDefPtr; struct _virPoolDef { char *name; unsigned char uuid[VIR_UUID_BUFLEN]; virPoolSource source; virPoolTarget target; }; typedef struct _virPoolInfo virPoolInfo; // used to be virPoolObj typedef virPoolInfo *virPoolInfoPtr; struct _virPoolInfo { char *configFile; char *autostartLink; bool active; int autostart; unsigned int asyncjobs; virPoolDefPtr def; virPoolDefPtr newDef; virPoolElementDefList elementsdef; }; /* Used to be PoolObjList * Separate struct - in case we will need additional info * upon the hash table. */ typedef struct _virPoolStore virPoolStore; typedef virPoolStore *virPoolStorePtr; struct _virPoolStore { size_t count; virHashAtomicPtr *pools; //Used to be objects obj }; /* * Pool hash and pool elements managment operations */ void virPoolElementDefFree (virPoolElementDefPtr def); void virPoolClearElements(virPoolInfoPtr poolinfo); void virPoolAuthDefFree(virPoolAuthDefPtr authdef); virPoolSourcePtr virPoolSourceNew (virPoolPrivDataFree privDataFree); void virPoolSourceClear(virPoolSourcePtr source); void virPoolDefFree(virPoolDefPtr def); void virPoolInfoFree(virPoolInfoPtr pool); virPoolStorePtr virPoolStoreNew(); * * Functions to manage pool as an object. * */ // It is reference implementation. #include "virpool.h" VIR_ENUM_IMPL(virPoolElementType, VIR_POOL_ELEMNT_LAST, "volume", "filesystem"); void virPoolElementDefFree(virPoolElementDefPtr def) { if (!def) return; VIR_FREE(def->name); VIR_FREE(def->uuid); if (def->PoolElementDefFree) def->PoolElementDefFree(def->ElementTypeDef); } void virPoolClearElements(virPoolInfoPtr poolinfo) { size_t i; for (i = 0; i < poolinfo->elementsdef.count; i++) virPoolElementDefFree(poolinfo->elementsdef.elements[i]); VIR_FREE(poolinfo->elementdef.elements); poolindo->elementsdef.count = 0; } /* General functions to work with pool */ VIR_ENUM_IMPL(virPoolSourcePathType, VIR_POOL_SOURCE_LAST, "dir", "device", "name"); void virPoolAuthDefFree(virPoolAuthDefPtr authdef) { if (!authdef) return; VIR_FREE(authdef->username); VIR_FREE(authdef->secrettype); VIR_FREE(authdef); } virPoolSourcePtr virPoolSourceNew(virPoolPrivDataFree privDataFree) { virPoolSourcePtr source; if (VIR_ALLOC(source) < 0) return -1; source->privDataFree = privDataFree; return source; } void virPoolSourceClear(virPoolSourcePtr source) { size_t i; if (!source) return; /* Free hosts */ for (i = 0; i < source->nhosts; i++) VIR_FREE(source->hosts[i].name); VIR_FREE(source->hosts); /* Free auth information * empty at the moment*/ virPoolAuthDefFree(source->auth); /* Free dev path*/ for (i = 0; i < source->nsrcpath; i++) VIR_FREE(source->srcpath[i].name); VIR_FREE(source->srcpath); VIR_FREE(source->name); VIR_FREE(source->vendor); VIR_FREE(source->product); if (source->privDataFree) source->privDataFree(source->privatePoolData); } void virPoolDefFree(virPoolDefPtr def) { if (!def) return; VIR_FREE(def->name); /*Free other fields*/ virPoolSourceClear(def->source); VIR_FREE(def->target.path); VIR_FREE(def->target.perms.lable); VIR_FREE(def); } void virPoolInfoFree(virPoolInfoPtr pool) { if (!pool) return; VIR_FREE(pool->configFile); VIR_FREE(pool->autostartLink); virPoolDefFree(pool->def); virPoolDefFree(pool->newDef); virPoolClearElements(pool); } virPoolStorePtr virPoolStoreNew() { virPoolStorePtr poolstore; if (VIR_ALLOC(poolstore) < 0) return NULL; poolstore->count = 0; poolstore->pools = virHashAtomicNew(0, virPoolInfoFree); return poolstore; } I will be glad to here any ideas and advises. -- Best regards, Olga

3 3

[libvirt] [PATCH 0/7] perf: add CACHE_L1D perf event support
by Nitesh Konkar 26 Jan '17

26 Jan '17

This patch series adds support and documentation for a generalized hardware cache event called CACHE_L1D perf event. This perf event is split into cache_l1dra, cache_l1drm, cache_l1dwa, cache_l1dwm, cache_l1dpa and cache_l1dpm perf events depending on the config value set. Nitesh Konkar (7): perf: add cache_l1dra perf event support perf: add cache_l1drm perf event support perf: add cache_l1dwa perf event support perf: add cache_l1dwm perf event support perf: add cache_l1dpa perf event support perf: add cache_l1dpm perf event support virsh: Fix manpage typo docs/formatdomain.html.in | 42 ++++++++++++++++++ docs/news.xml | 6 ++- docs/schemas/domaincommon.rng | 6 +++ include/libvirt/libvirt-domain.h | 66 +++++++++++++++++++++++++++++ src/libvirt-domain.c | 18 ++++++++ src/qemu/qemu_driver.c | 6 +++ src/remote/remote_protocol.x | 2 +- src/util/virperf.c | 34 ++++++++++++++- src/util/virperf.h | 6 +++ tests/genericxml2xmlindata/generic-perf.xml | 6 +++ tools/virsh.pod | 26 ++++++++++-- 11 files changed, 210 insertions(+), 8 deletions(-) -- 1.9.3

2 10

[libvirt] [PATCH] virnettlssessiontest.c: fix grammar
by Nitesh Konkar 26 Jan '17

26 Jan '17

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- tests/virnettlssessiontest.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/virnettlssessiontest.c b/tests/virnettlssessiontest.c index 0d2e106..24de212 100644 --- a/tests/virnettlssessiontest.c +++ b/tests/virnettlssessiontest.c @@ -74,9 +74,9 @@ static ssize_t testRead(char *buf, size_t len, void *opaque) * This is replicating the checks that are done for an * active TLS session after handshake completes. To * simulate that we create our TLS contexts, skipping - * sanity checks. When then get a socketpair, and + * sanity checks. We then get a socketpair, and * initiate a TLS session across them. Finally do - * do actual cert validation tests + * actual cert validation tests */ static int testTLSSessionInit(const void *opaque) { -- 1.9.3

2 1

[libvirt] [PATCH] perf: Prevent enabling of already enabled perf event
by Nitesh Konkar 26 Jan '17

26 Jan '17

Currently, on every --enable perf_event command, a new event->fd is created and counting of perf event counter starts from zero and previous event->fd is lost. This patch prevents this behaviour. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/util/virperf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/util/virperf.c b/src/util/virperf.c index 788b817..57c2081 100644 --- a/src/util/virperf.c +++ b/src/util/virperf.c @@ -230,6 +230,9 @@ virPerfEventEnable(virPerfPtr perf, if (!event || !event_attr) return -1; + if (event->enabled) + return 0; + if (event_attr->attrType == 0 && (type == VIR_PERF_EVENT_CMT || type == VIR_PERF_EVENT_MBMT || type == VIR_PERF_EVENT_MBML)) { -- 1.9.3

2 1

[libvirt] [PATCH] docs: Reword virsh manpage for --uuid --name --details options
by Nitesh Konkar 26 Jan '17

26 Jan '17

This commit is similar to commit 0977ada8.The virsh manpage lists options --uuid and --name as mutually exclusive if option --details is specified when actually the option --details is mutually exclusive and can't go with options --uuid and/or --name. This patch rewords the virsh manpage to state the correct meaning. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- tools/virsh.pod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 290f508..fb62923 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -3634,8 +3634,8 @@ I<--autostart> lists the autostarting pools, I<--no-autostart> lists the pools with autostarting disabled. If I<--uuid> is specified only pool's UUIDs are printed. If I<--name> is specified only pool's names are printed. If both I<--name> and I<--uuid> are specified, pool's UUID and names are printed side by side -without any header. Options I<--uuid> and I<--name> are mutually exclusive -if option I<--details> is specified. +without any header. Option I<--details> is mutually exclusive with options +I<--uuid> and I<--name>. You may also want to list pools with specified types using I<type>, the pool types must be separated by comma, e.g. --type dir,disk. The valid pool -- 1.9.3

2 1

[libvirt] [PATCH] virsh: Modify description for LIBVIRT_DEBUG=4 in manpage
by Nitesh Konkar 26 Jan '17

26 Jan '17

As LIBVIRT_DEBUG=4 logs only error messages and there are no levels above it, adjusting the description in the man page accordingly. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- tools/virsh.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index c1bdbdd..9e45f09 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -4565,7 +4565,7 @@ Messages at level WARNING or above =item * LIBVIRT_DEBUG=4 -Messages at level ERROR or above +Messages at level ERROR =back -- 1.9.3

2 1

[libvirt] [PATCH] vstorage: fix build
by Olga Krishtal 26 Jan '17

26 Jan '17

Fixed errors when we build libvirt with --with-storage-vstorage key Signed-off-by: Olga Krishtal <okrishtal(a)virtuozzo.com> --- src/storage/storage_backend_vstorage.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/storage/storage_backend_vstorage.c b/src/storage/storage_backend_vstorage.c index d3a12fb..7a1c468 100644 --- a/src/storage/storage_backend_vstorage.c +++ b/src/storage/storage_backend_vstorage.c @@ -9,6 +9,7 @@ #include <mntent.h> #include <pwd.h> #include <grp.h> +#include "storage_util.h" #define VIR_FROM_THIS VIR_FROM_STORAGE @@ -131,7 +132,7 @@ virStorageBackendVzPoolStop(virConnectPtr conn ATTRIBUTE_UNUSED, if ((rc = virStorageBackendVzIsMounted(pool)) != 1) return rc; - return virStorageBackendUnmountLocal(pool); + return virStorageBackendUmountLocal(pool); } -- 1.8.3.1

2 1

[libvirt] [PATCH] storage: Fix build due to recent storage backend code movement
by John Ferlan 26 Jan '17

26 Jan '17

Commit id '5f07c3c07' broke the freebsd build in the libvirt CI test environment because the UMOUNT was not defined unless WITH_STORAGE_FS is defined. So remove the virStorageBackendUmountLocal from storage_util.c,h and restore the code back in the storage_backend_fs.c and _vstorage.c modules. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- This is a build breaker - I'll push shortly... src/storage/storage_backend_fs.c | 11 ++++++++++- src/storage/storage_backend_vstorage.c | 11 ++++++++++- src/storage/storage_util.c | 18 ------------------ src/storage/storage_util.h | 2 -- 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 9710648..54bcc57 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -452,6 +452,8 @@ static int virStorageBackendFileSystemStop(virConnectPtr conn ATTRIBUTE_UNUSED, virStoragePoolObjPtr pool) { + virCommandPtr cmd = NULL; + int ret = -1; int rc; if (virStorageBackendFileSystemIsValid(pool) < 0) @@ -461,7 +463,14 @@ virStorageBackendFileSystemStop(virConnectPtr conn ATTRIBUTE_UNUSED, if ((rc = virStorageBackendFileSystemIsMounted(pool)) != 1) return rc; - return virStorageBackendUmountLocal(pool); + cmd = virCommandNewArgList(UMOUNT, pool->def->target.path, NULL); + if (virCommandRun(cmd, NULL) < 0) + goto cleanup; + + ret = 0; + cleanup: + virCommandFree(cmd); + return ret; } #endif /* WITH_STORAGE_FS */ diff --git a/src/storage/storage_backend_vstorage.c b/src/storage/storage_backend_vstorage.c index d3a12fb..0e945af 100644 --- a/src/storage/storage_backend_vstorage.c +++ b/src/storage/storage_backend_vstorage.c @@ -125,13 +125,22 @@ static int virStorageBackendVzPoolStop(virConnectPtr conn ATTRIBUTE_UNUSED, virStoragePoolObjPtr pool) { + virCommandPtr cmd = NULL; + int ret = -1; int rc; /* Short-circuit if already unmounted */ if ((rc = virStorageBackendVzIsMounted(pool)) != 1) return rc; - return virStorageBackendUnmountLocal(pool); + cmd = virCommandNewArgList(UMOUNT, pool->def->target.path, NULL); + if (virCommandRun(cmd, NULL) < 0) + goto cleanup; + + ret = 0; + cleanup: + virCommandFree(cmd); + return ret; } diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index fbe1844..a665bac 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -2803,24 +2803,6 @@ virStorageBackendBuildLocal(virStoragePoolObjPtr pool) } -int -virStorageBackendUmountLocal(virStoragePoolObjPtr pool) -{ - int ret = -1; - virCommandPtr cmd = virCommandNewArgList(UMOUNT, pool->def->target.path, - NULL); - - if (virCommandRun(cmd, NULL) < 0) - goto cleanup; - - ret = 0; - - cleanup: - virCommandFree(cmd); - return ret; -} - - /** * @conn connection to report errors against * @pool storage pool to delete diff --git a/src/storage/storage_util.h b/src/storage/storage_util.h index 49df530..326d555 100644 --- a/src/storage/storage_util.h +++ b/src/storage/storage_util.h @@ -87,8 +87,6 @@ int virStorageBackendVolWipeLocal(virConnectPtr conn, /* Local/Common Storage Pool Backend APIs */ int virStorageBackendBuildLocal(virStoragePoolObjPtr pool); -int virStorageBackendUmountLocal(virStoragePoolObjPtr pool); - int virStorageBackendDeleteLocal(virConnectPtr conn, virStoragePoolObjPtr pool, unsigned int flags); -- 2.7.4

2 1

[libvirt] [PATCH 0/3] Move FS Storage Backend API's to storage_util
by John Ferlan 26 Jan '17

26 Jan '17

While reviewing the Virtuozzo backend changes it became apparent that my initial review comments weren't fully understood. Rather than going back and forth more on this, I figured I'd take the plunge and make the "preparations". Also since the storage_util is the new dumping ground, I went there. It also already has the API's for the storage backend upload, download, and wipe - so these patches add a few more from the pool class and the rest of the volume class. FWIW: Rather than just making and bundling the changes with the Virtuozzo changes, I figured I'd post them separately just in case someone has agita over the API/helper name changes. John Ferlan (3): storage: Move the virStorageBackendFileSystem{Start|Stop} API's storage: Create common file/dir pool backend helpers storage: Create common file/dir volume backend helpers src/storage/storage_backend.c | 1 + src/storage/storage_backend_fs.c | 827 +++------------------------------- src/storage/storage_util.c | 931 ++++++++++++++++++++++++++++++++++----- src/storage/storage_util.h | 79 ++-- 4 files changed, 924 insertions(+), 914 deletions(-) -- 2.7.4

3 8

[libvirt] [PATCH 0/4] Support setting MTU on domain interfaces
by Michal Privoznik 26 Jan '17

26 Jan '17

After Laine merges his patches [1] the only missing piece is setting MTU on a domain <interface/>. Well, up until now :-) 1: https://www.redhat.com/archives/libvir-list/2017-January/msg00946.html Michal Privoznik (4): formatnetwork.html.in: Fix #elementsNICS anchor virDomainNetDefParseXML: s/ret/rv/ domain_conf: Introduce <mtu/> to <interface/> qemu: Implement mtu on interface docs/formatdomain.html.in | 19 ++++++ docs/formatnetwork.html.in | 4 +- docs/schemas/domaincommon.rng | 3 + docs/schemas/networkcommon.rng | 9 +++ src/conf/domain_conf.c | 18 ++++-- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 14 +++++ src/qemu/qemu_domain.c | 30 ++++++++++ src/qemu/qemu_domain.h | 2 + tests/qemuxml2argvdata/qemuxml2argv-net-mtu.xml | 60 +++++++++++++++++++ .../qemuxml2xmloutdata/qemuxml2xmlout-net-mtu.xml | 68 ++++++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 14 files changed, 226 insertions(+), 6 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-mtu.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-mtu.xml -- 2.11.0

3 11

[libvirt] [PATCHv2 1/3] util: unlock closeCallbacks if get callbacks for connect fail
by Wang King 25 Jan '17

25 Jan '17

Avoid return with the closeCallbacks locked when get callbacks list for connect fail. Signed-off-by: Wang King <king.wang(a)huawei.com> --- src/util/virclosecallbacks.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/util/virclosecallbacks.c b/src/util/virclosecallbacks.c index 891a92b..1fa9596 100644 --- a/src/util/virclosecallbacks.c +++ b/src/util/virclosecallbacks.c @@ -331,8 +331,10 @@ virCloseCallbacksRun(virCloseCallbacksPtr closeCallbacks, virObjectLock(closeCallbacks); list = virCloseCallbacksGetForConn(closeCallbacks, conn); - if (!list) + if (!list) { + virObjectLock(closeCallbacks); return; + } for (i = 0; i < list->nentries; i++) { char uuidstr[VIR_UUID_STRING_BUFLEN]; -- 2.8.3

2 6

[libvirt] non-standard types in remote XDR definitions
by Matt Broadstone 25 Jan '17

25 Jan '17

Hello, I have been experimenting with the remote protocol defined in the `src/remote/remote_protocol.x` (https://libvirt.org/git/?p=libvirt.git;a=blob_plain;f=src/remote/remote_pro…) and noticed that there a number of types used that are not defined in the XDR RFC, specifically: unsigned char, char, unsigned short, short (I might have missed one or two). I'm wondering if these are missing typedefs, or whether they are custom extensions to the RFC. Does anyone have more information on this? If the latter case is the fact, are these values padded to 4 bytes per the spec? Thanks, Matt

2 3

[libvirt] [PATCH] perf: introduce option --reset
by Nitesh Konkar 25 Jan '17

25 Jan '17

Currently you can either enable or disable a perf event. This patch allows you to reset the perf event using command line option --reset. Eg: virsh perf domainName --reset cpu_cycles Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- Example: virsh domstats Fedora --perf Domain: 'Fedora' virsh perf Fedora --enable cpu_cycles,cache_references cpu_cycles : enabled cache_references: enabled virsh domstats Fedora --perf Domain: 'Fedora' perf.cpu_cycles=107559185 perf.cache_references=563288 virsh perf Fedora --reset cache_misses,cpu_cycles,cache_references cache_misses : reset cpu_cycles : reset cache_references: reset virsh domstats Fedora --perf Domain: 'Fedora' perf.cpu_cycles=0 perf.cache_references=0 perf.cache_misses=0 virsh perf Fedora --reset cache_misses,cpu_cycles,cache_references --config error: Options --reset and --config are mutually exclusive Should reset option be made available in the domainxml along with enabled=yes/no ? I have not included any such change in this patch as I think that there is no need to reset a perf counter as its value for the VM's pid shall start by default at zero unless enabled. include/libvirt/libvirt-domain.h | 6 +++++ src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 52 ++++++++++++++++++++-------------------- src/qemu/qemu_process.c | 22 +++++++++++++---- src/util/virperf.c | 52 ++++++++++++++++++++++++++++------------ src/util/virperf.h | 12 ++++++---- tools/virsh-domain.c | 37 ++++++++++++++++++---------- 7 files changed, 120 insertions(+), 62 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index e303140..6072f00 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -2188,6 +2188,12 @@ void virDomainStatsRecordListFree(virDomainStatsRecordPtr *stats); */ # define VIR_PERF_PARAM_REF_CPU_CYCLES "ref_cpu_cycles" +enum { +VIR_PERF_STATE_DISABLED, +VIR_PERF_STATE_ENABLED, +VIR_PERF_STATE_RESET, +}; + int virDomainGetPerfEvents(virDomainPtr dom, virTypedParameterPtr *params, int *nparams, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index cfeb43c..61bd207 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2229,6 +2229,7 @@ virPCIStubDriverTypeToString; virPerfEventDisable; virPerfEventEnable; virPerfEventIsEnabled; +virPerfEventSetFd; virPerfEventTypeFromString; virPerfEventTypeToString; virPerfFree; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 516a851..8dd3ab7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9530,25 +9530,25 @@ qemuDomainSetPerfEvents(virDomainPtr dom, virDomainDefPtr persistentDef; int ret = -1; virPerfEventType type; - bool enabled; + int state; virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); if (virTypedParamsValidate(params, nparams, - VIR_PERF_PARAM_CMT, VIR_TYPED_PARAM_BOOLEAN, - VIR_PERF_PARAM_MBMT, VIR_TYPED_PARAM_BOOLEAN, - VIR_PERF_PARAM_MBML, VIR_TYPED_PARAM_BOOLEAN, - VIR_PERF_PARAM_CPU_CYCLES, VIR_TYPED_PARAM_BOOLEAN, - VIR_PERF_PARAM_INSTRUCTIONS, VIR_TYPED_PARAM_BOOLEAN, - VIR_PERF_PARAM_CACHE_REFERENCES, VIR_TYPED_PARAM_BOOLEAN, - VIR_PERF_PARAM_CACHE_MISSES, VIR_TYPED_PARAM_BOOLEAN, - VIR_PERF_PARAM_BRANCH_INSTRUCTIONS, VIR_TYPED_PARAM_BOOLEAN, - VIR_PERF_PARAM_BRANCH_MISSES, VIR_TYPED_PARAM_BOOLEAN, - VIR_PERF_PARAM_BUS_CYCLES, VIR_TYPED_PARAM_BOOLEAN, - VIR_PERF_PARAM_STALLED_CYCLES_FRONTEND, VIR_TYPED_PARAM_BOOLEAN, - VIR_PERF_PARAM_STALLED_CYCLES_BACKEND, VIR_TYPED_PARAM_BOOLEAN, - VIR_PERF_PARAM_REF_CPU_CYCLES, VIR_TYPED_PARAM_BOOLEAN, + VIR_PERF_PARAM_CMT, VIR_TYPED_PARAM_INT, + VIR_PERF_PARAM_MBMT, VIR_TYPED_PARAM_INT, + VIR_PERF_PARAM_MBML, VIR_TYPED_PARAM_INT, + VIR_PERF_PARAM_CPU_CYCLES, VIR_TYPED_PARAM_INT, + VIR_PERF_PARAM_INSTRUCTIONS, VIR_TYPED_PARAM_INT, + VIR_PERF_PARAM_CACHE_REFERENCES, VIR_TYPED_PARAM_INT, + VIR_PERF_PARAM_CACHE_MISSES, VIR_TYPED_PARAM_INT, + VIR_PERF_PARAM_BRANCH_INSTRUCTIONS, VIR_TYPED_PARAM_INT, + VIR_PERF_PARAM_BRANCH_MISSES, VIR_TYPED_PARAM_INT, + VIR_PERF_PARAM_BUS_CYCLES, VIR_TYPED_PARAM_INT, + VIR_PERF_PARAM_STALLED_CYCLES_FRONTEND, VIR_TYPED_PARAM_INT, + VIR_PERF_PARAM_STALLED_CYCLES_BACKEND, VIR_TYPED_PARAM_INT, + VIR_PERF_PARAM_REF_CPU_CYCLES, VIR_TYPED_PARAM_INT, NULL) < 0) return -1; @@ -9570,16 +9570,17 @@ qemuDomainSetPerfEvents(virDomainPtr dom, if (def) { for (i = 0; i < nparams; i++) { virTypedParameterPtr param = &params[i]; - enabled = param->value.b; + state = param->value.i; type = virPerfEventTypeFromString(param->field); - if (!enabled && virPerfEventDisable(priv->perf, type) < 0) - goto endjob; - if (enabled && virPerfEventEnable(priv->perf, type, vm->pid) < 0) + if ((state == VIR_PERF_STATE_DISABLED) && virPerfEventDisable(priv->perf, type) < 0) { goto endjob; + } else { + if (virPerfEventSetFd(priv->perf, type, vm->pid, state) < 0) + goto endjob; + } - def->perf.events[type] = enabled ? - VIR_TRISTATE_BOOL_YES : VIR_TRISTATE_BOOL_NO; + def->perf.events[type] = state; } if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) @@ -9589,11 +9590,10 @@ qemuDomainSetPerfEvents(virDomainPtr dom, if (persistentDef) { for (i = 0; i < nparams; i++) { virTypedParameterPtr param = &params[i]; - enabled = param->value.b; + state = param->value.i; type = virPerfEventTypeFromString(param->field); - persistentDef->perf.events[type] = enabled ? - VIR_TRISTATE_BOOL_YES : VIR_TRISTATE_BOOL_NO; + persistentDef->perf.events[type] = state; } if (virDomainSaveConfig(cfg->configDir, driver->caps, persistentDef) < 0) @@ -9649,14 +9649,14 @@ qemuDomainGetPerfEvents(virDomainPtr dom, priv = vm->privateData; for (i = 0; i < VIR_PERF_EVENT_LAST; i++) { - bool perf_enabled; + int perf_enabled; if (flags & VIR_DOMAIN_AFFECT_CONFIG) - perf_enabled = def->perf.events[i] == VIR_TRISTATE_BOOL_YES; + perf_enabled = def->perf.events[i]; else perf_enabled = virPerfEventIsEnabled(priv->perf, i); - if (virTypedParamsAddBoolean(&par, &npar, &maxpar, + if (virTypedParamsAddInt(&par, &npar, &maxpar, virPerfEventTypeToString(i), perf_enabled) < 0) goto endjob; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 184440d..1bd7979 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3200,11 +3200,19 @@ qemuDomainPerfRestart(virDomainObjPtr vm) for (i = 0; i < VIR_PERF_EVENT_LAST; i++) { if (def->perf.events[i] && - def->perf.events[i] == VIR_TRISTATE_BOOL_YES) { + def->perf.events[i] == VIR_PERF_STATE_ENABLED) { /* Failure to re-enable the perf event should not be fatal */ - if (virPerfEventEnable(priv->perf, i, vm->pid) < 0) - def->perf.events[i] = VIR_TRISTATE_BOOL_NO; + if (virPerfEventSetFd(priv->perf, i, vm->pid, VIR_PERF_STATE_ENABLED) < 0) + def->perf.events[i] = VIR_PERF_STATE_DISABLED; + } + + if (def->perf.events[i] && + def->perf.events[i] == VIR_PERF_STATE_RESET) { + + /* Failure to reset the perf event should not be fatal */ + if (virPerfEventSetFd(priv->perf, i, vm->pid, VIR_PERF_STATE_RESET) < 0) + def->perf.events[i] = VIR_PERF_STATE_DISABLED; } } @@ -5563,8 +5571,12 @@ qemuProcessLaunch(virConnectPtr conn, goto cleanup; for (i = 0; i < VIR_PERF_EVENT_LAST; i++) { - if (vm->def->perf.events[i] == VIR_TRISTATE_BOOL_YES && - virPerfEventEnable(priv->perf, i, vm->pid) < 0) + if (vm->def->perf.events[i] == VIR_PERF_STATE_ENABLED && + virPerfEventSetFd(priv->perf, i, vm->pid, VIR_PERF_STATE_ENABLED) < 0) + goto cleanup; + + if (vm->def->perf.events[i] == VIR_PERF_STATE_RESET && + virPerfEventSetFd(priv->perf, i, vm->pid, VIR_PERF_STATE_RESET) < 0) goto cleanup; } diff --git a/src/util/virperf.c b/src/util/virperf.c index f64692b..125166b 100644 --- a/src/util/virperf.c +++ b/src/util/virperf.c @@ -48,7 +48,7 @@ VIR_ENUM_IMPL(virPerfEvent, VIR_PERF_EVENT_LAST, struct virPerfEvent { int type; int fd; - bool enabled; + int state; union { /* cmt */ struct { @@ -186,9 +186,25 @@ virPerfGetEvent(virPerfPtr perf, } int -virPerfEventEnable(virPerfPtr perf, +virPerfEventEnable(int fd) +{ + if (ioctl(fd, PERF_EVENT_IOC_ENABLE) < 0) + return -1; + return 0; +} + +int +virPerfEventReset(int fd) +{ + if (ioctl(fd, PERF_EVENT_IOC_RESET) < 0) + return -1; + return 0; +} + +int +virPerfEventSetFd(virPerfPtr perf, virPerfEventType type, - pid_t pid) + pid_t pid, int state) { char *buf = NULL; struct perf_event_attr attr; @@ -237,14 +253,20 @@ virPerfEventEnable(virPerfPtr perf, goto error; } - if (ioctl(event->fd, PERF_EVENT_IOC_ENABLE) < 0) { + if (state == VIR_PERF_STATE_ENABLED && virPerfEventEnable(event->fd) < 0) { virReportSystemError(errno, _("unable to enable host cpu perf event for %s"), virPerfEventTypeToString(event->type)); goto error; } - event->enabled = true; + if (state == VIR_PERF_STATE_RESET && virPerfEventReset(event->fd) < 0) { + virReportSystemError(errno, + _("unable to reset host cpu perf event for %s"), + virPerfEventTypeToString(event->type)); + goto error; + } + event->state = state; return 0; error: @@ -261,7 +283,7 @@ virPerfEventDisable(virPerfPtr perf, if (event == NULL) return -1; - if (!event->enabled) + if (!event->state) return 0; if (ioctl(event->fd, PERF_EVENT_IOC_DISABLE) < 0) { @@ -271,19 +293,19 @@ virPerfEventDisable(virPerfPtr perf, return -1; } - event->enabled = false; + event->state = VIR_PERF_STATE_DISABLED; VIR_FORCE_CLOSE(event->fd); return 0; } -bool virPerfEventIsEnabled(virPerfPtr perf, +int virPerfEventIsEnabled(virPerfPtr perf, virPerfEventType type) { virPerfEventPtr event = virPerfGetEvent(perf, type); if (event == NULL) return false; - return event->enabled; + return event->state; } int @@ -292,7 +314,7 @@ virPerfReadEvent(virPerfPtr perf, uint64_t *value) { virPerfEventPtr event = virPerfGetEvent(perf, type); - if (event == NULL || !event->enabled) + if (event == NULL || !event->state) return -1; if (saferead(event->fd, value, sizeof(uint64_t)) < 0) { @@ -316,7 +338,7 @@ virPerfRdtAttrInit(void) int -virPerfEventEnable(virPerfPtr perf ATTRIBUTE_UNUSED, +virPerfEventSetFd(virPerfPtr perf ATTRIBUTE_UNUSED, virPerfEventType type ATTRIBUTE_UNUSED, pid_t pid ATTRIBUTE_UNUSED) { @@ -334,11 +356,11 @@ virPerfEventDisable(virPerfPtr perf ATTRIBUTE_UNUSED, return -1; } -bool +int virPerfEventIsEnabled(virPerfPtr perf ATTRIBUTE_UNUSED, virPerfEventType type ATTRIBUTE_UNUSED) { - return false; + return 0; } int @@ -365,7 +387,7 @@ virPerfNew(void) for (i = 0; i < VIR_PERF_EVENT_LAST; i++) { perf->events[i].type = i; perf->events[i].fd = -1; - perf->events[i].enabled = false; + perf->events[i].state = VIR_PERF_STATE_DISABLED; } if (virPerfRdtAttrInit() < 0) @@ -383,7 +405,7 @@ virPerfFree(virPerfPtr perf) return; for (i = 0; i < VIR_PERF_EVENT_LAST; i++) { - if (perf->events[i].enabled) + if (perf->events[i].state >= VIR_PERF_STATE_ENABLED) virPerfEventDisable(perf, i); } diff --git a/src/util/virperf.h b/src/util/virperf.h index 1f43c92..f79ef31 100644 --- a/src/util/virperf.h +++ b/src/util/virperf.h @@ -60,14 +60,18 @@ virPerfPtr virPerfNew(void); void virPerfFree(virPerfPtr perf); -int virPerfEventEnable(virPerfPtr perf, - virPerfEventType type, - pid_t pid); +int virPerfEventSetFd(virPerfPtr perf, + virPerfEventType type, + pid_t pid, int state); + +int virPerfEventEnable(int fd); + +int virPerfEventReset(int fd); int virPerfEventDisable(virPerfPtr perf, virPerfEventType type); -bool virPerfEventIsEnabled(virPerfPtr perf, +int virPerfEventIsEnabled(virPerfPtr perf, virPerfEventType type); int virPerfReadEvent(virPerfPtr perf, diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 93587e8..806490b 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -8794,7 +8794,7 @@ cmdMemtune(vshControl *ctl, const vshCmd *cmd) */ static const vshCmdInfo info_perf[] = { {.name = "help", - .data = N_("Get or set perf event") + .data = N_("Get, set or reset perf event") }, {.name = "desc", .data = N_("Get or set the current perf events for a guest" @@ -8815,6 +8815,10 @@ static const vshCmdOptDef opts_perf[] = { .type = VSH_OT_STRING, .help = N_("perf events which will be disabled") }, + {.name = "reset", + .type = VSH_OT_STRING, + .help = N_("perf events which will be reset") + }, VIRSH_COMMON_OPT_DOMAIN_CONFIG, VIRSH_COMMON_OPT_DOMAIN_LIVE, VIRSH_COMMON_OPT_DOMAIN_CURRENT, @@ -8823,7 +8827,7 @@ static const vshCmdOptDef opts_perf[] = { static int virshParseEventStr(const char *event, - bool state, + int state, virTypedParameterPtr *params, int *nparams, int *maxparams) @@ -8837,7 +8841,7 @@ virshParseEventStr(const char *event, for (i = 0; i < ntok; i++) { if ((*tok[i] != '\0') && - virTypedParamsAddBoolean(params, nparams, + virTypedParamsAddInt(params, nparams, maxparams, tok[i], state) < 0) goto cleanup; } @@ -8854,9 +8858,11 @@ virshPrintPerfStatus(vshControl *ctl, virTypedParameterPtr params, int nparams) size_t i; for (i = 0; i < nparams; i++) { - if (params[i].type == VIR_TYPED_PARAM_BOOLEAN && - params[i].value.b) { + if (params[i].type == VIR_TYPED_PARAM_INT && + params[i].value.i == VIR_PERF_STATE_ENABLED) { vshPrintExtra(ctl, "%-15s: %s\n", params[i].field, _("enabled")); + } else if (params[i].value.i == VIR_PERF_STATE_RESET) { + vshPrintExtra(ctl, "%-15s: %s\n", params[i].field, _("reset")); } else { vshPrintExtra(ctl, "%-15s: %s\n", params[i].field, _("disabled")); } @@ -8871,14 +8877,16 @@ cmdPerf(vshControl *ctl, const vshCmd *cmd) int maxparams = 0; virTypedParameterPtr params = NULL; bool ret = false; - const char *enable = NULL, *disable = NULL; + const char *enable = NULL, *disable = NULL, *resett = NULL; unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; bool current = vshCommandOptBool(cmd, "current"); bool config = vshCommandOptBool(cmd, "config"); bool live = vshCommandOptBool(cmd, "live"); + bool reset = vshCommandOptBool(cmd, "reset"); VSH_EXCLUSIVE_OPTIONS_VAR(current, live); VSH_EXCLUSIVE_OPTIONS_VAR(current, config); + VSH_EXCLUSIVE_OPTIONS_VAR(reset, config); if (config) flags |= VIR_DOMAIN_AFFECT_CONFIG; @@ -8886,18 +8894,23 @@ cmdPerf(vshControl *ctl, const vshCmd *cmd) flags |= VIR_DOMAIN_AFFECT_LIVE; if (vshCommandOptStringReq(ctl, cmd, "enable", &enable) < 0 || - vshCommandOptStringReq(ctl, cmd, "disable", &disable) < 0) + vshCommandOptStringReq(ctl, cmd, "disable", &disable) < 0 || + vshCommandOptStringReq(ctl, cmd, "reset", &resett) < 0) return false; if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; - if (enable && virshParseEventStr(enable, true, &params, - &nparams, &maxparams) < 0) + if (enable && virshParseEventStr(enable, VIR_PERF_STATE_ENABLED, + &params, &nparams, &maxparams) < 0) + goto cleanup; + + if (disable && virshParseEventStr(disable, VIR_PERF_STATE_DISABLED, + &params, &nparams, &maxparams) < 0) goto cleanup; - if (disable && virshParseEventStr(disable, false, &params, - &nparams, &maxparams) < 0) + if (resett && virshParseEventStr(resett, VIR_PERF_STATE_RESET, + &params, &nparams, &maxparams) < 0) goto cleanup; if (nparams == 0) { @@ -8908,7 +8921,7 @@ cmdPerf(vshControl *ctl, const vshCmd *cmd) virshPrintPerfStatus(ctl, params, nparams); } else { if (virDomainSetPerfEvents(dom, params, nparams, flags) != 0) { - vshError(ctl, "%s", _("Unable to enable/disable perf events")); + vshError(ctl, "%s", _("Unable to enable/disable/reset perf events")); goto cleanup; } else { virshPrintPerfStatus(ctl, params, nparams); -- 1.9.3

2 4

[libvirt] [PATCH 0/2] *** Expose host's cache information in capabilities ***
by Eli Qiao 25 Jan '17

25 Jan '17

This series patches are the first step to support CAT featues, which also called cache tune in libvirt. First to expose cache information which could be tuned in capabilites XML, later will add some more interface to do cache tune. Some discussion about this feature support can be found from: https://www.redhat.com/archives/libvir-list/2017-January/msg00644.html Eli Qiao (2): Resctrl: Add some utils functions Resctrl: expose cache information to capabilities include/libvirt/virterror.h | 1 + src/Makefile.am | 1 + src/conf/capabilities.c | 30 +++ src/conf/capabilities.h | 15 ++ src/libvirt_private.syms | 5 + src/qemu/qemu_capabilities.c | 42 ++++ src/qemu/qemu_driver.c | 4 + src/util/virerror.c | 1 + src/util/virresctrl.c | 500 +++++++++++++++++++++++++++++++++++++++++++ src/util/virresctrl.h | 121 +++++++++++ tests/Makefile.am | 4 + 11 files changed, 724 insertions(+) create mode 100644 src/util/virresctrl.c create mode 100644 src/util/virresctrl.h -- 1.9.1

3 4

[libvirt] [PATCH v2] network: make openvswitch call timeout compile time configurable
by Boris Fiuczynski 25 Jan '17

25 Jan '17

Since a successful completion of the calls to openvswitch is expected a long timeout should be chosen to account for heavily loaded systems. Therefore this patch increases the timeout value from 5 to 120 seconds as default value and also allows to set the openvswitch timeout value by specifying with-ovs-timeout when running configure. Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> Reviewed-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> Reviewed-by: Marc Hartmayer <mhartmay(a)linux.vnet.ibm.com> --- configure.ac | 3 +++ m4/virt-ovs-timeout.m4 | 34 ++++++++++++++++++++++++++++++++++ src/util/virnetdevopenvswitch.c | 9 +++++---- 3 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 m4/virt-ovs-timeout.m4 diff --git a/configure.ac b/configure.ac index 7efaddb..e70dfdc 100644 --- a/configure.ac +++ b/configure.ac @@ -463,6 +463,7 @@ LIBVIRT_ARG_LOADER_NVRAM LIBVIRT_ARG_LOGIN_SHELL LIBVIRT_ARG_HOST_VALIDATE LIBVIRT_ARG_TLS_PRIORITY +LIBVIRT_ARG_OVS_TIMEOUT LIBVIRT_ARG_SYSCTL_CONFIG @@ -477,6 +478,7 @@ LIBVIRT_CHECK_LOADER_NVRAM LIBVIRT_CHECK_LOGIN_SHELL LIBVIRT_CHECK_HOST_VALIDATE LIBVIRT_CHECK_TLS_PRIORITY +LIBVIRT_CHECK_OVS_TIMEOUT LIBVIRT_CHECK_SYSCTL_CONFIG LIBVIRT_CHECK_NSS @@ -1012,6 +1014,7 @@ LIBVIRT_RESULT_LOADER_NVRAM LIBVIRT_RESULT_LOGIN_SHELL LIBVIRT_RESULT_HOST_VALIDATE LIBVIRT_RESULT_TLS_PRIORITY +LIBVIRT_RESULT_OVS_TIMEOUT AC_MSG_NOTICE([]) AC_MSG_NOTICE([Developer Tools]) AC_MSG_NOTICE([]) diff --git a/m4/virt-ovs-timeout.m4 b/m4/virt-ovs-timeout.m4 new file mode 100644 index 0000000..a5174d5 --- /dev/null +++ b/m4/virt-ovs-timeout.m4 @@ -0,0 +1,34 @@ +dnl The OVS timeout check +dnl +dnl Copyright (C) 2017 IBM Corporation +dnl +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License, or (at your option) any later version. +dnl +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. +dnl +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library. If not, see +dnl <http://www.gnu.org/licenses/>. +dnl + +AC_DEFUN([LIBVIRT_ARG_OVS_TIMEOUT], [ + LIBVIRT_ARG_WITH([OVS_TIMEOUT], + [set the default OVS timeout], + 120) +]) + +AC_DEFUN([LIBVIRT_CHECK_OVS_TIMEOUT], [ + AC_DEFINE_UNQUOTED([OVS_TIMEOUT], ["$with_ovs_timeout"], + [default OVS timeout]) +]) + +AC_DEFUN([LIBVIRT_RESULT_OVS_TIMEOUT], [ +dnl AC_MSG_NOTICE([OVS timeout: $with_ovs_timeout]) + LIBVIRT_RESULT([ OVS timeout], [$with_ovs_timeout]) +]) diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index e6cb096..ba44b3b 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -35,6 +35,7 @@ #include "virlog.h" #define VIR_FROM_THIS VIR_FROM_NONE +#define OVS_TIMEOUT_ARG "--timeout=" OVS_TIMEOUT VIR_LOG_INIT("util.netdevopenvswitch"); @@ -89,7 +90,7 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname, cmd = virCommandNew(OVSVSCTL); - virCommandAddArgList(cmd, "--timeout=5", "--", "--if-exists", "del-port", + virCommandAddArgList(cmd, OVS_TIMEOUT_ARG, "--", "--if-exists", "del-port", ifname, "--", "add-port", brname, ifname, NULL); if (virtVlan && virtVlan->nTags > 0) { @@ -183,7 +184,7 @@ int virNetDevOpenvswitchRemovePort(const char *brname ATTRIBUTE_UNUSED, const ch virCommandPtr cmd = NULL; cmd = virCommandNew(OVSVSCTL); - virCommandAddArgList(cmd, "--timeout=5", "--", "--if-exists", "del-port", ifname, NULL); + virCommandAddArgList(cmd, OVS_TIMEOUT_ARG, "--", "--if-exists", "del-port", ifname, NULL); if (virCommandRun(cmd, NULL) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -212,7 +213,7 @@ int virNetDevOpenvswitchGetMigrateData(char **migrate, const char *ifname) size_t len; int ret = -1; - cmd = virCommandNewArgList(OVSVSCTL, "--timeout=5", "--if-exists", "get", "Interface", + cmd = virCommandNewArgList(OVSVSCTL, OVS_TIMEOUT_ARG, "--if-exists", "get", "Interface", ifname, "external_ids:PortData", NULL); virCommandSetOutputBuffer(cmd, migrate); @@ -255,7 +256,7 @@ int virNetDevOpenvswitchSetMigrateData(char *migrate, const char *ifname) return 0; } - cmd = virCommandNewArgList(OVSVSCTL, "--timeout=5", "set", + cmd = virCommandNewArgList(OVSVSCTL, OVS_TIMEOUT_ARG, "set", "Interface", ifname, NULL); virCommandAddArgFormat(cmd, "external_ids:PortData=%s", migrate); -- 2.5.5

3 4

[libvirt] [PATCH] configure: fix indentation in TLS priority result
by Boris Fiuczynski 25 Jan '17

25 Jan '17

Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> --- m4/virt-tls-priority.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/virt-tls-priority.m4 b/m4/virt-tls-priority.m4 index f7a6c56..44d9f68 100644 --- a/m4/virt-tls-priority.m4 +++ b/m4/virt-tls-priority.m4 @@ -29,5 +29,5 @@ AC_DEFUN([LIBVIRT_CHECK_TLS_PRIORITY], [ ]) AC_DEFUN([LIBVIRT_RESULT_TLS_PRIORITY], [ - LIBVIRT_RESULT([TLS priority], [$with_tls_priority]) + LIBVIRT_RESULT([ TLS priority], [$with_tls_priority]) ]) -- 2.5.5

2 2

[libvirt] [PATCH] THREADS.txt: fix typos
by Chen Hanxiao 25 Jan '17

25 Jan '17

From: Chen Hanxiao <chenhanxiao(a)gmail.com> s/wakup/wakeup Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- daemon/THREADS.txt | 2 +- src/util/vireventpoll.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/daemon/THREADS.txt b/daemon/THREADS.txt index 762ca25..ae4e9ba 100644 --- a/daemon/THREADS.txt +++ b/daemon/THREADS.txt @@ -42,7 +42,7 @@ event loop thread handles I/O from the client socket, and once a complete RPC message has been read off the wire (and optionally decrypted), it will be placed on the 'dx' job queue for the associated client object. The job condition will be signalled and -a worker will wakup and process it. +a worker will wakeup and process it. The worker thread must quickly drop its locks on the server and client to allow the main event loop thread to continue running diff --git a/src/util/vireventpoll.h b/src/util/vireventpoll.h index 8844c9c..e78e273 100644 --- a/src/util/vireventpoll.h +++ b/src/util/vireventpoll.h @@ -124,7 +124,7 @@ int virEventPollToNativeEvents(int events); /** * virEventPollInterrupt: wakeup any thread waiting in poll() * - * return -1 if wakup failed + * return -1 if wakeup failed */ int virEventPollInterrupt(void); -- 2.7.4

2 1

[libvirt] [PATCH 0/4] Xen: Improve support for <timer> configurations
by Jim Fehlig 25 Jan '17

25 Jan '17

This series fixes some issues wrt <timer> configuration in the libxl driver and the xenconfig parser/formatter. See patches 1 and 2 for details on the libxl driver changes, and patch 3 for details on the xenconfig parser/formatter changes. Patch 4 adds some tests to check domXML <-> xl.cfg conversions of <timer> configuration. Jim Fehlig (4): libxl: fix timer configuration libxl: support emulate mode of tsc timer xenconfig: add support for more timers tests: add xlconfig tests for <timer> configurations src/libxl/libxl_conf.c | 49 +++++++++---- src/xenconfig/xen_common.c | 87 +++++++++++++++++++++--- tests/xlconfigdata/test-fullvirt-hpet-timer.cfg | 27 ++++++++ tests/xlconfigdata/test-fullvirt-hpet-timer.xml | 64 +++++++++++++++++ tests/xlconfigdata/test-fullvirt-multi-timer.cfg | 28 ++++++++ tests/xlconfigdata/test-fullvirt-multi-timer.xml | 65 ++++++++++++++++++ tests/xlconfigdata/test-fullvirt-tsc-timer.cfg | 27 ++++++++ tests/xlconfigdata/test-fullvirt-tsc-timer.xml | 64 +++++++++++++++++ tests/xlconfigtest.c | 3 + 9 files changed, 392 insertions(+), 22 deletions(-) create mode 100644 tests/xlconfigdata/test-fullvirt-hpet-timer.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-hpet-timer.xml create mode 100644 tests/xlconfigdata/test-fullvirt-multi-timer.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-multi-timer.xml create mode 100644 tests/xlconfigdata/test-fullvirt-tsc-timer.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-tsc-timer.xml -- 2.9.2

2 11

[libvirt] [PATCH 0/3] support setting MTU of libvirt networks
by Laine Stump 24 Jan '17

24 Jan '17

This has been requested several times in #virt on IRC, and on libvirt-users, and a comment posted to https://bugzilla.redhat.com/1224348 reminded me that there's even an open BZ for it, so I finally sat down and wrote the patches for it. The idea of the patches is that an *empty* bridge device can't have its MTU directly set to anything higher than 1500, but once there are any devices on the bridge, its MTU is limited to the smallest of the MTUs of any attached devices. However, when the very first device is attached to the bridge, the bridge will *increase* its own MTU to match if needed. So the trick to setting a high MTU is to set the MTU of every device to the desired value before it is added (especially the first). libvirt already sets the MTU of every device to the MTU of the bridge, so all we need to do is make it so the first device is set from the network config's "mtu" attribute instead - the bridge will get the larger MTU, and all future devices added will get the higher MTU as well. This doesn't take care of setting the MTU on the guest side of the tap device; for now that must be done manually, but qemu has recently added a commandline parameter to send the desired MTU to the guest, and the virtio-net guest driver at least honors this. An upcoming patch to libvirt will automatically set this qemu commandline option so that no intervention will be required (beyond setting the MTU once in the network config). Laine Stump (3): util: add MTU arg to virNetDevTapCreateInBridgePort() conf: support mtu attribute in a network's <bridge> element network: honor mtu setting when creating network docs/formatnetwork.html.in | 8 +++++++- docs/news.xml | 6 +++++- docs/schemas/network.rng | 6 ++++++ src/bhyve/bhyve_command.c | 2 +- src/conf/network_conf.c | 20 ++++++++++++++++++-- src/conf/network_conf.h | 1 + src/network/bridge_driver.c | 1 + src/qemu/qemu_interface.c | 2 +- src/uml/uml_conf.c | 2 +- src/util/virnetdevtap.c | 20 +++++++++++++++----- src/util/virnetdevtap.h | 1 + tests/bhyvexml2argvmock.c | 1 + tests/networkxml2xmlin/set-mtu.xml | 11 +++++++++++ tests/networkxml2xmlout/set-mtu.xml | 11 +++++++++++ tests/networkxml2xmltest.c | 1 + 15 files changed, 81 insertions(+), 12 deletions(-) create mode 100644 tests/networkxml2xmlin/set-mtu.xml create mode 100644 tests/networkxml2xmlout/set-mtu.xml -- 2.9.3

2 7

[libvirt] [PATCH v2 1/2] util: virhostdev: disallow assigning a pci-bridge to a guest
by Shivaprasad G Bhat 23 Jan '17

23 Jan '17

Non-endpoint devices like pci-bridges cannot be passedthrough to guests. Prevent such attempts. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/util/virhostdev.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c index 0673afb..b23fe1f 100644 --- a/src/util/virhostdev.c +++ b/src/util/virhostdev.c @@ -532,6 +532,16 @@ virHostdevPreparePCIDevices(virHostdevManagerPtr mgr, bool strict_acs_check = !!(flags & VIR_HOSTDEV_STRICT_ACS_CHECK); bool usesVFIO = (virPCIDeviceGetStubDriver(pci) == VIR_PCI_STUB_DRIVER_VFIO); struct virHostdevIsPCINodeDeviceUsedData data = { mgr, dom_name, usesVFIO }; + int hdrType = -1; + + if (virPCIGetHeaderType(pci, &hdrType) < 0) + goto cleanup; + + if (hdrType != VIR_PCI_HEADER_ENDPOINT) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("PCI bridge devices " + "cannot be assigned to guests")); + goto cleanup; + } if (!usesVFIO && !virPCIDeviceIsAssignable(pci, strict_acs_check)) { virReportError(VIR_ERR_OPERATION_INVALID,

3 4

[libvirt] [PATCH go] Fix segfault in Connect.GetMemoryStats
by Matvey Kruglov 23 Jan '17

23 Jan '17

*** BLURB HERE *** Matvey Kruglov (1): Fix segfault in Connect.GetMemoryStats connect.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4

2 2

[libvirt] [PATCH v2] util: disallow assigning or resetting a pci-bridge device
by Shivaprasad G Bhat 23 Jan '17

23 Jan '17

It is destructive to attempt reset on a pci-bridge, the host can crash. The bridges won't contain any guest data and neither they can be passed through using vfio/stub. So, no point in allowing a reset on them. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/util/virhostdev.c | 10 ++++++++++ src/util/virpci.c | 11 +++++++++++ 2 files changed, 21 insertions(+) diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c index 0673afb..16b96f3 100644 --- a/src/util/virhostdev.c +++ b/src/util/virhostdev.c @@ -532,6 +532,16 @@ virHostdevPreparePCIDevices(virHostdevManagerPtr mgr, bool strict_acs_check = !!(flags & VIR_HOSTDEV_STRICT_ACS_CHECK); bool usesVFIO = (virPCIDeviceGetStubDriver(pci) == VIR_PCI_STUB_DRIVER_VFIO); struct virHostdevIsPCINodeDeviceUsedData data = { mgr, dom_name, usesVFIO }; + int hdrType = -1; + + if (virPCIGetHeaderType(pci, &hdrType) < 0) + goto cleanup; + + if (hdrType == VIR_PCI_HEADER_PCI_BRIDGE) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("PCI bridge devices" + " cannot be assigned to guests")); + goto cleanup; + } if (!usesVFIO && !virPCIDeviceIsAssignable(pci, strict_acs_check)) { virReportError(VIR_ERR_OPERATION_INVALID, diff --git a/src/util/virpci.c b/src/util/virpci.c index 0601f49..f205abf 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -933,6 +933,17 @@ virPCIDeviceReset(virPCIDevicePtr dev, char *drvName = NULL; int ret = -1; int fd = -1; + int hdrType = -1; + + if (virPCIGetHeaderType(dev, &hdrType) < 0) + return -1; + + if (hdrType != VIR_PCI_HEADER_ENDPOINT) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Invalid attempt to reset non-endpoint PCI device %s." + " Only PCI endpoint devices can be reset"), dev->name); + return -1; + } if (activeDevs && virPCIDeviceListFind(activeDevs, dev)) { virReportError(VIR_ERR_INTERNAL_ERROR,

3 3

[libvirt] [PATCH resend v2 0/2] Allow saving QEMU libvirt state to a pipe
by Chen Hanxiao 22 Jan '17

22 Jan '17

This series introduce flag VIR_DOMAIN_SAVE_DIRECT to enable command 'save' to write to PIPE. Base upon patches from Roy Keene <rkeene(a)knightpoint.com> with some fixes. Change from original patch: 1) Check whether the specified path is a PIPE. 2) Rebase on upstream. 3) Add doc for virsh command v2-resend: rebase on upstream v2: rename VIR_DOMAIN_SAVE_PIPE to VIR_DOMAIN_SAVE_DIRECT remove S_ISFIFO check Chen Hanxiao (2): qemu: Allow saving QEMU libvirt state to a pipe virsh: introduce flage --direct for save command include/libvirt/libvirt-domain.h | 1 + src/qemu/qemu_driver.c | 54 ++++++++++++++++++++++++++-------------- tools/virsh-domain.c | 6 +++++ tools/virsh.pod | 5 +++- 4 files changed, 47 insertions(+), 19 deletions(-) -- 2.7.4

1 3

[libvirt] [PATCH v2] qemu_domain: add timestamp in tainting of guests log
by Chen Hanxiao 21 Jan '17

21 Jan '17

From: Chen Hanxiao <chenhanxiao(a)gmail.com> We lacked of timestamp in tainting of guests log, which bring troubles for finding guest issues: such as whether a guest powerdown caused by qemu-monitor-command or others issues inside guests. If we had timestamp in tainting of guests log, it would be helpful when checking guest's /var/log/messages. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- v2: update logic flow of virDomainObjTaint check src/qemu/qemu_domain.c | 79 +++++++++++++++++++++++++++----------------------- 1 file changed, 42 insertions(+), 37 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index c676042..2bc023c 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3999,46 +3999,51 @@ void qemuDomainObjTaint(virQEMUDriverPtr driver, { virErrorPtr orig_err = NULL; bool closeLog = false; + char *timestamp = NULL; + char uuidstr[VIR_UUID_STRING_BUFLEN]; - if (virDomainObjTaint(obj, taint)) { - char uuidstr[VIR_UUID_STRING_BUFLEN]; - virUUIDFormat(obj->def->uuid, uuidstr); - - VIR_WARN("Domain id=%d name='%s' uuid=%s is tainted: %s", - obj->def->id, - obj->def->name, - uuidstr, - virDomainTaintTypeToString(taint)); - - /* We don't care about errors logging taint info, so - * preserve original error, and clear any error that - * is raised */ - orig_err = virSaveLastError(); - if (logCtxt == NULL) { - logCtxt = qemuDomainLogContextNew(driver, obj, - QEMU_DOMAIN_LOG_CONTEXT_MODE_ATTACH); - if (!logCtxt) { - if (orig_err) { - virSetError(orig_err); - virFreeError(orig_err); - } - VIR_WARN("Unable to open domainlog"); - return; - } - closeLog = true; - } + if (!virDomainObjTaint(obj, taint)) + return; + + virUUIDFormat(obj->def->uuid, uuidstr); + + VIR_WARN("Domain id=%d name='%s' uuid=%s is tainted: %s", + obj->def->id, + obj->def->name, + uuidstr, + virDomainTaintTypeToString(taint)); - if (qemuDomainLogContextWrite(logCtxt, - "Domain id=%d is tainted: %s\n", - obj->def->id, - virDomainTaintTypeToString(taint)) < 0) - virResetLastError(); - if (closeLog) - qemuDomainLogContextFree(logCtxt); - if (orig_err) { - virSetError(orig_err); - virFreeError(orig_err); + if ((timestamp = virTimeStringNow()) == NULL) + goto cleanup; + + /* We don't care about errors logging taint info, so + * preserve original error, and clear any error that + * is raised */ + orig_err = virSaveLastError(); + if (logCtxt == NULL) { + logCtxt = qemuDomainLogContextNew(driver, obj, + QEMU_DOMAIN_LOG_CONTEXT_MODE_ATTACH); + if (!logCtxt) { + VIR_WARN("Unable to open domainlog"); + goto cleanup; } + closeLog = true; + } + + if (qemuDomainLogContextWrite(logCtxt, + "%s: Domain id=%d is tainted: %s\n", + timestamp, + obj->def->id, + virDomainTaintTypeToString(taint)) < 0) + virResetLastError(); + + cleanup: + VIR_FREE(timestamp); + if (closeLog) + qemuDomainLogContextFree(logCtxt); + if (orig_err) { + virSetError(orig_err); + virFreeError(orig_err); } } -- 2.7.4

2 1

[libvirt] [PATCH 0/9] i386: query-cpu-model-expansion test script
by Eduardo Habkost 20 Jan '17

20 Jan '17

This is a follow-up to the series that implements query-cpu-model-expansion. Before including the test script, the series has some fixes to allow the results of query-cpu-model-expansion to be used in the QEMU command-line. The script probably will work on s390x too, but I couldn't test it yet. This series and its dependencies can be pulled from the branch: https://github.com/ehabkost/qemu-hacks.git work/x86-query-cpu-expansion-test --- Cc: Cornelia Huck <cornelia.huck(a)de.ibm.com> Cc: Christian Borntraeger <borntraeger(a)de.ibm.com> Cc: David Hildenbrand <david(a)redhat.com> Cc: libvir-list(a)redhat.com Cc: Jiri Denemark <jdenemar(a)redhat.com> Cc: "Jason J. Herne" <jjherne(a)linux.vnet.ibm.com> Cc: Markus Armbruster <armbru(a)redhat.com> Cc: Richard Henderson <rth(a)twiddle.net> Cc: Igor Mammedov <imammedo(a)redhat.com> Cc: Eric Blake <eblake(a)redhat.com> Eduardo Habkost (9): target-i386: Move "host" properties to base class target-i386: Allow short strings to be used as vendor ID cpu: Support comma escaping when parsing -cpu qemu.py: Make logging optional qtest.py: Support QTEST_LOG environment variable qtest.py: make logging optional qtest.py: Make 'binary' parameter optional tests: Add rules to non-gtester qtest test cases tests: Test case for query-cpu-model-expansion scripts/qemu.py | 25 ++- scripts/qtest.py | 15 +- qom/cpu.c | 32 ++-- target/i386/cpu.c | 83 ++++----- tests/test-x86-cpuid-compat.c | 19 ++ tests/Makefile.include | 40 ++++- tests/query-cpu-model-test.py | 398 ++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 551 insertions(+), 61 deletions(-) create mode 100755 tests/query-cpu-model-test.py -- 2.11.0.259.g40922b1

4 10

[libvirt] [PATCH python] Protect against user accidentally calling constructors directly
by Daniel P. Berrange 20 Jan '17

20 Jan '17

When using libvirt python you must never call the object constructors directly, as these are expecting to be passed a wrapped C object. For example import libvirt c = libvirt.virConnect("qemu:///system") c.listAllDomains() will mysteriously segfault. With this change the user now gets an slightly more helpful error Traceback (most recent call last): File "<stdin>", line 1, in <module> File "/home/berrange/src/virt/libvirt-python/build/libvirt.py", line 3409, in __init__ raise Exception("Expected a wrapped C Object but got %s" % type(_obj)) Exception: Expected a wrapped C Object but got <type 'str'> Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- generator.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/generator.py b/generator.py index e9be8b1..6bcf80b 100755 --- a/generator.py +++ b/generator.py @@ -1532,6 +1532,8 @@ def buildWrappers(module): elif classname in [ "virDomainSnapshot" ]: classes.write(" self._dom = dom\n") classes.write(" self._conn = dom.connect()\n") + classes.write(" if type(_obj).__name__ not in [\"PyCapsule\", \"PyCObject\"]:\n") + classes.write(" raise Exception(\"Expected a wrapped C Object but got %s\" % type(_obj))\n") classes.write(" self._o = _obj\n\n") destruct=None if classname in classes_destructors: -- 2.9.3

2 1

[libvirt] [PATCH] virDomainHostdevSubsysSCSIVHostDefParseXML: Don't leak @wwpn
by Michal Privoznik 20 Jan '17

20 Jan '17

==24748== 12 bytes in 2 blocks are definitely lost in loss record 25 of 84 ==24748== at 0x4C2BF80: malloc (vg_replace_malloc.c:296) ==24748== by 0x1A1E1E78: xmlStrndup (in /usr/lib64/libxml2.so.2.9.4) ==24748== by 0x18D0495F: virXMLPropString (virxml.c:506) ==24748== by 0x18D1FB3E: virDomainHostdevSubsysSCSIVHostDefParseXML (domain_conf.c:6280) ==24748== by 0x18D20350: virDomainHostdevDefParseXMLSubsys (domain_conf.c:6450) ==24748== by 0x18D34E7D: virDomainHostdevDefParseXML (domain_conf.c:13218) ==24748== by 0x18D42598: virDomainDefParseXML (domain_conf.c:17745) ==24748== by 0x18D440A9: virDomainDefParseNode (domain_conf.c:18236) ==24748== by 0x18D43EFA: virDomainDefParse (domain_conf.c:18180) ==24748== by 0x18D43FA0: virDomainDefParseFile (domain_conf.c:18206) ==24748== by 0x44EDA1: testCompareDomXML2XMLFiles (testutils.c:1140) ==24748== by 0x4365F8: testXML2XMLActive (qemuxml2xmltest.c:59) Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_conf.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 52aee2b02..55d2c25b2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6274,13 +6274,14 @@ static int virDomainHostdevSubsysSCSIVHostDefParseXML(xmlNodePtr sourcenode, virDomainHostdevDefPtr def) { - char *protocol = NULL; + char *protocol = NULL, *wwpn = NULL; virDomainHostdevSubsysSCSIVHostPtr hostsrc = &def->source.subsys.u.scsi_host; + int ret = -1; if (!(protocol = virXMLPropString(sourcenode, "protocol"))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Missing scsi_host subsystem protocol")); - return -1; + return ret; } if ((hostsrc->protocol = @@ -6293,17 +6294,19 @@ virDomainHostdevSubsysSCSIVHostDefParseXML(xmlNodePtr sourcenode, switch ((virDomainHostdevSubsysSCSIHostProtocolType) hostsrc->protocol) { case VIR_DOMAIN_HOSTDEV_SUBSYS_SCSI_HOST_PROTOCOL_TYPE_VHOST: - if (!(hostsrc->wwpn = virXMLPropString(sourcenode, "wwpn"))) { + if (!(wwpn = virXMLPropString(sourcenode, "wwpn"))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("missing vhost-scsi hostdev source wwpn")); goto cleanup; } - if (!STRPREFIX(hostsrc->wwpn, "naa.") || - !virValidateWWN(hostsrc->wwpn + 4)) { + if (!STRPREFIX(wwpn, "naa.") || + !virValidateWWN(wwpn + 4)) { virReportError(VIR_ERR_XML_ERROR, "%s", _("malformed 'wwpn' value")); goto cleanup; } + hostsrc->wwpn = wwpn; + wwpn = NULL; break; case VIR_DOMAIN_HOSTDEV_SUBSYS_SCSI_HOST_PROTOCOL_TYPE_NONE: case VIR_DOMAIN_HOSTDEV_SUBSYS_SCSI_HOST_PROTOCOL_TYPE_LAST: @@ -6314,12 +6317,11 @@ virDomainHostdevSubsysSCSIVHostDefParseXML(xmlNodePtr sourcenode, break; } - return 0; - + ret = 0; cleanup: - VIR_FREE(hostsrc->wwpn); + VIR_FREE(wwpn); VIR_FREE(protocol); - return -1; + return ret; } -- 2.11.0

2 1

[libvirt] [PATCH v3] qemu: set default vhost-user ifname
by Michal Privoznik 20 Jan '17

20 Jan '17

Based on work of Mehdi Abaakouk <sileht(a)sileht.net>. When parsing vhost-user interface XML and no ifname is found we can try to fill it in in post parse callback. The way this works is we try to make up interface name from given socket path and then ask openvswitch wether it knows the interface. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v2: - All the review points from v2 worked in src/libvirt_private.syms | 1 + src/qemu/qemu_domain.c | 21 +++++--- src/util/virnetdevopenvswitch.c | 58 ++++++++++++++++++++++ src/util/virnetdevopenvswitch.h | 4 ++ tests/Makefile.am | 7 +++ tests/qemuxml2argvmock.c | 8 +++ tests/qemuxml2xmlmock.c | 33 ++++++++++++ .../qemuxml2xmlout-net-vhostuser.xml | 2 + tests/qemuxml2xmltest.c | 2 +- 9 files changed, 129 insertions(+), 7 deletions(-) create mode 100644 tests/qemuxml2xmlmock.c diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 2d23e462d..9e4e8f83f 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2057,6 +2057,7 @@ virNetDevMidonetUnbindPort; # util/virnetdevopenvswitch.h virNetDevOpenvswitchAddPort; virNetDevOpenvswitchGetMigrateData; +virNetDevOpenvswitchGetVhostuserIfname; virNetDevOpenvswitchInterfaceStats; virNetDevOpenvswitchRemovePort; virNetDevOpenvswitchSetMigrateData; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index acfa69589..eed5745b6 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -41,6 +41,7 @@ #include "domain_addr.h" #include "domain_event.h" #include "virtime.h" +#include "virnetdevopenvswitch.h" #include "virstoragefile.h" #include "virstring.h" #include "virthreadjob.h" @@ -3028,12 +3029,20 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, def->emulator); } - if (dev->type == VIR_DOMAIN_DEVICE_NET && - dev->data.net->type != VIR_DOMAIN_NET_TYPE_HOSTDEV && - !dev->data.net->model) { - if (VIR_STRDUP(dev->data.net->model, - qemuDomainDefaultNetModel(def, qemuCaps)) < 0) - goto cleanup; + if (dev->type == VIR_DOMAIN_DEVICE_NET) { + if (dev->data.net->type != VIR_DOMAIN_NET_TYPE_HOSTDEV && + !dev->data.net->model) { + if (VIR_STRDUP(dev->data.net->model, + qemuDomainDefaultNetModel(def, qemuCaps)) < 0) + goto cleanup; + } + if (dev->data.net->type == VIR_DOMAIN_NET_TYPE_VHOSTUSER && + !dev->data.net->ifname) { + if (virNetDevOpenvswitchGetVhostuserIfname( + dev->data.net->data.vhostuser->data.nix.path, + &dev->data.net->ifname) < 0) + goto cleanup; + } } /* set default disk types and drivers */ diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index f003b3b13..d93653317 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -377,3 +377,61 @@ virNetDevOpenvswitchInterfaceStats(const char *ifname, virCommandFree(cmd); return ret; } + +/** + * virNetDevOpenvswitchVhostuserGetIfname: + * @path: the path of the unix socket + * @ifname: the retrieved name of the interface + * + * Retreives the ovs ifname from vhostuser unix socket path. + * + * Returns: 1 if interface is an openvswitch interface, + * 0 if it is not, but no other error occurred, + * -1 otherwise. + */ +int +virNetDevOpenvswitchGetVhostuserIfname(const char *path, + char **ifname) +{ + virCommandPtr cmd = NULL; + char *tmpIfname = NULL; + char **tokens = NULL; + size_t ntokens = 0; + int status; + int ret = -1; + + /* Openvswitch vhostuser path are hardcoded to + * /<runstatedir>/openvswitch/<ifname> + * for example: /var/run/openvswitch/dpdkvhostuser0 + * + * so we pick the filename and check it's a openvswitch interface + */ + if ((tokens = virStringSplitCount(path, "/", 0, &ntokens))) { + if (VIR_STRDUP(tmpIfname, tokens[ntokens - 1]) < 0) + goto cleanup; + } + + if (!tmpIfname) { + ret = 0; + goto cleanup; + } + + cmd = virCommandNewArgList(OVSVSCTL, "--timeout=5", "get", "Interface", + tmpIfname, "name", NULL); + if (virCommandRun(cmd, &status) < 0 || + status) { + /* it's not a openvswitch vhostuser interface. */ + ret = 0; + goto cleanup; + } + + *ifname = tmpIfname; + tmpIfname = NULL; + ret = 1; + + cleanup: + virStringListFreeCount(tokens, ntokens); + virCommandFree(cmd); + VIR_FREE(tmpIfname); + return ret; +} diff --git a/src/util/virnetdevopenvswitch.h b/src/util/virnetdevopenvswitch.h index 0f9e1dfa6..8f5faf14e 100644 --- a/src/util/virnetdevopenvswitch.h +++ b/src/util/virnetdevopenvswitch.h @@ -52,4 +52,8 @@ int virNetDevOpenvswitchInterfaceStats(const char *ifname, virDomainInterfaceStatsPtr stats) ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; +int virNetDevOpenvswitchGetVhostuserIfname(const char *path, + char **ifname) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + #endif /* __VIR_NETDEV_OPENVSWITCH_H__ */ diff --git a/tests/Makefile.am b/tests/Makefile.am index ecd04e895..c8584fea6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -414,6 +414,7 @@ if WITH_QEMU test_libraries += libqemumonitortestutils.la \ libqemutestdriver.la \ qemuxml2argvmock.la \ + qemuxml2xmlmock.la \ qemucaps2xmlmock.la \ qemucapsprobemock.la \ $(NULL) @@ -571,6 +572,12 @@ qemuxml2argvmock_la_CFLAGS = $(AM_CFLAGS) qemuxml2argvmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) qemuxml2argvmock_la_LIBADD = $(MOCKLIBS_LIBS) +qemuxml2xmlmock_la_SOURCES = \ + qemuxml2xmlmock.c +qemuxml2xmlmock_la_CFLAGS = $(AM_CFLAGS) +qemuxml2xmlmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) +qemuxml2xmlmock_la_LIBADD = $(MOCKLIBS_LIBS) + qemuxml2xmltest_SOURCES = \ qemuxml2xmltest.c testutilsqemu.c testutilsqemu.h \ testutils.c testutils.h diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c index c501b59ac..177b24e0a 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -28,6 +28,7 @@ #include "virnetdev.h" #include "virnetdevip.h" #include "virnetdevtap.h" +#include "virnetdevopenvswitch.h" #include "virnuma.h" #include "virrandom.h" #include "virscsi.h" @@ -180,3 +181,10 @@ virCryptoGenerateRandom(size_t nbytes) return buf; } + +int +virNetDevOpenvswitchGetVhostuserIfname(const char *path ATTRIBUTE_UNUSED, + char **ifname) +{ + return VIR_STRDUP(*ifname, "vhost-user0"); +} diff --git a/tests/qemuxml2xmlmock.c b/tests/qemuxml2xmlmock.c new file mode 100644 index 000000000..0d3e6f2bd --- /dev/null +++ b/tests/qemuxml2xmlmock.c @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2016 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Author: Michal Privoznik <mprivozn(a)redhat.com> + */ + +#include <config.h> + +#include "virnetdevopenvswitch.h" +#include "virstring.h" + +#define VIR_FROM_THIS VIR_FROM_NONE + +int +virNetDevOpenvswitchGetVhostuserIfname(const char *path ATTRIBUTE_UNUSED, + char **ifname) +{ + return VIR_STRDUP(*ifname, "vhost-user0"); +} diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-vhostuser.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-vhostuser.xml index ac1d7e110..2bdcac358 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-vhostuser.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-vhostuser.xml @@ -30,12 +30,14 @@ <interface type='vhostuser'> <mac address='52:54:00:ee:96:6b'/> <source type='unix' path='/tmp/vhost0.sock' mode='server'/> + <target dev='vhost-user0'/> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> <interface type='vhostuser'> <mac address='52:54:00:ee:96:6c'/> <source type='unix' path='/tmp/vhost1.sock' mode='client'/> + <target dev='vhost-user0'/> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </interface> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index ddd17cb1e..30931f581 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1031,7 +1031,7 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/qemuxml2xmlmock.so") #else -- 2.11.0

3 3

[libvirt] [PATCH] qemu: hotplug: Properly emit "DEVICE_DELETED" event when unplugging memory
by Peter Krempa 20 Jan '17

20 Jan '17

The event needs to be emitted after the last monitor call, so that it's not possible to find the device in the XML accidentally while the vm object is unlocked. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1414393 --- src/qemu/qemu_hotplug.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 5b0a3f515..a6de25407 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3691,9 +3691,6 @@ qemuDomainRemoveMemoryDevice(virQEMUDriverPtr driver, VIR_DEBUG("Removing memory device %s from domain %p %s", mem->info.alias, vm, vm->def->name); - event = virDomainEventDeviceRemovedNewFromObj(vm, mem->info.alias); - qemuDomainEventQueue(driver, event); - if (virAsprintf(&backendAlias, "mem%s", mem->info.alias) < 0) return -1; @@ -3708,6 +3705,9 @@ qemuDomainRemoveMemoryDevice(virQEMUDriverPtr driver, if (rc < 0) return -1; + event = virDomainEventDeviceRemovedNewFromObj(vm, mem->info.alias); + qemuDomainEventQueue(driver, event); + if ((idx = virDomainMemoryFindByDef(vm->def, mem)) >= 0) virDomainMemoryRemove(vm->def, idx); -- 2.11.0

2 1

[libvirt] [ libvirt-python BUG ?] Memory leak in libvirt_virConnectDomainEventJobCompletedCallback
by Hailiang Zhang 20 Jan '17

20 Jan '17

Hi all, It seems that, there is a memory leak bug in libvirt_virConnectDomainEventJobCompletedCallback() function of libvirt-override.c. We didn't decrease the reference of 'pyobj_dict' in this function or any other places while pyt0bj_ret is not zero. libvirt_virConnectDomainEventJobCompletedCallback() { ... ... pyobj_ret = PyObject_CallMethod(pyobj_conn, (char*)"_dispatchDomainEventJobCompletedCallback", (char*)"OOO", pyobj_dom, pyobj_dict, pyobj_cbData); Py_DECREF(pyobj_cbData); Py_DECREF(pyobj_dom); cleanup: if (!pyobj_ret) { DEBUG("%s - ret:%p\n", __FUNCTION__, pyobj_ret); PyErr_Print(); Py_XDECREF(pyobj_dict); } else { Py_DECREF(pyobj_ret); ret = 0; } LIBVIRT_RELEASE_THREAD_STATE; return ret; } I don't think the reference of pyobj_dict will be stolen by PyObject_CallMethod when it is passed to the Python function _dispatchDomainEventJobCompletedCallback. In fact, we have a test which triggered lots of events and found that the memory of the test process will keep raising slowly and could not be reclaimed even we called gc.collect() explicitly in our codes. So, is it a bug ? Any comments ? Thanks, hailiang

2 1

[libvirt] [V4] RFC for support cache tune(CAT) in libvirt
by 乔立勇(Eli Qiao) 20 Jan '17

20 Jan '17

hi all Sorry for resend this again, I forget to add subject :( ... Thanks all for the comment for previous RFC version, I summary all input here also with Opens which I am not sure, can you please review again? #Propose Changes ## Expose cache information into capabilities Extend capabilities to expose all level cache resource information and should tell the topology of caches also tell which kinds of resources can be tuned/allocation There information comes from /sys/devices/system/cpu/cpu0/cache/index${level}/size also /sys/fs/resctrl/ (this is CAT sys interface in linux kernel) virsh capabilities <cache> <bank id='0, 'type="l3" size="56320" units="KiB" cpus="0,1,2,6,7,8"/> <--------------------- level 3 cache is per socket, so group them by socket id <control unit="KiB" min="2816"/> <bank id='1', type="l3" size="56320" units="KiB" cpus="3,4,5,9,10,11"/> <bank id='2' type="l2" size="256" units="KiB" cpus="0"/> <bank id='3' type="l2" size="256" units="KiB" cpus="1"/> <bank id='4' type="l2" size="256" units="KiB" cpus="2"/> <bank id='5' type="l2" size="256" units="KiB" cpus="3"/> <bank id='6' type="l2" size="256" units="KiB" cpus="4"/> ... <cache> Opens 1. how about add socket id to bank for bank type = l3 ? 2. do we really want to expose l2/l3 cache for now , they are per core resource and linux kernel don't support l2 yet (depend no hardware)? 3. if enable CDP in resctrl, for bank type=l3 , it will be split to l3data l3code, should expose this ability. <bank type="l3" size="56320" units="KiB" cpus="0,1,2,6,7,8"/> <--------------------- level 3 cache is per socket, so group them by socket id <control unit="KiB" min="2816" cdp="enabled"/> ## Provide a new API to get the avail cache on each bank, such as the output are: id=0 type=l3 avail=56320 total = ?? <--------- do we need this? id=1 type=l3 avail=56320 id=3 type=l2 avail=256 Opens: · Don't expose the avail cache information if the host can not do the allocation of that type cache(eg, for l2 currently) ? · We can not make all of the cache , the reservation amount is the min_cbm_len (=1) * min_unit . · do we need to expose total? ## enable CAT for a domain 1 Domain XML changes <cputune> <cache id="1" host_id="0" type="l3" size="5632" unit="KiB"/> <cache id="2" host_id="1" type="l3" size="5632" unit="KiB"/> <cpu_cache vcpus="0-3" id="1"/> <cpu_cache vcpus="4-7" id="2"/> <iothread_cache iothreads="0-1" id="1"/> <emulator_cache id="2"/> </cputune> 2. Extend cputune command ? Opens: 1. Do we accept to extend existed API ? or using new API/virsh? 2. How to calculate cache size -> CBM bit? eg: 5632/ 2816 = 2 bits 5733/ 2816 = 2 bits or 3 bits? ## Restriction for using cache tune on multiple sockets' host. The l3 cache is per socket resource, kernel need to know about what's affinity looks like, so for a VM which running on a multiple socket's host, it should have NUMA setting or vcpuset pin setting. Or cache tune will fail. [1] kernel support https://git.kernel.org/cgit/linux/kernel/git/tip/tip .git/tree/arch/x86/kernel/cpu/intel_rdt.c?h=x86/cache [2] libvirt PoC(not finished yet) https://github.com/taget/ libvirt/commits/cat_new -- Best regards - Eli 天涯无处不重逢 a leaf duckweed belongs to the sea , where not to meet in life

3 3

[libvirt] Mirror on Github failed to sync from libvirt.org
by Chen Hanxiao 20 Jan '17

20 Jan '17

Dear list, Mirror on Github: https://github.com/libvirt/libvirt did not sync from libvirt.org for almost a month. Regards, - Chen

2 1

[libvirt] [PATCH] Interface: return appropriate status for bridge device
by Lin Ma 20 Jan '17

20 Jan '17

In function udevInterfaceIsActive, The current design relies on the sys attribute 'operstate' to determine whether the interface is active. For the device node of virtual network(say virbr0), There is already a dummy tap device to maintain a fixed mac on it, So it's available and its status should be considered as active. But if no anyelse tap device connects to it, The value of operstate of virbr0 in sysfs is 'down', So udevInterfaceIsActive returns 0, It causes 'virsh iface-list --all' to report the status of virbr0 as 'inactive'. This patch fixes the issue by counting slave devices for bridge device. Signed-off-by: Lin Ma <lma(a)suse.com> --- src/interface/interface_backend_udev.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index 5d0fc64..9ac4674 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -1127,6 +1127,11 @@ udevInterfaceIsActive(virInterfacePtr ifinfo) struct udev_device *dev; virInterfaceDefPtr def = NULL; int status = -1; + struct dirent **member_list = NULL; + const char *devtype; + int member_count = 0; + char *member_path; + size_t i; dev = udev_device_new_from_subsystem_sysname(udev, "net", ifinfo->name); @@ -1146,6 +1151,23 @@ udevInterfaceIsActive(virInterfacePtr ifinfo) /* Check if it's active or not */ status = STREQ(udev_device_get_sysattr_value(dev, "operstate"), "up"); + if (!status) { + devtype = udev_device_get_devtype(dev); + if (STREQ_NULLABLE(devtype, "bridge")) { + if (virAsprintf(&member_path, "%s/%s", + udev_device_get_syspath(dev), "brif") < 0) + goto cleanup; + member_count = scandir(member_path, &member_list, + udevBridgeScanDirFilter, alphasort); + if (member_count > 0) + status = 1; + for (i = 0; i < member_count; i++) + VIR_FREE(member_list[i]); + VIR_FREE(member_list); + VIR_FREE(member_path); + } + } + udev_device_unref(dev); cleanup: -- 2.9.2

1 0

[libvirt] [PATCH] bhyve: fix interface type handling for argv2xml
by Roman Bogorodskiy 19 Jan '17

19 Jan '17

When generating a domain XML from native command (i.e. via the connectDomainXMLFromNative call), we should use interface type 'bridge' rather than 'ethernet' because we only support bridges at this point. As we don't have bridge name explicitly specified on the command line, just use 'virbr0' as a default. --- src/bhyve/bhyve_parse_command.c | 9 ++++++--- tests/bhyveargv2xmldata/bhyveargv2xml-virtio-net.xml | 6 ++++-- tests/bhyveargv2xmldata/bhyveargv2xml-virtio-net4.xml | 3 ++- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_command.c index 619004298..5b8712388 100644 --- a/src/bhyve/bhyve_parse_command.c +++ b/src/bhyve/bhyve_parse_command.c @@ -507,9 +507,12 @@ bhyveParsePCINet(virDomainDefPtr def, if (VIR_ALLOC(net) < 0) goto cleanup; - /* Let's just assume it is VIR_DOMAIN_NET_TYPE_ETHERNET, it could also be - * a bridge, but this is the most generic option. */ - net->type = VIR_DOMAIN_NET_TYPE_ETHERNET; + /* As we only support interface type='bridge' and cannot + * guess the actual bridge name from the command line, + * try to come up with some reasonable defaults */ + net->type = VIR_DOMAIN_NET_TYPE_BRIDGE; + if (VIR_STRDUP(net->data.bridge.brname, "virbr0") < 0) + goto error; net->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; net->info.addr.pci.slot = pcislot; diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-virtio-net.xml b/tests/bhyveargv2xmldata/bhyveargv2xml-virtio-net.xml index 09cc79b92..5895c8c53 100644 --- a/tests/bhyveargv2xmldata/bhyveargv2xml-virtio-net.xml +++ b/tests/bhyveargv2xmldata/bhyveargv2xml-virtio-net.xml @@ -12,13 +12,15 @@ <on_reboot>destroy</on_reboot> <on_crash>destroy</on_crash> <devices> - <interface type='ethernet'> + <interface type='bridge'> <mac address='52:54:00:00:00:00'/> + <source bridge='virbr0'/> <target dev='tap0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> </interface> - <interface type='ethernet'> + <interface type='bridge'> <mac address='fe:ed:ad:ea:df:15'/> + <source bridge='virbr0'/> <target dev='tap1'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> </interface> diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-virtio-net4.xml b/tests/bhyveargv2xmldata/bhyveargv2xml-virtio-net4.xml index e1bda46a1..5f1972080 100644 --- a/tests/bhyveargv2xmldata/bhyveargv2xml-virtio-net4.xml +++ b/tests/bhyveargv2xmldata/bhyveargv2xml-virtio-net4.xml @@ -12,8 +12,9 @@ <on_reboot>destroy</on_reboot> <on_crash>destroy</on_crash> <devices> - <interface type='ethernet'> + <interface type='bridge'> <mac address='00:00:00:00:00:00'/> + <source bridge='virbr0'/> <target dev='tap1'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> </interface> -- 2.11.0

2 2

[libvirt] The libvirt Release Notes Game, v3.0.0 edition
by Andrea Bolognani 19 Jan '17

19 Jan '17

Hello everyone, and welcome to the libvirt Release Notes Game, v3.0.0 edition! Here's the deal: libvirt v3.0.0 is right around the corner, and so it's about time we get the release notes into shape. Most of the work has thankfully already been done during the development cycle, by bundling release notes entries with the code that implements the actual changes; however, some changes have managed to fly under the radar so far. Not documenting them properly in the release notes would be a disservice to our users, and would undersell what is once again a terrific release - I'd venture as far as calling it the best one of 2017! I've gone through all the commits between v2.5.0 and now, and highlighted the changes that look like they should be part of the release notes. Look for your name in the list below, and spend a few minutes to craft a beautiful release notes entry for each of the highlighted changes, then send the patch to the list as usual. Feel free to CC: me for a guaranteed[1] swift review! Please note that, unlike you, I don't have intimate knowledge of each and every line of code you've ever contributed to libvirt, and as such might have misjudged the weight and scope of the commits listed below, but that's the whole point: the only person worthy of documenting a change in the release notes is the author of the change himself! That said, if you feel that any of the changes below should not end up in the release notes feel free to raise an objection :) Happy documenting! ^^ * Cédric Bosdonnat - a30b08b libxl: define a per-domain logger. - 340bb6b libxl: add QED disk format support * Collin L. Walling, Jason J. Herne - 79d7201 s390: Cpu driver support for update and compare ..d47db7b qemu: command: Support new cpu feature argument syntax * Daniel P. Berrange - c500701 Add domain event for metadata changes ..dc2bfdc Update remote_protocol-structs for new events - 44f79a0 lxc: ensure libvirt_lxc and qemu-nbd move into systemd machine slice * intrigeri - de79efd AppArmor policy: support merged-/usr. ..a73e703 AppArmor: allow QEMU to set_process_name. * John Ferlan - 2b13361 nodedev: Add the ability to create vHBA by parent wwnn/wwpn or fabric_wwn * Laine Stump - 9838cad conf: use struct instead of int for each slot in virDomainPCIAddressBus ..5949b53 conf: eliminate virDomainPCIAddressReleaseSlot() in favor of ...Addr() * Lin Ma - 2922cd9 cpu: Add support for more AVX512 Intel features ..c80e6b9 cpu: Add support for pku and ospke Intel features for Memory Protection Keys * Marc Hartmayer - c344d4b conf: simplify functions virDomainSCSIDriveAddressIsUsedBy*() ..36d9965 tests: add test cases for address conflicts * Maxim Nestratov - ef5c8bb qemu: Fix pit timer tick policy=delay ..245d9ba tests: Add "no-kvm-pit-device" testcase * Mehdi Abaakouk - 013df87 Gathering vhostuser interface stats with ovs * Michal Privoznik - f55afd8 qemu: Create hugepage path on per domain basis * Nikolay Shirokovskiy - 61a0026 qemu: Fix xml dump of autogenerated websocket * Pavel Glushchak - 5bafa1d vz: set PVMT_DONT_CREATE_DISK migration flag ..b1f916a vz: added VIR_MIGRATE_NON_SHARED_INC migration flag support * Peter Krempa - b469853 qemu: blockjob: Fix locking of block copy/active block commit - f61e406 qemu: snapshot: Properly handle image locking - a4ed5b4 qemu: Don't try to find compression program for "raw" memory images - 9e93055 qemu: block copy: Forbid block copy to relative paths * Pino Toscano - 408a1ce rpc: libssh: allow a NULL known_hosts file ..1a5de3f remote: do not check for an existing config dir [1] Or you money back! -- Andrea Bolognani / Red Hat / Virtualization

4 4

[libvirt] [PATCH for 3.0.x] Disable use of namespaces by default
by Daniel P. Berrange 19 Jan '17

19 Jan '17

When namespaces are enabled there is currently breakage when using disk hotplug and when using AppArmor Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- I'm suggesting this for 3.0.x branch - we'll leave them enabled in master on the basis that we'll actually fix the real bugs there. src/qemu/qemu_conf.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 6613d59..aa05b46 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -317,13 +317,6 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) if (!(cfg->namespaces = virBitmapNew(QEMU_DOMAIN_NS_LAST))) goto error; -#if defined(__linux__) - if (privileged && - virProcessNamespaceAvailable(VIR_PROCESS_NAMESPACE_MNT) == 0 && - virBitmapSetBit(cfg->namespaces, QEMU_DOMAIN_NS_MOUNT) < 0) - goto error; -#endif /* defined(__linux__) */ - #ifdef DEFAULT_LOADER_NVRAM if (virFirmwareParseList(DEFAULT_LOADER_NVRAM, &cfg->firmwares, -- 2.9.3

3 3

[libvirt] [PATCH] storage: avoid use of undefined GLUSTER_CLI variable
by Daniel P. Berrange 19 Jan '17

19 Jan '17

Previous commit tried to change configure logic such that the GLUSTER_CLI parameter would always be set: commit 9e97c8c0f0f3921d06bac2b92cd094a41373f748 Author: Peter Krempa <pkrempa(a)redhat.com> Date: Mon Jan 9 15:56:12 2017 +0100 storage: gluster: Remove build-time dependency on the 'gluster' cli tool This missed the fact that the AC_PATH_PROG call was itself inside an 'if' conditional that would not be called in with_storage_gluster was false. As a result, GLUSTER_CLI was still conditionally defined. Just kill the GLUSTER_CLI parameter and AC_PATH_PROG call entirely and pass a bare "gluster" string to virFindFileInPath instead. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Technically this is a build-break fix for FreeBSD, but I want to get a review to double-check before pushing this. configure.ac | 9 --------- src/storage/storage_util.c | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index a217fc1..7efaddb 100644 --- a/configure.ac +++ b/configure.ac @@ -603,15 +603,6 @@ LIBVIRT_STORAGE_CHECK_SHEEPDOG LIBVIRT_STORAGE_CHECK_GLUSTER LIBVIRT_STORAGE_CHECK_ZFS -if test "$with_storage_fs" = "yes" || - test "$with_storage_gluster" = "yes"; then - AC_PATH_PROG([GLUSTER_CLI], [gluster], [gluster], [$LIBVIRT_SBIN_PATH]) - if test "x$GLUSTER_CLI" != "x"; then - AC_DEFINE_UNQUOTED([GLUSTER_CLI], ["$GLUSTER_CLI"], - [Location or name of the gluster command line tool]) - fi -fi - with_storage=no for backend in dir fs lvm iscsi scsi mpath rbd disk; do if eval test \$with_storage_$backend = yes; then diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 895c623..e16c1a4 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -2437,7 +2437,7 @@ virStorageBackendFindGlusterPoolSources(const char *host, int ret = -1; - if (!(glusterpath = virFindFileInPath(GLUSTER_CLI))) { + if (!(glusterpath = virFindFileInPath("gluster"))) { if (report) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("'gluster' command line tool not found")); -- 2.9.3

2 1

[libvirt] [PATCH] Fix segfault in GetIOThreadInfo
by Leonid Podolny 19 Jan '17

19 Jan '17

The pointers calculation included a typo which caused segfaults. Signed-off-by: Leonid Podolny <leonid(a)podolny.net> --- domain.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/domain.go b/domain.go index 515138a..74061c2 100644 --- a/domain.go +++ b/domain.go @@ -3887,7 +3887,7 @@ func (d *Domain) GetIOThreadInfo(flags DomainModificationImpact) ([]DomainIOThre info := make([]DomainIOThreadInfo, int(ret)) for i := 0; i < int(ret); i++ { - cinfo := (*(**C.virDomainIOThreadInfo)(unsafe.Pointer(uintptr(unsafe.Pointer(cinfolist)) + (unsafe.Sizeof(*cinfolist) + uintptr(i))))) + cinfo := (*(**C.virDomainIOThreadInfo)(unsafe.Pointer(uintptr(unsafe.Pointer(cinfolist)) + (unsafe.Sizeof(*cinfolist) * uintptr(i))))) ncpus := int(cinfo.cpumaplen * 8) cpumap := make([]bool, ncpus) -- 2.11.0

2 1

[libvirt] [PATCH go] Fix segfault in GetIOThreadInfo
by Leonid Podolny 19 Jan '17

19 Jan '17

2 1

[libvirt] [PATCH] qemu: Reset hostModelInfo in virQEMUCapsReset
by Jiri Denemark 19 Jan '17

19 Jan '17

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_capabilities.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 89e9dd471..1e1b53b22 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3752,6 +3752,9 @@ virQEMUCapsReset(virQEMUCapsPtr qemuCaps) VIR_FREE(qemuCaps->gicCapabilities); qemuCaps->ngicCapabilities = 0; + qemuMonitorCPUModelInfoFree(qemuCaps->hostCPUModelInfo); + qemuCaps->hostCPUModelInfo = NULL; + virCPUDefFree(qemuCaps->hostCPUModel); qemuCaps->hostCPUModel = NULL; } -- 2.11.0

3 2

[libvirt] [PATCH 0/6] storage: Cleanups of the storage backends
by Peter Krempa 19 Jan '17

19 Jan '17

I'm working on splitting of the storage backend codebase into loadable modules so that ceratin libraries (ceph, gluster) can be installed only when the functionality is required. This is a dump of cleanup patches, but they tend to get merge conflicts pretty often so I'm sending them prior to finishing the driver module stuff. Peter Krempa (6): storage: Remove common code from specific driver backend storage: Split utility functions from storage_backend.(ch) storage: fs: Compile file backends even if filesystem support is disabled storage: scsi: Fix build if SCSI backend is disabled but iSCSI is enabled storage: scsi: Remove private constants from header storage: sheepdog: Split out functions required for tests po/POTFILES.in | 1 + src/Makefile.am | 6 +- src/storage/storage_backend.c | 2807 +--------------------- src/storage/storage_backend.h | 124 - src/storage/storage_backend_disk.c | 153 +- src/storage/storage_backend_disk.h | 3 - src/storage/storage_backend_fs.c | 4 +- src/storage/storage_backend_gluster.c | 1 + src/storage/storage_backend_iscsi.c | 2 +- src/storage/storage_backend_logical.c | 1 + src/storage/storage_backend_mpath.c | 1 + src/storage/storage_backend_rbd.c | 1 + src/storage/storage_backend_scsi.c | 452 +--- src/storage/storage_backend_scsi.h | 8 - src/storage/storage_backend_sheepdog.c | 2 + src/storage/storage_backend_sheepdog.h | 5 - src/storage/storage_backend_sheepdog_priv.h | 29 + src/storage/storage_backend_zfs.c | 1 + src/storage/storage_driver.c | 1 + src/storage/storage_util.c | 3364 +++++++++++++++++++++++++++ src/storage/storage_util.h | 151 ++ tests/storagebackendsheepdogtest.c | 2 +- tests/storagevolxml2argvtest.c | 2 +- 23 files changed, 3602 insertions(+), 3519 deletions(-) create mode 100644 src/storage/storage_backend_sheepdog_priv.h create mode 100644 src/storage/storage_util.c create mode 100644 src/storage/storage_util.h -- 2.11.0

2 18

[libvirt] [PATCH V2] tests: fix compilation of shunloadtest
by Jim Fehlig 19 Jan '17

19 Jan '17

While local builds succeed fine, a build worker building in a chroot environment is encountering the following error with libvirt 3.0.0 release candidates [ 162s] shunloadtest.o: In function `main': [ 162s] /home/abuild/rpmbuild/BUILD/libvirt-3.0.0/tests/shunloadtest.c:110: undefined reference to `dlopen' [ 162s] /home/abuild/rpmbuild/BUILD/libvirt-3.0.0/tests/shunloadtest.c:114: undefined reference to `dlsym' [ 162s] /home/abuild/rpmbuild/BUILD/libvirt-3.0.0/tests/shunloadtest.c:133: undefined reference to `dlclose' [ 162s] /home/abuild/rpmbuild/BUILD/libvirt-3.0.0/tests/shunloadtest.c:111: undefined reference to `dlerror' [ 162s] /home/abuild/rpmbuild/BUILD/libvirt-3.0.0/tests/shunloadtest.c:115: undefined reference to `dlerror' [ 162s] /home/abuild/rpmbuild/BUILD/libvirt-3.0.0/tests/shunloadtest.c:116: undefined reference to `dlclose' Fix by appending DLOPEN_LIBS to shunloadtest_LDADD. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- V2: Use DLOPEN_LIBS instead of LDADDS tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index c7d4748..bcc2d1e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1348,7 +1348,7 @@ libshunload_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) shunloadtest_SOURCES = \ shunloadtest.c -shunloadtest_LDADD = $(LIB_PTHREAD) +shunloadtest_LDADD = $(LIB_PTHREAD) $(DLOPEN_LIBS) shunloadtest_DEPENDENCIES = libshunload.la sysinfotest_SOURCES = \ -- 2.9.2

2 2

[libvirt] [PATCH] nss: Remove RES_USE_INET6 usage
by Andrea Bolognani 18 Jan '17

18 Jan '17

The recent deprecation in glibc (commit b76e065991ec) means the module will fail to build entirely: nss/libvirt_nss.c: In function '_nss_libvirt_gethostbyname_r': nss/libvirt_nss.c:363:13: error: RES_USE_INET6 is deprecated [-Werror] int af = ((_res.options & RES_USE_INET6) ? AF_INET6 : AF_INET); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This resolver option was removed shortly after being introduced, and application using it are already broken anyway. --- tools/nss/libvirt_nss.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/nss/libvirt_nss.c b/tools/nss/libvirt_nss.c index b69e62c..9904026 100644 --- a/tools/nss/libvirt_nss.c +++ b/tools/nss/libvirt_nss.c @@ -360,9 +360,7 @@ NSS_NAME(gethostbyname)(const char *name, struct hostent *result, char *buffer, size_t buflen, int *errnop, int *herrnop) { - int af = ((_res.options & RES_USE_INET6) ? AF_INET6 : AF_INET); - - return NSS_NAME(gethostbyname3)(name, af, result, buffer, buflen, + return NSS_NAME(gethostbyname3)(name, AF_INET, result, buffer, buflen, errnop, herrnop, NULL, NULL); } -- 2.7.4

2 1

[libvirt] [PATCH] storage_backend_rbd: always call rados_conf_read_file when connect a rbd pool
by Chen Hanxiao 18 Jan '17

18 Jan '17

From: Chen Hanxiao <chenhanxiao(a)gmail.com> This patch fix a dead lock when try to read a rbd image When trying to connect a rbd server (ceph-0.94.7-1.el7.centos.x86_64), rbd_list/rbd_open enter a dead lock state. Backtrace: Thread 30 (Thread 0x7fdb342d0700 (LWP 12105)): #0 0x00007fdb40b16705 in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 #1 0x00007fdb294273f1 in librados::IoCtxImpl::operate_read(object_t const&, ObjectOperation*, ceph::buffer::list*, int) () from /lib64/librados.so.2 #2 0x00007fdb29429fcc in librados::IoCtxImpl::read(object_t const&, ceph::buffer::list&, unsigned long, unsigned long) () from /lib64/librados.so.2 #3 0x00007fdb293e850c in librados::IoCtx::read(std::string const&, ceph::buffer::list&, unsigned long, unsigned long) () from /lib64/librados.so.2 #4 0x00007fdb2b9dd15e in librbd::list(librados::IoCtx&, std::vector<std::string, std::allocator<std::string> >&) () from /lib64/librbd.so.1 #5 0x00007fdb2b98c089 in rbd_list () from /lib64/librbd.so.1 #6 0x00007fdb2e1a8052 in virStorageBackendRBDRefreshPool (conn=<optimized out>, pool=0x7fdafc002d50) at storage/storage_backend_rbd.c:366 #7 0x00007fdb2e193833 in storagePoolCreate (obj=0x7fdb1c1fd5a0, flags=<optimized out>) at storage/storage_driver.c:876 #8 0x00007fdb43790ea1 in virStoragePoolCreate (pool=pool@entry=0x7fdb1c1fd5a0, flags=0) at libvirt-storage.c:695 #9 0x00007fdb443becdf in remoteDispatchStoragePoolCreate (server=0x7fdb45fb2ab0, msg=0x7fdb45fb3db0, args=0x7fdb1c0037d0, rerr=0x7fdb342cfc30, client=<optimized out>) at remote_dispatch.h:14383 #10 remoteDispatchStoragePoolCreateHelper (server=0x7fdb45fb2ab0, client=<optimized out>, msg=0x7fdb45fb3db0, rerr=0x7fdb342cfc30, args=0x7fdb1c0037d0, ret=0x7fdb1c1b3260) at remote_dispatch.h:14359 #11 0x00007fdb437d9c42 in virNetServerProgramDispatchCall (msg=0x7fdb45fb3db0, client=0x7fdb45fd1a80, server=0x7fdb45fb2ab0, prog=0x7fdb45fcd670) at rpc/virnetserverprogram.c:437 #12 virNetServerProgramDispatch (prog=0x7fdb45fcd670, server=server@entry=0x7fdb45fb2ab0, client=0x7fdb45fd1a80, msg=0x7fdb45fb3db0) at rpc/virnetserverprogram.c:307 #13 0x00007fdb437d4ebd in virNetServerProcessMsg (msg=<optimized out>, prog=<optimized out>, client=<optimized out>, srv=0x7fdb45fb2ab0) at rpc/virnetserver.c:135 #14 virNetServerHandleJob (jobOpaque=<optimized out>, opaque=0x7fdb45fb2ab0) at rpc/virnetserver.c:156 #15 0x00007fdb436cfb35 in virThreadPoolWorker (opaque=opaque@entry=0x7fdb45fa7650) at util/virthreadpool.c:145 #16 0x00007fdb436cf058 in virThreadHelper (data=<optimized out>) at util/virthread.c:206 #17 0x00007fdb40b12df5 in start_thread () from /lib64/libpthread.so.0 #18 0x00007fdb408401ad in clone () from /lib64/libc.so.6 366 len = rbd_list(ptr.ioctx, names, &max_size); (gdb) n [New Thread 0x7fdb20758700 (LWP 22458)] [New Thread 0x7fdb20556700 (LWP 22459)] [Thread 0x7fdb20758700 (LWP 22458) exited] [New Thread 0x7fdb20455700 (LWP 22460)] [Thread 0x7fdb20556700 (LWP 22459) exited] [New Thread 0x7fdb20556700 (LWP 22461)] infinite loop... Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/storage/storage_backend_rbd.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index b1c51ab..233737b 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -95,6 +95,9 @@ virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr ptr, goto cleanup; } + /* try default location, but ignore failure */ + rados_conf_read_file(ptr->cluster, NULL); + if (!conn) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("'ceph' authentication not supported " @@ -124,6 +127,10 @@ virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr ptr, _("failed to create the RADOS cluster")); goto cleanup; } + + /* try default location, but ignore failure */ + rados_conf_read_file(ptr->cluster, NULL); + if (virStorageBackendRBDRADOSConfSet(ptr->cluster, "auth_supported", "none") < 0) goto cleanup; -- 2.7.4

2 3

[libvirt] [PATCH] qemu_domain: add timestamp in tainting of guests log
by Chen Hanxiao 18 Jan '17

18 Jan '17

From: Chen Hanxiao <chenhanxiao(a)gmail.com> We lacked of timestamp in tainting of guests log, which bring troubles for finding guest issues: such as whether a guest powerdown caused by qemu-monitor-command or others issues inside guests. If we had timestamp in tainting of guests log, it would be helpful when checking guest's logs(eg. /var/log/messages). Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/qemu/qemu_domain.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 35baffb..21c90a9 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4001,6 +4001,7 @@ void qemuDomainObjTaint(virQEMUDriverPtr driver, bool closeLog = false; if (virDomainObjTaint(obj, taint)) { + char *timestamp = NULL; char uuidstr[VIR_UUID_STRING_BUFLEN]; virUUIDFormat(obj->def->uuid, uuidstr); @@ -4018,27 +4019,31 @@ void qemuDomainObjTaint(virQEMUDriverPtr driver, logCtxt = qemuDomainLogContextNew(driver, obj, QEMU_DOMAIN_LOG_CONTEXT_MODE_ATTACH); if (!logCtxt) { - if (orig_err) { - virSetError(orig_err); - virFreeError(orig_err); - } VIR_WARN("Unable to open domainlog"); - return; + goto cleanup; } closeLog = true; } + if ((timestamp = virTimeStringNow()) == NULL) + goto cleanup; + if (qemuDomainLogContextWrite(logCtxt, - "Domain id=%d is tainted: %s\n", + "%s: Domain id=%d is tainted: %s\n", + timestamp, obj->def->id, virDomainTaintTypeToString(taint)) < 0) virResetLastError(); + + cleanup: if (closeLog) qemuDomainLogContextFree(logCtxt); if (orig_err) { virSetError(orig_err); virFreeError(orig_err); } + + VIR_FREE(timestamp); } } -- 2.7.4

2 1

[libvirt] [PATCH v2 0/3] virsh: pool-list: introduce option --name and --uuid
by Chen Hanxiao 18 Jan '17

18 Jan '17

virsh # pool-list --name default root virsh # pool-list --uuid 76bd3b4d-2d23-4741-b6de-7377fa4320a1 f97964af-a3df-44ff-8664-886729035c09 virsh # pool-list --uuid --name 76bd3b4d-2d23-4741-b6de-7377fa4320a1 default f97964af-a3df-44ff-8664-886729035c09 root v2: do something like 'virsh list` Chen Hanxiao (3): virsh: pool-list: introduce --uuid for printing pool's UUID only virsh: pool-list: introduce --name for printing pool's name only virsh: pool-list: allow both --uuid and --name in one cmd tools/virsh-pool.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- tools/virsh.pod | 9 +++++++-- 2 files changed, 53 insertions(+), 4 deletions(-) -- 2.5.5

2 4

[libvirt] [PATCH] util: disallow resetting a pci-bridge device
by Shivaprasad G Bhat 18 Jan '17

18 Jan '17

It is distructive to attempt a reset on pci-bridge, the host can crash. The bridges won't contain any guest data and neither they can be passed through using vfio/stub. So, no point in allowing a reset for them. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/util/virpci.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/util/virpci.c b/src/util/virpci.c index 0601f49..860f7aa 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -933,6 +933,16 @@ virPCIDeviceReset(virPCIDevicePtr dev, char *drvName = NULL; int ret = -1; int fd = -1; + int hdrType = -1; + + if (virPCIGetHeaderType(dev, &hdrType) < 0) + return -1; + + if (hdrType == VIR_PCI_HEADER_PCI_BRIDGE) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Resetting a pci-bridge device is not allowed")); + return -1; + } if (activeDevs && virPCIDeviceListFind(activeDevs, dev)) { virReportError(VIR_ERR_INTERNAL_ERROR,

3 2

[libvirt] [PATCH] Fix the incorrect memory freeing which will result in crash
by Wu Zongyong 18 Jan '17

18 Jan '17

The number of elements in new_params is equal to the length of info, instead of nparams, so it's wrong to free new_params using nparams. Signed-off-by: Wu Zongyong <wuzongyo(a)mail.ustc.edu.cn> --- libvirt-override.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index db14244..dac4250 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -632,7 +632,7 @@ libvirt_virDomainSetSchedulerParametersFlags(PyObject *self ATTRIBUTE_UNUSED, int nparams = 0; Py_ssize_t size = 0; unsigned int flags; - virTypedParameterPtr params, new_params = NULL; + virTypedParameterPtr params = NULL, new_params = NULL; if (!PyArg_ParseTuple(args, (char *)"OOI:virDomainSetScedulerParametersFlags", @@ -694,7 +694,7 @@ libvirt_virDomainSetSchedulerParametersFlags(PyObject *self ATTRIBUTE_UNUSED, cleanup: virTypedParamsFree(params, nparams); - virTypedParamsFree(new_params, nparams); + virTypedParamsFree(new_params, size); return ret; } @@ -7682,7 +7682,7 @@ libvirt_virNodeSetMemoryParameters(PyObject *self ATTRIBUTE_UNUSED, int nparams = 0; Py_ssize_t size = 0; unsigned int flags; - virTypedParameterPtr params, new_params = NULL; + virTypedParameterPtr params = NULL, new_params = NULL; if (!PyArg_ParseTuple(args, (char *)"OOI:virNodeSetMemoryParameters", @@ -7741,7 +7741,7 @@ libvirt_virNodeSetMemoryParameters(PyObject *self ATTRIBUTE_UNUSED, cleanup: virTypedParamsFree(params, nparams); - virTypedParamsFree(new_params, nparams); + virTypedParamsFree(new_params, size); return ret; } -- 2.10.0.windows.1

2 1

[libvirt] Entering freeze for libvirt-3.0.0
by Daniel Veillard 18 Jan '17

18 Jan '17

As planned, I tagged the RC1 in git and pushed signed tarball and rpms to the usual location: ftp://libvirt.org/libvirt/ This seems to work fine in my limited testing but as usual we need community feedback on it and especially testing on different systems and architectures, so please give it a try ! If everything works fine then I will push rc2 on Friday and hopefully 3.0.0 final on Monday, so please give it a try to make sure that 0.0 release is nonetheless a good one :-) thanks ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

7 16

[libvirt] TSC frequency configuration & invtsc migration (was Re: [PATCH 4/4] kvm: Allow migration with invtsc)
by Eduardo Habkost 18 Jan '17

18 Jan '17

On Wed, Jan 04, 2017 at 11:39:16AM -0200, Eduardo Habkost wrote: > On Wed, Jan 04, 2017 at 09:56:56AM -0200, Marcelo Tosatti wrote: > > On Tue, Dec 27, 2016 at 05:21:20PM -0200, Eduardo Habkost wrote: > > > Instead of blocking migration on the source when invtsc is > > > enabled, rely on the migration destination to ensure there's no > > > TSC frequency mismatch. > > > > > > We can't allow migration unconditionally because we don't know if > > > the destination is a QEMU version that is really going to ensure > > > there's no TSC frequency mismatch. To ensure we are migrating to > > > a destination that won't ignore SET_TSC_KHZ errors, allow invtsc > > > migration only on pc-*-2.9 and newer. > > > > > > Signed-off-by: Eduardo Habkost <ehabkost(a)redhat.com> [...] > > > @@ -2655,12 +2656,14 @@ int kvm_arch_put_registers(CPUState *cpu, int level) > > > } > > > > > > if (level == KVM_PUT_FULL_STATE) { > > > - /* We don't check for kvm_arch_set_tsc_khz() errors here, > > > - * because TSC frequency mismatch shouldn't abort migration, > > > - * unless the user explicitly asked for a more strict TSC > > > - * setting (e.g. using an explicit "tsc-freq" option). > > > + /* Migration TSC frequency mismatch is fatal only if we are > > > + * actually reporting Invariant TSC to the guest. > > > */ > > > - kvm_arch_set_tsc_khz(cpu); > > > + ret = kvm_arch_set_tsc_khz(cpu); > > > + if ((x86_cpu->env.features[FEAT_8000_0007_EDX] & CPUID_APM_INVTSC) && > > > + ret < 0) { > > > + return ret; > > > + } > > > } > > > > Will the guest continue in the source in this case? > > > > I think this is past the point where migration has been declared > > successful. > > > > Otherwise looks good. > > Good point. I will make additional tests and see if there's some > other place where the kvm_arch_set_tsc_khz() call can be moved > to. So, if we solve this and do something on (for example) post_load, we still have a problem: device state is migrated after RAM. This means QEMU will check for TSC scaling and abort migration very late. We could solve that by manually registering a SaveVMHandler that will send the TSC frequency on save_live_setup, so migration is aborted earlier. But: this sounds like just a complex hack to work around the real problems: 1) TSC frequency is guest-visible, and anything that affects guest ABI should depend on the VM configuration, not on host capabilities; 2) Setting TSC frequency depending on the host will make migratability unpredictable for management software: the same VM config could be migratable to host A when started on host B, but not migratable to host A when started on host C. I suggest we allow migration with invtsc if and only if tsc-frequency is set explicitly by management software. In other words, apply only patches 1/4 and 2/4 from this series. After that, we will need libvirt support for configuring tsc-frequency. -- Eduardo

5 21

[libvirt] [PATCH v3 0/2] Allow migration with invtsc if TSC frequency is explicitly set
by Eduardo Habkost 18 Jan '17

18 Jan '17

This series makes QEMU accept migration if tsc-frequency is explicitly set on configuration. As management software is required to keep device configuration the same on migration source or destination, explicit tsc-frequency will ensure that either: * The destination host has a matching TSC frequency; or * The destination host has TSC scaling available. Changelog ========= v2 -> v3: * Fix build failure ((missing closing braces) v1 -> v2: * v1 series subject was: * [PATCH 0/4] Allow migration with invtsc if there's no frequency mismatch * Removed patches 3/4 and 4/4, that allowed migration if no explicit tsc-frequency was set. Implementing the check on post_load or post_init is not enough to make migration abort, so we will need a more complex solution to implement that feature. Plans for future work ===================== 1) Querying host TSC frequency/scaling capability ------------------------------------------------- I plan to include TSC frequency/scaling information on query-cpu-model-expansion model="host" in a future series. Then management software will be able to automatically configure TSC frequency when invtsc is enabled, instead of requiring the user to configure it explicitly. While we don't implement that, invtsc migration will be possible only if the user configures TSC frequency manually. 2) invtsc migration with no explicit TSC frequency -------------------------------------------------- A future series can implement migration when TSC frequency is not specified explicitly. It will be a bit more complex because it requires either letting the destination abort the migration, or sending TSC frequency/scaling information from destination to source. --- Cc: Marcelo Tosatti <mtosatti(a)redhat.com> Cc: "Daniel P. Berrange" <berrange(a)redhat.com> Cc: Paolo Bonzini <pbonzini(a)redhat.com> Cc: kvm(a)vger.kernel.org Cc: Haozhong Zhang <haozhong.zhang(a)intel.com> Cc: "Michael S. Tsirkin" <mst(a)redhat.com> Cc: Igor Mammedov <imammedo(a)redhat.com> Cc: libvir-list(a)redhat.com Cc: Jiri Denemark <jdenemar(a)redhat.com> Eduardo Habkost (2): kvm: Simplify invtsc check kvm: Allow invtsc migration if tsc-khz is set explicitly target/i386/kvm.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) -- 2.11.0.259.g40922b1

2 1