- Devel - libvirt List Archives

[libvirt] [PATCH] schema: Allow space character in disk vendor/product
by Cole Robinson 26 Apr '16

26 Apr '16

The hex range already tried to allow for it, but it doesn't work for reasons I can't figure out. Use a plain character range instead, and test it --- docs/schemas/domaincommon.rng | 2 ++ tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-disk-vpd.xml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 4ad2236..6c80b66 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1165,6 +1165,7 @@ <optional> <element name="vendor"> <data type="string"> +  <param name="pattern">[ -~]{0,8}</param> </data> </element> @@ -1172,6 +1173,7 @@ <optional> <element name="product"> <data type="string"> +  <param name="pattern">[ -~]{0,16}</param> </data> </element> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-disk-vpd.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-disk-vpd.xml index 42c7bcd..9e1e7af 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-disk-vpd.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-disk-vpd.xml @@ -26,8 +26,8 @@ <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='sdb' bus='scsi'/> <readonly/> - <vendor>SEAGATE</vendor> - <product>ST3567807GD</product> + <vendor>SEA GATE</vendor> + <product>ST67 807GD</product> <address type='drive' controller='1' bus='0' target='0' unit='0'/> </disk> <controller type='usb' index='0'> -- 2.7.4

3 4

[libvirt] [PATCH] virsh: Document change-media --live --config confusion
by Cole Robinson 26 Apr '16

26 Apr '16

If 'virsh change-media --live --config ...' is requested, the inactive XML is used as the template for the media change/eject. If the runtime XML has diverged from the inactive XML, say via other update operations, those changes may be undone since the command will sync all non-path XML with the inactive config. To 'fix' this would involve two passes of XML editing and calls to UpdateDevice, which is kind of a pain for a case that won't affect most users. So let's just document it instead https://bugzilla.redhat.com/show_bug.cgi?id=1243342 --- tools/virsh.pod | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/virsh.pod b/tools/virsh.pod index 90ab47d..4c1b7fc 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2794,6 +2794,9 @@ the hypervisor's implementation. Both I<--live> and I<--config> flags may be given, but I<--current> is exclusive. If no flag is specified, behavior is different depending on hypervisor. +If both I<--live> and I<--config> are specified, the inactive device XML +is used as the template for the media change. If your I<--live> device XML +has received runtime changes, they may be removed. If I<--print-xml> is specified, the XML that would be used to change media is printed instead of changing the media. -- 2.7.4

1 1

[libvirt] [PATCH v4] Use-correct-pci-addresses-during-interface-detach
by Nitesh Konkar 26 Apr '16

26 Apr '16

The virsh attach virsh detach interface command fails when both live and config are set and when the interface gets attached to different pci slots on live and config xml respectively. When we attach an interface with both --live and --config, the first time they get the same PCI slots, but the second time onwards it differs and hence the virsh detach-interface --live --config command fails. This patch makes sure that when both --live --config are set , qemuDomainDetachDeviceFlags is called twice, once with config xml and once with live xml. --- Change log: v4: * Code unchanged, updated with commit message,change log and steps to reproduce the issue.. v3: * Created function vshDomainDetachInterface and called it once/twice from cmdDetachInterface depending on number of flags set (live/config/both). Passed the correct xml(live/persistent) to it. v2: * Changes only in cmdDetachInterface to pass the right domain xml depending on the flag set (live/config/both). v1: * Changes only in qemuDomainDetachDeviceFlags to set the right value in dev and dev_copy. Steps to see the issue: virsh attach-interface --domain DomainName --type network --source default --mac 52:54:00:4b:76:5f --live --config virsh detach-interface --domain DomainName --type network --mac 52:54:00:4b:76:5f --live --config virsh attach-interface --domain DomainName --type network --source default --mac 52:54:00:4b:76:5f --live --config virsh detach-interface --domain DomainName --type network --mac 52:54:00:4b:76:5f --live --config tools/virsh-domain.c | 104 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 64 insertions(+), 40 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 62acecb..a6abaf5 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -10801,40 +10801,21 @@ static const vshCmdOptDef opts_detach_interface[] = { {.name = NULL} }; -static bool -cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) +static bool +vshDomainDetachInterface(char *doc, unsigned int flags, virDomainPtr dom, vshControl *ctl, const vshCmd *cmd) { - virDomainPtr dom = NULL; xmlDocPtr xml = NULL; xmlXPathObjectPtr obj = NULL; xmlXPathContextPtr ctxt = NULL; xmlNodePtr cur = NULL, matchNode = NULL; - char *detach_xml = NULL; const char *mac = NULL, *type = NULL; - char *doc = NULL; + char *detach_xml = NULL; + bool current = vshCommandOptBool(cmd, "current"); char buf[64]; int diff_mac; size_t i; int ret; bool functionReturn = false; - unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; - bool current = vshCommandOptBool(cmd, "current"); - bool config = vshCommandOptBool(cmd, "config"); - bool live = vshCommandOptBool(cmd, "live"); - bool persistent = vshCommandOptBool(cmd, "persistent"); - - VSH_EXCLUSIVE_OPTIONS_VAR(persistent, current); - - VSH_EXCLUSIVE_OPTIONS_VAR(current, live); - VSH_EXCLUSIVE_OPTIONS_VAR(current, config); - - if (config || persistent) - flags |= VIR_DOMAIN_AFFECT_CONFIG; - if (live) - flags |= VIR_DOMAIN_AFFECT_LIVE; - - if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) - return false; if (vshCommandOptStringReq(ctl, cmd, "type", &type) < 0) goto cleanup; @@ -10842,15 +10823,6 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "mac", &mac) < 0) goto cleanup; - if (persistent && - virDomainIsActive(dom) == 1) - flags |= VIR_DOMAIN_AFFECT_LIVE; - - if (flags & VIR_DOMAIN_AFFECT_CONFIG) - doc = virDomainGetXMLDesc(dom, VIR_DOMAIN_XML_INACTIVE); - else - doc = virDomainGetXMLDesc(dom, 0); - if (!doc) goto cleanup; @@ -10918,23 +10890,75 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) else ret = virDomainDetachDevice(dom, detach_xml); - if (ret != 0) { - vshError(ctl, "%s", _("Failed to detach interface")); - } else { - vshPrint(ctl, "%s", _("Interface detached successfully\n")); + if (ret == 0) functionReturn = true; - } cleanup: - VIR_FREE(doc); VIR_FREE(detach_xml); - virDomainFree(dom); + xmlFreeDoc(xml); xmlXPathFreeObject(obj); xmlXPathFreeContext(ctxt); - xmlFreeDoc(xml); return functionReturn; } +static bool +cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) +{ + virDomainPtr dom = NULL; + unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; + char *doc_live = NULL, *doc_config = NULL; + bool current = vshCommandOptBool(cmd, "current"); + bool config = vshCommandOptBool(cmd, "config"); + bool live = vshCommandOptBool(cmd, "live"); + bool persistent = vshCommandOptBool(cmd, "persistent"); + bool functionReturn = false; + + VSH_EXCLUSIVE_OPTIONS_VAR(persistent, current); + + VSH_EXCLUSIVE_OPTIONS_VAR(current, live); + VSH_EXCLUSIVE_OPTIONS_VAR(current, config); + + if (config || persistent) + flags |= VIR_DOMAIN_AFFECT_CONFIG; + + if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) + return false; + + if (persistent && + virDomainIsActive(dom) == 1) + flags |= VIR_DOMAIN_AFFECT_LIVE; + + if (flags & VIR_DOMAIN_AFFECT_CONFIG) { + doc_config = virDomainGetXMLDesc(dom, VIR_DOMAIN_XML_INACTIVE); + if (!(functionReturn = vshDomainDetachInterface(doc_config, flags, dom, ctl, cmd))) + goto cleanup; + } + + if (live) + flags |= VIR_DOMAIN_AFFECT_LIVE; + + if (flags & VIR_DOMAIN_AFFECT_LIVE) { + doc_live = virDomainGetXMLDesc(dom, 0); + + if (flags & VIR_DOMAIN_AFFECT_CONFIG) + flags &= (~VIR_DOMAIN_AFFECT_CONFIG); + + functionReturn = vshDomainDetachInterface(doc_live, flags, dom, ctl, cmd); + } + + cleanup: + if (functionReturn == false) { + vshError(ctl, "%s", _("Failed to detach interface")); + } else { + vshPrint(ctl, "%s", _("Interface detached successfully\n")); + functionReturn = true; + } + VIR_FREE(doc_live); + VIR_FREE(doc_config); + virDomainFree(dom); + return functionReturn; +} + typedef enum { VIRSH_FIND_DISK_NORMAL, VIRSH_FIND_DISK_CHANGEABLE, -- 1.8.3.1

2 1

[libvirt] Request for an account to update wiki content(NPIV_in_libvirt).
by Nitesh Konkar 26 Apr '16

26 Apr '16

Hello All, I would like to get some feedback on the update I would like to make to this page. http://wiki.libvirt.org/page/NPIV_in_libvirt Original Content : *NOTE:* You can also create a scsi pool with source adapter type "fc_host" for a HBA, and in that case the attribute "parent" is not necessary. Patched Content: *NOTE:* You can also create a scsi pool with source adapter type "fc_host" for a HBA, and in that case the attribute "parent" is not necessary.Also the attribute "managed" should not be used or set to "no" , ('managed=no' ) for a scsi pool backed with physical HBA. Here are the details for more clarity on the issue: #git show 5530f248 (Info on managed attribute) An optional attribute to instruct the SCSI storage backend to manage destroying the vHBA when the pool is destroyed. For configurations that do not provide an already created vHBA from a 'virsh nodedev-create', libvirt will set this property to "yes". For configurations that have already created a vHBA via 'virsh nodedev-create' and are using the wwnn/wwpn from that vHBA and optionally the scsi_host parent, setting this attribute to "yes" will allow libvirt to destroy the node device when the pool is destroyed. If this attribute is set to "no" or not defined in the XML, then libvirt will not destroy the vHBA. When *managed=yes* is used in the pool xml for scsi pools *backed with physical HBA ports*, the virsh pool-destroy command errors out. #virsh pool-dumpxml poolhba_phy <pool type='scsi'> <name>poolhba_phy</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> The wwnn and wwpn used above is that of the physical HBA shown below. #virsh nodedev-dumpxml scsi_host2 <- This is the physical HBA. <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>0</vports> </capability> </capability> </device> #virsh pool-destroy poolhba_phy error: Failed to destroy pool poolhba_phy error: internal error: Invalid adapter name 'pci_0001_09_00_1' for SCSI pool However, When managed attribute is removed OR set to no in the xml, # virsh pool-destroy poolhba_phy Pool poolhba_phy destroyed Although the page http://wiki.libvirt.org/page/NPIV_in_libvirt does not talk about the managed attribute as of now, it would be helpful for a user who might face the above mentioned use-case. Looking forward to your views. Warm Regards, Nitesh Konkar.

1 0

[libvirt] A difference between libvirt and execution in bash shell
by zhukaijie 26 Apr '16

26 Apr '16

Once I type my qemu command line in bash shell and execute it. Then I use ps -aux to list the qemu process, results indicates the user of the qemu vm is "root" (Of course I logged with root). However, if I use libvirt to start a qemu vm, the user of qemu become "qemu". Could you tell me something about the user "qemu"? Also, how does this difference happen? Thank you.

2 1

[libvirt] [PATCH] daemon: add option to read host uuid from /etc/machine-id
by Nikolay Shirokovskiy 26 Apr '16

26 Apr '16

Daemon config parameter switch between reading host uuid either from smbios or machine-id: host_uuid_source = "smbios|machine-id" Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- daemon/libvirtd-config.c | 2 ++ daemon/libvirtd-config.h | 1 + daemon/libvirtd.c | 38 +++++++++++++++++++++++++++++++++++--- daemon/libvirtd.conf | 14 ++++++++++---- src/libvirt_private.syms | 1 + src/util/viruuid.c | 31 ++++++++++++++++++++++--------- src/util/viruuid.h | 3 +++ 7 files changed, 74 insertions(+), 16 deletions(-) diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c index 7a448f9..45280e9 100644 --- a/daemon/libvirtd-config.c +++ b/daemon/libvirtd-config.c @@ -374,6 +374,7 @@ daemonConfigFree(struct daemonConfig *data) VIR_FREE(data->crl_file); VIR_FREE(data->host_uuid); + VIR_FREE(data->host_uuid_source); VIR_FREE(data->log_filters); VIR_FREE(data->log_outputs); @@ -463,6 +464,7 @@ daemonConfigLoadOptions(struct daemonConfig *data, GET_CONF_UINT(conf, filename, audit_logging); GET_CONF_STR(conf, filename, host_uuid); + GET_CONF_STR(conf, filename, host_uuid_source); GET_CONF_UINT(conf, filename, log_level); GET_CONF_STR(conf, filename, log_filters); diff --git a/daemon/libvirtd-config.h b/daemon/libvirtd-config.h index 3e1971d..672e9ad 100644 --- a/daemon/libvirtd-config.h +++ b/daemon/libvirtd-config.h @@ -28,6 +28,7 @@ struct daemonConfig { char *host_uuid; + char *host_uuid_source; int listen_tls; int listen_tcp; diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 7ec02ad..ca1ec7a 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -1076,6 +1076,39 @@ static int migrateProfile(void) return ret; } +static int +daemonSetupHostUUID(const struct daemonConfig *config) +{ + static const char *machine_id = "/etc/machine-id"; + char buf[VIR_UUID_STRING_BUFLEN]; + const char *uuid; + + if (config->host_uuid) { + uuid = config->host_uuid; + } else if (!config->host_uuid_source || + STREQ(config->host_uuid_source, "smbios")) { + /* set host uuid in lazy manner*/ + return 0; + } else if (STREQ(config->host_uuid_source, "machine-id")) { + if (virUUIDRead(machine_id, buf, sizeof(buf)) < 0) { + VIR_ERROR(_("Can't read %s"), machine_id); + return -1; + } + + uuid = buf; + } else { + VIR_ERROR(_("invalid UUID source: %s"), config->host_uuid_source); + return -1; + } + + if (virSetHostUUIDStr(uuid)) { + VIR_ERROR(_("invalid host UUID: %s"), uuid); + return -1; + } + + return 0; +} + /* Print command-line usage. */ static void daemonUsage(const char *argv0, bool privileged) @@ -1295,9 +1328,8 @@ int main(int argc, char **argv) { exit(EXIT_FAILURE); } - if (config->host_uuid && - virSetHostUUIDStr(config->host_uuid) < 0) { - VIR_ERROR(_("invalid host UUID: %s"), config->host_uuid); + if (daemonSetupHostUUID(config) < 0) { + VIR_ERROR(_("Can't setup host uuid")); exit(EXIT_FAILURE); } diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf index d2c439c..eaae680 100644 --- a/daemon/libvirtd.conf +++ b/daemon/libvirtd.conf @@ -410,10 +410,15 @@ ################################################################### # UUID of the host: -# Provide the UUID of the host here in case the command -# 'dmidecode -s system-uuid' does not provide a valid uuid. In case -# 'dmidecode' does not provide a valid UUID and none is provided here, a -# temporary UUID will be generated. +# host uuid is read from one of host uuid sources specified +# in host_uuid_source. Possible values are 'smbios' and 'machine-id'. +# First option will set host uuid from 'dmidecode -s system-uuid', +# while second will read it from /etc/machine-id. uuid source +# defaults to smbios. Other option is to specify host uuid +# right here in host_uuid option, in this case host_uuid_source +# will not be taken into account. In case uuid value in +# smbios is invalid temporary host uuid will be generated. +# # Keep the format of the example UUID below. UUID must not have all digits # be the same. @@ -421,6 +426,7 @@ # it with the output of the 'uuidgen' command and then # uncomment this entry #host_uuid = "00000000-0000-0000-0000-000000000000" +#host_uuid_source = "smbios" ################################################################### # Keepalive protocol: diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 2b55369..e5823b2 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2512,6 +2512,7 @@ virUUIDFormat; virUUIDGenerate; virUUIDIsValid; virUUIDParse; +virUUIDRead; # util/virxml.h diff --git a/src/util/viruuid.c b/src/util/viruuid.c index 16e57db..721eac0 100644 --- a/src/util/viruuid.c +++ b/src/util/viruuid.c @@ -231,21 +231,34 @@ getDMISystemUUID(char *uuid, int len) }; while (paths[i]) { - int fd = open(paths[i], O_RDONLY); - if (fd >= 0) { - if (saferead(fd, uuid, len - 1) == len - 1) { - uuid[len - 1] = '\0'; - VIR_FORCE_CLOSE(fd); - return 0; - } - VIR_FORCE_CLOSE(fd); - } + if (virUUIDRead(paths[i], uuid, len) == 0) + return 0; i++; } return -1; } +int +virUUIDRead(const char *file, char *uuid, int len) +{ + int fd; + ssize_t sz; + + fd = open(file, O_RDONLY); + if (fd < 0) + return -1; + + if ((sz = saferead(fd, uuid, len - 1)) < 0) + goto cleanup; + + uuid[sz] = '\0'; + + cleanup: + VIR_FORCE_CLOSE(fd); + return sz < 0 ? -1 : 0; +} + /** * setHostUUID diff --git a/src/util/viruuid.h b/src/util/viruuid.h index 5790a17..94bf1ac 100644 --- a/src/util/viruuid.h +++ b/src/util/viruuid.h @@ -47,6 +47,9 @@ int virSetHostUUIDStr(const char *host_uuid); int virGetHostUUID(unsigned char *host_uuid) ATTRIBUTE_NONNULL(1); +int virUUIDRead(const char *file, char *uuid, int len) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); + int virUUIDIsValid(unsigned char *uuid); int virUUIDGenerate(unsigned char *uuid); -- 1.8.3.1

2 2

[libvirt] [PATCH] maint: Ignore all intermediate and generated man pages
by Andrea Bolognani 26 Apr '16

26 Apr '16

Since commit 9b77ce63f1d7 we create a .in file while building all man pages, including those in the tools/ directory; update the ignore patterns to take this change into account. The new ignore patterns are generic enough that we can get rid of a few existing ones as well. --- .gitignore | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 381db69..6021403 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ *#*# *.#*# +*.[18] +*.[18].in *.a *.cov *.exe @@ -57,8 +59,6 @@ /daemon/libvirt_qemud /daemon/libvirtd /daemon/libvirtd*.logrotate -/daemon/libvirtd.8 -/daemon/libvirtd.8.in /daemon/libvirtd.init /daemon/libvirtd.pod /daemon/libvirtd.policy @@ -155,12 +155,8 @@ /src/util/virkeymaps.h /src/virt-aa-helper /src/virtlockd -/src/virtlockd.8 -/src/virtlockd.8.in /src/virtlockd.init /src/virtlogd -/src/virtlogd.8 -/src/virtlogd.8.in /src/virtlogd.init /tests/*.log /tests/*.pid @@ -175,7 +171,6 @@ /tests/reconnect /tests/ssh /tests/test_conf -/tools/*.[18] /tools/libvirt-guests.init /tools/libvirt-guests.service /tools/libvirt-guests.sh -- 2.5.5

2 2

[libvirt] [PATCH 0/4] apibuild: Fix several issues
by Andrea Bolognani 26 Apr '16

26 Apr '16

My home directory contains src/upstream/libvirt - git repository src/libvirt - symbolic link to the above and since d195cffa2e1b I can no longer build in-tree because make passes srcdir=. builddir=$HOME/src/libvirt/docs to apibuild.py, which get converted to srcdir=$HOME/src/upstream/libvirt/docs builddir=$HOME/src/libvirt/docs inside the script and thus considered separate directories. This in turn leads to files being processed twice, and a bunch of definitions being reported as duplicates. ... Well, kind of. The script *attempts* to report the failures, but fails while doing so :) This series fixes both the build issue (1/4) and the failure to report build issues properly (2/4), plus some more of the latter that I noticed while working on the code (3/4, 4/4). Last but not least: I'm not a pythonista, so feel free to point out unpythonic code. Andrea Bolognani (4): docs: Pass relative paths to apibuild.py apibuild: Add index.warning() method apibuild: Introduce app class apibuild: Fix method call docs/Makefile.am | 2 +- docs/apibuild.py | 103 +++++++++++++++++++++++++++++++------------------------ 2 files changed, 59 insertions(+), 46 deletions(-) -- 2.5.5

2 6

[libvirt] Plans for next release
by Daniel Veillard 26 Apr '16

26 Apr '16

While 1.3.3 went out a bit late I think we should try to stick to the month boundary for releases. I will be travelling next week so to avoid any deviation the best would be to release on Sunday may 1st So that mean we need to freeze real soon now for 1.3.4 and I suggest to do that tomorrow wednesday, then have rc2 Friday and push on the 1st. We already have 338 commits since 1.3.3 so well worth pushing it now, Works for everybody ? thanks Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH 0/4] Fix a couple PCI controller/addressing problems
by Laine Stump 25 Apr '16

25 Apr '16

1 - makes an error message less specific because it was misleading/incorrect in many/most cases 2+3 - log a more informative message when you try to put a pcie-root in a 440fx domain, or a pci-root in a Q35 (or arm/virt) domain 4 - makes it possible to create a Q35 domain in libvirt that doesn't have a dmi-to-pci-bridge controller (as long as you have something else in its place). Laine Stump (4): qemu: fix error log in qemuAssignPCIAddresses() conf: make virDomainDefAddController() public conf: log error when incorrect PCI root controller is added to domain qemu: don't be as insistent about adding dmi-to-pci-bridge or pci-bridge src/conf/domain_conf.c | 2 +- src/conf/domain_conf.h | 2 ++ src/libvirt_private.syms | 1 + src/qemu/qemu_domain.c | 55 +++++++++++++++++++++++++++++++----------- src/qemu/qemu_domain_address.c | 7 +++--- 5 files changed, 48 insertions(+), 19 deletions(-) -- 2.5.5

3 12

[libvirt] [PATCH] libvirtd.service: add NotifyService=all
by Serge Hallyn 25 Apr '16

25 Apr '16

systemd.service(5) says that this should be set when using Type=notify, and indeed we seem to have a bug report resulting from this not being set: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1574566 Signed-off-by: Serge Hallyn <serge.hallyn(a)ubuntu.com> --- daemon/libvirtd.service.in | 1 + 1 file changed, 1 insertion(+) diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in index 1616e7a..a13f9af 100644 --- a/daemon/libvirtd.service.in +++ b/daemon/libvirtd.service.in @@ -24,6 +24,7 @@ KillMode=process Restart=on-failure # Override the maximum number of opened files #LimitNOFILE=2048 +NotifyAccess=all [Install] WantedBy=multi-user.target -- 2.7.4

2 2

[libvirt] [PATCH 00/13] build: Fix and improve man pages handling
by Andrea Bolognani 25 Apr '16

25 Apr '16

There are a bunch of issues in the way we handle man pages; most importantly, installed man pages (like libvirtd.8) end up having stuff like SYSCONFDIR/libvirtd.conf in the FILES section. This series makes it so all man pages are generated through the same steps: 1. process $command.pod (shipped) with pod2man(1) to convert pod markup to groff markup and obtain $command.$section.in (shipped) 2. process $command.$section.in with sed(1) to insert host-specific information such as @sysconfdir@ and obtain $command.$section (not shipped) As a follow-up improvement, it would be great if we could abstract those two steps into macros to reduce code duplication even further. Please provide hints on the best way to achieve that :) A number of other minor issues are fixed along the way. Cheers. Andrea Bolognani (13): build: Ship virt-admin.pod build: Extract pod from source files build: Build man pages in $(builddir) build: Perform post-processing on all man pages build: Standardize on .pod -> .x.in -> .x build: Never ship man pages build: Group files build: Ensure intermediate files are cleaned up properly build: Replace variables in man pages build: Always ship virt-login-shell.conf man: Fix NAME section man: Fix SYNOPSIS section man: Fix links daemon/Makefile.am | 43 +++++---- daemon/{libvirtd.pod.in => libvirtd.pod} | 4 +- src/Makefile.am | 69 ++++++++------ src/locking/{virtlockd.pod.in => virtlockd.pod} | 4 +- src/logging/{virtlogd.pod.in => virtlogd.pod} | 4 +- tools/Makefile.am | 114 +++++++++++++++--------- tools/virsh.pod | 6 +- tools/virt-admin.pod | 6 +- tools/virt-host-validate.c | 74 --------------- tools/virt-host-validate.pod | 68 ++++++++++++++ tools/virt-login-shell.pod | 3 +- tools/virt-pki-validate.in | 64 ------------- tools/virt-pki-validate.pod | 61 +++++++++++++ tools/virt-sanlock-cleanup.in | 52 ----------- tools/virt-sanlock-cleanup.pod | 49 ++++++++++ tools/virt-xml-validate.in | 113 ----------------------- tools/virt-xml-validate.pod | 111 +++++++++++++++++++++++ 17 files changed, 440 insertions(+), 405 deletions(-) rename daemon/{libvirtd.pod.in => libvirtd.pod} (97%) rename src/locking/{virtlockd.pod.in => virtlockd.pod} (97%) rename src/logging/{virtlogd.pod.in => virtlogd.pod} (97%) create mode 100644 tools/virt-host-validate.pod create mode 100644 tools/virt-pki-validate.pod create mode 100644 tools/virt-sanlock-cleanup.pod create mode 100644 tools/virt-xml-validate.pod -- 2.5.5

2 16

[libvirt] [PATCH 1/2] rpc: protocol: Clarify VIR_NET_ERROR usage with streams
by Cole Robinson 25 Apr '16

25 Apr '16

The described protocol semantics really only apply to server initiated stream messages. Document the semantics for client messages. --- AFAICT, the only time a server will receive VIR_NET_ERROR stream message from a client is via an explicit virStreamAbort call (which hits remote_driver.c:remoteStreamAbort) src/rpc/virnetprotocol.x | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/rpc/virnetprotocol.x b/src/rpc/virnetprotocol.x index 327a334..9ce33b0 100644 --- a/src/rpc/virnetprotocol.x +++ b/src/rpc/virnetprotocol.x @@ -104,7 +104,9 @@ const VIR_NET_MESSAGE_NUM_FDS_MAX = 32; * - type == VIR_NET_STREAM * * VIR_NET_CONTINUE if more data is following * * VIR_NET_OK if stream is complete - * * VIR_NET_ERROR if stream had an error + * * VIR_NET_ERROR + * server message: stream had an error + * client message: client aborted the stream * * Payload varies according to type and status: * @@ -125,7 +127,8 @@ const VIR_NET_MESSAGE_NUM_FDS_MAX = 32; * * status == VIR_NET_CONTINUE * byte[] raw stream data * * status == VIR_NET_ERROR - * remote_error error information + * server message: remote_error error information + * client message: <empty> * * status == VIR_NET_OK * <empty> * -- 2.7.3

1 2

[libvirt] [PATCH 0/3] Yet some install fixes
by Michal Privoznik 25 Apr '16

25 Apr '16

After my patches fixing install & uninstall [1] I've found some other flaws. The last patch is essential as the problem I'm seeing there I'm seeing in libvirt-php too. I've came up with an ugly fix in libvirt-php. But then found a better way of dealing with it, so if this gets in, I'll mimic it there too. 1: https://www.redhat.com/archives/libvir-list/2016-April/msg01192.html Michal Privoznik (3): Makefile: Enable distuninstallcheck again tools: Introduce install-nss targets wireshark: Fix distcheck Makefile.am | 3 --- m4/virt-wireshark.m4 | 8 +++++++- tools/Makefile.am | 11 +++++++---- 3 files changed, 14 insertions(+), 8 deletions(-) -- 2.7.3

2 6

[libvirt] [PATCH] qemuProcessCreatePretendCmd: Rework FIPS handling
by Michal Privoznik 25 Apr '16

25 Apr '16

This function - in contrast with qemuBuildCommandLine - merely constructs our internal command representation of a domain. This is then later compared against expected output. Or, this function is used also in virConnectDomainXMLToNative(). But due to a copy paste error this function, just like its image - has @forceFips argument that if enabled forces FIPS, otherwise mimics FIPS state in the host. If FIPS is enabled or forced the generated command line is different to state in which FIPS is disabled. Problem is, while this could be desired in the virConnectDomainXMLToNative() case, this is undesirable in the test suite as it will produce unpredicted results. Solution to this is to rename argument to @enableFips to specifically tell whether we expect command line to be build in either of fashions and make virConnectDomainXMLToNative() implementation fetch FIPS state and pass it to qemuProcessCreatePretendCmd(). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- This flaw has been identified by my big test mock patch set that has been not merged yet. src/qemu/qemu_driver.c | 3 ++- src/qemu/qemu_process.c | 4 ++-- src/qemu/qemu_process.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 90f541c..f8b4ab7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7060,7 +7060,8 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, } } - if (!(cmd = qemuProcessCreatePretendCmd(conn, driver, vm, NULL, false, true, + if (!(cmd = qemuProcessCreatePretendCmd(conn, driver, vm, NULL, + qemuCheckFips(), true, VIR_QEMU_PROCESS_START_COLD))) goto cleanup; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 8a2f65f..0ccc3ac 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5715,7 +5715,7 @@ qemuProcessCreatePretendCmd(virConnectPtr conn, virQEMUDriverPtr driver, virDomainObjPtr vm, const char *migrateURI, - bool forceFips, + bool enableFips, bool standalone, unsigned int flags) { @@ -5747,7 +5747,7 @@ qemuProcessCreatePretendCmd(virConnectPtr conn, NULL, VIR_NETDEV_VPORT_PROFILE_OP_NO_OP, standalone, - forceFips ? true : qemuCheckFips(), + enableFips, priv->autoNodeset, NULL, NULL, diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index 98cc9a8..b7262a7 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -85,7 +85,7 @@ virCommandPtr qemuProcessCreatePretendCmd(virConnectPtr conn, virQEMUDriverPtr driver, virDomainObjPtr vm, const char *migrateURI, - bool forceFips, + bool enableFips, bool standalone, unsigned int flags); -- 2.7.3

2 1

[libvirt] [PATCH] virsh: host: Use bitmap size in bytes rather than bit count
by Peter Krempa 25 Apr '16

25 Apr '16

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1329819 --- tools/virsh-host.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-host.c b/tools/virsh-host.c index 80ac4bd..c9b2646 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -699,7 +699,7 @@ cmdNodeCpuMap(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) vshPrint(ctl, "%-15s ", _("CPU map:")); if (pretty) { - char *str = virBitmapDataToString(cpumap, cpunum); + char *str = virBitmapDataToString(cpumap, VIR_DIV_UP(cpunum, 8)); if (!str) goto cleanup; -- 2.8.1

3 2

[libvirt] [PATCH] qemu: Fix off-by-one error in block I/O throttle messages
by Martin Kletzander 25 Apr '16

25 Apr '16

QEMU_BLOCK_IOTUNE_MAX is the maximum inclusively, so let's modify the message so it makes sense. https://bugzilla.redhat.com/show_bug.cgi?id=1329041 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_driver.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ef4a62dafb5b..9597b307e9de 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1409,7 +1409,7 @@ qemuBuildDriveStr(virConnectPtr conn, 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"), QEMU_BLOCK_IOTUNE_MAX); + "be no more than %llu using QEMU"), QEMU_BLOCK_IOTUNE_MAX); goto error; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 90f541cf6d74..91ed0fa4595a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17529,7 +17529,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, if (param->value.ul > QEMU_BLOCK_IOTUNE_MAX) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, _("block I/O throttle limit value must" - " be less than %llu"), QEMU_BLOCK_IOTUNE_MAX); + " be no more than %llu"), QEMU_BLOCK_IOTUNE_MAX); goto endjob; } -- 2.8.1

2 1

[libvirt] [PATCH] docs: apibuild: Fix VPATH build
by Peter Krempa 25 Apr '16

25 Apr '16

libvirt-common.h is generated into builddir/include/libvirt. apibuild.py only operated on srcdir/inlcude/libvirt. With VPATH build srcdir/docs/libvirt-libvirt-common.html would not get generated and make RPM failed. --- We still generate the html files and other stuff into the srcdir which is gross, but's that for a different fix. docs/Makefile.am | 2 +- docs/apibuild.py | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 3ca53a4..1b21b5c 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -325,7 +325,7 @@ $(APIBUILD_STAMP): $(srcdir)/apibuild.py \ $(top_srcdir)/src/util/virerror.c \ $(top_srcdir)/src/util/virevent.c \ $(top_srcdir)/src/util/virtypedparam.c - $(AM_V_GEN)srcdir=$(srcdir) $(PYTHON) $(APIBUILD) + $(AM_V_GEN)srcdir=$(srcdir) builddir=$(abs_builddir) $(PYTHON) $(APIBUILD) touch $@ diff --git a/docs/apibuild.py b/docs/apibuild.py index 8882759..648036f 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -2584,13 +2584,18 @@ def rebuild(name): self.warning("rebuild() failed, unknown module %s") % name return None builder = None - srcdir = os.environ["srcdir"] + srcdir = os.path.abspath((os.environ["srcdir"])) + builddir = os.path.abspath((os.environ["builddir"])) + if srcdir == builddir: + builddir = None if glob.glob(srcdir + "/../src/libvirt.c") != [] : if not quiet: print "Rebuilding API description for %s" % name dirs = [srcdir + "/../src", srcdir + "/../src/util", srcdir + "/../include/libvirt"] + if builddir: + dirs.append(builddir + "/../include/libvirt") if glob.glob(srcdir + "/../include/libvirt/libvirt.h") == [] : dirs.append("../include/libvirt") builder = docBuilder(name, srcdir, dirs, []) -- 2.8.1

2 2

[libvirt] [libvirt-python][PATCH] sanitytest: Sanitize VIR_TYPED_PARAM_*
by Michal Privoznik 25 Apr '16

25 Apr '16

This test checks whether all enums that we produce in libvirt.py have some reasonable value. But because of some crazy backcompat we have the following in libvirt-domain.h: VIR_DOMAIN_SCHED_FIELD_UINT = VIR_TYPED_PARAM_UINT VIR_DOMAIN_SCHED_FIELD_ULLONG = VIR_TYPED_PARAM_ULLONG with repetitions for other types. Now, when generating libvirt.py those values are special cased and thus assigned correct integer values. But sanitytest is missing the special treatment of VIR_TYPED_PARAM_* and therefore produces following error: /usr/bin/python sanitytest.py build/lib.linux-x86_64-2.7 /home/jenkins/build/libvirt/share/libvirt/api/libvirt-api.xml Cannot get a value of enum VIR_TYPED_PARAM_UINT (originally VIR_DOMAIN_SCHED_FIELD_UINT) Cannot get a value of enum VIR_TYPED_PARAM_ULLONG (originally VIR_DOMAIN_SCHED_FIELD_ULLONG) While the test is technically correct, "VIR_TYPED_PARAM_UINT" is not an integer value, it's a name for an enum value. Yet again, special handling is missing here, as VIR_DOMAIN_SCHED_FIELD_* has correct integer value in libvirt.py. Same applies for VIR_DOMAIN_BLKIO_PARAM_* and VIR_DOMAIN_MEMORY_PARAM_* which are fixed by this too. This has been exposed by previous commit of 3026a0593bd040 which started to generate values for symbols from libvirt-common.h too. The symbols I'm mentioning above live just in that very file. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- sanitytest.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) mode change 100644 => 100755 sanitytest.py diff --git a/sanitytest.py b/sanitytest.py old mode 100644 new mode 100755 index faabccb..23163f1 --- a/sanitytest.py +++ b/sanitytest.py @@ -22,6 +22,21 @@ def get_libvirt_api_xml_path(): sys.exit(proc.returncode) return stdout.splitlines()[0] +def sanitize_enum_val(value): + if value == 'VIR_TYPED_PARAM_INT': + value = 1 + elif value == 'VIR_TYPED_PARAM_UINT': + value = 2 + elif value == 'VIR_TYPED_PARAM_LLONG': + value = 3 + elif value == 'VIR_TYPED_PARAM_ULLONG': + value = 4 + elif value == 'VIR_TYPED_PARAM_DOUBLE': + value = 5 + elif value == 'VIR_TYPED_PARAM_BOOLEAN': + value = 6 + return value + # Path to the libvirt API XML file if len(sys.argv) >= 3: xml = sys.argv[2] @@ -66,7 +81,7 @@ for n in set: for n in second_pass: typ = n.attrib['type'] name = n.attrib['name'] - val = n.attrib['value'] + val = sanitize_enum_val(n.attrib['value']) for v in enumvals.values(): if val in v: -- 2.7.3

2 3

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

25 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> --- v2: - rebased on top of Cole's changes v1: - https://www.redhat.com/archives/libvir-list/2016-April/msg01462.html tests/test-lib.sh | 6 ++++++ tests/virsh-uriprecedence | 54 +++++++++++++++++++++++++++++++++++------------ tools/virsh.c | 48 ++++++++++------------------------------- tools/virt-admin.c | 6 ++++-- 4 files changed, 62 insertions(+), 52 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 af072510870d..00330db23d0a 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -211,10 +211,11 @@ virshConnect(vshControl *ctl, const char *uri, bool readonly) * */ static void -virshReconnect(vshControl *ctl) +virshReconnect(vshControl *ctl, const char *name, bool readonly) { bool connected = false; virshControlPtr priv = ctl->privData; + bool ro = name ? readonly : priv->readonly; if (priv->conn) { int ret; @@ -229,7 +230,7 @@ virshReconnect(vshControl *ctl) "disconnect from the hypervisor")); } - priv->conn = virshConnect(ctl, ctl->connname, priv->readonly); + priv->conn = virshConnect(ctl, name ? name : ctl->connname, ro); if (!priv->conn) { if (disconnected) @@ -237,6 +238,11 @@ virshReconnect(vshControl *ctl) else vshError(ctl, "%s", _("failed to connect to the hypervisor")); } else { + if (name) { + VIR_FREE(ctl->connname); + ctl->connname = vshStrdup(ctl, name); + priv->readonly = readonly; + } if (virConnectRegisterCloseCallback(priv->conn, virshCatchDisconnect, ctl, NULL) < 0) vshError(ctl, "%s", _("Unable to register disconnect callback")); @@ -291,43 +297,11 @@ 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; - - virConnectUnregisterCloseCallback(priv->conn, virshCatchDisconnect); - ret = virConnectClose(priv->conn); - if (ret < 0) - vshError(ctl, "%s", _("Failed to disconnect from the hypervisor")); - else if (ret > 0) - vshError(ctl, "%s", _("One or more references were leaked after " - "disconnect from the hypervisor")); - } - priv->conn = conn; - - VIR_FREE(ctl->connname); - ctl->connname = vshStrdup(ctl, name); - - priv->useGetInfo = false; - priv->useSnapshotOld = false; - priv->blockJobNoBytes = false; - priv->readonly = ro; - - if (virConnectRegisterCloseCallback(priv->conn, virshCatchDisconnect, - ctl, NULL) < 0) - vshError(ctl, "%s", _("Unable to register disconnect callback")); + virshReconnect(ctl, name, ro); return true; } @@ -360,7 +334,7 @@ virshConnectionHandler(vshControl *ctl) virshControlPtr priv = ctl->privData; if (!priv->conn || disconnected) - virshReconnect(ctl); + virshReconnect(ctl, NULL, false); if (virshConnectionUsability(ctl, priv->conn)) return priv->conn; @@ -431,7 +405,7 @@ virshInit(vshControl *ctl) return false; if (ctl->connname) { - virshReconnect(ctl); + virshReconnect(ctl, NULL, false); /* Connecting to a named connection must succeed, but we delay * connecting to the default connection until we need it * (since the first command might be 'connect' which allows a 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 2

[libvirt] Printing runtime DAC seclabel in the XML
by Cole Robinson 25 Apr '16

25 Apr '16

I'm looking in the code to see why runtime VM dac seclabel values aren't printed in the active XML. They are filled in, but the domain XML formatter explicitly skips it: /* To avoid backward compatibility issues, suppress DAC and 'none' labels * that are automatically generated. */ if ((STREQ_NULLABLE(def->model, "dac") || STREQ_NULLABLE(def->model, "none")) && def->implicit) return; The relevant bit is from here: commit 990e46c4542349f838e001d30638872576c389e9 Author: Marcelo Cerri <mhcerri(a)linux.vnet.ibm.com> Date: Fri Aug 31 13:40:41 2012 +0200 conf: Avoid formatting auto-generated DAC labels And I think comment elsewhere in domain_conf.c explains what that's all about: /* libvirt versions prior to 0.10.0 support just a single seclabel element * in guest's XML and model attribute can be suppressed if type is none or * type is dynamic, baselabel is not defined and INACTIVE flag is set. * * To avoid compatibility issues, for this specific case the first model * defined in host's capabilities is used as model for the seclabel. */ Just dropping the the model == "dac" check above seems to accomplish what I'm after, but it's not strictly back compatible. That said, libvirt has supported multiple seclabels for a loooong time now, so I wonder do we even care? Do we have a target for how far back we try to maintain XML compat? Or does anyone else have other ideas? (ccing jiri and michal who have had patches in this area) Thanks, Cole

2 5

[libvirt] [PATCH 0/5] tests: misc cleanups
by Cole Robinson 23 Apr '16

23 Apr '16

A collection of misc cleanups to the test suite. They apply on top of my config file fix here: http://www.redhat.com/archives/libvir-list/2016-April/msg01515.html Cole Robinson (5): tests: build: Remove duplicate libvirtd test list tests: consistently name virsh tests with 'virsh-' prefix tests: rename test_conf -> virconftest tests: consistently source test-lib.sh in scripts tests: remove 'reconnect' and 'statstest' cfg.mk | 2 +- tests/Makefile.am | 64 +++---- tests/capabilityschematest | 3 +- tests/domaincapsschematest | 3 +- tests/domainschematest | 3 +- tests/domainsnapshotschematest | 3 +- tests/interfaceschematest | 3 +- tests/libvirtd-fail | 6 +- tests/libvirtd-pool | 6 +- tests/networkschematest | 3 +- tests/nodedevschematest | 3 +- tests/nwfilterschematest | 3 +- tests/reconnect.c | 71 ------- tests/secretschematest | 3 +- tests/statstest.c | 210 --------------------- tests/storagepoolschematest | 3 +- tests/storagevolschematest | 3 +- tests/{confdata => virconfdata}/fc4.conf | 0 tests/{confdata => virconfdata}/fc4.out | 0 tests/{confdata => virconfdata}/libvirtd.conf | 0 tests/{confdata => virconfdata}/libvirtd.out | 0 tests/{confdata => virconfdata}/no-newline.conf | 0 tests/{confdata => virconfdata}/no-newline.out | 0 tests/{test_conf.c => virconftest.c} | 0 tests/{test_conf.sh => virconftest.sh} | 4 +- tests/virsh-all | 4 +- tests/{cpuset => virsh-cpuset} | 6 +- ...fine-dev-segfault => virsh-define-dev-segfault} | 6 +- tests/{int-overflow => virsh-int-overflow} | 6 +- tests/virsh-optparse | 6 +- tests/{read-bufsiz => virsh-read-bufsiz} | 6 +- .../{read-non-seekable => virsh-read-non-seekable} | 6 +- tests/virsh-schedinfo | 6 +- tests/{start => virsh-start} | 6 +- tests/virsh-synopsis | 6 +- tests/virsh-undefine | 6 +- tests/virsh-uriprecedence | 3 +- tests/{vcpupin => virsh-vcpupin} | 6 +- 38 files changed, 49 insertions(+), 420 deletions(-) delete mode 100644 tests/reconnect.c delete mode 100644 tests/statstest.c rename tests/{confdata => virconfdata}/fc4.conf (100%) rename tests/{confdata => virconfdata}/fc4.out (100%) rename tests/{confdata => virconfdata}/libvirtd.conf (100%) rename tests/{confdata => virconfdata}/libvirtd.out (100%) rename tests/{confdata => virconfdata}/no-newline.conf (100%) rename tests/{confdata => virconfdata}/no-newline.out (100%) rename tests/{test_conf.c => virconftest.c} (100%) rename tests/{test_conf.sh => virconftest.sh} (88%) rename tests/{cpuset => virsh-cpuset} (89%) rename tests/{define-dev-segfault => virsh-define-dev-segfault} (90%) rename tests/{int-overflow => virsh-int-overflow} (74%) rename tests/{read-bufsiz => virsh-read-bufsiz} (90%) rename tests/{read-non-seekable => virsh-read-non-seekable} (89%) rename tests/{start => virsh-start} (86%) rename tests/{vcpupin => virsh-vcpupin} (94%) -- 2.7.3

2 12

[libvirt] [PATCH] configure: Remove build time checks for (ip|ip6|eb)tables
by Cole Robinson 23 Apr '16

23 Apr '16

And the 'ip' tool. There isn't much benefit to checking this at configure time when we have infrastructure nowadays for looking up binaries in the PATH https://bugzilla.redhat.com/show_bug.cgi?id=661262 --- configure.ac | 12 ------ src/util/virfirewall.c | 18 +++++---- src/util/virnetdev.c | 6 +-- tests/virfirewalltest.c | 98 ++++++++++++++++++++++++------------------------- 4 files changed, 62 insertions(+), 72 deletions(-) diff --git a/configure.ac b/configure.ac index de5f430..35ae16e 100644 --- a/configure.ac +++ b/configure.ac @@ -694,18 +694,6 @@ if test x"$with_rhel5_api" = x"yes"; then AC_DEFINE([WITH_RHEL5_API], [1], [whether building for the RHEL-5 API]) fi -AC_PATH_PROG([IP_PATH], [ip], /sbin/ip, [/usr/sbin:$PATH]) -AC_DEFINE_UNQUOTED([IP_PATH], "$IP_PATH", [path to ip binary]) - -AC_PATH_PROG([IPTABLES_PATH], [iptables], /sbin/iptables, [/usr/sbin:$PATH]) -AC_DEFINE_UNQUOTED([IPTABLES_PATH], "$IPTABLES_PATH", [path to iptables binary]) - -AC_PATH_PROG([IP6TABLES_PATH], [ip6tables], /sbin/ip6tables, [/usr/sbin:$PATH]) -AC_DEFINE_UNQUOTED([IP6TABLES_PATH], "$IP6TABLES_PATH", [path to ip6tables binary]) - -AC_PATH_PROG([EBTABLES_PATH], [ebtables], /sbin/ebtables, [/usr/sbin:$PATH]) -AC_DEFINE_UNQUOTED([EBTABLES_PATH], "$EBTABLES_PATH", [path to ebtables binary]) - dnl dnl Checks for the OpenVZ driver diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index f26fd86..63f9709 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -47,9 +47,9 @@ typedef virFirewallGroup *virFirewallGroupPtr; VIR_ENUM_DECL(virFirewallLayerCommand) VIR_ENUM_IMPL(virFirewallLayerCommand, VIR_FIREWALL_LAYER_LAST, - EBTABLES_PATH, - IPTABLES_PATH, - IP6TABLES_PATH); + "ebtables", + "iptables", + "ip6tables"); VIR_ENUM_DECL(virFirewallLayerFirewallD) VIR_ENUM_IMPL(virFirewallLayerFirewallD, VIR_FIREWALL_LAYER_LAST, @@ -134,13 +134,13 @@ static void virFirewallCheckUpdateLocking(void) { const char *iptablesArgs[] = { - IPTABLES_PATH, "-w", "-L", "-n", NULL, + "iptables", "-w", "-L", "-n", NULL, }; const char *ip6tablesArgs[] = { - IP6TABLES_PATH, "-w", "-L", "-n", NULL, + "ip6tables", "-w", "-L", "-n", NULL, }; const char *ebtablesArgs[] = { - EBTABLES_PATH, "--concurrent", "-L", NULL, + "ebtables", "--concurrent", "-L", NULL, }; if (lockOverride) return; @@ -182,17 +182,19 @@ virFirewallValidateBackend(virFirewallBackend backend) if (backend == VIR_FIREWALL_BACKEND_DIRECT) { const char *commands[] = { - IPTABLES_PATH, IP6TABLES_PATH, EBTABLES_PATH + "iptables", "ip6tables", "ebtables" }; size_t i; for (i = 0; i < ARRAY_CARDINALITY(commands); i++) { - if (!virFileIsExecutable(commands[i])) { + char *path = virFindFileInPath(commands[i]); + if (!path) { virReportSystemError(errno, _("direct firewall backend requested, but %s is not available"), commands[i]); return -1; } + VIR_FREE(path); } VIR_DEBUG("found iptables/ip6tables/ebtables, using direct backend"); } diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index bb17b84..75e45fd 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1469,7 +1469,7 @@ int virNetDevSetIPAddress(const char *ifname, virCommandAddArgList(cmd, "broadcast", bcaststr, NULL); virCommandAddArg(cmd, "alias"); # else - cmd = virCommandNew(IP_PATH); + cmd = virCommandNew("ip"); virCommandAddArgList(cmd, "addr", "add", NULL); virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); if (peerstr) @@ -1506,7 +1506,7 @@ virNetDevAddRoute(const char *ifname, goto cleanup; if (!(gatewaystr = virSocketAddrFormat(gateway))) goto cleanup; - cmd = virCommandNew(IP_PATH); + cmd = virCommandNew("ip"); virCommandAddArgList(cmd, "route", "add", NULL); virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); virCommandAddArgList(cmd, "via", gatewaystr, "dev", ifname, @@ -1544,7 +1544,7 @@ int virNetDevClearIPAddress(const char *ifname, virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); virCommandAddArg(cmd, "-alias"); # else - cmd = virCommandNew(IP_PATH); + cmd = virCommandNew("ip"); virCommandAddArgList(cmd, "addr", "del", NULL); virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); virCommandAddArgList(cmd, "dev", ifname, NULL); diff --git a/tests/virfirewalltest.c b/tests/virfirewalltest.c index f1f29c6..976e883 100644 --- a/tests/virfirewalltest.c +++ b/tests/virfirewalltest.c @@ -128,11 +128,11 @@ VIR_MOCK_WRAP_RET_ARGS(dbus_connection_send_with_reply_and_block, if (fwBuf) { if (STREQ(type, "ipv4")) - virBufferAddLit(fwBuf, IPTABLES_PATH); + virBufferAddLit(fwBuf, "iptables"); else if (STREQ(type, "ipv4")) - virBufferAddLit(fwBuf, IP6TABLES_PATH); + virBufferAddLit(fwBuf, "ip6tables"); else - virBufferAddLit(fwBuf, EBTABLES_PATH); + virBufferAddLit(fwBuf, "ebtables"); } for (i = 0; i < nargs; i++) { if (fwBuf) { @@ -204,8 +204,8 @@ testFirewallSingleGroup(const void *opaque) int ret = -1; const char *actual = NULL; const char *expected = - IPTABLES_PATH " -A INPUT --source-host 192.168.122.1 --jump ACCEPT\n" - IPTABLES_PATH " -A INPUT --source-host '!192.168.122.1' --jump REJECT\n"; + "iptables -A INPUT --source-host 192.168.122.1 --jump ACCEPT\n" + "iptables -A INPUT --source-host '!192.168.122.1' --jump REJECT\n"; const struct testFirewallData *data = opaque; fwDisabled = data->fwDisabled; @@ -263,8 +263,8 @@ testFirewallRemoveRule(const void *opaque) int ret = -1; const char *actual = NULL; const char *expected = - IPTABLES_PATH " -A INPUT --source-host 192.168.122.1 --jump ACCEPT\n" - IPTABLES_PATH " -A INPUT --source-host '!192.168.122.1' --jump REJECT\n"; + "iptables -A INPUT --source-host 192.168.122.1 --jump ACCEPT\n" + "iptables -A INPUT --source-host '!192.168.122.1' --jump REJECT\n"; const struct testFirewallData *data = opaque; virFirewallRulePtr fwrule; @@ -329,10 +329,10 @@ testFirewallManyGroups(const void *opaque ATTRIBUTE_UNUSED) int ret = -1; const char *actual = NULL; const char *expected = - IPTABLES_PATH " -A INPUT --source-host 192.168.122.1 --jump ACCEPT\n" - IPTABLES_PATH " -A INPUT --source-host '!192.168.122.1' --jump REJECT\n" - IPTABLES_PATH " -A OUTPUT --source-host 192.168.122.1 --jump ACCEPT\n" - IPTABLES_PATH " -A OUTPUT --jump DROP\n"; + "iptables -A INPUT --source-host 192.168.122.1 --jump ACCEPT\n" + "iptables -A INPUT --source-host '!192.168.122.1' --jump REJECT\n" + "iptables -A OUTPUT --source-host 192.168.122.1 --jump ACCEPT\n" + "iptables -A OUTPUT --jump DROP\n"; const struct testFirewallData *data = opaque; fwDisabled = data->fwDisabled; @@ -423,10 +423,10 @@ testFirewallIgnoreFailGroup(const void *opaque ATTRIBUTE_UNUSED) int ret = -1; const char *actual = NULL; const char *expected = - IPTABLES_PATH " -A INPUT --source-host 192.168.122.1 --jump ACCEPT\n" - IPTABLES_PATH " -A INPUT --source-host 192.168.122.255 --jump REJECT\n" - IPTABLES_PATH " -A OUTPUT --source-host 192.168.122.1 --jump ACCEPT\n" - IPTABLES_PATH " -A OUTPUT --jump DROP\n"; + "iptables -A INPUT --source-host 192.168.122.1 --jump ACCEPT\n" + "iptables -A INPUT --source-host 192.168.122.255 --jump REJECT\n" + "iptables -A OUTPUT --source-host 192.168.122.1 --jump ACCEPT\n" + "iptables -A OUTPUT --jump DROP\n"; const struct testFirewallData *data = opaque; fwDisabled = data->fwDisabled; @@ -498,10 +498,10 @@ testFirewallIgnoreFailRule(const void *opaque ATTRIBUTE_UNUSED) int ret = -1; const char *actual = NULL; const char *expected = - IPTABLES_PATH " -A INPUT --source-host 192.168.122.1 --jump ACCEPT\n" - IPTABLES_PATH " -A INPUT --source-host 192.168.122.255 --jump REJECT\n" - IPTABLES_PATH " -A OUTPUT --source-host 192.168.122.1 --jump ACCEPT\n" - IPTABLES_PATH " -A OUTPUT --jump DROP\n"; + "iptables -A INPUT --source-host 192.168.122.1 --jump ACCEPT\n" + "iptables -A INPUT --source-host 192.168.122.255 --jump REJECT\n" + "iptables -A OUTPUT --source-host 192.168.122.1 --jump ACCEPT\n" + "iptables -A OUTPUT --jump DROP\n"; const struct testFirewallData *data = opaque; fwDisabled = data->fwDisabled; @@ -572,8 +572,8 @@ testFirewallNoRollback(const void *opaque ATTRIBUTE_UNUSED) int ret = -1; const char *actual = NULL; const char *expected = - IPTABLES_PATH " -A INPUT --source-host 192.168.122.1 --jump ACCEPT\n" - IPTABLES_PATH " -A INPUT --source-host 192.168.122.255 --jump REJECT\n"; + "iptables -A INPUT --source-host 192.168.122.1 --jump ACCEPT\n" + "iptables -A INPUT --source-host 192.168.122.255 --jump REJECT\n"; const struct testFirewallData *data = opaque; fwDisabled = data->fwDisabled; @@ -642,11 +642,11 @@ testFirewallSingleRollback(const void *opaque ATTRIBUTE_UNUSED) int ret = -1; const char *actual = NULL; const char *expected = - IPTABLES_PATH " -A INPUT --source-host 192.168.122.1 --jump ACCEPT\n" - IPTABLES_PATH " -A INPUT --source-host 192.168.122.255 --jump REJECT\n" - IPTABLES_PATH " -D INPUT --source-host 192.168.122.1 --jump ACCEPT\n" - IPTABLES_PATH " -D INPUT --source-host 192.168.122.255 --jump REJECT\n" - IPTABLES_PATH " -D INPUT --source-host '!192.168.122.1' --jump REJECT\n"; + "iptables -A INPUT --source-host 192.168.122.1 --jump ACCEPT\n" + "iptables -A INPUT --source-host 192.168.122.255 --jump REJECT\n" + "iptables -D INPUT --source-host 192.168.122.1 --jump ACCEPT\n" + "iptables -D INPUT --source-host 192.168.122.255 --jump REJECT\n" + "iptables -D INPUT --source-host '!192.168.122.1' --jump REJECT\n"; const struct testFirewallData *data = opaque; fwDisabled = data->fwDisabled; @@ -732,10 +732,10 @@ testFirewallManyRollback(const void *opaque ATTRIBUTE_UNUSED) int ret = -1; const char *actual = NULL; const char *expected = - IPTABLES_PATH " -A INPUT --source-host 192.168.122.1 --jump ACCEPT\n" - IPTABLES_PATH " -A INPUT --source-host 192.168.122.255 --jump REJECT\n" - IPTABLES_PATH " -D INPUT --source-host 192.168.122.255 --jump REJECT\n" - IPTABLES_PATH " -D INPUT --source-host '!192.168.122.1' --jump REJECT\n"; + "iptables -A INPUT --source-host 192.168.122.1 --jump ACCEPT\n" + "iptables -A INPUT --source-host 192.168.122.255 --jump REJECT\n" + "iptables -D INPUT --source-host 192.168.122.255 --jump REJECT\n" + "iptables -D INPUT --source-host '!192.168.122.1' --jump REJECT\n"; const struct testFirewallData *data = opaque; fwDisabled = data->fwDisabled; @@ -825,14 +825,14 @@ testFirewallChainedRollback(const void *opaque ATTRIBUTE_UNUSED) int ret = -1; const char *actual = NULL; const char *expected = - IPTABLES_PATH " -A INPUT --source-host 192.168.122.1 --jump ACCEPT\n" - IPTABLES_PATH " -A INPUT --source-host 192.168.122.127 --jump REJECT\n" - IPTABLES_PATH " -A INPUT --source-host '!192.168.122.1' --jump REJECT\n" - IPTABLES_PATH " -A INPUT --source-host 192.168.122.255 --jump REJECT\n" - IPTABLES_PATH " -D INPUT --source-host 192.168.122.127 --jump REJECT\n" - IPTABLES_PATH " -D INPUT --source-host '!192.168.122.1' --jump REJECT\n" - IPTABLES_PATH " -D INPUT --source-host 192.168.122.255 --jump REJECT\n" - IPTABLES_PATH " -D INPUT --source-host '!192.168.122.1' --jump REJECT\n"; + "iptables -A INPUT --source-host 192.168.122.1 --jump ACCEPT\n" + "iptables -A INPUT --source-host 192.168.122.127 --jump REJECT\n" + "iptables -A INPUT --source-host '!192.168.122.1' --jump REJECT\n" + "iptables -A INPUT --source-host 192.168.122.255 --jump REJECT\n" + "iptables -D INPUT --source-host 192.168.122.127 --jump REJECT\n" + "iptables -D INPUT --source-host '!192.168.122.1' --jump REJECT\n" + "iptables -D INPUT --source-host 192.168.122.255 --jump REJECT\n" + "iptables -D INPUT --source-host '!192.168.122.1' --jump REJECT\n"; const struct testFirewallData *data = opaque; fwDisabled = data->fwDisabled; @@ -976,11 +976,11 @@ testFirewallQueryHook(const char *const*args, int *status, void *opaque ATTRIBUTE_UNUSED) { - if (STREQ(args[0], IPTABLES_PATH) && + if (STREQ(args[0], "iptables") && STREQ(args[1], "-L")) { if (VIR_STRDUP(*output, TEST_FILTER_TABLE_LIST) < 0) *status = 127; - } else if (STREQ(args[0], IPTABLES_PATH) && + } else if (STREQ(args[0], "iptables") && STREQ(args[1], "-t") && STREQ(args[2], "nat") && STREQ(args[3], "-L")) { @@ -1026,15 +1026,15 @@ testFirewallQuery(const void *opaque ATTRIBUTE_UNUSED) int ret = -1; const char *actual = NULL; const char *expected = - IPTABLES_PATH " -A INPUT --source-host 192.168.122.1 --jump ACCEPT\n" - IPTABLES_PATH " -A INPUT --source-host 192.168.122.127 --jump REJECT\n" - IPTABLES_PATH " -L\n" - IPTABLES_PATH " -t nat -L\n" - IPTABLES_PATH " -A INPUT --source-host 192.168.122.130 --jump REJECT\n" - IPTABLES_PATH " -A INPUT --source-host '!192.168.122.129' --jump REJECT\n" - IPTABLES_PATH " -A INPUT --source-host '!192.168.122.129' --jump REJECT\n" - IPTABLES_PATH " -A INPUT --source-host 192.168.122.128 --jump REJECT\n" - IPTABLES_PATH " -A INPUT --source-host '!192.168.122.1' --jump REJECT\n"; + "iptables -A INPUT --source-host 192.168.122.1 --jump ACCEPT\n" + "iptables -A INPUT --source-host 192.168.122.127 --jump REJECT\n" + "iptables -L\n" + "iptables -t nat -L\n" + "iptables -A INPUT --source-host 192.168.122.130 --jump REJECT\n" + "iptables -A INPUT --source-host '!192.168.122.129' --jump REJECT\n" + "iptables -A INPUT --source-host '!192.168.122.129' --jump REJECT\n" + "iptables -A INPUT --source-host 192.168.122.128 --jump REJECT\n" + "iptables -A INPUT --source-host '!192.168.122.1' --jump REJECT\n"; const struct testFirewallData *data = opaque; expectedLineNum = 0; -- 2.7.3

3 5

[libvirt] [PATCH 0/3] docs: Some fixes and improvements
by Andrea Bolognani 23 Apr '16

23 Apr '16

See individual patches for details. Andrea Bolognani (3): syntax-check: Enforce <code> inside <dt> elements docs: Fix some formatting oddities docs: Use bold font for symbols cfg.mk | 14 ++++ docs/formatdomain.html.in | 193 +++++++++++++++++++++++--------------------- docs/formatnetwork.html.in | 7 +- docs/formatsnapshot.html.in | 6 +- docs/generic.css | 4 + docs/remote.html.in | 2 +- 6 files changed, 127 insertions(+), 99 deletions(-) -- 2.5.5

2 5

[libvirt] [PATCH v2 00/14] Convert secret driver to use hashed object
by John Ferlan 23 Apr '16

23 Apr '16

v1: http://www.redhat.com/archives/libvir-list/2016-March/msg00099.html Differences high level: - Use virsecretobj.{c,h} instead of secret_conf.{c,h} - Work in v1 review comments Difference details for those that care to know: Note: Former patch2 has already been pushed. Patch 1: Is combination of v1's patch1 and patch3 w/ adjustments: - Create virsecretobj.c and virsecretobj.h and move sources there. - Add virsecretobj.{c,h} to src/Makefile.am - Use order as suggested by eblake review of patch3 for forward static decls, removed the != NULL from virSecretObjDispose, and add comment regarding why memset() is being done Patch 2: Former patch4 - Move code to virsecretobj.{c,h} instead of secret_conf.{c,h} - Change the virSecretObjFindByUUIDLocked to use the construct "return virObjectRef(virHashLookup(...));" as suggested by eblake Patch3: Former patch5 (split) - Split the format patch5 to have virSecretUsageIDForDef changes in one patch and the remainder in the followup patch. Patch4: Former patch5 (split) - The rest of former patch5 - Removed the extraneous "VIR_FREE(configFile);" as noted by eblake. - NOTE: eblake queried about the condition: if (secret->def->private && !def->private) in virSecretObjListAddLocked. This same check came from the former secretDefineXML in the else of the "secretFindByUUID(new_attrs->uuid)". IOW: Redefining a secret. The code didn't allow a "new" secret to be not private if the currently defined one was private. I left it as is. Patch5->Patch9: Former patch6->patch10: - All that's different is using virsecretobj instead of secret_conf Patch10: Former patch11 - Using virsecretobj instead of secret_conf Patch11: Former patch10 - Adjusted and moved the comment from virSecretObjDeleteConfig to virSecretObjDeleteData - Added a virReportSystemError for the DeleteConfig error Patch12: Former patch13: - All that's different is using virsecretobj instead of secret_conf Patch13: Former patch14 - Delete the extra space in the "return 0" as noted by Cole's review. Patch14: Former patch15: - All that's different is using virsecretobj instead of secret_conf After all is said done, I did a sdiff between the v1 secret_conf.h and v2 virsecretobj.h as well as the v1 secret_conf.c and v2 virsecretobj.c and found only the differences as noted above, plus removed a duplicated virSecretUsageIDForDef prototype I found in secret_conf.h. I also went through the painful process of make check syntax-check at each step of the way and built using Coverity. John Ferlan (14): secret: Create virsecretobj.c and virsecretconf.h secret: Introduce virSecretObjListFindBy{UUID|Usage} support secret: Introduce virSecretUsageIDForDef secret: Introduce virSecretObjListAdd* and virSecretObjListRemove secret: Introduce virSecretObjListNumOfSecrets secret: Introduce virSecretObjListExport secret: Introduce virSecretObjListGetUUIDs secret: Use the hashed virSecretObjList secret: Move and rename secretLoadAllConfigs secret: Introduce virSecretObjDelete{Config|Data} secret: Introduce virSecretObjSave{Config|Data} secret: Introduce virSecretObj{Get|Set}Def secret: Introduce virSecretObjGetValue and virSecretObjGetValueSize secret: Change virSecretDef variable names po/POTFILES.in | 1 + src/Makefile.am | 3 +- src/conf/secret_conf.c | 37 +- src/conf/secret_conf.h | 9 +- src/conf/virsecretobj.c | 1011 +++++++++++++++++++++++++++++++++++++++++ src/conf/virsecretobj.h | 110 +++++ src/libvirt_private.syms | 24 + src/secret/secret_driver.c | 823 ++++----------------------------- src/storage/storage_backend.c | 4 +- 9 files changed, 1279 insertions(+), 743 deletions(-) create mode 100644 src/conf/virsecretobj.c create mode 100644 src/conf/virsecretobj.h -- 2.5.5

2 15