- Devel - libvirt List Archives

[libvirt] [PATCH] Post-release version bump to 3.1.0
by Michal Privoznik 18 Jan '17

18 Jan '17

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. configure.ac | 2 +- docs/news.xml | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 9e41f8983..a217fc165 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ 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/>. -AC_INIT([libvirt], [3.0.0], [libvir-list(a)redhat.com] [], [http://libvirt.org] +AC_INIT([libvirt], [3.1.0], [libvir-list(a)redhat.com] [], [http://libvirt.org] AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) diff --git a/docs/news.xml b/docs/news.xml index b912d8a62..4ff0cb638 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -10,6 +10,17 @@ and optionally a description where it's explained in more detail --> <libvirt> + <release version="v3.1.0" date="unreleased"> + <section title="New features"> + <change/> + </section> + <section title="Improvements"> + <change/> + </section> + <section title="Bug fixes"> + <change/> + </section> + </release> <release version="v3.0.0" date="2017-01-17"> <section title="New features"> <change> -- 2.11.0

1 0

[libvirt] [PATCH] tests: Distribute qemuhotplugtestcpus
by Michal Privoznik 18 Jan '17

18 Jan '17

Starting from a245abce436f4f333 another set of tests for qemuhotplugtest has been introduced. This time for vcpu hotplug. However, the test data (which live in qemuhotplugtestcpus dir) are not being distributed properly. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under build breaker rule. tests/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index c7d474817..87197841b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -121,6 +121,7 @@ EXTRA_DIST = \ qemucapabilitiesdata \ qemucaps2xmldata \ qemuhelpdata \ + qemuhotplugtestcpus \ qemuhotplugtestdevices \ qemuhotplugtestdomains \ qemumonitorjsondata \ -- 2.11.0

1 0

[libvirt] [PATCH 0/4] gluster: cleanup and fix code for pool discovery
by Peter Krempa 18 Jan '17

18 Jan '17

Peter Krempa (4): storage: Fix error reporting when looking up storage pool sources storage: gluster: Report error if no volumes were found in pool lookup storage: gluster: Remove build-time dependency on the 'gluster' cli tool spec: Depend on the gluster command line tool configure.ac | 2 +- libvirt.spec.in | 4 +++ src/storage/storage_backend.c | 48 ++++++++++++++++++++--------------- src/storage/storage_backend.h | 3 ++- src/storage/storage_backend_fs.c | 22 ++++++++++------ src/storage/storage_backend_gluster.c | 14 +++++++--- 6 files changed, 60 insertions(+), 33 deletions(-) -- 2.11.0

2 9

[libvirt] [PATCH] news: Fix xml dump of autogenerated websocket
by Nikolay Shirokovskiy 18 Jan '17

18 Jan '17

--- Sorry for delay and thus not getting this news bit into release notes in time. docs/news.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 95b021a..3ff8f4e 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -274,6 +274,15 @@ for x86_64 HVM domains. </description> </change> + <change> + <summary> + qemu: Fix xml dump of autogenerated websocket + </summary> + <description> + As a result autogenerated websocket port is regenerated on domain restore, + migration and such as it should be. + </description> + </change> </section> </release> <release version="v2.5.0" date="2016-12-04"> -- 1.8.3.1

2 1

[libvirt] Release of libvirt-3.0.0
by Daniel Veillard 18 Jan '17

18 Jan '17

So I got mixed reports in the last day about the state of the head but one of the big issues seems solved, and I'm not sure keeping the freeze much longer will help, so libvirt-3.0.0 is out. It's tagged in git, signed tarball and rpms are available at thet usual place: ftp://libvirt.org/libvirt/ I also pushed python bindings release too which one can find at ftp://libvirt.org/libvirt/python/ It includes a fair amount of changes despite the slowdown around the end of year break: * New features - Domain events for metadata content changes The domain events framework has a new event ID that can be used to get notifications when domain metadata content changes. - Event notifications for the secret object The secret object now supports event notifications, covering lifcycle changes and secret value changes. - New localPtr attribute for "ip" element in network XML - qemu: Support QEMU group I/O throttling Add the capability to allow group I/O throttling via a new domain <disk> <iotune> subelement "group_name" to allow sharing I/O throttling quota between multiple drives. - nss: Introduce libvirt_guest New libvirt_guest nss module that translates libvirt guest names into IP addresses. - daemon: Add support for runtime logging settings adjustment Logging-related settings like log outputs and filters can now be adjusted during runtime using the admin interface without the necessity of the daemon's restart. - storage: Add virStorageVolInfoFlags API Add the API to support using the VIR_STORAGE_VOL_GET_PHYSICAL flag in order to return the host physical size in bytes of the image container in the allocation field of the _virStorageVolInfo structure. The --physical flag has been added to the virsh vol-info command to access the data. - libxl: Implement virDomainGetMaxVcpus API - storage: Add overwrite flag checking for logical pool Add support for the OVERWRITE flags for the logical storage backend including checking for existing data on the target volumes when building a new logical pool on target volume(s). - qemu: Add support for guest CPU configuration on s390(x) * Improvements - perf: Add more perf statistics Add support to get the count of branch instructions executed, branch misses, bus cycles, stalled frontend cpu cycles, stalled backend cpu cycles, and ref cpu cycles by applications running on the platform. - conf: Display <physical> for volume xml Add a display of the <physical> size of a disk volume in the output of the volume XML. - qemu: Use virtio-pci by default for aarch64 mach-virt guests virtio-pci provides several advantages over virtio-mmio, such as the ability to hotplug devices and improved performance. While opting in to virtio-pci has been possible for a while, newly-defined guests will now use it automatically. - vbox: remove support for VirtualBox 3.x and older Those old VirtualBox versions have been unsupported by upstream for a long time and the API of 4.0 and newer has diverged enough to require code abstractions to handle differences. Removing support for those old versions drops lots of code from the driver and simplifies the logic to ease implementation of new features going forward. - virsh: pool-info: introduce option --bytes Add option --bytes to virsh pool-info in order ti allow display of units in bytes rather than default of human readable output. - scsi: Add parent wwnn/wwpn or fabric capability for createVport Improve the algorithm searching for the parent scsi_host device for vHBA/NPIV scsi_host creation. Rather than supplying the "parent" by name, it's now possible to define the parent by it's wwnn/wwpn or fabric_wwn in the node device create XML or the storage pool XML. - qemu: aggregate pcie-root-ports onto multiple functions of a slot When pcie-root-ports are added to pcie-root in order to provide a place to connect PCI Express endpoint devices, libvirt now aggregates multiple root ports together onto the same slot (up to 8 per slot) in order to conserve slots. Using this method, it's possible to connect more than 200 endpoint devices to a guest that uses PCIe without requiring setup of any PCIe switches. * Bug fixes - lxc: fix accidental killing of containers during libvirtd restart The libvirt_lxc process was previously not moved into the container scope. As a result, if systemd reloads its config after a container is started, when libvirtd is later restarted it will accidentally kill the containers. - qemu: Correct GetBlockInfo values For an active domain, correct the physical value provided for a raw sparse file backed storage and the allocation value provided for a qcow2 file backed storage that hasn't yet been opened on the domain. - qemu: Make virtio console usable on ppc64 guests The chardev detection code has been improved and can now handle this configuration properly. - qemu: Enable mount namespace To avoid funny races with udev relabelling devices under our hands and to enhance security, libvirt now spawns each qemu process with its own /dev. - storage: Fix implementation of no-overwrite for file system backend Fix file system storage backend implementation of the OVERWRITE flags to be consistent between code and documentation. Add checks to ensure that when building a new file system on a target volume that there is not something already on the disk in a format that libvirt can recognize. - qemu: Create hugepage path on per domain basis Historically, all hugepage enabled domains shared the same path under hugetlbfs. This left libvirt unable to correctly set security labels on it. With this release, however, each domain is put into a separate path which is also correctly labeled. - conf: Reject domains with duplicate drive addresses Reject duplicate drive addresses for disks and hostdevs at domain definition. - libxl: reverse defaults on HVM net device attach Fixes network interface attach for HVM domains when no model is specified. Emulated hotplug isn't yet supported and hence we should default to the general working scenario. - libxl: always enable pae for x86_64 HVM By default pae is disabled in libxl. Without an explicit <pae/> setting in the domain <features> configuration, an x86_64 HVM domain would be get an i686 environment. pae should always be enabled for x86_64 HVM domains. Thanks everybody for your contributions to this release, hopefully that won't be a brown paper bag one ! Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

3 2

[libvirt] [PATCH v2] Add support for Veritas HyperScale (VxHS) block device protocol
by Ashish Mittal 18 Jan '17

18 Jan '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. docs/formatdomain.html.in | 15 ++++-- docs/schemas/domaincommon.rng | 1 + src/libxl/libxl_conf.c | 1 + src/qemu/qemu_command.c | 4 ++ src/qemu/qemu_driver.c | 3 ++ src/qemu/qemu_parse_command.c | 25 +++++++++ src/util/virstoragefile.c | 63 +++++++++++++++++++++- src/util/virstoragefile.h | 1 + src/xenconfig/xen_xl.c | 1 + .../qemuxml2argv-disk-drive-network-vxhs.args | 24 +++++++++ .../qemuxml2argv-disk-drive-network-vxhs.xml | 34 ++++++++++++ tests/qemuxml2argvtest.c | 1 + tests/virstoragetest.c | 16 ++++++ 13 files changed, 185 insertions(+), 4 deletions(-) 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..1a52f12 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: @@ -1034,6 +1037,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; 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..150e011 100644 --- a/src/qemu/qemu_parse_command.c +++ b/src/qemu/qemu_parse_command.c @@ -263,6 +263,16 @@ 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 +747,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 +1963,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 +2043,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.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.args new file mode 100644 index 0000000..f6e3e37 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.args @@ -0,0 +1,24 @@ +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=vxhs://192.168.0.1:9999/eb90327c-8302-4725-9e1b-4e85ed4dc251,\ +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..0c3470b 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -892,6 +892,7 @@ 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("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

5 8

[libvirt] vms hung
by Umar Draz 18 Jan '17

18 Jan '17

Hello, I am running libvirt-2.0.0-10.el7_3.2.x86_64 on CentOS 7.3, I have few vms of CentOS and Windows 2012 servers. Randomly they are hung, but the status of virtual machine keep running, vnc and network not responding. I have checked all /var/log/messages and /var/log/libvirt/qemu/vm.log but nothing found anything wrong. Would you please help what should I do more so I can find the issue. -- Umar

2 4

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

17 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 LDADDS to shunloadtest_LDADD. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index c7d4748..112396f 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) $(LDADDS) shunloadtest_DEPENDENCIES = libshunload.la sysinfotest_SOURCES = \ -- 2.9.2

2 2

[libvirt] [PATCH] qemu: catch failure of drive_add
by Daniel P. Berrange 17 Jan '17

17 Jan '17

Previously when QEMU failed "drive_add" due to an error opening a file it would report "could not open disk image" These days though, QEMU reports "Could not open '/tmp/virtd-test_e3hnhh5/disk1.qcow2': Permission denied" which we were not detecting as an error condition. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_monitor_text.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index bc83218..76d7497 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -1959,6 +1959,16 @@ int qemuMonitorTextAddDrive(qemuMonitorPtr mon, goto cleanup; } + if (strstr(reply, "Could not open")) { + size_t len = strlen(reply); + if (reply[len - 1] == '\n') { + reply[len - 1] = '\0'; + } + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + reply); + goto cleanup; + } + ret = 0; cleanup: -- 2.9.3

2 1

[libvirt] [PATCH] tests: fix QED disk test in xlconfigtest
by Jim Fehlig 17 Jan '17

17 Jan '17

When LIBXL_HAVE_QED is defined, xlconfigtest fails 9) Xen XL-2-XML Format disk-qed ... command line: config parsing error in disk specification: no vdev specified in `target=/var/lib/libvirt/images/XenGuest2,format=qed,backendtype=qdisk,vdev=hda,access=rw' FAILED As per the xl-disk-configuration(5) man page, target= must come last in the disk specification when specified by name: When this parameter is specified by name, ie with the target= syntax in the configuration file, it consumes the whole rest of the DISKSPEC including trailing whitespaces. Therefore in that case it must come last. Change tests/xlconfigdata/test-disk-qed.cfg to adhere to this restriction. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- tests/xlconfigdata/test-disk-qed.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/xlconfigdata/test-disk-qed.cfg b/tests/xlconfigdata/test-disk-qed.cfg index ee904e0..7842176 100644 --- a/tests/xlconfigdata/test-disk-qed.cfg +++ b/tests/xlconfigdata/test-disk-qed.cfg @@ -22,4 +22,4 @@ parallel = "none" serial = "none" builder = "hvm" boot = "d" -disk = [ "target=/var/lib/libvirt/images/XenGuest2,format=qed,backendtype=qdisk,vdev=hda,access=rw" ] +disk = [ "format=qed,backendtype=qdisk,vdev=hda,access=rw,target=/var/lib/libvirt/images/XenGuest2" ] -- 2.9.2

2 2

[libvirt] [PATCH v3 0/2] Fabric name must not be required for fc_host capability
by Boris Fiuczynski 17 Jan '17

17 Jan '17

fabric_name is one of many fc_host attributes in Linux that is optional and left to the low-level driver to decide if it is implemented. --- Changes sinve v2: - removed virReadFCHostOption method - changed additional file check to be used permanently Changes since v1: - split of minor correction in documenting comment - added news entry... - added new virReadFCHostOption method - added check for file existence when optional is set - rearranged fchost tests to fit the numbering --- Boris Fiuczynski (2): util: add file exists check in virReadFCHost nodedev: Fabric name must not be required for fc_host capability docs/formatnode.html.in | 2 +- docs/news.xml | 12 ++++++++++ docs/schemas/nodedev.rng | 8 ++++--- src/node_device/node_device_linux_sysfs.c | 9 +++---- src/util/virutil.c | 5 +++- tests/fchostdata/fc_host/host6/node_name | 1 + tests/fchostdata/fc_host/host6/port_name | 1 + tests/fchostdata/fc_host/host6/port_state | 1 + tests/fchosttest.c | 40 ++++++++++++++++++++++++++++++- 9 files changed, 67 insertions(+), 12 deletions(-) create mode 100644 tests/fchostdata/fc_host/host6/node_name create mode 100644 tests/fchostdata/fc_host/host6/port_name create mode 100644 tests/fchostdata/fc_host/host6/port_state -- 2.5.5

2 4

[libvirt] [PATCH 0/2] security: Fix the transaction model's list appending
by Erik Skultety 17 Jan '17

17 Jan '17

The problem lies in how elements are appended into the transaction list - instead of making a deep copy of a string we were doing a shallow copy only. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1413773 Erik Skultety (2): security: DAC: fix the transaction model's list append security: SELinux: fix the transaction model's list append src/security/security_dac.c | 30 +++++++++++++++++++++--------- src/security/security_selinux.c | 30 +++++++++++++++++++++--------- 2 files changed, 42 insertions(+), 18 deletions(-) -- 2.10.2

2 6

[libvirt] [PATCH] qemu: Don't leak hostCPUModelInfo in virQEMUCaps
by Jiri Denemark 17 Jan '17

17 Jan '17

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_capabilities.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 2512e4838..89e9dd471 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2215,6 +2215,7 @@ void virQEMUCapsDispose(void *obj) VIR_FREE(qemuCaps->gicCapabilities); + qemuMonitorCPUModelInfoFree(qemuCaps->hostCPUModelInfo); virCPUDefFree(qemuCaps->hostCPUModel); } -- 2.11.0

2 2

[libvirt] [PATCH] qemu: Actually unshare() iff running as root
by Michal Privoznik 17 Jan '17

17 Jan '17

While all the code that deals with qemu namespaces correctly detects whether we are running as root (and turn into NO-OP for qemu:///session) the actual unshare() call is not guarded with such check. Therefore any attempt to start a domain under qemu:///session shall fail as unshare() is reserved for root. The fix consists of moving unshare() call (for which we have a wrapper called virProcessSetupPrivateMountNS) into qemuDomainBuildNamespace() where the proper check is performed. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 3 +++ src/qemu/qemu_process.c | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 35baffb51..c67604222 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -7400,6 +7400,9 @@ qemuDomainBuildNamespace(virQEMUDriverPtr driver, goto cleanup; } + if (virProcessSetupPrivateMountNS() < 0) + goto cleanup; + if (qemuDomainSetupDev(driver, vm, devPath) < 0) goto cleanup; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index a980f5a9e..184440dc1 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2663,9 +2663,6 @@ static int qemuProcessHook(void *data) if (virSecurityManagerClearSocketLabel(h->driver->securityManager, h->vm->def) < 0) goto cleanup; - if (virProcessSetupPrivateMountNS() < 0) - goto cleanup; - if (qemuDomainBuildNamespace(h->driver, h->vm) < 0) goto cleanup; -- 2.11.0

2 1

[libvirt] How to generate better API documentation?
by Michal Privoznik 17 Jan '17

17 Jan '17

Dear list, now that we more or less agreed to use some new features (i.e. automatic free() when a variable goes out of the scope [1]), and with our NEWS efforts, do you think it is finally the right time to fix generation of our API docs too? What I mean? Look here: [2] People use '@variable' notation hoping that the generator will put a link there. Or that our generator would allow us to: typedef enum { A = X, B = Y, C = Z, # ifdef VIR_ENUM_SENTINELS VIR_ENUM_LAST # endif } virEnum; where X, Y, Z come from another enum. Long story short, our documentation generator has a lot of bugs. What if instead of putting our effort in fixing it we would switch to something that is already available on the market? gtk-doc, doxygen, etc. Personally, I don't have any preference. Just want to know what your opinion is. Again, if I get a green light I can put it onto the list of GSoC projects [3]. Michal 1: https://www.redhat.com/archives/libvir-list/2017-January/msg00323.html 2: http://libvirt.org/html/libvirt-libvirt-domain.html#virConnectDomainEventBl… 3: http://wiki.libvirt.org/page/Google_Summer_of_Code_2017

4 4

[libvirt] [PATCH v5 0/3] gluster: cache glfs connection object per volume
by Prasanna Kumar Kalever 17 Jan '17

17 Jan '17

v5: Address review comments from Peter on v4 Dropping Patch 3 from v3 Patch 1: fix transport type in all drivers, possible switch case converts Patch 2: use virObject with src->drv to avoid 'initFlag' for remembering 'virStorageFileInit' status Patch 3: * change virStorageBackendGlusterCacheQuery to *Lookup * change virStorageBackendGlusterCacheRefresh to *Release * Avoid the global Flags * Thread safe measure by using virCond* Thanks Peter! v4: Address review comments from Peter on v3 Patch 1: changes to fix test failures (qemuargv2xmltest, qemuxml2argvtest, qemuxml2xmltest and virstoragetest) Patch 2: fix hung in qemuxml2argvtest Patch 3 v3: Split this Patch to 2 parts as below Patch 3 v4: don't free metadata used for storage driver access Patch 4: * update variable naming as per standards * virStorageBackendGlusterPreopened* -> virStorageBackendGlusterCache* Thanks Peter! v3: Address comments by Daniel and Peter on v2 * Split the patch to 3 parts Patch 1: change the virStorageNetHostDef type Patch 2: optimize calls to virStorageFileInit and friends Patch 3: add the caching for glfs * Thanks to Daniel, this version make all the methods as thread safe * Thanks to Peter for pointing use of virObjectLockable, this had simplified rest of the parts a lot. v2: Address review comments from Peter on v1 * Rebased on latest master * Changes to commit msg * Introduce storage API's for Register and Unregister of volume * During qemu process Start/Stop and snapshot create * Check Transport and Port type * Atomic element add/del to list and ref counting Pending: Treating IP and FQDN belong to same host v1: Initial patch Prasanna Kumar Kalever (3): util: change the virStorageNetHostDef type storage: optimize calls to virStorageFileInit and friends gluster: cache glfs connection object per volume src/conf/domain_conf.c | 60 +++-- src/libxl/libxl_conf.c | 10 +- src/qemu/qemu_command.c | 97 ++++--- src/qemu/qemu_domain.c | 25 +- src/qemu/qemu_domain.h | 8 +- src/qemu/qemu_driver.c | 26 +- src/qemu/qemu_parse_command.c | 50 ++-- src/qemu/qemu_process.c | 49 ++++ src/qemu/qemu_process.h | 4 + src/storage/storage_backend.h | 1 + src/storage/storage_backend_fs.c | 5 + src/storage/storage_backend_gluster.c | 329 ++++++++++++++++++++--- src/storage/storage_driver.c | 40 ++- src/storage/storage_driver.h | 2 + src/util/virstoragefile.c | 93 ++++--- src/util/virstoragefile.h | 21 +- src/xenconfig/xen_xl.c | 10 +- tests/domainsnapshotxml2xmlin/disk_snapshot.xml | 2 +- tests/domainsnapshotxml2xmlout/disk_snapshot.xml | 2 +- tests/virstoragetest.c | 2 +- 20 files changed, 614 insertions(+), 222 deletions(-) -- 2.7.4

3 5

[libvirt] [PATCH v2 0/4] target-i386: Implement query-cpu-model-expansion
by Eduardo Habkost 16 Jan '17

16 Jan '17

This series implements query-cpu-model-expansion on target-i386. Changes v1 -> v2: ----------------- This version is highly simplified compared to v1. It contains only an implementation that will return a limited set of properties. I have a follow-up series that will expend type=full expansion to return every single QOM property, but this version will return the same data for type=static and type=full expansion for simplicity (except that type=static expansion will use the "base" CPU model as base). This means this version also won't include "pmu" and "host-cache-info" in full expansion, and won't require special code for those properties. The unit test code was also removed in this version, to keep the series simple and easier to review. Most of the patches on the previous series were changes just to make the test case work. I will send the test-case-related changes as a follow-up series. --- 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 (4): target-i386: Reorganize and document CPUID initialization steps qapi-schema: Comment about full expansion of non-migration-safe models target-i386: Define static "base" CPU model target-i386: Implement query-cpu-model-expansion QMP command qapi-schema.json | 9 ++ target/i386/cpu-qom.h | 2 + monitor.c | 4 +- target/i386/cpu.c | 317 ++++++++++++++++++++++++++++++++++++++++++++------ 4 files changed, 298 insertions(+), 34 deletions(-) -- 2.11.0.259.g40922b1

1 1

[libvirt] Performance about x-data-plane
by Weiwei Jia 16 Jan '17

16 Jan '17

Hi, With QEMU x-data-plane, I find the performance has not been improved very much. Please see following two settings. Setting 1: I/O thread in host OS (VMM) reads 4KB each time from disk (8GB in total). Pin the I/O thread to pCPU 5 which will serve I/O thread dedicatedly. I find the performance is around 250 MB/s. Setting 2: I/O thread in guest OS (VMM) reads 4KB each time from virtual disk (8GB in total). Pin the I/O thread to vCPU 5 and pin vCPU 5 thread to pCPU5 so that vCPU 5 handles this I/O thread dedicatedly and pCPU5 serve vCPU5 dedicatedly. In order to keep vCPU5 not to be idle, I also pin one cpu intensive thread (while (1) {i++}) on vCPU 5 so that the I/O thread on it can be served without delay. For this setting, I find the performance for this I/O thread is around 190 MB/s. NOTE: For setting 2, I also pin the QEMU dedicated IOthread (x-data-plane) in host OS to pCPU to handle I/O requests from guest OS dedicatedly. I think for setting 2, the performance of I/O thread should be almost the same as setting 1. I cannot understand why it is 60 MB/s lower than setting 1. I am wondering whether there are something wrong with my x-data-plane setting or virtio setting for VM. Would you please give me some hints? Thank you. Libvirt version: 2.4.0 QEMU version: 2.3.0 The libvirt xml configuration file is like following (I only start one VM with following xml config). <domain type='kvm' id='1' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'> <name>vm</name> <uuid>3290a8d0-9d9f-b2c4-dd46-5d0d8a730cd6</uuid> <memory unit='KiB'>8290304</memory> <currentMemory unit='KiB'>8290304</currentMemory> <vcpu placement='static'>15</vcpu> <cputune> <vcpupin vcpu='0' cpuset='0'/> <vcpupin vcpu='1' cpuset='1'/> <vcpupin vcpu='2' cpuset='2'/> <vcpupin vcpu='3' cpuset='3'/> <vcpupin vcpu='4' cpuset='4'/> <vcpupin vcpu='5' cpuset='5'/> <vcpupin vcpu='6' cpuset='6'/> <vcpupin vcpu='7' cpuset='7'/> <vcpupin vcpu='8' cpuset='8'/> <vcpupin vcpu='9' cpuset='9'/> <vcpupin vcpu='10' cpuset='10'/> <vcpupin vcpu='11' cpuset='11'/> <vcpupin vcpu='12' cpuset='12'/> <vcpupin vcpu='13' cpuset='13'/> <vcpupin vcpu='14' cpuset='14'/> </cputune> <resource> <partition>/machine</partition> </resource> <os> <type arch='x86_64' machine='pc-i440fx-2.2'>hvm</type> <boot dev='hd'/> </os> <features> <acpi/> <apic/> <pae/> </features> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> <emulator>/usr/bin/kvm-spice</emulator> <disk type='file' device='disk'> <driver name='qemu' type='raw' cache='none' io='native'/> <source file='/var/lib/libvirt/images/vm.img'/> <target dev='vda' bus='virtio'/> <alias name='virtio-disk0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> </disk> <disk type='block' device='cdrom'> <driver name='qemu' type='raw'/> <target dev='hdc' bus='ide'/> <readonly/> <alias name='ide0-1-0'/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> <controller type='usb' index='0'> <alias name='usb0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='pci' index='0' model='pci-root'> <alias name='pci.0'/> </controller> <controller type='ide' index='0'> <alias name='ide0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> </controller> <controller type='scsi' index='0'> <alias name='scsi0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </controller> <interface type='network'> <mac address='52:54:00:8e:3d:06'/> <source network='default'/> <target dev='vnet0'/> <model type='virtio'/> <alias name='net0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> <serial type='pty'> <source path='/dev/pts/8'/> <target port='0'/> <alias name='serial0'/> </serial> <console type='pty' tty='/dev/pts/8'> <source path='/dev/pts/8'/> <target type='serial' port='0'/> <alias name='serial0'/> </console> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='5900' autoport='yes' listen='127.0.0.1'> <listen type='address' address='127.0.0.1'/> </graphics> <video> <model type='cirrus' vram='9216' heads='1'/> <alias name='video0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </video> <memballoon model='virtio'> <alias name='balloon0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </memballoon> </devices> <seclabel type='none'/> <qemu:commandline> <qemu:arg value='-set'/> <qemu:arg value='device.virtio-disk0.scsi=off'/> <qemu:arg value='-set'/> <qemu:arg value='device.virtio-disk0.config-wce=off'/> <qemu:arg value='-set'/> <qemu:arg value='device.virtio-disk0.x-data-plane=on'/> </qemu:commandline> </domain> Thank you, Weiwei Jia

4 8

[libvirt] [PATCH for 3.0.0] Revert "perf: Add cache_l1d perf event support"
by Daniel P. Berrange 16 Jan '17

16 Jan '17

This reverts commit ae16c95f1bb5591c27676c5de8d383e5612c3568. The data was calculated incorrectly and the event name needs to be changed. --- docs/formatdomain.html.in | 7 ------- docs/schemas/domaincommon.rng | 1 - include/libvirt/libvirt-domain.h | 11 ----------- src/libvirt-domain.c | 2 -- src/qemu/qemu_driver.c | 1 - src/util/virperf.c | 6 +----- src/util/virperf.h | 1 - tests/genericxml2xmlindata/generic-perf.xml | 1 - tools/virsh.pod | 5 +---- 9 files changed, 2 insertions(+), 33 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 30cb196..3f7f875 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1937,7 +1937,6 @@ <event name='stalled_cycles_frontend' enabled='no'/> <event name='stalled_cycles_backend' enabled='no'/> <event name='ref_cpu_cycles' enabled='no'/> - <event name='cache_l1d' enabled='no'/> </perf> ... </pre> @@ -2016,12 +2015,6 @@ by applications running on the platform</td> <td><code>perf.ref_cpu_cycles</code></td> </tr> - <tr> - <td><code>cache_l1d</code></td> - <td>the count of total level 1 data cache by applications running on - the platform</td> - <td><code>perf.cache_l1d</code></td> - </tr> </table> <h3><a name="elementsDevices">Devices</a></h3> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index be0a609..4d76315 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -433,7 +433,6 @@ <value>stalled_cycles_frontend</value> <value>stalled_cycles_backend</value> <value>ref_cpu_cycles</value> - <value>cache_l1d</value> </choice> </attribute> <attribute name="enabled"> diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 1e0e74c..e303140 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -2188,17 +2188,6 @@ void virDomainStatsRecordListFree(virDomainStatsRecordPtr *stats); */ # define VIR_PERF_PARAM_REF_CPU_CYCLES "ref_cpu_cycles" -/** - * VIR_PERF_PARAM_CACHE_L1D: - * - * Macro for typed parameter name that represents cache_l1d - * perf event which can be used to measure the count of total - * level 1 data cache by applications running on the platform. - * It corresponds to the "perf.cache_l1d" field in the - * *Stats APIs. - */ -# define VIR_PERF_PARAM_CACHE_L1D "cache_l1d" - int virDomainGetPerfEvents(virDomainPtr dom, virTypedParameterPtr *params, int *nparams, diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 3023f30..5b3e842 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -11250,8 +11250,6 @@ virConnectGetDomainCapabilities(virConnectPtr conn, * CPU frequency scaling by applications running * as unsigned long long. It is produced by the * ref_cpu_cycles perf event. - * "perf.cache_l1d" - The count of total level 1 data cache as unsigned - * long long. It is produced by cache_l1d perf event. * * Note that entire stats groups or individual stat fields may be missing from * the output in case they are not supported by the given hypervisor, are not diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 42f9889..d4422f3 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9877,7 +9877,6 @@ qemuDomainSetPerfEvents(virDomainPtr dom, 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_CACHE_L1D, VIR_TYPED_PARAM_BOOLEAN, NULL) < 0) return -1; diff --git a/src/util/virperf.c b/src/util/virperf.c index 8554723..f64692b 100644 --- a/src/util/virperf.c +++ b/src/util/virperf.c @@ -43,8 +43,7 @@ VIR_ENUM_IMPL(virPerfEvent, VIR_PERF_EVENT_LAST, "cache_references", "cache_misses", "branch_instructions", "branch_misses", "bus_cycles", "stalled_cycles_frontend", - "stalled_cycles_backend", "ref_cpu_cycles", - "cache_l1d"); + "stalled_cycles_backend", "ref_cpu_cycles"); struct virPerfEvent { int type; @@ -113,9 +112,6 @@ static struct virPerfEventAttr attrs[] = { .attrConfig = 0, # endif }, - {.type = VIR_PERF_EVENT_CACHE_L1D, - .attrType = PERF_TYPE_HW_CACHE, - .attrConfig = PERF_COUNT_HW_CACHE_L1D}, }; typedef struct virPerfEventAttr *virPerfEventAttrPtr; diff --git a/src/util/virperf.h b/src/util/virperf.h index 4c562af..1f43c92 100644 --- a/src/util/virperf.h +++ b/src/util/virperf.h @@ -47,7 +47,6 @@ typedef enum { the backend of the instruction processor pipeline */ VIR_PERF_EVENT_REF_CPU_CYCLES, /* Count of ref cpu cycles */ - VIR_PERF_EVENT_CACHE_L1D, /* Count of level 1 data cache*/ VIR_PERF_EVENT_LAST } virPerfEventType; diff --git a/tests/genericxml2xmlindata/generic-perf.xml b/tests/genericxml2xmlindata/generic-perf.xml index d1418d0..437cd65 100644 --- a/tests/genericxml2xmlindata/generic-perf.xml +++ b/tests/genericxml2xmlindata/generic-perf.xml @@ -26,7 +26,6 @@ <event name='stalled_cycles_frontend' enabled='yes'/> <event name='stalled_cycles_backend' enabled='yes'/> <event name='ref_cpu_cycles' enabled='yes'/> - <event name='cache_l1d' enabled='yes'/> </perf> <devices> </devices> diff --git a/tools/virsh.pod b/tools/virsh.pod index cfa7a24..0e434c0 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -945,8 +945,7 @@ I<--perf> returns the statistics of all enabled perf events: "perf.bus_cycles" - the count of bus cycles, "perf.stalled_cycles_frontend" - the count of stalled frontend cpu cycles, "perf.stalled_cycles_backend" - the count of stalled backend cpu cycles, -"perf.ref_cpu_cycles" - the count of ref cpu cycles, -"perf.cache_l1d" - the count of level 1 data cache +"perf.ref_cpu_cycles" - the count of ref cpu cycles See the B<perf> command for more details about each event. @@ -2311,8 +2310,6 @@ B<Valid perf event names> ref_cpu_cycles - Provides the count of total cpu cycles not affected by CPU frequency scaling by applications running on the platform. - cache_l1d - Provides the count of total level 1 data cache - by applications running on the platform. B<Note>: The statistics can be retrieved using the B<domstats> command using the I<--perf> flag. -- 2.9.3

2 2

[libvirt] [RFE] Enable/allow MAC spoofing for SR-IOV virtual functions.
by Leon Goldberg 16 Jan '17

16 Jan '17

Hey, We've recently encountered difficulties using a virtual function as a slave in a bond where the virtual function's MAC address differs from the bond's. I've opened an RFE[1] suggesting MAC spoofing to be enabled/allowed in virtual functions. [1] https://bugzilla.redhat.com/show_bug.cgi?id=1413596 Thanks, Leon

1 0

[libvirt] [PATCH] qemu: Copy SELinux labels for namespace too
by Michal Privoznik 16 Jan '17

16 Jan '17

When creating new /dev/* for qemu, we do chown() and copy ACLs to create the exact copy from the original /dev. I though that copying SELinux labels is not necessary as SELinux will chose the sane defaults. Surprisingly, it does not leaving namespace with the following labels: crw-rw-rw-. root root system_u:object_r:tmpfs_t:s0 random crw-------. root root system_u:object_r:tmpfs_t:s0 rtc0 drwxrwxrwt. root root system_u:object_r:tmpfs_t:s0 shm crw-rw-rw-. root root system_u:object_r:tmpfs_t:s0 urandom As a result, domain is unable to start: error: internal error: process exited while connecting to monitor: Error in GnuTLS initialization: Failed to acquire random data. qemu-kvm: cannot initialize crypto: Unable to initialize GNUTLS library: Failed to acquire random data. The solution is to copy the SELinux labels as well. Reported-by: Andrea Bolognani <abologna(a)redhat.com> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 1399dee0d..a29866673 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -63,6 +63,9 @@ #if defined(HAVE_SYS_MOUNT_H) # include <sys/mount.h> #endif +#ifdef WITH_SELINUX +# include <selinux/selinux.h> +#endif #include <libxml/xpathInternals.h> @@ -6958,6 +6961,9 @@ qemuDomainCreateDevice(const char *device, char *canonDevicePath = NULL; struct stat sb; int ret = -1; +#ifdef WITH_SELINUX + char *tcon = NULL; +#endif if (virFileResolveAllLinks(device, &canonDevicePath) < 0) { if (errno == ENOENT && allow_noent) { @@ -7023,10 +7029,34 @@ qemuDomainCreateDevice(const char *device, goto cleanup; } +#ifdef WITH_SELINUX + if (getfilecon_raw(canonDevicePath, &tcon) < 0 && + (errno != ENOTSUP && errno != ENODATA)) { + virReportSystemError(errno, + _("Unable to get SELinux label on %s"), canonDevicePath); + goto cleanup; + } + + if (tcon && + setfilecon_raw(devicePath, (VIR_SELINUX_CTX_CONST char *) tcon) < 0) { + VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR + if (errno != EOPNOTSUPP && errno != ENOTSUP) { + VIR_WARNINGS_RESET + virReportSystemError(errno, + _("Unable to set SELinux label on %s"), + devicePath); + goto cleanup; + } + } +#endif + ret = 0; cleanup: VIR_FREE(canonDevicePath); VIR_FREE(devicePath); +#ifdef WITH_SELINUX + freecon(tcon); +#endif return ret; } @@ -7472,6 +7502,9 @@ struct qemuDomainAttachDeviceMknodData { const char *file; struct stat sb; void *acl; +#ifdef WITH_SELINUX + char *tcon; +#endif }; @@ -7515,6 +7548,19 @@ qemuDomainAttachDeviceMknodHelper(pid_t pid ATTRIBUTE_UNUSED, goto cleanup; } +#ifdef WITH_SELINUX + if (setfilecon_raw(data->file, (VIR_SELINUX_CTX_CONST char *) data->tcon) < 0) { + VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR + if (errno != EOPNOTSUPP && errno != ENOTSUP) { + VIR_WARNINGS_RESET + virReportSystemError(errno, + _("Unable to set SELinux label on %s"), + data->file); + goto cleanup; + } + } +#endif + switch ((virDomainDeviceType) data->devDef->type) { case VIR_DOMAIN_DEVICE_DISK: { virDomainDiskDefPtr def = data->devDef->data.disk; @@ -7571,6 +7617,9 @@ qemuDomainAttachDeviceMknodHelper(pid_t pid ATTRIBUTE_UNUSED, cleanup: if (ret < 0 && delDevice) unlink(data->file); +#ifdef WITH_SELINUX + freecon(data->tcon); +#endif virFileFreeACLs(&data->acl); return ret; } @@ -7605,6 +7654,15 @@ qemuDomainAttachDeviceMknod(virQEMUDriverPtr driver, return ret; } +#ifdef WITH_SELINUX + if (getfilecon_raw(file, &data.tcon) < 0 && + (errno != ENOTSUP && errno != ENODATA)) { + virReportSystemError(errno, + _("Unable to get SELinux label on %s"), file); + goto cleanup; + } +#endif + if (virSecurityManagerPreFork(driver->securityManager) < 0) goto cleanup; @@ -7619,6 +7677,9 @@ qemuDomainAttachDeviceMknod(virQEMUDriverPtr driver, ret = 0; cleanup: +#ifdef WITH_SELINUX + freecon(data.tcon); +#endif virFileFreeACLs(&data.acl); return 0; } -- 2.11.0

3 5

[libvirt] [PATCH 0/2] Add perf event support for Level 1 Data Cache
by Nitesh Konkar 16 Jan '17

16 Jan '17

Compute the config value for cache_l1d (renamed to cache_l1dra) correctly and add another perf event support for cache_l1drm. Nitesh Konkar (2): perf: Compute cache_l1d config value correctly perf: add cache_l1drm perf event support docs/formatdomain.html.in | 19 +++++++++++++------ docs/news.xml | 5 +++-- docs/schemas/domaincommon.rng | 3 ++- include/libvirt/libvirt-domain.h | 23 +++++++++++++++++------ src/libvirt-domain.c | 8 ++++++-- src/qemu/qemu_driver.c | 3 ++- src/util/virperf.c | 13 ++++++++++--- src/util/virperf.h | 3 ++- tests/genericxml2xmlindata/generic-perf.xml | 3 ++- tools/virsh.pod | 9 ++++++--- 10 files changed, 63 insertions(+), 26 deletions(-) -- 1.9.3

2 4

[libvirt] [PATCH] news: Add support for guest CPU configuration on s390
by Jiri Denemark 16 Jan '17

16 Jan '17

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- docs/news.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 50c3b3ea2..a076836ed 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -73,6 +73,11 @@ volumes when building a new logical pool on target volume(s). </description> </change> + <change> + <summary> + qemu: Add support for guest CPU configuration on s390(x) + </summary> + </change> </section> <section title="Improvements"> <change> -- 2.11.0

2 1

[libvirt] [PATCH] qemu: document snapshot-related fixes in the release notes
by Andrea Bolognani 13 Jan '17

13 Jan '17

--- docs/news.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 50c3b3e..043d1fe 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -225,6 +225,15 @@ for x86_64 HVM domains. </description> </change> + <change> + <summary> + qemu: snapshot-related fixes + </summary> + <description> + Properly handle image locking and stop looking for a compression + program when the memory image format is "raw". + </description> + </change> </section> </release> <release version="v2.5.0" date="2016-12-04"> -- 2.7.4

2 2

[libvirt] [PATCH] docs: add entry for aggregation of pcie-root-ports to news.xml
by Laine Stump 13 Jan '17

13 Jan '17

--- docs/news.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 50c3b3e..18006e8 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -140,6 +140,19 @@ the storage pool XML. </description> </change> + <change> + <summary> + qemu: aggregate pcie-root-ports onto multiple functions of a slot + </summary> + <description> + When pcie-root-ports are added to pcie-root in order to + provide a place to connect PCI Express endpoint devices, + libvirt now aggregates multiple root-ports together onto the + same slot (up to 8 per slot) in order to conserve + slots. Using this method, it's possible to connect more than + 200 endpoint devices to a guest that uses PCIe without + requiring setup of any PCIe switches. + </description> </section> <section title="Bug fixes"> <change> -- 2.7.4

2 1

[libvirt] [PATCH 0/3] More adjustments for recent storage probe logic
by John Ferlan 13 Jan '17

13 Jan '17

Adjustments based on recent activity... The !writelabel path of patch 3 is probably a moot point since patches to check at FS and Logical startup for a valid data on the device(s) were reverted. John Ferlan (3): storage: Alter logic when both BLKID and PARTED unavailable storage: Clean up return value checking storage: Alter error message in probe/empty checks src/storage/storage_backend.c | 44 ++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-) -- 2.7.4

2 6

[libvirt] [PATCH] qemu-capabilities: Fix query-cpu-model-expansion on s390 with older kernel
by Collin L. Walling 13 Jan '17

13 Jan '17

When running on s390 with a kernel that does not support cpu model checking and with a Qemu new enough to support query-cpu-model-expansion, the gathering of qemu capabilities will fail. Qemu responds to the query-cpu-model-expansion qmp command with an error because the needed kernel ioct does not exist. When this happens a guest cannot even be defined due to missing qemu capabilities data. This patch fixes the problem by silently ignoring generic errors stemming from calls to query-cpu-model-expansion. Reported-by: Farhan Ali <alifm(a)linux.vnet.ibm.com> Signed-off-by: Collin L. Walling <walling(a)linux.vnet.ibm.com> Signed-off-by: Jason J. Herne <jjherne(a)linux.vnet.ibm.com> --- src/qemu/qemu_monitor_json.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index e767437..1662749 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -5041,6 +5041,15 @@ qemuMonitorJSONGetCPUModelExpansion(qemuMonitorPtr mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; + /* Some QEMU architectures have the query-cpu-model-expansion + * command, but return 'GenericError' instead of simply omitting + * the command entirely. + */ + if (qemuMonitorJSONHasError(reply, "GenericError")) { + ret = 0; + goto cleanup; + } + if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; -- 2.7.4

4 7

[libvirt] [PATCH v2 0/2] Fabric name must not be required for fc_host capability
by Boris Fiuczynski 13 Jan '17

13 Jan '17

fabric_name is one of many fc_host attributes in Linux that is optional and left to the low-level driver to decide if it is implemented. --- Changes since v1: - split of minor correction in documenting comment - added news entry... - added new virReadFCHostOption method - added check for file existence when optional is set - rearranged fchost tests to fit the numbering --- Boris Fiuczynski (2): nodedev: Fabric name must not be required for fc_host capability util: Minor correction in documenting comment docs/formatnode.html.in | 2 +- docs/news.xml | 12 +++++++++ docs/schemas/nodedev.rng | 8 +++--- src/libvirt_private.syms | 1 + src/node_device/node_device_linux_sysfs.c | 6 ++--- src/util/virutil.c | 25 +++++++++++++++++- src/util/virutil.h | 5 ++++ tests/fchostdata/fc_host/host6/node_name | 1 + tests/fchostdata/fc_host/host6/port_name | 1 + tests/fchostdata/fc_host/host6/port_state | 1 + tests/fchosttest.c | 44 ++++++++++++++++++++++++++++--- 11 files changed, 95 insertions(+), 11 deletions(-) create mode 100644 tests/fchostdata/fc_host/host6/node_name create mode 100644 tests/fchostdata/fc_host/host6/port_name create mode 100644 tests/fchostdata/fc_host/host6/port_state -- 2.5.5

2 3

[libvirt] [PATCH] docs: Fix libvirt_guest nss module name
by Michal Privoznik 13 Jan '17

13 Jan '17

In the documentation we are mixing libvirt-guest and libvirt_guest module name. The correct name is the latter. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed as trivial. docs/news.xml | 4 ++-- docs/nss.html.in | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/news.xml b/docs/news.xml index 8a876e998..50c3b3ea2 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -29,10 +29,10 @@ </change> <change> <summary> - nss: Introduce <code>libvirt-guest</code> + nss: Introduce <code>libvirt_guest</code> </summary> <description> - New <code>libvirt-guest</code> nss module that translates libvirt + New <code>libvirt_guest</code> nss module that translates libvirt guest names into IP addresses. </description> </change> diff --git a/docs/nss.html.in b/docs/nss.html.in index e07f9b774..2a5a46cd1 100644 --- a/docs/nss.html.in +++ b/docs/nss.html.in @@ -72,34 +72,34 @@ hosts: files libvirt dns records. Therefore this is dependent on hostname provided by guests. Thing is, not all the guests out there provide one in DHCP transactions, or not every sysadmin out there believes all the guests. Hence libvirt implements - second method in <code>libvirt-guest</code> module which does libvirt guest + second method in <code>libvirt_guest</code> module which does libvirt guest name to IP address translation (regardless of hostname set in the guest). </p> <p> To enable either of the modules put their name into the <code>nsswitch.conf</code> file. For instance, to enable - <code>libvirt-guest</code> module: + <code>libvirt_guest</code> module: </p> <pre> $ cat /etc/nsswitch.conf # /etc/nsswitch.conf: -hosts: files libvirt-guest dns +hosts: files libvirt_guest dns # ... </pre> <p>Or users can enable both at the same time:</p> <pre> $ cat /etc/nsswitch.conf # /etc/nsswitch.conf: -hosts: files libvirt libvirt-guest dns +hosts: files libvirt libvirt_guest dns # ... </pre> <p> This configuration will mean that if hostname is not found by the <code>libvirt</code> module (e.g. because a guest did not sent hostname - during DHCP transaction), the <code>libvirt-guest</code> module is + during DHCP transaction), the <code>libvirt_guest</code> module is consulted (and if the hostname matches libvirt guest name it will be resolved). </p> @@ -181,7 +181,7 @@ virsh domifaddr --source lease $domain <p> If there's no record for either of the aforementioned commands, it's very likely that NSS module won't find anything and vice versa. - As of <code>v3.0.0</code> libvirt provides <code>libvirt-guest</code> NSS + As of <code>v3.0.0</code> libvirt provides <code>libvirt_guest</code> NSS module that doesn't have this limitation. However, the statement is still true for the <code>libvirt</code> NSS module. </p> -- 2.11.0

1 0

[libvirt] [PATCH v2 00/10] Introduce new libvirt-guest NSS module
by Michal Privoznik 13 Jan '17

13 Jan '17

v2 of: https://www.redhat.com/archives/libvir-list/2016-November/msg01456.html diff to v1: - New module is created instead of putting everything into already existing one - Few hints from review of v1 were worked in Michal Privoznik (10): network: Don't unlock non-locked network driver nssmock: Prefer free() over VIR_FREE() virstring: Introduce virStringListAdd virstring: Introduce virStringListRemove util: Introduce virFileRewriteStr util: Introduce virMACMap module network: Track MAC address map nss: Use macro to generate public API names nss: Move address appending code into a separate function nss: Introduce libvirt-guest module cfg.mk | 2 +- docs/news.html.in | 4 + docs/nss.html.in | 58 ++++- po/POTFILES.in | 1 + src/Makefile.am | 9 + src/conf/network_conf.h | 4 + src/conf/virsecretobj.c | 20 +- src/libvirt_private.syms | 12 ++ src/network/bridge_driver.c | 95 ++++++++- src/network/leaseshelper.c | 14 +- src/util/virfile.c | 24 ++- src/util/virfile.h | 7 +- src/util/virmacmap.c | 399 +++++++++++++++++++++++++++++++++++ src/util/virmacmap.h | 48 +++++ src/util/virstring.c | 84 ++++++++ src/util/virstring.h | 6 + src/util/virxml.c | 4 +- tests/Makefile.am | 36 +++- tests/nssdata/virbr0.macs | 23 ++ tests/nssdata/virbr0.status | 5 + tests/nssdata/virbr1.macs | 21 ++ tests/nssdata/virbr1.status | 5 + tests/nsslinktest.c | 2 +- tests/nssmock.c | 25 ++- tests/nsstest.c | 17 +- tests/virmacmapmock.c | 29 +++ tests/virmacmaptest.c | 232 ++++++++++++++++++++ tests/virmacmaptestdata/complex.json | 45 ++++ tests/virmacmaptestdata/empty.json | 3 + tests/virmacmaptestdata/simple.json | 8 + tests/virmacmaptestdata/simple2.json | 16 ++ tests/virstringtest.c | 98 +++++++++ tools/Makefile.am | 46 +++- tools/nss/libvirt_guest_nss.syms | 12 ++ tools/nss/libvirt_nss.c | 216 +++++++++++++------ tools/nss/libvirt_nss.h | 30 +-- 36 files changed, 1531 insertions(+), 129 deletions(-) create mode 100644 src/util/virmacmap.c create mode 100644 src/util/virmacmap.h create mode 100644 tests/nssdata/virbr0.macs create mode 100644 tests/nssdata/virbr1.macs create mode 100644 tests/virmacmapmock.c create mode 100644 tests/virmacmaptest.c create mode 100644 tests/virmacmaptestdata/complex.json create mode 100644 tests/virmacmaptestdata/empty.json create mode 100644 tests/virmacmaptestdata/simple.json create mode 100644 tests/virmacmaptestdata/simple2.json create mode 100644 tools/nss/libvirt_guest_nss.syms -- 2.11.0

3 26

[libvirt] [PATCH 0/4] Doc update changes for my recent commits
by John Ferlan 13 Jan '17

13 Jan '17

These are all trivial and will push in a bit - I was essentially waiting for the news.html.in or news.xml to shake out before adjusting. John Ferlan (4): docs: Document the new vHBA/NPIV params for storage docs: Add NPIV/vHBA change description to news.xml docs: Add file system pool overwrite change description to news.xml docs: Add logical storage pool overwrite change description to news.xml docs/formatstorage.html.in | 17 +++++++++++++++++ docs/news.xml | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) -- 2.7.4

2 7

[libvirt] [PATCH 0/3] For 3.0: storage: fix regressions in storage driver
by Peter Krempa 13 Jan '17

13 Jan '17

Few recent patches broke stuff. Revert/fix them. Peter Krempa (3): Revert "storage: For FS pool check for properly formatted target volume" Revert "storage: Validate the device formats at logical startup" storage: logical: Fix flawed logic with (NO)_OVERWRITE flags. src/storage/storage_backend_fs.c | 13 ++----------- src/storage/storage_backend_logical.c | 15 +-------------- 2 files changed, 3 insertions(+), 25 deletions(-) -- 2.11.0

4 13

Re: [libvirt] Query regarding sharing of vcpu's (cpu alloc ratio 1.0) between VM's
by Martin Kletzander 13 Jan '17

13 Jan '17

[It's a good thing to keep the list Cc'd, someone else might have better answer] On Thu, Jan 12, 2017 at 10:33:23AM -0600, BharaniKumar Gedela wrote: >Hi Martin, > >To be more clear on the requirement, I have a kind of VM which needs 2 >vcpu's. One of the vcpu is dedicated for a specific process in the VM and >the other vcpu can be shared by other VM's of the same kind. >To be more clear, each VM is having 2 processes, one cpu intensive which >got a dedicated vcpu alloted and the other process is a lightweight process >which needs less amount of cpu so it can be shared with the other Vm's >light weight processes. >Example: >There are 10 VM's of same type which need 2 vcpu's each (1 dedicated and 1 >shared): >VM#: vcpu1, vcpu2 >VM1: 1, 11 >VM2: 2, 11 >VM3: 3, 11 >VM4: 4, 11 >VM5: 5, 11 >VM6: 6, 11 >VM7:7, 11 >VM8: 8, 11 >VM: 9, 11 >VM:10, 11 > OK, so this is easy to do in libvirt. You just use <vcpupin/> >IS there a way openstack nova-scheduler can provision the same (does this >need libvirt changes if we want to provision via nova-scheduler)?or it can >only be done via boot via xml (manually via templates in virsh)? > However, I don't know about openstack. But definitely there's no change needed in libvirt. There might be some people from openstack on this list, but it's mainly libvirt-related >Regards, >Bharani.. > >On Thu, Jan 12, 2017 at 2:26 AM, Martin Kletzander <mkletzan(a)redhat.com> >wrote: > >> On Wed, Jan 11, 2017 at 11:13:52AM -0600, BharaniKumar Gedela wrote: >> >>> HI, >>> >>> I have a Q about sharing a vcpu across Vm's (cpu alloc ratio 1.0 and HT >>> not >>> enabled)? >>> >>> I have a Use case where a VM needs vcpu's and one of the vcpu is dedicated >>> to the VM for some traffic processing. We want the other vcpu which is >>> used >>> for control processing and can be shared with a similar VM's control >>> processing. >>> Is this possible and support in openstack/libvirt/KVM? >>> >>> >> I can't wrap my head around it, but do you mean something like this: >> >> | pCPUs | 0 | 1 | 2 | 3 | >> |---------------+---+---+---+---| >> | VM #0's vCPUs | 0 | 1 | 2 | | >> | VM #1's vCPUs | | 0 | 1 | | >> >> where VM #0 uses pCPU 0 exclusively and both VMs share pCPUs 1 and 2? >> >> You can do that using vcpupin [1]. Do you want them to share the pCPUs >> fairly? You could theoretically utilize shares/period/quota for that, >> making sure that the rest of the system is set up properly as well. >> >> If so could you please advice how to test it? >>> >>> >> >> [1] https://libvirt.org/formatdomain.html#elementsCPUTuning >> >> Regards, >>> Bharani.. >>> >> >> -- >>> libvir-list mailing list >>> libvir-list(a)redhat.com >>> https://www.redhat.com/mailman/listinfo/libvir-list >>> >>

1 0

[libvirt] [PATCH] libxl: always enable pae for x86_64 HVM
by Jim Fehlig 13 Jan '17

13 Jan '17

For HVM domains, pae is only set in libxl_domain_build_info when explicitly specified in the hypervisor <features> config. This is fine for i686 machines, but is incorrect behavior for x86_64 machines where pae must always be enabled. See the following discussion for additional details https://www.redhat.com/archives/libvir-list/2017-January/msg00254.html Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_domain.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index fbe7ee5..a5314b0 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -410,6 +410,12 @@ libxlDomainDefPostParse(virDomainDefPtr def, if (xenDomainDefAddImplicitInputDevice(def) < 0) return -1; + /* For x86_64 HVM, always enable pae */ + if (def->os.type == VIR_DOMAIN_OSTYPE_HVM && + def->os.arch == VIR_ARCH_X86_64) { + def->features[VIR_DOMAIN_FEATURE_PAE] = VIR_TRISTATE_SWITCH_ON; + } + return 0; } -- 2.9.2

3 8

[libvirt] (no subject)
by 乔立勇(Eli Qiao) 13 Jan '17

13 Jan '17

hi all 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

1 0

[libvirt] [PATCH go-xml] Added domain snapshot schema
by Alexey Slaykovsky 12 Jan '17

12 Jan '17

Signed-off-by: Alexey Slaykovsky <aslaikov(a)redhat.com> --- domain.go | 11 ++- domain_snapshot.go | 79 ++++++++++++++++++++ domain_snapshot_test.go | 190 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 278 insertions(+), 2 deletions(-) create mode 100644 domain_snapshot.go create mode 100644 domain_snapshot_test.go diff --git a/domain.go b/domain.go index 8afe32d..161ba33 100644 --- a/domain.go +++ b/domain.go @@ -43,11 +43,18 @@ type DomainDiskDriver struct { Type string `xml:"type,attr"` } +type DomainDiskTarget struct { + Dev string `xml:"dev,attr"` + Bus string `xml:"bus,attr"` +} + type DomainDisk struct { Type string `xml:"type,attr"` Device string `xml:"device,attr"` + Snapshot string `xml:"snapshot,attr,omitempty"` Driver DomainDiskDriver `xml:"driver"` FileSource DomainDiskFileSource `xml:"source"` + Target *DomainDiskTarget `xml:"target"` } type DomainInterfaceMAC struct { @@ -123,7 +130,7 @@ type DomainDeviceList struct { type DomainMemory struct { Value string `xml:",chardata"` - Unit string `xml:"unit,attr"` + Unit string `xml:"unit,attr,omitempty"` } type DomainOSType struct { @@ -191,7 +198,7 @@ type DomainOS struct { type Domain struct { XMLName xml.Name `xml:"domain"` - Type string `xml:"type,attr"` + Type string `xml:"type,attr,omitempty"` Name string `xml:"name"` UUID *string `xml:"uuid"` Memory *DomainMemory `xml:"memory"` diff --git a/domain_snapshot.go b/domain_snapshot.go new file mode 100644 index 0000000..226cd09 --- /dev/null +++ b/domain_snapshot.go @@ -0,0 +1,79 @@ +/* + * This file is part of the libvirt-go-xml project + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * Copyright (C) 2017 Red Hat, Inc. + * + */ + +package libvirtxml + +import "encoding/xml" + +type DomainSnapshotDiskDriver struct { + Type string `xml:"type,attr"` +} + +type DomainSnapshotDiskSource struct { + File string `xml:"file,attr"` +} + +type DomainSnapshotDisk struct { + Name string `xml:"name,attr"` + Snapshot string `xml:"snapshot,attr,omitempty"` + Driver *DomainSnapshotDiskDriver `xml:"driver"` + Source *DomainSnapshotDiskSource `xml:"source"` +} + +type DomainSnapshotDisks struct { + Disks []DomainSnapshotDisk `xml:"disk"` +} + +type DomainSnapshotMemory struct { + Snapshot string `xml:"snapshot,attr"` +} + +type DomainSnapshotParent struct { + Name string `xml:"name"` +} + +type DomainSnapshot struct { + XMLName xml.Name `xml:"domainsnapshot"` + Name string `xml:"name,omitempty"` + Description string `xml:"description,omitempty"` + State string `xml:"state,omitempty"` + CreationTime string `xml:"creationTime,omitempty"` + Parent *DomainSnapshotParent `xml:"parent"` + Memory *DomainSnapshotMemory `xml:"memory"` + Disks *DomainSnapshotDisks `xml:"disks"` + Domain *Domain `xml:"domain"` +} + +func (s *DomainSnapshot) Unmarshal(doc string) error { + return xml.Unmarshal([]byte(doc), s) +} + +func (s *DomainSnapshot) Marshal() (string, error) { + doc, err := xml.MarshalIndent(s, "", " ") + if err != nil { + return "", err + } + return string(doc), nil +} diff --git a/domain_snapshot_test.go b/domain_snapshot_test.go new file mode 100644 index 0000000..e33bc6b --- /dev/null +++ b/domain_snapshot_test.go @@ -0,0 +1,190 @@ +/* + * This file is part of the libvirt-go-xml project + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * Copyright (C) 2017 Red Hat, Inc. + * + */ + +package libvirtxml + +import ( + "strings" + "testing" +) + +var domainSnapshotTestData = []struct { + Object *DomainSnapshot + Expected []string +}{ + { + Object: &DomainSnapshot{ + Description: "Snapshot", + Disks: &DomainSnapshotDisks{ + []DomainSnapshotDisk{ + DomainSnapshotDisk{ + Name: "/old", + Source: &DomainSnapshotDiskSource{ + File: "/new", + }, + }, + DomainSnapshotDisk{ + Name: "vdb", + Snapshot: "no", + }, + }, + }, + }, + Expected: []string{ + `<domainsnapshot>`, + ` <description>Snapshot</description>`, + ` <disks>`, + ` <disk name="/old">`, + ` <source file="/new"></source>`, + ` </disk>`, + ` <disk name="vdb" snapshot="no"></disk>`, + ` </disks>`, + `</domainsnapshot>`, + }, + }, + { + Object: &DomainSnapshot{ + Name: "1270477159", + Description: "Snapshot of OS install and updates", + State: "running", + CreationTime: "1270477159", + Parent: &DomainSnapshotParent{ + Name: "bare-os-install", + }, + Memory: &DomainSnapshotMemory{ + Snapshot: "no", + }, + Disks: &DomainSnapshotDisks{ + Disks: []DomainSnapshotDisk{ + DomainSnapshotDisk{ + Name: "vda", + Snapshot: "external", + Driver: &DomainSnapshotDiskDriver{ + Type: "qcow2", + }, + Source: &DomainSnapshotDiskSource{ + File: "/path/to/new", + }, + }, + DomainSnapshotDisk{ + Name: "vdb", + Snapshot: "no", + }, + }, + }, + Domain: &Domain{ + Name: "fedora", + Memory: &DomainMemory{ + Value: "1048576", + }, + Devices: &DomainDeviceList{ + Disks: []DomainDisk{ + DomainDisk{ + Type: "file", + Device: "disk", + Driver: DomainDiskDriver{ + Name: "qemu", + Type: "raw", + }, + FileSource: DomainDiskFileSource{ + File: "/path/to/old", + }, + Target: &DomainDiskTarget{ + Dev: "vda", + Bus: "virtio", + }, + }, + DomainDisk{ + Type: "file", + Device: "disk", + Snapshot: "external", + Driver: DomainDiskDriver{ + Name: "qemu", + Type: "raw", + }, + FileSource: DomainDiskFileSource{ + File: "/path/to/old2", + }, + Target: &DomainDiskTarget{ + Dev: "vdb", + Bus: "virtio", + }, + }, + }, + }, + }, + }, + Expected: []string{ + `<domainsnapshot>`, + ` <name>1270477159</name>`, + ` <description>Snapshot of OS install and updates</description>`, + ` <state>running</state>`, + ` <creationTime>1270477159</creationTime>`, + ` <parent>`, + ` <name>bare-os-install</name>`, + ` </parent>`, + ` <memory snapshot="no"></memory>`, + ` <disks>`, + ` <disk name="vda" snapshot="external">`, + ` <driver type="qcow2"></driver>`, + ` <source file="/path/to/new"></source>`, + ` </disk>`, + ` <disk name="vdb" snapshot="no"></disk>`, + ` </disks>`, + ` <domain>`, + ` <name>fedora</name>`, + ` <memory>1048576</memory>`, + ` <devices>`, + ` <disk type="file" device="disk">`, + ` <driver name="qemu" type="raw"></driver>`, + ` <source file="/path/to/old"></source>`, + ` <target dev="vda" bus="virtio"></target>`, + ` </disk>`, + ` <disk type="file" device="disk" snapshot="external">`, + ` <driver name="qemu" type="raw"></driver>`, + ` <source file="/path/to/old2"></source>`, + ` <target dev="vdb" bus="virtio"></target>`, + ` </disk>`, + ` </devices>`, + ` </domain>`, + `</domainsnapshot>`, + }, + }, +} + +func TestDomainSnapshot(t *testing.T) { + for _, test := range domainSnapshotTestData { + doc, err := test.Object.Marshal() + if err != nil { + t.Fatal(err) + } + + expect := strings.Join(test.Expected, "\n") + + if doc != expect { + t.Fatal("Bad xml:\n", string(doc), "\n does not match\n", expect, "\n") + } + } +} -- 2.11.0

2 1

[libvirt] [PATCH 0/2] Fix issues getting voldef capacity value
by John Ferlan 12 Jan '17

12 Jan '17

Details in each patch - essentially trying to get "more correct" values. John Ferlan (2): storage: Fix virStorageBackendUpdateVolTargetInfo type check storage: Allow probe of volume capacity for BLOCK type src/storage/storage_backend.c | 12 ++++++++---- src/storage/storage_backend.h | 3 ++- src/storage/storage_backend_fs.c | 3 ++- 3 files changed, 12 insertions(+), 6 deletions(-) -- 2.7.4

2 5

[libvirt] [PATCH] nodedev: Fabric name must not be required for fc_host capability
by Boris Fiuczynski 12 Jan '17

12 Jan '17

fabric_name is one of many fc_host attributes in Linux that is optional and left to the low-level driver to decide if it is implemented. The zfcp device driver does not provide a fabric name for an fcp host. This patch removes the requirement for a fabric name by making it optional. Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> Reviewed-by: Bjoern Walk <bwalk(a)linux.vnet.ibm.com> --- docs/formatnode.html.in | 2 +- docs/schemas/nodedev.rng | 8 +++--- src/node_device/node_device_linux_sysfs.c | 3 +-- src/util/virutil.c | 4 +-- tests/fchostdata/fc_host/host7/node_name | 1 + tests/fchostdata/fc_host/host7/port_name | 1 + tests/fchostdata/fc_host/host7/port_state | 1 + tests/fchosttest.c | 44 ++++++++++++++++++++++++++++--- 8 files changed, 53 insertions(+), 11 deletions(-) create mode 100644 tests/fchostdata/fc_host/host7/node_name create mode 100644 tests/fchostdata/fc_host/host7/port_name create mode 100644 tests/fchostdata/fc_host/host7/port_state diff --git a/docs/formatnode.html.in b/docs/formatnode.html.in index e7b1140..f8d0e12 100644 --- a/docs/formatnode.html.in +++ b/docs/formatnode.html.in @@ -254,7 +254,7 @@ number of vport in use. <code>max_vports</code> shows the maximum vports the HBA supports. "fc_host" implies following sub-elements: <code>wwnn</code>, <code>wwpn</code>, and - <code>fabric_wwn</code>. + optionally <code>fabric_wwn</code>. </dd> </dl> </dd> diff --git a/docs/schemas/nodedev.rng b/docs/schemas/nodedev.rng index 9c98402..b100a6e 100644 --- a/docs/schemas/nodedev.rng +++ b/docs/schemas/nodedev.rng @@ -367,9 +367,11 @@ <ref name='wwn'/> </element> - <element name='fabric_wwn'> - <ref name='wwn'/> - </element> + <optional> + <element name='fabric_wwn'> + <ref name='wwn'/> + </element> + </optional> </define> <define name='capsvports'> diff --git a/src/node_device/node_device_linux_sysfs.c b/src/node_device/node_device_linux_sysfs.c index be99c41..e043744 100644 --- a/src/node_device/node_device_linux_sysfs.c +++ b/src/node_device/node_device_linux_sysfs.c @@ -73,9 +73,8 @@ nodeDeviceSysfsGetSCSIHostCaps(virNodeDevCapDataPtr d) VIR_STEAL_PTR(d->scsi_host.wwnn, tmp); if (!(tmp = virReadFCHost(NULL, d->scsi_host.host, "fabric_name"))) { - VIR_WARN("Failed to read fabric WWN for host%d", + VIR_INFO("Optional fabric WWN for host%d not available", d->scsi_host.host); - goto cleanup; } VIR_FREE(d->scsi_host.fabric_wwn); VIR_STEAL_PTR(d->scsi_host.fabric_wwn, tmp); diff --git a/src/util/virutil.c b/src/util/virutil.c index aeaa7f9..ab61302 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -2011,7 +2011,7 @@ virGetSCSIHostNameByParentaddr(unsigned int domain, * * Read the value of sysfs "fc_host" entry. * - * Returns result as a stringon success, caller must free @result after + * Returns result as a string on success, caller must free @result after * Otherwise returns NULL. */ char * @@ -2029,7 +2029,7 @@ virReadFCHost(const char *sysfs_prefix, host, entry) < 0) goto cleanup; - if (virFileReadAll(sysfs_path, 1024, &buf) < 0) + if (virFileReadAllQuiet(sysfs_path, 1024, &buf) < 0) goto cleanup; if ((p = strchr(buf, '\n'))) diff --git a/tests/fchostdata/fc_host/host7/node_name b/tests/fchostdata/fc_host/host7/node_name new file mode 100644 index 0000000..73a91bd --- /dev/null +++ b/tests/fchostdata/fc_host/host7/node_name @@ -0,0 +1 @@ +0x2002001b32a9da4e diff --git a/tests/fchostdata/fc_host/host7/port_name b/tests/fchostdata/fc_host/host7/port_name new file mode 100644 index 0000000..f25abeb --- /dev/null +++ b/tests/fchostdata/fc_host/host7/port_name @@ -0,0 +1 @@ +0x2102001b32a9da4e diff --git a/tests/fchostdata/fc_host/host7/port_state b/tests/fchostdata/fc_host/host7/port_state new file mode 100644 index 0000000..b73dd46 --- /dev/null +++ b/tests/fchostdata/fc_host/host7/port_state @@ -0,0 +1 @@ +Online diff --git a/tests/fchosttest.c b/tests/fchosttest.c index a08a2e8..ba580aa 100644 --- a/tests/fchosttest.c +++ b/tests/fchosttest.c @@ -29,13 +29,16 @@ static char *fchost_prefix; #define TEST_FC_HOST_PREFIX fchost_prefix #define TEST_FC_HOST_NUM 5 +#define TEST_FC_HOST_NUM_NO_FAB 7 /* Test virIsCapableFCHost */ static int test1(const void *data ATTRIBUTE_UNUSED) { if (virIsCapableFCHost(TEST_FC_HOST_PREFIX, - TEST_FC_HOST_NUM)) + TEST_FC_HOST_NUM) && + virIsCapableFCHost(TEST_FC_HOST_PREFIX, + TEST_FC_HOST_NUM_NO_FAB)) return 0; return -1; @@ -106,10 +109,43 @@ test3(const void *data ATTRIBUTE_UNUSED) return ret; } -/* Test virGetFCHostNameByWWN */ +/* Test virReadFCHost fabric name optional */ static int test4(const void *data ATTRIBUTE_UNUSED) { + const char *expect_wwnn = "2002001b32a9da4e"; + const char *expect_wwpn = "2102001b32a9da4e"; + char *wwnn = NULL; + char *wwpn = NULL; + int ret = -1; + + if (!(wwnn = virReadFCHost(TEST_FC_HOST_PREFIX, TEST_FC_HOST_NUM_NO_FAB, + "node_name"))) + return -1; + + if (!(wwpn = virReadFCHost(TEST_FC_HOST_PREFIX, TEST_FC_HOST_NUM_NO_FAB, + "port_name"))) + goto cleanup; + + if (virReadFCHost(TEST_FC_HOST_PREFIX, TEST_FC_HOST_NUM_NO_FAB, + "fabric_name")) + goto cleanup; + + if (STRNEQ(expect_wwnn, wwnn) || + STRNEQ(expect_wwpn, wwpn)) + goto cleanup; + + ret = 0; + cleanup: + VIR_FREE(wwnn); + VIR_FREE(wwpn); + return ret; +} + +/* Test virGetFCHostNameByWWN */ +static int +test5(const void *data ATTRIBUTE_UNUSED) +{ const char *expect_hostname = "host5"; char *hostname = NULL; int ret = -1; @@ -130,7 +166,7 @@ test4(const void *data ATTRIBUTE_UNUSED) /* Test virFindFCHostCapableVport (host4 is not Online) */ static int -test5(const void *data ATTRIBUTE_UNUSED) +test6(const void *data ATTRIBUTE_UNUSED) { const char *expect_hostname = "host5"; char *hostname = NULL; @@ -169,6 +205,8 @@ mymain(void) ret = -1; if (virTestRun("test5", test5, NULL) < 0) ret = -1; + if (virTestRun("test6", test6, NULL) < 0) + ret = -1; cleanup: VIR_FREE(fchost_prefix); -- 2.5.5

2 1

[libvirt] [PATCH] disk: Fixup error handling path for devmapper when part_separator='yes'
by John Ferlan 12 Jan '17

12 Jan '17

https://bugzilla.redhat.com/show_bug.cgi?id=1346566 If libvirt_parthelper is erroneously told to append the partition separator 'p' onto the generated output for a disk pool using device mapper that has 'user_friendly_names' set to true, then the error recovery path will fail to find volume resulting in the pool being in an unusable state. So, augment the documentation to provide the better hint that the part_separator='yes' should be set when user_friendly_names are not being used. Additionally, once we're in the error path where the returned name doesn't match the expected partition name try to see if the reason is because the 'p' was erroneosly added. If so alter the about to be removed vol->target.path so that the DiskDeleteVol code can find the partition that was created and remove it. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- docs/formatstorage.html.in | 5 ++++- src/storage/storage_backend_disk.c | 23 +++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in index ed1f0d1..7690114 100644 --- a/docs/formatstorage.html.in +++ b/docs/formatstorage.html.in @@ -138,7 +138,10 @@ causes libvirt to attempt to generate and find target volume path's using a "p" separator. The default algorithm used by device mapper is to add the "p" separator only when the source device path ends - with a number. + with a number; however, it's possible to configure the devmapper + device to not use 'user_friendly_names' thus creating partitions + with the "p" separator even when the device source path does not + end with a number. <span class="since">Since 1.3.1</span></p></dd> <dt><code>dir</code></dt> <dd>Provides the source for pools backed by directories (pool diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index 666ad03..07a04f1 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -95,6 +95,29 @@ virStorageBackendDiskMakeDataVol(virStoragePoolObjPtr pool, virReportError(VIR_ERR_INVALID_ARG, _("invalid partition name '%s', expected '%s'"), vol->name, partname); + + /* Let's see if we by chance parthelper created a name that won't be + * found later when we try to delete. We tell parthelper to add a 'p' + * to the output via the part_separator flag, but if devmapper has + * user_friendly_names set, the creation won't happen that way, thus + * our deletion will fail because the name we generated is wrong. + * Check for our conditions and see if the generated name is the + * same as StablePath returns and has the 'p' in it */ + if (pool->def->source.devices[0].part_separator == + VIR_TRISTATE_BOOL_YES && + !virIsDevMapperDevice(vol->target.path) && + STREQ(groups[0], vol->target.path) && + (tmp = strrchr(groups[0], 'p'))) { + + /* If we remove the 'p' from groups[0] and the resulting + * device is a devmapper device, then we know parthelper + * was told to create the wrong name based on the results. + * So just remove the 'p' from the vol->target.path too. */ + memmove(tmp, tmp + 1, strlen(tmp)); + if (virIsDevMapperDevice(groups[0]) && + (tmp = strrchr(vol->target.path, 'p'))) + memmove(tmp, tmp + 1, strlen(tmp)); + } return -1; } -- 2.7.4

2 4

[libvirt] [PATCH] docs: Document <sndbuf/>
by Michal Privoznik 12 Jan '17

12 Jan '17

This element has been introduced in fe053dbea7, but isn't documented yet. After exactly 6 years I guess we can finally document it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/formatdomain.html.in | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 39f5a8823..30cb19626 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -4975,6 +4975,9 @@ qemu-kvm -net nic,model=? /dev/null <model type='virtio'/> <b><backend tap='/dev/net/tun' vhost='/dev/vhost-net'/></b> <driver name='vhost' txmode='iothread' ioeventfd='on' event_idx='off' queues='5'/> + <b><tune> + <sndbuf>1600</sndbuf> + </tune></b> </interface> </devices> ...</pre> @@ -4985,7 +4988,12 @@ qemu-kvm -net nic,model=? /dev/null device path (<code>/dev/vhost-net</code>) for devices with <code>virtio</code> model. The <code>tap</code> attribute overrides the tun/tap device path (default: <code>/dev/net/tun</code>) for network and bridge interfaces. This does not work - in session mode. + in session mode. <span class="since">Since 1.2.9</span> + </p> + <p> + For tap devices there is also <code>sndbuf</code> element which can + adjust the size of send buffer in the host. <span class="since">Since + 0.8.8</span> </p> <h5><a name="elementsNICSTargetOverride">Overriding the target element</a></h5> -- 2.11.0

2 3

[libvirt] [PATCH v2 00/11] tests: qemu: Add cpu hotplug testing
by Peter Krempa 12 Jan '17

12 Jan '17

This is a repost of https://www.redhat.com/archives/libvir-list/2016-December/msg00420.html after a recent rebase conflict. Add some useful monitor infrastructure to simplify testing and add testing for the cpu hotplug code. The code has some complex logic which was not covered by current test suite. Peter Krempa (11): qemu: monitor: More strict checking of 'query-cpus' if hotplug is supported util: json: Add helper to reformat JSON strings tests: qemu: Document qemuMonitorTestNewFromFile qemu: Prepare for reuse of qemuDomainSetVcpusLive qemu: Move cpu hotplug code into qemu_hotplug.c tests: qemumonitor: Propagate better error messages tests: qemu: monitor: Add helpers to test full command syntax tests: qemu: Add helper to load full monitor conversation from file tests: hotplug: Add test infrastructure for testing qemu CPU hotplug code tests: hotplug: Add test data for legacy cpu hotplug tests: hotplug: Test CPU hotplug with ppc64 data src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 328 ------------ src/qemu/qemu_hotplug.c | 339 ++++++++++++ src/qemu/qemu_hotplug.h | 7 + src/qemu/qemu_monitor.c | 6 +- src/qemu/qemu_monitor_json.c | 6 +- src/qemu/qemu_monitor_json.h | 3 +- src/util/virjson.c | 29 + src/util/virjson.h | 2 + tests/qemuagenttest.c | 3 +- tests/qemuhotplugtest.c | 194 +++++++ tests/qemuhotplugtestcpus/ppc64-bulk-domain.xml | 20 + tests/qemuhotplugtestcpus/ppc64-bulk-monitor.json | 593 +++++++++++++++++++++ .../qemuhotplugtestcpus/ppc64-bulk-result-conf.xml | 64 +++ .../qemuhotplugtestcpus/ppc64-bulk-result-live.xml | 72 +++ .../qemuhotplugtestcpus/x86-modern-bulk-domain.xml | 21 + .../x86-modern-bulk-monitor.json | 471 ++++++++++++++++ .../x86-modern-bulk-result-conf.xml | 40 ++ .../x86-modern-bulk-result-live.xml | 48 ++ tests/qemuhotplugtestcpus/x86-old-bulk-domain.xml | 21 + .../qemuhotplugtestcpus/x86-old-bulk-monitor.json | 193 +++++++ .../x86-old-bulk-result-conf.xml | 30 ++ .../x86-old-bulk-result-live.xml | 38 ++ tests/qemumonitorjsontest.c | 2 +- tests/qemumonitortestutils.c | 322 ++++++++++- tests/qemumonitortestutils.h | 12 +- 26 files changed, 2516 insertions(+), 349 deletions(-) create mode 100644 tests/qemuhotplugtestcpus/ppc64-bulk-domain.xml create mode 100644 tests/qemuhotplugtestcpus/ppc64-bulk-monitor.json create mode 100644 tests/qemuhotplugtestcpus/ppc64-bulk-result-conf.xml create mode 100644 tests/qemuhotplugtestcpus/ppc64-bulk-result-live.xml create mode 100644 tests/qemuhotplugtestcpus/x86-modern-bulk-domain.xml create mode 100644 tests/qemuhotplugtestcpus/x86-modern-bulk-monitor.json create mode 100644 tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml create mode 100644 tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml create mode 100644 tests/qemuhotplugtestcpus/x86-old-bulk-domain.xml create mode 100644 tests/qemuhotplugtestcpus/x86-old-bulk-monitor.json create mode 100644 tests/qemuhotplugtestcpus/x86-old-bulk-result-conf.xml create mode 100644 tests/qemuhotplugtestcpus/x86-old-bulk-result-live.xml -- 2.11.0

2 22

[libvirt] [PATCH] news: document libxl HVM network attach fix
by Joao Martins 12 Jan '17

12 Jan '17

Signed-off-by: Joao Martins <joao.m.martins(a)oracle.com> --- docs/news.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 92e39f9..c19bbbb 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -204,6 +204,16 @@ domain definition. </description> </change> + <change> + <summary> + libxl: reverse defaults on HVM net device attach + </summary> + <description> + Fixes network interface attach for HVM domains when no model is + specified. Emulated hotplug isn't yet supported and hence we should + default to the general working scenario. + </description> + </change> </section> </release> <release version="v2.5.0" date="2016-12-04"> -- 2.1.4

2 1

[libvirt] [PATCH 0/5] Use non-blacklisted family/model/stepping for Haswell CPU model
by Eduardo Habkost 12 Jan '17

12 Jan '17

A recent glibc commit[1] added a blacklist to ensure it won't use TSX on hosts that are known to have a broken TSX implementation. Our existing Haswell CPU model has a blacklisted family/model/stepping combination, so it has to be updated to make sure guests will really use TSX. This is done by patch 5/5. However, to do this safely we need to ensure the host CPU is not a blacklisted one, so we won't mislead guests by exposing known-to-be-good FMS values on a known-to-be-broken host. This is done by patch 3/5. [1] https://sourceware.org/git/?p=glibc.git;a=commit;h=2702856bf45c82cf8e69f206… --- Cc: dgilbert(a)redhat.com Cc: fweimer(a)redhat.com Cc: carlos(a)redhat.com Cc: triegel(a)redhat.com Cc: berrange(a)redhat.com Cc: jdenemar(a)redhat.com Cc: pbonzini(a)redhat.com Eduardo Habkost (5): i386: Add explicit array size to x86_cpu_vendor_words2str() i386: host_vendor_fms() helper function i386/kvm: Blacklist TSX on known broken hosts pc: Add 2.9 machine-types i386: Change stepping of Haswell to non-blacklisted value include/hw/i386/pc.h | 6 ++++++ target/i386/cpu.h | 1 + hw/i386/pc_piix.c | 15 ++++++++++++--- hw/i386/pc_q35.c | 13 +++++++++++-- target/i386/cpu.c | 32 ++++++++++++++++++++++---------- target/i386/kvm.c | 17 +++++++++++++++++ 6 files changed, 69 insertions(+), 15 deletions(-) -- 2.11.0.259.g40922b1

4 12

Re: [libvirt] "[V3] RFC for support cache tune in libvirt"
by Marcelo Tosatti 12 Jan '17

12 Jan '17

Hi, Comments/questions related to: https://www.redhat.com/archives/libvir-list/2017-January/msg00354.html 1) root s2600wt:~/linux# virsh cachetune kvm02 --l3.count 2 How does allocation of code/data look like? 2) 'nodecachestats' command: 3. Add new virsh command 'nodecachestats': This API is to expose vary cache resouce left on each hardware (cpu socket). It will be formated as: <resource_type>.<resource_id>: left size KiB Does this take into account that only contiguous regions of cbm masks can be used for allocations? Also, it should return the amount of free cache on each cacheid. 3) The interface should support different sizes for different cache-ids. See the KVM-RT use case at https://www.redhat.com/archives/libvir-list/2017-January/msg00415.html "WHAT THE USER NEEDS TO SPECIFY FOR VIRTUALIZATION (KVM-RT)". 4) Usefulness of exposing minimum unit size. Rather than specify unit sizes (which forces the user to convert every time the command is executed), why not specify in kbytes and round up? <resctrl name='L3' unit='KiB' cache_size='56320' cache_unit='2816'/> As noted in item 1 of https://www.redhat.com/archives/libvir-list/2017-January/msg00494.html, "1) Convertion of kbytes (user specification) --> number of CBM bits for host.", the format where the size is stored is kbytes, so its awkward to force users and OpenStack to perform the convertion themselves (and zero benefits... nothing changes if you know the unit size). Thanks!

3 7

[libvirt] [PATCH] news: document drive addresses fix
by Marc Hartmayer 12 Jan '17

12 Jan '17

Signed-off-by: Marc Hartmayer <mhartmay(a)linux.vnet.ibm.com> --- docs/news.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 8175fd0..92e39f9 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -195,6 +195,15 @@ separate path which is also correctly labeled. </description> </change> + <change> + <summary> + conf: Reject domains with duplicate drive addresses + </summary> + <description> + Reject duplicate drive addresses for disks and hostdevs at + domain definition. + </description> + </change> </section> </release> <release version="v2.5.0" date="2016-12-04"> -- 2.5.5

2 2

[libvirt] [PATCH] news: document events changes and lxc fix
by Daniel P. Berrange 12 Jan '17

12 Jan '17

Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- docs/news.xml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 300e553..23ff40f 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -14,6 +14,25 @@ <section title="New features"> <change> <summary> + Domain events for metadata content changes + </summary> + <description> + The domain events framework has a new event ID that can + be used to get notifications when domain metadata content + changes. + </description> + </change> + <change> + <summary> + Event notifications for the secret object + </summary> + <description> + The secret object now supports event notifications, covering + lifcycle changes and secret value changes. + </description> + </change> + <change> + <summary> New localPtr attribute for "ip" element in network XML </summary> </change> @@ -67,6 +86,17 @@ <section title="Improvements"> <change> <summary> + lxc: fix accidental killing of containers during libvirtd restart + </summary> + <description> + The libvirt_lxc process was previously not moved into the + container scope. As a result, if systemd reloads its config + after a container is started, when libvirtd is later restarted + it will accidentally kill the containers. + </description> + </change> + <change> + <summary> perf: Add more perf statistics </summary> <description> -- 2.9.3

2 1

[libvirt] [PATCH] docs: Add pit timer policy change description to news.xml
by Maxim Nestratov 12 Jan '17

12 Jan '17

Add bug fix description of appying correct pit timer policy. --- docs/news.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index e341ba2..d616ebd 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -184,6 +184,17 @@ libvirt can recognize. </description> </change> + <change> + <summary> + qemu: Fix pit timer tick policy + </summary> + <description> + By a mistake, when <code>policy=delay</code> pit timer tick policy + was specified, <code>policy=discard</code> was used instead. Now it + is possible to use both <code>discard</code> and <code>delay</code> + policies correctly. + </description> + </change> </section> </release> <release version="v2.5.0" date="2016-12-04"> -- 2.4.11

2 1

[libvirt] [V3] RFC for support cache tune in libvirt
by Qiao, Liyong 12 Jan '17

12 Jan '17

Add support for cache allocation. Thanks Martin for the previous version comments, this is the v3 version for RFC , I’v have some PoC code [2]. The follow changes are partly finished by the PoC. #Propose Changes ## virsh command line 1. Extend output of nodeinfo, to expose L3 cache size for Level 3 (last level cache size). This will expose how many cache on a host which can be used. root@s2600wt:~/linux# virsh nodeinfo | grep L3 L3 cache size: 56320 KiB 2. Extend capabilities outputs. virsh capabilities | grep resctrl <cpu> ... <resctrl name='L3' unit='KiB' cache_size='56320' cache_unit='2816'/> </cpu> This will tell that the host have enabled resctrl(which you can find it in /sys/fs/resctrl), And it supports to allocate 'L3' type cache, total 'L3' cache size is 56320 KiB, and the minimum unit size of 'L3' cache is 2816 KiB. P.S. L3 cache size unit is the minum l3 cache unit can be allocated. It's hardware related and can not be changed. 3. Add new virsh command 'nodecachestats': This API is to expose vary cache resouce left on each hardware (cpu socket). It will be formated as: <resource_type>.<resource_id>: left size KiB for example I have a 2 socket cpus host, and I'v enabled cat_l3 feature only root@s2600wt:~/linux# virsh nodecachestats L3.0 : 56320 KiB L3.1 : 56320 KiB P.S. resource_type can be L3, L3DATA, L3CODE, L2 for now. 4. Add new interface to manage how many cache can be allociated for a domain root@s2600wt:~/linux# virsh cachetune kvm02 --l3.count 2 root@s2600wt:~/linux# virsh cachetune kvm02 l3.count : 2 This will allocate 2 units(2816 * 2) l3 cache for domain kvm02 ## Domain XML changes Cache Tuneing <domain> ... <cachetune> <l3_cache_count>2</l3_cache_count> </cachetune> ... </domain> ## Restriction for using cache tune on multiple sockets' host. The l3 cache is per socket resource, kernel need to konw about what's affinity looks like, so for a VM which running on a mulitple 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/kern… [2] libvirt PoC(not finished yet) https://github.com/taget/libvirt/commits/cat_new Best Regards Eli Qiao(乔立勇）OpenStack Core team OTC Intel. --

4 13

[libvirt] Query regarding sharing of vcpu's (cpu alloc ratio 1.0) between VM's
by BharaniKumar Gedela 12 Jan '17

12 Jan '17

HI, I have a Q about sharing a vcpu across Vm's (cpu alloc ratio 1.0 and HT not enabled)? I have a Use case where a VM needs vcpu's and one of the vcpu is dedicated to the VM for some traffic processing. We want the other vcpu which is used for control processing and can be shared with a similar VM's control processing. Is this possible and support in openstack/libvirt/KVM? If so could you please advice how to test it? Regards, Bharani..

2 1

[libvirt] Regarding Migration Statistics
by Anubhav Guleria 12 Jan '17

12 Jan '17

Greetings, I am writing a code using libvirt API to migrate VM between two physical hosts *(QEMU/KVM) , *say some *n *number of times. *1)* I am using right now* virDomainPtr virDomainMigrate (.......) *and to calculate the total migration time I am using something like this: *clock_gettime(CLOCK_MONOTONIC_RAW,&begin); * *migrate*(domainToMigrate,nodeToMigrate); *clock_gettime(CLOCK_MONOTONIC_RAW,&end);* *Total Migration Time = end.tv_sec-begin.tv_sec* Is this correct way to calculate total migration time. And is there some way to calculate the downtime (not how to set it)? *2) *I am interested in identifying in particular other statistics of migration like : *Number of iterations in Pre Copy*, *Memory transferred in each iteration* etc. I was going through the API and found* virDomainJobInfo <http://libvirt.org/html/libvirt-libvirt-domain.html#virDomainJobInfo> and virDomainGetJobStats <http://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetJobStats> *functions.But how to use them is not very clear. Can anyone point me to right place to achieve this objective? Thanks in advance. And sorry if that was too silly to ask. Anubhav

2 1

[libvirt] OpenStack/libvirt CAT interface
by Marcelo Tosatti 12 Jan '17

12 Jan '17

There have been queries about the OpenStack interface for CAT: http://bugzilla.redhat.com/show_bug.cgi?id=1299678 Comment 2 says: Sahid Ferdjaoui 2016-01-19 10:58:48 EST A spec will have to be addressed, after a first look this feature needs some work in several components of Nova to maintain/schedule/consume host's cache. I can work on that spec and implementation it when libvirt will provides information about cache and feature to use it for guests. I could add a comment about parameters to resctrltool, but since this depends on the libvirt interface, it would be good to know what the libvirt interface exposes first. I believe it should be essentially similar to OpenStack's "reserved_host_memory_mb": Set the reserved_host_memory_mb to reserve RAM for host processes. For the purposes of testing I am going to use the default of 512 MB: reserved_host_memory_mb=512 But rather use: rdt_cat_cache_reservation=type=code/data/both,size=10mb,cacheid=2; type=code/data/both,size=2mb,cacheid=1;... (per-vcpu). Where cache-id is optional. What is cache-id (from Documentation/x86/intel_rdt_ui.txt on recent kernel sources): Cache IDs --------- On current generation systems there is one L3 cache per socket and L2 caches are generally just shared by the hyperthreads on a core, but this isn't an architectural requirement. We could have multiple separate L3 caches on a socket, multiple cores could share an L2 cache. So instead of using "socket" or "core" to define the set of logical cpus sharing a resource we use a "Cache ID". At a given cache level this will be a unique number across the whole system (but it isn't guaranteed to be a contiguous sequence, there may be gaps). To find the ID for each logical CPU look in /sys/devices/system/cpu/cpu*/cache/index*/id WHAT THE USER NEEDS TO SPECIFY FOR VIRTUALIZATION (KVM-RT) ========================================================== For virtualization the following scenario is desired, on a given socket: * VM-A with VCPUs VM-A.vcpu-1, VM-A.vcpu-2. * VM-B with VCPUs VM-B.vcpu-1, VM-B.vcpu-2. With one realtime workload on each vcpu-2. Assume VM-A.vcpu-2 on pcpu 3. Assume VM-B.vcpu-2 on pcpu 5. Assume pcpus 0-5 on cacheid 0. We want VM-A.vcpu-2 to have a certain region of cache reserved, and VM-B.vcpu-2 as well. vcpu-1 for both VMs can use the default group (that is not have reserved L3 cache). This translates to the following resctrltool-style reservations: res.vm-a.vcpu-2 type=both,size=VM-A-RESSIZE,cache-id=0 res.vm-b.vcpu-2 type=both,size=VM-B-RESSIZE,cache-id=0 Which translate to the following in resctrlfs: res.vm-a.vcpu-2 type=both,size=VM-A-RESSIZE,cache-id=0 type=both,size=default-size,cache-id=1 ... res.vm-b.vcpu-2 type=both,size=VM-B-RESSIZE,cache-id=0 type=both,size=default-size,cache-id=1 ... Which is what we want, since the VCPUs are pinned. res.vm-a.vcpu-1 and res.vm-b.vcpu-1 don't need to be assigned to any reservation, which means they'll remain on the default group. RESTRICTIONS TO THE SYNTAX ABOVE ================================ Rules for the parameters: * type=code must be paired with type=data entry. ABOUT THE LIST INTERFACE ======================== About an interface for listing the reservations of the system to OpenStack. I think that what OpenStack needs is to check, before starting a guest on a given host, that there is sufficient space available for the reservation. To do that, it can: 1) resctrltool list (the end of the output mentions how much free space available there is), or via resctrlfs directly (have to lock the filesystem, read each directory, AND each schemata, and count number of zero bits). 2) Via libvirt Should fix resctrltool/API to list amount of contiguous free space BTW.

3 5

[libvirt] RFC: Use __attribute__ ((cleanup) in libvirt ?
by Daniel P. Berrange 12 Jan '17

12 Jan '17

For those who don't already know, GCC and CLang both implement a C language extension that enables automatic free'ing of resources when variables go out of scope. This is done by annotating the variable with the "cleanup" attribute, pointing to a function the compiler will wire up a call to when unwinding the stack. Since the annotation points to an arbitrary user defined function, you're not limited to simple free() like semantics. The cleanup function could unlock a mutex, or decrement a reference count, etc This annotation is used extensively by systemd, and libguestfs, amongst other projects. This obviously doesn't bring full garbage collection to C, but it does enable the code to be simplified. By removing the need to put in many free() (or equiv) calls to cleanup state, the "interesting" logic in the code stands out more, not being obscured by cleanup calls and goto jumps. I'm wondering what people think of making use of this in libvirt ? To my mind the only real reason to *not* use it, would be to maintain code portability to non-GCC/non-CLang compilers. OS-X, *BSD and *Linux all use GCC or CLang or both, so its a non-issue there. So the only place this could cause pain is people building libvirt on Win32, who are using the Microsoft compilers instead og GCC. IMHO, it is perfectly valid for us to declare that MSVC is unsupported with Libvirt and users must use GCC to build on Windows, either natively via cygwin, or cross-build from Linux hosts. As an example of what it would involve... This commit enables the basic helper macros in libguestfs: https://github.com/libguestfs/libguestfs/commit/98b64650c852ccc9a8eef8b9691… These commits make use of them https://github.com/libguestfs/libguestfs/commit/61162bdce1a00a921a47eb3e788… https://github.com/libguestfs/libguestfs/commit/5a3da366268825b26b470cde356… https://github.com/libguestfs/libguestfs/commit/791ad3e9e600ef528e3e5a8d50b… Finally, I'm absolutely *not* volunteering to actually implement this idea myself, as I don't have the free time. I just want to raise it as a discussion item, and if we agree its something we'd do, then we can make it a GSoC idea, or let any other interested person hack on it at will. There's no need for a "big bang" convert everything approach, we can do it incrementally. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://entangle-photo.org -o- http://search.cpan.org/~danberr/ :|

7 14

[libvirt] Question about hypervisor <features> that are not tristate
by Jim Fehlig 11 Jan '17

11 Jan '17

Happy new year! Nearly a year ago I reported an issue with the <hap> hypervisor feature on Xen [1] and am now seeing a similar issue with the <pae> feature. Setting the default value of pae changed between xend and libxl. When not specified, xend would enable pae for HVM domains. Clients such as xm and the old libvirt driver did not have to explicitly enable it. In libxl, the pae field within libxl_domain_build_info is initialized to 0. Clients must enable pae, and indeed xl will do so if pae=1 is not specified in the xl.cfg. The xend behavior prevents libvirt from disabling pae, whereas the libxl behvior causes a guest ABI change (config that worked with libvirt+xend doesn't with libvirt+libxl). The libxl behavior also forces management software (e.g. OpenStack nova) to add <pae> where it wasn't needed before. To solve this problem for <hap>, it was changed it to a tristate [2], allowing it to be turned off with explicit <hap state='off'/>, and on if not specified or <hap/> or <hap state='on'/>. Should <pae> (and the remaining hypervisor features that are not tristate) be converted to tristate similar to <hap>? Alternatively, I could simply set pae=1 for all HVM domains in the libxl driver. Like the old libvirt+xend behavior it couldn't be turned off, but I don't think there is a practical use-case to do so. At least no one has complained over all the years of libvirt+xend use. Regards, Jim [1] https://www.redhat.com/archives/libvir-list/2016-February/msg00197.html [2] https://www.redhat.com/archives/libvir-list/2016-March/msg00001.html

4 6

[libvirt] [PATCH] news: Reflect hugepages patch
by Michal Privoznik 11 Jan '17

11 Jan '17

In f55afd8 I've made libvirt to construct hugepage path on per-domain basis. However, this change was not reflected in the NEWS file. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- I'd push this right away, but I rather wait for our NEWS police^Wvolunteer to check it. docs/news.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index e341ba248..f6f17d55f 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -184,6 +184,17 @@ libvirt can recognize. </description> </change> + <change> + <summary> + qemu: Create hugepage path on per domain basis + </summary> + <description> + Historically, all hugepage enabled domains shared the same path under + hugetlbfs. This left libvirt unable to correctly set security labels + on it. With this release, however, each domain is put into a + separate path which is also correctly labeled. + </description> + </change> </section> </release> <release version="v2.5.0" date="2016-12-04"> -- 2.11.0

2 1

[libvirt] [PATCH] qemuDomainSetupAllInputs: Update debug message
by Michal Privoznik 11 Jan '17

11 Jan '17

Due to a copy-paste error, the debug message reads: Setting up disks It should have been: Setting up inputs. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. src/qemu/qemu_domain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index b26c02bda..473d0c1a2 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -7275,14 +7275,14 @@ qemuDomainSetupAllInputs(virQEMUDriverPtr driver, { size_t i; - VIR_DEBUG("Setting up disks"); + VIR_DEBUG("Setting up inputs"); for (i = 0; i < vm->def->ninputs; i++) { if (qemuDomainSetupInput(driver, vm->def->inputs[i], devPath) < 0) return -1; } - VIR_DEBUG("Setup all disks"); + VIR_DEBUG("Setup all inputs"); return 0; } -- 2.11.0

1 0

[libvirt] [PATCH for 3.0.0 0/2] Fix qemuMonitorJSONParseCPUModelProperty
by Jiri Denemark 11 Jan '17

11 Jan '17

qemuMonitorJSONParseCPUModelProperty was made a little bit to strict which could cause compatibility issues between libvirt 3.0.0 and QEMU 2.9.0 (or newer depending on when query-cpu-model-expansion is implemented for x86). Jiri Denemark (2): qemu: Don't check CPU model property key qemu: Ignore non-boolean CPU model properties src/qemu/qemu_monitor_json.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) -- 2.11.0

2 3

[libvirt] [PATCH 00/11] Adjust build/start format checking for fs, disk, and logical backends
by John Ferlan 11 Jan '17

11 Jan '17

Two of these patches (2 and 10) are followups to no-overwrite patches previously posted (I left links in the patches for reference). Essentially this series works to unify the probing code from the file system backend using blkid and the parted format reading code from the disk backend in one common set of functions. In doing so, the disk backend will now pick up the ability to use the blkid 'partitions' APIs in order to "probe" the target device for a valid/known partition format type. Additionally, the file system probe will pick up a fallback to the parted mechanism from the disk backend if the 'blkid' APIs are not built into the system. A few extra bells/whistles were added for fs pool startup to ensure that the format in the startup XML matches the format on the target disk, which is essentially the mechanism the disk backend used (although it was slightly broken). Then in order to really pile on, the overwrite logic was added to the logical pool which didn't have any such checking (both build and start). Testing was done locally using an iSCSI device and laying down different formats and seeing what would happen on various usages of the format (with --overwrite and --no-overwrite). John Ferlan (11): storage: Introduce virStorageBackendDeviceProbeEmpty storage: Fix implementation of no-overwrite for file system backend storage: Add partition type checks for BLKID probing storage: Add writelabel bool for virStorageBackendDeviceProbe storage: For FS pool check for properly formatted target volume storage: Move and rename disk backend label checking storage: Adjust disk label found to match labels storage: Clean up logical pool devices on build failure storage: Extract logical device initialize into a helper storage: Add overwrite flag checking for logical pool storage: Validate the device formats at logical startup src/libvirt_private.syms | 1 + src/storage/storage_backend.c | 396 ++++++++++++++++++++++++++++++++++ src/storage/storage_backend.h | 4 + src/storage/storage_backend_disk.c | 150 ++----------- src/storage/storage_backend_fs.c | 118 ++-------- src/storage/storage_backend_fs.h | 5 - src/storage/storage_backend_logical.c | 180 ++++++++++------ tools/virsh-pool.c | 2 +- tools/virsh.pod | 42 ++-- 9 files changed, 585 insertions(+), 313 deletions(-) -- 2.7.4

3 22

[libvirt] [PATCH v2] libxl: fix usb inputs loop error
by Cédric Bosdonnat 11 Jan '17

11 Jan '17

List indexes where mixed up in the code looping over the USB input devices. --- * v2: Increment nusbdevice if LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST is not defined. src/libxl/libxl_conf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index ac83b51c7..a24f9e052 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -479,7 +479,8 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, if (VIR_EXPAND_N(b_info->u.hvm.usbdevice_list, nusbdevice, 1) < 0) return -1; #else - if (i > 1) { + nusbdevice++; + if (nusbdevice > 1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("libxenlight supports only one input device")); return -1; @@ -487,7 +488,7 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, #endif #ifdef LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST - usbdevice = &b_info->u.hvm.usbdevice_list[i]; + usbdevice = &b_info->u.hvm.usbdevice_list[nusbdevice - 1]; #else usbdevice = &b_info->u.hvm.usbdevice; #endif -- 2.11.0

2 1

[libvirt] [PATCH] Extend l3 cache to nodeinfo
by Eli Qiao 11 Jan '17

11 Jan '17

This patch extends l3 cache infomation to nodeinfo output. Signed-off-by: Eli Qiao <liyong.qiao(a)intel.com> --- include/libvirt/libvirt-host.h | 1 + src/nodeinfo.c | 3 ++- src/remote/remote_protocol.x | 1 + src/test/test_driver.c | 1 + src/util/virhostcpu.c | 29 +++++++++++++++++++++++++---- src/util/virhostcpu.h | 3 ++- src/util/virhostcpupriv.h | 3 ++- tests/virhostcputest.c | 3 ++- tools/virsh-host.c | 1 + 9 files changed, 37 insertions(+), 8 deletions(-) diff --git a/include/libvirt/libvirt-host.h b/include/libvirt/libvirt-host.h index 07b5d15..ba926df 100644 --- a/include/libvirt/libvirt-host.h +++ b/include/libvirt/libvirt-host.h @@ -167,6 +167,7 @@ struct _virNodeInfo { processors in case of unusual NUMA topology*/ unsigned int threads; /* number of threads per core, 1 in case of unusual numa topology */ + unsigned int l3_cache; /* l3 cache in kilobytes */ }; /** diff --git a/src/nodeinfo.c b/src/nodeinfo.c index f2ded02..f54972b 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -152,7 +152,8 @@ nodeGetInfo(virNodeInfoPtr nodeinfo) if (virHostCPUGetInfo(hostarch, &nodeinfo->cpus, &nodeinfo->mhz, &nodeinfo->nodes, &nodeinfo->sockets, - &nodeinfo->cores, &nodeinfo->threads) < 0) + &nodeinfo->cores, &nodeinfo->threads, + &nodeinfo->l3_cache) < 0) return -1; return 0; diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index b846ef2..6a16b4e 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -489,6 +489,7 @@ struct remote_node_get_info_ret { /* insert@1 */ int sockets; int cores; int threads; + int l3_cache; }; struct remote_connect_get_capabilities_ret { diff --git a/src/test/test_driver.c b/src/test/test_driver.c index de92a01..b49c07b 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -138,6 +138,7 @@ static const virNodeInfo defaultNodeInfo = { 2, 2, 2, + 4096, }; static void diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index f29f312..698813b 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -530,7 +530,8 @@ virHostCPUGetInfoPopulateLinux(FILE *cpuinfo, unsigned int *nodes, unsigned int *sockets, unsigned int *cores, - unsigned int *threads) + unsigned int *threads, + unsigned int *l3_cache) { virBitmapPtr present_cpus_map = NULL; virBitmapPtr online_cpus_map = NULL; @@ -546,7 +547,7 @@ virHostCPUGetInfoPopulateLinux(FILE *cpuinfo, int direrr; *mhz = 0; - *cpus = *nodes = *sockets = *cores = *threads = 0; + *cpus = *nodes = *sockets = *cores = *threads = *l3_cache = 0; /* Start with parsing CPU clock speed from /proc/cpuinfo */ while (fgets(line, sizeof(line), cpuinfo) != NULL) { @@ -571,6 +572,24 @@ virHostCPUGetInfoPopulateLinux(FILE *cpuinfo, (*p == '\0' || *p == '.' || c_isspace(*p))) *mhz = ui; } + if (STRPREFIX(buf, "cache size")) { + char *p; + unsigned int ui; + buf += 10; + + while (*buf && c_isspace(*buf)) + buf++; + + if (*buf != ':' || !buf[1]) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("parsing cache size from cpuinfo")); + goto cleanup; + } + + if (virStrToLong_ui(buf+1, &p, 10, &ui) == 0 && + *(p+1)=='K' && *(p+2)=='B') + *l3_cache = ui; + } } else if (ARCH_IS_PPC(arch)) { char *buf = line; if (STRPREFIX(buf, "clock")) { @@ -960,7 +979,8 @@ virHostCPUGetInfo(virArch hostarch ATTRIBUTE_UNUSED, unsigned int *nodes ATTRIBUTE_UNUSED, unsigned int *sockets ATTRIBUTE_UNUSED, unsigned int *cores ATTRIBUTE_UNUSED, - unsigned int *threads ATTRIBUTE_UNUSED) + unsigned int *threads ATTRIBUTE_UNUSED, + unsigned int *l3_cache ATTRIBUTE_UNUSED) { #ifdef __linux__ int ret = -1; @@ -974,7 +994,8 @@ virHostCPUGetInfo(virArch hostarch ATTRIBUTE_UNUSED, ret = virHostCPUGetInfoPopulateLinux(cpuinfo, hostarch, cpus, mhz, nodes, - sockets, cores, threads); + sockets, cores, threads, + l3_cache); if (ret < 0) goto cleanup; diff --git a/src/util/virhostcpu.h b/src/util/virhostcpu.h index 39f7cf8..fc579fe 100644 --- a/src/util/virhostcpu.h +++ b/src/util/virhostcpu.h @@ -50,7 +50,8 @@ int virHostCPUGetInfo(virArch hostarch, unsigned int *nodes, unsigned int *sockets, unsigned int *cores, - unsigned int *threads); + unsigned int *threads, + unsigned int *l3_cache); int virHostCPUGetKVMMaxVCPUs(void); diff --git a/src/util/virhostcpupriv.h b/src/util/virhostcpupriv.h index de30983..69d5e34 100644 --- a/src/util/virhostcpupriv.h +++ b/src/util/virhostcpupriv.h @@ -34,7 +34,8 @@ int virHostCPUGetInfoPopulateLinux(FILE *cpuinfo, unsigned int *nodes, unsigned int *sockets, unsigned int *cores, - unsigned int *threads); + unsigned int *threads, + unsigned int *l3_cache); int virHostCPUGetStatsLinux(FILE *procstat, int cpuNum, diff --git a/tests/virhostcputest.c b/tests/virhostcputest.c index 8387956..2b2a680 100644 --- a/tests/virhostcputest.c +++ b/tests/virhostcputest.c @@ -44,7 +44,8 @@ linuxTestCompareFiles(const char *cpuinfofile, if (virHostCPUGetInfoPopulateLinux(cpuinfo, arch, &nodeinfo.cpus, &nodeinfo.mhz, &nodeinfo.nodes, &nodeinfo.sockets, - &nodeinfo.cores, &nodeinfo.threads) < 0) { + &nodeinfo.cores, &nodeinfo.threads, + &nodeinfo.l3_cache) < 0) { if (virTestGetDebug()) { if (virGetLastError()) VIR_TEST_DEBUG("\n%s\n", virGetLastErrorMessage()); diff --git a/tools/virsh-host.c b/tools/virsh-host.c index 24ebde2..2b85372 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -671,6 +671,7 @@ cmdNodeinfo(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) vshPrint(ctl, "%-20s %d\n", _("Thread(s) per core:"), info.threads); vshPrint(ctl, "%-20s %d\n", _("NUMA cell(s):"), info.nodes); vshPrint(ctl, "%-20s %lu KiB\n", _("Memory size:"), info.memory); + vshPrint(ctl, "%-20s %d KiB\n", _("L3 cache size:"), info.l3_cache); return true; } -- 1.9.1

5 13

[libvirt] [PATCH] NEWS: Add trailing periods to all sentences
by Andrea Bolognani 11 Jan '17

11 Jan '17

Suggested-by: John Ferlan <jferlan(a)redhat.com> --- docs/news.xml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/docs/news.xml b/docs/news.xml index 909b4ca..672e988 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -24,7 +24,7 @@ <description> Add the capability to allow group I/O throttling via a new domain <disk> <iotune> subelement "group_name" - to allow sharing I/O throttling quota between multiple drives + to allow sharing I/O throttling quota between multiple drives. </description> </change> <change> @@ -33,7 +33,7 @@ </summary> <description> New <code>libvirt-guest</code> nss module that translates libvirt - guest names into IP addresses + guest names into IP addresses. </description> </change> <change> @@ -43,7 +43,7 @@ <description> Logging-related settings like log outputs and filters can now be adjusted during runtime using the admin interface without the - necessity of the daemon's restart + necessity of the daemon's restart. </description> </change> <change> @@ -55,7 +55,7 @@ flag in order to return the host physical size in bytes of the image container in the allocation field of the _virStorageVolInfo structure. The --physical flag has been - added to the virsh vol-info command to access the data + added to the virsh vol-info command to access the data. </description> </change> <change> @@ -73,7 +73,7 @@ Add support to get the count of branch instructions executed, branch misses, bus cycles, stalled frontend cpu cycles, stalled backend cpu cycles, and ref cpu - cycles by applications running on the platform + cycles by applications running on the platform. </description> </change> <change> @@ -82,7 +82,7 @@ </summary> <description> Add a display of the <physical> size of a disk - volume in the output of the volume XML + volume in the output of the volume XML. </description> </change> <change> @@ -93,7 +93,7 @@ virtio-pci provides several advantages over virtio-mmio, such as the ability to hotplug devices and improved performance. While opting in to virtio-pci has been possible for a while, - newly-defined guests will now use it automatically + newly-defined guests will now use it automatically. </description> </change> </section> @@ -106,7 +106,7 @@ For an active domain, correct the physical value provided for a raw sparse file backed storage and the allocation value provided for a qcow2 file backed storage that hasn't yet been opened on - the domain + the domain. </description> </change> <change> @@ -115,7 +115,7 @@ </summary> <description> The chardev detection code has been improved and can now handle this - configuration properly + configuration properly. </description> </change> <change> @@ -138,7 +138,7 @@ </summary> <description> The shmem device can now utilize QEMU's ivshmem-plain and - ivshmem-doorbell, more modern versions of ivshmem + ivshmem-doorbell, more modern versions of ivshmem. </description> </change> <change> @@ -153,7 +153,7 @@ <description> The new libssh transport allows one to connect to a running libvirtd via SSH, using the libssh library; for example: - <tt>qemu+libssh://<i>server</i>/system</tt> + <tt>qemu+libssh://<i>server</i>/system</tt>. </description> </change> <change> @@ -162,7 +162,7 @@ </summary> <description> Add the capability to pass through a scsi_host HBA and the - associated LUNs to the guest + associated LUNs to the guest. </description> </change> <change> @@ -190,7 +190,7 @@ e1000e, nec-xhci, vfio assigned devices) will be placed on an Express controller (i.e. a pcie-root-port) instead of a legacy PCI controller (i.e. pci-bridge) with the root ports - added as needed + added as needed. </description> </change> </section> @@ -222,7 +222,7 @@ </summary> <description> List user-visible changes instead of single commits for a better - high-level overview of differences between libvirt releases + high-level overview of differences between libvirt releases. </description> </change> <change> @@ -232,7 +232,7 @@ <description> The libvirt website looked very cluttered and outdated; it has now been completely overhauled, resulting in a design that's better - organized and more pleasant to look at + organized and more pleasant to look at. </description> </change> </section> -- 2.7.4

2 2

[libvirt] Paradox cpu topology in capabilities outputs
by Qiao, Liyong 11 Jan '17

11 Jan '17

Hi, I observe that virsh capabilities give wrong cpu topology on a multiple sockets host taget@jfz1r04h13:~/libvirt$ lscpu Architecture: x86_64 CPU op-mode(s): 32-bit, 64-bit Byte Order: Little Endian CPU(s): 72 On-line CPU(s) list: 0-71 Thread(s) per core: 2 Core(s) per socket: 18 Socket(s): 2 <------------------------ NUMA node(s): 2 Vendor ID: GenuineIntel CPU family: 6 Model: 63 Model name: Intel(R) Xeon(R) CPU E5-2699 v3 @ 2.30GHz Stepping: 2 CPU MHz: 1201.660 CPU max MHz: 3600.0000 CPU min MHz: 1200.0000 BogoMIPS: 4590.78 Virtualization: VT-x L1d cache: 32K L1i cache: 32K L2 cache: 256K L3 cache: 46080K NUMA node0 CPU(s): 0-17,36-53 NUMA node1 CPU(s): 18-35,54-71 But output of virsh capabilities only gives. <topology sockets='1' cores='18' threads='2'/> looking into code and got this: https://libvirt.org/git/?p=libvirt.git;a=blob;f=src/util/virhostcpu.c;h=f29… should we change it into 704<https://libvirt.org/git/?p=libvirt.git;a=blob;f=src/util/virhostcpu.c;h=f29…> *sockets += nodesockets; This also affect nodeinfo.sockets. Attached file is the full output of capabilities of the host Best Regards Eli Qiao(乔立勇）OpenStack Core team OTC Intel. --

3 3

[libvirt] [PATCH 00/11] tests: qemu: Add cpu hotplug testing
by Peter Krempa 11 Jan '17

11 Jan '17

Add some useful monitor infrastructure to simplify testing and add testing for the cpu hotplug code. The code has some complex logic which was not covered by current test suite. Peter Krempa (11): qemu: monitor: More strict checking of 'query-cpus' if hotplug is supported util: json: Add helper to reformat JSON strings tests: qemu: Document qemuMonitorTestNewFromFile qemu: Prepare for reuse of qemuDomainSetVcpusLive qemu: Move cpu hotplug code into qemu_hotplug.c tests: qemumonitor: Propagate better error messages tests: qemu: monitor: Add helpers to test full command syntax tests: qemu: Add helper to load full monitor conversation from file tests: hotplug: Add test infrastructure for testing qemu CPU hotplug code tests: hotplug: Add test data for legacy cpu hotplug tests: hotplug: Test CPU hotplug with ppc64 data src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 319 ----------- src/qemu/qemu_hotplug.c | 328 ++++++++++++ src/qemu/qemu_hotplug.h | 7 + src/qemu/qemu_monitor.c | 6 +- src/qemu/qemu_monitor_json.c | 6 +- src/qemu/qemu_monitor_json.h | 3 +- src/util/virjson.c | 29 + src/util/virjson.h | 2 + tests/qemuagenttest.c | 3 +- tests/qemuhotplugtest.c | 194 +++++++ tests/qemuhotplugtestcpus/ppc64-bulk-domain.xml | 20 + tests/qemuhotplugtestcpus/ppc64-bulk-monitor.json | 593 +++++++++++++++++++++ .../qemuhotplugtestcpus/ppc64-bulk-result-conf.xml | 64 +++ .../qemuhotplugtestcpus/ppc64-bulk-result-live.xml | 72 +++ .../qemuhotplugtestcpus/x86-modern-bulk-domain.xml | 21 + .../x86-modern-bulk-monitor.json | 471 ++++++++++++++++ .../x86-modern-bulk-result-conf.xml | 40 ++ .../x86-modern-bulk-result-live.xml | 48 ++ tests/qemuhotplugtestcpus/x86-old-bulk-domain.xml | 21 + .../qemuhotplugtestcpus/x86-old-bulk-monitor.json | 193 +++++++ .../x86-old-bulk-result-conf.xml | 30 ++ .../x86-old-bulk-result-live.xml | 38 ++ tests/qemumonitorjsontest.c | 2 +- tests/qemumonitortestutils.c | 322 ++++++++++- tests/qemumonitortestutils.h | 12 +- 26 files changed, 2505 insertions(+), 340 deletions(-) create mode 100644 tests/qemuhotplugtestcpus/ppc64-bulk-domain.xml create mode 100644 tests/qemuhotplugtestcpus/ppc64-bulk-monitor.json create mode 100644 tests/qemuhotplugtestcpus/ppc64-bulk-result-conf.xml create mode 100644 tests/qemuhotplugtestcpus/ppc64-bulk-result-live.xml create mode 100644 tests/qemuhotplugtestcpus/x86-modern-bulk-domain.xml create mode 100644 tests/qemuhotplugtestcpus/x86-modern-bulk-monitor.json create mode 100644 tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml create mode 100644 tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml create mode 100644 tests/qemuhotplugtestcpus/x86-old-bulk-domain.xml create mode 100644 tests/qemuhotplugtestcpus/x86-old-bulk-monitor.json create mode 100644 tests/qemuhotplugtestcpus/x86-old-bulk-result-conf.xml create mode 100644 tests/qemuhotplugtestcpus/x86-old-bulk-result-live.xml -- 2.10.2

1 13

[libvirt] [PATCH v3 0/8] aggregate multiple pcie-root-ports onto a single slot
by Laine Stump 11 Jan '17

11 Jan '17

Another rebase of the series with no other changes Laine Stump (8): conf: use struct instead of int for each slot in virDomainPCIAddressBus conf: eliminate concept of "reserveEntireSlot" conf: eliminate repetitive code in virDomainPCIAddressGetNextSlot() conf: start search for next unused PCI address at same slot as previous find conf: new function virDomainPCIAddressIsMulti() qemu: use virDomainPCIAddressIsMulti() to determine multifunction setting conf: aggregate multiple devices on a slot when assigning PCI addresses conf: aggregate multiple pcie-root-ports onto a single slot src/conf/domain_addr.c | 290 ++++++++++++++------- src/conf/domain_addr.h | 48 +++- src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 16 +- src/qemu/qemu_domain_address.c | 35 ++- .../qemuxml2argv-pcie-root-port.args | 5 +- .../qemuxml2argv-pcie-switch-upstream-port.args | 5 +- .../qemuxml2argv-q35-default-devices-only.args | 7 +- .../qemuxml2argv-q35-multifunction.args | 43 +++ .../qemuxml2argv-q35-multifunction.xml | 51 ++++ .../qemuxml2argv-q35-pcie-autoadd.args | 30 ++- tests/qemuxml2argvdata/qemuxml2argv-q35-pcie.args | 28 +- .../qemuxml2argv-q35-virt-manager-basic.args | 13 +- .../qemuxml2argv-q35-virtio-pci.args | 28 +- tests/qemuxml2argvtest.c | 25 ++ .../qemuxml2xmlout-pcie-root-port.xml | 2 +- .../qemuxml2xmlout-pcie-switch-upstream-port.xml | 4 +- .../qemuxml2xmlout-q35-default-devices-only.xml | 8 +- .../qemuxml2xmlout-q35-multifunction.xml | 120 +++++++++ .../qemuxml2xmlout-q35-pcie-autoadd.xml | 52 ++-- .../qemuxml2xmloutdata/qemuxml2xmlout-q35-pcie.xml | 48 ++-- .../qemuxml2xmlout-q35-virt-manager-basic.xml | 20 +- .../qemuxml2xmlout-q35-virtio-pci.xml | 48 ++-- tests/qemuxml2xmltest.c | 25 ++ 24 files changed, 676 insertions(+), 276 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-multifunction.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-multifunction.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-multifunction.xml -- 2.7.4

4 26

[libvirt] [PATCH v4] libxl: define a per-domain logger.
by Cédric Bosdonnat 11 Jan '17

11 Jan '17

libxl doesn't provide a way to write one log for each domain. Thus we need to demux the messages. If our logger doesn't know to which domain to attribute a message, then it will write it to the default log file. Starting with Xen 4.9 (commit f9858025 and following), libxl will write the domain ID in an easy to grab manner. The logger introduced by this commit will use it to demux the libxl log messages. Thanks to the default log file, this logger will also work with older versions of Xen. --- * v4: delay the log file opening to the first message write. * v3: add JSON-formatted libxl_domain_config to the newly opened file when creating a guest. * v2: addressed Jim's comments src/Makefile.am | 1 + src/libxl/libxl_conf.c | 38 +------ src/libxl/libxl_conf.h | 4 +- src/libxl/libxl_domain.c | 7 ++ src/libxl/libxl_driver.c | 2 + src/libxl/libxl_logger.c | 257 +++++++++++++++++++++++++++++++++++++++++++++++ src/libxl/libxl_logger.h | 40 ++++++++ 7 files changed, 312 insertions(+), 37 deletions(-) create mode 100644 src/libxl/libxl_logger.c create mode 100644 src/libxl/libxl_logger.h diff --git a/src/Makefile.am b/src/Makefile.am index 0dd2faaf6..58e3108a6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -851,6 +851,7 @@ LIBXL_DRIVER_SOURCES = \ libxl/libxl_capabilities.c libxl/libxl_capabilities.h \ libxl/libxl_domain.c libxl/libxl_domain.h \ libxl/libxl_driver.c libxl/libxl_driver.h \ + libxl/libxl_logger.c libxl/libxl_logger.h \ libxl/libxl_migration.c libxl/libxl_migration.h UML_DRIVER_SOURCES = \ diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index b569ddad8..ac83b51c7 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -76,9 +76,7 @@ libxlDriverConfigDispose(void *obj) virObjectUnref(cfg->caps); libxl_ctx_free(cfg->ctx); - xtl_logger_destroy(cfg->logger); - if (cfg->logger_file) - VIR_FORCE_FCLOSE(cfg->logger_file); + libxlLoggerFree(cfg->logger); VIR_FREE(cfg->configDir); VIR_FREE(cfg->autostartDir); @@ -1356,8 +1354,6 @@ libxlDriverConfigPtr libxlDriverConfigNew(void) { libxlDriverConfigPtr cfg; - char *log_file = NULL; - xentoollog_level log_level = XTL_DEBUG; char ebuf[1024]; unsigned int free_mem; @@ -1386,9 +1382,6 @@ libxlDriverConfigNew(void) if (VIR_STRDUP(cfg->channelDir, LIBXL_CHANNEL_DIR) < 0) goto error; - if (virAsprintf(&log_file, "%s/libxl-driver.log", cfg->logDir) < 0) - goto error; - if (virFileMakePath(cfg->logDir) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("failed to create log dir '%s': %s"), @@ -1397,37 +1390,13 @@ libxlDriverConfigNew(void) goto error; } - if ((cfg->logger_file = fopen(log_file, "a")) == NULL) { - VIR_ERROR(_("Failed to create log file '%s': %s"), - log_file, virStrerror(errno, ebuf, sizeof(ebuf))); - goto error; - } - VIR_FREE(log_file); - - switch (virLogGetDefaultPriority()) { - case VIR_LOG_DEBUG: - log_level = XTL_DEBUG; - break; - case VIR_LOG_INFO: - log_level = XTL_INFO; - break; - case VIR_LOG_WARN: - log_level = XTL_WARN; - break; - case VIR_LOG_ERROR: - log_level = XTL_ERROR; - break; - } - - cfg->logger = - (xentoollog_logger *)xtl_createlogger_stdiostream(cfg->logger_file, - log_level, XTL_STDIOSTREAM_SHOW_DATE); + cfg->logger = libxlLoggerNew(cfg->logDir, virLogGetDefaultPriority()); if (!cfg->logger) { VIR_ERROR(_("cannot create logger for libxenlight, disabling driver")); goto error; } - if (libxl_ctx_alloc(&cfg->ctx, LIBXL_VERSION, 0, cfg->logger)) { + if (libxl_ctx_alloc(&cfg->ctx, LIBXL_VERSION, 0, (xentoollog_logger *)cfg->logger)) { VIR_ERROR(_("cannot initialize libxenlight context, probably not " "running in a Xen Dom0, disabling driver")); goto error; @@ -1478,7 +1447,6 @@ libxlDriverConfigNew(void) return cfg; error: - VIR_FREE(log_file); virObjectUnref(cfg); return NULL; } diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index 851f3afb4..69d78851a 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -41,6 +41,7 @@ # include "locking/lock_manager.h" # include "virfirmware.h" # include "libxl_capabilities.h" +# include "libxl_logger.h" # define LIBXL_DRIVER_NAME "xenlight" # define LIBXL_VNC_PORT_MIN 5900 @@ -74,8 +75,7 @@ struct _libxlDriverConfig { unsigned int version; /* log stream for driver-wide libxl ctx */ - FILE *logger_file; - xentoollog_logger *logger; + libxlLoggerPtr logger; /* libxl ctx for driver wide ops; getVersion, getNodeInfo, ... */ libxl_ctx *ctx; diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 5cde576ef..fbe7ee5ff 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -809,6 +809,8 @@ libxlDomainCleanup(libxlDriverPrivatePtr driver, VIR_FREE(xml); } + libxlLoggerCloseFile(cfg->logger, vm->def->id); + virDomainObjRemoveTransientDef(vm); virObjectUnref(cfg); } @@ -1127,6 +1129,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver, libxl_asyncprogress_how aop_console_how; libxl_domain_restore_params params; unsigned int hostdev_flags = VIR_HOSTDEV_SP_PCI; + char *config_json = NULL; #ifdef LIBXL_HAVE_PVUSB hostdev_flags |= VIR_HOSTDEV_SP_USB; @@ -1290,6 +1293,9 @@ libxlDomainStart(libxlDriverPrivatePtr driver, * be cleaned up if there are any subsequent failures. */ vm->def->id = domid; + config_json = libxl_domain_config_to_json(cfg->ctx, &d_config); + + libxlLoggerOpenFile(cfg->logger, domid, vm->def->name, config_json); /* Always enable domain death events */ if (libxl_evenable_domain_death(cfg->ctx, vm->def->id, 0, &priv->deathW)) @@ -1366,6 +1372,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver, cleanup: libxl_domain_config_dispose(&d_config); + VIR_FREE(config_json); VIR_FREE(dom_xml); VIR_FREE(managed_save_path); virDomainDefFree(def); diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 7e5d9b69e..325636c9a 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -406,6 +406,8 @@ libxlReconnectDomain(virDomainObjPtr vm, /* Update domid in case it changed (e.g. reboot) while we were gone? */ vm->def->id = d_info.domid; + libxlLoggerOpenFile(cfg->logger, vm->def->id, vm->def->name, NULL); + /* Update hostdev state */ if (virHostdevUpdateActiveDomainDevices(hostdev_mgr, LIBXL_DRIVER_NAME, vm->def, hostdev_flags) < 0) diff --git a/src/libxl/libxl_logger.c b/src/libxl/libxl_logger.c new file mode 100644 index 000000000..437dbb34b --- /dev/null +++ b/src/libxl/libxl_logger.c @@ -0,0 +1,257 @@ +/* + * libxl_logger.c: libxl logger implementation + * + * Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. + * + * 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/>. + * + * Authors: + * Cédric Bosdonnat <cbosdonnat(a)suse.com> + */ +#include <config.h> + +#include <string.h> +#include <libxl.h> + +#include "internal.h" +#include "libxl_logger.h" +#include "util/viralloc.h" +#include "util/virerror.h" +#include "util/virfile.h" +#include "util/virhash.h" +#include "util/virstring.h" +#include "util/virtime.h" + +#define VIR_FROM_THIS VIR_FROM_LIBXL + +VIR_LOG_INIT("libxl.libxl_logger"); + +typedef struct xentoollog_logger_libvirt xentoollog_logger_libvirt; + +typedef struct { + FILE *handle; + char *path; +} libxlLoggerFile; + +struct xentoollog_logger_libvirt { + xentoollog_logger vtable; + xentoollog_level minLevel; + const char *logDir; + + /* map storing the opened fds: "domid" -> FILE* */ + virHashTablePtr files; + FILE *defaultLogFile; +}; + +static void +libxlLoggerFileFree(void *payload, const void *key ATTRIBUTE_UNUSED) +{ + libxlLoggerFile *file = payload; + if (file->handle) { + VIR_FORCE_FCLOSE(file->handle); + file->handle = NULL; + } + VIR_FREE(file->path); +} + +static int +libxlLoggerFileOpen(libxlLoggerFile *file) { + int ret = 0; + char ebuf[1024]; + + if (!file->handle && !(file->handle = fopen(file->path, "a"))) { + VIR_WARN("Failed to open log file %s: %s", + file->path, virStrerror(errno, ebuf, sizeof(ebuf))); + ret = -1; + } + + return ret; +} + +ATTRIBUTE_FMT_PRINTF(5, 0) static void +libvirt_vmessage(xentoollog_logger *logger_in, + xentoollog_level level, + int errnoval, + const char *context, + const char *format, + va_list args) +{ + xentoollog_logger_libvirt *lg = (xentoollog_logger_libvirt *)logger_in; + FILE *logFile = lg->defaultLogFile; + char timestamp[VIR_TIME_STRING_BUFLEN]; + char *message = NULL; + char *start, *end; + char ebuf[1024]; + + VIR_DEBUG("libvirt_vmessage: context='%s' format='%s'", context, format); + + if (level < lg->minLevel) + return; + + if (virVasprintf(&message, format, args) < 0) + return; + + /* Should we print to a domain-specific log file? */ + if ((start = strstr(message, ": Domain ")) && + (end = strstr(start + 9, ":"))) { + libxlLoggerFile *file = NULL; + + start = start + 9; + *end = '\0'; + + file = virHashLookup(lg->files, start); + if (file) { + ignore_value(libxlLoggerFileOpen(file)); + logFile = file->handle; + } + + *end = ':'; + } + + /* Do the actual print to the log file */ + if (virTimeStringNowRaw(timestamp) < 0) + timestamp[0] = '\0'; + + fprintf(logFile, "%s: ", timestamp); + if (context) + fprintf(logFile, "%s: ", context); + + fprintf(logFile, "%s", message); + + if (errnoval >= 0) + fprintf(logFile, ": %s", virStrerror(errnoval, ebuf, sizeof(ebuf))); + + fputc('\n', logFile); + fflush(logFile); + + VIR_FREE(message); +} + +static void +libvirt_progress(xentoollog_logger *logger_in ATTRIBUTE_UNUSED, + const char *context ATTRIBUTE_UNUSED, + const char *doingwhat ATTRIBUTE_UNUSED, + int percent ATTRIBUTE_UNUSED, + unsigned long done ATTRIBUTE_UNUSED, + unsigned long total ATTRIBUTE_UNUSED) +{ + /* This function purposedly does nothing: it's no logging info */ +} + +static void +libvirt_destroy(xentoollog_logger *logger_in) +{ + xentoollog_logger_libvirt *lg = (xentoollog_logger_libvirt*)logger_in; + VIR_FREE(lg); +} + + +libxlLoggerPtr libxlLoggerNew(const char *logDir, + virLogPriority minLevel) +{ + xentoollog_logger_libvirt logger; + libxlLoggerPtr logger_out = NULL; + char *path = NULL; + + switch (minLevel) { + case VIR_LOG_DEBUG: + logger.minLevel = XTL_DEBUG; + break; + case VIR_LOG_INFO: + logger.minLevel = XTL_INFO; + break; + case VIR_LOG_WARN: + logger.minLevel = XTL_WARN; + break; + case VIR_LOG_ERROR: + logger.minLevel = XTL_ERROR; + break; + } + logger.logDir = logDir; + + if ((logger.files = virHashCreate(3, libxlLoggerFileFree)) == NULL) + return NULL; + + if (virAsprintf(&path, "%s/libxl-driver.log", logDir) < 0) + goto error; + + if ((logger.defaultLogFile = fopen(path, "a")) == NULL) + goto error; + + logger_out = XTL_NEW_LOGGER(libvirt, logger); + + cleanup: + VIR_FREE(path); + return logger_out; + + error: + virHashFree(logger.files); + goto cleanup; +} + +void libxlLoggerFree(libxlLoggerPtr logger) +{ + xentoollog_logger *xtl_logger = (xentoollog_logger*)logger; + if (logger->defaultLogFile) + VIR_FORCE_FCLOSE(logger->defaultLogFile); + virHashFree(logger->files); + xtl_logger_destroy(xtl_logger); +} + +void libxlLoggerOpenFile(libxlLoggerPtr logger, int id, + const char *name, + const char *domain_config) +{ + FILE *logFile = NULL; + char *domidstr = NULL; + libxlLoggerFile *file; + + if (VIR_ALLOC(file) < 0) + return; + + if (virAsprintf(&file->path, "%s/%s.log", logger->logDir, name) < 0 || + virAsprintf(&domidstr, "%d", id) < 0) + goto error; + + ignore_value(virHashAddEntry(logger->files, domidstr, file)); + + /* domain_config is non NULL only when starting a new domain */ + if (domain_config) { + if (libxlLoggerFileOpen(file) < 0) + goto cleanup; + + fprintf(logFile, "Domain start: %s\n", domain_config); + fflush(logFile); + } + goto cleanup; + + error: + VIR_FREE(file->path); + VIR_FREE(file); + + cleanup: + VIR_FREE(domidstr); +} + +void libxlLoggerCloseFile(libxlLoggerPtr logger, int id) +{ + char *domidstr = NULL; + if (virAsprintf(&domidstr, "%d", id) < 0) + return; + + ignore_value(virHashRemoveEntry(logger->files, domidstr)); + + VIR_FREE(domidstr); +} diff --git a/src/libxl/libxl_logger.h b/src/libxl/libxl_logger.h new file mode 100644 index 000000000..92b222578 --- /dev/null +++ b/src/libxl/libxl_logger.h @@ -0,0 +1,40 @@ +/* + * libxl_logger.h: libxl logger implementation + * + * Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. + * + * 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/>. + * + * Authors: + * Cédric Bosdonnat <cbosdonnat(a)suse.com> + */ + +#ifndef __LIBXL_LOGGER_H +# define __LIBXL_LOGGER_H + +# include "util/virlog.h" + +typedef struct xentoollog_logger_libvirt libxlLogger; +typedef libxlLogger *libxlLoggerPtr; + +libxlLoggerPtr libxlLoggerNew(const char *logDir, + virLogPriority minLevel); +void libxlLoggerFree(libxlLoggerPtr logger); + +void libxlLoggerOpenFile(libxlLoggerPtr logger, int id, const char *name, + const char *domain_config); +void libxlLoggerCloseFile(libxlLoggerPtr logger, int id); + +#endif /* __LIBXL_LOGGER_H */ -- 2.11.0

4 4

[libvirt] Do different Virgil3D users running have the same CANVAS fingerprint?
by bancfc＠openmailbox.org 11 Jan '17

11 Jan '17

Background: Canvas fingerprinting is a technique to track users based on their GPUs. https://en.wikipedia.org/wiki/Canvas_fingerprinting Someone did some testing and the good news is the fingerprint is common for all users of the same OS across all KVM users because it presents the same virtual GPU/drivers for everybody. What I need your help to find out is whether this holds for Virgil3D users that enable graphics acceleration. (I am running on Debian and the libvirt version in the repos is too old to have this included also I don't have multiple machines) To test this you need: To run plain FireFox on a virtualized distro (with GL acceleration enabled in libvirt) of your choice and visit https://browserleaks.com/canvas . Then repeat the same steps with that same distro (in a VM) on another physical machine and compare values. A good result is if you see the same numbers for both machines. That means the virtual device fingerprint is uniform for all virtual users.

2 3

[libvirt] [PATCH] libxl: fix usb inputs loop error
by Cédric Bosdonnat 10 Jan '17

10 Jan '17

List indexes where mixed up in the code looping over the USB input devices. --- src/libxl/libxl_conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index ac83b51c7..1053e60a1 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -479,7 +479,7 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, if (VIR_EXPAND_N(b_info->u.hvm.usbdevice_list, nusbdevice, 1) < 0) return -1; #else - if (i > 1) { + if (nusbdevice > 1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("libxenlight supports only one input device")); return -1; @@ -487,7 +487,7 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, #endif #ifdef LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST - usbdevice = &b_info->u.hvm.usbdevice_list[i]; + usbdevice = &b_info->u.hvm.usbdevice_list[nusbdevice - 1]; #else usbdevice = &b_info->u.hvm.usbdevice; #endif -- 2.11.0

2 1

[libvirt] [PATCH] virsh: pool-info: introduce option --bytes
by Chen Hanxiao 10 Jan '17

10 Jan '17

From: Chen Hanxiao <chenhanxiao(a)gmail.com> By default, pool-info will convert sizes to human friendly units. This patch will introduce option [--bytes]. If specified, the raw sizes will be in the output. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- tools/virsh-pool.c | 25 +++++++++++++++++++------ tools/virsh.pod | 5 +++-- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index 8313be8..cbd7042 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -1589,6 +1589,10 @@ static const vshCmdInfo info_pool_info[] = { static const vshCmdOptDef opts_pool_info[] = { VIRSH_COMMON_OPT_POOL_FULL, + {.name = "bytes", + .type = VSH_OT_BOOL, + .help = N_("Reture pool info in bytes"), + }, {.name = NULL} }; @@ -1600,11 +1604,14 @@ cmdPoolInfo(vshControl *ctl, const vshCmd *cmd) int autostart = 0; int persistent = 0; bool ret = true; + bool bytes = false; char uuid[VIR_UUID_STRING_BUFLEN]; if (!(pool = virshCommandOptPool(ctl, cmd, "pool", NULL))) return false; + bytes = vshCommandOptBool(cmd, "bytes"); + vshPrint(ctl, "%-15s %s\n", _("Name:"), virStoragePoolGetName(pool)); if (virStoragePoolGetUUIDString(pool, &uuid[0]) == 0) @@ -1633,14 +1640,20 @@ cmdPoolInfo(vshControl *ctl, const vshCmd *cmd) if (info.state == VIR_STORAGE_POOL_RUNNING || info.state == VIR_STORAGE_POOL_DEGRADED) { - val = vshPrettyCapacity(info.capacity, &unit); - vshPrint(ctl, "%-15s %2.2lf %s\n", _("Capacity:"), val, unit); + if (bytes) { + vshPrint(ctl, "%-15s %llu\n", _("Capacity:"), info.capacity); + vshPrint(ctl, "%-15s %llu\n", _("Allocation:"), info.allocation); + vshPrint(ctl, "%-15s %llu\n", _("Available:"), info.available); + } else { + val = vshPrettyCapacity(info.capacity, &unit); + vshPrint(ctl, "%-15s %2.2lf %s\n", _("Capacity:"), val, unit); - val = vshPrettyCapacity(info.allocation, &unit); - vshPrint(ctl, "%-15s %2.2lf %s\n", _("Allocation:"), val, unit); + val = vshPrettyCapacity(info.allocation, &unit); + vshPrint(ctl, "%-15s %2.2lf %s\n", _("Allocation:"), val, unit); - val = vshPrettyCapacity(info.available, &unit); - vshPrint(ctl, "%-15s %2.2lf %s\n", _("Available:"), val, unit); + val = vshPrettyCapacity(info.available, &unit); + vshPrint(ctl, "%-15s %2.2lf %s\n", _("Available:"), val, unit); + } } } else { ret = false; diff --git a/tools/virsh.pod b/tools/virsh.pod index ef91223..7c418a5 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -3605,9 +3605,10 @@ except that it does some error checking. The editor used can be supplied by the C<$VISUAL> or C<$EDITOR> environment variables, and defaults to C<vi>. -=item B<pool-info> I<pool-or-uuid> +=item B<pool-info> [I<--bytes>] I<pool-or-uuid> -Returns basic information about the I<pool> object. +Returns basic information about the I<pool> object. If I<--bytes> is specified the sizes +of basic info are not converted to human friendly units. =item B<pool-list> [I<--inactive>] [I<--all>] [I<--persistent>] [I<--transient>] -- 2.7.4

2 1

[libvirt] [PATCH 00/12] vbox: remove support for vbox 3.x and older.
by Dawid Zamirski 10 Jan '17

10 Jan '17

Hello, This series removes support for legacy VirtualBox versions (3.x and older) that did not have upstream support for a while and won't even work on any relatively recent distro. The idea for doing this was first mentioned here [1] and this makes the driver code cleaner as the APIs for those old versions were quite different from v4.0+ and required abstractions to handle the differences. Please note that the first patch in the series is sent to ML as a compressed attachment because it deletes VirtualBox SDK header files for those old verions which are large and the patch would not pass ML message size limit. [1] https://www.redhat.com/archives/libvir-list/2016-November/msg01133.html Regards, Dawid Dawid Zamirski (12): vbox: remove SDK header files for vbox 3 and older. vbox: remove calls to *InstallUniformedAPI macros. vbox: remove code for old API versions. vbox: remove _vboxAttachDrivesOld vbox: do not use IHardDisk anymore. vbox: remove getMachineForSession flag. vbox: remove domain events support. vbox: remove code dealing with oldMediumInterface vbox: IVRDxServer to IVRDEServer. vbox: fix _displayTakeScreenShotPNGToArray vbox: consolidate vbox IID structures. docs: add news entry in improvements section. docs/news.html.in | 8 + src/Makefile.am | 4 - src/vbox/vbox_CAPI_v2_2.h | 4869 ----------------------------------- src/vbox/vbox_CAPI_v3_0.h | 5396 --------------------------------------- src/vbox/vbox_CAPI_v3_1.h | 5297 -------------------------------------- src/vbox/vbox_CAPI_v3_2.h | 5625 ----------------------------------------- src/vbox/vbox_V2_2.c | 37 - src/vbox/vbox_V3_0.c | 37 - src/vbox/vbox_V3_1.c | 37 - src/vbox/vbox_V3_2.c | 37 - src/vbox/vbox_XPCOMCGlue.h | 2 +- src/vbox/vbox_common.c | 402 +-- src/vbox/vbox_common.h | 13 +- src/vbox/vbox_network.c | 12 +- src/vbox/vbox_storage.c | 76 +- src/vbox/vbox_tmpl.c | 3006 ++-------------------- src/vbox/vbox_uniformed_api.h | 171 +- 17 files changed, 438 insertions(+), 24591 deletions(-) delete mode 100644 src/vbox/vbox_CAPI_v2_2.h delete mode 100644 src/vbox/vbox_CAPI_v3_0.h delete mode 100644 src/vbox/vbox_CAPI_v3_1.h delete mode 100644 src/vbox/vbox_CAPI_v3_2.h delete mode 100644 src/vbox/vbox_V2_2.c delete mode 100644 src/vbox/vbox_V3_0.c delete mode 100644 src/vbox/vbox_V3_1.c delete mode 100644 src/vbox/vbox_V3_2.c -- 2.9.3

2 14

[libvirt] [PATCH 1/3] rpc: libssh: allow a NULL known_hosts file
by Pino Toscano 10 Jan '17

10 Jan '17

Make sure that virNetLibsshSessionSetHostKeyVerification accepts a NULL value for the path to the known_hosts file: - call ssh_options_set(SSH_OPTIONS_KNOWNHOSTS) anyway, using /dev/null, otherwise libssh will use its default path - do not call ssh_write_knownhost when no known hosts file was set Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1406457 --- src/rpc/virnetlibsshsession.c | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c index 5de6629..25f93ce 100644 --- a/src/rpc/virnetlibsshsession.c +++ b/src/rpc/virnetlibsshsession.c @@ -382,14 +382,16 @@ virNetLibsshCheckHostKey(virNetLibsshSessionPtr sess) VIR_FREE(askKey.result); } - /* write the host key file */ - if (ssh_write_knownhost(sess->session) < 0) { - errmsg = ssh_get_error(sess->session); - virReportError(VIR_ERR_LIBSSH, - _("failed to write known_host file '%s': %s"), - sess->knownHostsFile, - errmsg); - return -1; + /* write the host key file, if specified */ + if (sess->knownHostsFile) { + if (ssh_write_knownhost(sess->session) < 0) { + errmsg = ssh_get_error(sess->session); + virReportError(VIR_ERR_LIBSSH, + _("failed to write known_host file '%s': %s"), + sess->knownHostsFile, + errmsg); + return -1; + } } /* key was accepted and added */ return 0; @@ -1172,13 +1174,20 @@ virNetLibsshSessionSetHostKeyVerification(virNetLibsshSessionPtr sess, goto error; } - /* set the known hosts file */ - if (ssh_options_set(sess->session, SSH_OPTIONS_KNOWNHOSTS, hostsfile) < 0) - goto error; + /* set the known hosts file, if specified */ + if (hostsfile) { + if (ssh_options_set(sess->session, SSH_OPTIONS_KNOWNHOSTS, hostsfile) < 0) + goto error; - VIR_FREE(sess->knownHostsFile); - if (VIR_STRDUP(sess->knownHostsFile, hostsfile) < 0) - goto error; + VIR_FREE(sess->knownHostsFile); + if (VIR_STRDUP(sess->knownHostsFile, hostsfile) < 0) + goto error; + } else { + /* libssh does not support trying no known_host file at all: + * hence use /dev/null here, without storing it as file */ + if (ssh_options_set(sess->session, SSH_OPTIONS_KNOWNHOSTS, "/dev/null") < 0) + goto error; + } virObjectUnlock(sess); return 0; -- 2.7.4

2 5

[libvirt] [PATCH] maint: update to latest gnulib
by Eric Blake 10 Jan '17

10 Jan '17

Among other recent changes, this includes a workaround to avoid Clang compiler bug https://llvm.org/bugs/show_bug.cgi?id=16404 having spurious link failures. * .gnulib: Update. * bootstrap: Synchronize to upstream. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I'm debating about re-enabling test-lock (right now, we explicitly pass --avoid=lock-tests to gnulib-tool via our bootstrap.conf), now that upstream is finally starting to fix the bugs in the test that were causing extremely slow completion or outright hangs on multi-processor setups. But that's probably something better done right after a libvirt release, not right before a release candidate. Pushing under the gnulib maintenance rule; contains these gnulib patches: * .gnulib e210a3c...94386a1 (38): > maint.mk: enforce spelling of "timestamp" (i.e., no space) > dfa: minor simplification with emptyset > dfa: shrink constraints from 4 bits to 3 > dfa: omit unnecessary ptrdiff_t check > dfa: omit unnecessary allocation > dfa: omit unused local > maint: time stamp -> timestamp > maint: remove stray .texi files > getprogname: fix port to IRIX > dfa: melt down dfastate into build_state > dfa: simplify transition table allocation > dfa: fix reallocation bug when matching newlines > Avoid -Wundef warning about undefined WINDOWS_SOCKETS. > Avoid -Wundef warning about undefined __USE_FILE_OFFSET64. > stdioext: Port to Minix 3.2 and newer. > getprogname: port to IRIX > localename-tests: port to NetBSD 7 > glob, intprops, xalloc: work around Clang bug > dfa: fix 'return' typo > lock tests: Prefer semaphore over mutex. > parse-datetime: fix generated paths for coverage files > maint.mk: support parallel execution of coverage > lock: Provide guarantee to avoid writer starvation for rwlocks. > thread: Fix pth port. > parse-datetime: fix debug message on lone year number > parse-datetime: fix local timezone debug messages > parse-datetime: add debug warning about DST changes > parse-datetime: add debug warning about date arithmetic > parse-datetime: fix debug message of relative part after timezone > parse-datetime: fix incorrect debug message on lone number > exec > build-aux/mdate-sh > doc: fix typo in previous change > Revert copyright-year change to synced files > doc: modernize for C11 etc. > dfa: prefer functions to FETCH_WC macro > dfa: narrow more local var scopes > dfa: remove duplicate assignment .gnulib | 2 +- bootstrap | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gnulib b/.gnulib index e210a3c..94386a1 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit e210a3cbaec0ee82a67ff8fc427e21bdd64dba1b +Subproject commit 94386a13667c645fd42544a7fd302cdddd39fcdf diff --git a/bootstrap b/bootstrap index 26066b2..932ff85 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2016-11-03.18; # UTC +scriptversion=2017-01-09.19; # UTC # Bootstrap this package from checked-out sources. @@ -790,7 +790,7 @@ symlink_to_dir() # Leave any existing symlink alone, if it already points to the source, # so that broken build tools that care about symlink times # aren't confused into doing unnecessary builds. Conversely, if the - # existing symlink's time stamp is older than the source, make it afresh, + # existing symlink's timestamp is older than the source, make it afresh, # so that broken tools aren't confused into skipping needed builds. See # <http://lists.gnu.org/archive/html/bug-gnulib/2011-05/msg00326.html>. test -h "$dst" && -- 2.9.3

1 0

[libvirt] [PATCH v3 0/3] Improve release notes process
by Andrea Bolognani 10 Jan '17

10 Jan '17

Dan raised some concerns, but it doesn't look like they're critical enough for him to NACK the series; moreover, it's all stuff that we can easily address later on, so I'd like to move forward with this before the freeze. Details of changes can be found in the single patches. Andrea Bolognani (3): NEWS: Improve building pipeline NEWS: Reformat at generation time docs: Document the release notes process for contributors .gitignore | 1 + HACKING | 7 ++ Makefile.am | 26 ++++-- docs/Makefile.am | 28 +++++- docs/hacking.html.in | 10 ++ docs/news-ascii.xsl | 68 ++++++++++++++ docs/news-html.xsl | 96 +++++++++++++++++++ docs/news.html.in | 164 -------------------------------- docs/news.xml | 252 ++++++++++++++++++++++++++++++++++++++++++++++++++ docs/news.xsl | 50 ---------- docs/reformat-news.py | 104 +++++++++++++++++++++ 11 files changed, 583 insertions(+), 223 deletions(-) create mode 100644 docs/news-ascii.xsl create mode 100644 docs/news-html.xsl delete mode 100644 docs/news.html.in create mode 100644 docs/news.xml delete mode 100644 docs/news.xsl create mode 100755 docs/reformat-news.py -- 2.7.4

2 7

[libvirt] [PATCH 0/2] Couple of build fixes
by Michal Privoznik 10 Jan '17

10 Jan '17

Spotted by our CI. Michal Privoznik (2): qemu_domain: Move qemuDomainGetPreservedMounts virSecuritySELinuxSetFileconHelper: Fix build with broken selinux.h src/qemu/qemu_domain.c | 140 ++++++++++++++++++++-------------------- src/security/security_selinux.c | 2 +- 2 files changed, 71 insertions(+), 71 deletions(-) -- 2.11.0

2 3

[libvirt] [PATCH] libxl: implement virDomainGetMaxVcpus
by Jim Fehlig 10 Jan '17

10 Jan '17

The libxl driver already supports getting maximum vcpu count via libxlDomainGetVcpusFlags, allowing to trivially implement virDomainGetMaxVcpus. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- docs/news.html.in | 2 ++ src/libxl/libxl_driver.c | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/docs/news.html.in b/docs/news.html.in index c222075..2365c39 100644 --- a/docs/news.html.in +++ b/docs/news.html.in @@ -39,6 +39,8 @@ _virStorageVolInfo structure. The --physical flag has been added to the virsh vol-info command to access the data </li> + <li>libxl: Implement virDomainGetMaxVcpus API + </li> </ul> </li> <li><strong>Improvements</strong> diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 7e5d9b6..51fe3d8 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -2363,6 +2363,13 @@ libxlDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags) } static int +libxlDomainGetMaxVcpus(virDomainPtr dom) +{ + return libxlDomainGetVcpusFlags(dom, (VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_VCPU_MAXIMUM)); +} + +static int libxlDomainPinVcpuFlags(virDomainPtr dom, unsigned int vcpu, unsigned char *cpumap, int maplen, unsigned int flags) @@ -6446,6 +6453,7 @@ static virHypervisorDriver libxlHypervisorDriver = { .domainSetVcpus = libxlDomainSetVcpus, /* 0.9.0 */ .domainSetVcpusFlags = libxlDomainSetVcpusFlags, /* 0.9.0 */ .domainGetVcpusFlags = libxlDomainGetVcpusFlags, /* 0.9.0 */ + .domainGetMaxVcpus = libxlDomainGetMaxVcpus, /* 3.0.0 */ .domainPinVcpu = libxlDomainPinVcpu, /* 0.9.0 */ .domainPinVcpuFlags = libxlDomainPinVcpuFlags, /* 1.2.1 */ .domainGetVcpus = libxlDomainGetVcpus, /* 0.9.0 */ -- 2.9.2

2 2

[libvirt] [PATCH 0/2] replacement for Patches 5/8 & 6/8 of "aggregate multiple pcie-root-ports onto a single slot"
by Laine Stump 10 Jan '17

10 Jan '17

During review of the aforementioned series, Andrea expressed misgivings about patch 6, which automatically set the multifunction=on option transiently at the time the qemu commandline was generated. Dan agreed. These two patches replace patches 5 and 6 of that series with two patches that will set multi='on' in the domain's config rather than just temporarily in the commandline. This way it will remain set even if all the devices on the non-0 function are later removed (unless it's explicitly changed by the user/management app, that is). The rest of the series is ACKed and ready to push, which I'd like to do before the freeze on Wednesday; these two patche are all that's holding it up. Laine Stump (2): conf: new function virDomainPCIAddressSetAllMulti() qemu: use virDomainPCIAddressSetAllMulti() to set multi when needed src/conf/domain_addr.c | 75 +++++++++++++ src/conf/domain_addr.h | 4 + src/libvirt_private.syms | 1 + src/qemu/qemu_domain_address.c | 5 + .../qemuxml2argv-q35-multifunction.args | 42 ++++++++ .../qemuxml2argv-q35-multifunction.xml | 51 +++++++++ tests/qemuxml2argvtest.c | 23 ++++ .../qemuxml2xmlout-q35-multifunction.xml | 120 +++++++++++++++++++++ tests/qemuxml2xmltest.c | 23 ++++ 9 files changed, 344 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-multifunction.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-multifunction.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-multifunction.xml -- 2.7.4

2 6

[libvirt] qemu-kvm blocked for more than 120 seconds when "libvirt-guests" is enabled
by Oscar Segarra 10 Jan '17

10 Jan '17

Hi, I just have two virtual machines in my environment, I want them to gracefully stop when host is powered off gracefully. Nevertheless, system hangs on shutdown: [root@vdicnode01 ~]# virsh list Id Name State ---------------------------------------------------- 1 vdicdb01 running 2 vdicone01 running The configuration: /usr/libexec/libvirt-guests.sh URIS=default ON_BOOT=ignore ON_SHUTDOWN=shutdown SHUTDOWN_TIMEOUT=60 PARALLEL_SHUTDOWN=5 START_DELAY=0 BYPASS_CACHE=0 CONNECT_RETRIES=10 RETRIES_SLEEP=1 SYNC_TIME=0 [root@vdicnode01 ~]# cat /etc/libvirt/qemu.conf user = "oneadmin" group = "oneadmin" dynamic_ownership = 0 spice_tls = 0 With libvirt-guests service started: [root@vdicnode01 ~]# service libvirt-guests status Redirecting to /bin/systemctl status libvirt-guests.service ● libvirt-guests.service - Suspend Active Libvirt Guests Loaded: loaded (/usr/lib/systemd/system/libvirt-guests.service; disabled; vendor preset: disabled) Active: active (exited) since Sat 2016-12-31 17:13:34 CET; 5s ago Docs: man:libvirtd(8) http://libvirt.org Process: 6619 ExecStart=/usr/libexec/libvirt-guests.sh start (code=exited, status=0/SUCCESS) Main PID: 6619 (code=exited, status=0/SUCCESS) Dec 31 17:13:34 vdicnode01.vdicube.com systemd[1]: Starting Suspend Active Libvirt Guests... Dec 31 17:13:34 vdicnode01.vdicube.com libvirt-guests.sh[6619]: libvirt-guests is configured not to start any guests on boot Dec 31 17:13:34 vdicnode01.vdicube.com systemd[1]: Started Suspend Active Libvirt Guests. [root@vdicnode01 ~]# If I stop locally libvirt-guests (as root) Looks work perfectly: [root@vdicnode01 ~]# virsh list Id Name State ---------------------------------------------------- [root@vdicnode01 ~]# --> Now I start again the virtual machines and the libvirt-guests service <-- [root@vdicnode01 ~]# service libvirtd restart Redirecting to /bin/systemctl restart libvirtd.service [root@vdicnode01 ~]# service libvirt-guests start Redirecting to /bin/systemctl start libvirt-guests.service [root@vdicnode01 ~]# virsh list Id Name State ---------------------------------------------------- 1 vdicone01 running 2 vdicdb01 running [root@vdicnode01 ~]# But If I shutdown the host it look not work properly (I attack screenshots of the shutdown process). Any help will be welcome. Thanks a lot.

3 11

[libvirt] [PATCH] storage: Fix storage_backend probing when PARTED not installed.
by John Ferlan 10 Jan '17

10 Jan '17

Commit id 'a48c674f' caused problems for systems without PARTED installed. So move the PARTED probing code back to storage_backend_disk.c and create a shim within storage_backend.c to call it if WITH_STORAGE_DISK is true; otherwise, just return -1 with the error. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Reported to me internally via Peter Krempa... Not pushing as a build breaker - I'll let Peter review and ACK. src/storage/storage_backend.c | 155 ++++--------------------------------- src/storage/storage_backend_disk.c | 152 ++++++++++++++++++++++++++++++++++++ src/storage/storage_backend_disk.h | 3 + 3 files changed, 169 insertions(+), 141 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 060b1c0..18433e9 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -2851,157 +2851,30 @@ virStorageBackendBLKIDFindEmpty(const char *device ATTRIBUTE_UNUSED, #endif /* #if WITH_BLKID */ -typedef enum { - VIR_STORAGE_PARTED_ERROR = -1, - VIR_STORAGE_PARTED_MATCH, /* Valid label found and matches format */ - VIR_STORAGE_PARTED_DIFFERENT, /* Valid label found but not match format */ - VIR_STORAGE_PARTED_UNKNOWN, /* No or unrecognized label */ - VIR_STORAGE_PARTED_NOPTTYPE, /* Did not find the Partition Table type */ - VIR_STORAGE_PARTED_PTTYPE_UNK, /* Partition Table type unknown*/ -} virStorageBackendPARTEDResult; - -/** - * Check for a valid disk label (partition table) on device using - * the PARTED command - * - * returns virStorageBackendPARTEDResult - */ -static virStorageBackendPARTEDResult -virStorageBackendPARTEDFindLabel(const char *device, - const char *format) -{ - const char *const args[] = { - device, "print", "--script", NULL, - }; - virCommandPtr cmd = virCommandNew(PARTED); - char *output = NULL; - char *error = NULL; - char *start, *end; - int ret = VIR_STORAGE_PARTED_ERROR; - - virCommandAddArgSet(cmd, args); - virCommandAddEnvString(cmd, "LC_ALL=C"); - virCommandSetOutputBuffer(cmd, &output); - virCommandSetErrorBuffer(cmd, &error); - - /* if parted succeeds we have a valid partition table */ - ret = virCommandRun(cmd, NULL); - if (ret < 0) { - if ((output && strstr(output, "unrecognised disk label")) || - (error && strstr(error, "unrecognised disk label"))) { - ret = VIR_STORAGE_PARTED_UNKNOWN; - } - goto cleanup; - } - - /* Search for "Partition Table:" in the output. If not present, - * then we cannot validate the partition table type. - */ - if (!(start = strstr(output, "Partition Table: ")) || - !(end = strstr(start, "\n"))) { - VIR_DEBUG("Unable to find tag in output: %s", output); - ret = VIR_STORAGE_PARTED_NOPTTYPE; - goto cleanup; - } - start += strlen("Partition Table: "); - *end = '\0'; - - /* on disk it's "msdos", but we document/use "dos" so deal with it here */ - if (STREQ(start, "msdos")) - start += 2; - - /* Make sure we know about this type */ - if (virStoragePoolFormatDiskTypeFromString(start) < 0) { - ret = VIR_STORAGE_PARTED_PTTYPE_UNK; - goto cleanup; - } - - /* Does the on disk match what the pool desired? */ - if (STREQ(start, format)) - ret = VIR_STORAGE_PARTED_MATCH; - - ret = VIR_STORAGE_PARTED_DIFFERENT; - - cleanup: - virCommandFree(cmd); - VIR_FREE(output); - VIR_FREE(error); - return ret; -} - +#if WITH_STORAGE_DISK -/** - * Determine whether the label on the disk is valid or in a known format - * for the purpose of rewriting the label during build or being able to - * start a pool on a device. - * - * When 'writelabel' is true, if we find a valid disk label on the device, - * then we shouldn't be attempting to write as the volume may contain - * data. Force the usage of the overwrite flag to the build command in - * order to be certain. When the disk label is unrecognized, then it - * should be safe to write. - * - * When 'writelabel' is false, only if we find a valid disk label on the - * device should we allow the start since for this path we won't be - * rewriting the label. - * - * Return: 0 if it's OK - * -1 if something's wrong - */ static int virStorageBackendPARTEDValidLabel(const char *device, const char *format, bool writelabel) { - int ret = -1; - virStorageBackendPARTEDResult check; - - check = virStorageBackendPARTEDFindLabel(device, format); - switch (check) { - case VIR_STORAGE_PARTED_ERROR: - virReportError(VIR_ERR_OPERATION_FAILED, "%s", - _("Error checking for disk label, failed to get " - "disk partition information")); - break; - - case VIR_STORAGE_PARTED_MATCH: - if (writelabel) - virReportError(VIR_ERR_OPERATION_INVALID, - _("Disk label already formatted using '%s'"), - format); - else - ret = 0; - break; - - case VIR_STORAGE_PARTED_DIFFERENT: - virReportError(VIR_ERR_OPERATION_FAILED, "%s", - _("Known, but different label format present, " - "requires build --overwrite")); - break; - - case VIR_STORAGE_PARTED_UNKNOWN: - if (writelabel) - ret = 0; - else - virReportError(VIR_ERR_OPERATION_FAILED, "%s", - _("Unrecognized disk label found, requires build")); - break; - - case VIR_STORAGE_PARTED_NOPTTYPE: - virReportError(VIR_ERR_OPERATION_FAILED, "%s", - _("Unable to determine Partition Type, " - "requires build --overwrite")); - break; + return virStorageBackendDiskValidLabel(device, format, writelabel); +} - case VIR_STORAGE_PARTED_PTTYPE_UNK: - virReportError(VIR_ERR_OPERATION_FAILED, "%s", - _("Unknown Partition Type, requires build --overwrite")); - break; - } +#else - return ret; +static int +virStorageBackendPARTEDValidLabel(const char *device ATTRIBUTE_UNUSED, + const char *format ATTRIBUTE_UNUSED, + bool writelabel ATTRIBUTE_UNUSED) +{ + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("PARTED is unsupported by this build")); + return -1; } +#endif /* #if WITH_STORAGE_DISK */ + /* virStorageBackendDeviceIsEmpty: * @devpath: Path to the device to check diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index eae6c90..04ffc6c 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -418,6 +418,158 @@ virStorageBackendDiskRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, } +typedef enum { + VIR_STORAGE_PARTED_ERROR = -1, + VIR_STORAGE_PARTED_MATCH, /* Valid label found and matches format */ + VIR_STORAGE_PARTED_DIFFERENT, /* Valid label found but not match format */ + VIR_STORAGE_PARTED_UNKNOWN, /* No or unrecognized label */ + VIR_STORAGE_PARTED_NOPTTYPE, /* Did not find the Partition Table type */ + VIR_STORAGE_PARTED_PTTYPE_UNK, /* Partition Table type unknown*/ +} virStorageBackendPARTEDResult; + +/** + * Check for a valid disk label (partition table) on device using + * the PARTED command + * + * returns virStorageBackendPARTEDResult + */ +static virStorageBackendPARTEDResult +virStorageBackendPARTEDFindLabel(const char *device, + const char *format) +{ + const char *const args[] = { + device, "print", "--script", NULL, + }; + virCommandPtr cmd = virCommandNew(PARTED); + char *output = NULL; + char *error = NULL; + char *start, *end; + int ret = VIR_STORAGE_PARTED_ERROR; + + virCommandAddArgSet(cmd, args); + virCommandAddEnvString(cmd, "LC_ALL=C"); + virCommandSetOutputBuffer(cmd, &output); + virCommandSetErrorBuffer(cmd, &error); + + /* if parted succeeds we have a valid partition table */ + ret = virCommandRun(cmd, NULL); + if (ret < 0) { + if ((output && strstr(output, "unrecognised disk label")) || + (error && strstr(error, "unrecognised disk label"))) { + ret = VIR_STORAGE_PARTED_UNKNOWN; + } + goto cleanup; + } + + /* Search for "Partition Table:" in the output. If not present, + * then we cannot validate the partition table type. + */ + if (!(start = strstr(output, "Partition Table: ")) || + !(end = strstr(start, "\n"))) { + VIR_DEBUG("Unable to find tag in output: %s", output); + ret = VIR_STORAGE_PARTED_NOPTTYPE; + goto cleanup; + } + start += strlen("Partition Table: "); + *end = '\0'; + + /* on disk it's "msdos", but we document/use "dos" so deal with it here */ + if (STREQ(start, "msdos")) + start += 2; + + /* Make sure we know about this type */ + if (virStoragePoolFormatDiskTypeFromString(start) < 0) { + ret = VIR_STORAGE_PARTED_PTTYPE_UNK; + goto cleanup; + } + + /* Does the on disk match what the pool desired? */ + if (STREQ(start, format)) + ret = VIR_STORAGE_PARTED_MATCH; + + ret = VIR_STORAGE_PARTED_DIFFERENT; + + cleanup: + virCommandFree(cmd); + VIR_FREE(output); + VIR_FREE(error); + return ret; +} + + +/** + * Determine whether the label on the disk is valid or in a known format + * for the purpose of rewriting the label during build or being able to + * start a pool on a device. + * + * When 'writelabel' is true, if we find a valid disk label on the device, + * then we shouldn't be attempting to write as the volume may contain + * data. Force the usage of the overwrite flag to the build command in + * order to be certain. When the disk label is unrecognized, then it + * should be safe to write. + * + * When 'writelabel' is false, only if we find a valid disk label on the + * device should we allow the start since for this path we won't be + * rewriting the label. + * + * Return: 0 if it's OK + * -1 if something's wrong + */ +int +virStorageBackendDiskValidLabel(const char *device, + const char *format, + bool writelabel) +{ + int ret = -1; + virStorageBackendPARTEDResult check; + + check = virStorageBackendPARTEDFindLabel(device, format); + switch (check) { + case VIR_STORAGE_PARTED_ERROR: + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("Error checking for disk label, failed to get " + "disk partition information")); + break; + + case VIR_STORAGE_PARTED_MATCH: + if (writelabel) + virReportError(VIR_ERR_OPERATION_INVALID, + _("Disk label already formatted using '%s'"), + format); + else + ret = 0; + break; + + case VIR_STORAGE_PARTED_DIFFERENT: + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("Known, but different label format present, " + "requires build --overwrite")); + break; + + case VIR_STORAGE_PARTED_UNKNOWN: + if (writelabel) + ret = 0; + else + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("Unrecognized disk label found, requires build")); + break; + + case VIR_STORAGE_PARTED_NOPTTYPE: + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("Unable to determine Partition Type, " + "requires build --overwrite")); + break; + + case VIR_STORAGE_PARTED_PTTYPE_UNK: + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("Unknown Partition Type, requires build --overwrite")); + break; + } + + return ret; +} + + static int virStorageBackendDiskStartPool(virConnectPtr conn ATTRIBUTE_UNUSED, virStoragePoolObjPtr pool) diff --git a/src/storage/storage_backend_disk.h b/src/storage/storage_backend_disk.h index aaabe62..79c0e6b 100644 --- a/src/storage/storage_backend_disk.h +++ b/src/storage/storage_backend_disk.h @@ -28,4 +28,7 @@ extern virStorageBackend virStorageBackendDisk; +int virStorageBackendDiskValidLabel(const char *device, + const char *format, + bool writelabel); #endif /* __VIR_STORAGE_BACKEND_DISK_H__ */ -- 2.7.4

2 1

[libvirt] [PATCH] rpc: libssh: don't crash when known_hosts file path is not provided
by Peter Krempa 10 Jan '17

10 Jan '17

When connecting as root, the "hostsfile" variable would be NULL due to the code leading to this point. This would result into a crash when attempting to set the known hosts file path. To avoid deviating from the approach taken in the libssh2 driver set the file to /dev/null so that all entries are discarded unless explicitly specified. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1406457 --- Note that it would be much simpler just to skip ssh_options_set if 'hostsfile' is NULL. This would result in using /root/.ssh/known_hosts (according to the config) which would be different to the approach taken in libssh2. With libssh2 this can't be done (at least the last time I checked) as it happened to corrupt the file in some cases. src/rpc/virnetlibsshsession.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c index 5de6629d7..5fc16ba8a 100644 --- a/src/rpc/virnetlibsshsession.c +++ b/src/rpc/virnetlibsshsession.c @@ -1172,6 +1172,9 @@ virNetLibsshSessionSetHostKeyVerification(virNetLibsshSessionPtr sess, goto error; } + if (!hostsfile) + hostsfile = "/dev/null"; + /* set the known hosts file */ if (ssh_options_set(sess->session, SSH_OPTIONS_KNOWNHOSTS, hostsfile) < 0) goto error; -- 2.11.0

2 2

[libvirt] [PATCH 0/6] qemu: blockjob: make automatic disk locking less useless
by Peter Krempa 10 Jan '17

10 Jan '17

If automatic disk locking would be enabled with either lock manager the operations would most probably fail. This was mostly as libvirt did not bother to release images that were no longer written to by qemu, or tried re-lock the same image. This fixes the locking code for creation of external snapshots (both disk-only and with memory), block copy and active block commit. This series also kills the horrible "rollback" code in the external disk snapshot code. Regular block commit work will be tracked by: https://bugzilla.redhat.com/show_bug.cgi?id=1405537 Peter Krempa (6): qemu: blockcopy: Save monitor error prior to calling into lock manager locking: Fix documentation on how automatic sanlock leases are stored qemu: snapshot: Don't redetect backing chain after snapshot qemu: snapshot: Refactor snapshot rollback on failure qemu: snapshot: Properly handle image locking qemu: blockjob: Fix locking of block copy/active block commit src/locking/sanlock.conf | 2 +- src/qemu/qemu_blockjob.c | 26 ++-- src/qemu/qemu_driver.c | 389 +++++++++++++++++++++++++++-------------------- 3 files changed, 242 insertions(+), 175 deletions(-) -- 2.11.0

3 14

[libvirt] [PATCH go-xml] Added Storage Pool and Storage Volume XML schemes.
by Alexey Slaykovsky 10 Jan '17

10 Jan '17

Signed-off-by: Alexey Slaykovsky <aslaikov(a)redhat.com> --- storage_encryption.go | 50 ++++++++++ storage_pool.go | 121 +++++++++++++++++++++++++ storage_pool_test.go | 240 ++++++++++++++++++++++++++++++++++++++++++++++++ storage_vol.go | 83 +++++++++++++++++ storage_vol_test.go | 246 ++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 740 insertions(+) create mode 100644 storage_encryption.go create mode 100644 storage_pool.go create mode 100644 storage_pool_test.go create mode 100644 storage_vol.go create mode 100644 storage_vol_test.go diff --git a/storage_encryption.go b/storage_encryption.go new file mode 100644 index 0000000..f66314c --- /dev/null +++ b/storage_encryption.go @@ -0,0 +1,50 @@ +/* + * This file is part of the libvirt-go-xml project + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * Copyright (C) 2017 Red Hat, Inc. + * + */ + +package libvirtxml + +type StorageEncryptionSecret struct { + Type string `xml:"type,attr"` + UUID string `xml:"uuid,attr"` +} + +type StorageEncryptionCipher struct { + Name string `xml:"name,attr"` + Size uint64 `xml:"size,attr"` + Mode string `xml:"mode,attr"` + Hash string `xml:"hash,attr"` +} + +type StorageEncryptionIvgen struct { + Name string `xml:"name,attr"` + Hash string `xml:"hash,attr"` +} + +type StorageEncryption struct { + Format string `xml:"format,attr"` + Secret *StorageEncryptionSecret `xml:"secret"` + Cipher *StorageEncryptionCipher `xml:"cipher"` + Ivgen *StorageEncryptionIvgen `xml:"ivgen"` +} diff --git a/storage_pool.go b/storage_pool.go new file mode 100644 index 0000000..3481361 --- /dev/null +++ b/storage_pool.go @@ -0,0 +1,121 @@ +/* + * This file is part of the libvirt-go-xml project + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * Copyright (C) 2017 Red Hat, Inc. + * + */ + +package libvirtxml + +import "encoding/xml" + +type StoragePoolTargetPermissions struct { + Owner string `xml:"owner,omitempty"` + Group string `xml:"group,omitempty"` + Mode string `xml:"mode,omitempty"` + Label string `xml:"label,omitempty"` +} + +type StoragePoolTargetTimestamps struct { + Atime string `xml:"atime"` + Mtime string `xml:"mtime"` + Ctime string `xml:"ctime"` +} + +type StoragePoolTarget struct { + Path string `xml:"path,omitempty"` + Permissions *StoragePoolTargetPermissions `xml:"permissions"` + Timestamps *StoragePoolTargetTimestamps `xml:"timestamps"` + Encryption *StorageEncryption `xml:"encryption"` +} + +type StoragePoolSourceFormat struct { + Type string `xml:"type,attr"` +} +type StoragePoolSourceHost struct { + Name string `xml:"name,attr"` +} + +type StoragePoolSourceDevice struct { + Path string `xml:"path,attr"` + PartSeparator string `xml:"part_separator,attr,omitempty"` +} + +type StoragePoolSourceAuthSecret struct { + Usage string `xml:"usage,attr"` +} + +type StoragePoolSourceAuth struct { + Type string `xml:"type,attr"` + Username string `xml:"username,attr"` + Secret *StoragePoolSourceAuthSecret `xml:"secret"` +} + +type StoragePoolSourceVendor struct { + Name string `xml:"name,attr"` +} + +type StoragePoolSourceProduct struct { + Name string `xml:"name,attr"` +} + +type StoragePoolSourceAdapterParentAddrAddress struct { + Domain string `xml:"domain,attr"` + Bus string `xml:"bus,attr"` + Slot string `xml:"slot,attr"` + Addr string `xml:"addr,attr"` +} + +type StoragePoolSourceAdapterParentAddr struct { + UniqueID uint64 `xml:"unique_id,attr"` + Address *StoragePoolSourceAdapterParentAddrAddress `xml:"address"` +} + +type StoragePoolSourceAdapter struct { + Type string `xml:"type,attr"` + Name string `xml:"name,attr,omitempty"` + Parent string `xml:"parent,attr,omitempty"` + WWNN string `xml:"wwnn,attr,omitempty"` + WWPN string `xml:"wwpn,attr,omitempty"` + ParentAddr *StoragePoolSourceAdapterParentAddr `xml:"parentaddr"` +} + +type StoragePoolSource struct { + Host *StoragePoolSourceHost `xml:"host"` + Device *StoragePoolSourceDevice `xml:"device"` + Auth *StoragePoolSourceAuth `xml:"auth"` + Vendor *StoragePoolSourceVendor `xml:"vendor"` + Product *StoragePoolSourceProduct `xml:"product"` + Format *StoragePoolSourceFormat `xml:"format"` + Adapter *StoragePoolSourceAdapter `xml:"adapter"` +} + +type StoragePool struct { + XMLName xml.Name `xml:"pool"` + Type string `xml:"type,attr"` + Name string `xml:"name"` + UUID string `xml:"uuid,omitempty"` + Allocation uint64 `xml:"allocation,omitempty"` + Capacity uint64 `xml:"capacity,omitempty"` + Available uint64 `xml:"available,omitempty"` + Target *StoragePoolTarget `xml:"target"` + Source *StoragePoolSource `xml:"source"` +} diff --git a/storage_pool_test.go b/storage_pool_test.go new file mode 100644 index 0000000..8c1b606 --- /dev/null +++ b/storage_pool_test.go @@ -0,0 +1,240 @@ +/* + * This file is part of the libvirt-go-xml project + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * Copyright (C) 2017 Red Hat, Inc. + * + */ + +package libvirtxml + +import ( + "encoding/xml" + "strings" + "testing" +) + +var storagePoolTestData = []struct { + Object *StoragePool + Expected []string +}{ + { + Object: &StoragePool{ + Type: "dir", + Name: "pool", + UUID: "3e3fce45-4f53-4fa7-bb32-11f34168b82b", + Allocation: 1000000, + Capacity: 5000000, + Available: 3000000, + }, + Expected: []string{ + `<pool type="dir">`, + ` <name>pool</name>`, + ` <uuid>3e3fce45-4f53-4fa7-bb32-11f34168b82b</uuid>`, + ` <allocation>1000000</allocation>`, + ` <capacity>5000000</capacity>`, + ` <available>3000000</available>`, + `</pool>`, + }, + }, + { + Object: &StoragePool{ + Type: "iscsi", + Name: "pool", + Source: &StoragePoolSource{ + Host: &StoragePoolSourceHost{ + Name: "host.example.com", + }, + Device: &StoragePoolSourceDevice{ + Path: "pool.example.com:iscsi-pool", + }, + Auth: &StoragePoolSourceAuth{ + Type: "chap", + Username: "username", + Secret: &StoragePoolSourceAuthSecret{ + Usage: "cluster", + }, + }, + Vendor: &StoragePoolSourceVendor{ + Name: "vendor", + }, + Product: &StoragePoolSourceProduct{ + Name: "product", + }, + }, + }, + Expected: []string{ + `<pool type="iscsi">`, + ` <name>pool</name>`, + ` <source>`, + ` <host name="host.example.com"></host>`, + ` <device path="pool.example.com:iscsi-pool"></device>`, + ` <auth type="chap" username="username">`, + ` <secret usage="cluster"></secret>`, + ` </auth>`, + ` <vendor name="vendor"></vendor>`, + ` <product name="product"></product>`, + ` </source>`, + `</pool>`, + }, + }, + { + Object: &StoragePool{ + Type: "disk", + Name: "pool", + Source: &StoragePoolSource{ + Device: &StoragePoolSourceDevice{ + Path: "/dev/mapper/pool", + PartSeparator: "no", + }, + Format: &StoragePoolSourceFormat{ + Type: "gpt", + }, + }, + }, + Expected: []string{ + `<pool type="disk">`, + ` <name>pool</name>`, + ` <source>`, + ` <device path="/dev/mapper/pool" part_separator="no"></device>`, + ` <format type="gpt"></format>`, + ` </source>`, + `</pool>`, + }, + }, + { + Object: &StoragePool{ + Type: "scsi", + Name: "pool", + Source: &StoragePoolSource{ + Adapter: &StoragePoolSourceAdapter{ + Type: "scsi_host", + Name: "scsi_host", + }, + }, + }, + Expected: []string{ + `<pool type="scsi">`, + ` <name>pool</name>`, + ` <source>`, + ` <adapter type="scsi_host" name="scsi_host"></adapter>`, + ` </source>`, + `</pool>`, + }, + }, + { + Object: &StoragePool{ + Type: "scsi", + Name: "pool", + Source: &StoragePoolSource{ + Adapter: &StoragePoolSourceAdapter{ + Type: "scsi_host", + ParentAddr: &StoragePoolSourceAdapterParentAddr{ + UniqueID: 1, + Address: &StoragePoolSourceAdapterParentAddrAddress{ + Domain: "0x0000", + Bus: "0x00", + Slot: "0x1f", + Addr: "0x2", + }, + }, + }, + }, + }, + Expected: []string{ + `<pool type="scsi">`, + ` <name>pool</name>`, + ` <source>`, + ` <adapter type="scsi_host">`, + ` <parentaddr unique_id="1">`, + ` <address domain="0x0000" bus="0x00" slot="0x1f" addr="0x2"></address>`, + ` </parentaddr>`, + ` </adapter>`, + ` </source>`, + `</pool>`, + }, + }, + { + Object: &StoragePool{ + Type: "fs", + Name: "pool", + Source: &StoragePoolSource{ + Adapter: &StoragePoolSourceAdapter{ + Type: "fc_host", + Parent: "scsi_parent", + WWNN: "20000000c9831b4b", + WWPN: "10000000c9831b4b", + }, + }, + }, + Expected: []string{ + `<pool type="fs">`, + ` <name>pool</name>`, + ` <source>`, + ` <adapter type="fc_host" parent="scsi_parent" wwnn="20000000c9831b4b" wwpn="10000000c9831b4b"></adapter>`, + ` </source>`, + `</pool>`, + }, + }, + { + Object: &StoragePool{ + Type: "dir", + Name: "pool", + Target: &StoragePoolTarget{ + Path: "/pool", + Permissions: &StoragePoolTargetPermissions{ + Owner: "1", + Group: "1", + Mode: "0744", + Label: "pool", + }, + }, + }, + Expected: []string{ + `<pool type="dir">`, + ` <name>pool</name>`, + ` <target>`, + ` <path>/pool</path>`, + ` <permissions>`, + ` <owner>1</owner>`, + ` <group>1</group>`, + ` <mode>0744</mode>`, + ` <label>pool</label>`, + ` </permissions>`, + ` </target>`, + `</pool>`, + }, + }, +} + +func TestStoragePool(t *testing.T) { + for _, test := range storagePoolTestData { + doc, err := xml.MarshalIndent(test.Object, "", " ") + if err != nil { + t.Fatal(err) + } + + expect := strings.Join(test.Expected, "\n") + + if string(doc) != expect { + t.Fatal("Bad xml:\n", string(doc), "\n does not match\n", expect, "\n") + } + } +} diff --git a/storage_vol.go b/storage_vol.go new file mode 100644 index 0000000..7d42b53 --- /dev/null +++ b/storage_vol.go @@ -0,0 +1,83 @@ +/* + * This file is part of the libvirt-go-xml project + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * Copyright (C) 2017 Red Hat, Inc. + * + */ + +package libvirtxml + +import "encoding/xml" + +type StorageVolumeMemory struct { + Unit string `xml:"unit,attr,omitempty"` + Value uint64 `xml:",chardata"` +} + +type StorageVolumeTargetPermissions struct { + Owner string `xml:"owner,omitempty"` + Group string `xml:"group,omitempty"` + Mode string `xml:"mode,omitempty"` + Label string `xml:"label,omitempty"` +} + +type StorageVolumeTargetFeature struct { + LazyRefcounts *struct{} `xml:"lazy_refcounts"` +} + +type StorageVolumeTargetFormat struct { + Type string `xml:"type,attr"` +} + +type StorageVolumeTargetTimestamps struct { + Atime string `xml:"atime"` + Mtime string `xml:"mtime"` + Ctime string `xml:"ctime"` +} + +type StorageVolumeTarget struct { + Path string `xml:"path,omitempty"` + Format *StorageVolumeTargetFormat `xml:"format"` + Permissions *StorageVolumeTargetPermissions `xml:"permissions"` + Timestamps *StorageVolumeTargetTimestamps `xml:"timestamps"` + Compat string `xml:"compat,omitempty"` + NoCOW *struct{} `xml:"nocow"` + Features []StorageVolumeTargetFeature `xml:"features"` + Encryption *StorageEncryption `xml:"encryption"` +} + +type StorageVolumeBackingStore struct { + Path string `xml:"path"` + Format *StorageVolumeTargetFormat `xml:"format"` + Permissions *StorageVolumeTargetPermissions `xml:"permissions"` +} + +type StorageVolume struct { + XMLName xml.Name `xml:"volume"` + Type string `xml:"type,attr,omitempty"` + Name string `xml:"name"` + Key string `xml:"key,omitempty"` + Allocation *StorageVolumeMemory `xml:"allocation"` + Capacity *StorageVolumeMemory `xml:"capacity"` + Physical *StorageVolumeMemory `xml:"physical"` + Target *StorageVolumeTarget `xml:"target"` + BackingStore *StorageVolumeBackingStore `xml:"backingStore"` +} diff --git a/storage_vol_test.go b/storage_vol_test.go new file mode 100644 index 0000000..e57e94d --- /dev/null +++ b/storage_vol_test.go @@ -0,0 +1,246 @@ +/* + * This file is part of the libvirt-go-xml project + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * Copyright (C) 2017 Red Hat, Inc. + * + */ + +package libvirtxml + +import ( + "encoding/xml" + "strings" + "testing" +) + +var storageVolumeTestData = []struct { + Object *StorageVolume + Expected []string +}{ + { + Object: &StorageVolume{ + Type: "file", + Name: "file.img", + Key: "/file.img", + Allocation: &StorageVolumeMemory{ + Value: 0, + }, + + Capacity: &StorageVolumeMemory{ + Unit: "T", + Value: 1, + }, + }, + Expected: []string{ + `<volume type="file">`, + ` <name>file.img</name>`, + ` <key>/file.img</key>`, + ` <allocation>0</allocation>`, + ` <capacity unit="T">1</capacity>`, + `</volume>`, + }, + }, + { + Object: &StorageVolume{ + Type: "file", + Name: "file.img", + Target: &StorageVolumeTarget{ + Path: "/file.img", + Format: &StorageVolumeTargetFormat{ + Type: "qcow2", + }, + Permissions: &StorageVolumeTargetPermissions{ + Owner: "107", + Group: "107", + Mode: "0744", + Label: "image", + }, + Timestamps: &StorageVolumeTargetTimestamps{ + Atime: "1341933637.273190990", + Mtime: "1341930622.047245868", + Ctime: "1341930622.047245868", + }, + Compat: "1.1", + NoCOW: &struct{}{}, + Features: []StorageVolumeTargetFeature{ + StorageVolumeTargetFeature{ + LazyRefcounts: &struct{}{}, + }, + }, + }, + }, + Expected: []string{ + `<volume type="file">`, + ` <name>file.img</name>`, + ` <target>`, + ` <path>/file.img</path>`, + ` <format type="qcow2"></format>`, + ` <permissions>`, + ` <owner>107</owner>`, + ` <group>107</group>`, + ` <mode>0744</mode>`, + ` <label>image</label>`, + ` </permissions>`, + ` <timestamps>`, + ` <atime>1341933637.273190990</atime>`, + ` <mtime>1341930622.047245868</mtime>`, + ` <ctime>1341930622.047245868</ctime>`, + ` </timestamps>`, + ` <compat>1.1</compat>`, + ` <nocow></nocow>`, + ` <features>`, + ` <lazy_refcounts></lazy_refcounts>`, + ` </features>`, + ` </target>`, + `</volume>`, + }, + }, + { + Object: &StorageVolume{ + Type: "file", + Name: "file.img", + BackingStore: &StorageVolumeBackingStore{ + Path: "/master.img", + Format: &StorageVolumeTargetFormat{ + Type: "raw", + }, + Permissions: &StorageVolumeTargetPermissions{ + Owner: "107", + Group: "107", + Mode: "0744", + Label: "label", + }, + }, + }, + Expected: []string{ + `<volume type="file">`, + ` <name>file.img</name>`, + ` <backingStore>`, + ` <path>/master.img</path>`, + ` <format type="raw"></format>`, + ` <permissions>`, + ` <owner>107</owner>`, + ` <group>107</group>`, + ` <mode>0744</mode>`, + ` <label>label</label>`, + ` </permissions>`, + ` </backingStore>`, + `</volume>`, + }, + }, + { + Object: &StorageVolume{ + Name: "luks.img", + Capacity: &StorageVolumeMemory{ + Unit: "G", + Value: 5, + }, + Target: &StorageVolumeTarget{ + Path: "/luks.img", + Format: &StorageVolumeTargetFormat{ + Type: "raw", + }, + Encryption: &StorageEncryption{ + Format: "luks", + Secret: &StorageEncryptionSecret{ + Type: "passphrase", + UUID: "f52a81b2-424e-490c-823d-6bd4235bc572", + }, + }, + }, + }, + Expected: []string{ + `<volume>`, + ` <name>luks.img</name>`, + ` <capacity unit="G">5</capacity>`, + ` <target>`, + ` <path>/luks.img</path>`, + ` <format type="raw"></format>`, + ` <encryption format="luks">`, + ` <secret type="passphrase" uuid="f52a81b2-424e-490c-823d-6bd4235bc572"></secret>`, + ` </encryption>`, + ` </target>`, + `</volume>`, + }, + }, + { + Object: &StorageVolume{ + Name: "twofish", + Capacity: &StorageVolumeMemory{ + Unit: "G", + Value: 5, + }, + Target: &StorageVolumeTarget{ + Path: "/twofish.luks", + Format: &StorageVolumeTargetFormat{ + Type: "raw", + }, + Encryption: &StorageEncryption{ + Format: "luks", + Secret: &StorageEncryptionSecret{ + Type: "passphrase", + UUID: "f52a81b2-424e-490c-823d-6bd4235bc572", + }, + Cipher: &StorageEncryptionCipher{ + Name: "twofish", + Size: 256, + Mode: "cbc", + Hash: "sha256", + }, + Ivgen: &StorageEncryptionIvgen{ + Name: "plain64", + Hash: "sha256", + }, + }, + }, + }, + Expected: []string{ + `<volume>`, + ` <name>twofish</name>`, + ` <capacity unit="G">5</capacity>`, + ` <target>`, + ` <path>/twofish.luks</path>`, + ` <format type="raw"></format>`, + ` <encryption format="luks">`, + ` <secret type="passphrase" uuid="f52a81b2-424e-490c-823d-6bd4235bc572"></secret>`, + ` <cipher name="twofish" size="256" mode="cbc" hash="sha256"></cipher>`, + ` <ivgen name="plain64" hash="sha256"></ivgen>`, + ` </encryption>`, + ` </target>`, + `</volume>`, + }, + }, +} + +func TestStorageVolume(t *testing.T) { + for _, test := range storageVolumeTestData { + doc, err := xml.MarshalIndent(test.Object, "", " ") + if err != nil { + t.Fatal(err) + } + + expect := strings.Join(test.Expected, "\n") + + if string(doc) != expect { + t.Fatal("Bad xml:\n", string(doc), "\n does not match\n", expect, "\n") + } + } +} -- 2.11.0

2 1

[libvirt] [PATCH 0/2] Attempt, and fail, to fix build with Clang 3.9 / Linux
by Andrea Bolognani 10 Jan '17

10 Jan '17

Martin asked for this a while ago. I was surprised, at first, because according to my experience the only issue with Clang builds were a couple of test cases failing to run, but trying again on Clang 3.9 / Fedora rawhide caused me to run into at least three separate compilation issues. Two of them I take care with this series, even though I'm fairly unconvinced the bugs are actually in libvirt rather than Clang or glibc; more details in the relevant commit messages. The last one I was unable to work around in any sensible manner: when linking, clang fails with ../gnulib/lib/.libs/libgnu.a(mgetgroups.o): In function `realloc_groupbuf': .../libvirt/gnulib/lib/mgetgroups.c:45: undefined reference to `__muloti4' This seems to be a well-known issue[1] with no solution in sight; passing CFLAGS='-rtlib=compiler-rt' to configure allows the compilation to succeed but, yeah, way gross. So basically I've spent way too much time trying to get this to work and I'm stuck now, so I'm posting whatever I have so far in hope others will pitch in and help me out :) [1] https://llvm.org/bugs/show_bug.cgi?id=16404 Andrea Bolognani (2): util: Turn virFirewallAddRule() into a macro util: Cast to 'long double' when calling isnan() src/libvirt_private.syms | 1 - src/util/virfirewall.c | 23 ----------------------- src/util/virfirewall.h | 16 ++++++++++++---- src/util/virxml.c | 10 +++++----- 4 files changed, 17 insertions(+), 33 deletions(-) -- 2.11.0

4 11

[libvirt] [PATCH v2 0/5] Don't run whole sec driver in namespace
by Michal Privoznik 10 Jan '17

10 Jan '17

v2 of: https://www.redhat.com/archives/libvir-list/2016-December/msg00907.html diff to v1: - Pushed 1/6 from the original series as it was ACKed - Added more comments - Fixed return value of virSecurityDACTransactionAppend and virSecuritySELinuxTransactionAppend - Dropped ignore_value() around virThreadLocalSet() - Unset thread local just in transactionCommit APIs I have not implemented any rollback yet, but I've added comments where the implementation should go ;-) Michal Privoznik (5): security_dac: Resolve virSecurityDACSetOwnershipInternal const correctness security driver: Introduce transaction APIs security_dac: Implement transaction APIs security_selinux: Implement transaction APIs qemu: Use transactions from security driver src/libvirt_private.syms | 3 + src/qemu/qemu_driver.c | 25 ++-- src/qemu/qemu_security.c | 100 ++++--------- src/security/security_dac.c | 261 +++++++++++++++++++++++++++++++++- src/security/security_driver.h | 9 ++ src/security/security_manager.c | 68 +++++++++ src/security/security_manager.h | 7 +- src/security/security_selinux.c | 256 ++++++++++++++++++++++++++++++++- src/security/security_stack.c | 49 +++++++ src/storage/storage_backend.h | 2 +- src/storage/storage_backend_fs.c | 2 +- src/storage/storage_backend_gluster.c | 2 +- src/storage/storage_driver.c | 6 +- src/storage/storage_driver.h | 4 +- src/util/virstoragefile.c | 2 +- src/util/virstoragefile.h | 2 +- 16 files changed, 703 insertions(+), 95 deletions(-) -- 2.11.0

2 9

[libvirt] [PATCH v3 0/3] qemu: Use virtio-pci by default for mach-virt guests
by Andrea Bolognani 10 Jan '17

10 Jan '17

Changes from [v2]: * rename qemuDomainCountVirtioMMIODevices() to qemuDomainHasVirtioMMIODevices() and make it exit as soon as the first virtio-mmio device is encountered, as suggested by Laine * tweak test suite and note no new test cases are needed * add comments and user documentation * add release notes entry * can actually be merged now that all patches it builds on have been merged :) Changes from [v1]: * use virDomainDeviceInfoIterate(), as suggested by Martin and Laine, which results in cleaner and more robust code [v1] https://www.redhat.com/archives/libvir-list/2016-October/msg00988.html [v2] https://www.redhat.com/archives/libvir-list/2016-October/msg01042.html Andrea Bolognani (3): qemu: Use virtio-pci by default for mach-virt guests docs: Document virtio-mmio by default for mach-virt guests NEWS: Update for virtio-pci by default for mach-virt guests docs/formatdomain.html.in | 8 +++- docs/news.html.in | 6 +++ src/qemu/qemu_domain_address.c | 51 ++++++++++++++++++++-- ...l2argv-aarch64-virt-2.6-virtio-pci-default.args | 14 +++--- .../qemuxml2argv-aarch64-virtio-pci-default.args | 17 +++++--- .../qemuxml2argv-aarch64-virtio-pci-default.xml | 3 -- tests/qemuxml2argvtest.c | 1 + .../qemuxml2xmlout-aarch64-virtio-pci-default.xml | 40 ++++++++++++++--- tests/qemuxml2xmltest.c | 1 + 9 files changed, 119 insertions(+), 22 deletions(-) -- 2.7.4

2 8

[libvirt] [PATCH 0/4] qemu: Don't leave temp mount dirs around
by Michal Privoznik 10 Jan '17

10 Jan '17

After yesterday's patches [1] and fixing BZ [2] with them, the comment 4 got me thinking: why leave /var/run/libvirt/$domain.pts and similar temporary directories around? We need them just for a very short time. After that we might as well remove them. 1: https://www.redhat.com/archives/libvir-list/2017-January/msg00073.html 2: https://bugzilla.redhat.com/show_bug.cgi?id=1406837 Michal Privoznik (4): qemuDomainCreateNamespace: s/unlink/rmdir/ qemuDomainGetPreservedMounts: Do not special case /dev qemuDomainCreateNamespace: move mkdir to qemuDomainBuildNamespace qemu: Drop qemuDomainDeleteNamespace src/qemu/qemu_domain.c | 126 +++++++++++++----------------------------------- src/qemu/qemu_domain.h | 3 -- src/qemu/qemu_process.c | 2 - 3 files changed, 34 insertions(+), 97 deletions(-) -- 2.11.0

2 5

[libvirt] [PATCH go] Add support for perf cache_l1d event
by Daniel P. Berrange 10 Jan '17

10 Jan '17

Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed as a build fix connect.go | 6 ++++++ domain.go | 6 ++++++ domain_compat.h | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/connect.go b/connect.go index 35eb7fd..41c54b1 100644 --- a/connect.go +++ b/connect.go @@ -2253,6 +2253,8 @@ type DomainStatsPerf struct { StalledCyclesBackend uint64 RefCpuCyclesSet bool RefCpuCycles uint64 + CacheL1DSet bool + CacheL1D uint64 } func getDomainStatsPerfFieldInfo(params *DomainStatsPerf) map[string]typedParamsFieldInfo { @@ -2309,6 +2311,10 @@ func getDomainStatsPerfFieldInfo(params *DomainStatsPerf) map[string]typedParams set: &params.RefCpuCyclesSet, ul: &params.RefCpuCycles, }, + "perf.cache_l1d": typedParamsFieldInfo{ + set: &params.CacheL1DSet, + ul: &params.CacheL1D, + }, } } diff --git a/domain.go b/domain.go index 515138a..3e66dab 100644 --- a/domain.go +++ b/domain.go @@ -3183,6 +3183,8 @@ type DomainPerfEvents struct { StalledCyclesBackend bool RefCpuCyclesSet bool RefCpuCycles bool + CacheL1DSet bool + CacheL1D bool } /* Remember to also update DomainStatsPerf in connect.go when adding to the stuct above */ @@ -3241,6 +3243,10 @@ func getDomainPerfEventsFieldInfo(params *DomainPerfEvents) map[string]typedPara set: &params.RefCpuCyclesSet, b: &params.RefCpuCycles, }, + C.VIR_PERF_PARAM_CACHE_L1D: typedParamsFieldInfo{ + set: &params.CacheL1DSet, + b: &params.CacheL1D, + }, } } diff --git a/domain_compat.h b/domain_compat.h index 14072d0..4da562b 100644 --- a/domain_compat.h +++ b/domain_compat.h @@ -45,6 +45,10 @@ #define VIR_PERF_PARAM_REF_CPU_CYCLES "ref_cpu_cycles" #endif +#ifndef VIR_PERF_PARAM_CACHE_L1D +#define VIR_PERF_PARAM_CACHE_L1D "cache_l1d" +#endif + #ifndef VIR_DOMAIN_EVENT_ID_METADATA_CHANGE #define VIR_DOMAIN_EVENT_ID_METADATA_CHANGE 23 #endif -- 2.9.3

1 0

[libvirt] [libvirt-python][PATCH] examples: Update event-test.py
by Michal Privoznik 10 Jan '17

10 Jan '17

With recent changes there are new events known to libvirt. Reflect those changes in our event-test.py example script. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- examples/event-test.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/examples/event-test.py b/examples/event-test.py index e43a2f8..d5af33c 100755 --- a/examples/event-test.py +++ b/examples/event-test.py @@ -538,6 +538,9 @@ def myDomainEventJobCompletedCallback(conn, dom, params, opaque): def myDomainEventDeviceRemovalFailedCallback(conn, dom, dev, opaque): print("myDomainEventDeviceRemovalFailedCallback: Domain %s(%s) failed to remove device: %s" % ( dom.name(), dom.ID(), dev)) +def myDomainEventMetadataChangeCallback(conn, dom, mtype, nsuri, opaque): + print("myDomainEventMetadataChangeCallback: Domain %s(%s) changed metadata mtype=%d nsuri=%s" % ( + dom.name(), dom.ID(), mtype, nsuri)) ########################################################################## # Network events @@ -600,6 +603,23 @@ def myNodeDeviceEventLifecycleCallback(conn, dev, event, detail, opaque): def myNodeDeviceEventUpdateCallback(conn, dev, opaque): print("myNodeDeviceEventUpdateCallback: Node device %s" % dev.name()) +########################################################################## +# Secret events +########################################################################## +def secretEventToString(event): + secretEventStrings = ( "Defined", + "Undefined", + ) + return secretEventStrings[event] + +def mySecretEventLifecycleCallback(conn, secret, event, detail, opaque): + print("mySecretEventLifecycleCallback: Secret %s %s %d" % (secret.UUIDString(), + secretEventToString(event), + detail)) + +def mySecretEventValueChanged(conn, secret, opaque): + print("mySecretEventValueChanged: Secret %s" % secret.UUIDString()) + ########################################################################## # Set up and run the program ########################################################################## @@ -689,6 +709,7 @@ def main(): vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION, myDomainEventMigrationIteration, None) vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_JOB_COMPLETED, myDomainEventJobCompletedCallback, None) vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED, myDomainEventDeviceRemovalFailedCallback, None) + vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_METADATA_CHANGE, myDomainEventMetadataChangeCallback, None) vc.networkEventRegisterAny(None, libvirt.VIR_NETWORK_EVENT_ID_LIFECYCLE, myNetworkEventLifecycleCallback, None) @@ -698,6 +719,9 @@ def main(): vc.nodeDeviceEventRegisterAny(None, libvirt.VIR_NODE_DEVICE_EVENT_ID_LIFECYCLE, myNodeDeviceEventLifecycleCallback, None) vc.nodeDeviceEventRegisterAny(None, libvirt.VIR_NODE_DEVICE_EVENT_ID_UPDATE, myNodeDeviceEventUpdateCallback, None) + vc.secretEventRegisterAny(None, libvirt.VIR_SECRET_EVENT_ID_LIFECYCLE, mySecretEventLifecycleCallback, None) + vc.secretEventRegisterAny(None, libvirt.VIR_SECRET_EVENT_ID_VALUE_CHANGED, mySecretEventValueChanged, None) + vc.setKeepAlive(5, 3) # The rest of your app would go here normally, but for sake -- 2.11.0

2 1

[libvirt] [PATCH python 0/2] Add support for new events
by Daniel P. Berrange 10 Jan '17

10 Jan '17

Daniel P. Berrange (2): Add support for secret event APIs Add support for domain metadata change event generator.py | 2 + libvirt-override-virConnect.py | 52 +++++++++ libvirt-override.c | 260 +++++++++++++++++++++++++++++++++++++++++ sanitytest.py | 3 + 4 files changed, 317 insertions(+) -- 2.9.3

2 5

[libvirt] [libvirt-perl PATCH] Add perf cache_l1d event
by John Ferlan 10 Jan '17

10 Jan '17

Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Daniel - feel free to add to the pile of changes you posted if it's easier. Changes | 1 + Virt.xs | 1 + lib/Sys/Virt/Domain.pm | 6 ++++++ 3 files changed, 8 insertions(+) diff --git a/Changes b/Changes index 672b566..2a13f8f 100644 --- a/Changes +++ b/Changes @@ -10,6 +10,7 @@ Revision history for perl module Sys::Virt - Add PERF_PARAM_STALLED_CYCLES_BACKEND constant - Add PERF_PARAM_REF_CPU_CYCLES constant - Add virStorageVolGetInfoFlags & associated constants + - Add PERF_PARAM_CACHE_L1D constant 2.5.0 2016-12-05 diff --git a/Virt.xs b/Virt.xs index 1eb94a8..8fbbc4a 100644 --- a/Virt.xs +++ b/Virt.xs @@ -8313,6 +8313,7 @@ BOOT: REGISTER_CONSTANT_STR(VIR_PERF_PARAM_STALLED_CYCLES_FRONTEND, PERF_PARAM_STALLED_CYCLES_FRONTEND); REGISTER_CONSTANT_STR(VIR_PERF_PARAM_STALLED_CYCLES_BACKEND, PERF_PARAM_STALLED_CYCLES_BACKEND); REGISTER_CONSTANT_STR(VIR_PERF_PARAM_REF_CPU_CYCLES, PERF_PARAM_REF_CPU_CYCLES); + REGISTER_CONSTANT_STR(VIR_PERF_PARAM_CACHE_L1D, PERF_PARAM_CACHE_L1D); REGISTER_CONSTANT_STR(VIR_DOMAIN_BANDWIDTH_IN_AVERAGE, BANDWIDTH_IN_AVERAGE); REGISTER_CONSTANT_STR(VIR_DOMAIN_BANDWIDTH_IN_PEAK, BANDWIDTH_IN_PEAK); diff --git a/lib/Sys/Virt/Domain.pm b/lib/Sys/Virt/Domain.pm index bd59139..2133a30 100644 --- a/lib/Sys/Virt/Domain.pm +++ b/lib/Sys/Virt/Domain.pm @@ -2809,6 +2809,12 @@ frequency scaling by applications running on the platform. It corresponds to the "perf.ref_cpu_cycles" field in the *Stats APIs. +=item Sys::Virt::Domain::PERF_PARAM_CACHE_L1D +The cache_l1d perf event counter which can be used to +measure the count of total level 1 data cache by applications +running on the platform. It corresponds to the "perf.cache_l1d" +field in the *Stats APIs. + =back =head2 VCPU FLAGS -- 2.7.4

2 1

[libvirt] [V2]RFC for support cache tune in libvirt
by Qiao, Liyong 10 Jan '17

10 Jan '17

Hi folks I’v send the V1 version RFC early this week, but no reply yet. Thanks Qiaowei for the comment, I’v change the RFC much more libvirt specify, please help to comments on. ##Propose Changes #Libvirtd configure changes Add a new configure option cache_allocation_ratio to libvirtd, which let libvirt to allocate how many cache to domains. Default is 0.5 Eg. On a host which has 55M cache, libvirt can allocate 55M * cache_allocation_ratio cache to domains ## Virsh command line changes: NAME cachetune - control or query domain cache allocation SYNOPSIS cachetune <domain> [--enabled true/false] [--type <type>][--size <number>] [--config] [--live] [--current] DESCRIPTION Allocate cache usage for domain. OPTIONS [--domain] <string> domain name, id or uuid --enabled <true/false> enable cache allocation --type <string> cache allocations type, support l3/l2 etc --size <number> the cache size in KB --config affect next boot --live affect running domain --current affect current domain This will allow libvirt to allocate specify type l3 cache for a domain Domain xml changes: <cachetune> <enabled=’yes’, size=4096, actual_size=4680,type=’l3’> <enabled=’no’, size=256, actual_size=0, type=’l2’> </cachetune> For more information about the detail design, please refer https://www.redhat.com/archives/libvir-list/2016-December/msg01011.html CAT intro: https://software.intel.com/en-us/articles/software-enabling-for-cache-alloc… Best Regards Eli Qiao(乔立勇）OpenStack Core team OTC Intel. --

2 2

[libvirt] [PATCH] util: fix domain object leaks on closecallbacks
by Wang King 10 Jan '17

10 Jan '17

From: wangjing <king.wang(a)huawei.com> The virCloseCallbacksSet method increase object reference for VM, and decrease object reference in virCloseCallbacksUnset. But VM UUID will be deleted from closecallbacks list in virCloseCallbacksRun when connection disconnected, and then object reference cannot be decreased by virCloseCallbacksUnset in callback functions. Signed-off-by: Wang King <king.wang(a)huawei.com> --- src/util/virclosecallbacks.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/src/util/virclosecallbacks.c b/src/util/virclosecallbacks.c index 891a92b..26d5075 100644 --- a/src/util/virclosecallbacks.c +++ b/src/util/virclosecallbacks.c @@ -300,7 +300,9 @@ virCloseCallbacksGetForConn(virCloseCallbacksPtr closeCallbacks, data.list = list; data.oom = false; + virObjectLock(closeCallbacks); virHashForEach(closeCallbacks->list, virCloseCallbacksGetOne, &data); + virObjectUnlock(closeCallbacks); if (data.oom) { VIR_FREE(list->entries); @@ -329,22 +331,15 @@ virCloseCallbacksRun(virCloseCallbacksPtr closeCallbacks, * them all from the hash. At that point we can release * the lock and run the callbacks safely. */ - virObjectLock(closeCallbacks); list = virCloseCallbacksGetForConn(closeCallbacks, conn); if (!list) return; for (i = 0; i < list->nentries; i++) { - char uuidstr[VIR_UUID_STRING_BUFLEN]; - virUUIDFormat(list->entries[i].uuid, uuidstr); - virHashRemoveEntry(closeCallbacks->list, uuidstr); - } - virObjectUnlock(closeCallbacks); - - for (i = 0; i < list->nentries; i++) { virDomainObjPtr vm; + virDomainObjPtr dom; - if (!(vm = virDomainObjListFindByUUID(domains, + if (!(vm = virDomainObjListFindByUUIDRef(domains, list->entries[i].uuid))) { char uuidstr[VIR_UUID_STRING_BUFLEN]; virUUIDFormat(list->entries[i].uuid, uuidstr); @@ -352,10 +347,20 @@ virCloseCallbacksRun(virCloseCallbacksPtr closeCallbacks, continue; } - vm = list->entries[i].callback(vm, conn, opaque); - if (vm) - virObjectUnlock(vm); + dom = list->entries[i].callback(vm, conn, opaque); + if (dom) + virObjectUnlock(dom); + virObjectUnref(vm); } + + virObjectLock(closeCallbacks); + for (i = 0; i < list->nentries; i++) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(list->entries[i].uuid, uuidstr); + virHashRemoveEntry(closeCallbacks->list, uuidstr); + } + virObjectUnlock(closeCallbacks); + VIR_FREE(list->entries); VIR_FREE(list); } -- 2.8.3

2 2

[libvirt] [PATCH v3] libxl: define a per-domain logger.
by Cédric Bosdonnat 10 Jan '17

10 Jan '17

libxl doesn't provide a way to write one log for each domain. Thus we need to demux the messages. If our logger doesn't know to which domain to attribute a message, then it will write it to the default log file. Starting with Xen 4.9 (commit f9858025 and following), libxl will write the domain ID in an easy to grab manner. The logger introduced by this commit will use it to demux the libxl log messages. Thanks to the default log file, this logger will also work with older versions of Xen. --- * v3: add JSON-formatted libxl_domain_config to the newly opened file when creating a guest. * v2: addressed Jim's comments src/Makefile.am | 1 + src/libxl/libxl_conf.c | 38 +------- src/libxl/libxl_conf.h | 4 +- src/libxl/libxl_domain.c | 7 ++ src/libxl/libxl_driver.c | 2 + src/libxl/libxl_logger.c | 231 +++++++++++++++++++++++++++++++++++++++++++++++ src/libxl/libxl_logger.h | 40 ++++++++ 7 files changed, 286 insertions(+), 37 deletions(-) create mode 100644 src/libxl/libxl_logger.c create mode 100644 src/libxl/libxl_logger.h diff --git a/src/Makefile.am b/src/Makefile.am index 0dd2faaf6..58e3108a6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -851,6 +851,7 @@ LIBXL_DRIVER_SOURCES = \ libxl/libxl_capabilities.c libxl/libxl_capabilities.h \ libxl/libxl_domain.c libxl/libxl_domain.h \ libxl/libxl_driver.c libxl/libxl_driver.h \ + libxl/libxl_logger.c libxl/libxl_logger.h \ libxl/libxl_migration.c libxl/libxl_migration.h UML_DRIVER_SOURCES = \ diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index b569ddad8..ac83b51c7 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -76,9 +76,7 @@ libxlDriverConfigDispose(void *obj) virObjectUnref(cfg->caps); libxl_ctx_free(cfg->ctx); - xtl_logger_destroy(cfg->logger); - if (cfg->logger_file) - VIR_FORCE_FCLOSE(cfg->logger_file); + libxlLoggerFree(cfg->logger); VIR_FREE(cfg->configDir); VIR_FREE(cfg->autostartDir); @@ -1356,8 +1354,6 @@ libxlDriverConfigPtr libxlDriverConfigNew(void) { libxlDriverConfigPtr cfg; - char *log_file = NULL; - xentoollog_level log_level = XTL_DEBUG; char ebuf[1024]; unsigned int free_mem; @@ -1386,9 +1382,6 @@ libxlDriverConfigNew(void) if (VIR_STRDUP(cfg->channelDir, LIBXL_CHANNEL_DIR) < 0) goto error; - if (virAsprintf(&log_file, "%s/libxl-driver.log", cfg->logDir) < 0) - goto error; - if (virFileMakePath(cfg->logDir) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("failed to create log dir '%s': %s"), @@ -1397,37 +1390,13 @@ libxlDriverConfigNew(void) goto error; } - if ((cfg->logger_file = fopen(log_file, "a")) == NULL) { - VIR_ERROR(_("Failed to create log file '%s': %s"), - log_file, virStrerror(errno, ebuf, sizeof(ebuf))); - goto error; - } - VIR_FREE(log_file); - - switch (virLogGetDefaultPriority()) { - case VIR_LOG_DEBUG: - log_level = XTL_DEBUG; - break; - case VIR_LOG_INFO: - log_level = XTL_INFO; - break; - case VIR_LOG_WARN: - log_level = XTL_WARN; - break; - case VIR_LOG_ERROR: - log_level = XTL_ERROR; - break; - } - - cfg->logger = - (xentoollog_logger *)xtl_createlogger_stdiostream(cfg->logger_file, - log_level, XTL_STDIOSTREAM_SHOW_DATE); + cfg->logger = libxlLoggerNew(cfg->logDir, virLogGetDefaultPriority()); if (!cfg->logger) { VIR_ERROR(_("cannot create logger for libxenlight, disabling driver")); goto error; } - if (libxl_ctx_alloc(&cfg->ctx, LIBXL_VERSION, 0, cfg->logger)) { + if (libxl_ctx_alloc(&cfg->ctx, LIBXL_VERSION, 0, (xentoollog_logger *)cfg->logger)) { VIR_ERROR(_("cannot initialize libxenlight context, probably not " "running in a Xen Dom0, disabling driver")); goto error; @@ -1478,7 +1447,6 @@ libxlDriverConfigNew(void) return cfg; error: - VIR_FREE(log_file); virObjectUnref(cfg); return NULL; } diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index 851f3afb4..69d78851a 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -41,6 +41,7 @@ # include "locking/lock_manager.h" # include "virfirmware.h" # include "libxl_capabilities.h" +# include "libxl_logger.h" # define LIBXL_DRIVER_NAME "xenlight" # define LIBXL_VNC_PORT_MIN 5900 @@ -74,8 +75,7 @@ struct _libxlDriverConfig { unsigned int version; /* log stream for driver-wide libxl ctx */ - FILE *logger_file; - xentoollog_logger *logger; + libxlLoggerPtr logger; /* libxl ctx for driver wide ops; getVersion, getNodeInfo, ... */ libxl_ctx *ctx; diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 5cde576ef..fbe7ee5ff 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -809,6 +809,8 @@ libxlDomainCleanup(libxlDriverPrivatePtr driver, VIR_FREE(xml); } + libxlLoggerCloseFile(cfg->logger, vm->def->id); + virDomainObjRemoveTransientDef(vm); virObjectUnref(cfg); } @@ -1127,6 +1129,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver, libxl_asyncprogress_how aop_console_how; libxl_domain_restore_params params; unsigned int hostdev_flags = VIR_HOSTDEV_SP_PCI; + char *config_json = NULL; #ifdef LIBXL_HAVE_PVUSB hostdev_flags |= VIR_HOSTDEV_SP_USB; @@ -1290,6 +1293,9 @@ libxlDomainStart(libxlDriverPrivatePtr driver, * be cleaned up if there are any subsequent failures. */ vm->def->id = domid; + config_json = libxl_domain_config_to_json(cfg->ctx, &d_config); + + libxlLoggerOpenFile(cfg->logger, domid, vm->def->name, config_json); /* Always enable domain death events */ if (libxl_evenable_domain_death(cfg->ctx, vm->def->id, 0, &priv->deathW)) @@ -1366,6 +1372,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver, cleanup: libxl_domain_config_dispose(&d_config); + VIR_FREE(config_json); VIR_FREE(dom_xml); VIR_FREE(managed_save_path); virDomainDefFree(def); diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 7e5d9b69e..325636c9a 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -406,6 +406,8 @@ libxlReconnectDomain(virDomainObjPtr vm, /* Update domid in case it changed (e.g. reboot) while we were gone? */ vm->def->id = d_info.domid; + libxlLoggerOpenFile(cfg->logger, vm->def->id, vm->def->name, NULL); + /* Update hostdev state */ if (virHostdevUpdateActiveDomainDevices(hostdev_mgr, LIBXL_DRIVER_NAME, vm->def, hostdev_flags) < 0) diff --git a/src/libxl/libxl_logger.c b/src/libxl/libxl_logger.c new file mode 100644 index 000000000..9ca745a93 --- /dev/null +++ b/src/libxl/libxl_logger.c @@ -0,0 +1,231 @@ +/* + * libxl_logger.c: libxl logger implementation + * + * Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. + * + * 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/>. + * + * Authors: + * Cédric Bosdonnat <cbosdonnat(a)suse.com> + */ +#include <config.h> + +#include <string.h> +#include <libxl.h> + +#include "internal.h" +#include "libxl_logger.h" +#include "util/viralloc.h" +#include "util/virerror.h" +#include "util/virfile.h" +#include "util/virhash.h" +#include "util/virstring.h" +#include "util/virtime.h" + +#define VIR_FROM_THIS VIR_FROM_LIBXL + +VIR_LOG_INIT("libxl.libxl_logger"); + +typedef struct xentoollog_logger_libvirt xentoollog_logger_libvirt; + +struct xentoollog_logger_libvirt { + xentoollog_logger vtable; + xentoollog_level minLevel; + const char *logDir; + + /* map storing the opened fds: "domid" -> FILE* */ + virHashTablePtr files; + FILE *defaultLogFile; +}; + +static void +libxlLoggerFileFree(void *payload, const void *key ATTRIBUTE_UNUSED) +{ + FILE *file = payload; + VIR_FORCE_FCLOSE(file); + file = NULL; +} + +ATTRIBUTE_FMT_PRINTF(5, 0) static void +libvirt_vmessage(xentoollog_logger *logger_in, + xentoollog_level level, + int errnoval, + const char *context, + const char *format, + va_list args) +{ + xentoollog_logger_libvirt *lg = (xentoollog_logger_libvirt *)logger_in; + FILE *logFile = lg->defaultLogFile; + char timestamp[VIR_TIME_STRING_BUFLEN]; + char *message = NULL; + char *start, *end; + char ebuf[1024]; + + VIR_DEBUG("libvirt_vmessage: context='%s' format='%s'", context, format); + + if (level < lg->minLevel) + return; + + if (virVasprintf(&message, format, args) < 0) + return; + + /* Should we print to a domain-specific log file? */ + if ((start = strstr(message, ": Domain ")) && + (end = strstr(start + 9, ":"))) { + FILE *domainLogFile; + + VIR_DEBUG("Found domain log message"); + + start = start + 9; + *end = '\0'; + + domainLogFile = virHashLookup(lg->files, start); + if (domainLogFile) + logFile = domainLogFile; + + *end = ':'; + } + + /* Do the actual print to the log file */ + if (virTimeStringNowRaw(timestamp) < 0) + timestamp[0] = '\0'; + + fprintf(logFile, "%s: ", timestamp); + if (context) + fprintf(logFile, "%s: ", context); + + fprintf(logFile, "%s", message); + + if (errnoval >= 0) + fprintf(logFile, ": %s", virStrerror(errnoval, ebuf, sizeof(ebuf))); + + fputc('\n', logFile); + fflush(logFile); + + VIR_FREE(message); +} + +static void +libvirt_progress(xentoollog_logger *logger_in ATTRIBUTE_UNUSED, + const char *context ATTRIBUTE_UNUSED, + const char *doingwhat ATTRIBUTE_UNUSED, + int percent ATTRIBUTE_UNUSED, + unsigned long done ATTRIBUTE_UNUSED, + unsigned long total ATTRIBUTE_UNUSED) +{ + /* This function purposedly does nothing: it's no logging info */ +} + +static void +libvirt_destroy(xentoollog_logger *logger_in) +{ + xentoollog_logger_libvirt *lg = (xentoollog_logger_libvirt*)logger_in; + VIR_FREE(lg); +} + + +libxlLoggerPtr libxlLoggerNew(const char *logDir, + virLogPriority minLevel) +{ + xentoollog_logger_libvirt logger; + libxlLoggerPtr logger_out = NULL; + char *path = NULL; + + switch (minLevel) { + case VIR_LOG_DEBUG: + logger.minLevel = XTL_DEBUG; + break; + case VIR_LOG_INFO: + logger.minLevel = XTL_INFO; + break; + case VIR_LOG_WARN: + logger.minLevel = XTL_WARN; + break; + case VIR_LOG_ERROR: + logger.minLevel = XTL_ERROR; + break; + } + logger.logDir = logDir; + + if ((logger.files = virHashCreate(3, libxlLoggerFileFree)) == NULL) + return NULL; + + if (virAsprintf(&path, "%s/libxl-driver.log", logDir) < 0) + goto error; + + if ((logger.defaultLogFile = fopen(path, "a")) == NULL) + goto error; + + logger_out = XTL_NEW_LOGGER(libvirt, logger); + + cleanup: + VIR_FREE(path); + return logger_out; + + error: + virHashFree(logger.files); + goto cleanup; +} + +void libxlLoggerFree(libxlLoggerPtr logger) +{ + xentoollog_logger *xtl_logger = (xentoollog_logger*)logger; + if (logger->defaultLogFile) + VIR_FORCE_FCLOSE(logger->defaultLogFile); + virHashFree(logger->files); + xtl_logger_destroy(xtl_logger); +} + +void libxlLoggerOpenFile(libxlLoggerPtr logger, int id, + const char *name, + const char *domain_config) +{ + char *path = NULL; + FILE *logFile = NULL; + char *domidstr = NULL; + char ebuf[1024]; + + if (virAsprintf(&path, "%s/%s.log", logger->logDir, name) < 0 || + virAsprintf(&domidstr, "%d", id) < 0) + goto cleanup; + + if (!(logFile = fopen(path, "a"))) { + VIR_WARN("Failed to open log file %s: %s", + path, virStrerror(errno, ebuf, sizeof(ebuf))); + goto cleanup; + } + ignore_value(virHashAddEntry(logger->files, domidstr, logFile)); + + /* domain_config is non NULL only when starting a new domain */ + if (domain_config) { + fprintf(logFile, "Domain start: %s\n", domain_config); + fflush(logFile); + } + + cleanup: + VIR_FREE(path); + VIR_FREE(domidstr); +} + +void libxlLoggerCloseFile(libxlLoggerPtr logger, int id) +{ + char *domidstr = NULL; + if (virAsprintf(&domidstr, "%d", id) < 0) + return; + + ignore_value(virHashRemoveEntry(logger->files, domidstr)); + + VIR_FREE(domidstr); +} diff --git a/src/libxl/libxl_logger.h b/src/libxl/libxl_logger.h new file mode 100644 index 000000000..92b222578 --- /dev/null +++ b/src/libxl/libxl_logger.h @@ -0,0 +1,40 @@ +/* + * libxl_logger.h: libxl logger implementation + * + * Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. + * + * 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/>. + * + * Authors: + * Cédric Bosdonnat <cbosdonnat(a)suse.com> + */ + +#ifndef __LIBXL_LOGGER_H +# define __LIBXL_LOGGER_H + +# include "util/virlog.h" + +typedef struct xentoollog_logger_libvirt libxlLogger; +typedef libxlLogger *libxlLoggerPtr; + +libxlLoggerPtr libxlLoggerNew(const char *logDir, + virLogPriority minLevel); +void libxlLoggerFree(libxlLoggerPtr logger); + +void libxlLoggerOpenFile(libxlLoggerPtr logger, int id, const char *name, + const char *domain_config); +void libxlLoggerCloseFile(libxlLoggerPtr logger, int id); + +#endif /* __LIBXL_LOGGER_H */ -- 2.11.0

2 1

[libvirt] [PATCH 1/2] perf: add cache_l1d perf event support
by Nitesh Konkar 10 Jan '17

10 Jan '17

This patch adds support and documentation for a generalized hardware cache event called cache_l1d perf event. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- docs/formatdomain.html.in | 7 +++++++ docs/schemas/domaincommon.rng | 1 + include/libvirt/libvirt-domain.h | 11 +++++++++++ src/libvirt-domain.c | 2 ++ src/qemu/qemu_driver.c | 1 + src/util/virperf.c | 6 +++++- src/util/virperf.h | 1 + tests/genericxml2xmlindata/generic-perf.xml | 1 + tools/virsh.pod | 5 ++++- 9 files changed, 33 insertions(+), 2 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index f7bef51..e192b77 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1937,6 +1937,7 @@ <event name='stalled_cycles_frontend' enabled='no'/> <event name='stalled_cycles_backend' enabled='no'/> <event name='ref_cpu_cycles' enabled='no'/> + <event name='cache_l1d' enabled='no'/> </perf> ... </pre> @@ -2015,6 +2016,12 @@ by applications running on the platform</td> <td><code>perf.ref_cpu_cycles</code></td> </tr> + <tr> + <td><code>cache_l1d</code></td> + <td>the count of total level 1 data cache by applications running on + the platform</td> + <td><code>perf.cache_l1d</code></td> + </tr> </table> <h3><a name="elementsDevices">Devices</a></h3> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 4d76315..be0a609 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -433,6 +433,7 @@ <value>stalled_cycles_frontend</value> <value>stalled_cycles_backend</value> <value>ref_cpu_cycles</value> + <value>cache_l1d</value> </choice> </attribute> <attribute name="enabled"> diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 6362947..479d417 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -2188,6 +2188,17 @@ void virDomainStatsRecordListFree(virDomainStatsRecordPtr *stats); */ # define VIR_PERF_PARAM_REF_CPU_CYCLES "ref_cpu_cycles" +/** + * VIR_PERF_PARAM_CACHE_L1D: + * + * Macro for typed parameter name that represents cache_l1d + * perf event which can be used to measure the count of total + * level 1 data cache by applications running on the platform. + * It corresponds to the "perf.cache_l1d" field in the + * *Stats APIs. + */ +# define VIR_PERF_PARAM_CACHE_L1D "cache_l1d" + int virDomainGetPerfEvents(virDomainPtr dom, virTypedParameterPtr *params, int *nparams, diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 5b3e842..3023f30 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -11250,6 +11250,8 @@ virConnectGetDomainCapabilities(virConnectPtr conn, * CPU frequency scaling by applications running * as unsigned long long. It is produced by the * ref_cpu_cycles perf event. + * "perf.cache_l1d" - The count of total level 1 data cache as unsigned + * long long. It is produced by cache_l1d perf event. * * Note that entire stats groups or individual stat fields may be missing from * the output in case they are not supported by the given hypervisor, are not diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b359e77..80db495 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9859,6 +9859,7 @@ qemuDomainSetPerfEvents(virDomainPtr dom, 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_CACHE_L1D, VIR_TYPED_PARAM_BOOLEAN, NULL) < 0) return -1; diff --git a/src/util/virperf.c b/src/util/virperf.c index f64692b..8554723 100644 --- a/src/util/virperf.c +++ b/src/util/virperf.c @@ -43,7 +43,8 @@ VIR_ENUM_IMPL(virPerfEvent, VIR_PERF_EVENT_LAST, "cache_references", "cache_misses", "branch_instructions", "branch_misses", "bus_cycles", "stalled_cycles_frontend", - "stalled_cycles_backend", "ref_cpu_cycles"); + "stalled_cycles_backend", "ref_cpu_cycles", + "cache_l1d"); struct virPerfEvent { int type; @@ -112,6 +113,9 @@ static struct virPerfEventAttr attrs[] = { .attrConfig = 0, # endif }, + {.type = VIR_PERF_EVENT_CACHE_L1D, + .attrType = PERF_TYPE_HW_CACHE, + .attrConfig = PERF_COUNT_HW_CACHE_L1D}, }; typedef struct virPerfEventAttr *virPerfEventAttrPtr; diff --git a/src/util/virperf.h b/src/util/virperf.h index 1f43c92..4c562af 100644 --- a/src/util/virperf.h +++ b/src/util/virperf.h @@ -47,6 +47,7 @@ typedef enum { the backend of the instruction processor pipeline */ VIR_PERF_EVENT_REF_CPU_CYCLES, /* Count of ref cpu cycles */ + VIR_PERF_EVENT_CACHE_L1D, /* Count of level 1 data cache*/ VIR_PERF_EVENT_LAST } virPerfEventType; diff --git a/tests/genericxml2xmlindata/generic-perf.xml b/tests/genericxml2xmlindata/generic-perf.xml index 437cd65..d1418d0 100644 --- a/tests/genericxml2xmlindata/generic-perf.xml +++ b/tests/genericxml2xmlindata/generic-perf.xml @@ -26,6 +26,7 @@ <event name='stalled_cycles_frontend' enabled='yes'/> <event name='stalled_cycles_backend' enabled='yes'/> <event name='ref_cpu_cycles' enabled='yes'/> + <event name='cache_l1d' enabled='yes'/> </perf> <devices> </devices> diff --git a/tools/virsh.pod b/tools/virsh.pod index ef91223..e039db5 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -951,7 +951,8 @@ I<--perf> returns the statistics of all enabled perf events: "perf.bus_cycles" - the count of bus cycles, "perf.stalled_cycles_frontend" - the count of stalled frontend cpu cycles, "perf.stalled_cycles_backend" - the count of stalled backend cpu cycles, -"perf.ref_cpu_cycles" - the count of ref cpu cycles +"perf.ref_cpu_cycles" - the count of ref cpu cycles, +"perf.cache_l1d" - the count of level 1 data cache See the B<perf> command for more details about each event. @@ -2316,6 +2317,8 @@ B<Valid perf event names> ref_cpu_cycles - Provides the count of total cpu cycles not affected by CPU frequency scaling by applications running on the platform. + cache_l1d - Provides the count of total level 1 data cache + by applications running on the platform. B<Note>: The statistics can be retrieved using the B<domstats> command using the I<--perf> flag. -- 1.9.3

2 2

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

10 Jan '17

The virsh manpage lists options --uuid and --name as mutually exclusive along option --table when actually the optoin --table 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 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index ef91223..cc99da1 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -529,9 +529,8 @@ output should be used. This is the default. If both I<--name> and I<--uuid> are specified, domain UUID's and names are printed side by side without any header. Flag I<--table> specifies that the legacy table-formatted output should be used. This is the -default if neither I<--name> nor I<--uuid> are specified. Options -I<--uuid> and I<--name> are mutually exclusive if option I<--table> is -specified. +default if neither I<--name> nor I<--uuid> are specified. Option +I<--table> is mutually exclusive with options I<--uuid> and I<--name>. If I<--title> is specified, then the short domain description (title) is printed in an extra column. This flag is usable only with the default -- 1.9.3

2 1

[libvirt] [PATCH v2] cmdPerf: Display enabled/disabled message on perf event enable/disable
by Nitesh Konkar 10 Jan '17

10 Jan '17

Currently no message is displayed on successful perf event enable or disable. This patch gives the enabled/disabled status message on successful enabling/disabling of the perf event. Eg:virsh perf Domain --enable instructions --disable cache_misses instructions : enabled cache_misses : disabled Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- tools/virsh-domain.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 3a6fa5c..287ca28 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -8848,13 +8848,27 @@ virshParseEventStr(const char *event, return ret; } +static void +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) { + vshPrint(ctl, "%-15s: %s\n", params[i].field, _("enabled")); + } else { + vshPrint(ctl, "%-15s: %s\n", params[i].field, _("disabled")); + } + } +} + static bool cmdPerf(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; int nparams = 0; int maxparams = 0; - size_t i; virTypedParameterPtr params = NULL; bool ret = false; const char *enable = NULL, *disable = NULL; @@ -8891,18 +8905,13 @@ cmdPerf(vshControl *ctl, const vshCmd *cmd) vshError(ctl, "%s", _("Unable to get perf events")); goto cleanup; } - for (i = 0; i < nparams; i++) { - if (params[i].type == VIR_TYPED_PARAM_BOOLEAN && - params[i].value.b) { - vshPrint(ctl, "%-15s: %s\n", params[i].field, _("enabled")); - } else { - vshPrint(ctl, "%-15s: %s\n", params[i].field, _("disabled")); - } - } + virshPrintPerfStatus(ctl, params, nparams); } else { if (virDomainSetPerfEvents(dom, params, nparams, flags) != 0) { vshError(ctl, "%s", _("Unable to enable/disable perf events")); goto cleanup; + } else { + virshPrintPerfStatus(ctl, params, nparams); } } -- 1.9.3

2 1

[libvirt] [PATCH 1/2] perf: Refactor perf code
by Nitesh Konkar 10 Jan '17

10 Jan '17

Avoid unnecessary calling of function vshCommandOptStringReq. In the current code the function vshCommandOptStringReq is called irrespective of whether --enable and/or --disable is present in the command line. Eg: 'virsh perf domainName' also results in calling this function twice. This patch fixes this. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- tools/virsh-domain.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 3a6fa5c..91de532 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -8862,6 +8862,8 @@ cmdPerf(vshControl *ctl, const vshCmd *cmd) bool current = vshCommandOptBool(cmd, "current"); bool config = vshCommandOptBool(cmd, "config"); bool live = vshCommandOptBool(cmd, "live"); + bool shouldEnable = vshCommandOptBool(cmd, "enable"); + bool shouldDisable = vshCommandOptBool(cmd, "disable"); VSH_EXCLUSIVE_OPTIONS_VAR(current, live); VSH_EXCLUSIVE_OPTIONS_VAR(current, config); @@ -8871,9 +8873,15 @@ cmdPerf(vshControl *ctl, const vshCmd *cmd) if (live) flags |= VIR_DOMAIN_AFFECT_LIVE; - if (vshCommandOptStringReq(ctl, cmd, "enable", &enable) < 0 || - vshCommandOptStringReq(ctl, cmd, "disable", &disable) < 0) - return false; + if (shouldEnable) { + if (vshCommandOptStringReq(ctl, cmd, "enable", &enable) < 0) + return false; + } + + if (shouldDisable) { + if (vshCommandOptStringReq(ctl, cmd, "disable", &disable) < 0) + return false; + } if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; -- 1.9.3

3 3

[libvirt] [PATCH] lxc: ensure libvirt_lxc and qemu-nbd move into systemd machine slice
by Daniel P. Berrange 09 Jan '17

09 Jan '17

Currently when spawning containers with systemd, the container PID 1 will get moved into the systemd machine slice. Libvirt then manually moves the libvirt_lxc and qemu-nbd processes into the cgroups associated with the slice, but skips the systemd controller cgroup. This means that from systemd's POV, libvirt_lxc and qemu-nbd are still part of the libvirtd.service unit. On systemctl daemon-reload, it will notice that libvirt_lxc & qemu-nbd are in the libvirtd.service unit for the systemd controller, but in the machine cgroups for resources. Systemd will thus move them back into the libvirtd.service resource cgroups next time libvirtd is restarted. This causes libvirtd to kill off the container due to incorrect cgroup placement. The solution is to ensure that when moving libvirt_lxc & qemu-nbd, we also move the systemd cgroup controller placement. Normally this is not something we ever want todo, but this is a special case as we are intentionally wanting to move them to a different systemd unit. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/libvirt_private.syms | 1 + src/lxc/lxc_controller.c | 4 ++-- src/util/vircgroup.c | 52 +++++++++++++++++++++++++++++++++++++----------- src/util/vircgroup.h | 1 + 4 files changed, 44 insertions(+), 14 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 2d23e46..2dd5809 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1287,6 +1287,7 @@ virBufferVasprintf; # util/vircgroup.h +virCgroupAddMachineTask; virCgroupAddTask; virCgroupAddTaskController; virCgroupAllowAllDevices; diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 2170b0a..88ba8aa 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -869,12 +869,12 @@ static int virLXCControllerSetupCgroupLimits(virLXCControllerPtr ctrl) ctrl->nicindexes))) goto cleanup; - if (virCgroupAddTask(ctrl->cgroup, getpid()) < 0) + if (virCgroupAddMachineTask(ctrl->cgroup, getpid()) < 0) goto cleanup; /* Add all qemu-nbd tasks to the cgroup */ for (i = 0; i < ctrl->nnbdpids; i++) { - if (virCgroupAddTask(ctrl->cgroup, ctrl->nbdpids[i]) < 0) + if (virCgroupAddMachineTask(ctrl->cgroup, ctrl->nbdpids[i]) < 0) goto cleanup; } diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 80ce43c..ddf19e9 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -1184,16 +1184,8 @@ virCgroupNew(pid_t pid, } -/** - * virCgroupAddTask: - * - * @group: The cgroup to add a task to - * @pid: The pid of the task to add - * - * Returns: 0 on success, -1 on error - */ -int -virCgroupAddTask(virCgroupPtr group, pid_t pid) +static int +virCgroupAddTaskInternal(virCgroupPtr group, pid_t pid, bool withSystemd) { int ret = -1; size_t i; @@ -1203,8 +1195,10 @@ virCgroupAddTask(virCgroupPtr group, pid_t pid) if (!group->controllers[i].mountPoint) continue; - /* We must never add tasks in systemd's hierarchy */ - if (i == VIR_CGROUP_CONTROLLER_SYSTEMD) + /* We must never add tasks in systemd's hierarchy + * unless we're intentionally trying to move a + * task into a systemd machine scope */ + if (i == VIR_CGROUP_CONTROLLER_SYSTEMD && !withSystemd) continue; if (virCgroupAddTaskController(group, pid, i) < 0) @@ -1216,6 +1210,40 @@ virCgroupAddTask(virCgroupPtr group, pid_t pid) return ret; } +/** + * virCgroupAddTask: + * + * @group: The cgroup to add a task to + * @pid: The pid of the task to add + * + * Will add the task to all controllers, except the + * systemd unit controller. + * + * Returns: 0 on success, -1 on error + */ +int +virCgroupAddTask(virCgroupPtr group, pid_t pid) +{ + return virCgroupAddTaskInternal(group, pid, false); +} + +/** + * virCgroupAddMachineTask: + * + * @group: The cgroup to add a task to + * @pid: The pid of the task to add + * + * Will add the task to all controllers, including the + * systemd unit controller. + * + * Returns: 0 on success, -1 on error + */ +int +virCgroupAddMachineTask(virCgroupPtr group, pid_t pid) +{ + return virCgroupAddTaskInternal(group, pid, true); +} + /** * virCgroupAddTaskController: diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h index 4b8f3ff..2de1bf2 100644 --- a/src/util/vircgroup.h +++ b/src/util/vircgroup.h @@ -131,6 +131,7 @@ int virCgroupPathOfController(virCgroupPtr group, char **path); int virCgroupAddTask(virCgroupPtr group, pid_t pid); +int virCgroupAddMachineTask(virCgroupPtr group, pid_t pid); int virCgroupAddTaskController(virCgroupPtr group, pid_t pid, -- 2.9.3

3 3

[libvirt] [PATCH] Update remote_protocol-structs for new events
by Jiri Denemark 09 Jan '17

09 Jan '17

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Pushed as a build-breaker. src/remote_protocol-structs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 0e8291a92..0360600cf 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -2804,7 +2804,7 @@ struct remote_domain_event_callback_metadata_change_msg { int callbackID; remote_nonnull_domain dom; int type; - remote_string nsuri + remote_string nsuri; }; struct remote_connect_secret_event_register_any_args { int eventID; @@ -2822,6 +2822,10 @@ struct remote_secret_event_lifecycle_msg { int event; int detail; }; +struct remote_secret_event_value_changed_msg { + int callbackID; + remote_nonnull_secret secret; +}; enum remote_procedure { REMOTE_PROC_CONNECT_OPEN = 1, REMOTE_PROC_CONNECT_CLOSE = 2, @@ -3205,4 +3209,5 @@ enum remote_procedure { REMOTE_PROC_CONNECT_SECRET_EVENT_REGISTER_ANY = 380, REMOTE_PROC_CONNECT_SECRET_EVENT_DEREGISTER_ANY = 381, REMOTE_PROC_SECRET_EVENT_LIFECYCLE = 382, + REMOTE_PROC_SECRET_EVENT_VALUE_CHANGED = 383, }; -- 2.11.0

1 0

[libvirt] [PATCH go 0/3] Add bindings for new (and missing!) events
by Daniel P. Berrange 09 Jan '17

09 Jan '17

Daniel P. Berrange (3): Add support for domain metadata change event Add missing binding for storage pool refresh event Add binding for secret event APIs api_test.go | 6 ++ domain_compat.h | 3 + domain_events.go | 46 +++++++++++++ domain_events_cfuncs.go | 10 +++ domain_events_cfuncs.h | 5 ++ secret.go | 14 ++++ secret_compat.go | 47 +++++++++++++ secret_compat.h | 30 ++++++++ secret_events.go | 157 ++++++++++++++++++++++++++++++++++++++++++ secret_events_cfuncs.go | 65 +++++++++++++++++ secret_events_cfuncs.h | 40 +++++++++++ storage_pool_events.go | 40 +++++++++++ storage_pool_events_cfuncs.go | 7 ++ storage_pool_events_cfuncs.h | 2 + 14 files changed, 472 insertions(+) create mode 100644 secret_compat.go create mode 100644 secret_events.go create mode 100644 secret_events_cfuncs.go create mode 100644 secret_events_cfuncs.h -- 2.9.3

1 3

[libvirt] [PATCH perl 0/2] Add bindings for new events
by Daniel P. Berrange 09 Jan '17

09 Jan '17

Daniel P. Berrange (2): Add domain metadata change event Add support for secret event APIs Changes | 2 + Virt.xs | 184 +++++++++++++++++++++++++++++++++++++++++++++++++ lib/Sys/Virt.pm | 36 ++++++++++ lib/Sys/Virt/Domain.pm | 4 ++ lib/Sys/Virt/Secret.pm | 33 +++++++++ t/030-api-coverage.t | 4 ++ 6 files changed, 263 insertions(+) -- 2.9.3

1 2

[libvirt] [PATCH v2 0/2] Detect misconfiguration between disk bus and disk address
by Marc Hartmayer 09 Jan '17

09 Jan '17

This patch series adds the functionality to detect a misconfiguration between disk bus type and disk address type for disks that are using the address type virDomainDeviceDriveAddress. It also adds a test for it. A check for other bus types may be needed. This may require a driver specific function, as it is already implemented in virDomainDeviceDefPostParse(), for example. Changelog: - v1 -> v2: + Use full enumeration of the bus types + Add warning for unexpected bus type Marc Hartmayer (2): conf: Detect misconfiguration between disk bus and disk address tests: Add tests for disk configuration validation src/conf/domain_conf.c | 56 ++++++++++++++++++++++ .../qemuxml2argv-disk-fdc-incompatible-address.xml | 22 +++++++++ .../qemuxml2argv-disk-ide-incompatible-address.xml | 23 +++++++++ ...qemuxml2argv-disk-sata-incompatible-address.xml | 23 +++++++++ ...qemuxml2argv-disk-scsi-incompatible-address.xml | 24 ++++++++++ tests/qemuxml2argvtest.c | 8 ++++ 6 files changed, 156 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-fdc-incompatible-address.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-ide-incompatible-address.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-sata-incompatible-address.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-incompatible-address.xml -- 2.5.5

4 7

[libvirt] [PATCH] qemu: setvcpus: Properly coldplug vcpus when hotpluggable vcpus are present
by Peter Krempa 09 Jan '17

09 Jan '17

When coldplugging vcpus to a VM that already has a few hotpluggable vcpus the code might generate a invalid configuration as non-hotpluggable cpus need to be clustered starting from vcpu 0. This fix forces the added vcpus to be hotpluggable in such case. Fixes a corner case described in: https://bugzilla.redhat.com/show_bug.cgi?id=1370357 --- src/qemu/qemu_driver.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 675a4d0e7..30edb6cde 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4943,9 +4943,20 @@ qemuDomainSetVcpusConfig(virDomainDefPtr def, for (i = 0; i < maxvcpus; i++) { vcpu = virDomainDefGetVcpu(def, i); - if (!vcpu || vcpu->online) + if (!vcpu) continue; + if (vcpu->online) { + /* non-hotpluggable vcpus need to be clustered at the beggining, + * thus we need to force vcpus to be hotpluggable when we find + * vcpus that are hotpluggable and online prior to the ones + * we are going to add */ + if (vcpu->hotpluggable == VIR_TRISTATE_BOOL_YES) + hotpluggable = true; + + continue; + } + vcpu->online = true; if (hotpluggable) { vcpu->hotpluggable = VIR_TRISTATE_BOOL_YES; -- 2.11.0

2 1