- Devel - libvirt List Archives

[libvirt] [RFC] changing/regenerating domain uuid on migration
by Nikolay Shirokovskiy 22 Apr '16

22 Apr '16

Hi all. Consider next usecase. There are active domain DA on host A and active domain DB on host B and the uuids of domains are the same. This is quite uncommon of course but still possible. If we have option to change uuid on migration then migration of DA to host B is possible and if we don't have the option we have to stop/edit/start DA to migrate. What is you opinion on subject? Can this functionality be taken into upstream and in what form? In form of setting uuid as a migration parameter or option to regenerate uuid on destination? Nikolay

3 3

[libvirt] [RFC] relax offline migration requirements to --xml
by Nikolay Shirokovskiy 22 Apr '16

22 Apr '16

Hi, all. I'm thinking of leveraging of existing migration API to support offline clone in virtuozzo. AFAIK offline migration is basically just copying of domain config to the other side and defining it there. It is even possible to slightly mutate it thru options like --dname or --xml but mutation restrictions are the same as in case of active domain migration which is quite tight for an offline clone case. In case of clone we want to change uuid, MACs etc. Well the changes itself could be done by mgmt but this requires that libvirt drops the restictive checks for --xml option. What is your evaluation of this approach? Nikolay

2 2

[libvirt] [PATCH] qemu: Limit maximum block device I/O tune values
by Martin Kletzander 22 Apr '16

22 Apr '16

The values are currently limited to LLONG_MAX which causes some problems. QEMU conveniently changed their maximum to 1e15 (1 PB) which is enough for some time and we need to adapt to that so that we don't throw "Unknown error" messages. Strictly limiting these values actually fixes some corner case values (off-by-one checks in QEMU probably). Since values out of the new specified range do not overflow anything, change the type of error as well. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1317531 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_command.c | 30 +++++++++++++++--------------- src/qemu/qemu_command.h | 2 ++ src/qemu/qemu_driver.c | 6 +++--- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 2fb967acbfe8..ef4a62dafb5b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1394,22 +1394,22 @@ qemuBuildDriveStr(virConnectPtr conn, goto error; } - if (disk->blkdeviotune.total_bytes_sec > LLONG_MAX || - disk->blkdeviotune.read_bytes_sec > LLONG_MAX || - disk->blkdeviotune.write_bytes_sec > LLONG_MAX || - disk->blkdeviotune.total_iops_sec > LLONG_MAX || - disk->blkdeviotune.read_iops_sec > LLONG_MAX || - disk->blkdeviotune.write_iops_sec > LLONG_MAX || - disk->blkdeviotune.total_bytes_sec_max > LLONG_MAX || - disk->blkdeviotune.read_bytes_sec_max > LLONG_MAX || - disk->blkdeviotune.write_bytes_sec_max > LLONG_MAX || - disk->blkdeviotune.total_iops_sec_max > LLONG_MAX || - disk->blkdeviotune.read_iops_sec_max > LLONG_MAX || - disk->blkdeviotune.write_iops_sec_max > LLONG_MAX || - disk->blkdeviotune.size_iops_sec > LLONG_MAX) { - virReportError(VIR_ERR_OVERFLOW, + if (disk->blkdeviotune.total_bytes_sec > QEMU_BLOCK_IOTUNE_MAX || + disk->blkdeviotune.read_bytes_sec > QEMU_BLOCK_IOTUNE_MAX || + disk->blkdeviotune.write_bytes_sec > QEMU_BLOCK_IOTUNE_MAX || + disk->blkdeviotune.total_iops_sec > QEMU_BLOCK_IOTUNE_MAX || + disk->blkdeviotune.read_iops_sec > QEMU_BLOCK_IOTUNE_MAX || + disk->blkdeviotune.write_iops_sec > QEMU_BLOCK_IOTUNE_MAX || + disk->blkdeviotune.total_bytes_sec_max > QEMU_BLOCK_IOTUNE_MAX || + disk->blkdeviotune.read_bytes_sec_max > QEMU_BLOCK_IOTUNE_MAX || + disk->blkdeviotune.write_bytes_sec_max > QEMU_BLOCK_IOTUNE_MAX || + disk->blkdeviotune.total_iops_sec_max > QEMU_BLOCK_IOTUNE_MAX || + disk->blkdeviotune.read_iops_sec_max > QEMU_BLOCK_IOTUNE_MAX || + disk->blkdeviotune.write_iops_sec_max > QEMU_BLOCK_IOTUNE_MAX || + disk->blkdeviotune.size_iops_sec > QEMU_BLOCK_IOTUNE_MAX) { + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, _("block I/O throttle limit must " - "be less than %llu using QEMU"), LLONG_MAX); + "be less than %llu using QEMU"), QEMU_BLOCK_IOTUNE_MAX); goto error; } diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 2e2f133ac341..1e9ce6690603 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -40,6 +40,8 @@ # define QEMU_DRIVE_HOST_PREFIX "drive-" # define QEMU_FSDEV_HOST_PREFIX "fsdev-" +# define QEMU_BLOCK_IOTUNE_MAX 1000000000000000LL + VIR_ENUM_DECL(qemuVideo) char *qemuBuildObjectCommandlineFromJSON(const char *type, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 055f0714ddf3..90f541cf6d74 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17526,10 +17526,10 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, for (i = 0; i < nparams; i++) { virTypedParameterPtr param = &params[i]; - if (param->value.ul > LLONG_MAX) { - virReportError(VIR_ERR_OVERFLOW, + if (param->value.ul > QEMU_BLOCK_IOTUNE_MAX) { + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, _("block I/O throttle limit value must" - " be less than %llu"), LLONG_MAX); + " be less than %llu"), QEMU_BLOCK_IOTUNE_MAX); goto endjob; } -- 2.8.1

2 2

[libvirt] [PATCH v2] virconf: Handle conf file without ending newline
by Cole Robinson 21 Apr '16

21 Apr '16

$ echo -n 'log_level=1' > ~/.config/libvirt/libvirtd.conf $ libvirtd --timeout=10 2014-10-10 10:30:56.394+0000: 6626: info : libvirt version: 1.1.3.6, package: 1.fc20 (Fedora Project, 2014-09-08-17:50:42, buildvm-05.phx2.fedoraproject.org) 2014-10-10 10:30:56.394+0000: 6626: error : main:1261 : Can't load config file: configuration file syntax error: /home/rjones/.config/libvirt/libvirtd.conf:1: expecting a value: /home/rjones/.config/libvirt/libvirtd.conf Rather than try to fix this in the depths of the parser, just catch the case when a config file doesn't end in a newline, and manually append a newline to the content before parsing https://bugzilla.redhat.com/show_bug.cgi?id=1151409 --- v2: Properly NULL deliminate string (thanks pkrempa) Hey, there's a virconf test suite. Add a new test case src/util/virconf.c | 11 ++++++++++- tests/confdata/no-newline.conf | 1 + tests/confdata/no-newline.out | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 tests/confdata/no-newline.conf create mode 100644 tests/confdata/no-newline.out diff --git a/src/util/virconf.c b/src/util/virconf.c index 5915bc2..7c98588 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -765,7 +765,7 @@ virConfReadFile(const char *filename, unsigned int flags) { char *content; int len; - virConfPtr conf; + virConfPtr conf = NULL; VIR_DEBUG("filename=%s", NULLSTR(filename)); @@ -777,8 +777,17 @@ virConfReadFile(const char *filename, unsigned int flags) if ((len = virFileReadAll(filename, MAX_CONFIG_FILE_SIZE, &content)) < 0) return NULL; + if (len && len < MAX_CONFIG_FILE_SIZE && content[len - 1] != '\n') { + VIR_DEBUG("appending newline to busted config file %s", filename); + if (VIR_REALLOC_N(content, len + 1) < 0) + goto cleanup; + content[len++] = '\n'; + content[len] = '\0'; + } + conf = virConfParse(filename, content, len, flags); + cleanup: VIR_FREE(content); return conf; diff --git a/tests/confdata/no-newline.conf b/tests/confdata/no-newline.conf new file mode 100644 index 0000000..77e082e --- /dev/null +++ b/tests/confdata/no-newline.conf @@ -0,0 +1 @@ +log_level=1 \ No newline at end of file diff --git a/tests/confdata/no-newline.out b/tests/confdata/no-newline.out new file mode 100644 index 0000000..c001761 --- /dev/null +++ b/tests/confdata/no-newline.out @@ -0,0 +1 @@ +log_level = 1 -- 2.7.3

2 2

[libvirt] [PATCH] network: fix DHCPv6 on networks with prefix != 64
by Laine Stump 21 Apr '16

21 Apr '16

According to the dnsmasq manpage, the netmask for IPv4 address ranges will be auto-deteremined from the interface dnsmasq is listening on, but it can't do this for IPv6 for some reason - it instead assumes a network prefix of 64 for all IPv6 address ranges. If this is incorrect, dnsmasq will refuse to give out an address to clients, instead logging this message: dnsmasq-dhcp[2380]: no address range available for DHCPv6 request via virbr0 The solution is for libvirt to add ",$prefix" to all IPv6 dhcp-range arguments when building the dnsmasq.conf file. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1033739 --- src/network/bridge_driver.c | 21 +++++++++++++++++++-- tests/networkxml2confdata/dhcp6-nat-network.conf | 2 +- tests/networkxml2confdata/dhcp6-network.conf | 2 +- .../dhcp6host-routed-network.conf | 2 +- 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 73236ff..29c5feb 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1180,6 +1180,15 @@ networkDnsmasqConfContents(virNetworkObjPtr network, ipdef = ipv4def ? ipv4def : ipv6def; while (ipdef) { + int prefix; + + prefix = virNetworkIpDefPrefix(ipdef); + if (prefix < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("bridge '%s' has an invalid prefix"), + network->def->bridge); + goto cleanup; + } for (r = 0; r < ipdef->nranges; r++) { int thisRange; @@ -1187,8 +1196,12 @@ networkDnsmasqConfContents(virNetworkObjPtr network, !(eaddr = virSocketAddrFormat(&ipdef->ranges[r].end))) goto cleanup; - virBufferAsprintf(&configbuf, "dhcp-range=%s,%s\n", + virBufferAsprintf(&configbuf, "dhcp-range=%s,%s", saddr, eaddr); + if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET6)) + virBufferAsprintf(&configbuf, ",%d", prefix); + virBufferAddLit(&configbuf, "\n"); + VIR_FREE(saddr); VIR_FREE(eaddr); thisRange = virSocketAddrGetRange(&ipdef->ranges[r].start, @@ -1210,7 +1223,11 @@ networkDnsmasqConfContents(virNetworkObjPtr network, char *bridgeaddr = virSocketAddrFormat(&ipdef->address); if (!bridgeaddr) goto cleanup; - virBufferAsprintf(&configbuf, "dhcp-range=%s,static\n", bridgeaddr); + virBufferAsprintf(&configbuf, "dhcp-range=%s,static", + bridgeaddr); + if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET6)) + virBufferAsprintf(&configbuf, ",%d", prefix); + virBufferAddLit(&configbuf, "\n"); VIR_FREE(bridgeaddr); } diff --git a/tests/networkxml2confdata/dhcp6-nat-network.conf b/tests/networkxml2confdata/dhcp6-nat-network.conf index 922eb7a..17076b8 100644 --- a/tests/networkxml2confdata/dhcp6-nat-network.conf +++ b/tests/networkxml2confdata/dhcp6-nat-network.conf @@ -10,7 +10,7 @@ bind-dynamic interface=virbr0 dhcp-range=192.168.122.2,192.168.122.254 dhcp-no-override -dhcp-range=2001:db8:ac10:fd01::1:10,2001:db8:ac10:fd01::1:ff +dhcp-range=2001:db8:ac10:fd01::1:10,2001:db8:ac10:fd01::1:ff,64 dhcp-lease-max=493 dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2confdata/dhcp6-network.conf b/tests/networkxml2confdata/dhcp6-network.conf index 064515f..8270690 100644 --- a/tests/networkxml2confdata/dhcp6-network.conf +++ b/tests/networkxml2confdata/dhcp6-network.conf @@ -10,7 +10,7 @@ expand-hosts except-interface=lo bind-dynamic interface=virbr0 -dhcp-range=2001:db8:ac10:fd01::1:10,2001:db8:ac10:fd01::1:ff +dhcp-range=2001:db8:ac10:fd01::1:10,2001:db8:ac10:fd01::1:ff,64 dhcp-lease-max=240 dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2confdata/dhcp6host-routed-network.conf b/tests/networkxml2confdata/dhcp6host-routed-network.conf index ad6db36..5728ee4 100644 --- a/tests/networkxml2confdata/dhcp6host-routed-network.conf +++ b/tests/networkxml2confdata/dhcp6host-routed-network.conf @@ -10,7 +10,7 @@ bind-dynamic interface=virbr1 dhcp-range=192.168.122.1,static dhcp-no-override -dhcp-range=2001:db8:ac10:fd01::1,static +dhcp-range=2001:db8:ac10:fd01::1,static,64 dhcp-hostsfile=/var/lib/libvirt/dnsmasq/local.hostsfile addn-hosts=/var/lib/libvirt/dnsmasq/local.addnhosts enable-ra -- 2.5.5

2 1

[libvirt] [PATCH] docs: Use <code> inside <dt> for symbols
by Andrea Bolognani 21 Apr '16

21 Apr '16

Most of the time, the <dt> tag is used when providing documentation for a symbol; enclose symbols in <code> tags to style them appropriately. --- docs/auditlog.html.in | 142 +++++++++++++++++++++--------------------- docs/drvlxc.html.in | 16 ++--- docs/formatcaps.html.in | 26 ++++---- docs/formatdomain.html.in | 18 +++--- docs/formatdomaincaps.html.in | 32 +++++----- docs/locking.html.in | 6 +- docs/remote.html.in | 12 ++-- 7 files changed, 126 insertions(+), 126 deletions(-) diff --git a/docs/auditlog.html.in b/docs/auditlog.html.in index 8a007ca..012d068 100644 --- a/docs/auditlog.html.in +++ b/docs/auditlog.html.in @@ -57,13 +57,13 @@ </p> <dl> - <dt>pid</dt> + <dt><code>pid</code></dt> <dd>Process ID of the libvirtd daemon generating the audit record.</dd> - <dt>uid</dt> + <dt><code>uid</code></dt> <dd>User ID of the libvirtd daemon process generating the audit record.</dd> - <dt>subj</dt> + <dt><code>subj</code></dt> <dd>Security context of the libvirtd daemon process generating the audit record.</dd> - <dt>msg</dt> + <dt><code>msg</code></dt> <dd>String containing a list of key=value pairs specific to the type of audit record being reported.</dd> </dl> @@ -72,21 +72,21 @@ </p> <dl> - <dt>virt</dt> + <dt><code>virt</code></dt> <dd>Type of virtualization driver used. One of <code>qemu</code> or <code>lxc</code></dd> - <dt>vm</dt> + <dt><code>vm</code></dt> <dd>Host driver unique name of the guest</dd> - <dt>uuid</dt> + <dt><code>uuid</code></dt> <dd>Globally unique identifier for the guest</dd> - <dt>exe</dt> + <dt><code>exe</code></dt> <dd>Path of the libvirtd daemon</dd> - <dt>hostname</dt> + <dt><code>hostname</code></dt> <dd>Currently unused</dd> - <dt>addr</dt> + <dt><code>addr</code></dt> <dd>Currently unused</dd> - <dt>terminal</dt> + <dt><code>terminal</code></dt> <dd>Currently unused</dd> - <dt>res</dt> + <dt><code>res</code></dt> <dd>Result of the action, either <code>success</code> or <code>failed</code></dd> </dl> @@ -98,15 +98,15 @@ </p> <dl> - <dt>op</dt> + <dt><code>op</code></dt> <dd>Type of operation performed. One of <code>start</code>, <code>stop</code> or <code>init</code></dd> - <dt>reason</dt> + <dt><code>reason</code></dt> <dd>The reason which caused the operation to happen</dd> - <dt>vm-pid</dt> + <dt><code>vm-pid</code></dt> <dd>ID of the primary/leading process associated with the guest</dd> - <dt>init-pid</dt> + <dt><code>init-pid</code></dt> <dd>ID of the <code>init</code> process in a container. Only if <code>op=init</code> and <code>virt=lxc</code></dd> - <dt>pid-ns</dt> + <dt><code>pid-ns</code></dt> <dd>Namespace ID of the <code>init</code> process in a container. Only if <code>op=init</code> and <code>virt=lxc</code></dd> </dl> @@ -118,11 +118,11 @@ </p> <dl> - <dt>model</dt> + <dt><code>model</code></dt> <dd>The security driver type. One of <code>selinux</code> or <code>apparmor</code></dd> - <dt>vm-ctx</dt> + <dt><code>vm-ctx</code></dt> <dd>Security context for the guest process</dd> - <dt>img-ctx</dt> + <dt><code>img-ctx</code></dt> <dd>Security context for the guest disk images and other assigned host resources</dd> </dl> @@ -144,13 +144,13 @@ </p> <dl> - <dt>reason</dt> + <dt><code>reason</code></dt> <dd>The reason which caused the resource to be assigned to happen</dd> - <dt>resrc</dt> + <dt><code>resrc</code></dt> <dd>The type of resource assigned. Set to <code>vcpu</code></dd> - <dt>old-vcpu</dt> + <dt><code>old-vcpu</code></dt> <dd>Original vCPU count, or 0</dd> - <dt>new-vcpu</dt> + <dt><code>new-vcpu</code></dt> <dd>Updated vCPU count</dd> </dl> @@ -162,13 +162,13 @@ </p> <dl> - <dt>reason</dt> + <dt><code>reason</code></dt> <dd>The reason which caused the resource to be assigned to happen</dd> - <dt>resrc</dt> + <dt><code>resrc</code></dt> <dd>The type of resource assigned. Set to <code>mem</code></dd> - <dt>old-mem</dt> + <dt><code>old-mem</code></dt> <dd>Original memory size in bytes, or 0</dd> - <dt>new-mem</dt> + <dt><code>new-mem</code></dt> <dd>Updated memory size in bytes</dd> </dl> @@ -178,13 +178,13 @@ </p> <dl> - <dt>reason</dt> + <dt><code>reason</code></dt> <dd>The reason which caused the resource to be assigned to happen</dd> - <dt>resrc</dt> + <dt><code>resrc</code></dt> <dd>The type of resource assigned. Set to <code>disk</code></dd> - <dt>old-disk</dt> + <dt><code>old-disk</code></dt> <dd>Original host file or device path acting as the disk backing file</dd> - <dt>new-disk</dt> + <dt><code>new-disk</code></dt> <dd>Updated host file or device path acting as the disk backing file</dd> </dl> @@ -195,13 +195,13 @@ </p> <dl> - <dt>reason</dt> + <dt><code>reason</code></dt> <dd>The reason which caused the resource to be assigned to happen</dd> - <dt>resrc</dt> + <dt><code>resrc</code></dt> <dd>The type of resource assigned. Set to <code>net</code></dd> - <dt>old-net</dt> + <dt><code>old-net</code></dt> <dd>Original MAC address of the guest network interface</dd> - <dt>new-net</dt> + <dt><code>new-net</code></dt> <dd>Updated MAC address of the guest network interface</dd> </dl> @@ -211,13 +211,13 @@ </p> <dl> - <dt>reason</dt> + <dt><code>reason</code></dt> <dd>The reason which caused the resource to be assigned to happen</dd> - <dt>resrc</dt> + <dt><code>resrc</code></dt> <dd>The type of resource assigned. Set to <code>net</code></dd> - <dt>net</dt> + <dt><code>net</code></dt> <dd>MAC address of the host network interface</dd> - <dt>rdev</dt> + <dt><code>rdev</code></dt> <dd>Name of the host network interface</dd> </dl> @@ -227,13 +227,13 @@ </p> <dl> - <dt>reason</dt> + <dt><code>reason</code></dt> <dd>The reason which caused the resource to be assigned to happen</dd> - <dt>resrc</dt> + <dt><code>resrc</code></dt> <dd>The type of resource assigned. Set to <code>fs</code></dd> - <dt>old-fs</dt> + <dt><code>old-fs</code></dt> <dd>Original host directory, file or device path backing the filesystem </dd> - <dt>new-fs</dt> + <dt><code>new-fs</code></dt> <dd>Updated host directory, file or device path backing the filesystem</dd> </dl> @@ -243,15 +243,15 @@ </p> <dl> - <dt>reason</dt> + <dt><code>reason</code></dt> <dd>The reason which caused the resource to be assigned to happen</dd> - <dt>resrc</dt> + <dt><code>resrc</code></dt> <dd>The type of resource assigned. Set to <code>hostdev</code> or <code>dev</code></dd> - <dt>dev</dt> + <dt><code>dev</code></dt> <dd>The unique bus identifier of the USB, PCI or SCSI device, if <code>resrc=dev</code></dd> - <dt>disk</dt> + <dt><code>disk</code></dt> <dd>The path of the block device assigned to the guest, if <code>resrc=hostdev</code></dd> - <dt>chardev</dt> + <dt><code>chardev</code></dt> <dd>The path of the character device assigned to the guest, if <code>resrc=hostdev</code></dd> </dl> @@ -261,11 +261,11 @@ </p> <dl> - <dt>reason</dt> + <dt><code>reason</code></dt> <dd>The reason which caused the resource to be assigned to happen</dd> - <dt>resrc</dt> + <dt><code>resrc</code></dt> <dd>The type of resource assigned. Set to <code>tpm</code></dd> - <dt>device</dt> + <dt><code>device</code></dt> <dd>The path of the host TPM device assigned to the guest</dd> </dl> @@ -275,13 +275,13 @@ </p> <dl> - <dt>reason</dt> + <dt><code>reason</code></dt> <dd>The reason which caused the resource to be assigned to happen</dd> - <dt>resrc</dt> + <dt><code>resrc</code></dt> <dd>The type of resource assigned. Set to <code>rng</code></dd> - <dt>old-rng</dt> + <dt><code>old-rng</code></dt> <dd>Original path of the host entropy source for the RNG</dd> - <dt>new-rng</dt> + <dt><code>new-rng</code></dt> <dd>Updated path of the host entropy source for the RNG</dd> </dl> @@ -291,13 +291,13 @@ </p> <dl> - <dt>reason</dt> + <dt><code>reason</code></dt> <dd>The reason which caused the resource to be assigned to happen</dd> - <dt>resrc</dt> + <dt><code>resrc</code></dt> <dd>The type of resource assigned. Set to <code>chardev</code></dd> - <dt>old-chardev</dt> + <dt><code>old-chardev</code></dt> <dd>Original path of the backing character device for given emulated device</dd> - <dt>new-chardev</dt> + <dt><code>new-chardev</code></dt> <dd>Updated path of the backing character device for given emulated device</dd> </dl> @@ -307,15 +307,15 @@ </p> <dl> - <dt>reason</dt> + <dt><code>reason</code></dt> <dd>The reason which caused the resource to be assigned to happen</dd> - <dt>resrc</dt> + <dt><code>resrc</code></dt> <dd>The type of resource assigned. Set to <code>smartcard</code></dd> - <dt>old-smartcard</dt> + <dt><code>old-smartcard</code></dt> <dd>Original path of the backing character device, certificate store or "nss-smartcard-device" for host smartcard passthrough. </dd> - <dt>new-smartcard</dt> + <dt><code>new-smartcard</code></dt> <dd>Updated path of the backing character device, certificate store or "nss-smartcard-device" for host smartcard passthrough. </dd> @@ -327,13 +327,13 @@ </p> <dl> - <dt>reason</dt> + <dt><code>reason</code></dt> <dd>The reason which caused the resource to be assigned to happen</dd> - <dt>resrc</dt> + <dt><code>resrc</code></dt> <dd>The type of resource assigned. Set to <code>redir</code></dd> - <dt>bus</dt> + <dt><code>bus</code></dt> <dd>The bus type, only <code>usb</code> allowed</dd> - <dt>device</dt> + <dt><code>device</code></dt> <dd>The device type, only <code>USB redir</code> allowed</dd> </dl> @@ -344,11 +344,11 @@ </p> <dl> - <dt>reason</dt> + <dt><code>reason</code></dt> <dd>The reason which caused the resource to be assigned to happen</dd> - <dt>resrc</dt> + <dt><code>resrc</code></dt> <dd>The type of resource assigned. Set to <code>cgroup</code></dd> - <dt>cgroup</dt> + <dt><code>cgroup</code></dt> <dd>The name of the cgroup controller</dd> </dl> diff --git a/docs/drvlxc.html.in b/docs/drvlxc.html.in index d6c57c4..3dc9d59 100644 --- a/docs/drvlxc.html.in +++ b/docs/drvlxc.html.in @@ -80,15 +80,15 @@ to be provided by all container technologies on Linux. </p> <dl> -<dt>container</dt> +<dt><code>container</code></dt> <dd>The fixed string <code>libvirt-lxc</code> to identify libvirt as the creator</dd> -<dt>container_uuid</dt> +<dt><code>container_uuid</code></dt> <dd>The UUID assigned to the container by libvirt</dd> -<dt>PATH</dt> +<dt><code>PATH</code></dt> <dd>The fixed string <code>/bin:/usr/bin</code></dd> -<dt>TERM</dt> +<dt><code>TERM</code></dt> <dd>The fixed string <code>linux</code></dd> -<dt>HOME</dt> +<dt><code>HOME</code></dt> <dd>The fixed string <code>/</code></dd> </dl> @@ -98,11 +98,11 @@ environment variables are also provided </p> <dl> -<dt>LIBVIRT_LXC_NAME</dt> +<dt><code>LIBVIRT_LXC_NAME</code></dt> <dd>The name assigned to the container by libvirt</dd> -<dt>LIBVIRT_LXC_UUID</dt> +<dt><code>LIBVIRT_LXC_UUID</code></dt> <dd>The UUID assigned to the container by libvirt</dd> -<dt>LIBVIRT_LXC_CMDLINE</dt> +<dt><code>LIBVIRT_LXC_CMDLINE</code></dt> <dd>The unparsed command line arguments specified in the container configuration. Use of this is discouraged, in favour of passing arguments directly to the container init process via the <code>initarg</code> config element.</dd> diff --git a/docs/formatcaps.html.in b/docs/formatcaps.html.in index c187187..0ba567c 100644 --- a/docs/formatcaps.html.in +++ b/docs/formatcaps.html.in @@ -73,19 +73,19 @@ <dd>This expresses what kind of operating system the hypervisor is able to run. Possible values are: <dl> - <dt>xen</dt> + <dt><code>xen</code></dt> <dd>for XEN</dd> - <dt>linux</dt> + <dt><code>linux</code></dt> <dd>legacy alias for <code>xen</code></dd> - <dt>hvm</dt> + <dt><code>hvm</code></dt> <dd>Unmodified operating system</dd> - <dt>exe</dt> + <dt><code>exe</code></dt> <dd>Container based virtualization</dd> - <dt>uml</dt> + <dt><code>uml</code></dt> <dd>User Mode Linux</dd> </dl> </dd> @@ -97,37 +97,37 @@ <dd>This optional element encases possible features that can be used with a guest of described type. Possible subelements are: <dl> - <dt>pae</dt><dd>If present, 32-bit guests can use PAE + <dt><code>pae</code></dt><dd>If present, 32-bit guests can use PAE address space extensions, <span class="since">since 0.4.1</span></dd> - <dt>nonpae</dt><dd>If present, 32-bit guests can be run + <dt><code>nonpae</code></dt><dd>If present, 32-bit guests can be run without requiring PAE, <span class="since">since 0.4.1</span></dd> - <dt>ia64_be</dt><dd>If present, IA64 guests can be run in + <dt><code>ia64_be</code></dt><dd>If present, IA64 guests can be run in big-endian mode, <span class="since">since 0.4.1</span></dd> - <dt>acpi</dt><dd>If this element is present, + <dt><code>acpi</code></dt><dd>If this element is present, the <code>default</code> attribute describes whether the hypervisor exposes ACPI to the guest by default, and the <code>toggle</code> attribute describes whether the user can override this default. <span class="since">Since 0.4.1</span></dd> - <dt>apic</dt><dd>If this element is present, + <dt><code>apic</code></dt><dd>If this element is present, the <code>default</code> attribute describes whether the hypervisor exposes APIC to the guest by default, and the <code>toggle</code> attribute describes whether the user can override this default. <span class="since">Since 0.4.1</span></dd> - <dt>cpuselection</dt><dd>If this element is present, the + <dt><code>cpuselection</code></dt><dd>If this element is present, the hypervisor supports the <code><cpu></code> element within a domain definition for fine-grained control over the CPU presented to the guest. <span class="since">Since 0.7.5</span></dd> - <dt>deviceboot</dt><dd>If this element is present, + <dt><code>deviceboot</code></dt><dd>If this element is present, the <code><boot order='...'/></code> element can be used inside devices, rather than the older boot specification by category. <span class="since">Since 0.8.8</span></dd> - <dt>disksnapshot</dt><dd>If this element is present, + <dt><code>disksnapshot</code></dt><dd>If this element is present, the <code>default</code> attribute describes whether external disk snapshots are supported. If absent, external snapshots may still be supported, but it diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 895114b..a9c657d 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3331,17 +3331,17 @@ ...</pre> <dl> - <dt>lockspace</dt> + <dt><code>lockspace</code></dt> <dd>This is an arbitrary string, identifying the lockspace within which the key is held. Lock managers may impose extra restrictions on the format, or length of the lockspace name.</dd> - <dt>key</dt> + <dt><code>key</code></dt> <dd>This is an arbitrary string, uniquely identifying the lease to be acquired. Lock managers may impose extra restrictions on the format, or length of the key. </dd> - <dt>target</dt> + <dt><code>target</code></dt> <dd>This is the fully qualified path of the file associated with the lockspace. The offset specifies where the lease is stored within the file. If the lock manager does not @@ -3429,12 +3429,12 @@ "subsystem" and the <code>type</code> is one of the following values with additional attributes noted. <dl> - <dt>usb</dt> + <dt><code>usb</code></dt> <dd>USB devices are detached from the host on guest startup and reattached after the guest exits or the device is hot-unplugged. </dd> - <dt>pci</dt> + <dt><code>pci</code></dt> <dd>For PCI devices, when <code>managed</code> is "yes" it is detached from the host before being passed on to the guest and reattached to the host after the guest exits. If @@ -3445,7 +3445,7 @@ (or <code>virsh nodedev-reattach</code>) after hot-unplug or stopping the guest. </dd> - <dt>scsi</dt> + <dt><code>scsi</code></dt> <dd>For SCSI devices, user is responsible to make sure the device is not used by host. If supported by the hypervisor and OS, the optional <code>sgio</code> (<span class="since">since 1.0.6</span>) @@ -3472,7 +3472,7 @@ <dd>The source element describes the device as seen from the host using the following mechanism to describe: <dl> - <dt>usb</dt> + <dt><code>usb</code></dt> <dd>The USB device can either be addressed by vendor / product id using the <code>vendor</code> and <code>product</code> elements or by the device's address on the host using the @@ -3500,10 +3500,10 @@ </tr> </table> </dd> - <dt>pci</dt> + <dt><code>pci</code></dt> <dd>PCI devices can only be described by their <code>address</code>. </dd> - <dt>scsi</dt> + <dt><code>scsi</code></dt> <dd>SCSI devices are described by both the <code>adapter</code> and <code>address</code> elements. The <code>address</code> element includes a <code>bus</code> attribute (a 2-digit bus diff --git a/docs/formatdomaincaps.html.in b/docs/formatdomaincaps.html.in index 0c40321..edbb948 100644 --- a/docs/formatdomaincaps.html.in +++ b/docs/formatdomaincaps.html.in @@ -61,18 +61,18 @@ </domainCapabilities> </pre> <dl> - <dt>path</dt> + <dt><code>path</code></dt> <dd>The full path to the emulator binary.</dd> - <dt>domain</dt> + <dt><code>domain</code></dt> <dd>Describes the <a href="formatdomain.html#elements">virtualization type</a> (or so called domain type).</dd> - <dt>machine</dt> + <dt><code>machine</code></dt> <dd>The domain's <a href="formatdomain.html#elementsOSBIOS">machine type</a>.</dd> - <dt>arch</dt> + <dt><code>arch</code></dt> <dd>The domain's <a href="formatdomain.html#elementsOSBIOS"> architecture</a>.</dd> @@ -92,7 +92,7 @@ </pre> <dl> - <dt>vcpu</dt> + <dt><code>vcpu</code></dt> <dd>The maximum number of supported virtual CPUs</dd> </dl> @@ -126,18 +126,18 @@ <p>For the <code>loader</code> element, the following can occur:</p> <dl> - <dt>value</dt> + <dt><code>value</code></dt> <dd>List of known loader paths. Currently this is only used to advertise known locations of OVMF binaries for qemu. Binaries will only be listed if they actually exist on disk.</dd> - <dt>type</dt> + <dt><code>type</code></dt> <dd>Whether loader is a typical BIOS (<code>rom</code>) or an UEFI binary (<code>pflash</code>). This refers to <code>type</code> attribute of the <loader/> element.</dd> - <dt>readonly</dt> + <dt><code>readonly</code></dt> <dd>Options for the <code>readonly</code> attribute of the <loader/> element.</dd> </dl> @@ -207,11 +207,11 @@ </pre> <dl> - <dt>diskDevice</dt> + <dt><code>diskDevice</code></dt> <dd>Options for the <code>device</code> attribute of the <disk/> element.</dd> - <dt>bus</dt> + <dt><code>bus</code></dt> <dd>Options for the <code>bus</code> attribute of the <target/> element for a <disk/>.</dd> </dl> @@ -257,23 +257,23 @@ </pre> <dl> - <dt>mode</dt> + <dt><code>mode</code></dt> <dd>Options for the <code>mode</code> attribute of the <hostdev/> element.</dd> - <dt>startupPolicy</dt> + <dt><code>startupPolicy</code></dt> <dd>Options for the <code>startupPolicy</code> attribute of the <hostdev/> element.</dd> - <dt>subsysType</dt> + <dt><code>subsysType</code></dt> <dd>Options for the <code>type</code> attribute of the <hostdev/> element in case of <code>mode="subsystem"</code>.</dd> - <dt>capsType</dt> + <dt><code>capsType</code></dt> <dd>Options for the <code>type</code> attribute of the <hostdev/> element in case of <code>mode="capabilities"</code>.</dd> - <dt>pciBackend</dt> + <dt><code>pciBackend</code></dt> <dd>Options for the <code>name</code> attribute of the <driver/> element.</dd> </dl> @@ -313,7 +313,7 @@ <p>GIC capabilities are exposed under the <code>gic</code> element.</p> <dl> - <dt>version</dt> + <dt><code>version</code></dt> <dd>Options for the <code>version</code> attribute of the <code>gic</code> element.</dd> </dl> diff --git a/docs/locking.html.in b/docs/locking.html.in index c25ae85..aca1811 100644 --- a/docs/locking.html.in +++ b/docs/locking.html.in @@ -23,19 +23,19 @@ </p> <dl> - <dt>nop</dt> + <dt><code>nop</code></dt> <dd>This is a "no op" implementation which does absolutely nothing. This can be used if mutual exclusion between virtual machines is not required, or if it is being solved at another level in the management stack.</dd> - <dt><a href="locking-lockd.html">lockd</a></dt> + <dt><code><a href="locking-lockd.html">lockd</a></code></dt> <dd>This is the current preferred implementation shipped with libvirt. It uses the <code>virtlockd</code> daemon to manage locks using the POSIX fcntl() advisory locking capability. As such it requires a shared filesystem of some kind be accessible to all hosts which share the same image storage.</dd> - <dt><a href="locking-sanlock.html">sanlock</a></dt> + <dt><code><a href="locking-sanlock.html">sanlock</a></code></dt> <dd>This is an alternative implementation preferred by the oVirt project. It uses a disk paxos algorithm for maintaining continuously renewed leases. In the default diff --git a/docs/remote.html.in b/docs/remote.html.in index dc9b354..ace1577 100644 --- a/docs/remote.html.in +++ b/docs/remote.html.in @@ -102,7 +102,7 @@ much slower than, say, direct hypervisor calls. </li> Remote libvirt supports a range of transports: </p> <dl> - <dt> tls </dt> + <dt><code>tls</code></dt> <dd><a href="http://en.wikipedia.org/wiki/Transport_Layer_Security" title="Transport Layer Security">TLS</a> 1.0 (SSL 3.1) authenticated and encrypted TCP/IP socket, usually listening on a public port number. To use this you will need to @@ -110,7 +110,7 @@ Remote libvirt supports a range of transports: server certificates</a>. The standard port is 16514. </dd> - <dt> unix </dt> + <dt><code>unix</code></dt> <dd> Unix domain socket. Since this is only accessible on the local machine, it is not encrypted, and uses Unix permissions or SELinux for authentication. @@ -119,7 +119,7 @@ Remote libvirt supports a range of transports: <code>/var/run/libvirt/libvirt-sock-ro</code> (the latter for read-only connections). </dd> - <dt> ssh </dt> + <dt><code>ssh</code></dt> <dd> Transported over an ordinary <a href="http://www.openssh.com/" title="OpenSSH homepage">ssh (secure shell)</a> connection. @@ -130,15 +130,15 @@ Remote libvirt supports a range of transports: <a href="http://mah.everybody.org/docs/ssh" title="Using ssh-agent with ssh">ssh-agent</a>) otherwise programs which use this transport will stop to ask for a password. </dd> - <dt> ext </dt> + <dt><code>ext</code></dt> <dd> Any external program which can make a connection to the remote machine by means outside the scope of libvirt. </dd> - <dt> tcp </dt> + <dt><code>tcp</code></dt> <dd> Unencrypted TCP/IP socket. Not recommended for production use, this is normally disabled, but an administrator can enable it for testing or use over a trusted network. The standard port is 16509. </dd> - <dt> libssh2 </dt> + <dt><code>libssh2</code></dt> <dd> Transport over the SSH protocol using <a href="http://libssh2.org/" title="libssh2 homepage">libssh2</a> instead of the OpenSSH binary. This transport uses the libvirt authentication callback for -- 2.5.5

2 1

[libvirt] [PATCH] virconf: Handle conf file without ending newline
by Cole Robinson 21 Apr '16

21 Apr '16

$ echo -n 'log_level=1' > ~/.config/libvirt/libvirtd.conf $ libvirtd --timeout=10 2014-10-10 10:30:56.394+0000: 6626: info : libvirt version: 1.1.3.6, package: 1.fc20 (Fedora Project, 2014-09-08-17:50:42, buildvm-05.phx2.fedoraproject.org) 2014-10-10 10:30:56.394+0000: 6626: error : main:1261 : Can't load config file: configuration file syntax error: /home/rjones/.config/libvirt/libvirtd.conf:1: expecting a value: /home/rjones/.config/libvirt/libvirtd.conf Rather than try to fix this in the depths of the parser, just catch the case when a config file doesn't end in a newline, and manually append a newline to the content before parsing https://bugzilla.redhat.com/show_bug.cgi?id=1151409 --- src/util/virconf.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/util/virconf.c b/src/util/virconf.c index 5915bc2..9b19d54 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -765,7 +765,7 @@ virConfReadFile(const char *filename, unsigned int flags) { char *content; int len; - virConfPtr conf; + virConfPtr conf = NULL; VIR_DEBUG("filename=%s", NULLSTR(filename)); @@ -777,8 +777,16 @@ virConfReadFile(const char *filename, unsigned int flags) if ((len = virFileReadAll(filename, MAX_CONFIG_FILE_SIZE, &content)) < 0) return NULL; + if (len && len < MAX_CONFIG_FILE_SIZE && content[len - 1] != '\n') { + VIR_DEBUG("appending newline to busted config file %s", filename); + if (VIR_REALLOC_N(content, len + 1) < 0) + goto cleanup; + content[len++] = '\n'; + } + conf = virConfParse(filename, content, len, flags); + cleanup: VIR_FREE(content); return conf; -- 2.7.3

2 2

[libvirt] [PATCH 00/14] conf: disk: Continue refactoring of virDomainDiskDefParseXML
by Peter Krempa 21 Apr '16

21 Apr '16

This is yet another dump of my quest to despaghettize virDomainDiskDefParseXML. My eyes are starting to bleed a bit less, but there's still a lot of patches to come. Peter Krempa (14): conf: disk: Extract verification of disk config conf: disk: Split out parsing of disk <driver> element conf: disk: Avoid temporary variable when parsing driver name conf: disk: Sanitize parsing of disk format conf: disk: Mark VIR_DOMAIN_DISK_IO_DEFAULT as 0 and simplify parsing conf: disk: Remove custom single-use temporary variables conf: disk: Extract disk type and device right away conf: disk: Initialize closed device tray state to 0 conf: disk: Don't bother setting removable state to 0 by default conf: disk: extract sgio/rawio validation conf: disk: Extract verification of disk tray conf: disk: Move validation of disk bus vs disk type conf: disk: Extract checking of removable status conf: disk: extract validation of startup policy src/conf/domain_conf.c | 452 ++++++++++++++++++++++++------------------------- src/conf/domain_conf.h | 4 +- 2 files changed, 221 insertions(+), 235 deletions(-) -- 2.8.1

2 28

[libvirt] [PATCH 0/4] Introduce big test mock
by Michal Privoznik 21 Apr '16

21 Apr '16

What? Big test mock that checks all our file accesses whether we are touching anything outside $srcdir or $builddir. Why? Because it has happened in the past (and is happening even now as you'll see later) that our test suite produces nondeterministic results because of a file in live system being accessible or having some specific value. How? Well, this is merely introducing a mock library that every C program on Linux will use. I'm not aware of any approach for our shell tests. The mock library then collects all the paths outside $srcdir or $builddir and prints them into a file. The file is then checked against a white list, because some accesses might be desirable. Unfortunately, as you'll learn in the 4/4 commit message, I was unable to wire this up to 'make check' so this is accessible under 'make check-access' target. If there's some access outside aforementioned directories, the path will be printed out. So far there is plenty of them. For instance, in qemuxml2argvtest we are checking /proc/sys/crypto/fips_enabled for each test. Ouch. What's left to do? a) Enhance white list b) Wire this up to 'check' c) Test d) Review Michal Privoznik (4): seclabeltest: Update to use VIRT_TEST_MAIN tests: Introduce global mock library virtestmock: Print invalid file accesses into a file tests: Introduce check-file-access.pl .gitignore | 1 + HACKING | 11 ++ Makefile.am | 3 + cfg.mk | 8 +- docs/hacking.html.in | 15 +++ tests/Makefile.am | 28 +++- tests/check-file-access.pl | 106 +++++++++++++++ tests/file_access_whitelist.txt | 19 +++ tests/seclabeltest.c | 7 +- tests/testutils.c | 58 ++++++++- tests/testutils.h | 29 +---- tests/vircgroupmock.c | 6 +- tests/virpcimock.c | 6 +- tests/virtestmock.c | 279 ++++++++++++++++++++++++++++++++++++++++ 14 files changed, 535 insertions(+), 41 deletions(-) create mode 100755 tests/check-file-access.pl create mode 100644 tests/file_access_whitelist.txt create mode 100644 tests/virtestmock.c -- 2.7.3

2 6

[libvirt] [PATCH] build: Fix default network generation on FreeBSD
by Andrea Bolognani 21 Apr '16

21 Apr '16

FreeBSD's sed(1) doesn't support using "\n" to insert a newline, so the installed default.xml file ends up containing a literal "n" between tags; to work around this problem, add a tr(1) invocation as suggested by the sed FAQ[1]. [1] http://sed.sourceforge.net/sedfaq4.html (4.1 c) --- src/Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index c639e37..f020545 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3072,8 +3072,9 @@ if WITH_NETWORK $(INSTALL_DATA) $(srcdir)/network/default.xml \ $(DESTDIR)$(confdir)/qemu/networks/default.xml test -z "$(UUID)" || \ - { sed -e "s,</name>,</name>\n <uuid>$(UUID)</uuid>," \ - $(DESTDIR)$(confdir)/qemu/networks/default.xml > \ + { sed -e "s,</name>,</name>; <uuid>$(UUID)</uuid>," \ + $(DESTDIR)$(confdir)/qemu/networks/default.xml | \ + tr ";" "\n" > \ $(DESTDIR)$(confdir)/qemu/networks/default.xml.t && \ cp $(DESTDIR)$(confdir)/qemu/networks/default.xml.t \ $(DESTDIR)$(confdir)/qemu/networks/default.xml && \ -- 2.5.5

2 2

[libvirt] [PATCH] docs: Update style for <dt> elements
by John Ferlan 21 Apr '16

21 Apr '16

Add bolding for <dt> elements to make them "stick out" on the page rather that just a stream of text where the <dt> elements only differ by slightly different font style since most uses encase the text within using <code> Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- I had suggested this during a review of Andrea's changes late last month: http://www.redhat.com/archives/libvir-list/2016-March/msg01501.html but figure I'll make the more 'formal' patch request... docs/generic.css | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/generic.css b/docs/generic.css index 208e31e..b86bb88 100644 --- a/docs/generic.css +++ b/docs/generic.css @@ -25,6 +25,7 @@ ul, ol { dt { margin-left: 1em; margin-right: 2em; + font-weight: bold; } dl dd { -- 2.5.5

2 3

[libvirt] [PATCH] tools: Fix connect command
by Martin Kletzander 21 Apr '16

21 Apr '16

The man page says: "(Re)-Connect to the hypervisor. When the shell is first started, this is automatically run with the URI parameter requested by the "-c" option on the command line." However, if you run: virsh -c 'test://default' 'connect; uri' the output will not be 'test://default'. That's because the 'connect' command does not care about any virsh-only related settings and if it is run without parameters, it connects with @uri == NULL. Not only that doesn't comply to what the man page describes, but it also doesn't make sense. It also means you aren't able to reconnect to whatever you are connected currently. So let's fix that in both virsh and virt-admin add a test case for it. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- tests/test-lib.sh | 6 ++++++ tests/virsh-uriprecedence | 54 +++++++++++++++++++++++++++++++++++------------ tools/virsh.c | 6 ++++-- tools/virt-admin.c | 6 ++++-- 4 files changed, 55 insertions(+), 17 deletions(-) diff --git a/tests/test-lib.sh b/tests/test-lib.sh index 8e0ce83e118c..49e8d2209572 100644 --- a/tests/test-lib.sh +++ b/tests/test-lib.sh @@ -232,6 +232,12 @@ if test -n "$VIR_TEST_DEBUG" || test -n "$VIR_TEST_VERBOSE" ; then verbose=1 fi +debug() { :; } + +if test "$VIR_TEST_DEBUG" = "2"; then + debug() { echo "$@"; } +fi + # This is a stub function that is run upon trap (upon regular exit and # interrupt). Override it with a per-test function, e.g., to unmount # a partition, or to undo any other global state changes. diff --git a/tests/virsh-uriprecedence b/tests/virsh-uriprecedence index f9e325658900..4bcce3aeb08f 100755 --- a/tests/virsh-uriprecedence +++ b/tests/virsh-uriprecedence @@ -8,7 +8,8 @@ test_intro "virsh-uriprecedence" virsh_bin="$abs_top_builddir/tools/virsh" -counter=1 +virsh_cmd="$virsh_bin" +counter=0 ret=0 cleanup_() { rm -rf "$tmphome"; } @@ -23,16 +24,44 @@ mkdir -p "$XDG_CONFIG_HOME/libvirt" "$XDG_CONFIG_HOME/virsh" mkdir -p "$XDG_CACHE_HOME/libvirt" "$XDG_CACHE_HOME/virsh" mkdir -p "$XDG_RUNTIME_HOME/libvirt" "$XDG_RUNTIME_HOME/virsh" -# Main function checking for the proper uri being returned +is_uri_good() +{ + echo "$1" | grep -q -F "$good_uri" +} + +test_uri_internal() +{ + test_name=$1 + test_cmd="$virsh_cmd \"$2\"" + result=0 + + debug "Running '$test_cmd'" + out="$($virsh_cmd "$2")" + + if ! is_uri_good "$out"; then + debug "Invalid output: '$out'" + result=1 + ret=1 + fi + + counter="$((counter+1))" + test_result "$counter" "$1" "$result" +} + +test_uri_connect() +{ + test_uri_internal "$1" "connect; uri" +} + +test_uri_noconnect() +{ + test_uri_internal "$1" "uri" +} + test_uri() { - result=0 - if [ "$($virsh_bin uri)" != "$good_uri" ]; then - result=1 - ret=1 - fi - test_result "$counter" "$1" "$result" - counter="$((counter+1))" + test_uri_connect "$1" + test_uri_noconnect "$1" } # Precedence is the following (lowest priority first): @@ -57,6 +86,7 @@ good_uri="test:///default?good_uri" printf "uri_default=\"%s\"\n" "$good_uri" >"$XDG_CONFIG_HOME/libvirt/libvirt.conf" if uid_is_privileged_; then + counter="$((counter+1))" test_skip_case "$counter" "User config file" "must not be run as root" else test_uri "User config file" @@ -71,10 +101,8 @@ export VIRSH_DEFAULT_CONNECT_URI="$good_uri" test_uri "VIRSH_DEFAULT_CONNECT_URI" export VIRSH_DEFAULT_CONNECT_URI="$bad_uri" -virsh_bin="$virsh_bin --connect $good_uri" +virsh_cmd="$virsh_bin --connect $good_uri" test_uri "Parameter" -# test_uri() increases $counter even for the last test, so we must -# decrement it -test_final "$((counter-1))" "$ret" +test_final "$counter" "$ret" (exit "$ret"); exit "$ret" diff --git a/tools/virsh.c b/tools/virsh.c index 366956cd5c75..d17aaf0be8ea 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -306,11 +306,13 @@ cmdConnect(vshControl *ctl, const vshCmd *cmd) priv->conn = NULL; } - VIR_FREE(ctl->connname); if (vshCommandOptStringReq(ctl, cmd, "name", &name) < 0) return false; - ctl->connname = vshStrdup(ctl, name); + if (name) { + VIR_FREE(ctl->connname); + ctl->connname = vshStrdup(ctl, name); + } priv->useGetInfo = false; priv->useSnapshotOld = false; diff --git a/tools/virt-admin.c b/tools/virt-admin.c index 22160ad929d0..4275aa37a1bf 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -291,8 +291,10 @@ cmdConnect(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "name", &name) < 0) return false; - VIR_FREE(ctl->connname); - ctl->connname = vshStrdup(ctl, name); + if (name) { + VIR_FREE(ctl->connname); + ctl->connname = vshStrdup(ctl, name); + } vshAdmReconnect(ctl); if (!connected) -- 2.8.1

2 1

[libvirt] [PATCH] tests: Use system() for test-wrap-argv.pl
by Cole Robinson 21 Apr '16

21 Apr '16

virCommand doesn't buy us anything here, and this simplifies the code. There's another usage of system() in testutils.c already FWIW, though it predates virCommand --- Had this sitting in a branch from an earlier discussion... I figure system() is safe in the test suite but I'm not going to argue if someone feels strongly the other way tests/testutils.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/tests/testutils.c b/tests/testutils.c index 79d0763..7664b06 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -432,28 +432,14 @@ virtTestCaptureProgramOutput(const char *const argv[] ATTRIBUTE_UNUSED, static int virTestRewrapFile(const char *filename) { - int ret = -1; - char *outbuf = NULL; - char *script = NULL; - virCommandPtr cmd = NULL; - - if (virAsprintf(&script, "%s/test-wrap-argv.pl", abs_srcdir) < 0) - goto cleanup; - - cmd = virCommandNewArgList(script, filename, NULL); - virCommandSetOutputBuffer(cmd, &outbuf); - if (virCommandRun(cmd, NULL) < 0) - goto cleanup; + char *cmd; - if (virFileWriteStr(filename, outbuf, 0666) < 0) - goto cleanup; + /* The 'echo' syntax lets us read and write the file in one shot */ + if (virAsprintf(&cmd, "echo \"$(%s/test-wrap-argv.pl %s)\" > %s", + abs_srcdir, filename, filename) < 0) + return -1; - ret = 0; - cleanup: - VIR_FREE(script); - virCommandFree(cmd); - VIR_FREE(outbuf); - return ret; + return system(cmd); } /** -- 2.7.3

5 5

[libvirt] [PATCH] lxc: explicitly error on interface type=ethernet
by Cole Robinson 21 Apr '16

21 Apr '16

It isn't implemented and does not work: error: internal error: guest failed to start: /usr/lib/libvirt/libvirt_lxc: option '--veth' requires an argument syntax: /usr/lib/libvirt/libvirt_lxc [OPTIONS] ... We previously threw an explicit error, but this changed in 22cff52a2b8e06c913b1f97767e5d390fb17fc3b , which I suspect was untested for LXC --- src/lxc/lxc_process.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 5e0bbe2..0044ee5 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -559,8 +559,6 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn, break; case VIR_DOMAIN_NET_TYPE_ETHERNET: - break; - case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_VHOSTUSER: case VIR_DOMAIN_NET_TYPE_SERVER: -- 2.7.3

3 4

[libvirt] [libvirt-glib] events: Mark 'eventlock' as static
by Christophe Fergeau 21 Apr '16

21 Apr '16

It's not used outside of the libvirt-glib-event.c file, so there is no good reason for not having it static. As it was not listed in libvirt-glib.sym, this will make no change to the publicly exported symbols (ie this is not an ABI change). --- libvirt-glib/libvirt-glib-event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-glib/libvirt-glib-event.c b/libvirt-glib/libvirt-glib-event.c index f8227d6..4548aa6 100644 --- a/libvirt-glib/libvirt-glib-event.c +++ b/libvirt-glib/libvirt-glib-event.c @@ -110,7 +110,7 @@ struct gvir_event_timeout virFreeCallback ff; }; -GMutex *eventlock = NULL; +static GMutex *eventlock = NULL; static int nextwatch = 1; static GPtrArray *handles; -- 2.5.0

1 1

[libvirt] [PATCH 0/4] Fix python sanity check after moving typedParam stuff to libvirt-common.h
by Peter Krempa 21 Apr '16

21 Apr '16

Fixes the following breakage: Cannot get a value of enum VIR_TYPED_PARAM_BOOLEAN (originally VIR_DOMAIN_BLKIO_PARAM_BOOLEAN) Cannot get a value of enum VIR_TYPED_PARAM_DOUBLE (originally VIR_DOMAIN_BLKIO_PARAM_DOUBLE) Cannot get a value of enum VIR_TYPED_PARAM_INT (originally VIR_DOMAIN_BLKIO_PARAM_INT) ... Peter Krempa (4): include: common: Fix file header for apibuild.py apibuild: Allow completely skipping certain macros api: Generate docs for libvirt-common.h include: common: Fix function formatting docs/Makefile.am | 1 + docs/apibuild.py | 12 +++ docs/sitemap.html.in | 4 + include/libvirt/libvirt-common.h.in | 173 ++++++++++++++++-------------------- 4 files changed, 95 insertions(+), 95 deletions(-) -- 2.8.1

2 7

[libvirt] [PATCH 0/2] virsh: perf: Trivial fixes of a memleak and coding style
by Peter Krempa 21 Apr '16

21 Apr '16

Both are pushed under the trivial rule. Peter Krempa (2): virsh: perf: Don't leak domain virsh: perf: Remove unnecessary 'error' label tools/virsh-domain.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) -- 2.8.1

2 3

[libvirt] [PATCH 0/9] Admin API: Introduce client listing API
by Erik Skultety 21 Apr '16

21 Apr '16

This series introduces API to list all clients connected to a specific server. Clients are now identified by 64-bit wide IDs and store their connection timestamp. Along with these attributes, transport type of the connection is returned back to the caller as well. Erik Skultety (9): rpc: virnetserverclient: Identify clients by an integer ID rpc: virnetserverclient: Introduce new attribute conn_time to client admin: Introduce virAdmClient client-side object rpc: gendispatch: Tune it to support client structure rpc: virnetserver: Support retrieval of a list of clients include: admin: export connection transport constants rpc: virnetserverclient: Implement client connection transport retrieval admin: Introduce listing clients virt-admin: Introduce srv-clients-list command daemon/admin.c | 15 +++ daemon/admin_server.c | 24 ++++ daemon/admin_server.h | 4 + daemon/libvirtd.c | 4 +- include/libvirt/libvirt-admin.h | 36 ++++++ src/admin/admin_protocol.x | 29 ++++- src/admin/admin_remote.c | 6 + src/admin_protocol-structs | 19 +++ src/datatypes.c | 35 +++++ src/datatypes.h | 47 +++++++ src/libvirt-admin.c | 131 +++++++++++++++++++ src/libvirt_admin_private.syms | 3 + src/libvirt_admin_public.syms | 5 + src/libvirt_remote.syms | 2 + src/locking/lock_daemon.c | 2 +- src/logging/log_daemon.c | 2 +- src/lxc/lxc_controller.c | 2 +- src/rpc/gendispatch.pl | 61 +++++++-- src/rpc/virnetserver.c | 64 +++++++++- src/rpc/virnetserver.h | 6 + src/rpc/virnetserverclient.c | 106 ++++++++++++++-- src/rpc/virnetserverclient.h | 10 +- tests/Makefile.am | 7 + tests/virnetdaemondata/input-data-client-ids.json | 69 ++++++++++ .../input-data-client-timestamp.json | 71 +++++++++++ .../virnetdaemondata/output-data-admin-nomdns.json | 6 + .../output-data-admin-server-names.json | 6 + .../virnetdaemondata/output-data-anon-clients.json | 3 + tests/virnetdaemondata/output-data-client-ids.json | 69 ++++++++++ .../output-data-client-timestamp.json | 71 +++++++++++ .../output-data-initial-nomdns.json | 3 + tests/virnetdaemondata/output-data-initial.json | 3 + .../output-data-no-keepalive-required.json | 6 + tests/virnetdaemonmock.c | 34 +++++ tests/virnetdaemontest.c | 13 +- tests/virnetserverclienttest.c | 2 +- tools/virt-admin.c | 141 +++++++++++++++++++++ tools/virt-admin.pod | 7 + 38 files changed, 1085 insertions(+), 39 deletions(-) create mode 100644 tests/virnetdaemondata/input-data-client-ids.json create mode 100644 tests/virnetdaemondata/input-data-client-timestamp.json create mode 100644 tests/virnetdaemondata/output-data-client-ids.json create mode 100644 tests/virnetdaemondata/output-data-client-timestamp.json create mode 100644 tests/virnetdaemonmock.c -- 2.4.11

1 9

[libvirt] [PATCH v6 0/5] vz: add migration support
by Nikolay Shirokovskiy 21 Apr '16

21 Apr '16

Difference from v5 ================== 1. managed case is implemented 2. p2p follows managed migration flow now 3. 'vz: fix const correctness case' is needed to implement managed case. 4. misc options that are always on for vz (--live, --compressed) are not required to be set explicitly. 5. --offline is not supported anymore but migration of inactive domains is possible without this option set. Nikolay Shirokovskiy (5): vz: save session uuid on login vz: fix const correctness case vz: implement managed migration vz: implement p2p migration vz: cleanup: define vz format of uuids src/vz/vz_driver.c | 555 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/vz/vz_sdk.c | 89 +++++++-- src/vz/vz_sdk.h | 6 + src/vz/vz_utils.c | 2 +- src/vz/vz_utils.h | 6 +- 5 files changed, 641 insertions(+), 17 deletions(-) -- 1.8.3.1

2 7

[libvirt] [PATCH] Bump minimum libvirt requirement to 1.2.13
by Christophe Fergeau 21 Apr '16

21 Apr '16

libvirt-php uses VIR_STORAGE_VOL_CREATE_REFLINK which was introduced in commit v1.2.12-18-g95da191 (so first available in the 1.2.13 release). --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 7a634ca..bce3de2 100644 --- a/configure.ac +++ b/configure.ac @@ -39,7 +39,7 @@ if test "$prefix" = "/usr" && test "$sysconfdir" = '${prefix}/etc' ; then sysconfdir='/etc' fi -LIBVIRT_REQUIRED=1.2.9 +LIBVIRT_REQUIRED=1.2.13 PKG_CHECK_MODULES(LIBVIRT, libvirt >= $LIBVIRT_REQUIRED) PKG_CHECK_MODULES(QEMU, libvirt-qemu) AC_SUBST([QEMU_CFLAGS]) -- 2.5.5

4 6

[libvirt] [libvirt-php][PATCH 0/4] Fix build again
by Michal Privoznik 21 Apr '16

21 Apr '16

There were some problems with my build fixes. Hopefully, these will make it work for everybody again. Michal Privoznik (4): Get php cflags at configure Get rid of $DEFINES src: Distribute config.m4 libvirt-php.so: Avoid versioning library configure.ac | 5 +++++ src/Makefile.am | 13 ++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) -- 2.7.3

2 10

[libvirt] [PATCH 0/3] Perform some minor rather cosmetic adjustments to tests
by Erik Skultety 21 Apr '16

21 Apr '16

When I was adding new admin related tests, I noticed that we have some test data leftovers in the repo, as well as having a test that isn't enabled, although it should be and that we still have some JSON test data using tabs for indentation...my bad, I got through the log history only to see that when I merged a patch to fix this, I failed to do it properly. Erik Skultety (3): tests: remove virnetservertest data leftovers tests: virnetdaemon: Replace tabs with spaces tests: virnetdaemontest: Enable testing for no-keepalive-required .../input-data-admin-server-names.json | 204 +++++++++---------- .../output-data-no-keepalive-required.json | 224 ++++++++++----------- tests/virnetdaemontest.c | 1 + .../input-data-initial-nomdns.json | 61 ------ .../output-data-initial-nomdns.json | 62 ------ 5 files changed, 215 insertions(+), 337 deletions(-) delete mode 100644 tests/virnetserverdata/input-data-initial-nomdns.json delete mode 100644 tests/virnetserverdata/output-data-initial-nomdns.json -- 2.4.11

2 5

[libvirt] [PATCH] virsh: re-fix help printing without connection
by Roman Bogorodskiy 21 Apr '16

21 Apr '16

Re-do 0217089 so it does not add regression for commit c0726e0 that allowed to print help without making a connection to the daemon. --- tools/virsh.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index e14410b..366956c 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -962,14 +962,16 @@ main(int argc, char **argv) if (!vshInit(ctl, cmdGroups, NULL)) exit(EXIT_FAILURE); - ctl->connname = vshStrdup(ctl, virGetEnvBlockSUID("VIRSH_DEFAULT_CONNECT_URI")); - if (!virshParseArgv(ctl, argc, argv) || !virshInit(ctl)) { virshDeinit(ctl); exit(EXIT_FAILURE); } + if (!ctl->connname) + ctl->connname = vshStrdup(ctl, + virGetEnvBlockSUID("VIRSH_DEFAULT_CONNECT_URI")); + if (!ctl->imode) { ret = vshCommandRun(ctl, ctl->cmd); } else { -- 2.7.4

2 2

[libvirt] Release of libvirt-php-0.5.2
by Michal Privoznik 21 Apr '16

21 Apr '16

After 5 months of development I'm more than proud to announce that libvirt-php-0.5.2 is out!It can be downloaded from http://libvirt.org/sources/php/libvirt-php-0.5.2.tar.gz This release focused on adapting to PHP7 and yet again some more bug fixes. The diff stat is rather big, but that's mostly because of all the documentation that has been added to PHP functions that we expose. I'd like to thank everybody who participated, namely Neal and Remi for proposing their patches and testing mine, Vasiliy for his valuable input. Lets make the next release even better! Michal

3 4

[libvirt] [PATCH] virsh: don't override connection URI from argv
by Roman Bogorodskiy 21 Apr '16

21 Apr '16

Currently, if a connection URI was specified on the command line by the '-c' switch, virsh connects to it, but after connecting overrides its value with the one it tries to obtain from the VIRSH_DEFAULT_CONNECT_URI environment variable. This makes virsh connecting to the wrong URI if it disconnects from the hypervisor and then tries to reconnect, and also leaks the original connname. Fix by calling virGetEnvBlockSUID() before virshParseArgv(). --- tools/virsh.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 0d8ec5c..e14410b 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -962,14 +962,14 @@ main(int argc, char **argv) if (!vshInit(ctl, cmdGroups, NULL)) exit(EXIT_FAILURE); + ctl->connname = vshStrdup(ctl, virGetEnvBlockSUID("VIRSH_DEFAULT_CONNECT_URI")); + if (!virshParseArgv(ctl, argc, argv) || !virshInit(ctl)) { virshDeinit(ctl); exit(EXIT_FAILURE); } - ctl->connname = vshStrdup(ctl, virGetEnvBlockSUID("VIRSH_DEFAULT_CONNECT_URI")); - if (!ctl->imode) { ret = vshCommandRun(ctl, ctl->cmd); } else { -- 2.7.4

3 4

[libvirt] [PATCH] virsh: blockcopy: force an absolute path
by Cole Robinson 21 Apr '16

21 Apr '16

virsh doesn't reject or absolutify a passed relative path, which can give unexpected results. Convert a relative path to an absolute one before calling the API https://bugzilla.redhat.com/show_bug.cgi?id=1300177 --- tools/virsh-domain.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index a1d4a75..7074ded 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -2256,8 +2256,9 @@ static bool cmdBlockCopy(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom = NULL; - const char *dest = NULL; + const char *dest_cli = NULL; const char *format = NULL; + char *dest = NULL; unsigned long bandwidth = 0; unsigned int granularity = 0; unsigned long long buf_size = 0; @@ -2281,7 +2282,7 @@ cmdBlockCopy(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "path", &path) < 0) return false; - if (vshCommandOptStringReq(ctl, cmd, "dest", &dest) < 0) + if (vshCommandOptStringReq(ctl, cmd, "dest", &dest_cli) < 0) return false; if (vshCommandOptStringReq(ctl, cmd, "xml", &xml) < 0) return false; @@ -2308,6 +2309,11 @@ cmdBlockCopy(vshControl *ctl, const vshCmd *cmd) if (async) abort_flags |= VIR_DOMAIN_BLOCK_JOB_ABORT_ASYNC; + if (dest_cli && virFileAbsPath(dest_cli, &dest) < 0) { + vshError(ctl, _("failed to build absolute path for %s"), dest_cli); + return false; + } + VSH_EXCLUSIVE_OPTIONS_VAR(dest, xml); VSH_EXCLUSIVE_OPTIONS_VAR(format, xml); VSH_EXCLUSIVE_OPTIONS_VAR(blockdev, xml); @@ -2462,6 +2468,7 @@ cmdBlockCopy(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: + VIR_FREE(dest); VIR_FREE(xmlstr); virTypedParamsFree(params, nparams); virDomainFree(dom); -- 2.7.3

4 3

[libvirt] [PATCH 0/4] build: Fix symbolic links usage
by Andrea Bolognani 21 Apr '16

21 Apr '16

This series fixes the build failures currently affecting FreeBSD on ci.centos.org[1] and also gets rid of some behavior deemed dangerous by the autoconf manual[2]. Tested on Fedora 23 and FreeBSD 10.3-RELEASE. [1] https://ci.centos.org/view/libvirt-project/job/libvirt-freebsd/617/console [2] https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Partic… Andrea Bolognani (4): build: Always use $(LN_S) and $(MKDIR_P) build: Add AC_PROG_LN_S to configure build: Overwrite existing symbolic links build: Use $(LN_S) safely Makefile.am | 2 +- configure.ac | 1 + src/Makefile.am | 5 ++--- tools/Makefile.am | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) -- 2.5.5

2 6

[libvirt] [PATCH 1/2] qemu: process: split out shmem startup warning
by Cole Robinson 21 Apr '16

21 Apr '16

Now we can return early and save some indentation --- src/qemu/qemu_process.c | 95 ++++++++++++++++++++++++++----------------------- 1 file changed, 51 insertions(+), 44 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c087300..10e1b5a 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4497,6 +4497,56 @@ qemuProcessMakeDir(virQEMUDriverPtr driver, } +static void +qemuProcessStartWarnShmem(virDomainObjPtr vm) +{ + size_t i; + bool check_shmem = false; + bool shmem = vm->def->nshmems; + + /* + * For vhost-user to work, the domain has to have some type of + * shared memory configured. We're not the proper ones to judge + * whether shared hugepages or shm are enough and will be in the + * future, so we'll just warn in case neither is configured. + * Moreover failing would give the false illusion that libvirt is + * really checking that everything works before running the domain + * and not only we are unable to do that, but it's also not our + * aim to do so. + */ + for (i = 0; i < vm->def->nnets; i++) { + if (virDomainNetGetActualType(vm->def->nets[i]) == + VIR_DOMAIN_NET_TYPE_VHOSTUSER) { + check_shmem = true; + break; + } + } + + if (!check_shmem) + return; + + /* + * This check is by no means complete. We merely check + * whether there are *some* hugepages enabled and *some* NUMA + * nodes with shared memory access. + */ + if (!shmem && vm->def->mem.nhugepages) { + for (i = 0; i < virDomainNumaGetNodeCount(vm->def->numa); i++) { + if (virDomainNumaGetNodeMemoryAccessMode(vm->def->numa, i) == + VIR_NUMA_MEM_ACCESS_SHARED) { + shmem = true; + break; + } + } + } + + if (!shmem) { + VIR_WARN("Detected vhost-user interface without any shared memory, " + "the interface might not be operational"); + } +} + + /** * qemuProcessStartValidate: * @vm: domain object @@ -4517,9 +4567,6 @@ qemuProcessStartValidate(virQEMUDriverPtr driver, bool snapshot, unsigned int flags) { - bool check_shmem = false; - size_t i; - if (!(flags & VIR_QEMU_PROCESS_START_PRETEND)) { if (vm->def->virtType == VIR_DOMAIN_VIRT_KVM) { VIR_DEBUG("Checking for KVM availability"); @@ -4559,47 +4606,7 @@ qemuProcessStartValidate(virQEMUDriverPtr driver, VIR_DEBUG("Checking for any possible (non-fatal) issues"); - /* - * For vhost-user to work, the domain has to have some type of - * shared memory configured. We're not the proper ones to judge - * whether shared hugepages or shm are enough and will be in the - * future, so we'll just warn in case neither is configured. - * Moreover failing would give the false illusion that libvirt is - * really checking that everything works before running the domain - * and not only we are unable to do that, but it's also not our - * aim to do so. - */ - for (i = 0; i < vm->def->nnets; i++) { - if (virDomainNetGetActualType(vm->def->nets[i]) == - VIR_DOMAIN_NET_TYPE_VHOSTUSER) { - check_shmem = true; - break; - } - } - - if (check_shmem) { - bool shmem = vm->def->nshmems; - - /* - * This check is by no means complete. We merely check - * whether there are *some* hugepages enabled and *some* NUMA - * nodes with shared memory access. - */ - if (!shmem && vm->def->mem.nhugepages) { - for (i = 0; i < virDomainNumaGetNodeCount(vm->def->numa); i++) { - if (virDomainNumaGetNodeMemoryAccessMode(vm->def->numa, i) == - VIR_NUMA_MEM_ACCESS_SHARED) { - shmem = true; - break; - } - } - } - - if (!shmem) { - VIR_WARN("Detected vhost-user interface without any shared memory, " - "the interface might not be operational"); - } - } + qemuProcessStartWarnShmem(vm); return 0; } -- 2.7.3

2 2

[libvirt] [PATCH python] spec: Don't pull in dependencies for example scripts
by Cole Robinson 21 Apr '16

21 Apr '16

If the scripts are marked as executable, RPM magic will scan them for dependencies, which can pull in python2 for the python3 package --- Taken from this commit by a fedora packager: http://pkgs.fedoraproject.org/cgit/rpms/libvirt-python.git/commit/?id=78763… libvirt-python.spec.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libvirt-python.spec.in b/libvirt-python.spec.in index 8a21003..3021ebd 100644 --- a/libvirt-python.spec.in +++ b/libvirt-python.spec.in @@ -49,6 +49,11 @@ of recent versions of Linux (and other OSes). %prep %setup -q +# Unset execute bit for example scripts; it can introduce spurious +# RPM dependencies, like /usr/bin/python which can pull in python2 +# for the -python3 package +find examples -type f -exec chmod 0644 \{\} \; + %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %if %{with_python3} -- 2.7.3

2 1

[libvirt] [PATCH] virsh: Don't clear old connection if 'connect $uri' fails
by Cole Robinson 21 Apr '16

21 Apr '16

virsh # list --all Id Name State ---------------------------------------------------- 1 test running virsh # connect frob error: Failed to connect to the hypervisor error: no connection driver available for frob virsh # list --all error: failed to connect to the hypervisor error: no valid connection error: no connection driver available for frob Seems sensible IMO to just not clear out the old connection state until the new virConnectOpen succeeds. https://bugzilla.redhat.com/show_bug.cgi?id=829160 --- There was an older discussion here: https://www.redhat.com/archives/libvir-list/2012-June/msg00270.html That seemed to go off into the weeds a bit, talking about caching old URIs... This approach seems fine for me to address the bug report but maybe I missed something tools/virsh.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 0d8ec5c..353a5d8 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -292,6 +292,17 @@ cmdConnect(vshControl *ctl, const vshCmd *cmd) bool ro = vshCommandOptBool(cmd, "readonly"); const char *name = NULL; virshControlPtr priv = ctl->privData; + virConnectPtr conn; + + if (vshCommandOptStringReq(ctl, cmd, "name", &name) < 0) + return false; + + conn = virshConnect(ctl, name, ro); + + if (!conn) { + vshError(ctl, "%s", _("Failed to connect to the hypervisor")); + return false; + } if (priv->conn) { int ret; @@ -303,13 +314,10 @@ cmdConnect(vshControl *ctl, const vshCmd *cmd) else if (ret > 0) vshError(ctl, "%s", _("One or more references were leaked after " "disconnect from the hypervisor")); - priv->conn = NULL; } + priv->conn = conn; VIR_FREE(ctl->connname); - if (vshCommandOptStringReq(ctl, cmd, "name", &name) < 0) - return false; - ctl->connname = vshStrdup(ctl, name); priv->useGetInfo = false; @@ -317,13 +325,6 @@ cmdConnect(vshControl *ctl, const vshCmd *cmd) priv->blockJobNoBytes = false; priv->readonly = ro; - priv->conn = virshConnect(ctl, ctl->connname, priv->readonly); - - if (!priv->conn) { - vshError(ctl, "%s", _("Failed to connect to the hypervisor")); - return false; - } - if (virConnectRegisterCloseCallback(priv->conn, virshCatchDisconnect, ctl, NULL) < 0) vshError(ctl, "%s", _("Unable to register disconnect callback")); -- 2.7.3

2 1

[libvirt] [PATCH] libvirt: Fix crash on URI without scheme
by Cole Robinson 21 Apr '16

21 Apr '16

My commit 0d1579572 crashes on a URI without a scheme, like via 'virsh --connect frob' Add a check on uri->server too while we are at it, and centralize them all --- src/libvirt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 749089b..114e88c 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -935,6 +935,9 @@ virConnectGetDefaultURI(virConfPtr conf, static int virConnectCheckURIMissingSlash(const char *uristr, virURIPtr uri) { + if (!uri->scheme || !uri->path || !uri->server) + return 0; + /* To avoid false positives, only check drivers that mandate a path component in the URI, like /system or /session */ if (STRNEQ(uri->scheme, "qemu") && @@ -942,9 +945,6 @@ virConnectCheckURIMissingSlash(const char *uristr, virURIPtr uri) STRNEQ(uri->scheme, "vz")) return 0; - if (uri->path != NULL) - return 0; - if (STREQ(uri->server, "session") || STREQ(uri->server, "system")) { virReportError(VIR_ERR_INTERNAL_ERROR, -- 2.7.3

2 1

[libvirt] RFC: virtio-rng and /dev/urandom
by Cole Robinson 21 Apr '16

21 Apr '16

Libvirt currently rejects using host /dev/urandom as an input source for a virtio-rng device. The only accepted sources are /dev/random and /dev/hwrng. This is the result of discussions on qemu-devel around when the feature was first added (2013). Examples: http://lists.gnu.org/archive/html/qemu-devel/2012-09/msg02387.html https://lists.gnu.org/archive/html/qemu-devel/2013-03/threads.html#00023 libvirt's rejection of /dev/urandom has generated some complaints from users: https://bugzilla.redhat.com/show_bug.cgi?id=1074464 * cited: http://www.2uo.de/myths-about-urandom/ http://www.redhat.com/archives/libvir-list/2016-March/msg01062.html http://www.redhat.com/archives/libvir-list/2016-April/msg00186.html I think it's worth having another discussion about this, at least with a recent argument in one place so we can put it to bed. I'm CCing a bunch of people. I think the questions are: 1) is the original recommendation to never use virtio-rng+/dev/urandom correct? 2) regardless of #1, should we continue to reject that config in libvirt? Thanks, Cole

9 21

[libvirt] [PATCH 0/4] libxl: Add support for UEFI using OVMF
by Jim Fehlig 20 Apr '16

20 Apr '16

This series adds support for UEFI, via OVMF, to the libxl driver. Patch1 moves the capabilities code from libxl_conf.{ch} to the new files libxl_capabilities.{ch}. Patch2 implements connectGetDomainCapabilities, allowing advertisement of the default OVMF firmware path. Patch3 implements conversion of xl.cfg <-> libvirt domXML. And patch4 finally maps the relevant virDomainLoaderDef fields to libxl_domain_build_info. Jim Fehlig (4): libxl: introduce libxl_capabilities.{ch} libxl: implement connectGetDomainCapabilities xenconfig: support bios=ovmf xl.cfg libxl: Add support for ovmf firmware po/POTFILES.in | 1 + src/Makefile.am | 11 +- src/libxl/libxl_capabilities.c | 557 +++++++++++++++++++++ src/libxl/libxl_capabilities.h | 54 ++ src/libxl/libxl_conf.c | 423 +--------------- src/libxl/libxl_conf.h | 18 +- src/libxl/libxl_domain.c | 1 + src/libxl/libxl_driver.c | 69 +++ src/xenconfig/xen_xl.c | 50 +- tests/Makefile.am | 5 + tests/domaincapsschemadata/domaincaps-xenfv.xml | 51 ++ tests/domaincapsschemadata/domaincaps-xenpv.xml | 44 ++ tests/domaincapstest.c | 33 ++ tests/testutilsxen.h | 1 + tests/xlconfigdata/test-fullvirt-ovmf-override.cfg | 27 + tests/xlconfigdata/test-fullvirt-ovmf-override.xml | 58 +++ tests/xlconfigdata/test-fullvirt-ovmf.cfg | 26 + tests/xlconfigdata/test-fullvirt-ovmf.xml | 58 +++ tests/xlconfigtest.c | 2 + 19 files changed, 1046 insertions(+), 443 deletions(-) create mode 100644 src/libxl/libxl_capabilities.c create mode 100644 src/libxl/libxl_capabilities.h create mode 100644 tests/domaincapsschemadata/domaincaps-xenfv.xml create mode 100644 tests/domaincapsschemadata/domaincaps-xenpv.xml create mode 100644 tests/xlconfigdata/test-fullvirt-ovmf-override.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-ovmf-override.xml create mode 100644 tests/xlconfigdata/test-fullvirt-ovmf.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-ovmf.xml -- 2.1.4

1 4

[libvirt] [PATCH] qemu: process: comment on min_guarantee validation
by Cole Robinson 20 Apr '16

20 Apr '16

Explain why we check it at process startup time, and not parse time where most other XML validation checks are performed --- src/qemu/qemu_process.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c087300..628b4b6 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4550,6 +4550,8 @@ qemuProcessStartValidate(virQEMUDriverPtr driver, virDomainDefCheckDuplicateDiskInfo(vm->def) < 0) return -1; + /* Previously we silently accepted this parameter; we can't reject + it at parse time without breaking those configs, so check it here */ if (vm->def->mem.min_guarantee) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Parameter 'min_guarantee' " -- 2.7.3

2 4

[libvirt] [PATCH] docs: domain: Document network <filterref>
by Cole Robinson 20 Apr '16

20 Apr '16

The proper nwfilter docs go into full detail, but we should still have a brief bit about domain XML in the domain documentation --- docs/formatdomain.html.in | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 9bcef6a..f6ce22d 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -4908,6 +4908,47 @@ qemu-kvm -net nic,model=? /dev/null <code><model></code> element is mandatory. </p> + <h5><a name="elementNwfilter">Traffic filtering with NWFilter</a></h5> + + <p> + <span class="since">Since 0.8.0</span> an <code>nwfilter</code> profile + can be assigned to an interface device, which allows configuring + traffic filter rules for the virtual machine. + + See the <a href="formatnwfilter.html">nwfilter</a> documentation for more + complete details. + </p> + +<pre> + ... + <devices> + <interface ...> + ... + <filterref filter='clean-traffic'/> + </interface> + <interface ...> + ... + <filterref filter='myfilter'> + <parameter name='IP' value='104.207.129.11'/> + <parameter name='IP6_ADDR' value='2001:19f0:300:2102::'/> + <parameter name='IP6_MASK' value='64'/> + ... + </filterref> + </interface> + </devices> + ...</pre> + + <p> + The <code><filterref></code> <code>filter</code> attribute + specifies the name of the <a href="formatnwfilter.html">nwfilter</a> + to use. Optional <code><parameter></code> values may be + specified for passing additional info to the nwfilter via the + <code>name</code> and <code>value</code> attributes. See + the <a href="formatnwfilter.html#nwfconceptsvars">nwfilter</a> + docs for info on parameters. + </p> + + <h4><a name="elementsInput">Input devices</a></h4> <p> -- 2.7.3

2 2

[libvirt] [ 0/5] netdev ethernet allow to set ip, route and peer address
by Vasiliy Tolstov 20 Apr '16

20 Apr '16

Some minor improvements and patch split as suggested by Laine Stump Vasiliy Tolstov (5): virnetdev allow to set peer address libvirt domain xml allow to set peer address lxc domain allow to set peer address bridge network ignore peer address qemu domain allow to set ip address, peer address and route docs/formatdomain.html.in | 12 +++++++++- docs/schemas/domaincommon.rng | 5 ++++ src/conf/domain_conf.c | 14 ++++++++++- src/conf/domain_conf.h | 1 + src/lxc/lxc_container.c | 2 +- src/network/bridge_driver.c | 2 +- src/qemu/qemu_interface.c | 39 +++++++++++++++++++++++++++++++ src/util/virnetdev.c | 54 ++++++++++++++++++++++++++++++------------- src/util/virnetdev.h | 1 + 9 files changed, 110 insertions(+), 20 deletions(-) -- 2.7.3

3 14

[libvirt] [PATCH 0/4] Make uninstall clean again
by Michal Privoznik 20 Apr '16

20 Apr '16

It's been a while since 'make uninstall' cleaned up everything that 'make install' created. I've noticed this while trying to figure out why some build test on *BSD is failing (fix for that is in the first patch btw). Michal Privoznik (4): nss: Try harder to uninstall examples: Try harder to uninstall nwfilter docs: Uninstall libvirt logo too docs: Don't leave any documentation behind docs/Makefile.am | 7 +++++++ examples/Makefile.am | 2 +- tools/Makefile.am | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) -- 2.7.3

3 12

[libvirt] [PATCH REBASE 0/2] vz: fix handling inputs in config
by Nikolay Shirokovskiy 20 Apr '16

20 Apr '16

Input devices are not stored in SDK but we report them on dumpxml if vnc is on. Thus we need to handle input devices on define xml as well. The latter part have some problems. Let's fix them. Nikolay Shirokovskiy (2): vz: add default input devices on post parse vz: fix config input device check src/vz/vz_driver.c | 26 +++++++++++++++++++++++++- src/vz/vz_sdk.c | 27 ++++++++++++++++++--------- 2 files changed, 43 insertions(+), 10 deletions(-) -- 1.8.3.1

2 3

[libvirt] [libvirt-php][PATCH 0/2] Fix some build issues
by Michal Privoznik 20 Apr '16

20 Apr '16

While trying to make 'distcheck' work again, this is where I got so far. Unfortunately, distcheck is still not working. Michal Privoznik (2): tools: Compile generate-api-docs into builddir configure.ac: Slightly rework configure.ac | 11 ++++++----- tools/Makefile.am | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) -- 2.7.3

2 5

[libvirt] [PATCH] virt-aa-helper: disallow VNC socket read permissions
by Cole Robinson 20 Apr '16

20 Apr '16

From: Simon Arlott <bugzilla.redhat.simon(a)arlott.org> The VM does not need read permission for its own VNC socket to create(), bind(), accept() connections or to receive(), send(), etc. on connections. https://bugzilla.redhat.com/show_bug.cgi?id=1312573 --- src/security/virt-aa-helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 50d2a08..a4cb409 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -1062,7 +1062,7 @@ get_files(vahControl * ctl) for (i = 0; i < ctl->def->ngraphics; i++) { if (ctl->def->graphics[i]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && ctl->def->graphics[i]->data.vnc.socket && - vah_add_file(&buf, ctl->def->graphics[i]->data.vnc.socket, "rw")) + vah_add_file(&buf, ctl->def->graphics[i]->data.vnc.socket, "w")) goto cleanup; } -- 2.5.5

3 4

[libvirt] [PATCH] man: Clarify virsh vol-clone works within a single pool
by Cole Robinson 20 Apr '16

20 Apr '16

virsh vol-clone is expected to clone a volume within a single pool; it doesn't work for cloning across pools. Clarify the docs https://bugzilla.redhat.com/show_bug.cgi?id=1103714 --- tools/virsh-volume.c | 2 +- tools/virsh.pod | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 36dd0ed..9cc8e52 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -546,7 +546,7 @@ static const vshCmdInfo info_vol_clone[] = { .data = N_("clone a volume.") }, {.name = "desc", - .data = N_("Clone an existing volume.") + .data = N_("Clone an existing volume within the parent pool.") }, {.name = NULL} }; diff --git a/tools/virsh.pod b/tools/virsh.pod index 6c9d4ec..e1c0d8e 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -3530,10 +3530,10 @@ only slightly higher initial disk space usage. =item B<vol-clone> [I<--pool> I<pool-or-uuid>] I<vol-name-or-key-or-path> I<name> [I<--prealloc-metadata>] [I<--reflink>] -Clone an existing volume. Less powerful, but easier to type, version of -B<vol-create-from>. +Clone an existing volume within the parent pool. Less powerful, +but easier to type, version of B<vol-create-from>. I<--pool> I<pool-or-uuid> is the name or UUID of the storage pool to create -the volume in. +that contains the source volume, and will contain the new volume. I<vol-name-or-key-or-path> is the name or key or path of the source volume. I<name> is the name of the new volume. [I<--prealloc-metadata>] preallocate metadata (for qcow2 images which don't -- 2.7.3

2 2

[libvirt] [PATCH 0/3] storage: drop support for qcow-create, kvm-img
by Cole Robinson 20 Apr '16

20 Apr '16

I don't think we need to try and support qcow-create or kvm-img binaries anymore; everywhere we care about should have a /usr/bin/qemu-img. See patches for more details Cole Robinson (3): storage: remove support for /usr/bin/qcow-create storage: remove support for /usr/bin/kvm-img storage: drop the plumbing needed for kvm-img/qcow-create src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 4 +- src/storage/storage_backend.c | 131 ++------------------------------------- src/storage/storage_backend.h | 9 ++- src/storage/storage_backend_fs.c | 21 ++----- src/util/virfile.c | 2 +- tests/virstoragetest.c | 4 +- 7 files changed, 18 insertions(+), 155 deletions(-) -- 2.7.3

3 10

[libvirt] [PATCH] tests: Fix enumeration value
by Andrea Bolognani 20 Apr '16

20 Apr '16

Commit 3a773c43c801 introduced the testCompareNetXML2XMLResult enumeration; however, in one instance the result variable was assigned a value from the very similar testCompareDocXML2XMLResult enumeration, leading to a build error. networkxml2xmltest.c:33:42: error: implicit conversion from enumeration type 'testCompareDomXML2XMLResult' to different enumeration type 'testCompareNetXML2XMLResult' [-Werror,-Wenum-conversion] testCompareNetXML2XMLResult result = TEST_COMPARE_DOM_XML2XML_RESULT_SUCCESS; ~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Use the proper value (TEST_COMPARE_NET_XML2XML_RESULT_SUCCESS) instead. --- Pushed as build breaker. tests/networkxml2xmltest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c index a52b350..c069f3d 100644 --- a/tests/networkxml2xmltest.c +++ b/tests/networkxml2xmltest.c @@ -30,7 +30,7 @@ testCompareXMLToXMLFiles(const char *inxml, const char *outxml, { char *actual = NULL; int ret; - testCompareNetXML2XMLResult result = TEST_COMPARE_DOM_XML2XML_RESULT_SUCCESS; + testCompareNetXML2XMLResult result = TEST_COMPARE_NET_XML2XML_RESULT_SUCCESS; virNetworkDefPtr dev = NULL; if (!(dev = virNetworkDefParseFile(inxml))) { -- 2.5.5

1 0

[libvirt] [PATCH 0/7] Probe and expose GIC capabilities
by Andrea Bolognani 20 Apr '16

20 Apr '16

Changes from [RFC]: * Fix issues pointed out during review (see patches 1 and 2 for details) * Add documentation The only thing missing AFAIK is some test cases... I'm not sure whether it's possible to include QMP replies for QEMU 2.6 even though it hasn't been released yet, and I wouldn't know how to generate a .replies file anyway. Any pointers? Cheers. [RFC] https://www.redhat.com/archives/libvir-list/2016-March/msg00956.html Andrea Bolognani (7): conf: Get rid of virDomainCapsDevice qemu: Probe GIC capabilities schema: Validate GIC capabilities conf: Expose GIC capabilities qemu: Fill in GIC capabilities qemu: Cache GIC capabilities docs: Document the new XML elements docs/formatdomain.html.in | 3 +- docs/formatdomaincaps.html.in | 43 ++++- docs/schemas/domaincaps.rng | 18 ++ src/conf/domain_capabilities.c | 42 ++++- src/conf/domain_capabilities.h | 24 +-- src/qemu/qemu_capabilities.c | 194 ++++++++++++++++++++- src/qemu/qemu_monitor.c | 17 ++ src/qemu/qemu_monitor.h | 4 + src/qemu/qemu_monitor_json.c | 115 ++++++++++++ src/qemu/qemu_monitor_json.h | 4 + src/util/virgic.h | 13 ++ tests/domaincapsschemadata/domaincaps-basic.xml | 3 + tests/domaincapsschemadata/domaincaps-full.xml | 3 + .../domaincaps-qemu_1.6.50-1.xml | 3 + tests/domaincapstest.c | 8 +- 15 files changed, 470 insertions(+), 24 deletions(-) -- 2.5.5

2 16

[libvirt] [PATCH] network: Don't use ERR_NO_SUPPORT for invalid net-update requests
by Cole Robinson 20 Apr '16

20 Apr '16

VIR_ERR_NO_SUPPORT maps to the error string this function is not supported by the connection driver and is largely only used for when a driver doesn't have any implementation for a public API. So its usage with invalid net-update requests is a bit out of place. Instead use VIR_ERR_OPERATION_UNSUPPORTED which maps to: Operation not supported And is what qemu's hotplug routines use in similar scenarios --- src/conf/network_conf.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 4fb2e2a..eabaccd 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -3376,14 +3376,14 @@ void virNetworkSetBridgeMacAddr(virNetworkDefPtr def) static void virNetworkDefUpdateNoSupport(virNetworkDefPtr def, const char *section) { - virReportError(VIR_ERR_NO_SUPPORT, + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("can't update '%s' section of network '%s'"), section, def->name); } static void virNetworkDefUpdateUnknownCommand(unsigned int command) { - virReportError(VIR_ERR_NO_SUPPORT, + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("unrecognized network update command code %d"), command); } @@ -3666,7 +3666,7 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDefPtr def, /* parse the xml into a virSocketAddrRange */ if (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY) { - virReportError(VIR_ERR_NO_SUPPORT, "%s", + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("dhcp ranges cannot be modified, " "only added or deleted")); goto cleanup; @@ -3772,7 +3772,7 @@ virNetworkDefUpdateForwardInterface(virNetworkDefPtr def, goto cleanup; if (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY) { - virReportError(VIR_ERR_NO_SUPPORT, "%s", + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("forward interface entries cannot be modified, " "only added or deleted")); goto cleanup; @@ -3973,7 +3973,7 @@ virNetworkDefUpdateDNSHost(virNetworkDefPtr def, memset(&host, 0, sizeof(host)); if (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY) { - virReportError(VIR_ERR_NO_SUPPORT, "%s", + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("DNS HOST records cannot be modified, " "only added or deleted")); goto cleanup; @@ -4067,7 +4067,7 @@ virNetworkDefUpdateDNSSrv(virNetworkDefPtr def, memset(&srv, 0, sizeof(srv)); if (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY) { - virReportError(VIR_ERR_NO_SUPPORT, "%s", + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("DNS SRV records cannot be modified, " "only added or deleted")); goto cleanup; @@ -4151,7 +4151,7 @@ virNetworkDefUpdateDNSTxt(virNetworkDefPtr def, memset(&txt, 0, sizeof(txt)); if (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY) { - virReportError(VIR_ERR_NO_SUPPORT, "%s", + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("DNS TXT records cannot be modified, " "only added or deleted")); goto cleanup; @@ -4268,7 +4268,7 @@ virNetworkDefUpdateSection(virNetworkDefPtr def, ret = virNetworkDefUpdateDNSSrv(def, command, parentIndex, ctxt, flags); break; default: - virReportError(VIR_ERR_NO_SUPPORT, "%s", + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("can't update unrecognized section of network")); break; } -- 2.7.3

2 1

[libvirt] [PATCH v2 1/2] Explicitly error on uri=qemu://system
by Cole Robinson 20 Apr '16

20 Apr '16

It's a fairly common error that a user tries to connect to a URI like qemu://system or qemu://session (missing a slash). This errors like: $ virsh --connect qemu://session error: failed to connect to the hypervisor error: Unable to resolve address 'session' service '16514': No address associated with hostname If you already know that the standard qemu URI has 3 slashes, that error will make it obvious enough. But new user's may not get it. There's even a RHEL support page explicitly mentioning it!: https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/ht… Catch this error early in libvirt.c virConnectOpen for qemu (and vbox which has similar rules https://bugzilla.redhat.com/show_bug.cgi?id=1038304 --- v2: Use conventional function naming Improve a comment Handle 'vz' driver src/libvirt.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/src/libvirt.c b/src/libvirt.c index a21d00e..919c9cb 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -928,6 +928,35 @@ virConnectGetDefaultURI(virConfPtr conf, } +/* + * Check to see if an invalid URI like qemu://system (missing /) was passed, + * offer the suggested fix. + */ +static int +virConnectCheckURIMissingSlash(const char *uristr, virURIPtr uri) +{ + /* To avoid false positives, only check drivers that mandate + a path component in the URI, like /system or /session */ + if (STRNEQ(uri->scheme, "qemu") && + STRNEQ(uri->scheme, "vbox") && + STRNEQ(uri->scheme, "vz")) + return 0; + + if (uri->path != NULL) + return 0; + + if (STREQ(uri->server, "session") || + STREQ(uri->server, "system")) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("invalid URI %s (maybe you want %s:///%s)"), + uristr, uri->scheme, uri->server); + return -1; + } + + return 0; +} + + static virConnectPtr do_open(const char *name, virConnectAuthPtr auth, @@ -995,6 +1024,12 @@ do_open(const char *name, NULLSTR(ret->uri->user), ret->uri->port, NULLSTR(ret->uri->path)); + if (virConnectCheckURIMissingSlash(alias ? alias : name, + ret->uri) < 0) { + VIR_FREE(alias); + goto failed; + } + VIR_FREE(alias); } else { VIR_DEBUG("no name, allowing driver auto-select"); -- 2.7.3

3 4

[libvirt] [PATCH] Revert "daemon: use socket activation with systemd"
by Cole Robinson 20 Apr '16

20 Apr '16

This reverts commit 1e9808d3a1e00a7121bae8b163d9c42d441d2ca8. We shouldn't advertise libvirtd.socket activation, since currently it means VM/network/... autostart won't work as expected. We tried to find a middle ground by installing the config file without an [Install] section, since systemd won't allow .socket to be enabled without one... or at least it did do that; presently on f24 it allows activating the socket quite happily. This also caused user confusion[1] Just remove the socket file. I've filed a new RFE to track coming up with a solution to the autostart problem[2], we can point users at that if there's more confusion: [1]: https://bugzilla.redhat.com/show_bug.cgi?id=1279348 [2]: https://bugzilla.redhat.com/show_bug.cgi?id=1326136 --- .gitignore | 1 - daemon/Makefile.am | 14 ++------------ daemon/libvirtd.conf | 5 ----- daemon/libvirtd.service.in | 5 +++++ daemon/libvirtd.socket.in | 11 ----------- libvirt.spec.in | 7 ++----- 6 files changed, 9 insertions(+), 34 deletions(-) delete mode 100644 daemon/libvirtd.socket.in diff --git a/.gitignore b/.gitignore index 0d12c5c..381db69 100644 --- a/.gitignore +++ b/.gitignore @@ -63,7 +63,6 @@ /daemon/libvirtd.pod /daemon/libvirtd.policy /daemon/libvirtd.service -/daemon/libvirtd.socket /daemon/test_libvirtd.aug /docs/aclperms.htmlinc /docs/apibuild.py.stamp diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 2dbe81b..fc6fd95 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -59,7 +59,6 @@ EXTRA_DIST = \ libvirt.rules \ libvirtd.sasl \ libvirtd.service.in \ - libvirtd.socket.in \ libvirtd.sysconf \ libvirtd.sysctl \ libvirtd.aug \ @@ -446,18 +445,15 @@ endif ! LIBVIRT_INIT_SCRIPT_UPSTART if LIBVIRT_INIT_SCRIPT_SYSTEMD SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system -BUILT_SOURCES += libvirtd.service libvirtd.socket +BUILT_SOURCES += libvirtd.service -install-init-systemd: install-sysconfig libvirtd.service libvirtd.socket +install-init-systemd: install-sysconfig libvirtd.service $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) $(INSTALL_DATA) libvirtd.service \ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirtd.service - $(INSTALL_DATA) libvirtd.socket \ - $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirtd.socket uninstall-init-systemd: uninstall-sysconfig rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirtd.service - rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirtd.socket rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || : else ! LIBVIRT_INIT_SCRIPT_SYSTEMD install-init-systemd: @@ -481,12 +477,6 @@ libvirtd.service: libvirtd.service.in $(top_builddir)/config.status < $< > $@-t && \ mv $@-t $@ -libvirtd.socket: libvirtd.socket.in $(top_builddir)/config.status - $(AM_V_GEN)sed \ - -e 's|[@]runstatedir[@]|$(runstatedir)|g' \ - < $< > $@-t && \ - mv $@-t $@ - check-local: check-augeas diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf index 5485f98..d2c439c 100644 --- a/daemon/libvirtd.conf +++ b/daemon/libvirtd.conf @@ -77,11 +77,6 @@ # UNIX socket access controls # -# Beware that if you are changing *any* of these options, and you use -# socket activation with systemd, you need to adjust the settings in -# the libvirtd.socket file as well since it could impose a security -# risk if you rely on file permission checking only. - # Set the UNIX domain socket group ownership. This can be used to # allow a 'trusted' set of users access to management capabilities # without becoming root. diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in index 608221c..1616e7a 100644 --- a/daemon/libvirtd.service.in +++ b/daemon/libvirtd.service.in @@ -1,3 +1,8 @@ +# NB we don't use socket activation. When libvirtd starts it will +# spawn any virtual machines registered for autostart. We want this +# to occur on every boot, regardless of whether any client connects +# to a socket. Thus socket activation doesn't have any benefit + [Unit] Description=Virtualization daemon Before=libvirt-guests.service diff --git a/daemon/libvirtd.socket.in b/daemon/libvirtd.socket.in deleted file mode 100644 index 0915bb3..0000000 --- a/daemon/libvirtd.socket.in +++ /dev/null @@ -1,11 +0,0 @@ -[Socket] -ListenStream=@runstatedir@/libvirt/libvirt-sock -ListenStream=@runstatedir@/libvirt/libvirt-sock-ro - -; The following settings must match libvirtd.conf file in order to -; work as expected because libvirtd can't change them later. -; SocketMode=0777 is safe only if authentication on the socket is set -; up. For further information, please see the libvirtd.conf file. -SocketMode=0777 -SocketUser=root -SocketGroup=root diff --git a/libvirt.spec.in b/libvirt.spec.in index 8036fa3..c3bfea3 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1710,7 +1710,7 @@ exit 0 %if %{with_systemd} %if %{with_systemd_macros} - %systemd_post virtlockd.socket virtlogd.socket libvirtd.service libvirtd.socket + %systemd_post virtlockd.socket virtlogd.socket libvirtd.service %else if [ $1 -eq 1 ] ; then # Initial installation @@ -1739,19 +1739,17 @@ fi %preun daemon %if %{with_systemd} %if %{with_systemd_macros} - %systemd_preun libvirtd.socket libvirtd.service virtlogd.socket virtlogd.service virtlockd.socket virtlockd.service + %systemd_preun libvirtd.service virtlogd.socket virtlogd.service virtlockd.socket virtlockd.service %else if [ $1 -eq 0 ] ; then # Package removal, not upgrade /bin/systemctl --no-reload disable \ - libvirtd.socket \ libvirtd.service \ virtlogd.socket \ virtlogd.service \ virtlockd.socket \ virtlockd.service > /dev/null 2>&1 || : /bin/systemctl stop \ - libvirtd.socket \ libvirtd.service \ virtlogd.socket \ virtlogd.service \ @@ -1966,7 +1964,6 @@ exit 0 %if %{with_systemd} %{_unitdir}/libvirtd.service -%{_unitdir}/libvirtd.socket %{_unitdir}/virtlogd.service %{_unitdir}/virtlogd.socket %{_unitdir}/virtlockd.service -- 2.7.3

2 2

[libvirt] [PATCH v2] vz: handle sourceless cdroms
by Nikolay Shirokovskiy 19 Apr '16

19 Apr '16

From: Mikhail Feoktistov <mfeoktistov(a)virtuozzo.com> libvirt handles empty source as NULL, while vz sdk as "" thus we need a bit of conversion. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- src/vz/vz_sdk.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) changes from v1: ================ 1. simplify empty string check in prlsdkGetDiskInfo 2. call setting "" explicitly in prlsdkAddDisk. point 2 is the actual reason for releasing new version. I need this semantics on my future work of updating disks. diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 2e9544b..9b783af 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -565,7 +565,7 @@ prlsdkGetDiskInfo(vzDriverPtr driver, if (!(buf = prlsdkGetStringParamVar(PrlVmDev_GetFriendlyName, prldisk))) goto cleanup; - if (virDomainDiskSetSource(disk, buf) < 0) + if (*buf != '\0' && virDomainDiskSetSource(disk, buf) < 0) goto cleanup; if (prlsdkGetDiskId(prldisk, isCt, &disk->bus, &disk->dst) < 0) @@ -3183,6 +3183,7 @@ static int prlsdkAddDisk(vzDriverPtr driver, PRL_DEVICE_TYPE devType; PRL_CLUSTERED_DEVICE_SUBTYPE scsiModel; char *dst = NULL; + const char *path = disk->src->path ? : ""; if (disk->device == VIR_DOMAIN_DISK_DEVICE_DISK) devType = PDE_HARD_DISK; @@ -3206,10 +3207,10 @@ static int prlsdkAddDisk(vzDriverPtr driver, pret = PrlVmDev_SetEmulatedType(sdkdisk, emutype); prlsdkCheckRetGoto(pret, cleanup); - pret = PrlVmDev_SetSysName(sdkdisk, disk->src->path); + pret = PrlVmDev_SetSysName(sdkdisk, path); prlsdkCheckRetGoto(pret, cleanup); - pret = PrlVmDev_SetFriendlyName(sdkdisk, disk->src->path); + pret = PrlVmDev_SetFriendlyName(sdkdisk, path); prlsdkCheckRetGoto(pret, cleanup); drive = &disk->info.addr.drive; -- 1.8.3.1

2 1

[libvirt] [PATCH REBASE 0/4] vz: use disk bus and target name as disk id
by Nikolay Shirokovskiy 19 Apr '16

19 Apr '16

This series is a preparation to implement device update functionality. In case of disk updates disk bus and disk target name pair is considered disk id. We already have places in vz driver code where we use disk source as id. These places are either not critical (see boot patch) or correct (see detach patch) so we need not to fix them immediately to use more rubust id. But as this id will be introduced anyway for disk updates let's move to new id in existing code. This way we have single id for disks. Nikolay Shirokovskiy (4): vz: introduce vzsdk disk id function vz: fix detach disk to use new disk id vz: fix boot check to use new disk id vz: cleanup: remove trivial function src/vz/vz_sdk.c | 251 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 126 insertions(+), 125 deletions(-) -- 1.8.3.1

2 9

[libvirt] [PATCH 00/10] Convert secret driver to use hashed object
by John Ferlan 19 Apr '16

19 Apr '16

This series replaces the usage of linked list in secret driver with a hashed object list as was suggested in the review in the last patch of the previous secret driver changes series: http://www.redhat.com/archives/libvir-list/2016-February/msg01274.html Patch 1 - starts the ball rolling Patch 2 - is yet another code optimization (as found in bridge_driver) Patches 3-8 - Add the new API's "slowly" (for review purposes) Patch 9 - replaces the usage of linked lists with the hashed object Patch 10 - moves the secretLoadAllConfigs to secret_conf The changes are loosely modeled after both virdomainobj and network_conf functionality. The real meat and potato(e)s is found in patches 5 and 9. Other functions should be relatively straightforward. I've done testing of various virsh secret-* commands (both valid and invalid options) as well as performing driver start, stop, and reload testing. Each patch was built using 'check' and 'syntax-check'. The end result is much more code in secret_conf and much less in secret_driver. John Ferlan (10): secret: Move virSecretObj to secret_conf.h Add secretObjFromSecret secret: Add hashed virSecretObj and virSecretObjList secret: Introduce virSecretObjListFindBy{UUID|Usage} support secret: Introduce virSecretObjListAdd* and virSecretObjListRemove secret: Introduce virSecretObjListNumOfSecrets secret: Introduce virSecretObjListExport secret: Introduce virSecretObjListGetUUIDs secret: Use the hashed virSecretObjList secret: Move and rename secretLoadAllConfigs src/conf/secret_conf.c | 819 ++++++++++++++++++++++++++++++++++++++++++++- src/conf/secret_conf.h | 76 ++++- src/libvirt_private.syms | 11 + src/secret/secret_driver.c | 647 +++-------------------------------- 4 files changed, 957 insertions(+), 596 deletions(-) -- 2.5.0

4 40

[libvirt] [PATCH 0/3] qemu: cleanup duplicate calls to DomainObjIsActive
by Cole Robinson 19 Apr '16

19 Apr '16

Some API entry points have duplicate calls to DomainObjIsActive. Remove the redundant ones, and document the valid ones that confused me :) Cole Robinson (3): qemu: Remove redundant DomainObjIsActive calls qemu: Clarify usage of DomainObjIsActive for PMSuspended qemu: Clarify usage of DomainObjIsActive for SetTime src/qemu/qemu_driver.c | 43 ++++++++++++++++--------------------------- 1 file changed, 16 insertions(+), 27 deletions(-) -- 2.7.3

2 7

[libvirt] [PATCH] Explicitly error on uri=qemu://system
by Cole Robinson 19 Apr '16

19 Apr '16

It's a fairly common error that a user tries to connect to a URI like qemu://system or qemu://session (missing a slash). This errors like: $ virsh --connect qemu://session error: failed to connect to the hypervisor error: Unable to resolve address 'session' service '16514': No address associated with hostname If you already know that the standard qemu URI has 3 slashes, that error will make it obvious enough. But new user's may not get it. There's even a RHEL support page explicitly mentioning it!: https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/ht… Catch this error early in libvirt.c virConnectOpen for qemu (and vbox which has similar rules https://bugzilla.redhat.com/show_bug.cgi?id=1038304 --- src/libvirt.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/src/libvirt.c b/src/libvirt.c index a21d00e..7607ae3 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -928,6 +928,33 @@ virConnectGetDefaultURI(virConfPtr conf, } +/* + * Check to see if an invalid URI like qemu://system (missing /) was passed, + * offer the suggested fix. + */ +static int +check_uri_missing_slash(const char *uristr, virURIPtr uri) +{ + /* These drivers _only_ accepts URIs with a 'path' element */ + if (STRNEQ(uri->scheme, "qemu") && + STRNEQ(uri->scheme, "vbox")) + return 0; + + if (uri->path != NULL) + return 0; + + if (STREQ(uri->server, "session") || + STREQ(uri->server, "system")) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("invalid URI %s (maybe you want %s:///%s)"), + uristr, uri->scheme, uri->server); + return -1; + } + + return 0; +} + + static virConnectPtr do_open(const char *name, virConnectAuthPtr auth, @@ -995,6 +1022,11 @@ do_open(const char *name, NULLSTR(ret->uri->user), ret->uri->port, NULLSTR(ret->uri->path)); + if (check_uri_missing_slash(alias ? alias : name, ret->uri) < 0) { + VIR_FREE(alias); + goto failed; + } + VIR_FREE(alias); } else { VIR_DEBUG("no name, allowing driver auto-select"); -- 2.7.3

3 4

[libvirt] [libvirt-php][PATCH 0/3] Couple of small fixes
by Michal Privoznik 19 Apr '16

19 Apr '16

While playing with our php bindings I've noticed couple of memory leaks mostly. And one bug in our examples. Michal Privoznik (3): examples: Check properly if connected Fix some leaks related to get_string_from_xpath Revisit some VIRT_RETURN_STRING examples/index.php | 4 +- src/libvirt-php.c | 121 ++++++++++++++++++++++++++++++----------------------- 2 files changed, 72 insertions(+), 53 deletions(-) -- 2.7.3

4 13

[libvirt] RFC: Drop unmaintained hv drivers? (phyp, xenapi, hyperv)
by Cole Robinson 19 Apr '16

19 Apr '16

Hi all, There's a few old hypervisor drivers in the tree that haven't been actively maintained for a long time. I'm curious if anyone knows of these drivers being actively used. If not I think we should consider dropping them src/phyp/ : for power VM hypervisor. Added in July 2009. The last commit that looks like it wasn't either internal API conversion, or caught by code analysis, is: commit 41461ff7f7d6ee6679aae2a8004e305c5830c9e8 Author: Eduardo Otubo <otubo(a)linux.vnet.ibm.com> Date: Tue Apr 19 12:34:08 2011 -0300 PHYP: Adding reboot domain function Adding reboot <domain> function for pHyp driver. Nearly 5 years ago. Eduardo is the primary driver author too (CCd at his email from github). Searching the upstream bug tracker for all bugs with 'phyp', the only one that's actually about the phyp driver is a report from 2 years ago that it crashes trying to open a connection: https://bugzilla.redhat.com/show_bug.cgi?id=1093094 src/xenapi/: Connecting to a xen api server. Added in March 2010. Largely appears to be a code drop, the original author/committer has never had another commit. The last xenapi specific commit seems to be: commit 484460ec4678a264c5e7355495c2f0da72cb42bd Author: Matthias Bolte <matthias.bolte(a)googlemail.com> Date: Thu Jul 21 15:16:11 2011 +0200 xenapi: Improve error reporting in xenapiOpen once again Nearly 5 years ago. The only upstream bug that was filed about xenapi is: https://bugzilla.redhat.com/show_bug.cgi?id=711372 Which was about a connection failure that was eventually fixed upstream, and dovetailed into the above referenced commit. Current xen guys, you know of anyone using this? src/hyperv/: Added in July 2011. This was largely a code drop as well; committed and patched a few times by Matthias but it was a university project by someone else. Last hyperv targeted patch was: commit 9e9ea3ead9825bd1dc2c17cea4abc8c4165591d0 Author: Matthias Bolte <matthias.bolte(a)googlemail.com> Date: Sun Sep 9 17:39:40 2012 +0200 hyperv: Fix and improve hypervListAllDomains The driver is fairly minimal as well: it can only list existing VMs and perform lifecycle operations. It can't create new VMs, and doesn't list VM device config AFAICT. Also, in general, I've never heard about anyone _actually_ using any of those drivers in the wild. There's reports here and there but it mostly sounds like people trying them out. Just an anecdote so take it with a grain of salt - Cole

4 7

[libvirt] [PATCH] network: Add support for dhcp-range lease time in the network XML configuration format and dnsmasq
by Alberto Ruiz 19 Apr '16

19 Apr '16

Hello, I've been asked to send this patch to the list for review which I originally posted at rhbz#913446 [0]. My main motivation is to be able to set a saner default for dhcp leases in Boxes for development machines where the instant volatility of the dhcp lease makes it impossible to reliably work with services after the machines have to be rebooted. One has to discover the ip again... setup ssh keys... This patch is a first attempt so feel free to let me know if I'm aiming at the right direction. Thanks! [0]https://bugzilla.redhat.com/show_bug.cgi?id=913446 -- Alberto Ruiz Associate Engineering Manager - Desktop Management Tools Red Hat

3 4

[libvirt] how does the qemu command line executed by libvirt?
by zhukaijie 19 Apr '16

19 Apr '16

As you know, libvirt takes advantage of xml and generate corresponding qemu command line. But how does this command line executed? Does it executed in bash shell? Or any other api is used to create the qemu process? Thank you.

2 1

[libvirt] [PATCH] qemu: command: drop redundant min_guarantee check
by Cole Robinson 19 Apr '16

19 Apr '16

We already reject a VM with min_guarantee early in the VM startup in qemuProcessStartValidate --- src/qemu/qemu_command.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 26c19ff..2fb967a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9143,7 +9143,6 @@ qemuBuildCommandLineValidate(virQEMUDriverPtr driver, if (virMemoryLimitIsSet(def->mem.hard_limit) || virMemoryLimitIsSet(def->mem.soft_limit) || - def->mem.min_guarantee || virMemoryLimitIsSet(def->mem.swap_hard_limit)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Memory tuning is not available in session mode")); -- 2.7.3

2 1

[libvirt] [libvirt-php PATCH 00/29] Add PHP7 support and unit tests V2
by Neal Gompa 19 Apr '16

19 Apr '16

This patch set is a revision of the first version, taking into account some of the feedback from Michal Privoznik. I've done some patch surgery to rebase the patch set on the current git HEAD, so it should cleanly apply as-is. Additionally, I've squashed a few commits (mainly some of Remi's patches that were squashable that should be squashed). This means that Vasiliy's patches are no longer unnecessarily part of this patch set. I've updated my patches for the instructions on the php extension build system method to correct a typo on how to run the tests (`make test` instead of `make tests`) and removed the "-dev" suffix that Remi attached to the version string in libvirt-php.h, as I expect that there will likely be a libvirt-php release after this patch set is merged. I would greatly appreciate a quick review and merge of this patch set. Chuck Roydhouse (1): add arginfo for libvirt_domain_block_commit and libvirt_domain_block_job_info Frederic Mora (1): Add more tests Neal Gompa (2): Commit short instructions to using the php extension build method Bump version to 0.5.2 Remi Collet (25): add config.m4 to allow standard PHP extension build system include config.h earlier add missing arginfo adapt RETURN_STRING work on zpp register + fetch resources + hash adapt add_assoc_string_ex clean ALLOC_INIT_ZVAL zend_hash_update add_next_index_string buildable with PHP 7 bump version 0.5.2-dev fix missed (hidden) zpp calls fix PHP 5 compat fix libvirt_version + add test port test-connect.phpt to real phpt Switch all add_assoc_string_ex to add_assoc_string to avoid nul char management Fix max_connections management add test-conn-limit.phpt (as real phpt) add test-connect-get-emulator.phpt fix parse_array + build warnings convert test-install.phpt to real phpt convert test-domain-create-and-coredump.phpt to real phpt convert test-domain-create-and-get-xpath.phpt to real phpt fix PHP 5 compat again (nested macro issue) INSTALL.PHPEXT | 14 + configure.ac | 2 +- src/config.m4 | 52 + src/libvirt-php.c | 1796 ++++++++++++++++------- src/libvirt-php.h | 48 +- src/tests/example-no-disk-and-media.xml | 41 + src/tests/qemu-no-disk-and-media.xml | 41 + src/tests/skipif.inc | 3 + src/tests/test-conn-limit.phpt | 49 + src/tests/test-connect-get-capabilities.phpt | 27 + src/tests/test-connect-get-emulator.phpt | 15 + src/tests/test-connect-get-info.phpt | 110 ++ src/tests/test-connect-get-machine-types.phpt | 30 + src/tests/test-connect.phpt | 15 + src/tests/test-domain-create-and-coredump.phpt | 49 + src/tests/test-domain-create-and-get-xpath.phpt | 56 + src/tests/test-domain-create-and-shutdown.phpt | 38 + src/tests/test-domain-define.phpt | 38 + src/tests/test-domain-disk.phpt | 71 + src/tests/test-domain-get.phpt | 91 ++ src/tests/test-domain-lookup-by-name.phpt | 35 + src/tests/test-domain-nic.phpt | 52 + src/tests/test-install.phpt | 136 ++ src/tests/test-libvirt-php.img | 0 src/tests/test-logfile.phpt | 43 + src/tests/test-version-get.phpt | 27 + 26 files changed, 2330 insertions(+), 549 deletions(-) create mode 100644 INSTALL.PHPEXT create mode 100644 src/config.m4 create mode 100644 src/tests/example-no-disk-and-media.xml create mode 100644 src/tests/qemu-no-disk-and-media.xml create mode 100644 src/tests/skipif.inc create mode 100644 src/tests/test-conn-limit.phpt create mode 100644 src/tests/test-connect-get-capabilities.phpt create mode 100644 src/tests/test-connect-get-emulator.phpt create mode 100644 src/tests/test-connect-get-info.phpt create mode 100644 src/tests/test-connect-get-machine-types.phpt create mode 100644 src/tests/test-connect.phpt create mode 100644 src/tests/test-domain-create-and-coredump.phpt create mode 100644 src/tests/test-domain-create-and-get-xpath.phpt create mode 100644 src/tests/test-domain-create-and-shutdown.phpt create mode 100644 src/tests/test-domain-define.phpt create mode 100644 src/tests/test-domain-disk.phpt create mode 100644 src/tests/test-domain-get.phpt create mode 100644 src/tests/test-domain-lookup-by-name.phpt create mode 100644 src/tests/test-domain-nic.phpt create mode 100644 src/tests/test-install.phpt create mode 100644 src/tests/test-libvirt-php.img create mode 100644 src/tests/test-logfile.phpt create mode 100644 src/tests/test-version-get.phpt -- 2.5.5

4 41

[libvirt] [python PATCH] fix crash in getAllDomainStats
by Pavel Hrdina 19 Apr '16

19 Apr '16

Commits 1d39dbaf and 827ed9b4 broke the libvirt-python API by removing virDomainRef() and virDomainFree(). virDomainStatsRecordListFree() will free that domain pointer and later when virDomain (python object) call its destructor and tries to free that same pointer again. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1326839 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- libvirt-override.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libvirt-override.c b/libvirt-override.c index 4640ed5..2de95ce 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -8381,6 +8381,7 @@ convertDomainStatsRecord(virDomainStatsRecordPtr *records, PyObject *py_retval; PyObject *py_record; PyObject *py_record_stats = NULL; + virDomainPtr dom = NULL; size_t i; if (!(py_retval = PyList_New(nrecords))) @@ -8392,9 +8393,12 @@ convertDomainStatsRecord(virDomainStatsRecordPtr *records, VIR_PY_LIST_SET_GOTO(py_retval, i, py_record, error); + dom = records[i]->dom; + virDomainRef(dom); VIR_PY_TUPLE_SET_GOTO(py_record, 0, - libvirt_virDomainPtrWrap(records[i]->dom), + libvirt_virDomainPtrWrap(dom), error); + dom = NULL; if (!(py_record_stats = getPyVirTypedParameter(records[i]->params, records[i]->nparams))) @@ -8406,6 +8410,8 @@ convertDomainStatsRecord(virDomainStatsRecordPtr *records, return py_retval; error: + if (dom) + virDomainFree(dom); Py_XDECREF(py_retval); return NULL; } -- 2.8.1

2 1

[libvirt] [PATCH 0/2] prevent duplicate entries in network device pools
by Laine Stump 19 Apr '16

19 Apr '16

This is a simple bugfix, but proper testing required the ability to test for parse failures in networkxml2xmltest, which wasn't yet an option, so I added a separate prerequisite patch to do that (in case someone wants to backport the new testing option without the bugfix). Laine Stump (2): test: enable testing for expected parse errors in network XML network: prevent duplicate entries in network device pools src/conf/network_conf.c | 33 ++++++++-- tests/networkxml2xmlin/hostdev-duplicate.xml | 11 ++++ tests/networkxml2xmlin/passthrough-duplicate.xml | 10 +++ tests/networkxml2xmltest.c | 77 ++++++++++++++++++------ 4 files changed, 108 insertions(+), 23 deletions(-) create mode 100644 tests/networkxml2xmlin/hostdev-duplicate.xml create mode 100644 tests/networkxml2xmlin/passthrough-duplicate.xml -- 2.5.5

2 3

[libvirt] [PATCH v2] Include sysmacros.h where needed
by Martin Kletzander 18 Apr '16

18 Apr '16

So in glibc-2.23 sys/sysmacros.h is no longer included from sys/types.h and we don't build because of the usage of major/minor/makedev macros. Autoconf already has AC_HEADER_MAJOR macro that check where exactly these functions/macros are defined, so let's use that. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- v2: - Don't include the file unconditionally, but rather use AC_HEADER_MAJOR that exists for exactly this purpose. v1: - https://www.redhat.com/archives/libvir-list/2016-April/msg00851.html configure.ac | 2 ++ src/conf/domain_audit.c | 6 ++++++ src/lxc/lxc_controller.c | 7 +++++++ src/lxc/lxc_driver.c | 7 +++++++ src/util/vircgroup.c | 7 +++++++ src/util/virutil.c | 7 +++++++ tests/vircgroupmock.c | 7 +++++++ 7 files changed, 43 insertions(+) diff --git a/configure.ac b/configure.ac index b1500f60bc5d..f266484575ff 100644 --- a/configure.ac +++ b/configure.ac @@ -144,6 +144,8 @@ AC_TYPE_UID_T dnl Support building Win32 DLLs (must appear *before* AM_PROG_LIBTOOL) AC_LIBTOOL_WIN32_DLL +AC_HEADER_MAJOR + m4_ifndef([LT_INIT], [ AM_PROG_LIBTOOL ], [ diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index bd2eeb6a792d..36a3cf6ba0b4 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -26,6 +26,12 @@ #include <sys/stat.h> #include <sys/types.h> +#ifdef MAJOR_IN_MKDEV +# include <sys/mkdev.h> +#elif MAJOR_IN_SYSMACROS +# include <sys/sysmacros.h> +#endif + #include "domain_audit.h" #include "viraudit.h" #include "viruuid.h" diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 73e57e30ad48..de59775256b5 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -28,6 +28,13 @@ #include <sys/wait.h> #include <sys/socket.h> #include <sys/types.h> + +#ifdef MAJOR_IN_MKDEV +# include <sys/mkdev.h> +#elif MAJOR_IN_SYSMACROS +# include <sys/sysmacros.h> +#endif + #include <sys/un.h> #include <sys/personality.h> #include <unistd.h> diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index ef488123db12..1dfbde333073 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -29,6 +29,13 @@ #include <sys/utsname.h> #include <string.h> #include <sys/types.h> + +#ifdef MAJOR_IN_MKDEV +# include <sys/mkdev.h> +#elif MAJOR_IN_SYSMACROS +# include <sys/sysmacros.h> +#endif + #include <sys/socket.h> #include <sys/stat.h> #include <sys/un.h> diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index bffd88f90a44..da5ccff35f8a 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -35,6 +35,13 @@ #include <stdlib.h> #include <sys/stat.h> #include <sys/types.h> + +#ifdef MAJOR_IN_MKDEV +# include <sys/mkdev.h> +#elif MAJOR_IN_SYSMACROS +# include <sys/sysmacros.h> +#endif + #include <signal.h> #include <dirent.h> #include <unistd.h> diff --git a/src/util/virutil.c b/src/util/virutil.c index 82051505d258..d80d994327cd 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -36,6 +36,13 @@ #include <poll.h> #include <sys/stat.h> #include <sys/types.h> + +#ifdef MAJOR_IN_MKDEV +# include <sys/mkdev.h> +#elif MAJOR_IN_SYSMACROS +# include <sys/sysmacros.h> +#endif + #include <sys/ioctl.h> #include <string.h> #include <termios.h> diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c index 756ac51679b4..cfc51e8f6373 100644 --- a/tests/vircgroupmock.c +++ b/tests/vircgroupmock.c @@ -29,6 +29,13 @@ # include <unistd.h> # include <fcntl.h> # include <sys/stat.h> + +# ifdef MAJOR_IN_MKDEV +# include <sys/mkdev.h> +# elif MAJOR_IN_SYSMACROS +# include <sys/sysmacros.h> +# endif + # include <stdarg.h> # include "testutilslxc.h" # include "virstring.h" -- 2.8.1

2 3

[libvirt] [PATCH] qemu: Label master key file
by Martin Kletzander 18 Apr '16

18 Apr '16

When creating the master key, we used mode 0600 (which we should) but because we were creating it as root, the file is not readable by any qemu running as non-root. Fortunately, it's just a matter of labelling the file. We are generating the file path few times already, so let's label it in the same function that has access to the path already. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_domain.c | 15 ++++++++++++--- src/qemu/qemu_domain.h | 3 ++- src/qemu/qemu_process.c | 2 +- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 5d54fffcfb98..83e765ef6868 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -504,11 +504,13 @@ qemuDomainGetMasterKeyFilePath(const char *libDir) * Returns 0 on success, -1 on failure with error message indicating failure */ static int -qemuDomainWriteMasterKeyFile(qemuDomainObjPrivatePtr priv) +qemuDomainWriteMasterKeyFile(virQEMUDriverPtr driver, + virDomainObjPtr vm) { char *path; int fd = -1; int ret = -1; + qemuDomainObjPrivatePtr priv = vm->privateData; if (!(path = qemuDomainGetMasterKeyFilePath(priv->libDir))) return -1; @@ -525,6 +527,10 @@ qemuDomainWriteMasterKeyFile(qemuDomainObjPrivatePtr priv) goto cleanup; } + if (virSecurityManagerDomainSetDirLabel(driver->securityManager, + vm->def, path) < 0) + goto cleanup; + ret = 0; cleanup: @@ -697,8 +703,11 @@ qemuDomainMasterKeyRemove(qemuDomainObjPrivatePtr priv) * Returns: 0 on success, -1 w/ error message on failure */ int -qemuDomainMasterKeyCreate(qemuDomainObjPrivatePtr priv) +qemuDomainMasterKeyCreate(virQEMUDriverPtr driver, + virDomainObjPtr vm) { + qemuDomainObjPrivatePtr priv = vm->privateData; + /* If we don't have the capability, then do nothing. */ if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_OBJECT_SECRET)) return 0; @@ -709,7 +718,7 @@ qemuDomainMasterKeyCreate(qemuDomainObjPrivatePtr priv) priv->masterKeyLen = QEMU_DOMAIN_MASTER_KEY_LEN; - if (qemuDomainWriteMasterKeyFile(priv) < 0) + if (qemuDomainWriteMasterKeyFile(driver, vm) < 0) goto error; return 0; diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index d8d57d32df5d..7d2c4fd92ae4 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -584,7 +584,8 @@ char *qemuDomainGetMasterKeyFilePath(const char *libDir); int qemuDomainMasterKeyReadFile(qemuDomainObjPrivatePtr priv); -int qemuDomainMasterKeyCreate(qemuDomainObjPrivatePtr priv); +int qemuDomainMasterKeyCreate(virQEMUDriverPtr driver, + virDomainObjPtr vm); void qemuDomainMasterKeyRemove(qemuDomainObjPrivatePtr priv); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index b1e270ff235e..787d78670dae 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5218,7 +5218,7 @@ qemuProcessPrepareHost(virQEMUDriverPtr driver, goto cleanup; VIR_DEBUG("Create domain masterKey"); - if (qemuDomainMasterKeyCreate(priv) < 0) + if (qemuDomainMasterKeyCreate(driver, vm) < 0) goto cleanup; ret = 0; -- 2.8.1

3 8

[libvirt] [RFC 0/6] Probe and expose GIC capabilities
by Andrea Bolognani 18 Apr '16

18 Apr '16

This series implements support for asking QEMU what GIC versions can be used for guests, eg: <features> <gic version='2'/> </features> and exposing such information to users via domain capabilities. QEMU patches that implement the query-gic-capabilities QMP command: https://lists.gnu.org/archive/html/qemu-devel/2016-03/msg04465.html Cheers. Andrea Bolognani (6): conf: Get rid of virDomainCapsDevice qemu: Probe GIC capabilities schema: Validate GIC capabilities conf: Expose GIC capabilities qemu: Fill in GIC capabilities qemu: Cache GIC capabilities docs/schemas/domaincaps.rng | 18 +++ src/conf/domain_capabilities.c | 26 +++- src/conf/domain_capabilities.h | 24 ++-- src/qemu/qemu_capabilities.c | 157 ++++++++++++++++++++- src/qemu/qemu_monitor.c | 10 ++ src/qemu/qemu_monitor.h | 4 + src/qemu/qemu_monitor_json.c | 90 ++++++++++++ src/qemu/qemu_monitor_json.h | 4 + src/util/virgic.h | 13 ++ tests/domaincapsschemadata/domaincaps-basic.xml | 3 + tests/domaincapsschemadata/domaincaps-full.xml | 3 + .../domaincaps-qemu_1.6.50-1.xml | 3 + tests/domaincapstest.c | 8 +- 13 files changed, 341 insertions(+), 22 deletions(-) -- 2.5.5

4 26

[libvirt] [PATCH] virDomain{Get, Set}PerfEvents: Tweak documentation
by Michal Privoznik 18 Apr '16

18 Apr '16

These API already support VIR_DOMAIN_AFFECT_* flags. But the documentation does not mention it. Eww. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/libvirt-domain.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 3e144b6..4f473c9 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -9695,11 +9695,13 @@ virDomainOpenChannel(virDomainPtr dom, * @domain: a domain object * @params: where to store perf events setting * @nparams: number of items in @params - * @flags: extra flags; not used yet, so callers should always pass 0 + * @flags: bitwise-OR of virDomainModificationImpact * - * Get all perf events setting. Possible fields returned in @params are - * defined by VIR_DOMAIN_PERF_* macros and new fields will likely be - * introduced in the future. + * Get all Linux perf events setting. Possible fields returned in + * @params are defined by VIR_PERF_EVENT_* macros and new fields + * will likely be introduced in the future. + * + * Linux perf events are performance analyzing tool in Linux. * * Returns -1 in case of failure, 0 in case of success. */ @@ -9743,9 +9745,13 @@ int virDomainGetPerfEvents(virDomainPtr domain, * @params: pointer to perf events parameter object * @nparams: number of perf event parameters (this value can be the same * less than the number of parameters supported) - * @flags: extra flags; not used yet, so callers should always pass 0 + * @flags: bitwise-OR of virDomainModificationImpact * - * Enable or disable the particular list of perf events you care about. + * Enable or disable the particular list of Linux perf events you + * care about. The @params argument should contain any subset of + * VIR_PERF_EVENT_ macros. + * + * Linux perf events are performance analyzing tool in Linux. * * Returns -1 in case of error, 0 in case of success. */ -- 2.7.3

2 1

[libvirt] [PATCH v4 00/11] Introduce worker tuning APIs
by Erik Skultety 18 Apr '16

18 Apr '16

since v3: - fixed some indentation problem in 10/11 - for some reason daemon-side APIs did not follow our function signature conventions, e.g. if the function name starts with virAdmServer (adminServer for server-side version), it means that first argument is going to be virAdmServerPtr (virNetServerPtr for server side), etc., but for some reason, I named the server-side version adminDaemon, while passing virNetServerPtr as the first argument - fixed a bug when setting parameters would return error stating that minWorkers cannot be larger than maxWorkers for configuration: maxWorkers = 14 and minWorkers = 13 - replaced srv-workertune command with two commands srv-threadpool-info and srv-threadpool-set, since it's much easier to extend the set of options for each command separately than to do some black magic to determine which options make the command behave as a getter and which ones make it behave as a setter since v2: - all getters are now protected by threadpool mutex to prevent torn reads in concurrent execution - some checks in adminDispatchServerGetThreadpoolParameters were redundant, thus were optimizes out - fixed memory leak in adminDispatchServerGetThreadpoolParameters when allocating a newlist although typed params serialization already does that - fixed some cosmetic issues like exporting a function prototype one patch earlier than it should actually be introduced - a mistake that got there by interactive rebase Erik Skultety (11): po: Fix record ordering in POTFILES.in libvirt-host: Move virTypedParam* to libvirt-common admin: Enable usage of typed parameters util: Refactor thread creation by introducing virThreadPoolExpand util: Report system error when virThreadCreateFull fails util: Use a mutex when retrieving threadpool data util: Add more getters to threadpool parameters admin: Prepare admin protocol for future worker related procedures admin: Introduce virAdmServerGethreadPoolParameters admin: Introduce virAdmServerSetThreadPoolParameters virt-admin: Introduce srv-threadpool-info and srv-threadpool-set commands cfg.mk | 2 +- daemon/admin.c | 88 +++++++++++++ daemon/admin_server.c | 110 ++++++++++++++++ daemon/admin_server.h | 11 ++ include/libvirt/libvirt-admin.h | 71 +++++++++++ include/libvirt/libvirt-common.h.in | 185 +++++++++++++++++++++++++++ include/libvirt/libvirt-host.h | 186 ---------------------------- po/POTFILES.in | 4 +- src/admin/admin_protocol.x | 54 +++++++- src/admin/admin_remote.c | 77 ++++++++++++ src/admin_protocol-structs | 45 +++++++ src/libvirt-admin.c | 83 +++++++++++++ src/libvirt_admin_private.syms | 3 + src/libvirt_admin_public.syms | 2 + src/libvirt_private.syms | 4 + src/rpc/virnetserver.c | 37 ++++++ src/rpc/virnetserver.h | 13 ++ src/util/virthreadpool.c | 241 ++++++++++++++++++++++++++---------- src/util/virthreadpool.h | 8 ++ tools/virt-admin.c | 185 +++++++++++++++++++++++++++ 20 files changed, 1152 insertions(+), 257 deletions(-) -- 2.4.11

2 15

[libvirt] [PATCH] Libvirt: virTypedParamsValidate: Fix detection of multiple parameters
by Jason J. Herne 18 Apr '16

18 Apr '16

virTypedParamsValidate currently uses an index based check to find duplicate parameters. This check does not work. Consider the following simple example: We have only 2 keys A (multiples allowed) B (multiples NOT allowed) We are given the following list of parameters to check: A A B If you work through the validation loop you will see that our last iteration through the loop has i=2 and j=1. In this case, i > j and keys[j].value.i will indicate that multiples are not allowed. Both conditionals are satisfied so an incorrect error will be given: "parameter '%s' occurs multiple times" This patch replaces the index based check with code that remembers the name of the last parameter seen and only triggers the error case if the current parameter name equals the last one. This works because the list is sorted and duplicate parameters will be grouped together. In reality, we hit this bug while using selective block migration to migrate a guest with 5 disks. 5 was apparently just the right number to push i > j and hit this bug. virsh migrate --live guestname --copy-storage-all --migrate-disks vdb,vdc,vdd,vde,vdf qemu+ssh://dsthost/system Signed-off-by: Jason J. Herne <jjherne(a)linux.vnet.ibm.com> Reviewed-by: Eric Farman <farman(a)linux.vnet.ibm.com> --- src/util/virtypedparam.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c index 138fc64..23109e1 100644 --- a/src/util/virtypedparam.c +++ b/src/util/virtypedparam.c @@ -66,7 +66,7 @@ virTypedParamsValidate(virTypedParameterPtr params, int nparams, ...) va_list ap; int ret = -1; size_t i, j; - const char *name; + const char *name, *last_name = NULL; int type; size_t nkeys = 0, nkeysalloc = 0; virTypedParameterPtr sorted = NULL, keys = NULL; @@ -106,7 +106,8 @@ virTypedParamsValidate(virTypedParameterPtr params, int nparams, ...) if (STRNEQ(sorted[i].field, keys[j].field)) { j++; } else { - if (i > j && !(keys[j].value.i & VIR_TYPED_PARAM_MULTIPLE)) { + if (STREQ_NULLABLE(last_name, sorted[i].field) && + !(keys[j].value.i & VIR_TYPED_PARAM_MULTIPLE)) { virReportError(VIR_ERR_INVALID_ARG, _("parameter '%s' occurs multiple times"), sorted[i].field); @@ -125,6 +126,7 @@ virTypedParamsValidate(virTypedParameterPtr params, int nparams, ...) virTypedParameterTypeToString(keys[j].type)); goto cleanup; } + last_name = sorted[i].field; i++; } } -- 1.9.1

2 1

[libvirt] [PATCH 00/18] Refactor event-test
by Peter Krempa 18 Apr '16

18 Apr '16

I was asked to add the new event to the test. My eyes started bleeding after opening the file. Refactor the mega-ancient code and add missing stuff. As a finishing touch add a static check that new events are not forgotten. P.S: I contemplated just deleting that ... stuff ... at first. But I coudn't think of a bulletproof justification other than the state of the code. Peter Krempa (18): event-test: Remove forward declarations event-test: Get rid of useless and ambiguous VIR_DEBUG macro event-test: Remove unnecessary 'usage' function event-test: touch up coding style event-test: Use functions with typecasted switch to convert enums lib: document fields virConnectDomainEventDiskChangeReason event-test: Force compiler check in switch for connectClose callback event-test: Use typecasted enum to convert graphics event phase event-test: Use switch instead of if/else if chains for lifecycle event translation event-test: make few switch statements future proof event-test: Enable enum sentinels and warn on not fully populated enums event-test: make domain event registration declarative event-test: Add VIR_DOMAIN_EVENT_ID_BLOCK_JOB and VIR_DOMAIN_EVENT_ID_BLOCK_JOB_2 event-test: Add VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION callback event-test: Add VIR_DOMAIN_EVENT_ID_JOB_COMPLETED event-test: Add VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED event-test: Add VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON event-test: Enforce domain event sync examples/Makefile.am | 5 + examples/object-events/event-test.c | 973 +++++++++++++++++++++--------------- include/libvirt/libvirt-domain.h | 6 +- 3 files changed, 580 insertions(+), 404 deletions(-) -- 2.8.0

2 36

[libvirt] [PATCH v3] security: Rename DomainSetDirLabel to DomainSetPathLabel
by Martin Kletzander 18 Apr '16

18 Apr '16

It already labels abritrary paths, so it's just the naming that was wrong. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- v3: The other patch from the series was pushed, so this is the only one missing right now, so it needed rebasing. src/libvirt_private.syms | 2 +- src/qemu/qemu_domain.c | 4 ++-- src/qemu/qemu_process.c | 4 ++-- src/security/security_dac.c | 8 ++++---- src/security/security_driver.h | 8 ++++---- src/security/security_manager.c | 10 +++++----- src/security/security_manager.h | 6 +++--- src/security/security_selinux.c | 8 ++++---- src/security/security_stack.c | 12 ++++++------ 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 61fc5004bbb7..1118fdcfa3bc 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1055,7 +1055,7 @@ virSecurityDriverLookup; # security/security_manager.h virSecurityManagerCheckAllLabel; virSecurityManagerClearSocketLabel; -virSecurityManagerDomainSetDirLabel; +virSecurityManagerDomainSetPathLabel; virSecurityManagerGenLabel; virSecurityManagerGetBaseLabel; virSecurityManagerGetDOI; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ed1e0e502925..e031e0fc42c8 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -527,8 +527,8 @@ qemuDomainWriteMasterKeyFile(virQEMUDriverPtr driver, goto cleanup; } - if (virSecurityManagerDomainSetDirLabel(driver->securityManager, - vm->def, path) < 0) + if (virSecurityManagerDomainSetPathLabel(driver->securityManager, + vm->def, path) < 0) goto cleanup; ret = 0; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 81d86c2d1aa2..c0873007d397 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4486,8 +4486,8 @@ qemuProcessMakeDir(virQEMUDriverPtr driver, goto cleanup; } - if (virSecurityManagerDomainSetDirLabel(driver->securityManager, - vm->def, path) < 0) + if (virSecurityManagerDomainSetPathLabel(driver->securityManager, + vm->def, path) < 0) goto cleanup; ret = 0; diff --git a/src/security/security_dac.c b/src/security/security_dac.c index a09aba5f62c6..df3ed4793be8 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -1542,9 +1542,9 @@ virSecurityDACGetBaseLabel(virSecurityManagerPtr mgr, } static int -virSecurityDACDomainSetDirLabel(virSecurityManagerPtr mgr, - virDomainDefPtr def, - const char *path) +virSecurityDACDomainSetPathLabel(virSecurityManagerPtr mgr, + virDomainDefPtr def, + const char *path) { virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); virSecurityLabelDefPtr seclabel; @@ -1607,5 +1607,5 @@ virSecurityDriver virSecurityDriverDAC = { .getBaseLabel = virSecurityDACGetBaseLabel, - .domainSetDirLabel = virSecurityDACDomainSetDirLabel, + .domainSetPathLabel = virSecurityDACDomainSetPathLabel, }; diff --git a/src/security/security_driver.h b/src/security/security_driver.h index 784b0dee65ea..7cb62f029343 100644 --- a/src/security/security_driver.h +++ b/src/security/security_driver.h @@ -118,9 +118,9 @@ typedef int (*virSecurityDomainSetImageLabel) (virSecurityManagerPtr mgr, typedef int (*virSecurityDomainRestoreImageLabel) (virSecurityManagerPtr mgr, virDomainDefPtr def, virStorageSourcePtr src); -typedef int (*virSecurityDomainSetDirLabel) (virSecurityManagerPtr mgr, - virDomainDefPtr def, - const char *path); +typedef int (*virSecurityDomainSetPathLabel) (virSecurityManagerPtr mgr, + virDomainDefPtr def, + const char *path); struct _virSecurityDriver { @@ -172,7 +172,7 @@ struct _virSecurityDriver { virSecurityDriverGetBaseLabel getBaseLabel; - virSecurityDomainSetDirLabel domainSetDirLabel; + virSecurityDomainSetPathLabel domainSetPathLabel; }; virSecurityDriverPtr virSecurityDriverLookup(const char *name, diff --git a/src/security/security_manager.c b/src/security/security_manager.c index 07a05224e0be..ecb4a40f05c8 100644 --- a/src/security/security_manager.c +++ b/src/security/security_manager.c @@ -987,14 +987,14 @@ virSecurityManagerSetHugepages(virSecurityManagerPtr mgr, int -virSecurityManagerDomainSetDirLabel(virSecurityManagerPtr mgr, - virDomainDefPtr vm, - const char *path) +virSecurityManagerDomainSetPathLabel(virSecurityManagerPtr mgr, + virDomainDefPtr vm, + const char *path) { - if (mgr->drv->domainSetDirLabel) { + if (mgr->drv->domainSetPathLabel) { int ret; virObjectLock(mgr); - ret = mgr->drv->domainSetDirLabel(mgr, vm, path); + ret = mgr->drv->domainSetPathLabel(mgr, vm, path); virObjectUnlock(mgr); return ret; } diff --git a/src/security/security_manager.h b/src/security/security_manager.h index e534e31d4a55..4cbc2d85d0f1 100644 --- a/src/security/security_manager.h +++ b/src/security/security_manager.h @@ -160,8 +160,8 @@ int virSecurityManagerRestoreImageLabel(virSecurityManagerPtr mgr, virDomainDefPtr vm, virStorageSourcePtr src); -int virSecurityManagerDomainSetDirLabel(virSecurityManagerPtr mgr, - virDomainDefPtr vm, - const char *path); +int virSecurityManagerDomainSetPathLabel(virSecurityManagerPtr mgr, + virDomainDefPtr vm, + const char *path); #endif /* VIR_SECURITY_MANAGER_H__ */ diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 04760a1f41d1..b33d54a81d58 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -2594,9 +2594,9 @@ virSecuritySELinuxGetSecurityMountOptions(virSecurityManagerPtr mgr, } static int -virSecuritySELinuxDomainSetDirLabel(virSecurityManagerPtr mgr, - virDomainDefPtr def, - const char *path) +virSecuritySELinuxDomainSetPathLabel(virSecurityManagerPtr mgr, + virDomainDefPtr def, + const char *path) { virSecurityLabelDefPtr seclabel; @@ -2652,5 +2652,5 @@ virSecurityDriver virSecurityDriverSELinux = { .domainGetSecurityMountOptions = virSecuritySELinuxGetSecurityMountOptions, .getBaseLabel = virSecuritySELinuxGetBaseLabel, - .domainSetDirLabel = virSecuritySELinuxDomainSetDirLabel, + .domainSetPathLabel = virSecuritySELinuxDomainSetPathLabel, }; diff --git a/src/security/security_stack.c b/src/security/security_stack.c index 00d1fa7012bb..3ea27518fcc1 100644 --- a/src/security/security_stack.c +++ b/src/security/security_stack.c @@ -600,17 +600,17 @@ virSecurityStackRestoreImageLabel(virSecurityManagerPtr mgr, } static int -virSecurityStackDomainSetDirLabel(virSecurityManagerPtr mgr, - virDomainDefPtr vm, - const char *path) +virSecurityStackDomainSetPathLabel(virSecurityManagerPtr mgr, + virDomainDefPtr vm, + const char *path) { virSecurityStackDataPtr priv = virSecurityManagerGetPrivateData(mgr); virSecurityStackItemPtr item = priv->itemsHead; int rc = 0; for (; item; item = item->next) { - if (virSecurityManagerDomainSetDirLabel(item->securityManager, - vm, path) < 0) + if (virSecurityManagerDomainSetPathLabel(item->securityManager, + vm, path) < 0) rc = -1; } @@ -667,5 +667,5 @@ virSecurityDriver virSecurityDriverStack = { .getBaseLabel = virSecurityStackGetBaseLabel, - .domainSetDirLabel = virSecurityStackDomainSetDirLabel, + .domainSetPathLabel = virSecurityStackDomainSetPathLabel, }; -- 2.8.1

2 1

[libvirt] [PATCH v4 0/2] persistent live migration with specified XML
by Dmitry Andreev 18 Apr '16

18 Apr '16

v4: wrong param name in commit msg v3: - use shorter name for param and rename args - move qemuMigrationCookieAddPersistent out from qemuMigrationBakeCookie - rebase to master v2: reimplemented with new migration param Libvirt doesn't allow to specify destination persistent domain configuration. VIR_MIGRATE_PARAM_DEST_XML migration param is used for active configuration and persistent configuration is taken from source domain. The problem is mentioned in this bug: https://bugzilla.redhat.com/show_bug.cgi?id=835300 This patch-set introduces new migration param VIR_MIGRATE_PARAM_PERSIST_XML and implements its support in qemu driver. Dmitry Andreev (2): qemuMigrationCookieAddPersistent: move it out and change argument type qemu: migration: new migration param for persistent destination XML include/libvirt/libvirt-domain.h | 15 ++++++++++ src/qemu/qemu_driver.c | 12 +++++--- src/qemu/qemu_migration.c | 64 ++++++++++++++++++++++++---------------- src/qemu/qemu_migration.h | 2 ++ 4 files changed, 63 insertions(+), 30 deletions(-) -- 1.8.3.1

2 7

[libvirt] [PATCH] qemu: reject min_guarantee at parse time
by Cole Robinson 18 Apr '16

18 Apr '16

min_guarantee isn't implemented for qemu, and an explicit check was added in june 2014 to reject the VM at qemu startup time. It's a weird place to do XML validation, so move it to the post parse area where we have similar checks. Also drop a validation check against min_guarantee in the command line building; it will never see min_guarantee there. --- src/qemu/qemu_command.c | 1 - src/qemu/qemu_domain.c | 7 +++++++ src/qemu/qemu_process.c | 7 ------- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 26c19ff..2fb967a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9143,7 +9143,6 @@ qemuBuildCommandLineValidate(virQEMUDriverPtr driver, if (virMemoryLimitIsSet(def->mem.hard_limit) || virMemoryLimitIsSet(def->mem.soft_limit) || - def->mem.min_guarantee || virMemoryLimitIsSet(def->mem.swap_hard_limit)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Memory tuning is not available in session mode")); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 73187ce..f5fafc8 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1690,6 +1690,13 @@ qemuDomainDefPostParse(virDomainDefPtr def, return ret; } + if (def->mem.min_guarantee) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Parameter 'min_guarantee' " + "not supported by QEMU.")); + return -1; + } + if (def->os.loader && def->os.loader->type == VIR_DOMAIN_LOADER_TYPE_PFLASH && def->os.loader->readonly == VIR_TRISTATE_SWITCH_ON && diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 81d86c2..387aff5 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4550,13 +4550,6 @@ qemuProcessStartValidate(virQEMUDriverPtr driver, virDomainDefCheckDuplicateDiskInfo(vm->def) < 0) return -1; - if (vm->def->mem.min_guarantee) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Parameter 'min_guarantee' " - "not supported by QEMU.")); - return -1; - } - VIR_DEBUG("Checking for any possible (non-fatal) issues"); /* -- 2.7.3

2 2

[libvirt] [python PATCH] event: Add support VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED
by Peter Krempa 18 Apr '16

18 Apr '16

--- examples/event-test.py | 4 +++ libvirt-override-virConnect.py | 9 +++++++ libvirt-override.c | 60 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+) diff --git a/examples/event-test.py b/examples/event-test.py index 5be4978..f96c917 100755 --- a/examples/event-test.py +++ b/examples/event-test.py @@ -535,6 +535,9 @@ def myDomainEventMigrationIteration(conn, dom, iteration, opaque): dom.name(), dom.ID(), iteration)) def myDomainEventJobCompletedCallback(conn, dom, params, opaque): print("myDomainEventJobCompletedCallback: Domain %s(%s) %s" % (dom.name(), dom.ID(), params)) +def myDomainEventDeviceRemovalFailedCallback(conn, dom, dev, opaque): + print("myDomainEventDeviceRemovalFailedCallback: Domain %s(%s) failed to remove device: %s" % ( + dom.name(), dom.ID(), dev)) ########################################################################## # Network events @@ -649,6 +652,7 @@ def main(): vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_DEVICE_ADDED, myDomainEventDeviceAddedCallback, None) 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.networkEventRegisterAny(None, libvirt.VIR_NETWORK_EVENT_ID_LIFECYCLE, myNetworkEventLifecycleCallback, None) diff --git a/libvirt-override-virConnect.py b/libvirt-override-virConnect.py index 396a6ed..0f76c59 100644 --- a/libvirt-override-virConnect.py +++ b/libvirt-override-virConnect.py @@ -234,6 +234,15 @@ cb(self, virDomain(self, _obj=dom), params, opaque) return 0 + def _dispatchDomainEventDeviceRemovalFailedCallback(self, dom, devAlias, cbData): + """Dispatches event to python user domain device removal failed event callbacks + """ + cb = cbData["cb"] + opaque = cbData["opaque"] + + cb(self, virDomain(self, _obj=dom), devAlias, opaque) + return 0 + def domainEventDeregisterAny(self, callbackID): """Removes a Domain Event Callback. De-registering for a domain callback will disable delivery of this event type """ diff --git a/libvirt-override.c b/libvirt-override.c index ee355da..4640ed5 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -6894,6 +6894,61 @@ libvirt_virConnectDomainEventJobCompletedCallback(virConnectPtr conn ATTRIBUTE_U } #endif /* VIR_DOMAIN_EVENT_ID_JOB_COMPLETED */ + +#ifdef VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED +static int +libvirt_virConnectDomainEventDeviceRemovalFailedCallback(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + const char *devAlias, + void *opaque) +{ + PyObject *pyobj_cbData = (PyObject*)opaque; + PyObject *pyobj_dom; + PyObject *pyobj_ret = NULL; + PyObject *pyobj_conn; + PyObject *dictKey; + int ret = -1; + + LIBVIRT_ENSURE_THREAD_STATE; + + if (!(dictKey = libvirt_constcharPtrWrap("conn"))) + goto cleanup; + pyobj_conn = PyDict_GetItem(pyobj_cbData, dictKey); + Py_DECREF(dictKey); + + /* Create a python instance of this virDomainPtr */ + virDomainRef(dom); + if (!(pyobj_dom = libvirt_virDomainPtrWrap(dom))) { + virDomainFree(dom); + goto cleanup; + } + Py_INCREF(pyobj_cbData); + + /* Call the Callback Dispatcher */ + pyobj_ret = PyObject_CallMethod(pyobj_conn, + (char*)"_dispatchDomainEventDeviceRemovalFailedCallback", + (char*)"OsO", + pyobj_dom, devAlias, pyobj_cbData); + + Py_DECREF(pyobj_cbData); + Py_DECREF(pyobj_dom); + + cleanup: + if (!pyobj_ret) { + DEBUG("%s - ret:%p\n", __FUNCTION__, pyobj_ret); + PyErr_Print(); + } else { + Py_DECREF(pyobj_ret); + ret = 0; + } + + LIBVIRT_RELEASE_THREAD_STATE; + return ret; + +} +#endif /* VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED */ + + static PyObject * libvirt_virConnectDomainEventRegisterAny(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -7004,6 +7059,11 @@ libvirt_virConnectDomainEventRegisterAny(PyObject *self ATTRIBUTE_UNUSED, cb = VIR_DOMAIN_EVENT_CALLBACK(libvirt_virConnectDomainEventJobCompletedCallback); break; #endif /* VIR_DOMAIN_EVENT_ID_JOB_COMPLETED */ +#ifdef VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED + case VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED: + cb = VIR_DOMAIN_EVENT_CALLBACK(libvirt_virConnectDomainEventDeviceRemovalFailedCallback); + break; +#endif /* VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED */ case VIR_DOMAIN_EVENT_ID_LAST: break; } -- 2.8.0

2 1

[libvirt] [libvirt-glib v2] spec: Add verification of the tarball GPG signature
by Christophe Fergeau 18 Apr '16

18 Apr '16

This at least allows to make sure that all tarballs are signed with the same GPG key, and that the tarball was not corrupted between the time it was uploaded upstream, and the time the RPM is built. danpb-BE86EBB415104FDF.gpg is generated with: gpg2 -v --armor --export 15104FDF | gpg2 --no-default-keyring --keyring ./danpb-BE86EBB415104FDF.gpg --import We cannot unconditionally enable gpg signature checks as when building from tarballs with rpmbuild -ta (for example), the needed keyring file will no be available, so this commit checks that BE86EBB415104FDF.gpg exists before attempting to do the check. --- libvirt-glib.spec.in | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) Hey, here is my attempt at addressing the issue raised with v1 (rpmbuild -ta being broken by the change). I cannot rely on the usual test on %{fedora} and %{rhel} as they are set when running rpmbuild on a fedora. Instead I added a test for the existence of the keyring file. Maybe there are better ways of writing this file existence check.. Christophe diff --git a/libvirt-glib.spec.in b/libvirt-glib.spec.in index 32ce4f0..02a27d5 100644 --- a/libvirt-glib.spec.in +++ b/libvirt-glib.spec.in @@ -1,5 +1,12 @@ # -*- rpm-spec -*- +# We cannot unconditionally enable gpg signature checks as when +# building from tarballs with rpmbuild -ta (for example), the needed +# keyring file will no be available +%define gpg_keyring danpb-BE86EBB415104FDF.gpg +%define has_gpg_keyring %(if [ -f %{gpg_keyring} ]; then echo 1; else echo 0; fi) +%define with_gpg_check %{has_gpg_keyring} + %define with_introspection 0 %define with_python 0 %define with_vala 0 @@ -28,6 +35,10 @@ Group: Development/Libraries License: LGPLv2+ URL: http://libvirt.org/ Source0: ftp://libvirt.org/libvirt/glib/%{name}-%{version}.tar.gz +%if %{with_gpg_check} +Source1: ftp://libvirt.org/libvirt/glib/%{name}-%{version}.tar.gz.asc +Source2: %{gpg_keyring} +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel >= @GLIB2_REQUIRED@ @@ -45,6 +56,9 @@ BuildRequires: libtool %if %{with_vala} BuildRequires: vala-tools %endif +%if %{with_gpg_check} +BuildRequires: gnupg2 +%endif %package devel Group: Development/Libraries @@ -109,6 +123,9 @@ libvirt and the glib event loop %endif %prep +%if %{with_gpg_check} +gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} +%endif %setup -q %build -- 2.5.5

1 0

[libvirt] [PATCH] tests: Fix syntax in iSCSI auth/secret tests
by John Ferlan 18 Apr '16

18 Apr '16

While working on the tests for the secret initialization vector, I found that the existing iSCSI tests were lacking in how they defined the IQN. Many had IQN's of just 'iqn.1992-01.com.example' for one disk while using 'iqn.1992-01.com.example/1' for the second disk (same for hostdevs - guess how they were copied/generated). Typically (and documented this way), IQN's would include be of the form 'iqn.1992-01.com.example:storage/1' indicating an IQN using "storage" for naming authority specific string and "/1" for the iSCSI LUN. So modify the input XML's to use the more proper format - this of course has a ripple effect on the output XML and the args. Also note that the "%3A" is generated by the virURIFormat/xmlSaveUri to represent the colon. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- .../qemuargv2xml-disk-drive-network-iscsi-auth.args | 6 +++--- .../qemuargv2xml-disk-drive-network-iscsi-auth.xml | 4 ++-- .../qemuxml2argv-disk-drive-network-iscsi-auth.args | 8 +++++--- .../qemuxml2argv-disk-drive-network-iscsi-auth.xml | 7 +++++-- .../qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args | 4 ++-- .../qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.xml | 4 ++-- .../qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args | 4 ++-- .../qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.xml | 4 ++-- .../qemuxml2xmlout-disk-drive-network-iscsi-auth.xml | 7 +++++-- .../qemuxml2xmlout-hostdev-scsi-lsi-iscsi-auth.xml | 4 ++-- .../qemuxml2xmlout-hostdev-scsi-virtio-iscsi-auth.xml | 4 ++-- 11 files changed, 32 insertions(+), 24 deletions(-) diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.args b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.args index 5bebcae..44c9506 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.args +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.args @@ -17,9 +17,9 @@ QEMU_AUDIO_DRV=none \ -boot c \ -usb \ -drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\ -6000/iqn.1992-01.com.example,format=raw,if=virtio \ --drive file=iscsi://example.org:6000/iqn.1992-01.com.example/1,format=raw,\ -if=virtio \ +6000/iqn.1992-01.com.example%3Astorage/1,format=raw,if=virtio \ +-drive file=iscsi://example.org:6000/iqn.1992-01.com.example%3Astorage/2,\ +format=raw,if=virtio \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.xml index 35b3abc..b5f948b 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.xml @@ -19,14 +19,14 @@ <auth username='myname'> <secret type='iscsi' usage='qemuargv2xml_usage'/> </auth> - <source protocol='iscsi' name='iqn.1992-01.com.example'> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/1'> <host name='example.org' port='6000'/> </source> <target dev='vda' bus='virtio'/> </disk> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> - <source protocol='iscsi' name='iqn.1992-01.com.example/1'> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/2'> <host name='example.org' port='6000'/> </source> <target dev='vdb' bus='virtio'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.args index 735a0ae..66e2497 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.args @@ -18,10 +18,12 @@ QEMU_AUDIO_DRV=none \ -boot c \ -usb \ -drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\ -6000/iqn.1992-01.com.example,format=raw,if=none,id=drive-virtio-disk0 \ +6000/iqn.1992-01.com.example%3Astorage/1,format=raw,if=none,\ +id=drive-virtio-disk0 \ -device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\ id=virtio-disk0 \ --drive file=iscsi://example.org:6000/iqn.1992-01.com.example/1,format=raw,\ -if=none,id=drive-virtio-disk1 \ +-drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\ +6000/iqn.1992-01.com.example%3Astorage/2,format=raw,if=none,\ +id=drive-virtio-disk1 \ -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,\ id=virtio-disk1 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.xml index 5ac4abf..1f80d3b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.xml @@ -19,14 +19,17 @@ <auth username='myname'> <secret type='iscsi' usage='mycluster_myname'/> </auth> - <source protocol='iscsi' name='iqn.1992-01.com.example'> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/1'> <host name='example.org' port='6000'/> </source> <target dev='vda' bus='virtio'/> </disk> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> - <source protocol='iscsi' name='iqn.1992-01.com.example/1'> + <auth username='myname'> + <secret type='iscsi' usage='mycluster_myname'/> + </auth> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/2'> <host name='example.org' port='6000'/> </source> <target dev='vdb' bus='virtio'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args index 2bd98e5..ff6655f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args @@ -21,9 +21,9 @@ QEMU_AUDIO_DRV=none \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\ -3260/iqn.1992-01.com.example,if=none,format=raw,id=drive-hostdev0 \ +3260/iqn.1992-01.com.example%3Astorage/1,if=none,format=raw,id=drive-hostdev0 \ -device scsi-generic,bus=scsi0.0,scsi-id=4,drive=drive-hostdev0,id=hostdev0 \ -drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\ -3260/iqn.1992-01.com.example/1,if=none,format=raw,id=drive-hostdev1 \ +3260/iqn.1992-01.com.example%3Astorage/2,if=none,format=raw,id=drive-hostdev1 \ -device scsi-generic,bus=scsi0.0,scsi-id=5,drive=drive-hostdev1,id=hostdev1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.xml b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.xml index ed2bf25..f988165 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.xml @@ -26,7 +26,7 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <hostdev mode='subsystem' type='scsi' managed='yes'> - <source protocol='iscsi' name='iqn.1992-01.com.example'> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/1'> <host name='example.org' port='3260'/> <auth username='myname'> <secret type='iscsi' usage='mycluster_myname'/> @@ -35,7 +35,7 @@ <address type='drive' controller='0' bus='0' target='0' unit='4'/> </hostdev> <hostdev mode='subsystem' type='scsi' managed='yes'> - <source protocol='iscsi' name='iqn.1992-01.com.example/1'> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/2'> <host name='example.org' port='3260'/> <auth username='myname'> <secret type='iscsi' usage='mycluster_myname'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args index 624be94..42113c8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args @@ -21,11 +21,11 @@ QEMU_AUDIO_DRV=none \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\ -3260/iqn.1992-01.com.example,if=none,format=raw,id=drive-hostdev0 \ +3260/iqn.1992-01.com.example%3Astorage/1,if=none,format=raw,id=drive-hostdev0 \ -device scsi-generic,bus=scsi0.0,channel=0,scsi-id=2,lun=4,drive=drive-hostdev0,\ id=hostdev0 \ -drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\ -3260/iqn.1992-01.com.example/1,if=none,format=raw,id=drive-hostdev1 \ +3260/iqn.1992-01.com.example%3Astorage/2,if=none,format=raw,id=drive-hostdev1 \ -device scsi-generic,bus=scsi0.0,channel=0,scsi-id=2,lun=5,drive=drive-hostdev1,\ id=hostdev1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.xml b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.xml index 33577ab..b70b84e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.xml @@ -26,7 +26,7 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <hostdev mode='subsystem' type='scsi' managed='yes'> - <source protocol='iscsi' name='iqn.1992-01.com.example'> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/1'> <host name='example.org' port='3260'/> <auth username='myname'> <secret type='iscsi' usage='mycluster_myname'/> @@ -35,7 +35,7 @@ <address type='drive' controller='0' bus='0' target='2' unit='4'/> </hostdev> <hostdev mode='subsystem' type='scsi' managed='yes'> - <source protocol='iscsi' name='iqn.1992-01.com.example/1'> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/2'> <host name='example.org' port='3260'/> <auth username='myname'> <secret type='iscsi' usage='mycluster_myname'/> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-iscsi-auth.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-iscsi-auth.xml index 4f0e87f..fc8aba1 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-iscsi-auth.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-iscsi-auth.xml @@ -19,7 +19,7 @@ <auth username='myname'> <secret type='iscsi' usage='mycluster_myname'/> </auth> - <source protocol='iscsi' name='iqn.1992-01.com.example'> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/1'> <host name='example.org' port='6000'/> </source> <target dev='vda' bus='virtio'/> @@ -27,7 +27,10 @@ </disk> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> - <source protocol='iscsi' name='iqn.1992-01.com.example/1'> + <auth username='myname'> + <secret type='iscsi' usage='mycluster_myname'/> + </auth> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/2'> <host name='example.org' port='6000'/> </source> <target dev='vdb' bus='virtio'/> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-lsi-iscsi-auth.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-lsi-iscsi-auth.xml index 5ed4095..1db5ed9 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-lsi-iscsi-auth.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-lsi-iscsi-auth.xml @@ -32,7 +32,7 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <hostdev mode='subsystem' type='scsi' managed='yes'> - <source protocol='iscsi' name='iqn.1992-01.com.example'> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/1'> <host name='example.org' port='3260'/> <auth username='myname'> <secret type='iscsi' usage='mycluster_myname'/> @@ -41,7 +41,7 @@ <address type='drive' controller='0' bus='0' target='0' unit='4'/> </hostdev> <hostdev mode='subsystem' type='scsi' managed='yes'> - <source protocol='iscsi' name='iqn.1992-01.com.example/1'> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/2'> <host name='example.org' port='3260'/> <auth username='myname'> <secret type='iscsi' usage='mycluster_myname'/> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-virtio-iscsi-auth.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-virtio-iscsi-auth.xml index a5d3b8e..64c149f 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-virtio-iscsi-auth.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-virtio-iscsi-auth.xml @@ -32,7 +32,7 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <hostdev mode='subsystem' type='scsi' managed='yes'> - <source protocol='iscsi' name='iqn.1992-01.com.example'> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/1'> <host name='example.org' port='3260'/> <auth username='myname'> <secret type='iscsi' usage='mycluster_myname'/> @@ -41,7 +41,7 @@ <address type='drive' controller='0' bus='0' target='2' unit='4'/> </hostdev> <hostdev mode='subsystem' type='scsi' managed='yes'> - <source protocol='iscsi' name='iqn.1992-01.com.example/1'> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/2'> <host name='example.org' port='3260'/> <auth username='myname'> <secret type='iscsi' usage='mycluster_myname'/> -- 2.5.5

2 1

[libvirt] [PATCH] ZFS: Support sparse volumes
by Richard Laager 17 Apr '16

17 Apr '16

By default, `zfs create -V ...` reserves space for the entire volsize, plus some extra (which attempts to account for overhead). If `zfs create -s -V ...` is used instead, zvols are (fully) sparse. A middle ground (partial allocation) can be achieved with `zfs create -s -o refreservation=... -V ...`. Both libvirt and ZFS support this approach, so the ZFS storage backend should support it. Signed-off-by: Richard Laager <rlaager(a)wiktel.com> --- src/storage/storage_backend_zfs.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/src/storage/storage_backend_zfs.c b/src/storage/storage_backend_zfs.c index 2e6e407..6dc3cec 100644 --- a/src/storage/storage_backend_zfs.c +++ b/src/storage/storage_backend_zfs.c @@ -112,7 +112,7 @@ virStorageBackendZFSParseVol(virStoragePoolObjPtr pool, if (!(tokens = virStringSplitCount(volume_string, "\t", 0, &count))) return -1; - if (count != 2) + if (count != 3) goto cleanup; if (!(name_tokens = virStringSplit(tokens[0], "/", 2))) @@ -151,6 +151,20 @@ virStorageBackendZFSParseVol(virStoragePoolObjPtr pool, goto cleanup; } + if (virStrToLong_ull(tokens[2], NULL, 10, &volume->target.allocation) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("malformed refreservation reported")); + goto cleanup; + } + if (volume->target.allocation >= volume->target.capacity) { + /* A zvol created without -s will have a refreservation slightly larger + * than volblocksize. + */ + volume->target.allocation = volume->target.capacity; + } else { + volume->target.sparse = true; + } + if (is_new_vol && VIR_APPEND_ELEMENT(pool->volumes.objs, pool->volumes.count, @@ -190,7 +204,7 @@ virStorageBackendZFSFindVols(virStoragePoolObjPtr pool, cmd = virCommandNewArgList(ZFS, "list", "-Hp", "-t", "volume", "-r", - "-o", "name,volsize", + "-o", "name,volsize,refreservation", pool->def->source.name, NULL); virCommandSetOutputBuffer(cmd, &volumes_list); @@ -320,15 +334,28 @@ virStorageBackendZFSCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, goto cleanup; /** * $ zfs create -o volmode=dev -V 10240K test/volname + * $ zfs create -o volmode=dev -s -V 10240K test/volname + * $ zfs create -o volmode=dev -s -o refreservation=1024K -V 10240K test/volname * * -o volmode=dev -- we want to get volumes exposed as cdev * devices. If we don't specify that zfs * will lookup vfs.zfs.vol.mode sysctl value + * -s -- create a sparse volume + * -o refreservation -- reserve the specified amount of space * -V -- tells to create a volume with the specified size */ cmd = virCommandNewArgList(ZFS, "create", NULL); if (volmode_needed) virCommandAddArgList(cmd, "-o", "volmode=dev", NULL); + if (vol->target.capacity != vol->target.allocation) { + virCommandAddArg(cmd, "-s"); + if (vol->target.allocation > 0) { + virCommandAddArg(cmd, "-o"); + virCommandAddArgFormat(cmd, "refreservation=%lluK", + VIR_DIV_UP(vol->target.allocation, 1024)); + } + vol->target.sparse = true; + } virCommandAddArg(cmd, "-V"); virCommandAddArgFormat(cmd, "%lluK", VIR_DIV_UP(vol->target.capacity, 1024)); -- 2.1.4

2 7

[libvirt] [libvirt-sandbox PATCH] virt-sandbox: document how to pass arguments to commands
by Guido Günther 17 Apr '16

17 Apr '16

The example was already correct but the synopsis didn't mention '--' is required. --- bin/virt-sandbox.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/virt-sandbox.c b/bin/virt-sandbox.c index 9495e85..d6a441c 100644 --- a/bin/virt-sandbox.c +++ b/bin/virt-sandbox.c @@ -345,7 +345,9 @@ virt-sandbox - Run cmd under a virtual machine sandbox =head1 SYNOPSIS -virt-sandbox [OPTIONS...] COMMAND [CMDARG1 [CMDARG2 [...]]] +virt-sandbox [OPTIONS...] COMMAND + +virt-sandbox [OPTIONS...] -- COMMAND [CMDARG1 [CMDARG2 [...]]] =head1 DESCRIPTION -- 2.8.0.rc3

2 2

Re: [libvirt] [PATCH] storage_scsi: Handle physical HBA when deleting vHBA vport.
by John Ferlan 16 Apr '16

16 Apr '16

On 04/15/2016 02:26 PM, Nitesh Konkar wrote: > On Fri, Apr 15, 2016 at 8:08 PM, John Ferlan <jferlan(a)redhat.com> wrote: > Please do not remove libvir-list from a response. I've replaced it. Someone may have a different idea. >> >> >> On 04/15/2016 10:11 AM, Nitesh Konkar wrote: >>> Thanks John for the reply. >>> >>> On Fri, Apr 15, 2016 at 5:08 PM, John Ferlan <jferlan(a)redhat.com> wrote: >>> >>>> >>>> >>>> On 04/07/2016 05:09 AM, Nitesh Konkar wrote: >>>>> HBA will get treated as vHBA if not returned >>>>> after detecting vhba_parent format. >>>>> >>>>> Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> >>>>> --- >>>>> Before Patch: >>>>> # virsh pool-destroy poolhba_name >>>>> error: Failed to destroy pool poolhba_name >>>>> error: internal error: Invalid adapter name 'pci_000x_0x_00_x' for SCSI >>>> pool >>>>> >>>>> # virsh nodedev-dumpxml scsi_host2 >>>>> <device> >>>>> <name>scsi_host2</name> >>>>> <path>xxxx</path> >>>>> <parent>pci_000x_0x_00_x</parent> >>>>> <capability type='scsi_host'> >>>>> <host>2</host> >>>>> ... >>>>> ... >>>>> <capability type='vport_ops'> >>>>> <max_vports>255</max_vports> >>>>> <vports>0</vports> >>>>> </capability> >>>>> </capability> >>>>> </device> >>>>> >>>>> After Patch: >>>>> # virsh pool-destroy poolhba_name >>>>> Pool poolhba_name destroyed >>>>> >>>>> src/storage/storage_backend_scsi.c | 5 +++++ >>>>> 1 file changed, 5 insertions(+) >>>>> >>>> >>>> Can you provide the pool-dumpxml for poolhba_name? Can you provide the >>>> nodedev-dumpxml of the 'scsi_host#' that was created for the vHBA pool? >>>> >>>> >>> This patch is to destroy a pool created out from a Physical HBA. >> Apologies, >>> if the >>> commit message was misleading. >>> >>> # virsh pool-dumpxml poolhba_name >>> <pool type='scsi'> >>> <name>poolhba_name</name> >>> <uuid>60d74134-0c18-4d4f-9305-24d96ce1a1b6</uuid> >>> <capacity unit='bytes'>268435456000</capacity> >>> <allocation unit='bytes'>268435456000</allocation> >>> <available unit='bytes'>0</available> >>> <source> >>> <adapter type='fc_host' managed='yes' wwnn='20000120fa8f1271' >>> wwpn='10000090fa8f1271'/> >>> </source> >>> <target> >>> <path>/dev/disk/by-id</path> >>> <permissions> >>> <mode>0700</mode> >>> <owner>0</owner> >>> <group>0</group> >>> </permissions> >>> </target> >>> </pool> >>> >> >> OK, maybe I wasn't clear enough... Which 'scsi_host#' is *this* pool >> associated with. Prior to creating it, do a virsh nodedev-list >> scsi_host. Then create it. Then generate the list again. >> >> The pool poolhba_name is associated with scsi_host2. > > #virsh list --all > Id Name State > ---------------------------------------------------- > > # virsh nodedev-list scsi_host > scsi_host0 > scsi_host1 > scsi_host2 > scsi_host3 > scsi_host4 > > #virsh pool-list --all > Name State Autostart > ------------------------------------------- > poolhba_name active yes > > # virsh nodedev-dumpxml scsi_host2 > <device> > <name>scsi_host2</name> > > <path>/sys/devices/pci0001:00/0001:00:00.0/0001:01:00.0/0001:02:09.0/0001:09:00.1/host2</path> > <parent>pci_0001_09_00_1</parent> > <capability type='scsi_host'> > <host>2</host> > <unique_id>1</unique_id> > <capability type='fc_host'> > <wwnn>20000120fa8f1271</wwnn> > <wwpn>10000090fa8f1271</wwpn> > <fabric_wwn>100050eb1a99d430</fabric_wwn> > </capability> > <capability type='vport_ops'> > <max_vports>255</max_vports> > <vports>1</vports> > </capability> > </capability> > </device> > > Or of course since you cannot delete the poolvhba_name, go through the >> various scsi_host#'s on your host looking for the one with the match >> wwwn/wwpn - then do the nodedev-dumpxml of that. For you example you >> are looking for the scsi_host# with the matching wwnn='20000120fa8f1271' >> and wwpn='10000090fa8f1271'. >> >> That one is supposed to list 'scsi_host2' in the <parent> field as my >> 'scsi_host19' does below. >> >> # virsh pool-list --all > Name State Autostart > ------------------------------------------- > poolhba_name active yes > > # virsh nodedev-dumpxml scsi_host2 > <device> > <name>scsi_host2</name> > > <path>/sys/devices/pci0001:00/0001:00:00.0/0001:01:00.0/0001:02:09.0/0001:09:00.1/host2</path> > <parent>pci_0001_09_00_1</parent> > <capability type='scsi_host'> > <host>2</host> > <unique_id>1</unique_id> > <capability type='fc_host'> > <wwnn>20000120fa8f1271</wwnn> > <wwpn>10000090fa8f1271</wwpn> > <fabric_wwn>100050eb1a99d430</fabric_wwn> > </capability> > <capability type='vport_ops'> > <max_vports>255</max_vports> > <vports>1</vports> > </capability> > </capability> > </device> > > Here the parent field has "pci_0001_09_00_1" and not 'scsi_host2' . This is > why it errors out. > > # virsh pool-destroy poolhba_name > 2016-04-15 18:21:07.054+0000: 113209: error : virGetSCSIHostNumber:1922 : > internal error: Invalid adapter name 'pci_0001_09_00_1' for SCSI pool > error: Failed to destroy pool poolhba_name > error: internal error: Invalid adapter name 'pci_0001_09_00_1' for SCSI pool > > Am I missing something? > Perhaps - I think I explained how the vHBA is created before... Look at the code for createVport() - see the 'parent_hoststr' description. When you did a pool-{create|define} for the "poolhba_name", you provided some XML which would search the existing 'scsi_host#' for one that's capable of supporting a vHBA. What that create is supposed to do (at least it does it on the systems I used) is create another 'scsi_host#'. That scsi_host# is then the vHBA - it's *parent* is supposed to be 'scsi_host2' - see my example. On your host perhaps scsi_host3 or scsi_host4. Do either one of those two have the wwnn/wwpn that's in your poolhba_name: <adapter type='fc_host' managed='yes' wwnn='20000120fa8f1271' wwpn='10000090fa8f1271'/> I'm really not quite sure what's happening on your host/environment. Perhaps you could follow how createVport generates things and report back. You can always 'create' another vHBA using a different wwnn/wwpn John

1 0

[libvirt] [PATCH libvirt v2 0/2] libxl: support vscsi
by Olaf Hering 16 Apr '16

16 Apr '16

Add support for upcoming vscsi= in libxl. Changes between v1 and v2: - rebase to 'master' (ad584cb) - Update API to v12 Olaf Hering (2): libxl: include a XLU_Config in _libxlDriverConfig libxl: support vscsi src/libxl/libxl_conf.c | 66 +++++++++++++++++ src/libxl/libxl_conf.h | 8 ++ src/libxl/libxl_domain.c | 2 +- src/libxl/libxl_driver.c | 187 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 262 insertions(+), 1 deletion(-)

2 5

[libvirt] [PATCH] libxl config file convertion: correct `type=netfront' to 'type=vif'
by Chunyan Liu 15 Apr '16

15 Apr '16

According to current xl.cfg docs and xl codes, it uses type=vif instead of type=netfront. Currently after domxml-to-native, libvirt xml model=netfront will be converted to xl type=netfront. This has no problem before, xen codes for a long time just check type=ioemu, if not, set type to _VIF. Since libxl uses parse_nic_config to avoid duplicate codes, it compares 'type=vif' and 'type=ioemu' for valid parameters, others are considered as invalid, thus we have problem with type=netfront in xl config file. #xl create sles12gm-hvm.orig Parsing config from sles12gm-hvm.orig Invalid parameter `type'. Correct the convertion in libvirt, so that it matchs libxl codes and also xl.cfg. Signed-off-by: Chunyan Liu <cyliu(a)suse.com> --- Since type=netfront config has been used for a very long time, at lease for xm/xend, it has no problem. I'm not sure if we need to split into xenParseXLVif vs xenParseXMVif, and xenFormatXLVif vs xenFormatXMVif for this change? src/xenconfig/xen_common.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c index 4dcd484..ae81635 100644 --- a/src/xenconfig/xen_common.c +++ b/src/xenconfig/xen_common.c @@ -944,7 +944,8 @@ xenParseVif(virConfPtr conf, virDomainDefPtr def) VIR_STRDUP(net->model, model) < 0) goto cleanup; - if (!model[0] && type[0] && STREQ(type, "netfront") && + if (!model[0] && type[0] && + (STREQ(type, "netfront") || STREQ(type, "vif")) && VIR_STRDUP(net->model, "netfront") < 0) goto cleanup; @@ -1201,7 +1202,7 @@ xenFormatNet(virConnectPtr conn, virBufferAsprintf(&buf, ",model=%s", net->model); } else { if (net->model != NULL && STREQ(net->model, "netfront")) { - virBufferAddLit(&buf, ",type=netfront"); + virBufferAddLit(&buf, ",type=vif"); } else { if (net->model != NULL) virBufferAsprintf(&buf, ",model=%s", net->model); -- 2.1.4

3 2

[libvirt] [PATCH V2] libxl: use LIBXL_API_VERSION 0x040200
by Jim Fehlig 15 Apr '16

15 Apr '16

To ensure the libvirt libxl driver will build with future versions of Xen where the libxl API may change in incompatible ways, explicitly use LIBXL_API_VERSION 0x040200. The libxl driver does use new libxl APIs that have been added since Xen 4.2, but currently it does not make use of any changes made to existing APIs such as libxl_domain_create_restore or libxl_set_vcpuaffinity. The version can be bumped if/when the libxl driver consumes the changed APIs. Further details can be found in the following discussion thread https://www.redhat.com/archives/libvir-list/2016-April/msg00178.html Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- configure.ac | 2 ++ src/libxl/libxl_conf.h | 12 ------------ src/libxl/libxl_domain.c | 15 --------------- 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/configure.ac b/configure.ac index b1500f6..446f2a2 100644 --- a/configure.ac +++ b/configure.ac @@ -894,6 +894,7 @@ if test "$with_libxl" != "no" ; then PKG_CHECK_MODULES([LIBXL], [xenlight], [ LIBXL_FIRMWARE_DIR=`$PKG_CONFIG --variable xenfirmwaredir xenlight` LIBXL_EXECBIN_DIR=`$PKG_CONFIG --variable libexec_bin xenlight` + LIBXL_CFLAGS="$LIBXL_CFLAGS -DLIBXL_API_VERSION=0x040200" with_libxl=yes ], [LIBXL_FOUND=no]) if test "$LIBXL_FOUND" = "no"; then @@ -906,6 +907,7 @@ if test "$with_libxl" != "no" ; then LIBS="$LIBS $LIBXL_LIBS" AC_CHECK_LIB([xenlight], [libxl_ctx_alloc], [ with_libxl=yes + LIBXL_CFLAGS="$LIBXL_CFLAGS -DLIBXL_API_VERSION=0x040200" LIBXL_LIBS="$LIBXL_LIBS -lxenlight" ],[ if test "$with_libxl" = "yes"; then diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index 3c0eafb..24e2911 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -69,18 +69,6 @@ # endif -/* libxl interface for setting VCPU affinity changed in 4.5. In fact, a new - * parameter has been added, representative of 'VCPU soft affinity'. If one - * does not care about it (and that's libvirt case), passing NULL is the - * right thing to do. To mark that change, LIBXL_HAVE_VCPUINFO_SOFT_AFFINITY - * is defined. */ -# ifdef LIBXL_HAVE_VCPUINFO_SOFT_AFFINITY -# define libxl_set_vcpuaffinity(ctx, domid, vcpuid, map) \ - libxl_set_vcpuaffinity((ctx), (domid), (vcpuid), (map), NULL) -# define libxl_set_vcpuaffinity_all(ctx, domid, max_vcpus, map) \ - libxl_set_vcpuaffinity_all((ctx), (domid), (max_vcpus), (map), NULL) -# endif - typedef struct _libxlDriverPrivate libxlDriverPrivate; typedef libxlDriverPrivate *libxlDriverPrivatePtr; diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 86fb713..14a900c 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -1026,9 +1026,6 @@ libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, int managed_save_fd = -1; libxlDomainObjPrivatePtr priv = vm->privateData; libxlDriverConfigPtr cfg; -#ifdef LIBXL_HAVE_DOMAIN_CREATE_RESTORE_PARAMS - libxl_domain_restore_params params; -#endif virHostdevManagerPtr hostdev_mgr = driver->hostdevMgr; libxl_asyncprogress_how aop_console_how; @@ -1118,20 +1115,8 @@ libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, ret = libxl_domain_create_new(cfg->ctx, &d_config, &domid, NULL, &aop_console_how); } else { -#if defined(LIBXL_HAVE_DOMAIN_CREATE_RESTORE_SEND_BACK_FD) - params.checkpointed_stream = 0; - ret = libxl_domain_create_restore(cfg->ctx, &d_config, &domid, - restore_fd, -1, &params, NULL, - &aop_console_how); -#elif defined(LIBXL_HAVE_DOMAIN_CREATE_RESTORE_PARAMS) - params.checkpointed_stream = 0; - ret = libxl_domain_create_restore(cfg->ctx, &d_config, &domid, - restore_fd, &params, NULL, - &aop_console_how); -#else ret = libxl_domain_create_restore(cfg->ctx, &d_config, &domid, restore_fd, NULL, &aop_console_how); -#endif } virObjectLock(vm); -- 2.6.1

3 3

[libvirt] Regarding PCI/PCIe Multifunction hotplug support in libvirt
by Shivaprasad bhat 15 Apr '16

15 Apr '16

Hi All, I am exploring how to go about supporting multi-function hot-plug/unplug support from libvirt now that Qemu has enabled it. The Qemu semantics is that, qemu queues the notification to guest until function 0 is hot- plugged and on function 0 hot-plug, all the previously added devices in the slot are notified to the guest. For hot-unplug - On x86, unplug of any device in the slot would unplug all the functions of the slot. On PPC, unplug all non-zero functions first, then unplug the function zero which triggers the unplug of all the functions in the slot. On Libvirt, I had a brief chat with Laine Stump on IRC and we "think" the below semantics would be appropriate. 1) Change the virDomainAttachDeviceFlags() to recognize multiple devices in the XML and the application should make one call to attach all the functions for the slot at one time. 2) The libvirt qemu driver to translate this into multiple attach device commands to qemu with the final operation being for function 0. 3) The XML now needs to accept multiple devices and there is a need for single parent element. I am thinking if we should have all devices to be enclosed in <device></device> parent element. Note that this is only when all the devices should go to the same slot. We probably should disallow user attempting to hot-plug to different slots with this. 4) For the hot-unplug, the application to send all the devices the same way enclosed in <device></devices> and libvirt to go ahead with unplug only if all the devices are specified in the XML for the slot. Want to know if you foresee any problem with using <device></device> semantics Or you have any different approach/suggestions. Any comments greatly appreciated. Thanks and Regards, Shivaprasad

2 1

[libvirt] [PATCH v2 0/4] Fix parsing our own XMLs
by Martin Kletzander 15 Apr '16

15 Apr '16

v2: - Just a rebase - I did *not* use virPCIDeviceAddress wording instead as discussed in the v1 thread. That's because we have lot of functions working with virDevicePCIAddress named exactly after that and renaming those would be ugly IMHO. v1: - https://www.redhat.com/archives/libvir-list/2016-April/msg00081.html Martin Kletzander (4): Change virPCIDeviceAddress to virDevicePCIAddress Move capability formatting together schemas: Update nodedev schema to match reality conf: Parse more of our nodedev XML docs/schemas/nodedev.rng | 29 +++--- src/conf/device_conf.h | 11 +-- src/conf/node_device_conf.c | 109 +++++++++++++++++++-- src/conf/node_device_conf.h | 6 +- src/libvirt_private.syms | 10 +- src/network/bridge_driver.c | 4 +- src/node_device/node_device_linux_sysfs.c | 6 +- src/util/virhostdev.c | 12 +-- src/util/virnetdev.c | 4 +- src/util/virnetdev.h | 2 +- src/util/virpci.c | 80 +++++++-------- src/util/virpci.h | 29 +++--- .../pci_0000_00_1c_0_header_type.xml | 2 +- tests/nodedevschemadata/pci_0000_02_10_7_sriov.xml | 23 +++++ .../pci_0000_02_10_7_sriov_pf_vfs_all.xml | 29 ++++++ ...i_0000_02_10_7_sriov_pf_vfs_all_header_type.xml | 30 ++++++ .../pci_0000_02_10_7_sriov_vfs.xml | 26 +++++ .../pci_0000_02_10_7_sriov_zero_vfs_max_count.xml | 21 ++++ tests/nodedevxml2xmltest.c | 7 ++ 19 files changed, 335 insertions(+), 105 deletions(-) create mode 100644 tests/nodedevschemadata/pci_0000_02_10_7_sriov.xml create mode 100644 tests/nodedevschemadata/pci_0000_02_10_7_sriov_pf_vfs_all.xml create mode 100644 tests/nodedevschemadata/pci_0000_02_10_7_sriov_pf_vfs_all_header_type.xml create mode 100644 tests/nodedevschemadata/pci_0000_02_10_7_sriov_vfs.xml create mode 100644 tests/nodedevschemadata/pci_0000_02_10_7_sriov_zero_vfs_max_count.xml -- 2.8.1

2 8

[libvirt] [PATCH] ploop: Fix build with gluster
by Jiri Denemark 15 Apr '16

15 Apr '16

Recent patches addiing support for ploop volumes did not properly update gluster backend. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Pushed as a build-breaker. src/storage/storage_backend_gluster.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c index d2e79bc..0085052 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -435,6 +435,7 @@ virStorageBackendGlusterVolDelete(virConnectPtr conn ATTRIBUTE_UNUSED, case VIR_STORAGE_VOL_FILE: case VIR_STORAGE_VOL_DIR: case VIR_STORAGE_VOL_BLOCK: + case VIR_STORAGE_VOL_PLOOP: case VIR_STORAGE_VOL_LAST: virReportError(VIR_ERR_NO_SUPPORT, _("removing of '%s' volumes is not supported " -- 2.8.1

1 0

[libvirt] [PATCH v5] Add functions for handling exponential backoff loops.
by Richard W.M. Jones 15 Apr '16

15 Apr '16

v4b -> v5: - Move documentation to .c file. - Change the name of the while function to virTimeBackOffWait. Rich.

3 5

[libvirt] [PATCH v6 0/7] storage:dir: ploop volumes support
by Olga Krishtal 15 Apr '16

15 Apr '16

This series of patches introduces the support of ploop volumes in storage pools (dir, fs, etc). Ploop volume is a disk loopback block device consists of root.hds (it is the image file) and DiskDescriptor.xml: https://openvz.org/Ploop/format. Due to this fact it can't be treated as file or any other volume type, moreover, in order to successfully manipulate with such volume, ploop tools should be installed. All callbacks except the wipeVol are supported. First patch introduces ploop volume type. This is a directory with two files inside. The name of the directory is the name of the volume. Patch 2 deals with creating an empty volume and cloning the existing one. Clone is done via simle cp operation. If any of this operation fails - directory will be deleted. Patch 3 deletes recursively ploop directory. Patch 4 uses ploop tool to resize volume. Patch 6 adapts all refreshing functions to work with ploop. To get information the directory is checked. The volume is treated as the ploops one only if it contains ploop files. Every time the pool is refreshed DiskDescriptor.xml is restored. This is necessary, because the content of the volume may have changed. Upload and download (patch 7) can't be done if the volume contains snapshots. v6: - There is no DiskDescriptor.xml restoring during the refresh pool operation. This operation is moved to storage driver. - fixed issue with regenerating xml for ploop volume with the snapshots. v5: - added ploop volume type - there is no change in opening volume functions. Now reopening takes place is the volume is ploops one. - restore DiskDescriptor.xml every refresh pool - all information, except format is taken from header - forbidden upload and download ops for volume with snapshots - there is no separate function for deleting the volume - fixed identation and leaks v4: - fixed identation issues. - in case of .uploadVol, DiskDescriptor.xml is restored. - added check of ploops'accessibility v3: - no VIR_STORAGE_VOL_PLOOP type any more - adapted all patches according to previous change - fixed comments v2: - fixed memory leak - chenged the return value of all helper functions to 0/-1. Now check for success is smth like that: vir****Ploop() < 0 - fixed some identation issues.

2 16

[libvirt] [PATCH] storage_scsi: Handle physical HBA when deleting vHBA vport.
by Nitesh Konkar 15 Apr '16

15 Apr '16

HBA will get treated as vHBA if not returned after detecting vhba_parent format. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- Before Patch: # virsh pool-destroy poolhba_name error: Failed to destroy pool poolhba_name error: internal error: Invalid adapter name 'pci_000x_0x_00_x' for SCSI pool # virsh nodedev-dumpxml scsi_host2 <device> <name>scsi_host2</name> <path>xxxx</path> <parent>pci_000x_0x_00_x</parent> <capability type='scsi_host'> <host>2</host> ... ... <capability type='vport_ops'> <max_vports>255</max_vports> <vports>0</vports> </capability> </capability> </device> After Patch: # virsh pool-destroy poolhba_name Pool poolhba_name destroyed src/storage/storage_backend_scsi.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index e6c8bb5..dd0343f 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -842,6 +842,11 @@ deleteVport(virConnectPtr conn, if (!(vhba_parent = virStoragePoolGetVhbaSCSIHostParent(conn, name))) goto cleanup; + if (STRPREFIX(vhba_parent, "pci")) { + ret = 0; + goto cleanup; + } + if (virGetSCSIHostNumber(vhba_parent, &parent_host) < 0) goto cleanup; } -- 1.8.3.1

2 4

[libvirt] [PATCH 0/4] syntax-check: Minor cleanups
by Andrea Bolognani 15 Apr '16

15 Apr '16

Ran into something confusing while working on something unrelated, ended up making a few tiny cleanups. Cheers. Andrea Bolognani (4): util: Fix 'exempt from syntax-check' comment cfg.mk: Remove spurious whitespace cfg.mk: Use single quotes wherever possible cfg.mk: Always enclose syntax-check error messages in quotes cfg.mk | 36 ++++++++++++++++++------------------ src/util/virutil.c | 4 ++-- 2 files changed, 20 insertions(+), 20 deletions(-) -- 2.5.5

2 13

[libvirt] [PATCH] qemu: Remove redundant DomainObjIsActive check
by Cole Robinson 15 Apr '16

15 Apr '16

We perform the same check several lines earlier --- src/qemu/qemu_driver.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e795062..ced808a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18403,32 +18403,26 @@ qemuDomainQemuAgentCommand(virDomainPtr domain, if (!virDomainObjIsActive(vm)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto cleanup; } if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; if (!qemuDomainAgentAvailable(vm, true)) goto endjob; - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("domain is not running")); - goto endjob; - } - qemuDomainObjEnterAgent(vm); ret = qemuAgentArbitraryCommand(priv->agent, cmd, &result, timeout); qemuDomainObjExitAgent(vm); if (ret < 0) VIR_FREE(result); endjob: qemuDomainObjEndJob(driver, vm); cleanup: virDomainObjEndAPI(&vm); return result; } -- 2.7.3

2 3

[libvirt] [PATCH] Return error when --start <number> in cpu-stats is invalid.
by Nitesh Konkar 15 Apr '16

15 Apr '16

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- # virsh cpu-stats --domain 40 --start 159 CPU159: cpu_time 0.000000000 seconds vcpu_time 0.000000000 seconds # virsh cpu-stats --domain 40 --start 160 Start cpu 160 larger than maximum of 159. tools/virsh-domain.c | 6 ++++++ 1 files changed, 6 insertions(+) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 800829e..3d6b626 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -7357,6 +7357,12 @@ cmdCPUStats(vshControl *ctl, const vshCmd *cmd) /* get number of cpus on the node */ if ((max_id = virDomainGetCPUStats(dom, NULL, 0, 0, 0, 0)) < 0) goto failed_stats; + + if (cpu >= max_id) { + vshPrint(ctl, "Start cpu %d larger than maximum of %d.", cpu, max_id - 1); + goto cleanup; + } + if (show_count < 0 || show_count > max_id) { if (show_count > max_id) vshPrint(ctl, _("Only %d CPUs available to show\n"), max_id); -- 1.8.3.1

2 1

[libvirt] RFC: spec file cleanup ideas
by Cole Robinson 15 Apr '16

15 Apr '16

Hi all, I wanted to float some ideas about cleaning up the RPM spec file. None of it is urgent but I'll end up scratching the itch eventually and I want to make sure people are on board Old distro bits: * Drop support for building on rhel5... this was ACKd previously by eblake: http://www.redhat.com/archives/libvir-list/2015-November/msg00175.html * Drop support for end-of-life Fedora. There's lots of Fedora conditionals going back to Fedora 13. I don't think it's really interesting to try to support building an RPM on a distribution that is no longer receiving updates. But we could be a bit conservative and give a couple release window, dropping support for less than Fedora 20 for example (which went EOL in June 2015) Configuration variables: some of these could still feasibly be 'useful' even if they aren't programmatically set by any distro conditional, but I think unless someone actively uses them we should seek to have as few conditionals as possible, rather than conditionalize everything by default which seems more common. Some ideas: * Drop with_* conditionals that are only used by old Fedora or RHEL5. I didn't audit all of them but the obvious ones are straight forward like: with_systemd_macros, with_polkit, with_capng, with_netcf, with_yajl, with_capng, with_avahi, with_hal/all HAL support * Drop client_only/server_drivers/with_libvirtd ... do these serve any good purpose? (once the rhel5 bits are gone) * Drop with_driver_modules: it's unconditionally enabled and has been since it was introduced Old spec bits cleanup: * drop defattr(), it's long since not needed * drop manual removal of the buildroot, it's long since not needed * use %global consistently instead of %define * consider using %{with/without X} pattern instead of defining variables as with_X * The top of the spec has this block: # If neither fedora nor rhel was defined, try to guess them from dist %if !0%{?rhel} && !0%{?fedora} %{expand:%(echo "%{?dist}" | \ sed -ne 's/^\.el$[0-9]\+$.*/%%define rhel \1/p')} %{expand:%(echo "%{?dist}" | \ sed -ne 's/^\.fc\?$[0-9]\+$.*/%%define fedora \1/p')} %endif Is it actually still relevant? It was added 5 years ago... I don't know in what case rhel or fedora macros won't be defined

4 8

[libvirt] [PATCH] spec: Only pull in API docs with -devel package
by Cole Robinson 15 Apr '16

15 Apr '16

Move some API specific documentation out of -docs package and into -devel, and some end user docs out of -devel and into -docs, then drop the -devel dep on -docs. This is more in line with the suggested Fedora guidelines. https://bugzilla.redhat.com/show_bug.cgi?id=1310155 --- libvirt.spec.in | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 8036fa3..500cde9 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1197,7 +1197,6 @@ namespaces. Summary: Libraries, includes, etc. to compile with the libvirt library Group: Development/Libraries Requires: %{name}-client = %{version}-%{release} -Requires: %{name}-docs = %{version}-%{release} Requires: pkgconfig %description devel @@ -1949,14 +1948,10 @@ exit 0 %files docs %defattr(-, root, root) -%doc AUTHORS ChangeLog.gz NEWS README TODO libvirt-docs/* +%doc AUTHORS ChangeLog.gz NEWS README TODO +%doc libvirt-docs/* +%doc docs/*.html docs/html docs/*.gif -# API docs -%dir %{_datadir}/gtk-doc/html/libvirt/ -%doc %{_datadir}/gtk-doc/html/libvirt/*.devhelp -%doc %{_datadir}/gtk-doc/html/libvirt/*.html -%doc %{_datadir}/gtk-doc/html/libvirt/*.png -%doc %{_datadir}/gtk-doc/html/libvirt/*.css %if %{with_libvirtd} %files daemon @@ -2387,8 +2382,12 @@ exit 0 %{_datadir}/libvirt/api/libvirt-qemu-api.xml %{_datadir}/libvirt/api/libvirt-lxc-api.xml - -%doc docs/*.html docs/html docs/*.gif +# API docs +%dir %{_datadir}/gtk-doc/html/libvirt/ +%doc %{_datadir}/gtk-doc/html/libvirt/*.devhelp +%doc %{_datadir}/gtk-doc/html/libvirt/*.html +%doc %{_datadir}/gtk-doc/html/libvirt/*.png +%doc %{_datadir}/gtk-doc/html/libvirt/*.css %doc docs/libvirt-api.xml %doc examples/hellolibvirt %doc examples/object-events -- 2.7.3

2 2

[libvirt] [PATCH] qemu: migration: Drop dead VNC cookie handling
by Cole Robinson 15 Apr '16

15 Apr '16

The only caller of this code is: for (i = 0; i < dom->def->ngraphics; i++) { if (dom->def->graphics[i]->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { if (!(mig->graphics = qemuMigrationCookieGraphicsAlloc(driver, dom->def->graphics[i]))) return -1; mig->flags |= QEMU_MIGRATION_COOKIE_GRAPHICS; break; } } So this is never triggered for VNC, and in fact VNC has no support for seamless migration anyways so that seems correct. Drop the dead VNC handling. --- src/qemu/qemu_migration.c | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 8d2ca3b..ca3619d 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -320,33 +320,21 @@ qemuMigrationCookieGraphicsAlloc(virQEMUDriverPtr driver, goto error; mig->type = def->type; - if (mig->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) { - mig->port = def->data.vnc.port; - listenAddr = virDomainGraphicsListenGetAddress(def, 0); - if (!listenAddr) - listenAddr = cfg->vncListen; + mig->port = def->data.spice.port; + if (cfg->spiceTLS) + mig->tlsPort = def->data.spice.tlsPort; + else + mig->tlsPort = -1; + listenAddr = virDomainGraphicsListenGetAddress(def, 0); + if (!listenAddr) + listenAddr = cfg->spiceListen; #ifdef WITH_GNUTLS - if (cfg->vncTLS && - !(mig->tlsSubject = qemuDomainExtractTLSSubject(cfg->vncTLSx509certdir))) - goto error; + if (cfg->spiceTLS && + !(mig->tlsSubject = qemuDomainExtractTLSSubject(cfg->spiceTLSx509certdir))) + goto error; #endif - } else { - mig->port = def->data.spice.port; - if (cfg->spiceTLS) - mig->tlsPort = def->data.spice.tlsPort; - else - mig->tlsPort = -1; - listenAddr = virDomainGraphicsListenGetAddress(def, 0); - if (!listenAddr) - listenAddr = cfg->spiceListen; -#ifdef WITH_GNUTLS - if (cfg->spiceTLS && - !(mig->tlsSubject = qemuDomainExtractTLSSubject(cfg->spiceTLSx509certdir))) - goto error; -#endif - } if (VIR_STRDUP(mig->listen, listenAddr) < 0) goto error; -- 2.7.3

2 2

[libvirt] [PATCH v4b] Add functions for handling exponential backoff loops.
by Richard W.M. Jones 15 Apr '16

15 Apr '16

The alternate version. Rich.

3 6

[libvirt] [PATCH 0/8] qemu: Fix current ballooned size after memory hot(un)plug
by Peter Krempa 15 Apr '16

15 Apr '16

Clean up some of the memory balloon code and fix the calculation of size after hotplug. Peter Krempa (8): qemu: command: Assume QEMU_CAPS_DEVICE when building memballoon args qemu: caps: Deprecate QEMU_CAPS_BALLOON qemu: command: Drop obsolete comment qemu: command: Refactor memballoon command line formatting qemu: domain: Add helper to determine presence of memory baloon qemu: driver: Reuse qemuDomainGetMonitor in qemuDomainMemoryStats qemu: process: Simplify condition in qemuProcessRefreshBalloonState qemu: hotplug: Properly recalculate/reload balloon size after hot(un)plug src/qemu/qemu_capabilities.c | 3 - src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 83 +++++++++------------------ src/qemu/qemu_command.h | 4 -- src/qemu/qemu_domain.c | 11 +++- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 16 ++---- src/qemu/qemu_hotplug.c | 15 ++--- src/qemu/qemu_process.c | 16 ++---- src/qemu/qemu_process.h | 4 ++ tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 1 - tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 1 - tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 1 - tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 - tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 - tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 - tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 1 - tests/qemucapabilitiesdata/caps_2.4.0-1.caps | 1 - tests/qemucapabilitiesdata/caps_2.5.0-1.caps | 1 - tests/qemucapabilitiesdata/caps_2.6.0-1.caps | 1 - tests/qemuhelptest.c | 8 --- 21 files changed, 59 insertions(+), 114 deletions(-) -- 2.8.0

3 13

[libvirt] [libvirt-php PATCH] Use zend_long instead of zend_ulong64
by Neal Gompa 15 Apr '16

15 Apr '16

In PHP 7.0, the zend_(u)long64 definition was removed in favor of zend_(u)long changing depending on whether PHP was compiled on a 64-bit architecture or not. The patch set that originally ported libvirt-php to PHP7+ did not use zend_ulong64. However, it was altered to use it during the review, which broke PHP 7.0 support. This fixes that by using zend_long and checking for if the value is invalid and returning false when that happens. --- src/libvirt-php.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libvirt-php.c b/src/libvirt-php.c index 7dcead8..435bf97 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -6666,11 +6666,12 @@ PHP_FUNCTION(libvirt_domain_memory_peek) zval *zdomain; int retval; zend_long flags=0; - zend_ulong64 start; + zend_long start; zend_long size; char *buff; GET_DOMAIN_FROM_ARGS("rlll",&zdomain,&start,&size,&flags); + if (start < 0) RETURN_FALSE; buff=(char *)emalloc(size); retval=virDomainMemoryPeek(domain->domain,start,size,buff,flags); if (retval != 0) RETURN_FALSE; -- 2.5.5

2 1

[libvirt] [libvirt-php PATCH] Add missing zend_ulong64 definition for PHP7+
by Neal Gompa 15 Apr '16

15 Apr '16

In PHP 7.0, the zend_ulong64 definition was removed in favor of zend_ulong changing depending on whether PHP was compiled on a 64-bit architecture or not. However, we need 64-bit wide unsigned numbers, so the definition has been added for when it is compiled against PHP 7.0 or newer. The patch set that originally ported libvirt-php to PHP7+ did not use zend_ulong64. However, it was altered to use it during the review, which broke PHP 7.0 support. This fixes that. --- src/libvirt-php.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libvirt-php.c b/src/libvirt-php.c index 7dcead8..91bb1c5 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -57,7 +57,7 @@ const char *features_binaries[] = { NULL }; #if PHP_MAJOR_VERSION >= 7 typedef size_t strsize_t; - +typedef uint64_t zend_ulong64; #define VIRT_FETCH_RESOURCE(_state, _type, _zval, _name, _le) \ if ((_state = (_type)zend_fetch_resource(Z_RES_P(*_zval), _name, _le)) == NULL) { \ -- 2.5.5

2 1

[libvirt] [PATCH v4] Add macro for handling exponential backoff loops.
by Richard W.M. Jones 15 Apr '16

15 Apr '16

v3 -> v4: - Add Michal Privoznik's changes. Posting v4 since there's obviously not consensus around using while-macro. Rich.

4 4

[libvirt] [PATCH v3] Add macro for handling exponential backoff loops.
by Richard W.M. Jones 15 Apr '16

15 Apr '16

v2 was here: https://www.redhat.com/archives/libvir-list/2016-April/thread.html#00355 v2->v3: - Rename virTimeBackOffInit -> Start. - virTimeBackOffStart now returns an error indication. - Remove var->first and var->timeout fields from struct. - Change var->limit field name to limit_t. - Remove '- 2' fudge factor. - virTimeBackOffCondition returns bool instead of int. I didn't remove the macro hiding the 'while' keyword because I prefer the current user interface. I retested this against current libguestfs. Rich.

4 6

[libvirt] [PATCH] makefile: Move include/Makefile.am to include/libvirt/Makefile.am
by Erik Skultety 15 Apr '16

15 Apr '16

The reason for this is to fix the automatic rebuild of libvirt-common.h.in. All *.in files should be automatically rebuilt each time they're modified. It works well for makefiles and pkgconfig files, since they do have a valid dependency in the top-level Makefile. However, with libvirt-common.h.in there is no dependency in the top-level Makefile and there's no need for it either, so this rule include/libvirt/libvirt-common.h: $(top_builddir)/config.status \ $(top_srcdir)/include/libvirt/libvirt-common.h.in cd $(top_builddir) && $(SHELL) ./config.status $@ is never hit and should be moved to include/Makefile, but that's automake's job. According to GNU automake docs: "Files created by AC_CONFIG_FILES, be they Automake Makefiles or not, are all removed by ‘make distclean’. Their inputs are automatically distributed, unless they are the output of prior AC_CONFIG_FILES commands. Finally, rebuild rules are generated in the Automake Makefile existing in the subdirectory of the output file, if there is one, or in the top-level Makefile otherwise." Which means that if we want to have the rule for libvirt-common.h automatically generated by automake, the include/Makefile.am needs to be moved into libvirt/ subdirectory and $SUBDIRS in the top-level Makefile need to be adjusted as well. This patch moves Makefile.am from include/ to include/libvirt, adjusting the prefixes accordingly as well as updates the top-level Makefile $SUBDIRS to properly hint automake to generate all rules at proper places. Best way to see the changes, use -M with 'git show'. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- Makefile.am | 2 +- configure.ac | 2 +- include/{ => libvirt}/Makefile.am | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) rename include/{ => libvirt}/Makefile.am (76%) diff --git a/Makefile.am b/Makefile.am index ffe0517..9298082 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ LCOV = lcov GENHTML = genhtml -SUBDIRS = . gnulib/lib include src daemon tools docs gnulib/tests \ +SUBDIRS = . gnulib/lib include/libvirt src daemon tools docs gnulib/tests \ tests po examples ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index 85fc6e1..1e83b8f 100644 --- a/configure.ac +++ b/configure.ac @@ -2744,7 +2744,7 @@ AC_DEFINE_UNQUOTED([base64_encode_alloc],[libvirt_gl_base64_encode_alloc],[Hack AC_CONFIG_FILES([run], [chmod +x,-w run]) AC_CONFIG_FILES([\ - Makefile src/Makefile include/Makefile docs/Makefile \ + Makefile src/Makefile include/libvirt/Makefile docs/Makefile \ gnulib/lib/Makefile \ gnulib/tests/Makefile \ libvirt.pc \ diff --git a/include/Makefile.am b/include/libvirt/Makefile.am similarity index 76% rename from include/Makefile.am rename to include/libvirt/Makefile.am index dde955e..a59b8ab 100644 --- a/include/Makefile.am +++ b/include/libvirt/Makefile.am @@ -18,15 +18,15 @@ virincdir = $(includedir)/libvirt -allheaders = $(wildcard $(srcdir)/libvirt/*.h) -virinc_HEADERS = $(filter-out $(srcdir)/libvirt/libvirt-admin.h \ - $(srcdir)/libvirt/libvirt-common.h, $(allheaders)) -virinc_HEADERS += libvirt/libvirt-common.h +allheaders = $(wildcard $(srcdir)/*.h) +virinc_HEADERS = $(filter-out $(srcdir)/libvirt-admin.h \ + $(srcdir)/libvirt-common.h, $(allheaders)) +virinc_HEADERS += libvirt-common.h -EXTRA_DIST = libvirt/libvirt-common.h.in +EXTRA_DIST = libvirt-common.h.in # Temporarily disabled, but we need it for building -EXTRA_DIST += libvirt/libvirt-admin.h +EXTRA_DIST += libvirt-admin.h install-exec-hook: $(mkinstalldirs) $(DESTDIR)$(virincdir) -- 2.4.11

2 2

[libvirt] [PATCH] Include sysmacros.h where needed
by Martin Kletzander 15 Apr '16

15 Apr '16

So in glibc-2.23 sys/sysmacros.h is no longer included from sys/types.h and we don't build because of the usage of major/minor/makedev macros. Simply add sys/sysmacros.h into files that are using any of these macros. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- I noticed this after update to glibc-2.23 and don't worry, there are more project that fail compiling due to the same issue. I can't find it in their repository, but I think it's safe to assume that stuff will break sooner or later if we don't fix it. The closest thing I've found is this thread: https://marc.info/?l=glibc-alpha&m=144790641508520 >From that mailing list thread (actually just one mesage I've found out, I haven't read the whole thread) there should've been some deprecation warning for few releases, but apparently there isn't. Technically it's a build-breaker fix, but I'm sending it for review in case there is a system that does not have sys/sysmacros.h installed for some reason. Then we'd have to resort to using AC_HEADER_MAJOR. src/conf/domain_audit.c | 1 + src/lxc/lxc_controller.c | 1 + src/lxc/lxc_driver.c | 1 + src/util/vircgroup.c | 1 + src/util/virutil.c | 1 + tests/vircgroupmock.c | 1 + 6 files changed, 6 insertions(+) diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index bd2eeb6a792d..541cf27e44f7 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -25,6 +25,7 @@ #include <sys/stat.h> #include <sys/types.h> +#include <sys/sysmacros.h> #include "domain_audit.h" #include "viraudit.h" diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 8b5ec4c840c6..43fc2479b5f0 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -28,6 +28,7 @@ #include <sys/wait.h> #include <sys/socket.h> #include <sys/types.h> +#include <sys/sysmacros.h> #include <sys/un.h> #include <sys/personality.h> #include <unistd.h> diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index ef488123db12..5ce3ceccc601 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -29,6 +29,7 @@ #include <sys/utsname.h> #include <string.h> #include <sys/types.h> +#include <sys/sysmacros.h> #include <sys/socket.h> #include <sys/stat.h> #include <sys/un.h> diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index bffd88f90a44..5258526bf77a 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -35,6 +35,7 @@ #include <stdlib.h> #include <sys/stat.h> #include <sys/types.h> +#include <sys/sysmacros.h> #include <signal.h> #include <dirent.h> #include <unistd.h> diff --git a/src/util/virutil.c b/src/util/virutil.c index 82051505d258..730a24fcb0fe 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -36,6 +36,7 @@ #include <poll.h> #include <sys/stat.h> #include <sys/types.h> +#include <sys/sysmacros.h> #include <sys/ioctl.h> #include <string.h> #include <termios.h> diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c index 756ac51679b4..2ca02f360556 100644 --- a/tests/vircgroupmock.c +++ b/tests/vircgroupmock.c @@ -29,6 +29,7 @@ # include <unistd.h> # include <fcntl.h> # include <sys/stat.h> +# include <sys/sysmacros.h> # include <stdarg.h> # include "testutilslxc.h" # include "virstring.h" -- 2.8.1

2 3

[libvirt] [PATCH] vz: make it possible to use shared drivers API with vz driver connection
by Maxim Nestratov 15 Apr '16

15 Apr '16

Since vz driver is now lives as a part of daemon we can benefit from this fact and allow vz clients to use shared drivers API like storage, network, nwfilter etc. Signed-off-by: Maxim Nestratov <mnestratov(a)virtuozzo.com> --- src/vz/vz_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index d2bf54e..ffa6f45 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -1696,10 +1696,10 @@ vzRegister(void) parallelsHypervisorDriver.name = "Parallels"; parallelsConnectDriver = vzConnectDriver; parallelsConnectDriver.hypervisorDriver = &parallelsHypervisorDriver; - if (virRegisterConnectDriver(&parallelsConnectDriver, false) < 0) + if (virRegisterConnectDriver(&parallelsConnectDriver, true) < 0) return -1; - if (virRegisterConnectDriver(&vzConnectDriver, false) < 0) + if (virRegisterConnectDriver(&vzConnectDriver, true) < 0) return -1; if (virRegisterStateDriver(&vzStateDriver) < 0) -- 2.4.3

2 2