- Devel - libvirt List Archives

[libvirt] [PATCH] virtlogd: make max file size & number of backups configurable
by Daniel P. Berrange 04 Jul '16

04 Jul '16

Currently virtlogd has a hardcoded max file size of 128kb and max of 3 backups. This adds two new config parameters to /etc/libvirt/virtlogd.conf to let these be customized. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/logging/log_daemon.c | 17 +++++++++++++---- src/logging/log_daemon_config.c | 5 +++++ src/logging/log_daemon_config.h | 3 +++ src/logging/log_handler.c | 27 ++++++++++++++++++--------- src/logging/log_handler.h | 4 ++++ src/logging/test_virtlogd.aug.in | 4 ++++ src/logging/virtlogd.aug | 2 ++ src/logging/virtlogd.conf | 8 ++++++++ 8 files changed, 57 insertions(+), 13 deletions(-) diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 9f71ca9..80e75bf 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -165,6 +165,8 @@ virLogDaemonNew(virLogDaemonConfigPtr config, bool privileged) goto error; if (!(logd->handler = virLogHandlerNew(privileged, + config->max_size, + config->max_backups, virLogDaemonInhibitor, logd))) goto error; @@ -185,7 +187,8 @@ virLogDaemonGetHandler(virLogDaemonPtr dmn) static virLogDaemonPtr -virLogDaemonNewPostExecRestart(virJSONValuePtr object, bool privileged) +virLogDaemonNewPostExecRestart(virJSONValuePtr object, bool privileged, + virLogDaemonConfigPtr config) { virLogDaemonPtr logd; virJSONValuePtr child; @@ -226,6 +229,8 @@ virLogDaemonNewPostExecRestart(virJSONValuePtr object, bool privileged) if (!(logd->handler = virLogHandlerNewPostExecRestart(child, privileged, + config->max_size, + config->max_backups, virLogDaemonInhibitor, logd))) goto error; @@ -717,7 +722,8 @@ static int virLogDaemonPostExecRestart(const char *state_file, const char *pid_file, int *pid_file_fd, - bool privileged) + bool privileged, + virLogDaemonConfigPtr config) { const char *gotmagic; char *wantmagic = NULL; @@ -766,7 +772,9 @@ virLogDaemonPostExecRestart(const char *state_file, (*pid_file_fd = virPidFileAcquirePath(pid_file, false, getpid())) < 0) goto cleanup; - if (!(logDaemon = virLogDaemonNewPostExecRestart(object, privileged))) + if (!(logDaemon = virLogDaemonNewPostExecRestart(object, + privileged, + config))) goto cleanup; ret = 1; @@ -1086,7 +1094,8 @@ int main(int argc, char **argv) { if ((rv = virLogDaemonPostExecRestart(state_file, pid_file, &pid_file_fd, - privileged)) < 0) { + privileged, + config)) < 0) { ret = VIR_LOG_DAEMON_ERR_INIT; goto cleanup; } diff --git a/src/logging/log_daemon_config.c b/src/logging/log_daemon_config.c index 9e729fa..b584970 100644 --- a/src/logging/log_daemon_config.c +++ b/src/logging/log_daemon_config.c @@ -128,6 +128,8 @@ virLogDaemonConfigNew(bool privileged ATTRIBUTE_UNUSED) return NULL; data->max_clients = 1024; + data->max_size = 128 * 1024; + data->max_backups = 3; return data; } @@ -154,6 +156,9 @@ virLogDaemonConfigLoadOptions(virLogDaemonConfigPtr data, GET_CONF_STR(conf, filename, log_outputs); GET_CONF_UINT(conf, filename, max_clients); + GET_CONF_UINT(conf, filename, max_size); + GET_CONF_UINT(conf, filename, max_backups); + return 0; error: diff --git a/src/logging/log_daemon_config.h b/src/logging/log_daemon_config.h index 24cc631..0da7b0b 100644 --- a/src/logging/log_daemon_config.h +++ b/src/logging/log_daemon_config.h @@ -34,6 +34,9 @@ struct _virLogDaemonConfig { char *log_filters; char *log_outputs; int max_clients; + + size_t max_backups; + size_t max_size; }; diff --git a/src/logging/log_handler.c b/src/logging/log_handler.c index a8cb6cf..cd0ba6e 100644 --- a/src/logging/log_handler.c +++ b/src/logging/log_handler.c @@ -41,8 +41,6 @@ VIR_LOG_INIT("logging.log_handler"); #define VIR_FROM_THIS VIR_FROM_LOGGING -#define DEFAULT_FILE_SIZE (128 * 1024) -#define DEFAULT_MAX_BACKUP 3 #define DEFAULT_MODE 0600 typedef struct _virLogHandlerLogFile virLogHandlerLogFile; @@ -62,6 +60,9 @@ struct _virLogHandler { virObjectLockable parent; bool privileged; + size_t max_size; + size_t max_backups; + virLogHandlerLogFilePtr *files; size_t nfiles; @@ -184,6 +185,8 @@ virLogHandlerDomainLogFileEvent(int watch, virLogHandlerPtr virLogHandlerNew(bool privileged, + size_t max_size, + size_t max_backups, virLogHandlerShutdownInhibitor inhibitor, void *opaque) { @@ -196,6 +199,8 @@ virLogHandlerNew(bool privileged, goto error; handler->privileged = privileged; + handler->max_size = max_size; + handler->max_backups = max_backups; handler->inhibitor = inhibitor; handler->opaque = opaque; @@ -254,8 +259,8 @@ virLogHandlerLogFilePostExecRestart(virLogHandlerPtr handler, } if ((file->file = virRotatingFileWriterNew(path, - DEFAULT_FILE_SIZE, - DEFAULT_MAX_BACKUP, + handler->max_size, + handler->max_backups, false, DEFAULT_MODE)) == NULL) goto error; @@ -283,6 +288,8 @@ virLogHandlerLogFilePostExecRestart(virLogHandlerPtr handler, virLogHandlerPtr virLogHandlerNewPostExecRestart(virJSONValuePtr object, bool privileged, + size_t max_size, + size_t max_backups, virLogHandlerShutdownInhibitor inhibitor, void *opaque) { @@ -292,6 +299,8 @@ virLogHandlerNewPostExecRestart(virJSONValuePtr object, size_t i; if (!(handler = virLogHandlerNew(privileged, + max_size, + max_backups, inhibitor, opaque))) return NULL; @@ -396,8 +405,8 @@ virLogHandlerDomainOpenLogFile(virLogHandlerPtr handler, goto error; if ((file->file = virRotatingFileWriterNew(path, - DEFAULT_FILE_SIZE, - DEFAULT_MAX_BACKUP, + handler->max_size, + handler->max_backups, trunc, DEFAULT_MODE)) == NULL) goto error; @@ -487,7 +496,7 @@ virLogHandlerDomainReadLogFile(virLogHandlerPtr handler, virObjectLock(handler); - if (!(file = virRotatingFileReaderNew(path, DEFAULT_MAX_BACKUP))) + if (!(file = virRotatingFileReaderNew(path, handler->max_backups))) goto error; if (virRotatingFileReaderSeek(file, inode, offset) < 0) @@ -542,8 +551,8 @@ virLogHandlerDomainAppendLogFile(virLogHandlerPtr handler, if (!writer) { if (!(newwriter = virRotatingFileWriterNew(path, - DEFAULT_FILE_SIZE, - DEFAULT_MAX_BACKUP, + handler->max_size, + handler->max_backups, false, DEFAULT_MODE))) goto cleanup; diff --git a/src/logging/log_handler.h b/src/logging/log_handler.h index 4607e45..70be567 100644 --- a/src/logging/log_handler.h +++ b/src/logging/log_handler.h @@ -34,10 +34,14 @@ typedef void (*virLogHandlerShutdownInhibitor)(bool inhibit, void *opaque); virLogHandlerPtr virLogHandlerNew(bool privileged, + size_t max_size, + size_t max_backups, virLogHandlerShutdownInhibitor inhibitor, void *opaque); virLogHandlerPtr virLogHandlerNewPostExecRestart(virJSONValuePtr child, bool privileged, + size_t max_size, + size_t max_backups, virLogHandlerShutdownInhibitor inhibitor, void *opaque); diff --git a/src/logging/test_virtlogd.aug.in b/src/logging/test_virtlogd.aug.in index b12f676..792a5b8 100644 --- a/src/logging/test_virtlogd.aug.in +++ b/src/logging/test_virtlogd.aug.in @@ -2,9 +2,13 @@ module Test_virtlogd = let conf = "log_level = 3 log_filters=\"3:remote 4:event\" log_outputs=\"3:syslog:virtlogd\" +max_size = 131072 +max_backups = 3 " test Virtlogd.lns get conf = { "log_level" = "3" } { "log_filters" = "3:remote 4:event" } { "log_outputs" = "3:syslog:virtlogd" } + { "max_size" = "131072" } + { "max_backups" = "3" } diff --git a/src/logging/virtlogd.aug b/src/logging/virtlogd.aug index eefba5b..da480fd 100644 --- a/src/logging/virtlogd.aug +++ b/src/logging/virtlogd.aug @@ -29,6 +29,8 @@ module Virtlogd = | str_entry "log_outputs" | int_entry "log_buffer_size" | int_entry "max_clients" + | int_entry "max_size" + | int_entry "max_backups" (* Each enty in the config is one of the following three ... *) let entry = logging_entry diff --git a/src/logging/virtlogd.conf b/src/logging/virtlogd.conf index abb3633..fbd92ff 100644 --- a/src/logging/virtlogd.conf +++ b/src/logging/virtlogd.conf @@ -57,3 +57,11 @@ # The maximum number of concurrent client connections to allow # over all sockets combined. #max_clients = 1024 + + +# Maximum file size before rolling over. Defaults to 128 KB +#max_size = 131072 + +# Maximum number of backup files to keep. Defaults to 3, +# not including the primary active file +#max_backups = 3 -- 2.7.4

2 1

[libvirt] [PATCH] maint: update to latest gnulib
by Martin Kletzander 04 Jul '16

04 Jul '16

Fix mingw build regarding rpl_{printf,scanf} symbols. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed under gnulib maintenance (just guessing what that means) and build-breaker rules. .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index 246b3b28808e..68b6adebef05 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 246b3b28808ee5f4664be674dce573af9497fc7a +Subproject commit 68b6adebef05670a312fb92b05e7bd089d2ed43a -- 2.9.0

1 0

[libvirt] is there a plan to support internal-rbd-snapshot?
by longguang.yue 02 Jul '16

02 Jul '16

hi, is there a plan to support internal-rbd-snapshot? any one is responsible for it? thanks

3 2

[libvirt] [PATCH 0/6] Revert: 'IP peer address and host-side address config support'
by Ján Tomko 02 Jul '16

02 Jul '16

This series was accidentally pushed in the feature freeze. Revert the last six commits adding the new functionality. The rest are either bugfixes or preparation for the bugfixes. Ján Tomko (6): Revert "qemu: support setting host-side IP addresses/routes" Revert "lxc: support setting host-side IP addresses/routes" Revert "util: support setting peer for virNetDevIPInfo addresses" Revert "conf: support host-side IP/route information in <interface>" Revert "conf: allow setting peer address in <ip> element of <interface>" Revert "util: new function virNetDevIPInfoAddToDev" docs/formatdomain.html.in | 60 +++-------- docs/schemas/domaincommon.rng | 8 +- src/conf/domain_conf.c | 117 ++++----------------- src/conf/domain_conf.h | 3 +- src/libvirt_private.syms | 1 - src/lxc/lxc_container.c | 47 +++++++-- src/lxc/lxc_process.c | 8 -- src/qemu/qemu_interface.c | 6 +- src/util/virnetdevip.c | 60 ----------- src/util/virnetdevip.h | 7 +- tests/lxcxml2xmldata/lxc-ethernet-hostip.xml | 44 -------- tests/lxcxml2xmltest.c | 1 - .../qemuxml2argv-net-eth-hostip.args | 23 ---- .../qemuxml2argv-net-eth-hostip.xml | 39 ------- tests/qemuxml2argvtest.c | 1 - .../qemuxml2xmlout-net-eth-hostip.xml | 44 -------- tests/qemuxml2xmltest.c | 1 - 17 files changed, 75 insertions(+), 395 deletions(-) delete mode 100644 tests/lxcxml2xmldata/lxc-ethernet-hostip.xml delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-eth-hostip.args delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-eth-hostip.xml delete mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth-hostip.xml -- 2.7.3

2 9

[libvirt] CPU topology and ordering in ACPI MADT
by Eduardo Habkost 02 Jul '16

02 Jul '16

I got a bug report yesterday that seems to be related to how CPUs are ordered 'lscpu' and /proc/cpuinfo: https://bugzilla.redhat.com/show_bug.cgi?id=1351160 It's not an actual bug, but it's not the first time I see people confused by CPU numbers not following socket/core/thread IDs in lscpu and /proc/cpuinfo in the host (making CPU numbers seen in the guest not matching CPU numbers in the host). The ordering in /proc/cpuinfo and lscpu seems to come from the MADT ACPI table, and on some hosts it looks completely arbitrary[1]. Now that we will allow the APIC ID (or socket/core/thread IDs) to be explicitly set in each VCPU, we could let management make CPU ordering match the host exactly, for people that really want to reproduce the host topology and get easily confused by CPU numbers that don't match the host. But this is lot of data to be provided to QEMU, so I don't see it as an useful feature unless it can be represented in the libvirt XML configuration in a more compact way, or generated automatically based on the host. I'm CCing libvir-list to see if they have any ideas. ...or we could just tell users that sometimes it will be impossible to make the CPU numbers in the guest match the ones in the host. To be honest, I am more inclined towards this option, but I would like to hear your opinions. [1] Example of lscpu output from a host that doesn't follow socket/core/thread ID on the MADT table: # lscpu -e CPU NODE SOCKET CORE L1d:L1i:L2:L3 ONLINE 0 1 0 0 0:0:0:0 yes 1 0 1 1 1:1:1:1 yes 2 1 0 2 2:2:2:0 yes 3 0 1 3 3:3:3:1 yes 4 1 0 4 4:4:4:0 yes 5 0 1 5 5:5:5:1 yes 6 1 0 6 6:6:6:0 yes 7 0 1 7 7:7:7:1 yes 8 1 0 8 8:8:8:0 yes 9 0 1 9 9:9:9:1 yes 10 1 0 10 10:10:10:0 yes 11 0 1 11 11:11:11:1 yes 12 1 0 0 0:0:0:0 yes 13 0 1 1 1:1:1:1 yes 14 1 0 2 2:2:2:0 yes 15 0 1 3 3:3:3:1 yes 16 1 0 4 4:4:4:0 yes 17 0 1 5 5:5:5:1 yes 18 1 0 6 6:6:6:0 yes 19 0 1 7 7:7:7:1 yes 20 1 0 8 8:8:8:0 yes 21 0 1 9 9:9:9:1 yes 22 1 0 10 10:10:10:0 yes 23 0 1 11 11:11:11:1 yes # lscpu Architecture: x86_64 CPU op-mode(s): 32-bit, 64-bit Byte Order: Little Endian CPU(s): 24 On-line CPU(s) list: 0-23 Thread(s) per core: 2 Core(s) per socket: 6 Socket(s): 2 NUMA node(s): 2 Vendor ID: GenuineIntel CPU family: 6 Model: 44 Model name: Intel(R) Xeon(R) CPU L5640 @ 2.27GHz Stepping: 2 CPU MHz: 2266.000 BogoMIPS: 4533.26 Virtualization: VT-x L1d cache: 32K L1i cache: 32K L2 cache: 256K L3 cache: 12288K NUMA node0 CPU(s): 1,3,5,7,9,11,13,15,17,19,21,23 NUMA node1 CPU(s): 0,2,4,6,8,10,12,14,16,18,20,22 # -- Eduardo

1 0

[libvirt] [PATCH 0/5] Some USB hotplug and alias cleanups
by John Ferlan 01 Jul '16

01 Jul '16

A post 2.0.0 type adjustment... While answering a question for bz 1289391 regarding the USB path - I figured that making the code be more the virtio and scsi code paths would at least have a better look'n'feel. Then I tripped in to the alias morass and cleaned that up a bit too. John Ferlan (5): qemu: Reorder qemuDomainAttachUSBMassStorageDevice failure path qemu: Move drive alias processing to qemu_alias qemu: Use qemuAssignDeviceDiskDriveAlias qemu: Make QEMU_DRIVE_HOST_PREFIX more private qemu: Add attempt to call qemuMonitorDriveDel for USB failure path src/qemu/qemu_alias.c | 34 +++++++++++++++++++++++++ src/qemu/qemu_alias.h | 4 +++ src/qemu/qemu_command.c | 23 ++++++++--------- src/qemu/qemu_command.h | 1 - src/qemu/qemu_domain.c | 3 +-- src/qemu/qemu_driver.c | 3 +-- src/qemu/qemu_hotplug.c | 59 ++++++++++++++++++++++++++++---------------- src/qemu/qemu_migration.c | 11 +++------ src/qemu/qemu_monitor_json.c | 10 +++----- src/qemu/qemu_monitor_text.c | 18 ++++++++------ src/qemu/qemu_process.c | 3 +-- 11 files changed, 107 insertions(+), 62 deletions(-) -- 2.5.5

2 7

[libvirt] [PATCH] Allow custom metadata in network configuration XML
by Brnadon Bennett 01 Jul '16

01 Jul '16

From: Brandon Bennett <bbennett(a)fb.com> This replicates the metadata field found in the domain configuration and adds it to the network configuration XML. --- docs/formatnetwork.html.in | 13 +++++++++++++ docs/schemas/basictypes.rng | 23 +++++++++++++++++++++++ docs/schemas/domaincommon.rng | 23 ----------------------- docs/schemas/network.rng | 5 +++++ src/conf/network_conf.c | 35 ++++++++++++++++++++++++++++++++++- src/conf/network_conf.h | 3 +++ tests/networkxml2xmlin/metadata.xml | 10 ++++++++++ tests/networkxml2xmlout/metadata.xml | 10 ++++++++++ tests/networkxml2xmltest.c | 1 + 9 files changed, 99 insertions(+), 24 deletions(-) create mode 100644 tests/networkxml2xmlin/metadata.xml create mode 100644 tests/networkxml2xmlout/metadata.xml diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index 1cea931..15ebf0c 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -38,6 +38,10 @@ <network ipv6='yes' trustGuestRxFilters='no'> <name>default</name> <uuid>3e3fce45-4f53-4fa7-bb32-11f34168b82b</uuid> + <metadata> + <app1:foo xmlns:app1="http://app1.org/app1/">..</app1:foo> + <app2:bar xmlns:app2="http://app1.org/app2/">..</app2:bar> + </metadata> ...</pre> <dl> @@ -54,6 +58,12 @@ The format must be RFC 4122 compliant, eg <code>3e3fce45-4f53-4fa7-bb32-11f34168b82b</code>. If omitted when defining/creating a new network, a random UUID is generated. <span class="since">Since 0.3.0</span></dd> + <dd>The <code>metadata</code> node can be used by applications to + store custom metadata in the form of XML nodes/trees. Applications + must use custom namespaces on their XML nodes/trees, with only + one top-level element per namespace (if the application needs + structure, they should have sub-elements to their namespace + element). <span class="since">Since 1.3.6</span></dd> <dt><code>ipv6</code></dt> <dd>When set to <code>yes</code>, the optional parameter <code>ipv6</code> enables @@ -73,6 +83,9 @@ override the setting in the network.</dd> </dl> ++ + + <h3><a name="elementsConnect">Connectivity</a></h3> <p> diff --git a/docs/schemas/basictypes.rng b/docs/schemas/basictypes.rng index 83fd4ec..474ad77 100644 --- a/docs/schemas/basictypes.rng +++ b/docs/schemas/basictypes.rng @@ -495,4 +495,27 @@ </choice> </define> + <define name="metadata"> + <element name="metadata"> + <zeroOrMore> + <ref name="customElement"/> + </zeroOrMore> + </element> + </define> + + <define name="customElement"> + <element> + <anyName/> + <zeroOrMore> + <choice> + <attribute> + <anyName/> + </attribute> + <text/> + <ref name="customElement"/> + </choice> + </zeroOrMore> + </element> + </define> + </grammar> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 162c2e0..78eb3f5 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -5338,29 +5338,6 @@ </element> </define> - <define name="metadata"> - <element name="metadata"> - <zeroOrMore> - <ref name="customElement"/> - </zeroOrMore> - </element> - </define> - - <define name="customElement"> - <element> - <anyName/> - <zeroOrMore> - <choice> - <attribute> - <anyName/> - </attribute> - <text/> - <ref name="customElement"/> - </choice> - </zeroOrMore> - </element> - </define> -  diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index 4edb6eb..b67a5ea 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -37,6 +37,11 @@ <text/> </element> +  + <optional> + <ref name="metadata"/> + </optional> +  <optional> <element name="uuid"><ref name="UUID"/></element> diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 02b8cd7..4239c32 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -419,6 +419,9 @@ virNetworkDefFree(virNetworkDefPtr def) virNetDevBandwidthFree(def->bandwidth); virNetDevVlanClear(&def->vlan); + + xmlFreeNode(def->metadata); + VIR_FREE(def); } @@ -2059,6 +2062,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) xmlNodePtr save = ctxt->node; xmlNodePtr bandwidthNode = NULL; xmlNodePtr vlanNode; + xmlNodePtr metadataNode = NULL; if (VIR_ALLOC(def) < 0) return NULL; @@ -2388,8 +2392,12 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) } break; } - VIR_FREE(stp); + + /* Extract custom metadata */ + if ((metadataNode = virXPathNode("./metadata[1]", ctxt)) != NULL) + def->metadata = xmlCopyNode(metadataNode, 1); + ctxt->node = save; return def; @@ -2412,12 +2420,14 @@ virNetworkDefParse(const char *xmlStr, { xmlDocPtr xml; virNetworkDefPtr def = NULL; + int keepBlanksDefault = xmlKeepBlanksDefault(0); if ((xml = virXMLParse(filename, xmlStr, _("(network_definition)")))) { def = virNetworkDefParseNode(xml, xmlDocGetRootElement(xml)); xmlFreeDoc(xml); } + xmlKeepBlanksDefault(keepBlanksDefault); return def; } @@ -2736,6 +2746,29 @@ virNetworkDefFormatBuf(virBufferPtr buf, virUUIDFormat(uuid, uuidstr); virBufferAsprintf(buf, "<uuid>%s</uuid>\n", uuidstr); + if (def->metadata) { + xmlBufferPtr xmlbuf; + int oldIndentTreeOutput = xmlIndentTreeOutput; + + /* Indentation on output requires that we previously set + * xmlKeepBlanksDefault to 0 when parsing; also, libxml does 2 + * spaces per level of indentation of intermediate elements, + * but no leading indentation before the starting element. + * Thankfully, libxml maps what looks like globals into + * thread-local uses, so we are thread-safe. */ + xmlIndentTreeOutput = 1; + xmlbuf = xmlBufferCreate(); + if (xmlNodeDump(xmlbuf, def->metadata->doc, def->metadata, + virBufferGetIndent(buf, false) / 2, 1) < 0) { + xmlBufferFree(xmlbuf); + xmlIndentTreeOutput = oldIndentTreeOutput; + goto error; + } + virBufferAsprintf(buf, "%s\n", (char *) xmlBufferContent(xmlbuf)); + xmlBufferFree(xmlbuf); + xmlIndentTreeOutput = oldIndentTreeOutput; + } + if (def->forward.type != VIR_NETWORK_FORWARD_NONE) { const char *dev = NULL; if (!def->forward.npfs) diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 0d34dfe..4481f60 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -253,6 +253,9 @@ struct _virNetworkDef { virNetDevBandwidthPtr bandwidth; virNetDevVlan vlan; int trustGuestRxFilters; /* enum virTristateBool */ + + /* Application-specific custom metadata */ + xmlNodePtr metadata; }; typedef struct _virNetworkObj virNetworkObj; diff --git a/tests/networkxml2xmlin/metadata.xml b/tests/networkxml2xmlin/metadata.xml new file mode 100644 index 0000000..c075f93 --- /dev/null +++ b/tests/networkxml2xmlin/metadata.xml @@ -0,0 +1,10 @@ +<network> + <name>host-bridge-net</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a8e</uuid> + <forward mode='bridge'/> + <bridge name='br0'/> + <metadata> + <app1:foo xmlns:app1="http://foo.org/">fooish</app1:foo> + <app2:bar xmlns:app2="http://bar.com/" maman="baz">barish</app2:bar> + </metadata> +</network> diff --git a/tests/networkxml2xmlout/metadata.xml b/tests/networkxml2xmlout/metadata.xml new file mode 100644 index 0000000..a9364ab --- /dev/null +++ b/tests/networkxml2xmlout/metadata.xml @@ -0,0 +1,10 @@ +<network> + <name>host-bridge-net</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a8e</uuid> + <metadata> + <app1:foo xmlns:app1="http://foo.org/">fooish</app1:foo> + <app2:bar xmlns:app2="http://bar.com/" maman="baz">barish</app2:bar> + </metadata> + <forward mode='bridge'/> + <bridge name='br0'/> +</network> diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c index d65f6aa..2a2c348 100644 --- a/tests/networkxml2xmltest.c +++ b/tests/networkxml2xmltest.c @@ -153,6 +153,7 @@ mymain(void) DO_TEST("host-bridge-no-flood"); DO_TEST_PARSE_ERROR("hostdev-duplicate"); DO_TEST_PARSE_ERROR("passthrough-duplicate"); + DO_TEST("metadata"); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 2.7.4

4 8

[libvirt] [PATCH] lxc; Fir memory leak if virSocketAddrGetIPPrefix fails
by Jiri Denemark 01 Jul '16

01 Jul '16

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/lxc/lxc_container.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 0d5f16c..65930c9 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -514,18 +514,16 @@ lxcContainerRenameAndEnableInterfaces(virDomainDefPtr vmDef, for (j = 0; j < netDef->guestIP.nips; j++) { virNetDevIPAddrPtr ip = netDef->guestIP.ips[j]; int prefix; - char *ipStr = virSocketAddrFormat(&ip->address); if ((prefix = virSocketAddrGetIPPrefix(&ip->address, NULL, ip->prefix)) < 0) { - ipStr = virSocketAddrFormat(&ip->address); + char *ipStr = virSocketAddrFormat(&ip->address); virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to determine prefix for IP address '%s'"), ipStr); VIR_FREE(ipStr); goto cleanup; } - VIR_FREE(ipStr); if (virNetDevIPAddrAdd(newname, &ip->address, NULL, prefix) < 0) goto cleanup; -- 2.9.0

2 1

[libvirt] [PATCH] util: Call capng_setpid() before using cap-ng
by Andrea Bolognani 01 Jul '16

01 Jul '16

audit is using cap-ng itself since version 2.6.1, and it gets to initialize the internal state of the cap-ng library before we call fork(). Because of that, our own use of cap-ng in the child process ends up attempting to change the capabilities of the parent process instead of the child process, which fails. Calling capng_setpid() before using any other cap-ng API ensures we're altering the capabilities of the right process. --- src/util/virutil.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/util/virutil.c b/src/util/virutil.c index 170dd59..d393a12 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -1465,6 +1465,14 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups, bool need_setgid = false, need_setuid = false; bool need_setpcap = false; + /* The cap-ng library stores some internal data in a thread local + * variable; that includes the PID of the process it should alter + * the capabilities of. After fork(), this data is not cleared, + * so we might end up trying to change the capabilities of a + * different process. Initialize the PID explicitly to work around + * that issue */ + capng_setpid(getpid()); + /* First drop all caps (unless the requested uid is "unchanged" or * root and clearExistingCaps wasn't requested), then add back * those in capBits + the extra ones we need to change uid/gid and -- 2.7.4

3 3

[libvirt] [PATCH] examples: check asprintf return value in client_info.c
by Ján Tomko 01 Jul '16

01 Jul '16

On error, asprintf returns -1 and the contents of the string pointer is undefined. In the rest of the libvirt code, the virAsprintf wrapper takes care of that. Check the return value and report a generic error, since we purposefully avoid linking to virutil. --- examples/admin/client_info.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/examples/admin/client_info.c b/examples/admin/client_info.c index dd0a04a..314a090 100644 --- a/examples/admin/client_info.c +++ b/examples/admin/client_info.c @@ -86,6 +86,11 @@ exampleGetTypedParamValue(virTypedParameterPtr item) return NULL; } + if (ret < 0) { + fprintf(stderr, "error formatting typed param value\n"); + return NULL; + } + return str; } -- 2.7.3

2 1

[libvirt] RFC: creating a libvirt-ci mailing list
by Daniel P. Berrange 01 Jul '16

01 Jul '16

Hi Folks, Thanks to the CentOS CI project[1], we have automated build jobs running on every libvirt change. Currently each job is spamming a selected set of email addresses. It seems we're doing a general poor job of actually dealing with breakage though. For example the Mingw build of libvirt has been reported broken for a month and a 1/2 :-( I think it would be useful if we had a broader audience able to see build failures across all the libvirt jobs. At the same time though I dont want to force all libvirt developers to receive this spam. So I suggest we should create a new mailing list 'libvirt-ci(a)redhat.com' which is used to report all CI job failures. People can opt-in to this mailing list to receive reports if they're interested in helping to fix breakage when it happens. We'd set reply-to in the mailing list to be libvir-list(a)redhat.com. IOW, libvirt-ci would be a read-only mailing list for subscribers - any discussion about failures would still be on libvir-list(a)redhat.com Regards, Daniel [1] https://ci.centos.org/ -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

3 3

[libvirt] [PATCH] mingw-libvirt.spec.in: add perl + perl(Getopt::Long) BRs
by Daniel P. Berrange 01 Jul '16

01 Jul '16

The default Fedora build roots for f25 and newer no longer include perl. We must thus explicitly ask for it as the RPC gendispatch.pl program needs it, and the Getopt::Long module. Do this unconditionally since it isn't harmful for older Fedora Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed as a mingw build fix mingw-libvirt.spec.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in index 699d6f7..5c7183f 100644 --- a/mingw-libvirt.spec.in +++ b/mingw-libvirt.spec.in @@ -54,6 +54,8 @@ BuildRequires: mingw64-portablexdr BuildRequires: pkgconfig # Need native version for msgfmt BuildRequires: gettext +BuildRequires: perl +BuildRequires: perl(Getopt::Long) %if 0%{?enable_autotools} BuildRequires: autoconf BuildRequires: automake -- 2.7.4

1 0

[libvirt] LSN-2016-0001 - Authentication disabled when setting empty VNC password
by Daniel P. Berrange 01 Jul '16

01 Jul '16

Libvirt Security Notice: LSN-2016-0001 ====================================== Summary: Authentication disabled when setting empty VNC password Reported on: 20130531 Published on: 20130531 Fixed on: 20160630 Reported by: Vivian Zhang <vivianzhang(a)redhat.com> Christoph Anton Mitterer <calestyo(a)scientia.net> Patched by: Jiri Denemar <jdenemar(a)redhat.com> See also: CVE-2016-5008 Description ----------- An empty password set for the VNC server is documented as preventing all client connections. This is the behaviour when QEMU virtual machines are first started with the 'password' flag given to the -vnc argument and when setting the password with the 'change vnc' monitor command. When libvirt switched to using 'set_password' QMP command though using an empty password had the effect of disabling password checking and thus allowing any client connection with no authentication check. Impact ------ When the password on a VNC server is set to the empty string, authentication on the VNC server will be disabled allowing any user to connect. An application would meanwhile expect that the empty string would prevent all users from connecting Workaround ---------- The VNC password authentication scheme is generally considered to offer inadequate security, so its use is not recommended at all, regardless of this vulnerability. Applications and administrators are thus encouraged to make use of the VNC TLS extension together with SASL for strong authentication. Affected product ---------------- Name: libvirt Repository: git://libvirt.org/git/libvirt.git http://libvirt.org/git/?p=libvirt.git Branch: master Broken in: v0.8.8 Broken in: v0.9.0 Broken in: v0.9.1 Broken in: v0.9.2 Broken in: v0.9.3 Broken in: v0.9.4 Broken in: v0.9.5 Broken in: v0.9.6 Broken in: v0.9.7 Broken in: v0.9.8 Broken in: v0.9.9 Broken in: v0.9.10 Broken in: v0.9.11 Broken in: v0.9.12 Broken in: v0.9.13 Broken in: v0.10.0 Broken in: v0.10.1 Broken in: v0.10.2 Broken in: v1.0.0 Broken in: v1.0.1 Broken in: v1.0.2 Broken in: v1.0.3 Broken in: v1.0.4 Broken in: v1.0.5 Broken in: v1.0.6 Broken in: v1.1.0 Broken in: v1.1.1 Broken in: v1.1.2 Broken in: v1.1.3 Broken in: v1.1.4 Broken in: v1.2.0 Broken in: v1.2.1 Broken in: v1.2.2 Broken in: v1.2.3 Broken in: v1.2.4 Broken in: v1.2.5 Broken in: v1.2.6 Broken in: v1.2.7 Broken in: v1.2.8 Broken in: v1.2.9 Broken in: v1.2.10 Broken in: v1.2.11 Broken in: v1.2.12 Broken in: v1.2.13 Broken in: v1.2.14 Broken in: v1.2.15 Broken in: v1.2.16 Broken in: v1.2.17 Broken in: v1.2.18 Broken in: v1.2.19 Broken in: v1.2.20 Broken in: v1.2.21 Broken in: v1.3.0 Broken in: v1.3.1 Broken in: v1.3.2 Broken in: v1.3.3 Broken in: v1.3.4 Broken in: v1.3.5 Fixed in: v2.0.0 Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Fixed by: bb848feec0f3f10e92dd8e5231ae7aa89b5598f3 Branch: v0.9.6-maint Broken in: v0.9.6.1 Broken in: v0.9.6.2 Broken in: v0.9.6.3 Broken in: v0.9.6.4 Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Branch: v0.9.11-maint Broken in: v0.9.11.1 Broken in: v0.9.11.2 Broken in: v0.9.11.3 Broken in: v0.9.11.4 Broken in: v0.9.11.5 Broken in: v0.9.11.6 Broken in: v0.9.11.7 Broken in: v0.9.11.8 Broken in: v0.9.11.9 Broken in: v0.9.11.10 Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Branch: v0.9.12-maint Broken in: v0.9.12.1 Broken in: v0.9.12.2 Broken in: v0.9.12.3 Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Fixed by: eea38b5922b7daff91fd146869a337287e77065e Branch: v0.10.2-maint Broken in: v0.10.2.1 Broken in: v0.10.2.2 Broken in: v0.10.2.3 Broken in: v0.10.2.4 Broken in: v0.10.2.5 Broken in: v0.10.2.6 Broken in: v0.10.2.7 Broken in: v0.10.2.8 Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Fixed by: 418a165da6e61ab548349408e4ba0c0d612ef5af Branch: v1.0.2-maint Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Fixed by: 139a4265774b7aa194f8479a82188bc1337cd7a4 Branch: v1.0.3-maint Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Fixed by: 3779715e8d4522f1f5de20746fd96bbe59167d1a Branch: v1.0.4-maint Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Fixed by: a3954cc79358a990720fab36b4feaecd0266c5c6 Branch: v1.0.5-maint Broken in: v1.0.5.1 Broken in: v1.0.5.2 Broken in: v1.0.5.3 Broken in: v1.0.5.4 Broken in: v1.0.5.5 Broken in: v1.0.5.6 Broken in: v1.0.5.7 Broken in: v1.0.5.8 Broken in: v1.0.5.9 Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Fixed by: 6fd8d6b655b925df306652d525e388860704d67d Branch: v1.0.6-maint Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Fixed by: c8df12a1394d75e12da09ec4189eea360feb059d Branch: v1.1.0-maint Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Fixed by: 1338fceea2f16c20b2aa91515918c7cc977d5f29 Branch: v1.1.1-maint Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Fixed by: 6a11fd52b480bb47f8cc988763333788201ab1ab Branch: v1.1.2-maint Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Fixed by: 832cc0eff8feb2f14613a75b0e1d5671735d2094 Branch: v1.1.3-maint Broken in: v1.1.3.1 Broken in: v1.1.3.2 Broken in: v1.1.3.3 Broken in: v1.1.3.4 Broken in: v1.1.3.5 Broken in: v1.1.3.6 Broken in: v1.1.3.7 Broken in: v1.1.3.8 Broken in: v1.1.3.9 Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Fixed by: 39419b37c2049cfa36110d75c9071f8a72fa238d Branch: v1.1.4-maint Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Fixed by: 916f5c9d1f6b2145dac93311925db3eb93d3e5aa Branch: v1.2.0-maint Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Fixed by: 20397434fc036dead7e5c375aec7483334396178 Branch: v1.2.1-maint Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Fixed by: e4ecee35aed931cc10a7c84ec9829ccefddecefa Branch: v1.2.2-maint Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Fixed by: 4816c5370ecf9ed412068c6c3795a2fd71ebc354 Branch: v1.2.3-maint Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Fixed by: 6f7cfb5ba21d5e710a88c2e0fcbc150b59ac510c Branch: v1.2.4-maint Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Fixed by: dd9cca35bce5bea871f96264cfe9f629566f0b12 Branch: v1.2.5-maint Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Fixed by: f39de9abfd4b8b19a012169355a0e73dae427bd0 Branch: v1.2.6-maint Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Fixed by: d933f68ee660566b52cd90330aee0d5f414636a4 Branch: v1.2.7-maint Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Fixed by: 0d052f8abd8bc38ac982e88294737c6ddf3e6484 Branch: v1.2.8-maint Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Fixed by: 05d238be999f6488b6f24cbbff3dada0560d97bf Branch: v1.2.9-maint Broken in: v1.2.9.1 Broken in: v1.2.9.2 Broken in: v1.2.9.3 Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Fixed by: f32441c69bf450d6ac593c3acd621c37e120cdaf Branch: v1.2.10-maint Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Fixed by: 33802d62af95fd7a4e86f2755efe94af59158fea Branch: v1.2.11-maint Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Fixed by: b7fbb52ac8d1198ba42b3d1f6cc3079497eea704 Branch: v1.2.12-maint Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Fixed by: 819c14190cbea4ef1f99acfbd5e0389899142bd5 Branch: v1.2.13-maint Broken in: v1.2.13.1 Broken in: v1.2.13.2 Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Fixed by: 35c2bd75f2c8312687f965a80cc2b6255daf6575 Branch: v1.2.14-maint Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Fixed by: ea59deeeead2e4894f3651977aa6114849b857fb Branch: v1.2.15-maint Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Fixed by: 9e181d7f6c76f9a84e2c8638722bb98ac61b6baa Branch: v1.2.16-maint Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Fixed by: b869aab71102c41247a3fede506e88700bb95e55 Branch: v1.2.17-maint Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Fixed by: 49fa383bb03328f7def85e249e252abe5e602e39 Branch: v1.2.18-maint Broken in: v1.2.18.1 Broken in: v1.2.18.2 Broken in: v1.2.18.3 Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Fixed by: caa4c280cd34f0ff0fb9a3879ccc0ceaffc3b802 Branch: v1.2.19-maint Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Fixed by: 38d5c57b9a89c84a19bddcafca9230e69fc78171 Branch: v1.2.20-maint Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Fixed by: 8c30687b71ccb635c110404f0ef1caf2dbccf2e0 Branch: v1.2.21-maint Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Fixed by: 9329ca10f121b737fbdcf3070877e3dbe50f9fdf Branch: v1.3.0-maint Broken in: v1.3.3.1 Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Fixed by: d49b1dfcb59af791f78cd699134cfe80bd6f13ab Branch: v1.3.1-maint Broken in: v1.3.3.1 Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Fixed by: 2d5370eba6b52f44cf832eba28f162c55331a47c Branch: v1.3.3-maint Broken in: v1.3.3.1 Broken by: 9d73efdbe3ea61a13a11fdc24a2cb530eaa0b66f Fixed by: 881441f84a30cd3921df313a982f7162d7ca04f4 Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

3 4

[libvirt] [PATCH] mingw-libvirt.spec.in: fix packaging of admin API and other bugs
by Daniel P. Berrange 01 Jul '16

01 Jul '16

When the admin API was enabled no entries were added to the file list. The virt-host-validate binary is also no longer built on win32 Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed as a build-breaker fix mingw-libvirt.spec.in | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in index e808839..699d6f7 100644 --- a/mingw-libvirt.spec.in +++ b/mingw-libvirt.spec.in @@ -184,21 +184,25 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh %files -n mingw32-libvirt %dir %{mingw32_sysconfdir}/libvirt/ %config(noreplace) %{mingw32_sysconfdir}/libvirt/libvirt.conf +%config(noreplace) %{mingw32_sysconfdir}/libvirt/libvirt-admin.conf %{mingw32_bindir}/libvirt-0.dll %{mingw32_bindir}/virsh.exe +%{mingw32_bindir}/virt-admin.exe %{mingw32_bindir}/virt-xml-validate %{mingw32_bindir}/virt-pki-validate -%{mingw32_bindir}/virt-host-validate.exe %{mingw32_bindir}/libvirt-lxc-0.dll %{mingw32_bindir}/libvirt-qemu-0.dll +%{mingw32_bindir}/libvirt-admin-0.dll %{mingw32_libdir}/libvirt.dll.a %{mingw32_libdir}/pkgconfig/libvirt.pc %{mingw32_libdir}/pkgconfig/libvirt-qemu.pc %{mingw32_libdir}/pkgconfig/libvirt-lxc.pc +%{mingw32_libdir}/pkgconfig/libvirt-admin.pc %{mingw32_libdir}/libvirt-lxc.dll.a %{mingw32_libdir}/libvirt-qemu.dll.a +%{mingw32_libdir}/libvirt-admin.dll.a %dir %{mingw32_datadir}/libvirt/ %dir %{mingw32_datadir}/libvirt/schemas/ @@ -221,6 +225,7 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh %{mingw32_datadir}/libvirt/api/libvirt-api.xml %{mingw32_datadir}/libvirt/api/libvirt-lxc-api.xml %{mingw32_datadir}/libvirt/api/libvirt-qemu-api.xml +%{mingw32_datadir}/libvirt/api/libvirt-admin-api.xml %{mingw32_datadir}/libvirt/cpu_map.xml %{mingw32_datadir}/libvirt/libvirtLogo.png @@ -229,6 +234,7 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh %dir %{mingw32_includedir}/libvirt %{mingw32_includedir}/libvirt/libvirt.h +%{mingw32_includedir}/libvirt/libvirt-common.h %{mingw32_includedir}/libvirt/libvirt-domain.h %{mingw32_includedir}/libvirt/libvirt-domain-snapshot.h %{mingw32_includedir}/libvirt/libvirt-event.h @@ -243,36 +249,42 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh %{mingw32_includedir}/libvirt/virterror.h %{mingw32_includedir}/libvirt/libvirt-lxc.h %{mingw32_includedir}/libvirt/libvirt-qemu.h +%{mingw32_includedir}/libvirt/libvirt-admin.h %{mingw32_mandir}/man1/virsh.1* +%{mingw32_mandir}/man1/virt-admin.1* %{mingw32_mandir}/man1/virt-xml-validate.1* %{mingw32_mandir}/man1/virt-pki-validate.1* -%{mingw32_mandir}/man1/virt-host-validate.1* %files -n mingw32-libvirt-static %{mingw32_libdir}/libvirt.a %{mingw32_libdir}/libvirt-lxc.a %{mingw32_libdir}/libvirt-qemu.a +%{mingw32_libdir}/libvirt-admin.a # Mingw64 %files -n mingw64-libvirt %dir %{mingw64_sysconfdir}/libvirt/ %config(noreplace) %{mingw64_sysconfdir}/libvirt/libvirt.conf +%config(noreplace) %{mingw64_sysconfdir}/libvirt/libvirt-admin.conf %{mingw64_bindir}/libvirt-0.dll %{mingw64_bindir}/virsh.exe +%{mingw64_bindir}/virt-admin.exe %{mingw64_bindir}/virt-xml-validate %{mingw64_bindir}/virt-pki-validate -%{mingw64_bindir}/virt-host-validate.exe %{mingw64_bindir}/libvirt-lxc-0.dll %{mingw64_bindir}/libvirt-qemu-0.dll +%{mingw64_bindir}/libvirt-admin-0.dll %{mingw64_libdir}/libvirt.dll.a %{mingw64_libdir}/pkgconfig/libvirt.pc %{mingw64_libdir}/pkgconfig/libvirt-qemu.pc %{mingw64_libdir}/pkgconfig/libvirt-lxc.pc +%{mingw64_libdir}/pkgconfig/libvirt-admin.pc %{mingw64_libdir}/libvirt-lxc.dll.a %{mingw64_libdir}/libvirt-qemu.dll.a +%{mingw64_libdir}/libvirt-admin.dll.a %dir %{mingw64_datadir}/libvirt/ %dir %{mingw64_datadir}/libvirt/schemas/ @@ -295,6 +307,7 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh %{mingw64_datadir}/libvirt/api/libvirt-api.xml %{mingw64_datadir}/libvirt/api/libvirt-lxc-api.xml %{mingw64_datadir}/libvirt/api/libvirt-qemu-api.xml +%{mingw64_datadir}/libvirt/api/libvirt-admin-api.xml %{mingw64_datadir}/libvirt/cpu_map.xml %{mingw64_datadir}/libvirt/libvirtLogo.png @@ -303,6 +316,7 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh %dir %{mingw64_includedir}/libvirt %{mingw64_includedir}/libvirt/libvirt.h +%{mingw64_includedir}/libvirt/libvirt-common.h %{mingw64_includedir}/libvirt/libvirt-domain.h %{mingw64_includedir}/libvirt/libvirt-domain-snapshot.h %{mingw64_includedir}/libvirt/libvirt-event.h @@ -317,16 +331,18 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh %{mingw64_includedir}/libvirt/virterror.h %{mingw64_includedir}/libvirt/libvirt-lxc.h %{mingw64_includedir}/libvirt/libvirt-qemu.h +%{mingw64_includedir}/libvirt/libvirt-admin.h %{mingw64_mandir}/man1/virsh.1* +%{mingw64_mandir}/man1/virt-admin.1* %{mingw64_mandir}/man1/virt-xml-validate.1* %{mingw64_mandir}/man1/virt-pki-validate.1* -%{mingw64_mandir}/man1/virt-host-validate.1* %files -n mingw64-libvirt-static %{mingw64_libdir}/libvirt.a %{mingw64_libdir}/libvirt-lxc.a %{mingw64_libdir}/libvirt-qemu.a +%{mingw64_libdir}/libvirt-admin.a %changelog -- 2.7.4

1 0

[libvirt] [PATCH] Post-release version bump to 2.1.0
by Jiri Denemark 01 Jul '16

01 Jul '16

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Pushed as trivial. configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 5c48a02..2c81c95 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>. -AC_INIT([libvirt], [2.0.0], [libvir-list(a)redhat.com] [], [http://libvirt.org] +AC_INIT([libvirt], [2.1.0], [libvir-list(a)redhat.com] [], [http://libvirt.org] AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) -- 2.9.0

1 0

[libvirt] [PATCH] docs: remove outdated suggestion to make patches with "diff -urp" or "git diff"
by Laine Stump 01 Jul '16

01 Jul '16

I can't think of any good reason to do either of those, and having the examples there will just lead to unusable patch emails from people who can't be bothered to read the entire page. --- I'm sure there are other problems with this file, but this one really jupmed out at me when I was suggesting to someone that they look to this page for proper procedures. docs/hacking.html.in | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/docs/hacking.html.in b/docs/hacking.html.in index a471d88..5f19143 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -23,21 +23,11 @@ automatically pulls the latest version of each translation file from zanata.</li> - <li><p>Post patches in unified diff format, with git rename + <li><p>Post patches using "git send-email", with git rename detection enabled. You need a one-time setup of:</p> <pre> git config diff.renames true </pre> - <p>After that, a command similar to this should work:</p> -<pre> - diff -urp libvirt.orig/ libvirt.modified/ > libvirt-myfeature.patch -</pre> - <p> - or: - </p> -<pre> - git diff > libvirt-myfeature.patch -</pre> <p>Also, for code motion patches, you may find that <code>git diff --patience</code> provides an easier-to-read patch. However, the usual workflow of libvirt developer is:</p> -- 2.5.5

3 2

[libvirt] [PATCH] qemu: Let empty default VNC password work as documented
by Jiri Denemark 01 Jul '16

01 Jul '16

CVE-2016-5008 Setting an empty graphics password is documented as a way to disable VNC/SPICE access, but QEMU does not always behaves like that. VNC would happily accept the empty password. Let's enforce the behavior by setting password expiration to "now". https://bugzilla.redhat.com/show_bug.cgi?id=1180092 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_hotplug.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index e0b8230..bf6430d 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3933,6 +3933,7 @@ qemuDomainChangeGraphicsPasswords(virQEMUDriverPtr driver, time_t now = time(NULL); char expire_time [64]; const char *connected = NULL; + const char *password; int ret = -1; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); @@ -3940,16 +3941,14 @@ qemuDomainChangeGraphicsPasswords(virQEMUDriverPtr driver, ret = 0; goto cleanup; } + password = auth->passwd ? auth->passwd : defaultPasswd; if (auth->connected) connected = virDomainGraphicsAuthConnectedTypeToString(auth->connected); if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) goto cleanup; - ret = qemuMonitorSetPassword(priv->mon, - type, - auth->passwd ? auth->passwd : defaultPasswd, - connected); + ret = qemuMonitorSetPassword(priv->mon, type, password, connected); if (ret == -2) { if (type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) { @@ -3957,14 +3956,15 @@ qemuDomainChangeGraphicsPasswords(virQEMUDriverPtr driver, _("Graphics password only supported for VNC")); ret = -1; } else { - ret = qemuMonitorSetVNCPassword(priv->mon, - auth->passwd ? auth->passwd : defaultPasswd); + ret = qemuMonitorSetVNCPassword(priv->mon, password); } } if (ret != 0) goto end_job; - if (auth->expires) { + if (password[0] == '\0') { + snprintf(expire_time, sizeof(expire_time), "now"); + } else if (auth->expires) { time_t lifetime = auth->validTo - now; if (lifetime <= 0) snprintf(expire_time, sizeof(expire_time), "now"); -- 2.9.0

2 3

[libvirt] Release of libvirt-2.0.0
by Daniel Veillard 01 Jul '16

01 Jul '16

It's out ! As planned I tagged it in git and made available signed tarball and rpms at the usual place: ftp://libvirt.org/libvirt/ I also pushed a libvirt-python-2.0.0 release that can be found at: ftp://libvirt.org/libvirt/python/ Independantly of the major bump in numbering scheme (see the document at http://libvirt.org/downloads.html#numbering for new mechanism) this is a major release in terms of the number of commits included, more than 500. This includes user visible changes and APIs, a very large amount of bug fixes and massive set of improvements: Features: - Many improvements in Xen support (Jim Fehlig, Philipp Hahn, Chunyan Liu) - Many improvements in OpenVZ support (Nikolay Shirokovskiy, mfeoktistov(a)virtuozzo.com) - Guest agent vCPU APIs (Peter Krempa) - storage lifecycle event APIs (Jovanka Gulicoska) - CPU type detection (Jiri Denemark) Documentation: - Document to not rely on virConnectGetMaxVcpus API (Shivaprasad G Bhat) - add help document relevant to default mapping of credentials to machines (yuelongguang) - docs: Fix whitespace in output (John Ferlan) - util: fix a typo (Chen Hanxiao) - docs: virsh: Added note for the dump command (Jaroslav Suchanek) - docs: Add at least some docs and fix schema entry for perf events (Peter Krempa) - virsh: Fix help string for net-dumpxml (sannyshao) - doc: Fix explanation of S3 and S4 states (Jingjing Shao) - docs: Clarify chardev protocol (John Ferlan) - docs: Document our event loop (Michal Privoznik) Portability: - libvirt.spec.in: Use libnl-devel for RHEL-6 (Jean-Marc Liger) - qemuDomainDeviceDefValidate: Drop unused qemuCaps (Jiri Denemark) - vz: Fix indentation in prlsdkGetNetAddresses() (Andrea Bolognani) - Revert "util: new function virNetDevIPInfoAddToDev" (Ján Tomko) - Revert "conf: allow setting peer address in <ip> element of <interface>" (Ján Tomko) - Revert "conf: support host-side IP/route information in <interface>" (Ján Tomko) - Revert "util: support setting peer for virNetDevIPInfo addresses" (Ján Tomko) - Revert "lxc: support setting host-side IP addresses/routes" (Ján Tomko) - Revert "qemu: support setting host-side IP addresses/routes" (Ján Tomko) - Clean up after virNetDevIP creation (Andrea Bolognani) - util: netdevip: Include vircommand.h (Andrea Bolognani) - qemu: support setting host-side IP addresses/routes (Laine Stump) - lxc: support setting host-side IP addresses/routes (Laine Stump) - util: support setting peer for virNetDevIPInfo addresses (Laine Stump) - conf: support host-side IP/route information in <interface> (Laine Stump) - conf: allow setting peer address in <ip> element of <interface> (Vasiliy Tolstov) - util: new function virNetDevIPInfoAddToDev (Laine Stump) - lxc: move debug/error log when adding IP addresses to virNetDevIPAddrAdd (Laine Stump) - conf: clean up after adding calls to virNetDevIPInfo helpers (Laine Stump) - qemu: forbid setting guest-side IP address/route info of <interface> (Laine Stump) - conf: use virNetDevIPInfo for guest-side <interface> config (Laine Stump) - conf: use virNetDevIPInfo in virDomainHostdevCaps (Laine Stump) - conf: single object containing list of IP addresses, list of routes (Laine Stump) - util: move IP route & address object-related functions to virnetdevip.c (Laine Stump) - util: new files virnetdevip.[ch] for IP-related netdev functions (Laine Stump) - conf/openvz: eliminate incorrect/undocumented use of <source dev='blah'/> (Laine Stump) - qemu: eliminate memory leaks when converting NetDefs to type='ethernet' (Laine Stump) - qemu: don't set/clear NetDef IP addresses in qemuConnectDomainXMLToNative() (Laine Stump) - conf: new function virDomainNetDefClear (Laine Stump) - virHostCPUGetInfo: Fix build on non-Unix like systems (Michal Privoznik) - Fix build without xen (Martin Kletzander) - bhyve: add missing virhost(cpu|mem).h headers (Roman Bogorodskiy) - hostcpu: fix build on FreeBSD (Roman Bogorodskiy) - nodeinfo: fix build on non-Linux (Roman Bogorodskiy) - domain_conf: silence gcc warnings (Pavel Hrdina) - vz: fixed build by including necessary headers (Maxim Nestratov) - nodeinfo: remove FreeBSD specific code for getting memory (Daniel P. Berrange) - util: Alter virCryptoEncryptData for non GNUTLS builds (John Ferlan) Bug Fixes: - conf: Don't free the constructed string in virDomainGetBlkioParametersAssignFromDef (Peter Krempa) - conf: def: Avoid unnecessary allocation of 'perf' events definition (Peter Krempa) - docs: Warn against locked memory limit too high (Jiri Denemark) - qemu: SCSI hostdev hot-plug: Fix automatic creation of SCSI controllers (Marc Hartmayer) - qemu: hot-plug: Fix broken SCSI disk hot-plug (Marc Hartmayer) - qemu: Let empty default VNC password work as documented (Jiri Denemark) - admin: fix virt-admin startup crash by calling virAdmInitialize (Erik Skultety) - Fix possible invalid read in adminClientGetInfo (Ján Tomko) - virStorageTranslateDiskSourcePool: Avoid double free (Michal Privoznik) - logging: fixing log level initialization from cmdline (Jaroslav Suchanek) - vz: fix build for virNetDev* changes (Olga Krishtal) - libvirtd.conf: Fix invalid default of max_anonymous_clients (Michal Privoznik) - lxc: eliminate extraneous free of netDef->ifname_guest (Laine Stump) - vz: fix memory leaks in attach/detach functions (Nikolay Shirokovskiy) - Fix error detection in virStorageBackendISCSIGetHostNumber (Ján Tomko) - virStorageBackendISCSIGetHostNumber: correctly use virDirOpen (Ján Tomko) - storage: Fix coverity warning (Cole Robinson) - Don't allow raneming domains to empty strings (Martin Kletzander) - Revert "virnetsocket: Provide socket address format in a more standard form" (Ján Tomko) - Allow configs to start with a dot (Ján Tomko) - Do not skip hidden entries when looking for a stable path (Ján Tomko) - Do not ignore hidden files in /sys and /proc (Ján Tomko) - tests: genericxml2xml: Fix test file name (Peter Krempa) - qemu: command: Error on accel2d (Cole Robinson) - qemu: command: Error on accel3d with non-virtio (Cole Robinson) - Allow virDomain(SG)etGuestVcpus on read-write connection only (Peter Krempa) - libxl: use serial device for console when targetType is serial (Jim Fehlig) - conf: Remove redundant free in virCPUDefFree (Jiri Denemark) - qemu: Fix reference leak in qemuDomainDefPostParse (Jiri Denemark) - tests: Adjust tests for encrypted storage (John Ferlan) - conf: limit chassisNr, and busNr to a minimum value of 1, not 0 (Laine Stump) - virsh migrate: Fix positional parameters (Jiri Denemark) - util: Make failure to get supplementary group list for a uid non-fatal (Peter Krempa) - tools: virt-login-shell: Fix group list bounds checking (Peter Krempa) - conf: Fix memory leak in graphics XML parser (Peter Krempa) - qemu: restore non-pci hostdev labels after detach (Ján Tomko) - configure: define preprocessor macros for SCSI and MPATH (Ján Tomko) - spec: Make driver-qemu require driver-storage (Martin Kletzander) - conf: Remove pre-calculation of initial memory size (Peter Krempa) - conf: Fix perf event parser (Peter Krempa) - qemu: perf: Don't set state of first event for every other event (Peter Krempa) - xenconfig: fix conversion of <driver> to backendtype (Jim Fehlig) - util: fix missing broadcast address in bridge and tap device IP addresses (Laine Stump) - qemu: Shorten domain name for watchdog coredump (Martin Kletzander) - util: Fix broken syntax-check (John Ferlan) - docs: document rng backend path restrictions of older libvirt (Ján Tomko) - docs: Fix syntax-check (John Ferlan) - Fix renumbering once again (Martin Kletzander) - qemu: Allow ACPI shutdown only for running domains (Martin Kletzander) - virt-host-validate: fix build with clang (Roman Bogorodskiy) - tests: fix CPUID detection tests compilation failure (Wei Liu) - apparmor: Don't scrub environment of virtlogd process (Guido Günther) - bhyve: fix bhyvexml2arg test (Roman Bogorodskiy) - vz: fix crash when parsing unexpected disk configuration (Maxim Nestratov) - vz: return correct result for unimplemented ChangeState actions (Maxim Nestratov) - qemuMonitorJSONAttachCharDev: Teach spicevmc (Michal Privoznik) - qemu: Yet another check for blkdeviotune values (Martin Kletzander) - qemu: Generate channel target paths on hotplug as well (Martin Kletzander) - virsh-domain: fix memory leak in cmdDomDisplay (Pavel Hrdina) - virsh-network: Avoid possible NULL deref in cmdNetworkDHCPLeases (Michal Privoznik) - virsh: domdisplay: if listen is 0.0.0.0 or [::] print address from URI (Pavel Hrdina) - qemu_process: don't print empty line if qemu exits without any error (Pavel Hrdina) - virschematest: Link with libxml2 (Michal Privoznik) - virschematest: Access the right directory containing XMLs (Michal Privoznik) - qemu: process: Call disk startup policy check after cloning domain def (Peter Krempa) - qemu: driver: Unset log file watcher after restoring a VM save file (Peter Krempa) - test: Remove executable permission from Xen xm files (Philipp Hahn) - qemu: process: Append the "shutting down" message using the new APIs (Peter Krempa) - Do not VIR_STRDUP the string in udevGetDeviceProperty (Ján Tomko) - systemd: directly notify systemd instead of using sd_notify (Daniel P. Berrange) Improvements: - dist: Speed up distribution compression (Martin Kletzander) - tests: Add test cases for SCSI disk hot-plug with QEMU (Marc Hartmayer) - qemu: Use proper async job to refresh virtio channels (Jiri Denemark) - lxc: use correct prefix when setting veth IP address (Laine Stump) - util: allow calling virSocketAddrGetIPPrefix with NULL netmask or address (Laine Stump) - tests: mock virNetDevSetIPAddress (Laine Stump) - conf: clean up virDomainNetIPParseXML() (Laine Stump) - global: consistently use IP rather than Ip in identifiers (Laine Stump) - util: move virInterface(State|Link)/virNetDevFeature from conf to util (Laine Stump) - util: move virNetDevLinkDump to virnetlink.c (Laine Stump) - spec: distribute admin API within libvirt-client package (Erik Skultety) - examples: admin: Add some examples for the new admin APIs (Erik Skultety) - admin: enable both admin API functionality and tarball distribution (Erik Skultety) - vz: always pass graphics address to sdk (Nikolay Shirokovskiy) - vz: support vnc password (Nikolay Shirokovskiy) - vz: remove exlicitly setting zeros in dumping graphics (Nikolay Shirokovskiy) - vz: support attach/detach/update/ of graphics device (Nikolay Shirokovskiy) - vz: move getting container video devices out from vnc code (Nikolay Shirokovskiy) - vz: trustGuestRxFilters fixes (Nikolay Shirokovskiy) - vz: fix minor type safey issues with net union usage (Nikolay Shirokovskiy) - vz: fix updating to no gateways (Nikolay Shirokovskiy) - vz: dump route info in domain xml (Nikolay Shirokovskiy) - vz: dump ip addresses to domain xml (Nikolay Shirokovskiy) - vz: give nice report if network device not found (Nikolay Shirokovskiy) - vz: move disks checks to device post parse (Nikolay Shirokovskiy) - vz: leverage disks parameters check on disks updates too (Nikolay Shirokovskiy) - vz: add device updates (Nikolay Shirokovskiy) - vz: reuse edit config frame in for attach/detach functions (Nikolay Shirokovskiy) - vz: make prlsdkGetDisk more generic (Nikolay Shirokovskiy) - vz: remove disk cache mode hunk (Nikolay Shirokovskiy) - cpu_map.xml: add cmt/mbm feature to x86 (Qiaowei Ren) - cpu: Consolidate ARM drivers (Jiri Denemark) - util: fix build in virNetDevTapGetRealDeviceName (Roman Bogorodskiy) - storage: Introduce virStoragePoolObjBuildTempFilePath (John Ferlan) - Promote storage pool refresh lifecycle event to top level event (Daniel P. Berrange) - util: Add 'luks' to the FileTypeInfo (John Ferlan) - util: Modify the FileTypeInfo to add a version size (John Ferlan) - util: Introduce virReadBufInt16LE and virReadBufInt16BE (John Ferlan) - qemu: Remove authdef from secret setup (John Ferlan) - qemu: Change protocol parameter for secret setup (John Ferlan) - qemu: check the kvm host cpu max limits in virConnectGetDomainCapabilities (Shivaprasad G Bhat) - qemu: Make qemuBuildSecretInfoProps global (John Ferlan) - qemu: Remove type from qemuBuildSecretInfoProps (John Ferlan) - Rename kvmGetMaxVCPUs() to virHostCPUGetKVMMaxVCPUs() (Shivaprasad G Bhat) - conf: Allow disks with identical WWN or serial (Peter Krempa) - build: increase xz compression level (Ján Tomko) - openvz: do not open-code STRSKIP (Ján Tomko) - Replace some uses STREQLEN with STRPREFIX (Ján Tomko) - qemu: Check for VFIO too where legacy passthrough is checked (Shivaprasad G Bhat) - Prohibit opendir in syntax-check (Ján Tomko) - Use virDirOpenQuiet (Ján Tomko) - Introduce virDirOpenQuiet (Ján Tomko) - Use virDirOpenIfExists (Ján Tomko) - Add virDirOpenIfExists (Ján Tomko) - Use virDirOpen (Ján Tomko) - Introduce virDirOpen (Ján Tomko) - openvz: split single-line if (Ján Tomko) - qemu: Use stricter checks in virQEMUCapsFillDomainDeviceDiskCaps() (Andrea Bolognani) - qemu: Introduce qemuDomainMachineIsPSeries() (Andrea Bolognani) - qemu: Add architecture checks to qemuDomainMachineIsVirt() (Andrea Bolognani) - qemu: Remove redundant arguments to qemuBuildSerialChrDeviceStr() (Andrea Bolognani) - Add support for VirtualBox 5 (Martin Pietsch) - Rename virNetClient*AddrString (Ján Tomko) - Rename virNetServerClient*AddrString (Ján Tomko) - Add SASL to virNetSocket{Local,Remote}AddrString (Ján Tomko) - virNetSocket: rename AddrStr to AddrStrSASL (Ján Tomko) - virnetsockettest: fix error messages (Ján Tomko) - Introduce virNetServerClientRemoteAddrStringURI (Ján Tomko) - Introduce virNetSocketRemoteAddrStringURI (Ján Tomko) - Do not skip files starting with a dot in leases directory (Ján Tomko) - Fix comment in virStorageBackendFileSystemRefresh (Ján Tomko) - Do not check for '.' and '..' after virDirRead (Ján Tomko) - Skip '.' and '..' in virDirRead (Ján Tomko) - Introduce VIR_DIR_CLOSE (Ján Tomko) - Do not check the return value of closedir (Ján Tomko) - Do not save errno in virUSBDeviceSearch (Ján Tomko) - tests: utils: Fail XML file comparison if input file doesn't exist (Peter Krempa) - qemu: Add new secret info type (John Ferlan) - util: Introduce virSecretLookupFormatSecret (John Ferlan) - util: Move and rename virStorageAuthDefParseSecret (John Ferlan) - secret: Move virStorageSecretType and rename (John Ferlan) - storage: Remove redundant refreshPool check (Cole Robinson) - qemu: make monitor command API available during async jobs (Nikolay Shirokovskiy) - prohibit-duplicate-header: print file name and line (Ján Tomko) - syntax-check: rewrite prohibit-duplicate-header in perl (Ján Tomko) - Do not ignore perl scripts in build-aux (Ján Tomko) - Add newDomain parameter to qemuDomainAssignAddresses (Ján Tomko) - Add a USB hub to controller order test (Ján Tomko) - conf: Remove dead console compat formatting (Cole Robinson) - Use for instead of code duplication when parsing USB port (Ján Tomko) - Split out USB port parsing (Ján Tomko) - Add a test for long USB port paths (Ján Tomko) - Report auto convergence throttle rate in migration stats (Jiri Denemark) - qemu: Implement auto convergence migration parameters (Jiri Denemark) - qemu: Add support for cpu throttling parameters (Jiri Denemark) - qemu: Introduce qemuMigrationSetParams (Jiri Denemark) - Add auto convergence migration parameters (Jiri Denemark) - test: Rework qemuMonitorJSONGetMigrationParams test (Jiri Denemark) - qemu: Rework qemuMonitorJSONSetMigrationParams (Jiri Denemark) - qemu: Rework qemuMonitorJSONGetMigrationParams (Jiri Denemark) - qemu: Rename qemuMonitorMigrationCompression (Jiri Denemark) - qemu: Decouple migration parameters from compression settings (Jiri Denemark) - qemu: Make qemuMonitorSetMigrationCompression saner (Jiri Denemark) - conf: Simplify conditions in CPU parser/formatter (Jiri Denemark) - qemucapsprobe: Don't put empty line at EOF (Jiri Denemark) - qemu: Hide virQEMUCapsNewForBinary (Jiri Denemark) - qemu: Implement virDomainSetGuestVcpus (Peter Krempa) - qemu: Implement virDomainGetGuestVcpus (Peter Krempa) - qemu: agent: Make setting of vcpus more robust (Peter Krempa) - virsh: Add command 'guestvcpus' implementing virDomain(GS)etGuestVcpus (Peter Krempa) - lib: Add API to set individual vcpu usage in the guest via guest agent (Peter Krempa) - lib: Add API to query guest vcpu info using guest agent (Peter Krempa) - rpcgen: Add support for generating funcs returning alloc'd typed params (Peter Krempa) - storage: Use virSecretGetSecretString (John Ferlan) - storage: Create helper to set options for CreateQemuImg code (John Ferlan) - storage: Create helper to set backing for CreateQemuImg code (John Ferlan) - storage: Adjust qemu-img switches check (John Ferlan) - Do not call postParse with ABI_UPDATE when parsing cmdline (Ján Tomko) - Fix USB port in input-usbmouse test (Ján Tomko) - test-wrap-argv: add --check parameter (Ján Tomko) - test-wrap-argv: add --in-place parameter (Ján Tomko) - test-wrap-argv: hold a copy of the original file in an array (Ján Tomko) - test-wrap-argv: return a string in rewrap_line (Ján Tomko) - test-wrap-argv: use map and join instead of a for cycle (Ján Tomko) - test-wrap-argv: return a string in rewrap_arg (Ján Tomko) - test-wrap-argv: split out rewrap_arg (Ján Tomko) - test-wrap-argv: split out rewrap_line (Ján Tomko) - vsh: remove namespace poisoning (Ján Tomko) - vbox: remove duplicate macros (Ján Tomko) - Remove unused SOL_NETLINK macro (Ján Tomko) - qemu: Fix typo pci-extender-bus -> pci-expander-bus (Andrea Bolognani) - Mark virsh-optparse as expensive (Ján Tomko) - Drop virrandomtest (Ján Tomko) - Remove virsh-synopsis (Ján Tomko) - Introduce virsh self-test (Ján Tomko) - tests: mock gnutls_dh_params_generate2 (Ján Tomko) - Remove virsh-all (Ján Tomko) - util: Add option not to report errors in virGetUserEnt (Peter Krempa) - tools: virt-login-shell: Fix cut'n'paste mistake in error message (Peter Krempa) - conf: Fix label name in virDomainGraphicsListensParseXML (Peter Krempa) - Allow disjunct ranges in VIR_TEST_RANGE (Ján Tomko) - Introduce virBitmapParseUnlimited (Ján Tomko) - Remove separator argument from virBitmapParse (Ján Tomko) - Introduce virBitmapParseSeparator (Ján Tomko) - Do not return number of set bits in virBitmapParse (Ján Tomko) - qemu: Don't use legacy USB for aarch64 mach-virt guests (Andrea Bolognani) - qemu_hotplug: Use a helper variable consistently (Tomasz Flendrich) - virsh: Introduce pool-event command (Jovanka Gulicoska) - libxl: add USB to hostdev domcapabilities (Jim Fehlig) - Remove stray space in cmdHelp (Ján Tomko) - qemu: Permit PCI-free aarch64 mach-virt guests (Andrea Bolognani) - qemuDomainDetachDeviceConfig: Allow cold unplug of redirdevs (Michal Privoznik) - qemuDomainAttachDeviceConfig: Allow redirdev coldplug (Michal Privoznik) - virDomainDeviceInfoIterateInternal: Iterate through redirdevs too (Michal Privoznik) - virDomainRedirdevDef: Introduce find & remove routines (Michal Privoznik) - domain_conf: Validate redirdev after parsing (Michal Privoznik) - configure: remove definition of HAVE_GLIBC_RPCGEN (Ján Tomko) - configure: error out when asked for mpath on non-Linux (Ján Tomko) - qemu: Fix alignment in virDomainDefAddController() call (Andrea Bolognani) - tests: schema: Remove useless perf schema data (Peter Krempa) - docs: virsh: Add minimal documentation for 'mbmt' and 'mbml' perf events (Peter Krempa) - cpu_x86: Use signature in CPU detection code (Jiri Denemark) - cpu: Add Skylake-Client x86 CPU model (Jiri Denemark) - conf: Rename virDomainDefGetMemoryActual to virDomainDefGetMemoryTotal (Peter Krempa) - qemu: don't add pci-bridge to Q35/arm domains unless it's needed (Laine Stump) - qemu: don't be as insistent about adding dmi-to-pci-bridge or pci-bridge (Laine Stump) - util: remove redundant comments (Chen Hanxiao) - event-test: support storage lifecycle event APIs (Jovanka Gulicoska) - storage: implement storage lifecycle event APIs (Jovanka Gulicoska) - remote: implement storage lifecycle event APIs (Jovanka Gulicoska) - test: implement storage lifecycle event APIs (Jovanka Gulicoska) - conf: add storage_event handling (Jovanka Gulicoska) - Introduce storage lifecycle event APIs (Jovanka Gulicoska) - qemu: Remove useless block in processWatchdogEvent (Martin Kletzander) - qemu: Follow coding style convention (Martin Kletzander) - qemu: Unify automatic coredump filenames (Martin Kletzander) - qemu: Add cfg pointer to various command line helpers (John Ferlan) - qemu: Make qemuBuildShmemBackendStr private (John Ferlan) - qemu: migration: use consistent error message (Cole Robinson) - qemu: More usage of qemuDomainDiskBlockJobIsActive (Cole Robinson) - add default mapping of credentials to machine (yuelongguang) - syntax-check: drop prohibit_undesirable_word_seq (Ján Tomko) - maint: Switch to xz compressed PAX release archives (Andrea Bolognani) - vz: get rid of unused home state variable in private domain obj (Nikolay Shirokovskiy) - check-spacing: fix error message (Ján Tomko) - check-spacing: use non-capturing groups (Ján Tomko) - check-spacing: remove virAssertCmpInt exception (Ján Tomko) - check-spacing: simplify keyword spacing check (Ján Tomko) - check-spacing: rewrite regex for checking the closing parenthesis (Ján Tomko) - check-spacing: rewrite whitespace check before (semi)colon (Ján Tomko) - Rename bracket-spacing.pl to check-spacing.pl (Ján Tomko) - Rename virAssertCmpInt to testAssertEq (Ján Tomko) - maint: remove whitespace from closing parentheses (Ján Tomko) - vbox: reformat multi-line error reports (Ján Tomko) - cfg.mk: use a single regex for all non-reentrant functions (Ján Tomko) - xlconfigtest: add test for USB config conversion (Chunyan Liu) - Add conversion of domxml USB config to/from xl.cfg (Chunyan Liu) - libxl: support hotplug USB host device (Chunyan Liu) - libxl: support creating guest with USB hostdev (Chunyan Liu) - qemu: Refactor qemuDomainAttachChrDevice error paths (John Ferlan) - caps: Add capability for tls-x509-creds (John Ferlan) - Change 1.3.6 occurrences to 2.0.0 to follow version bump (Martin Kletzander) - qemu: Obtain job before checking if domain is live (Martin Kletzander) - Bump release to 2.0.0 and document release schedule & versioning (Daniel P. Berrange) - cputest: Get rid of the array of test functions (Jiri Denemark) - qemu: Add support for zero-detection writes (Martin Kletzander) - conf: Add support of zero-detection for disks (Martin Kletzander) - libxl: Add support for ovmf firmware (Jim Fehlig) - xenconfig: support bios=ovmf xl.cfg (Jim Fehlig) - libxl: implement connectGetDomainCapabilities (Jim Fehlig) - libxl: introduce libxl_capabilities.{ch} (Jim Fehlig) - libxl: add default firmwares to driver config object (Jim Fehlig) - driver config: Introduce virFirmware object (Jim Fehlig) - libxl: fix vm lock overwritten bug (Wang Yufei) - virt-host-validate: improve tests for arm/aarch64 (Riku Voipio) - virt-login-shell: mark as Linux only (Roman Bogorodskiy) - vz: implementation of domainSetUserPassword callback (Mikhail Feoktistov) - vz: remove unused macro logPrlEventError (Maxim Nestratov) - vz: keep subscription to performance events thru domain lifetime (Nikolay Shirokovskiy) - vz: use consistent naming for different domain object in vz_driver.c (Nikolay Shirokovskiy) - Export virDomainRedirdevDefFree (Michal Privoznik) - virt-login-shell: add ability to join the container cgroups (Daniel P. Berrange) - virt-login-shell: add ability to auto-detect shell from container (Daniel P. Berrange) - virt-login-shell: fully reset container environment (Daniel P. Berrange) - virt-login-shell: avoid loosing error during cleanup (Daniel P. Berrange) - virt-login-shell: allow shell to be a simple string argument (Daniel P. Berrange) - virt-login-shell: change way we request a login shell (Daniel P. Berrange) - virt-login-shell: honour the -c option to launch commands (Daniel P. Berrange) - virsh: make lxc-enter-namespace also join the cgroups (Daniel P. Berrange) - libvirt-lxc: add virDomainLxcEnterCGroup API (Daniel P. Berrange) - util: add function for looking up the user shell (Daniel P. Berrange) - nodeinfo: move host memory APIs out into virhostmem file (Daniel P. Berrange) - nodeinfo: move host CPU APIs out into virhostcpu.c file (Daniel P. Berrange) - nodeinfo: rename all CPU APIs to have a virHostCPU prefix (Daniel P. Berrange) - nodeinfo: rename all memory APIs to have a virHostMem prefix (Daniel P. Berrange) - nodeinfo: split CPU info retrieval out of nodeGetInfo (Daniel P. Berrange) - nodeinfo: make nodeGetInfo() call nodeGetMemory for memory size (Daniel P. Berrange) - nodeinfo: remove sysfs_prefix from all methods (Daniel P. Berrange) - vnc: add support for listen type none (Pavel Hrdina) - spice: introduce listen type none (Pavel Hrdina) - spice: introduce spice_auto_unix_socket config option (Pavel Hrdina) - spice: add support for listen type socket (Pavel Hrdina) - qemu_capabilites: add QEMU_CAPS_SPICE_UNIX (Pavel Hrdina) - vnc: add support for listen type 'socket' (Pavel Hrdina) - graphics: introduce new listen type 'socket' (Pavel Hrdina) - vnc: move generation of socket path to qemuProcessGraphicsSetupListen (Pavel Hrdina) - vnc: rename socketAutogenerated to socketFromConfig (Pavel Hrdina) - qemu_command: move websocket code into else part for address listen (Pavel Hrdina) - qemuhotplugtest: Test live data (Martin Kletzander) - qemu: Move channel path generation out of command creation (Martin Kletzander) - cputest: Rename nehalem-force to penryn-force (Jiri Denemark) - cpu: Add ARAT x86 CPU feature (Jiri Denemark) - cpu: Add x86 feature flags for CPUID leaf 0xd, sub leaf 1 (Jiri Denemark) - cpu: Sort CPU map features on eax_in (Jiri Denemark) - cpu: Shorten eax_in values in CPU map (Jiri Denemark) - cpu_x86: Add full support for ecx_in CPUID parameter (Jiri Denemark) - cpu_x86: Prepare for ecx_in CPUID parameter (Jiri Denemark) - qemumonitorjsontest: Add getcpu test data (Jiri Denemark) - tests: Add CPU detection test for Intel Xeon X5460 (Jiri Denemark) - tests: Add CPU detection test for Intel Xeon W3520 (Jiri Denemark) - tests: Add CPU detection test for Intel Xeon E7-4820 (Jiri Denemark) - tests: Add CPU detection test for Intel Xeon E5-2650 (Jiri Denemark) - tests: Add CPU detection test for Intel Xeon E5-2630 (Jiri Denemark) - tests: Add CPU detection test for Intel Xeon E3-1245 (Jiri Denemark) - tests: Add CPU detection test for Intel Xeon 5110 (Jiri Denemark) - tests: Add CPU detection test for AMD Phenom II X4 B95 (Jiri Denemark) - tests: Add CPU detection test for Intel Pentium P6100 (Jiri Denemark) - tests: Add CPU detection test for AMD Opteron 6282 SE (Jiri Denemark) - tests: Add CPU detection test for AMD Opteron 6234 (Jiri Denemark) - tests: Add CPU detection test for AMD Opteron 2350 (Jiri Denemark) - tests: Add CPU detection test for AMD Opteron 1352 (Jiri Denemark) - tests: Add CPU detection test for AMD FX 8150 (Jiri Denemark) - tests: Add CPU detection test for Intel Core2 Quad Q9500 (Jiri Denemark) - tests: Add CPU detection test for Intel Core2 Duo E6850 (Jiri Denemark) - tests: Add CPU detection test for Intel Core i7-5600U (Jiri Denemark) - tests: Add CPU detection test for Intel Core i7-4600U (Jiri Denemark) - tests: Add CPU detection test for Intel Core i7-3770 (Jiri Denemark) - tests: Add CPU detection test for Intel Core i7-3740QM (Jiri Denemark) - tests: Add CPU detection test for Intel Core i7-3520M (Jiri Denemark) - tests: Add CPU detection test for Intel Core i7-2600 (Jiri Denemark) - tests: Add CPU detection test for Intel Core i5-6600 (Jiri Denemark) - tests: Add CPU detection test for Intel Core i5-4670T (Jiri Denemark) - tests: Add CPU detection test for Intel Core i5-2540M (Jiri Denemark) - tests: Add CPU detection test for Intel Core i5-2500 (Jiri Denemark) - tests: Add CPU detection test for Intel Atom N450 (Jiri Denemark) - tests: Add CPU detection test for Intel Atom D510 (Jiri Denemark) - tests: Add CPU detection test for AMD A10-5800K (Jiri Denemark) - tests: Add CPU detection tests (Jiri Denemark) - cpu_x86: Refactor internal KVM features (Jiri Denemark) - cpu_ppc64: Avoid unnecessary pointer to virCPUppc64Data (Jiri Denemark) - cpu_x86: Avoid unnecessary pointers to virCPUx86Data (Jiri Denemark) - tests: Create simple monitor in qemuMonitorTestNewFromFile (Jiri Denemark) - tests: Fix "Reponse" typo (Jiri Denemark) - tests: Introduce qemuMonitorTestNewFromFile (Jiri Denemark) - qemu: Refactor qemuMonitorJSONGetCPUx86Data (Jiri Denemark) - cpu_x86: Rename CPUID function to eax_in (Jiri Denemark) - cpu: Detect arch when parsing CPU data (Jiri Denemark) - cpu_x86: Fix CPU data parser (Jiri Denemark) - cpu_x86: Propagate vendor to guest's virCPUData (Jiri Denemark) - Fix typo in virNetDevGetEthtoolGFeatures stub (Ján Tomko) - tests: Rename virtTestMain to virTestMain. (Tomáš Ryšavý) - tests: Rename virtTestErrorFuncQuiet to virTestErrorFuncQuiet. (Tomáš Ryšavý) - tests: Rename virtTestCounterNext to virTestCounterNext. (Tomáš Ryšavý) - tests: Rename virtTestCaptureProgramOutput to virTestCaptureProgramOutput. (Tomáš Ryšavý) - tests: Rename virtTestDifferenceBin to virTestDifferenceBin. (Tomáš Ryšavý) - tests: Rename virtTestCaptureProgramExecChild to virTestCaptureProgramExecChild. (Tomáš Ryšavý) - tests: Rename virtTestDifferenceFullInternal to virTestDifferenceFullInternal. (Tomáš Ryšavý) - tests: Rename virtTestDifferenceFullNoRegenerate. (Tomáš Ryšavý) - tests: Rename virtTestQuiesceLibvirtErrors to virTestQuiesceLibvirtErrors. (Tomáš Ryšavý) - tests: Rename virtTestUseTerminalColors to virTestUseTerminalColors. (Tomáš Ryšavý) - tests: Rename virtTestLogContentAndReset to virTestLogContentAndReset. (Tomáš Ryšavý) - tests: Rename virtTestCounterReset to virTestCounterReset. (Tomáš Ryšavý) - tests: Rename virtTest00MActive to virTest00MActive. (Tomáš Ryšavý) - tests: Rename virtTestClearCommandPath to virTestClearCommandPath. (Tomáš Ryšavý) - Rename virtTestDifferenceFull to virTestDifferenceFull. (Tomáš Ryšavý) - tests: Rename virtTestCompareToFile to virTestCompareToFile. (Tomáš Ryšavý) - Rename virtTestLoadFile to virTestLoadFile. (Tomáš Ryšavý) - Rename virtTestDifference to virTestDifference. (Tomáš Ryšavý) - tests: Rename virtTestRun to virTestRun. (Tomáš Ryšavý) - virschematest: call va_end even on OOM (Ján Tomko) - node_device: Replace VIR_ERROR with standard vir*Error in state driver init (Jovanka Gulicoska) - lxc: simplify lxcDomainGetBlkioParameters (Ján Tomko) - Export virDomainGetBlkioParametersAssignFromDef (Ján Tomko) - Use virDomainObjGetDefs in lxcDomainGetBlkioParameters (Ján Tomko) - Use virDomainObjGetDefs in lxcDomainSetBlkioParameters (Ján Tomko) - Use virDomainObjGetDefs in lxcDomainGetMemoryParameters (Ján Tomko) - Use virDomainObjGetDefs in lxcDomainGetSchedulerParametersFlags (Ján Tomko) - Use virDomainObjGetDefs in lxcDomainSetSchedulerParametersFlags (Ján Tomko) - Use virDomainObjGetDefs in lxcDomainSetMemoryFlags (Ján Tomko) - lxc: rename vmdef to persistentDef (Ján Tomko) - Use @SYSTEM priority for TLS on Fedora >= 21 (Daniel P. Berrange) - remote: allow TLS priority to be customized (Daniel P. Berrange) - Pass config file object through to driver open methods (Daniel P. Berrange) - remote: allow TLS protocol/cipher priority override in URI (Daniel P. Berrange) - libvirtd: add config option for TLS priority (Daniel P. Berrange) - rpc: allow priority string to be passed to TLS context (Daniel P. Berrange) - configure: allow setting default TLS priority string (Daniel P. Berrange) - rpc: set gnutls log function at global init time (Daniel P. Berrange) - tls: remove support for gnutls 1.x.x, require 2.2.0 (Daniel P. Berrange) - qemu_monitor: rephrase error message if qemu closes monitor (Pavel Hrdina) - Introduce virschematest (Ján Tomko) - Introduce virXMLValidatorValidate (Ján Tomko) - Introduce virXMLValidatorInit (Ján Tomko) - Introduce virXMLValidatorFree (Ján Tomko) - Introduce virXMLValidator structure (Ján Tomko) - qemu: domain: Sanitize return value handling in disk presence checker (Peter Krempa) - xen: test for driver=tap2 sub-type in xen-xm (Philipp Hahn) - xen: Also add sub-type for driver=tap2 in xen-xm (Philipp Hahn) - qemu: Replace VIR_ERROR with standard vir*Error in state driver init (Jovanka Gulicoska) - xen: Replace VIR_ERROR with standard vir*Error in state driver init (Jovanka Gulicoska) - uml: Replace VIR_ERROR with standard vir*Error in state driver init (Jovanka Gulicoska) - qemu: migration: Add VM log entry on start of migration (Peter Krempa) - qemu: domain: Implement helper for one-shot log entries to the VM log file (Peter Krempa) - log: daemon: Add remote protocol handling for the log appending API (Peter Krempa) - log: handler: Add new API to append to logging files (Peter Krempa) - util: Perform proper virRandomBytes return value checking (John Ferlan) - Reindent virNetDevSendEthtoolIoctl (Ján Tomko) - Reuse the socket in virNetDevGetFeatures (Ján Tomko) - Return bool in virNetDevFeatureAvailable (Ján Tomko) - Split out virNetDevGetEthtoolGFeatures (Ján Tomko) - Split out virNetDevGetEthtoolFeatures (Ján Tomko) - Move struct elem out of virNetDevGetFeatures (Ján Tomko) - Reindent comment of virNetDevFeatureAvailable (Ján Tomko) - qemu: process: Allow VIR_QEMU_PROCESS_START_NEW in qemuProcessLaunch (Peter Krempa) - Add nomatch filters when enumerating udev devices (Ján Tomko) - node_device_udev: rename labels to cleanup (Ján Tomko) - node_device_udev: remove unnecessary ret variables (Ján Tomko) - qemu: Move check that validates 'min_guarantee' to qemuDomainDefValidate (Peter Krempa) - conf: Move validation of disk LUN device to the appropriate place (Peter Krempa) - conf: Move disk info validator to the domain conf validator (Peter Krempa) - qemu: process: Call the domain config validator when starting a new VM (Peter Krempa) - qemu: process: Convert multiple boolean args to a single flag (Peter Krempa) - qemu: process: Unexport qemuProcessStartValidate (Peter Krempa) - conf: Add device def validation callback (Peter Krempa) - conf: drop 'def' from struct virDomainDefPostParseDeviceIteratorData (Peter Krempa) - conf: Add infrastructure for adding configuration validation (Peter Krempa) - conf: Rename VIR_DOMAIN_DEF_PARSE_VALIDATE to VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA (Peter Krempa) - node_device_udev: remove yoda condition (Ján Tomko) - udevSetupSystemDev: return if allocation fails (Ján Tomko) - Reformat udevProcessRemoveableMedia (Ján Tomko) - udevProcessStorage: trim all whitespace from model and vendor (Ján Tomko) - node_device_udev: switch to using virReportError (Ján Tomko) - Remove PROPERTY_* constants (Ján Tomko) - Only return two values in udevGetUintSysfsAttr (Ján Tomko) - Only return two values in udevGetIntSysfsAttr (Ján Tomko) - Only return two values in udevGetStringSysfsAttr (Ján Tomko) - Remove extra allocation in udevGetDeviceSysfsAttr (Ján Tomko) - Only return two values in udevGetUintProperty (Ján Tomko) - Only return two values in udevGetStringProperty (Ján Tomko) - qemu: Add support to QXL's max_outputs parameter (Martin Kletzander) - qemu: Check for qxl's max_outputs parameter (Martin Kletzander) - Rewrite disk type checking in udevProcessStorage (Ján Tomko) - Fix the return value in udevKludgeStorageType (Ján Tomko) - udevProcessFloppy; remove unnecessary allocation (Ján Tomko) - Move udevHasDeviceProperty earlier (Ján Tomko) - Remove udevStrToLong_i (Ján Tomko) - Remove udevStrToLong_ui (Ján Tomko) - Remove udevStrToLong_ull (Ján Tomko) - Rewrite usage of StrToLong_ui in udevProcess{PCI,SCSI} (Ján Tomko) - udevProcessSCSIHost: use STRSKIP (Ján Tomko) - udevGetDMIData: remove unused variable (Ján Tomko) - Assign node device driver private data earlier (Ján Tomko) - Do not call nodeStateCleanup on early initialization error (Ján Tomko) - Reformat nodeStateCleanup (Ján Tomko) - node_device_udev: initialize libpciaccess after the driver lock (Ján Tomko) - Split out pciaccess (de)initialization (Ján Tomko) - Initialize ret to -1 in nodeStateInitialize (Ján Tomko) - qemu: Move and rename qemuBuildObjectCommandlineFromJSON (John Ferlan) - storage: Create helper to set input for CreateQemuImg code (John Ferlan) - storage: Split out a helper for encryption checks (John Ferlan) - storage: Split out setting default secret for encryption (John Ferlan) - util: Clean up code formatting in virstorageencryption (John Ferlan) - Do not check for domain liveness in virDomainObjSetDefTransient (Ján Tomko) - Check if the domain is active in virDomainObjGetPersistentDef (Ján Tomko) - Clean up redundant usage of virDomainObjSetDefTransient (Ján Tomko) - Post-release version bump to 1.3.6 (Ján Tomko) Thanks everyone for contributing to this release, with bug reports, patches, reviews, documentation etc ... Enjoy ! 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] Entering freeze for libvirt-2.0.0
by Daniel Veillard 01 Jul '16

01 Jul '16

As planned the Release candidate 1 of libvirt 2.0.0 is tagged in git, I have made signed tarball and rpms available at the usual place: ftp://libvirt.org/libvirt/ Seems to work just fine in my limited testing, but there is a number of packaging changes and we need to look for issues that could come from bumping the major release version. If things go as planned an RC2 on Tuesday or Wednesday and final release on Friday is the schedule, but please give it some testing it would be a shame to have 2.0.0 be a brown paper bag release ! :-) 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/

6 7

[libvirt] [PATCH] dist: Speed up distribution compression
by Martin Kletzander 01 Jul '16

01 Jul '16

This almost reverts b7200d723648. The size is increased from 11M to 13M and the compression is sped up from 2 minutes to 17 seconds. The compression level is removed because -9 doesn't allow multiple threads to be spawned. Effectively speeds up distcheck as well. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 99ee4763c5cd..50c358c30d2c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,7 +22,7 @@ GENHTML = genhtml SUBDIRS = . gnulib/lib include/libvirt src daemon tools docs gnulib/tests \ tests po examples -XZ_OPT ?= -9ev +XZ_OPT ?= -v -T0 export XZ_OPT ACLOCAL_AMFLAGS = -I m4 -- 2.9.0

3 3

[libvirt] [PATCH 0/2] option to disable default gateway in IPv6 RA
by Maxim Perevedentsev 30 Jun '16

30 Jun '16

In case of DHCPv6 in isolated network, we start dnsmasq which sends Router Advertisements (RA). If RA containts no gateway then the link-local address of the source of RA is considered a gateway (and guest installs a corresponding default route). If a guest has two network interfaces (public and isolated network) and the user installs a default route through "public" interface, the guest will have something like default via fe80::ffff:1:1 dev eth2 metric 1024 default via fe80::5054:ff:fe0a:d808 dev eth3 proto ra metric 1024 expires 1789sec RA route metric may vary, and it is preferred. The validity of default route is controlled by "default [route] lifetime" field in RA. If it is 0, then the default gateway announced is considered invalid, and no default route is installed into guest. dnsmasq 2.67+ supports "ra-param=<interface>,<RA interval>,<default lifetime>" option. We can pass "ra-param=*,0,0" (here, RA_interval=0 means default) to disable default gateway in RA. This patchset adds <network ipv6noDefRoute="yes|no"> option to network xml and sets the above option to dnsmasq config if it is set to yes (default: no). Maxim Perevedentsev (2): dnsmasq: add option to disable IPv6 default gateway in RA docs: add ipv6noDefRoute to schema and html. docs/formatnetwork.html.in | 15 ++++++++++++++- docs/schemas/network.rng | 5 +++++ src/conf/network_conf.c | 17 +++++++++++++++++ src/conf/network_conf.h | 3 +++ src/network/bridge_driver.c | 22 ++++++++++++++++++++++ src/util/virdnsmasq.h | 6 ++++++ 6 files changed, 67 insertions(+), 1 deletion(-) -- 1.8.3.1

2 5

[libvirt] [PATCH 0/2] Add support for preallocated memory
by Jaroslav Safka 30 Jun '16

30 Jun '16

This change introduces support for preallocated shared file descriptor based memory backing. It allows vhost-user to be used without hugepages. This is achieved by introducing 3 new sub elements to the memoryBacking element: source, access & allocation which will configure qemu commandline during VM startup accordingly Jaroslav Safka (2): Add new elements source,access and allocation Add xml to argv for memorybacking access,source,.. docs/schemas/domaincommon.rng | 45 +++++++++++++++++ src/conf/domain_conf.c | 59 +++++++++++++++++++++- src/conf/domain_conf.h | 31 ++++++++++++ src/qemu/qemu_command.c | 56 ++++++++++++++++++++ src/qemu/qemu_command.h | 4 ++ .../qemuxml2argv-memorybacking-set.args | 26 ++++++++++ .../qemuxml2argv-memorybacking-set.xml | 32 ++++++++++++ .../qemuxml2argv-memorybacking-unset.args | 22 ++++++++ .../qemuxml2argv-memorybacking-unset.xml | 32 ++++++++++++ tests/qemuxml2argvtest.c | 3 ++ .../qemuxml2xmlout-memorybacking-set.xml | 40 +++++++++++++++ .../qemuxml2xmlout-memorybacking-unset.xml | 40 +++++++++++++++ tests/qemuxml2xmltest.c | 3 ++ 13 files changed, 392 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memorybacking-set.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memorybacking-set.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memorybacking-unset.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memorybacking-unset.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-memorybacking-set.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-memorybacking-unset.xml -- 2.1.0 -------------------------------------------------------------- Intel Research and Development Ireland Limited Registered in Ireland Registered Office: Collinstown Industrial Park, Leixlip, County Kildare Registered Number: 308263 This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.

5 7

[libvirt] [PATCH] A description error about libvirtd manpage
by Jingjing Shao 30 Jun '16

30 Jun '16

To fix the bug The description of --timeout should be updated in libvirtd manpage https://bugzilla.redhat.com/show_bug.cgi?id=1325066 According to the description, delete the part: "Be aware that resources such as autostart networks will result in never reaching the timeout, even when there are no client connections." --- daemon/libvirtd.pod | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/daemon/libvirtd.pod b/daemon/libvirtd.pod index 3b819a2..5adf8a2 100644 --- a/daemon/libvirtd.pod +++ b/daemon/libvirtd.pod @@ -57,9 +57,7 @@ Use this name for the PID file, overriding the default value. =item B<-t, --timeout> I<SECONDS> Exit after timeout period (in seconds) elapse with no client connections -or registered resources. Be aware that resources such as autostart -networks will result in never reaching the timeout, even when there are -no client connections. +or registered resources. =item B<-v, --verbose> -- 1.8.3.1

2 1

[libvirt] [PATCH] conf: Don't free the constructed string in virDomainGetBlkioParametersAssignFromDef
by Peter Krempa 30 Jun '16

30 Jun '16

virTypedParameterAssign steals the string rather than copying it into the typed parameter and thus freeing it leads to a crash when attempting to serialize the results. This was introduced in commit 9f50f6e2 and later made an universal helper in 32e6339c. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1351473 --- src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ef266af..5e2a467 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -24944,7 +24944,7 @@ virDomainGetBlkioParametersAssignFromDef(virDomainDefPtr def, if (virTypedParameterAssign(&(params[(*nparams)++]), name, \ VIR_TYPED_PARAM_STRING, data) < 0) \ goto error; \ - VIR_FREE(data); \ + data = NULL; \ } /* blkiotune.device_weight */ -- 2.9.0

2 1

[libvirt] [PATCH v2] conf: def: Avoid unnecessary allocation of 'perf' events definition
by Peter Krempa 30 Jun '16

30 Jun '16

Some code paths already assume that it is allocated since it was always allocated by virDomainPerfDefParseXML. Make it member of virDomainDef directly so that we don't have to allocate it all the time. This fixes crash when attempting to connect to an existing process via virDomainQemuAttach since we would not allocate it in that code path. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1350688 --- src/conf/domain_conf.c | 12 ++---------- src/conf/domain_conf.h | 2 +- src/qemu/qemu_driver.c | 6 +++--- src/qemu/qemu_process.c | 8 ++++---- 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ef266af..7d40f26 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2671,8 +2671,6 @@ void virDomainDefFree(virDomainDefPtr def) VIR_FREE(def->keywrap); - VIR_FREE(def->perf); - if (def->namespaceData && def->ns.free) (def->ns.free)(def->namespaceData); @@ -13136,19 +13134,14 @@ virDomainPerfDefParseXML(virDomainDefPtr def, if ((n = virXPathNodeSet("./perf/event", ctxt, &nodes)) < 0) return n; - if (VIR_ALLOC(def->perf) < 0) - goto cleanup; - for (i = 0; i < n; i++) { - if (virDomainPerfEventDefParseXML(def->perf, nodes[i]) < 0) + if (virDomainPerfEventDefParseXML(&def->perf, nodes[i]) < 0) goto cleanup; } ret = 0; cleanup: - if (ret < 0) - VIR_FREE(def->perf); VIR_FREE(nodes); return ret; } @@ -23388,8 +23381,7 @@ virDomainDefFormatInternal(virDomainDefPtr def, virBufferAddLit(buf, "</pm>\n"); } - if (def->perf) - virDomainPerfDefFormat(buf, def->perf); + virDomainPerfDefFormat(buf, &def->perf); virBufferAddLit(buf, "<devices>\n"); virBufferAdjustIndent(buf, 2); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 7c5cbd9..e1990dc 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2140,7 +2140,7 @@ struct _virDomainDef { virDomainPowerManagement pm; - virDomainPerfDefPtr perf; + virDomainPerfDef perf; virDomainOSDef os; char *emulator; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 61d184b..0507be8 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9642,7 +9642,7 @@ qemuDomainSetPerfEvents(virDomainPtr dom, if (enabled && virPerfEventEnable(priv->perf, type, vm->pid) < 0) goto endjob; - def->perf->events[type] = enabled ? + def->perf.events[type] = enabled ? VIR_TRISTATE_BOOL_YES : VIR_TRISTATE_BOOL_NO; } @@ -9656,7 +9656,7 @@ qemuDomainSetPerfEvents(virDomainPtr dom, enabled = param->value.b; type = virPerfEventTypeFromString(param->field); - persistentDef->perf->events[type] = enabled ? + persistentDef->perf.events[type] = enabled ? VIR_TRISTATE_BOOL_YES : VIR_TRISTATE_BOOL_NO; } @@ -9716,7 +9716,7 @@ qemuDomainGetPerfEvents(virDomainPtr dom, bool perf_enabled; if (flags & VIR_DOMAIN_AFFECT_CONFIG) - perf_enabled = def->perf->events[i] == VIR_TRISTATE_BOOL_YES; + perf_enabled = def->perf.events[i] == VIR_TRISTATE_BOOL_YES; else perf_enabled = virPerfEventIsEnabled(priv->perf, i); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 63da600..a175a4d 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3139,12 +3139,12 @@ qemuDomainPerfRestart(virDomainObjPtr vm) return -1; for (i = 0; i < VIR_PERF_EVENT_LAST; i++) { - if (def->perf->events[i] && - def->perf->events[i] == VIR_TRISTATE_BOOL_YES) { + if (def->perf.events[i] && + def->perf.events[i] == VIR_TRISTATE_BOOL_YES) { /* Failure to re-enable the perf event should not be fatal */ if (virPerfEventEnable(priv->perf, i, vm->pid) < 0) - def->perf->events[i] = VIR_TRISTATE_BOOL_NO; + def->perf.events[i] = VIR_TRISTATE_BOOL_NO; } } @@ -5217,7 +5217,7 @@ qemuProcessLaunch(virConnectPtr conn, goto cleanup; for (i = 0; i < VIR_PERF_EVENT_LAST; i++) { - if (vm->def->perf->events[i] == VIR_TRISTATE_BOOL_YES && + if (vm->def->perf.events[i] == VIR_TRISTATE_BOOL_YES && virPerfEventEnable(priv->perf, i, vm->pid) < 0) goto cleanup; } -- 2.9.0

2 1

[libvirt] [PATCH] qemu: Avoid needless copies of static strings
by Jiri Denemark 30 Jun '16

30 Jun '16

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_hotplug.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index bf6430d..f88520f 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3931,7 +3931,8 @@ qemuDomainChangeGraphicsPasswords(virQEMUDriverPtr driver, { qemuDomainObjPrivatePtr priv = vm->privateData; time_t now = time(NULL); - char expire_time [64]; + const char *expire; + char *validTo = NULL; const char *connected = NULL; const char *password; int ret = -1; @@ -3962,19 +3963,18 @@ qemuDomainChangeGraphicsPasswords(virQEMUDriverPtr driver, if (ret != 0) goto end_job; - if (password[0] == '\0') { - snprintf(expire_time, sizeof(expire_time), "now"); + if (password[0] == '\0' || + (auth->expires && auth->validTo <= now)) { + expire = "now"; } else if (auth->expires) { - time_t lifetime = auth->validTo - now; - if (lifetime <= 0) - snprintf(expire_time, sizeof(expire_time), "now"); - else - snprintf(expire_time, sizeof(expire_time), "%lu", (long unsigned)auth->validTo); + if (virAsprintf(&validTo, "%lu", (unsigned long) auth->validTo) < 0) + goto end_job; + expire = validTo; } else { - snprintf(expire_time, sizeof(expire_time), "never"); + expire = "never"; } - ret = qemuMonitorExpirePassword(priv->mon, type, expire_time); + ret = qemuMonitorExpirePassword(priv->mon, type, expire); if (ret == -2) { /* XXX we could fake this with a timer */ @@ -3991,6 +3991,7 @@ qemuDomainChangeGraphicsPasswords(virQEMUDriverPtr driver, if (qemuDomainObjExitMonitor(driver, vm) < 0) ret = -1; cleanup: + VIR_FREE(validTo); virObjectUnref(cfg); return ret; } -- 2.9.0

2 1

[libvirt] [PATCH 0/3] qemu: Fix auto-generation of SCSI controllers for hot-plugged SCSI disks and add tests
by Marc Hartmayer 30 Jun '16

30 Jun '16

This patch series fixes the auto-generation of SCSI controllers for hot-plugged SCSI disks and hot-plugged SCSI hostdevs. Additionally this patch series adds test cases for the auto-generation of SCSI controllers to the test suite. Marc Hartmayer (3): qemu: hot-plug: Fix broken SCSI disk hot-plug qemu: SCSI hostdev hot-plug: Fix automatic creation of SCSI controllers tests: Add test cases for SCSI disk hot-plug with QEMU src/qemu/qemu_hotplug.c | 41 +++++++++++++- tests/qemuhotplugtest.c | 29 ++++++++++ .../qemuhotplug-disk-scsi-2.xml | 8 +++ ...-base-with-scsi-controller-live+disk-scsi-2.xml | 51 +++++++++++++++++ ...se-without-scsi-controller-live+disk-scsi-2.xml | 66 ++++++++++++++++++++++ ...argv-hotplug-base-with-scsi-controller-live.xml | 56 ++++++++++++++++++ ...v-hotplug-base-without-scsi-controller-live.xml | 40 +++++++++++++ 7 files changed, 288 insertions(+), 3 deletions(-) create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-disk-scsi-2.xml create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-hotplug-base-with-scsi-controller-live+disk-scsi-2.xml create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-hotplug-base-without-scsi-controller-live+disk-scsi-2.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hotplug-base-with-scsi-controller-live.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hotplug-base-without-scsi-controller-live.xml -- 2.5.5

4 13

[libvirt] [PATCH] docs: Warn against locked memory limit too high
by Jiri Denemark 30 Jun '16

30 Jun '16

https://bugzilla.redhat.com/show_bug.cgi?id=1046833 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- docs/formatdomain.html.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index f660aa6..b0b2f82 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -862,8 +862,11 @@ be allowed to swap them out. For QEMU/KVM this requires <code>hard_limit</code> <a href="#elementsMemoryTuning">memory tuning</a> element to be used and set to the maximum memory configured for the - domain plus any memory consumed by the QEMU process itself. - <span class="since">Since 1.0.6</span></dd> + domain plus any memory consumed by the QEMU process itself. Beware of + setting the memory limit too high (and thus allowing the domain to lock + most of the host's memory). Doing so may be dangerous to both the + domain and the host itself since the host's kernel may run out of + memory. <span class="since">Since 1.0.6</span></dd> </dl> -- 2.9.0

2 1

[libvirt] [PATCH 0/8] Fix build with clang
by Ján Tomko 30 Jun '16

30 Jun '16

I am not proud of the first patch. I wrote the temporary bump for -Wframe-larger-than thinking splitting it out would be too intrusive for the freeze, but it did not turn out so bad. Patch 7/8 does not fix anything. Ján Tomko (8): virFirewallAddRule: exchange first two parameters virTypedParamsValidate: do not use STREQ_NULLABLE build: disable -Wdouble-promotion build: ignore some clang-specific warnings Introudce VIR_WARNINGS_NO_UNUSED_VALUE Temporarily bump maximum stack size test/Makefile.am: drop WARN_CFLAGS from LDFLAGS Split out -Wframe-larger-than warning from WARN_CLFAGS daemon/Makefile.am | 3 + m4/virt-compile-warnings.m4 | 15 ++++- src/Makefile.am | 1 + src/internal.h | 5 ++ src/nwfilter/nwfilter_ebiptables_driver.c | 84 +++++++++++++-------------- src/util/viratomic.h | 7 +++ src/util/virebtables.c | 8 +-- src/util/virfirewall.c | 8 +-- src/util/virfirewall.h | 4 +- src/util/viriptables.c | 38 ++++++------- src/util/virtypedparam.c | 2 +- tests/Makefile.am | 3 +- tests/virfirewalltest.c | 94 +++++++++++++++---------------- 13 files changed, 150 insertions(+), 122 deletions(-) -- 2.7.3

2 10

[libvirt] regression on virsh capabilities ?
by Eli Qiao 30 Jun '16

30 Jun '16

hi guys. I build libvirt from source(assume the latest is 2.0.0) but I get wrong virsh capabilities, see detail on. https://bugzilla.redhat.com/show_bug.cgi?id=1347458 This issue is not found if I use 1.3.1(from ubuntu 16.04) Is this an regression or the issue is bring out by my manually testing? can anyone help to clarify/test this? -- Best Regards, Eli Qiao (乔立勇) Intel OTC China

2 1

[libvirt] [libvirt-test-API][PATCH] Modify makefile to add check option.
by Ruifeng Bian 30 Jun '16

30 Jun '16

Use inspektor to check code style. Change-Id: I8c238c785f8e5dbd585379cad0d4687d0d5b5ce2 Signed-off-by: Ruifeng Bian <rbian(a)redhat.com> --- Makefile | 3 +++ selftests/check | 15 +++++++++++++++ 2 files changed, 18 insertions(+) create mode 100755 selftests/check diff --git a/Makefile b/Makefile index 91a95db..837f41d 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,9 @@ dist: @echo " " @echo "the archive is $(APP).tar.gz" +check: + selftests/check + clean: @find . -name "*.pyc" -exec rm -f {} \; @rm -rf log/ log.xml diff --git a/selftests/check b/selftests/check new file mode 100755 index 0000000..f064651 --- /dev/null +++ b/selftests/check @@ -0,0 +1,15 @@ +#!/bin/bash +ret=0 +run_cmd() { + echo "Running '$1'" + $1 + if [ $? != 0 ]; then + ret=1 + fi + echo "" +} +run_cmd 'inspekt lint' +run_cmd 'inspekt indent' +run_cmd 'inspekt style' +exit ${ret} + -- 2.4.3

2 2

[libvirt] [PATCH] vz: fixed null-pointer dereference in applying graphic params
by Olga Krishtal 30 Jun '16

30 Jun '16

Signed-off-by: Olga Krishtal <okrishtal(a)virtuozzo.com> --- src/vz/vz_sdk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index f4c2b3b..903440b 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -2790,6 +2790,7 @@ static int prlsdkApplyGraphicsParams(PRL_HANDLE sdkdom, if (!gr) { pret = PrlVmCfg_SetVNCMode(sdkdom, PRD_DISABLED); prlsdkCheckRetExit(pret, -1); + return 1; } pret = PrlVmCfg_SetVNCPassword(sdkdom, gr->data.vnc.auth.passwd ? : ""); -- 1.8.3.1

2 1

[libvirt] [PATCH 0/4] bhyve: UEFI bootrom support
by Fabian Freyer 30 Jun '16

30 Jun '16

this series of patches adds support for specifying UEFI boot images for bhyve virtual machines. The old behaviour is kept; only when a loader pflash is specified the loader command is omitted and adds a bootrom parameter to the bhyverun command. Fabian Freyer (4): bhyve: Separate out checks from virBhyveProbeCaps bhyve: virBhyveProbeCaps: BHYVE_CAP_LPC_BOOTROM bhyve: add support for booting from UEFI bhyve: Test cases for UEFI bhyvexml2argvtest src/bhyve/bhyve_capabilities.c | 59 ++++++++++++++++++---- src/bhyve/bhyve_capabilities.h | 1 + src/bhyve/bhyve_command.c | 6 +++ src/bhyve/bhyve_driver.c | 27 ++++++++-- tests/bhyvexml2argvdata/bhyvexml2argv-nouefi.args | 9 ++++ .../bhyvexml2argvdata/bhyvexml2argv-nouefi.ldargs | 1 + tests/bhyvexml2argvdata/bhyvexml2argv-nouefi.xml | 23 +++++++++ tests/bhyvexml2argvdata/bhyvexml2argv-uefi.args | 10 ++++ tests/bhyvexml2argvdata/bhyvexml2argv-uefi.ldargs | 1 + tests/bhyvexml2argvdata/bhyvexml2argv-uefi.xml | 23 +++++++++ tests/bhyvexml2argvtest.c | 13 ++++- 11 files changed, 158 insertions(+), 15 deletions(-) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-nouefi.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-nouefi.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-nouefi.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-uefi.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-uefi.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-uefi.xml -- 2.7.0

1 4

[libvirt] [PATCH] Introduce Smack security driver for Libvirt
by Randy Aybar (raybar) 30 Jun '16

30 Jun '16

First time RFC/mailing list/community submission/etc. so please forgive if not in the appropriate format. -Randy --- Incorporate changes that enable native support for Smack within Libvirt. -------------------------------------------------------------------------------- Table of Contents i. Contributions I. Introduction II. Implementations & Changes III. Patch -------------------------------------------------------------------------------- i. Contributions Below is a list of contributors of the patch described in this document: -Raghuram S. Sudhaakar rsudhaak(a)cisco.com, Cisco Systems, Inc. San Jose, California, USA -Randy Aybar raybar(a)cisco.com, Cisco Systems, Inc. San Jose, California, USA -Hongliang Liang hliang(a)bupt.edu.cn, Beijing University of Posts and Telecommunications (BUPT), Beijing, China -Changyao Han changyao(a)bupt.edu.cn, Beijing University of Posts and Telecommunications (BUPT), Beijing, China Portion of changes are based on existing security drivers within Libvirt: -James Morris <jmorris(a)namei.org> (SELinux security driver) -Jamie Strandboge <jamie(a)canonical.org> (AppArmor security driver) -------------------------------------------------------------------------------- I. Introduction Libvirt currently has support for two of the various Linux security modules (LSM), AppArmor and SELinux. While these work well enough for most cases, there are others in which a platform may require less complexity and overhead. Smack LSM (http://schaufler-ca.com/description_from_the_linux_source_tree) intrinsically provides access control with much more simplicity while remaining secure. A subject-object model is adapted with an access type relationship to determine if permissions or granted or denied. Brief history of code authorship We [folks at Cisco] started work on implementing a Libvirt security driver that would allow enable Smack support. The goal was to ensure that Libvirt would be able to enforce security policies using this lightweight module in order secure our Linux containers running on platforms. Initial findings on the topic yielded us to a research paper worked on by students at Beijing University of Posts and Telecommunications. As part of the paper's objective to create a lightweight approach to secure deployment of virtual machines in the cloud, a Smack security driver was implemented for use with QEMU-based virtual machines spawned by using the Libvirt API. After contacting the authors of the papers, they were more than willing to share the source code. Since the initial driver acquired from the university lacked support for LXC-style VMs, our role was to implement that portion. This patch includes the collaborative efforts in order to bring a more complete Smack driver to Libvirt. -------------------------------------------------------------------------------- II. Implementation & Changes Detailed changes described in this section will be limited to those made by Cisco engineers. The implementation made by researchers at BUPT can be read in their research paper and is based on libvirt v1.1.4. Publication information: A Lightweight Security Isolation Approach for Virtual Machines Deployment by Hongliang Liang, Changyao Han, Daijie Zhang, and Dongyang Wu Information Security and Cryptology 10th International Conference, Inscrypt 2014, Beijing, China, December 13-15, 2014, Revised Selected Papers Editors: Lin, Dongdai, Young, Moti, Zhou, Jianying (Eds.) Initial code changes made by BUPT can be located at the following GitHub repository as patches labeled for Libvirt 1.1.4: https://github.com/rssudhaakar/libvirt-smack The Smack driver was initially derived from parts of the SELinux and AppArmor drivers as noted by the authors and uses the Libsmack library to assign Smack labels when needed. Changes made by authors Raghuram S Sudhaakar and Randy Aybar are two major parts - 1) Firstly, the code was updated to accommodate the various interface changes made in libvirt v1.2+. 2) Secondly, make the SMACK security driver work with LXC driver The following is the details on the changes made for #2 above – A major changes involves modifying the security driver interface to include an additional hook/function. This decision was made after encountering several issues while applying labels to certain components of a container as well as consideration for minimizing the impact of the other security drivers. Details can be found under security driver changes. Another thing to note is that the Smack security driver itself depends on a security interface when fully enforced with namespaces. This interface is brought in by the Linux kernel in 4.3 but our team has backported and tested Libvirt with version 3.19 kernel. Details on why this was necessary found below in LXC container changes. Link that references the change in the kernel: https://lwn.net/Articles/660675/ i. LXC Container (src/lxc/lxc_container.c) a. Reordering of dropping capabilities and setting up security labeling Upon forking into a new user namespace (lxcContainerSetID), the child process no longer has the ability to override LSM and access folders that have been previously assigned Smack labels. This is important to note since after entering the namespace, the child still needs to share mount devpts and pivot root however the process does not take on the container's label until much after this setup. Thus a suggestion to move the set process label (virSecurityManagerSetProcessLabel) after setting namespaces is made. Dropping capabilities was also moved after sending the continue signal to the parent. We had come across an issue as well with setting up FDs and the container would fail to start. b. Adding a call to set the child's process label (virSecurityManagerSetChildProcessLabel) When the child process is spawned from lxcContainerStart, although it has full capabilities in its own namespace (after SetUID), it is unable to change its own security context (label). Currently the only workaround is to incorporate an upcoming patch to the Smack LSM (kernel base) that allows an unprivileged process to change its context only if the label its trying to acquire exists in a predefined list held by the parent. With the patch in place, the LXC driver needs to ensure that the label makes it to the list of the parent so that the child can continue to take on the context which brings a change to lxcContainerStart. Although the SetChildProcessLabel is a hook that is primarily used by QEMU, we decided to use it as the name best fit the operation being performed. A check is implemented to ensure that it only continues if Smack is the driver being used since this does not need to occur in the other LSMs. Within the Smack driver itself, the hook also performs a check to see if LXC is used otherwise skip the block pertaining to LXC. In the LXC code, it checks to see if the Smack relabel-self interface exists and if namespaces is being used to continue. The label is written with a simple write call to the file. The logic is allowed to flow into the QEMU portion since no command is passed in, the function acts as a noop and safely exits. Any comments for improvement on the logic handled in this change are highly appreciated! ii. LXC Controller (src/lxc/lxc_controller.c) a. Add logic to label the special devices created under (/var/run/libvirt/lxc/container.XXX) The following function calls setup the appropriate special devices such as ttys, ptmx, null, etc. (/dev) virLXCControllerSetupDev virLXCControllerPopulateDevices virLXCControllerSetupDevPTS virLXCControllerSetupConsoles It was decided to add the call to do a label operation in these functions due to the fact that chown'ing also happened at these locations and wanted to provide some uniformity in that sense. Since the security hook to label these are no-op in all but the Smack driver it's just a straightforward call with the usual check to see if it succeeded. iii. Security Drivers (src/security) Changes to security driver model include an additional hook to apply a security label by passing in a string. Although there exists functions made for applying security labels, complications arose from using either. The first of these is SetImageLabel which requires to pass in a virStorageSource that holds the string. LXC does not make use of this data structure and initializing one for the sake of a string did not seem feasible due to the numerous and differing members the struct consisted of. The second function major function to apply security labels is SetImageFDLabel which uses a file descriptor rather than a string text. While this approach seemed more promising there were hurdles that came across while attempting to label items. A file descriptor would be needed to be opened for each special device available. However devices like tty could not be opened without being issued as a controlling tty by the process. Note that a workaround was attempted to change the open call to include the O_PATH flag and obtain the path by looking up the location the FD pointed to in the process's list of file descriptors within /proc. While this change worked for the tty case, it was dismissed due to the additional changes that may have been needed to the other security drivers as we were targeting to minimize the changes. This solution may be revisited upon further testing and review. a. Update Definitions for DAC, Stack, AppArmor, SELinux, Smack, driver base (security_driver.h), and driver manager (security_manager.c,h) Changes here involve updated the driver's definitions to include the new hook, virSecurityDomainSetImagePathLabel. All drivers except Smack implement this by just returning 0 to not disrupt the flow in a non-Smack setup. b. Updates to Smack driver to support namespaces with LXC Already described include changes to implement the extra hook to label a file using a path as well as SetChildProcessLabel wihthin the driver to include the process of adding a label to the approved list via relabel-self. The driver itself was cleaned up a bit and refactored to eliminate the use of excessive amount of helper functions and rely on the API provided by the libsmack library. Function names were refactored to match the style of the SELinux driver (after the dropping of an extra "Security" in the function's name). iv. Support for entering namespaces in Smack (src/libvirt-lxc.c) A small addition was made to enable support for Smack using the lxc-enter-namespace and was merely a mirror of the other security drivers included in this file. Smack in this case uses libsmack API call to label the process entering the namespace. -------------------------------------------------------------------------------- III. Patch This patch has been created for patching Libvirt 1.3.1 base source code. diff --git a/configure.ac b/configure.ac index 047ad3b..12d0bb8 100644 --- a/configure.ac +++ b/configure.ac @@ -253,6 +253,7 @@ LIBVIRT_CHECK_READLINE LIBVIRT_CHECK_SANLOCK LIBVIRT_CHECK_SASL LIBVIRT_CHECK_SELINUX +LIBVIRT_CHECK_SMACK LIBVIRT_CHECK_SSH2 LIBVIRT_CHECK_SYSTEMD_DAEMON LIBVIRT_CHECK_UDEV @@ -1535,6 +1536,27 @@ if test "$with_apparmor" = "no"; then fi AM_CONDITIONAL([WITH_APPARMOR_PROFILES], [test "$with_apparmor_profiles" != "no"]) +AC_ARG_WITH([secdriver-smack], + [AS_HELP_STRING([--with-secdriver-smack], + [use Smack security driver @<:@default=check@:>@])], + [], + [with_secdriver_smack=check]) + +if test "$with_smack" != "yes" ; then + if test "$with_secdriver_smack" = "check" ; then + with_secdriver_smack=no + fi + if test "$with_secdriver_smack" != "no" ; then + AC_MSG_ERROR([You must install the Smack development package in order to compile libvirt]) + fi +elif test "with_secdriver_smack" != "no" ; then + with_secdriver_smack=yes + AC_DEFINE_UNQUOTED([WITH_SECDRIVER_SMACK], 1, [whether Smack security driver is available]) +fi +AM_CONDITIONAL([WITH_SECDRIVER_SMACK], [test "$with_secdriver_smack" != "no"]) + + + dnl DTrace static probes AC_ARG_WITH([dtrace], [AS_HELP_STRING([--with-dtrace], @@ -2867,6 +2889,7 @@ AC_MSG_NOTICE([Security Drivers]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([ SELinux: $with_secdriver_selinux ($SELINUX_MOUNT)]) AC_MSG_NOTICE([AppArmor: $with_secdriver_apparmor (install profiles: $with_apparmor_profiles)]) +AC_MSG_NOTICE([Smack: $with_secdriver_smack]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Driver Loadable Modules]) AC_MSG_NOTICE([]) @@ -2897,6 +2920,7 @@ LIBVIRT_RESULT_READLINE LIBVIRT_RESULT_SANLOCK LIBVIRT_RESULT_SASL LIBVIRT_RESULT_SELINUX +LIBVIRT_RESULT_SMACK LIBVIRT_RESULT_SSH2 LIBVIRT_RESULT_SYSTEMD_DAEMON LIBVIRT_RESULT_UDEV diff --git a/m4/virt-smack.m4 b/m4/virt-smack.m4 new file mode 100644 index 0000000..f23ffdc --- /dev/null +++ b/m4/virt-smack.m4 @@ -0,0 +1,48 @@ +dnl The libsmack.so library +dnl +dnl Copyright (C) 2013 changyaoh. +dnl +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License, or (at your option) any later version. +dnl +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. +dnl +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library. If not, see +dnl <http://www.gnu.org/licenses/>. +dnl + +AC_DEFUN([LIBVIRT_CHECK_SMACK],[ + LIBVIRT_CHECK_LIB([SMACK], [smack], + [smack_set_label_for_self], [sys/smack.h]) + + AC_ARG_WITH([smack_mount], + [AS_HELP_STRING([--with-smack-mount], + [set Smack mount point @<:@default=check@:>@])], + [], + [with_smack_mount=check]) + + if test "$with_smack" = "yes"; then + AC_MSG_CHECKING([Smack mount point]) + if test "$with_smack_mount" = "check" || test -z "$with_smack_mount"; then + if test -d /sys/fs/smackfs ; then + SMACK_MOUNT=/sys/fs/smackfs + else + SMACK_MOUNT=/smack + fi + else + SMACK_MOUNT=$with_smack_mount + fi + AC_MSG_RESULT([$SMACK_MOUNT]) + AC_DEFINE_UNQUOTED([SMACK_MOUNT], ["$SMACK_MOUNT"], [Smack mount point]) + fi +]) + +AC_DEFUN([LIBVIRT_RESULT_SMACK],[ + LIBVIRT_RESULT_LIB([SMACK]) +]) diff --git a/src/Makefile.am b/src/Makefile.am index aa5ab69..d367954 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -68,6 +68,10 @@ if WITH_SECDRIVER_APPARMOR SECDRIVER_CFLAGS += $(APPARMOR_CFLAGS) SECDRIVER_LIBS += $(APPARMOR_LIBS) endif WITH_SECDRIVER_APPARMOR +if WITH_SECDRIVER_SMACK +SECDRIVER_CFLAGS += $(SMACK_CFLAGS) +SECDRIVER_LIBS += $(SMACK_LIBS) +endif WITH_SECDRIVER_SMACK if WITH_NETWORK UUID=$(shell uuidgen 2>/dev/null) @@ -1005,6 +1009,9 @@ SECURITY_DRIVER_SELINUX_SOURCES = \ SECURITY_DRIVER_APPARMOR_SOURCES = \ security/security_apparmor.h security/security_apparmor.c +SECURITY_DRIVER_SMACK_SOURCES = \ + security/security_smack.h security/security_smack.c + ACCESS_DRIVER_GENERATED = \ access/viraccessapicheck.h \ access/viraccessapicheck.c \ @@ -1734,6 +1741,10 @@ if WITH_SECDRIVER_APPARMOR libvirt_security_manager_la_SOURCES += $(SECURITY_DRIVER_APPARMOR_SOURCES) libvirt_security_manager_la_CFLAGS += $(APPARMOR_CFLAGS) endif WITH_SECDRIVER_APPARMOR +if WITH_SECDRIVER_SMACK +libvirt_security_manager_la_SOURCES += $(SECURITY_DRIVER_SMACK_SOURCES) +libvirt_security_manager_la_CFLAGS += $(SMACK_CFLAGS) +endif WITH_SECDRIVER_SMACK libvirt_driver_access_la_SOURCES = \ $(ACCESS_DRIVER_SOURCES) $(ACCESS_DRIVER_GENERATED) @@ -1865,6 +1876,7 @@ EXTRA_DIST += \ $(NWFILTER_DRIVER_SOURCES) \ $(SECURITY_DRIVER_SELINUX_SOURCES) \ $(SECURITY_DRIVER_APPARMOR_SOURCES) \ + $(SECURITY_DRIVER_SMACK_SOURCES) \ $(SECRET_DRIVER_SOURCES) \ $(VBOX_DRIVER_EXTRA_DIST) \ $(VMWARE_DRIVER_SOURCES) \ diff --git a/src/libvirt-lxc.c b/src/libvirt-lxc.c index 8553570..4a26e80 100644 --- a/src/libvirt-lxc.c +++ b/src/libvirt-lxc.c @@ -3,6 +3,7 @@ * APIs. * * Copyright (C) 2012-2014 Red Hat, Inc. + * Copyright (C) 2015 Cisco Systems, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,7 +19,9 @@ * License along with this library. If not, see * <http://www.gnu.org/licenses/>. * - * Author: Daniel P. Berrange <berrange(a)redhat.com> + * Authors: Daniel P. Berrange <berrange(a)redhat.com> + * Raghuram S. Sudhaakar <rssudhaakar(a)gmail.com> + * Randy Aybar <raybar(a)cisco.com> */ #include <config.h> @@ -36,6 +39,9 @@ #ifdef WITH_APPARMOR # include <sys/apparmor.h> #endif +#ifdef WITH_SMACK +# include <sys/smack.h> +#endif #define VIR_FROM_THIS VIR_FROM_NONE @@ -256,6 +262,20 @@ virDomainLxcEnterSecurityLabel(virSecurityModelPtr model, _("Support for AppArmor is not enabled")); goto error; #endif + } else if (STREQ(model->model, "smack")) { +#ifdef WITH_SMACK + if (smack_set_label_for_self(label->label) < 0) { + virReportError(errno, + _("unable to set security label '%s'"), + label->label); + + goto error; + } +#else + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("Support for Smack is not enabled")); + goto error; +#endif } else { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, _("Security model %s cannot be entered"), diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index c5a70a1..71203aa 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1,13 +1,16 @@ /* * Copyright (C) 2008-2015 Red Hat, Inc. * Copyright (C) 2008 IBM Corp. - * Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. + * Copyright (C) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. + * Copyright (C) 2015 Cisco Systems, Inc. * * lxc_container.c: file description * * Authors: * David L. Leskovec <dlesko at linux.vnet.ibm.com> * Daniel P. Berrange <berrange(a)redhat.com> + * Raghuram S. Sudhaakar <rssudhaakar(a)gmail.com> + * Randy Aybar <raybar(a)cisco.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -2206,6 +2209,10 @@ static int lxcContainerChild(void *data) if (lxcContainerSetID(vmDef) < 0) goto cleanup; + VIR_DEBUG("Setting up security labeling"); + if (virSecurityManagerSetProcessLabel(argv->securityDriver, vmDef) < 0) + goto cleanup; + root = virDomainGetFilesystemForTarget(vmDef, "/"); if (argv->nttyPaths) { @@ -2254,20 +2261,12 @@ static int lxcContainerChild(void *data) goto cleanup; } - /* drop a set of root capabilities */ - if (lxcContainerDropCapabilities(vmDef, !!hasReboot) < 0) - goto cleanup; - if (lxcContainerSendContinue(argv->handshakefd) < 0) { virReportSystemError(errno, "%s", _("Failed to send continue signal to controller")); goto cleanup; } - VIR_DEBUG("Setting up security labeling"); - if (virSecurityManagerSetProcessLabel(argv->securityDriver, vmDef) < 0) - goto cleanup; - VIR_DEBUG("Setting up inherited FDs"); VIR_FORCE_CLOSE(argv->handshakefd); VIR_FORCE_CLOSE(argv->monitor); @@ -2275,6 +2274,10 @@ static int lxcContainerChild(void *data) argv->npassFDs, argv->passFDs) < 0) goto cleanup; + /* drop a set of root capabilities */ + if (lxcContainerDropCapabilities(vmDef, !!hasReboot) < 0) + goto cleanup; + ret = 0; cleanup: VIR_FREE(ttyPath); @@ -2389,6 +2392,16 @@ int lxcContainerStart(virDomainDefPtr def, if (userns_supported()) { VIR_DEBUG("Enable user namespace"); cflags |= CLONE_NEWUSER; +#ifdef WITH_SMACK + if(STREQ(virSecurityManagerGetModel(securityDriver),"smack") && + virSecurityManagerSetChildProcessLabel(securityDriver, + def, + NULL) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to send label to relabel interface.")); + return -1; + } +#endif } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Kernel doesn't support user namespace")); diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 438103a..37080b8 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -1,11 +1,14 @@ /* * Copyright (C) 2010-2015 Red Hat, Inc. - * Copyright IBM Corp. 2008 - * + * Copyright (C) 2008 IBM Corp. + * Copyright (C) 2015 Cisco Systems, Inc. + * * lxc_controller.c: linux container process controller * * Authors: * David L. Leskovec <dlesko at linux.vnet.ibm.com> + * Raghuram S. Sudhaakar <rssudhaakar(a)gmail.com> + * Randy Aybar <raybar(a)cisco.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1476,6 +1479,9 @@ static int virLXCControllerSetupDev(virLXCControllerPtr ctrl) if (lxcContainerChown(ctrl->def, dev) < 0) goto cleanup; + + if (virSecurityManagerSetImagePathLabel(ctrl->securityManager,ctrl->def,dev) < 0) + goto cleanup; ret = 0; cleanup: @@ -1525,6 +1531,11 @@ static int virLXCControllerPopulateDevices(virLXCControllerPtr ctrl) if (lxcContainerChown(ctrl->def, path) < 0) goto cleanup; + if (virSecurityManagerSetImagePathLabel(ctrl->securityManager, + ctrl->def, + path) < 0) + goto cleanup; + VIR_FREE(path); } @@ -2183,6 +2194,14 @@ virLXCControllerSetupDevPTS(virLXCControllerPtr ctrl) (lxcContainerChown(ctrl->def, devpts) < 0)) goto cleanup; + if ((virSecurityManagerSetImagePathLabel(ctrl->securityManager, + ctrl->def, + ctrl->devptmx)) < 0 || + (virSecurityManagerSetImagePathLabel(ctrl->securityManager, + ctrl->def, + devpts) < 0)) + goto cleanup; + ret = 0; cleanup: @@ -2227,6 +2246,11 @@ virLXCControllerSetupConsoles(virLXCControllerPtr ctrl, if (lxcContainerChown(ctrl->def, ttyHostPath) < 0) goto cleanup; + if (virSecurityManagerSetImagePathLabel(ctrl->securityManager, + ctrl->def, + ttyHostPath) < 0) + goto cleanup; + VIR_FREE(ttyHostPath); } diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 2cf333d..c013443 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -986,6 +986,14 @@ AppArmorSetFDLabel(virSecurityManagerPtr mgr, return reload_profile(mgr, def, fd_path, true); } +static int +AppArmorSetPathLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, + virDomainDefPtr def ATTRIBUTE_UNUSED, + const char *path ATTRIBUTE_UNUSED) +{ + return 0; +} + static char * AppArmorGetMountOptions(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, virDomainDefPtr vm ATTRIBUTE_UNUSED) @@ -1043,6 +1051,7 @@ virSecurityDriver virAppArmorSecurityDriver = { .domainRestoreSavedStateLabel = AppArmorRestoreSavedStateLabel, .domainSetSecurityImageFDLabel = AppArmorSetFDLabel, + .domainSetSecurityImagePathLabel = AppArmorSetPathLabel, .domainSetSecurityTapFDLabel = AppArmorSetFDLabel, .domainGetSecurityMountOptions = AppArmorGetMountOptions, diff --git a/src/security/security_dac.c b/src/security/security_dac.c index a09aba5..1af5175 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -1519,6 +1519,14 @@ virSecurityDACSetImageFDLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, } static int +virSecurityDACSetImagePathLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, + virDomainDefPtr def ATTRIBUTE_UNUSED, + const char *path ATTRIBUTE_UNUSED) +{ + return 0; +} + +static int virSecurityDACSetTapFDLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, virDomainDefPtr def ATTRIBUTE_UNUSED, int fd ATTRIBUTE_UNUSED) @@ -1601,6 +1609,7 @@ virSecurityDriver virSecurityDriverDAC = { .domainRestoreSavedStateLabel = virSecurityDACRestoreSavedStateLabel, .domainSetSecurityImageFDLabel = virSecurityDACSetImageFDLabel, + .domainSetSecurityImagePathLabel = virSecurityDACSetImagePathLabel, .domainSetSecurityTapFDLabel = virSecurityDACSetTapFDLabel, .domainGetSecurityMountOptions = virSecurityDACGetMountOptions, diff --git a/src/security/security_driver.c b/src/security/security_driver.c index 4800d52..3ca3766 100644 --- a/src/security/security_driver.c +++ b/src/security/security_driver.c @@ -35,6 +35,10 @@ # include "security_apparmor.h" #endif +#ifdef WITH_SECDRIVER_SMACK +# include "security_smack.h" +#endif + #include "security_nop.h" #define VIR_FROM_THIS VIR_FROM_SECURITY @@ -48,6 +52,9 @@ static virSecurityDriverPtr security_drivers[] = { #ifdef WITH_SECDRIVER_APPARMOR &virAppArmorSecurityDriver, #endif +#ifdef WITH_SECDRIVER_SMACK + &virSecurityDriverSmack, +#endif &virSecurityDriverNop, /* Must always be last, since it will always probe */ }; diff --git a/src/security/security_driver.h b/src/security/security_driver.h index 784b0de..c477f93 100644 --- a/src/security/security_driver.h +++ b/src/security/security_driver.h @@ -1,6 +1,7 @@ /* * Copyright (C) 2008, 2010-2013 Red Hat, Inc. - * + * Copyright (C) 2015 Cisco System, Inc. + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,7 +18,8 @@ * * Authors: * James Morris <jmorris(a)namei.org> - * + * Raghuram S. Sudhaakar <rssudhaakar(a)gmail.com> + * Randy Aybar <raybar(a)cisco.com> */ #ifndef __VIR_SECURITY_H__ # define __VIR_SECURITY_H__ @@ -104,6 +106,9 @@ typedef int (*virSecurityDomainSecurityVerify) (virSecurityManagerPtr mgr, typedef int (*virSecurityDomainSetImageFDLabel) (virSecurityManagerPtr mgr, virDomainDefPtr def, int fd); +typedef int (*virSecurityDomainSetImagePathLabel) (virSecurityManagerPtr mgr, + virDomainDefPtr def, + const char *path); typedef int (*virSecurityDomainSetTapFDLabel) (virSecurityManagerPtr mgr, virDomainDefPtr def, int fd); @@ -165,6 +170,7 @@ struct _virSecurityDriver { virSecurityDomainRestoreSavedStateLabel domainRestoreSavedStateLabel; virSecurityDomainSetImageFDLabel domainSetSecurityImageFDLabel; + virSecurityDomainSetImagePathLabel domainSetSecurityImagePathLabel; virSecurityDomainSetTapFDLabel domainSetSecurityTapFDLabel; virSecurityDomainGetMountOptions domainGetSecurityMountOptions; diff --git a/src/security/security_manager.c b/src/security/security_manager.c index 07a0522..b782eab 100644 --- a/src/security/security_manager.c +++ b/src/security/security_manager.c @@ -2,6 +2,7 @@ * security_manager.c: Internal security manager API * * Copyright (C) 2010-2014 Red Hat, Inc. + * Copyright (C) 2015 Cisco Systems, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,7 +18,9 @@ * License along with this library. If not, see * <http://www.gnu.org/licenses/>. * - * Author: Daniel P. Berrange <berrange(a)redhat.com> + * Authors: Daniel P. Berrange <berrange(a)redhat.com> + * Raghuram S. Sudhaakar <rssudhaakar(a)gmail.com> + * Randy Aybar <raybar(a)cisco.com> */ #include <config.h> @@ -916,6 +919,23 @@ virSecurityManagerSetImageFDLabel(virSecurityManagerPtr mgr, return -1; } +int +virSecurityManagerSetImagePathLabel(virSecurityManagerPtr mgr, + virDomainDefPtr vm, + const char* path) +{ + if (mgr->drv->domainSetSecurityImagePathLabel) { + int ret; + virObjectLock(mgr); + ret = mgr->drv->domainSetSecurityImagePathLabel(mgr,vm,path); + virObjectUnlock(mgr); + return ret; + } + + virReportUnsupportedError(); + return -1; +} + int virSecurityManagerSetTapFDLabel(virSecurityManagerPtr mgr, diff --git a/src/security/security_manager.h b/src/security/security_manager.h index e534e31..35e8a3b 100644 --- a/src/security/security_manager.h +++ b/src/security/security_manager.h @@ -2,7 +2,8 @@ * security_manager.h: Internal security manager API * * Copyright (C) 2010-2013 Red Hat, Inc. - * + * Copyright (C) 2015 Cisco Systems, Inc. + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -18,6 +19,8 @@ * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> + * Raghuram S. Sudhaakar <rssudhaakar(a)gmail.com> + * Randy Aybar <raybar(a)cisco.com> */ #ifndef VIR_SECURITY_MANAGER_H__ @@ -143,6 +146,9 @@ int virSecurityManagerVerify(virSecurityManagerPtr mgr, int virSecurityManagerSetImageFDLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, int fd); +int virSecurityManagerSetImagePathLabel(virSecurityManagerPtr mgr, + virDomainDefPtr def, + const char *path); int virSecurityManagerSetTapFDLabel(virSecurityManagerPtr mgr, virDomainDefPtr vm, int fd); diff --git a/src/security/security_nop.c b/src/security/security_nop.c index 951125d..3d4d47a 100644 --- a/src/security/security_nop.c +++ b/src/security/security_nop.c @@ -236,6 +236,13 @@ virSecurityDomainSetImageLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, return 0; } +static int +virSecurityDomainSetPathLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, + virDomainDefPtr def ATTRIBUTE_UNUSED, + const char* path ATTRIBUTE_UNUSED) +{ + return 0; +} virSecurityDriver virSecurityDriverNop = { .privateDataLen = 0, @@ -277,6 +284,7 @@ virSecurityDriver virSecurityDriverNop = { .domainRestoreSavedStateLabel = virSecurityDomainRestoreSavedStateLabelNop, .domainSetSecurityImageFDLabel = virSecurityDomainSetFDLabelNop, + .domainSetSecurityImagePathLabel = virSecurityDomainSetPathLabelNop, .domainSetSecurityTapFDLabel = virSecurityDomainSetFDLabelNop, .domainGetSecurityMountOptions = virSecurityDomainGetMountOptionsNop, diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 9e98635..4b510e1 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -2459,6 +2459,14 @@ virSecuritySELinuxSetImageFDLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, } static int +virSecuritySELinuxSetImagePathLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, + virDomainDefPtr def ATTRIBUTE_UNUSED, + const char *path ATTRIBUTE_UNUSED) +{ + return 0; +} + +static int virSecuritySELinuxSetTapFDLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, int fd) @@ -2639,6 +2647,7 @@ virSecurityDriver virSecurityDriverSELinux = { .domainRestoreSavedStateLabel = virSecuritySELinuxRestoreSavedStateLabel, .domainSetSecurityImageFDLabel = virSecuritySELinuxSetImageFDLabel, + .domainSetSecurityImagePathLabel = virSecuritySELinuxSetImagePathLabel, .domainSetSecurityTapFDLabel = virSecuritySELinuxSetTapFDLabel, .domainGetSecurityMountOptions = virSecuritySELinuxGetSecurityMountOptions, diff --git a/src/security/security_smack.c b/src/security/security_smack.c new file mode 100644 index 0000000..50301ad --- /dev/null +++ b/src/security/security_smack.c @@ -0,0 +1,1519 @@ +/* + * Copyright (C) 2015 Cisco Systems, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Author: + * Hongliang Liang <hliang(a)bupt.edu.cn> + * Changyao Han <changyao(a)bupt.edu.cn> + * + * Updated to libvirt v1.2.15: (Original was written for libvirt v1.1.4) + * Raghuram S. Sudhaakar <rsudhaak(a)cisco.com> + * Randy Aybar <raybar(a)cisco.com> + * + * Based on security_selinux.c by James Morris <jmorris(a)namei.org> + * and security_apparmor.c by Jamie Strandboge <jamie(a)canonical.com> + * + * Smack scurity driver. + * + */ + +#include <config.h> + +#include <sys/types.h> +#include <sys/xattr.h> +#include <sys/stat.h> +#include <sys/syscall.h> +#include <fcntl.h> +#include <sys/smack.h> +#include <errno.h> +#include <unistd.h> +#include <wait.h> +#include <dirent.h> +#include <stdlib.h> + + +#include "security_smack.h" +#include "virerror.h" +#include "viralloc.h" +#include "datatypes.h" +#include "viruuid.h" +#include "virlog.h" +#include "virpci.h" +#include "virusb.h" +#include "virscsi.h" +#include "virstoragefile.h" +#include "virfile.h" +#include "configmake.h" +#include "vircommand.h" +#include "virhash.h" +#include "virstring.h" + +#define VIR_FROM_THIS VIR_FROM_SECURITY +VIR_LOG_INIT("security.security_smack"); + +#define SECURITY_SMACK_VOID_DOI "0" +#define SECURITY_SMACK_NAME "smack" + +typedef struct _SmackCallbackData SmackCallbackData; +typedef SmackCallbackData *SmackCallbackDataPtr; + +struct _SmackCallbackData { + virSecurityManagerPtr manager; + virSecurityLabelDefPtr secdef; +}; + +static char * +virSecuritySmackGetLabelName(virDomainDefPtr def) +{ + char uuidstr[VIR_UUID_STRING_BUFLEN]; + char *name = NULL; + + virUUIDFormat(def->uuid, uuidstr); + if (virAsprintf(&name, "%s%s", SMACK_PREFIX, uuidstr) < 0) + return NULL; + + return name; +} + +static int +virSecuritySmackGetPIDLabel(pid_t pid, char **label) +{ + + char *result; + int fd; + int ret; + char *path; + + result = calloc(SMACK_LABEL_LEN + 1, 1); + if (result == NULL) + return -1; + ret = virAsprintf(&path, "/proc/%d/attr/current", pid); + if (ret < 0) + return -1; + fd = open(path, O_RDONLY); + VIR_FREE(path); + if (fd < 0) { + free(result); + return -1; + } + ret = read(fd, result, SMACK_LABEL_LEN); + VIR_FORCE_CLOSE(fd); + if (ret < 0) { + free(result); + return -1; + } + *label = result; + return ret; + +} + +int +virSecuritySmackSockCreate(const char *label, const char *attr) +{ + int fd; + int ret = -1; + long int tid; + char *path; + tid = syscall(SYS_gettid); + VIR_DEBUG("/proc/self/task/%ld/attr/%s", tid, attr); + ret = virAsprintf(&path, "/proc/self/task/%ld/attr/%s", tid, attr); + if (ret < 0) + return -1; + + VIR_DEBUG("virSecuritySmackSockCreate pid is in %d", getpid()); + VIR_DEBUG("real user ID is in %d", getuid()); + VIR_DEBUG("effective user ID is in %d", geteuid()); + VIR_DEBUG("label from self %s", label); + VIR_DEBUG("location /proc/self/attr/%s", attr); + + if (label) { + fd = open(path, O_WRONLY | O_CLOEXEC); + VIR_DEBUG("open file %s", path); + VIR_FREE(path); + if (fd < 0) { + VIR_DEBUG("open fail"); + return -1; + } + VIR_DEBUG("open success"); + do { + ret = write(fd, label, strlen(label) + 1); + } while (ret < 0 && errno == EINTR); + } + else { + fd = open(path, O_TRUNC); + VIR_FREE(path); + if (fd < 0) + return -1; + ret = 0; + } + + close(fd); + + return (ret < 0) ? -1 : 0; + +} + +static int +virSecuritySmackSetPathLabel(const char *path, const char *tlabel) +{ + char * elabel = NULL; + + VIR_INFO("Setting Smack label on '%s' to '%s'", path, tlabel); + + if (smack_set_label_for_path(path, "security.SMACK64", 0, tlabel) < 0) { + int setfilelabel_errno = errno; + + if (smack_new_label_from_path(path, "security.SMACK64", 0, &elabel) >= 0) { + if (STREQ(tlabel, elabel)) { + VIR_FREE(elabel); + /* It's alright, there's nothing to change anyway. */ + return 0; + } + VIR_FREE(elabel); + } + + /* if the error complaint is related to an image hosted on + * an nfs mount, or a usbfs/sysfs filesystem not supporting + * labelling, then just ignore it & hope for the best. + */ + + if (setfilelabel_errno != EOPNOTSUPP && setfilelabel_errno != ENOTSUP) { + virReportSystemError(setfilelabel_errno, + _("unable to set security context '%s' on '%s'"), + tlabel, path); + return -1; + + } else { + const char *msg; + if ((virFileIsSharedFS(path) == 1)) { + msg = _("Setting security context '%s' on '%s' not supported. "); + VIR_WARN(msg, tlabel, path); + } else { + VIR_INFO("Setting security context '%s' on '%s' not supported", + tlabel, path); + + } + + } + + } + return 0; + +} + +static int +virSecuritySmackSetHostdevLabelHelper(const char *file, void *opaque) +{ + virSecurityLabelDefPtr seclabel; + virDomainDefPtr def = opaque; + + seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SMACK_NAME); + if (seclabel == NULL) + return -1; + return virSecuritySmackSetPathLabel(file, seclabel->imagelabel); +} + +static int +virSecuritySmackSetUSBLabel(virUSBDevicePtr dev ATTRIBUTE_UNUSED, + const char *file, void *opaque) +{ + return virSecuritySmackSetHostdevLabelHelper(file, opaque); +} + + +static int +virSecuritySmackSetPCILabel(virPCIDevicePtr dev ATTRIBUTE_UNUSED, + const char *file, void *opaque) +{ + return virSecuritySmackSetHostdevLabelHelper(file, opaque); +} + +static int +virSecuritySmackSetSCSILabel(virSCSIDevicePtr dev ATTRIBUTE_UNUSED, + const char *file, void *opaque) +{ + return virSecuritySmackSetHostdevLabelHelper(file, opaque); +} + + +static int +virSecuritySmackRestoreFileLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, + const char *path) +{ + struct stat buf; + int ret = -1; + char *newpath = NULL; + char ebuf[1024]; + + VIR_INFO("Restoring Smack label on '%s'", path); + + if (virFileResolveLink(path, &newpath) < 0) { + VIR_WARN("cannot resolve symlink %s: %s", path, + virStrerror(errno, ebuf, sizeof(ebuf))); + goto err; + } + + if (stat(newpath, &buf) != 0) { + VIR_WARN("cannot stat %s: %s", newpath, + virStrerror(errno, ebuf, sizeof(ebuf))); + goto err; + } + + ret = virSecuritySmackSetPathLabel(newpath, "smack-unused"); + +err: + VIR_FREE(newpath); + return ret; +} + + +static int +virSecuritySmackRestoreUSBLabel(virUSBDevicePtr dev ATTRIBUTE_UNUSED, + const char *file, + void *opaque) +{ + virSecurityManagerPtr mgr = opaque; + + return virSecuritySmackRestoreFileLabel(mgr, file); +} + +static int +virSecuritySmackRestorePCILabel(virPCIDevicePtr dev ATTRIBUTE_UNUSED, + const char *file, + void *opaque) +{ + virSecurityManagerPtr mgr = opaque; + + return virSecuritySmackRestoreFileLabel(mgr, file); +} + +static int +virSecuritySmackRestoreSCSILabel(virSCSIDevicePtr dev ATTRIBUTE_UNUSED, + const char *file, + void *opaque) +{ + virSecurityManagerPtr mgr = opaque; + + return virSecuritySmackRestoreFileLabel(mgr, file); +} + +static int +virSecuritySmackRestoreImageLabelInt(virSecurityManagerPtr mgr, + virDomainDefPtr def, + virStorageSourcePtr src, + bool migrated) +{ + virSecurityLabelDefPtr seclabel; + + seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SMACK_NAME); + + if (seclabel == NULL) + return -1; + + if (!seclabel->relabel) + return 0; + + if (src->readonly || src->shared) + return 0; + + if (!src || src->type == VIR_STORAGE_TYPE_NETWORK) + return 0; + + if (migrated) { + int ret = virFileIsSharedFS(src->path); + if (ret < 0) + return -1; + if (ret == 1) { + VIR_DEBUG("Skipping image label restore on %s because FS is shared", src->path); + return 0; + } + + } + + return virSecuritySmackRestoreFileLabel(mgr, src->path); + +} + +static int +virSecuritySmackSetFileLabel(int fd, char *tlabel) +{ + char *elabel = NULL; + + VIR_INFO("Setting Smack label on fd %d to '%s'", fd, tlabel); + + if (smack_set_label_for_file(fd, "security.SMACK64", tlabel) < 0) { + int fsetfilelabel_errno = errno; + + if (smack_new_label_from_file(fd, "security.SMACK64", &elabel) >= 0) { + if (STREQ(tlabel, elabel)) { + VIR_FREE(elabel); + /* It's alright, there's nothing to change anyway. */ + + return 0; + } + + VIR_FREE(elabel); + } + /* if the error complaint is related to an image hosted on + * an nfs mount, or a usbfs/sysfs filesystem not supporting + * labelling, then just ignore it & hope for the best. + */ + if (fsetfilelabel_errno != EOPNOTSUPP) { + virReportSystemError(fsetfilelabel_errno, + _("unable to set security context '%s' on fd %d"), tlabel, fd); + return -1; + } else { + VIR_INFO("Setting security label '%s' on fd %d not supported", + tlabel, fd); + } + } + return 0; +} + + +static int +virSecuritySmackSetHostdevSubsysLabel(virDomainDefPtr def, + virDomainHostdevDefPtr dev, + const char *vroot) +{ + int ret = -1; + + switch (dev->source.subsys.type) { + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: + { + virUSBDevicePtr usb; + + if (dev->missing) + return 0; + + usb = virUSBDeviceNew(dev->source.subsys.u.usb.bus, + dev->source.subsys.u.usb.device, + vroot); + if (!usb) + goto done; + + ret = virUSBDeviceFileIterate(usb, virSecuritySmackSetUSBLabel, def); + virUSBDeviceFree(usb); + + break; + } + + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: + { + virPCIDevicePtr pci = + virPCIDeviceNew(dev->source.subsys.u.pci.addr.domain, + dev->source.subsys.u.pci.addr.bus, + dev->source.subsys.u.pci.addr.slot, + dev->source.subsys.u.pci.addr.function); + + if (!pci) + goto done; + + if (dev->source.subsys.u.pci.backend + == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) { + char *vfioGroupDev = virPCIDeviceGetIOMMUGroupDev(pci); + + if (!vfioGroupDev) { + virPCIDeviceFree(pci); + goto done; + } + ret = virSecuritySmackRestorePCILabel(pci, vfioGroupDev, def); + VIR_FREE(vfioGroupDev); + } else { + ret = virPCIDeviceFileIterate(pci, virSecuritySmackSetPCILabel, def); + } + virPCIDeviceFree(pci); + break; + } + + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: + { + virDomainHostdevSubsysSCSIHostPtr scsihostsrc = + &(dev->source.subsys.u.scsi.u.host); + virSCSIDevicePtr scsi = + virSCSIDeviceNew(NULL, + scsihostsrc->adapter, scsihostsrc->bus, + scsihostsrc->target, scsihostsrc->unit, + dev->readonly, dev->shareable); + + if (!scsi) + goto done; + + ret = virSCSIDeviceFileIterate(scsi, virSecuritySmackSetSCSILabel, def); + virSCSIDeviceFree(scsi); + + break; + } + + default: + ret = 0; + break; + } + +done: + return ret; +} + +static int +virSecuritySmackSetHostdevCapsLabel(virDomainDefPtr def, + virDomainHostdevDefPtr dev, + const char *vroot) +{ + int ret = -1; + virSecurityLabelDefPtr seclabel; + char *path; + + seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SMACK_NAME); + if (seclabel == NULL) + return -1; + + switch (dev->source.caps.type) { + case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_STORAGE: + { + if (vroot) { + if (virAsprintf(&path, "%s/%s", vroot, + dev->source.caps.u.storage.block) < 0) + return -1; + } else { + if (VIR_STRDUP(path, dev->source.caps.u.storage.block) < 0) + return -1; + } + ret = virSecuritySmackSetPathLabel(path, seclabel->imagelabel); + VIR_FREE(path); + break; + } + + case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_MISC: + { + if (vroot) { + if (virAsprintf(&path, "%s/%s", vroot, + dev->source.caps.u.misc.chardev) < 0) + return -1; + } else { + if (VIR_STRDUP(path, dev->source.caps.u.misc.chardev) < 0) + return -1; + } + ret = virSecuritySmackSetPathLabel(path, seclabel->imagelabel); + VIR_FREE(path); + break; + } + + default: + { + ret = 0; + break; + } + } + + return ret; + +} + +static int +virSecuritySmackSetHostdevLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, + virDomainDefPtr def, + virDomainHostdevDefPtr dev, + const char *vroot) +{ + virSecurityLabelDefPtr seclabel; + seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SMACK_NAME); + if (seclabel == NULL) + return -1; + + if (!seclabel->relabel) + return 0; + + switch (dev->mode) { + case VIR_DOMAIN_HOSTDEV_MODE_SUBSYS: + return virSecuritySmackSetHostdevSubsysLabel(def, dev, vroot); + + case VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES: + return virSecuritySmackSetHostdevCapsLabel(def, dev, vroot); + + default: + return 0; + + } +} + +static int +virSecuritySmackRestoreHostdevSubsysLabel(virSecurityManagerPtr mgr, + virDomainHostdevDefPtr dev, + const char *vroot) +{ + int ret = -1; + + switch (dev->source.subsys.type) { + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: + { + virUSBDevicePtr usb; + + if (dev->missing) + return 0; + + usb = virUSBDeviceNew(dev->source.subsys.u.usb.bus, + dev->source.subsys.u.usb.device, + vroot); + if (!usb) + goto done; + + ret = virUSBDeviceFileIterate(usb, virSecuritySmackRestoreUSBLabel, mgr); + virUSBDeviceFree(usb); + + break; + } + + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: + { + virPCIDevicePtr pci = + virPCIDeviceNew(dev->source.subsys.u.pci.addr.domain, + dev->source.subsys.u.pci.addr.bus, + dev->source.subsys.u.pci.addr.slot, + dev->source.subsys.u.pci.addr.function); + + if (!pci) + goto done; + + if (dev->source.subsys.u.pci.backend + == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) { + char *vfioGroupDev = virPCIDeviceGetIOMMUGroupDev(pci); + + if (!vfioGroupDev) { + virPCIDeviceFree(pci); + goto done; + } + ret = virSecuritySmackRestorePCILabel(pci, vfioGroupDev, mgr); + VIR_FREE(vfioGroupDev); + } else { + ret = virPCIDeviceFileIterate(pci, virSecuritySmackRestorePCILabel, mgr); + } + virPCIDeviceFree(pci); + break; + } + + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: + { + virDomainHostdevSubsysSCSIHostPtr scsihostsrc = + &(dev->source.subsys.u.scsi.u.host); + virSCSIDevicePtr scsi = + virSCSIDeviceNew(NULL, + scsihostsrc->adapter, scsihostsrc->bus, + scsihostsrc->target, scsihostsrc->unit, + dev->readonly, dev->shareable); + + if (!scsi) + goto done; + + ret = virSCSIDeviceFileIterate(scsi, virSecuritySmackRestoreSCSILabel, mgr); + virSCSIDeviceFree(scsi); + + break; + } + + default: + { + ret = 0; + break; + } + } + +done: + return ret; + +} + +static int +virSecuritySmackRestoreHostdevCapsLabel(virSecurityManagerPtr mgr, + virDomainHostdevDefPtr dev, + const char *vroot) +{ + int ret = -1; + char *path; + + switch (dev->source.caps.type) { + case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_STORAGE: + { + if (vroot) { + if (virAsprintf(&path, "%s/%s", vroot, + dev->source.caps.u.storage.block) < 0) + return -1; + } else { + if (VIR_STRDUP(path, dev->source.caps.u.storage.block) < 0) + return -1; + } + ret = virSecuritySmackRestoreFileLabel(mgr, path); + VIR_FREE(path); + break; + } + + case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_MISC: + { + if (vroot) { + if (virAsprintf(&path, "%s/%s", vroot, + dev->source.caps.u.misc.chardev) < 0) + return -1; + } else { + if (VIR_STRDUP(path, dev->source.caps.u.misc.chardev) < 0) + return -1; + } + ret = virSecuritySmackRestoreFileLabel(mgr, path); + VIR_FREE(path); + break; + } + + default: + ret = 0; + break; + } + + return ret; +} + +static int +virSecuritySmackRestoreHostdevLabel(virSecurityManagerPtr mgr, + virDomainDefPtr def, + virDomainHostdevDefPtr dev, + const char *vroot) +{ + virSecurityLabelDefPtr seclabel; + + seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SMACK_NAME); + if (seclabel == NULL) + return -1; + + if (!seclabel->relabel) + return 0; + + switch (dev->mode) { + case VIR_DOMAIN_HOSTDEV_MODE_SUBSYS: + return virSecuritySmackRestoreHostdevSubsysLabel(mgr, dev, vroot); + + case VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES: + return virSecuritySmackRestoreHostdevCapsLabel(mgr, dev, vroot); + + default: + return 0; + } +} + +/*Called on libvirtd startup to see if Smack is available*/ +static int +virSecuritySmackSecurityDriverProbe(const char *virtDriver) +{ + if (!smack_smackfs_path() || NULL == virtDriver) + return SECURITY_DRIVER_DISABLE; + + return SECURITY_DRIVER_ENABLE; + +} + +/*Security dirver initialization .*/ +static int +virSecuritySmackSecurityDriverOpen(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +{ + return 0; +} + +static int +virSecuritySmackSecurityDriverClose(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +{ + return 0; +} + +static const char * +virSecuritySmackSecurityDriverGetModel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +{ + return SECURITY_SMACK_NAME; +} + +static const char * +virSecuritySmackSecurityDriverGetDOI(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +{ + return SECURITY_SMACK_VOID_DOI; +} + +static int +virSecuritySmackSecurityVerify(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, + virDomainDefPtr def) +{ + virSecurityLabelDefPtr seclabel; + seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SMACK_NAME); + if (seclabel == NULL) + return -1; + + if (!STREQ(SECURITY_SMACK_NAME, seclabel->model)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("security label driver mismatch: " + "'%s' model configured for domain, but " + "hypervisor driver is '%s'."), + seclabel->model, SECURITY_SMACK_NAME); + return -1; + } + + if (seclabel->type == VIR_DOMAIN_SECLABEL_STATIC){ + if (smack_label_length(seclabel->label) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Invalid security label %s"), seclabel->label); + return -1; + } + } + + return 0; + +} + +static int +virSecuritySmackSetDiskLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, + virDomainDefPtr def, + virDomainDiskDefPtr disk) +{ + virSecurityLabelDefPtr seclabel; + seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SMACK_NAME); + + if (seclabel == NULL) + return -1; + + if (!seclabel->relabel) + return 0; + + if (disk->src->type == VIR_STORAGE_TYPE_NETWORK) + return 0; + + VIR_DEBUG("set disk image security label before"); + + if (setxattr(disk->src->path, "security.SMACK64", seclabel->imagelabel, + strlen(seclabel->imagelabel) + 1, 0) < 0) + return -1; + + VIR_DEBUG("disk image %s", disk->src->path); + VIR_DEBUG("set disk image security label after"); + + return 0; + +} + +static int +virSecuritySmackRestoreDiskLabel(virSecurityManagerPtr mgr, + virDomainDefPtr def, + virDomainDiskDefPtr disk) +{ + return virSecuritySmackRestoreImageLabelInt(mgr, def, disk->src, false); +} + +static int +virSecuritySmackSetImageLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, + virDomainDefPtr def, + virStorageSourcePtr src) +{ + virSecurityLabelDefPtr seclabel; + seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SMACK_NAME); + + if (seclabel == NULL) + return -1; + + if (!seclabel->relabel) + return 0; + + if (src->type == VIR_STORAGE_TYPE_NETWORK) + return 0; + + VIR_DEBUG("set disk image security label before"); + + if (setxattr(src->path, "security.SMACK64", seclabel->imagelabel, + strlen(seclabel->imagelabel) + 1, 0) < 0) + return -1; + + VIR_DEBUG("disk image %s", src->path); + VIR_DEBUG("set disk image security label after"); + + return 0; + +} + +static int +virSecuritySmackRestoreImageLabel(virSecurityManagerPtr mgr, + virDomainDefPtr def, + virStorageSourcePtr src) +{ + return virSecuritySmackRestoreImageLabelInt(mgr, def, src, false); + +} + +static int +virSecuritySmackSetDaemonSocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, + virDomainDefPtr vm) +{ + + return 0; + virSecurityLabelDefPtr seclabel; + char *label = NULL; + int ret = -1; + + seclabel = virDomainDefGetSecurityLabelDef(vm, SECURITY_SMACK_NAME); + if (seclabel == NULL) + return -1; + + if (seclabel->label == NULL) + return 0; + + if (!STREQ(SECURITY_SMACK_NAME, seclabel->model)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("security label driver mismatch: " + "'%s' model configured for domain, but " + "hypervisor driver is '%s'."), + seclabel->model, SECURITY_SMACK_NAME); + return -1; + } + + if (smack_new_label_from_self(&label) == -1){ + virReportSystemError(errno, + _("unable to get current process context '%s'"), seclabel->label); + goto done; + } + + VIR_DEBUG("SmackSetSecurityDaemonSocketLabel is in %d", getpid()); + VIR_DEBUG("label from self %s", label); + + + if (virSecuritySmackSockCreate(label, "sockincreate") == -1) { + virReportSystemError(errno, + _("unable to set socket smack label '%s'"), seclabel->label); + goto done; + } + + ret = 0; +done: + + free(label); + return ret; + +} + +static int +virSecuritySmackSetSocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, + virDomainDefPtr vm) +{ + + virSecurityLabelDefPtr seclabel; + + return 0; + seclabel = virDomainDefGetSecurityLabelDef(vm, SECURITY_SMACK_NAME); + if (seclabel == NULL) + return -1; + + if (seclabel->label == NULL) + return 0; + + if (!STREQ(SECURITY_SMACK_NAME, seclabel->model)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("security label driver mismatch: " + "'%s' model configured for domain, but " + "hypervisor driver is '%s'."), + seclabel->model, SECURITY_SMACK_NAME); + return -1; + } + + VIR_DEBUG("Setting VM %s socket label %s", vm->name, seclabel->label); + + if (virSecuritySmackSockCreate(seclabel->label, "sockoutcreate") == -1) { + virReportSystemError(errno, + _("unable to set socket smack label '%s'"), + seclabel->label); + return -1; + } + + + return 0; + +} + +static int +virSecuritySmackClearSocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, + virDomainDefPtr def) +{ + + virSecurityLabelDefPtr seclabel; + + return 0; + seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SMACK_NAME); + if (seclabel == NULL) + return -1; + + if (seclabel->label == NULL) + return 0; + + if (!STREQ(SECURITY_SMACK_NAME, seclabel->model)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("security label driver mismatch: " + "'%s' model configured for domain, but " + "hypervisor driver is '%s'."), + seclabel->model, SECURITY_SMACK_NAME); + return -1; + } + + VIR_DEBUG("clear sock label"); + + if (virSecuritySmackSockCreate(NULL, "sockincreate") == -1 || + virSecuritySmackSockCreate(NULL, "sockoutcreate") == -1) { + virReportSystemError(errno, + _("unable to clear socket smack label '%s'"), + seclabel->label); + + return -1; + } + + return 0; +} + +/* +*Current called in qemuStartVMDaemon to setup a 'label'. We make the +*label based on UUID. +*this is called on 'start'with RestoreSecurityLabel being called on +*shutdown + */ +static int +virSecuritySmackGenLabel(virSecurityManagerPtr mgr, + virDomainDefPtr def) +{ + int ret = -1; + char *label_name = NULL; + virSecurityLabelDefPtr seclabel; + + seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SMACK_NAME); + if (seclabel == NULL) + return ret; + + VIR_DEBUG("label=%s", virSecurityManagerGetDriver(mgr)); + if (seclabel->type == VIR_DOMAIN_SECLABEL_DYNAMIC && + seclabel->label) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("security label already defined for VM")); + return ret; + } + + if (seclabel->imagelabel) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("security image label already defined for VM")); + return ret; + } + + if (seclabel->model && + STRNEQ(seclabel->model, SECURITY_SMACK_NAME)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("security label model %s is not supported with smack"), + seclabel->model); + return ret; + } + + VIR_DEBUG("type=%d", seclabel->type); + + if ((label_name = virSecuritySmackGetLabelName(def)) == NULL) + return ret; + + if (seclabel->type == VIR_DOMAIN_SECLABEL_DYNAMIC){ + + /*set process label*/ + if (VIR_STRDUP(seclabel->label, label_name) < 0) + goto cleanup; + } + + /*set imagelabel the same as label*/ + if (VIR_STRDUP(seclabel->imagelabel, label_name) < 0) + goto cleanup; + + if (!seclabel->model && + VIR_STRDUP(seclabel->model, SECURITY_SMACK_NAME) < 0) + goto cleanup; + + ret = 0; + +cleanup: + + if (ret != 0){ + if (seclabel->type == VIR_DOMAIN_SECLABEL_DYNAMIC) + VIR_FREE(seclabel->label); + VIR_FREE(seclabel->imagelabel); + if (seclabel->type == VIR_DOMAIN_SECLABEL_DYNAMIC && + !seclabel->baselabel) + VIR_FREE(seclabel->model); + } + + VIR_FREE(label_name); + + VIR_DEBUG("model=%s label=%s imagelabel=%s", + NULLSTR(seclabel->model), + NULLSTR(seclabel->label), + NULLSTR(seclabel->imagelabel)); + + return ret; + +} + +static int +virSecuritySmackReserveLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, + virDomainDefPtr def ATTRIBUTE_UNUSED, + pid_t pid ATTRIBUTE_UNUSED) +{ + /*Security label is based UUID,*/ + return 0; +} + +/* +*Called on VM shutdown and destroy. +*/ +static int +virSecuritySmackReleaseLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, + virDomainDefPtr def) +{ + virSecurityLabelDefPtr seclabel; + + seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SMACK_NAME); + if (seclabel == NULL) + return -1; + + if (seclabel->type == VIR_DOMAIN_SECLABEL_DYNAMIC) { + VIR_FREE(seclabel->label); + VIR_FREE(seclabel->model); + } + VIR_FREE(seclabel->imagelabel); + + return 0; + +} + +/* Seen with 'virsh dominfo <vm>'. This function only called if the VM is +* running. +*/ +static int +virSecuritySmackGetProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, + virDomainDefPtr def ATTRIBUTE_UNUSED, + pid_t pid, + virSecurityLabelPtr sec) +{ + + char *label_name = NULL; + + if (virSecuritySmackGetPIDLabel(pid, &label_name) == -1){ + virReportSystemError(errno, + _("unable to get PID %d security label"), + pid); + return -1; + } + + if (strlen(label_name) >= VIR_SECURITY_LABEL_BUFLEN) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("security label exceeds " + "maximum length: %d"), + VIR_SECURITY_LABEL_BUFLEN - 1); + free(label_name); + return -1; + } + + strcpy(sec->label, label_name); + free(label_name); + /*Smack default enforced*/ + sec->enforcing = 1; + + return 0; +} + +static int +virSecuritySmackSetProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, + virDomainDefPtr def) +{ + virSecurityLabelDefPtr seclabel; + + seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SMACK_NAME); + + if (seclabel == NULL) + return -1; + + if (seclabel->label == NULL) + return 0; + + if (STRNEQ(SECURITY_SMACK_NAME, seclabel->model)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("security label driver mismatch: " + "\'%s\' model configured for domain, but " + "hypervisor driver is \'%s\'."), + seclabel->model, SECURITY_SMACK_NAME); + + return -1; + } + + if (smack_set_label_for_self(seclabel->label) < 0) { + virReportError(errno, + _("unable to set security label '%s'"), + seclabel->label); + + return -1; + } + + return 0; + +} + +static int +virSecuritySmackSetChildProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, + virDomainDefPtr def, + virCommandPtr cmd) +{ + virSecurityLabelDefPtr seclabel; + int rlbl; + char *smackfs_path = NULL; + + seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SMACK_NAME); + + if (seclabel == NULL) + return -1; + + if (seclabel->label == NULL) + return 0; + + if (STRNEQ(SECURITY_SMACK_NAME, seclabel->model)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("security label driver mismatch: " + "\'%s\' model configured for domain, but " + "hypervisor driver is \'%s\'."), + seclabel->model, SECURITY_SMACK_NAME); + + return -1; + } + + /* + * Send label to relabel-self interface to allow child to label + * its self once it finishes setting up. Apply only if interface is + * available and user namespace is enabled. + */ + + if (STREQ(virSecurityManagerGetDriver(mgr), "LXC")) { + + if(!def->idmap.nuidmap) + return 0; + + VIR_DEBUG("Applying label %s to relabel-self interface.",seclabel->label); + + if(virAsprintf(&smackfs_path,"%s/relabel-self",smack_smackfs_path()) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to obtain path for smackfs. Is smack enabled? ")); + return -1; + } + + rlbl = open(smackfs_path,O_WRONLY); + + if(rlbl < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not open relabel interface \'%s\' for writing. Is it " + "enabled in the kernel?"), + smackfs_path); + return -1; + } + + if(write(rlbl, seclabel->label, strlen(seclabel->label)) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not write to relabel interface \'%s\'."), + smackfs_path); + return -1; + } + + VIR_FORCE_CLOSE(rlbl); + } + + /* save in cmd to be set after fork/before child process is exec'ed */ + virCommandSetSmackLabel(cmd, seclabel->label); + VIR_DEBUG("save smack label in cmd %s", seclabel->label); + + return 0; + +} + +static int +virSecuritySmackSetAllLabel(virSecurityManagerPtr mgr, + virDomainDefPtr def, + const char *stdin_path) +{ + + size_t i; + virSecurityLabelDefPtr seclabel; + + seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SMACK_NAME); + + if (seclabel == NULL) + return -1; + + if (!seclabel->relabel) + return 0; + + VIR_DEBUG("set image security label before"); + + for (i = 0; i < def->ndisks; i++) { + if (def->disks[i]->src->type == VIR_STORAGE_TYPE_DIR) { + VIR_WARN("Unable to relabel directory tree %s for disk %s", + def->disks[i]->src->path, def->disks[i]->dst); + continue; + } + + VIR_DEBUG("set image security label"); + + if (virSecuritySmackSetImageLabel(mgr, + def, def->disks[i]->src) < 0) + return -1; + } + + VIR_DEBUG("set image security label after"); + + for (i = 0; i< def->nhostdevs; i++) { + if (virSecuritySmackSetHostdevLabel(mgr, + def, + def->hostdevs[i], + NULL) < 0) + return -1; + + } + + if (stdin_path) { + if (setxattr(stdin_path, "security.SMACK64", seclabel->imagelabel, + strlen(seclabel->imagelabel) + 1, 0)< 0 && + virFileIsSharedFS(stdin_path) != 1) + return -1; + } + + return 0; + +} + +static int +virSecuritySmackRestoreAllLabel(virSecurityManagerPtr mgr, + virDomainDefPtr def, + bool migrated ATTRIBUTE_UNUSED) +{ + size_t i; + virSecurityLabelDefPtr seclabel; + + VIR_DEBUG("Restoring security label on %s", def->name); + + seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SMACK_NAME); + + if (seclabel == NULL) + return -1; + + if (!seclabel->relabel) + return 0; + + for (i = 0; i < def->ndisks; i++) { + + if (virSecuritySmackRestoreImageLabelInt(mgr, + def, + def->disks[i]->src, + migrated) < 0) + + return -1; + + } + + return 0; + +} + + +static int +virSecuritySmackSetSavedStateLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, + virDomainDefPtr def, + const char *savefile) +{ + virSecurityLabelDefPtr seclabel; + + seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SMACK_NAME); + if (seclabel == NULL) + return -1; + + if (!seclabel->relabel) + return 0; + + return virSecuritySmackSetPathLabel(savefile, seclabel->imagelabel); +} + +static int +virSecuritySmackRestoreSavedStateLabel(virSecurityManagerPtr mgr, + virDomainDefPtr def, + const char *savefile) +{ + virSecurityLabelDefPtr seclabel; + + seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SMACK_NAME); + if (seclabel == NULL) + return -1; + + if (!seclabel->relabel) + return 0; + + return virSecuritySmackRestoreFileLabel(mgr, savefile); +} + +static int +virSecuritySmackSetImageFDLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, + virDomainDefPtr def, + int fd) +{ + virSecurityLabelDefPtr seclabel; + + seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SMACK_NAME); + + if (seclabel == NULL) + return -1; + + if (seclabel->imagelabel == NULL) + return 0; + + return virSecuritySmackSetFileLabel(fd, seclabel->imagelabel); + +} + +static int +virSecuritySmackSetImagePathLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, + virDomainDefPtr def, + const char *path) +{ + virSecurityLabelDefPtr seclabel; + + seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SMACK_NAME); + + if (seclabel == NULL) + return -1; + + if (seclabel->imagelabel == NULL) + return 0; + + if (virSecuritySmackSetPathLabel(path, seclabel->imagelabel) < 0) + return -1; + + return 0; +} + +static int +virSecuritySmackSetTapFDLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, + virDomainDefPtr def, + int fd) +{ + struct stat buf; + virSecurityLabelDefPtr seclabel; + + seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SMACK_NAME); + if (seclabel == NULL) + return -1; + + if (seclabel->label == NULL) + return 0; + + + if (fstat(fd, &buf) < 0) { + virReportSystemError(errno, _("cannot stat tap fd %d"), fd); + return -1; + } + + if ((buf.st_mode & S_IFMT) != S_IFCHR) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("tap fd %d is not character device"), fd); + return -1; + } + + return virSecuritySmackSetFileLabel(fd, seclabel->label); + +} + +static char * +virSecuritySmackGetSecurityMountOptions(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, + virDomainDefPtr def) +{ + char *opts = NULL; + virSecurityLabelDefPtr seclabel; + + if ((seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SMACK_NAME))) { + if (!seclabel->imagelabel) { + if (!seclabel->label) + seclabel->imagelabel = virSecuritySmackGetLabelName(def); + else + seclabel->imagelabel = seclabel->label; + } + if (seclabel->imagelabel && + virAsprintf(&opts, + ",smackfsdef=\"%s\"", + (const char*) seclabel->imagelabel) < 0) + return NULL; + } + + if (!opts && VIR_STRDUP(opts, "") < 0) + return NULL; + + return opts; + +} + +static const char * +virSecuritySmackGetBaseLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, + int virtType ATTRIBUTE_UNUSED) +{ + return NULL; +} + +virSecurityDriver virSecurityDriverSmack = { + .privateDataLen = 0, + .name = SECURITY_SMACK_NAME, + .probe = virSecuritySmackSecurityDriverProbe, + .open = virSecuritySmackSecurityDriverOpen, + .close = virSecuritySmackSecurityDriverClose, + + .getModel = virSecuritySmackSecurityDriverGetModel, + .getDOI = virSecuritySmackSecurityDriverGetDOI, + + .domainSecurityVerify = virSecuritySmackSecurityVerify, + + .domainSetSecurityDiskLabel = virSecuritySmackSetDiskLabel, + .domainRestoreSecurityDiskLabel = virSecuritySmackRestoreDiskLabel, + + .domainSetSecurityImageLabel = virSecuritySmackSetImageLabel, + .domainRestoreSecurityImageLabel = virSecuritySmackRestoreImageLabel, + + .domainSetSecurityDaemonSocketLabel = virSecuritySmackSetDaemonSocketLabel, + .domainSetSecuritySocketLabel = virSecuritySmackSetSocketLabel, + .domainClearSecuritySocketLabel = virSecuritySmackClearSocketLabel, + + .domainGenSecurityLabel = virSecuritySmackGenLabel, + .domainReserveSecurityLabel = virSecuritySmackReserveLabel, + .domainReleaseSecurityLabel = virSecuritySmackReleaseLabel, + + .domainGetSecurityProcessLabel = virSecuritySmackGetProcessLabel, + .domainSetSecurityProcessLabel = virSecuritySmackSetProcessLabel, + .domainSetSecurityChildProcessLabel = virSecuritySmackSetChildProcessLabel, + + .domainSetSecurityAllLabel = virSecuritySmackSetAllLabel, + .domainRestoreSecurityAllLabel = virSecuritySmackRestoreAllLabel, + + .domainSetSecurityHostdevLabel = virSecuritySmackSetHostdevLabel, + .domainRestoreSecurityHostdevLabel = virSecuritySmackRestoreHostdevLabel, + + .domainSetSavedStateLabel = virSecuritySmackSetSavedStateLabel, + .domainRestoreSavedStateLabel = virSecuritySmackRestoreSavedStateLabel, + + .domainSetSecurityImageFDLabel = virSecuritySmackSetImageFDLabel, + .domainSetSecurityImagePathLabel = virSecuritySmackSetImagePathLabel, + .domainSetSecurityTapFDLabel = virSecuritySmackSetTapFDLabel, + + .domainGetSecurityMountOptions = virSecuritySmackGetSecurityMountOptions, + + .getBaseLabel = virSecuritySmackGetBaseLabel, + +}; diff --git a/src/security/security_smack.h b/src/security/security_smack.h new file mode 100644 index 0000000..9a865cb --- /dev/null +++ b/src/security/security_smack.h @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2015 Cisco Systems, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Author: + * Hongliang Liang <hliang(a)bupt.edu,cn> + * Changyao Han <changyao(a)bupt.edu.cn> + * Raghuram S. Sudhaakar <rssudhaakar(a)gmail.com> + * Randy Aybar <raybar(a)cisco.com> + */ + +#ifndef __VIR_SECURITY_SMACK_H__ +# define __VIR_SECURITY_SMACK_H__ + +# include "security_driver.h" + +int virSecuritySmackSockCreate(const char *label, const char *attr); + + +extern virSecurityDriver virSecurityDriverSmack; + +# define SMACK_PREFIX "smack-" + +#endif /* __VIR_SECURITY_SMACK_H__ */ diff --git a/src/security/security_stack.c b/src/security/security_stack.c index 00d1fa7..38551ca 100644 --- a/src/security/security_stack.c +++ b/src/security/security_stack.c @@ -495,6 +495,14 @@ virSecurityStackSetImageFDLabel(virSecurityManagerPtr mgr, } static int +virSecurityStackSetImagePathLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, + virDomainDefPtr vm ATTRIBUTE_UNUSED, + const char *path ATTRIBUTE_UNUSED) +{ + return 0; +} + +static int virSecurityStackSetTapFDLabel(virSecurityManagerPtr mgr, virDomainDefPtr vm, int fd) @@ -659,6 +667,7 @@ virSecurityDriver virSecurityDriverStack = { .domainRestoreSavedStateLabel = virSecurityStackRestoreSavedStateLabel, .domainSetSecurityImageFDLabel = virSecurityStackSetImageFDLabel, + .domainSetSecurityImagePathLabel = virSecurityStackSetImagePathLabel, .domainSetSecurityTapFDLabel = virSecurityStackSetTapFDLabel, .domainGetSecurityMountOptions = virSecurityStackGetMountOptions, diff --git a/src/util/vircommand.c b/src/util/vircommand.c index fe7bf34..7094e89 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -41,6 +41,9 @@ #if defined(WITH_SECDRIVER_APPARMOR) # include <sys/apparmor.h> #endif +#if defined(WITH_SECDRIVER_SMACK) +# include <sys/smack.h> +#endif #define __VIR_COMMAND_PRIV_H_ALLOW__ #include "vircommandpriv.h" @@ -134,6 +137,10 @@ struct _virCommand { #if defined(WITH_SECDRIVER_APPARMOR) char *appArmorProfile; #endif +#if defined(WITH_SECDRIVER_SMACK) + char *smackLabel; +#endif + int mask; }; @@ -722,6 +729,30 @@ virExec(virCommandPtr cmd) } # endif +# if defined(WITH_SECDRIVER_SMACK) + if (cmd->smackLabel) { + VIR_DEBUG("Setting child security label to %s", cmd->smackLabel); + + if (smack_set_label_for_self(cmd->smackLabel) < 0) { + virReportSystemError(errno, + _("unable to set Smack label '%s' " + "for '%s'"), + cmd->smackLabel, cmd->args[0]); + goto fork_error; + } + } +# endif + +/* + * if (smack_new_label_from_self(&label) == -1) + * { + * goto fork_error; + * } + * VIR_DEBUG("smack label is %s",label); + * free(label); + * + * + */ /* The steps above may need to do something privileged, so we delay * setuid and clearing capabilities until the last minute. */ @@ -1197,6 +1228,35 @@ virCommandSetAppArmorProfile(virCommandPtr cmd, } + +/** + * virCommandSetSmackLabel: + * @cmd: the command to modify + * @label: the Smack label to use for the child process + * + * Saves a copy of @label to use when setting the Smack context + * label (write to /proc/self/attr/current ) after the child process has + * been started. If Smack isn't compiled into libvirt, or if label is + * NULL, nothing will be done. + */ +void +virCommandSetSmackLabel(virCommandPtr cmd, + const char *label ATTRIBUTE_UNUSED) + +{ + if(!cmd || cmd->has_error) + return; + +#if defined(WITH_SECDRIVER_SMACK) + VIR_FREE(cmd->smackLabel); + if (VIR_STRDUP_QUIET(cmd->smackLabel, label) < 0) + cmd->has_error = ENOMEM; +#endif + return; + +} + + /** * virCommandDaemonize: * @cmd: the command to modify @@ -2796,6 +2856,9 @@ virCommandFree(virCommandPtr cmd) #if defined(WITH_SECDRIVER_APPARMOR) VIR_FREE(cmd->appArmorProfile); #endif +#if defined(WITH_SECDRIVER_SMACK) + VIR_FREE(cmd->smackLabel); +#endif VIR_FREE(cmd); } diff --git a/src/util/vircommand.h b/src/util/vircommand.h index 198da2f..dfc8a65 100644 --- a/src/util/vircommand.h +++ b/src/util/vircommand.h @@ -88,6 +88,9 @@ void virCommandSetSELinuxLabel(virCommandPtr cmd, void virCommandSetAppArmorProfile(virCommandPtr cmd, const char *profile); +void virCommandSetSmackLabel(virCommandPtr cmd, + const char *label); + void virCommandDaemonize(virCommandPtr cmd); void virCommandNonblockingFDs(virCommandPtr cmd);

4 5

[libvirt] Creating external snapshots with logical volumes.
by Dominique Ramaekers 29 Jun '16

29 Jun '16

Hi, I've already asked this question on the libvirt-users mailing list but got no answer. I think because the answer to my question is not obvious. I hope I get some help here... Currently, for making backups of my guests, I use external snapshots like this: A) virsh snapshot-create-as --domain PCVIRTdra --disk-only --atomic --quiesce --no-metadata --diskspec vda,file=/srv/poolVMS/PCVIRTdra-ONDERHOUD If I wanted to use a logical volume as destination behind the '--diskspec' option, can I do this like this? B) virsh snapshot-create-as --domain PCVIRTdra --disk-only --atomic --quiesce --no-metadata --diskspec vda,file=/dev/CmsrvVH3-vg/PCVIRTdra-ONDERHOUD I got the hit from libvirt itself. If I create a snapshot with command A and the diskspec file already exists, libvirt gives me an error like: " external snapshot file for disk vda already exists and is not a block device: /srv/poolVMS/PCVIRTdra-ONDERHOUD" So the 'and is not a block device' gave me the idea to use a logical volume instead of a file It seems to work, but if this is never intended to be used like this, I would rather not... I ask this question because it seems libvirt is actually recognizing the logical volume as a file if I use command B: root@CmsrvVH3:~# virsh domblklist PCVIRTdra --details Type Device Target Source ------------------------------------------------ file disk vda /dev/CmsrvVH3-vg/PCVIRTdra-ONDERHOUD file cdrom hdb /srv/poolVMS/Windows10_x64.iso file cdrom hdc /srv/poolVMS/virtiodrivers.iso Is this intentional? Is there a better way of doing this? Thanks in advance, Dominique.

1 0

[libvirt] [PATCH] virt-admin: Call virInitialize to fix startup crash
by Cole Robinson 29 Jun '16

29 Jun '16

Similar to what virsh and virt-login-shell do https://bugzilla.redhat.com/show_bug.cgi?id=1350315 --- I can't actually reproduce the bug, the backtrace is similar to 97973ebb7 which added the same fix for virt-login-shell, and that commit also mentions the randomness of reproducing... tools/virt-admin.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/virt-admin.c b/tools/virt-admin.c index 4acac65..7bff5c3 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -1371,6 +1371,11 @@ main(int argc, char **argv) return EXIT_FAILURE; } + if (virInitialize() < 0) { + vshError(ctl, "%s", _("Failed to initialize libvirt")); + return EXIT_FAILURE; + } + virFileActivateDirOverride(argv[0]); if (!vshInit(ctl, cmdGroups, NULL)) -- 2.7.4

4 10

[libvirt] [PATCH] qemu: Let empty default VNC password work as documented
by Jiri Denemark 29 Jun '16

29 Jun '16

Setting an empty vnc_password in qemu.conf is documented as a way to disable VNC access, but QEMU does not seem to behave like that. Let's enforce the behavior by setting password expiration to "now". Note, this has no effect on setting an empty //graphics@passwd in domain XML. Users may use //graphics@passwdValidTo to enforce the same behavior. https://bugzilla.redhat.com/show_bug.cgi?id=1180092 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_hotplug.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index e0b8230..91f48dc 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3970,6 +3970,8 @@ qemuDomainChangeGraphicsPasswords(virQEMUDriverPtr driver, snprintf(expire_time, sizeof(expire_time), "now"); else snprintf(expire_time, sizeof(expire_time), "%lu", (long unsigned)auth->validTo); + } else if (!auth->passwd && defaultPasswd && defaultPasswd[0] == '\0') { + snprintf(expire_time, sizeof(expire_time), "now"); } else { snprintf(expire_time, sizeof(expire_time), "never"); } -- 2.9.0

3 6

[libvirt] [PATCH] qemu: Use proper async job to refresh virtio channels
by Jiri Denemark 29 Jun '16

29 Jun '16

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_migration.c | 3 ++- src/qemu/qemu_process.c | 9 ++++++--- src/qemu/qemu_process.h | 3 ++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 83e1bfc..0b1770b 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -6225,7 +6225,8 @@ qemuMigrationFinish(virQEMUDriverPtr driver, if (qemuMigrationStopNBDServer(driver, vm, mig) < 0) goto endjob; - if (qemuRefreshVirtioChannelState(driver, vm) < 0) + if (qemuRefreshVirtioChannelState(driver, vm, + QEMU_ASYNC_JOB_MIGRATION_IN) < 0) goto endjob; if ((rc = qemuConnectAgent(driver, vm)) < 0) { diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 63da600..c8ff587 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1974,13 +1974,16 @@ qemuProcessRefreshChannelVirtioState(virQEMUDriverPtr driver, int qemuRefreshVirtioChannelState(virQEMUDriverPtr driver, - virDomainObjPtr vm) + virDomainObjPtr vm, + qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivatePtr priv = vm->privateData; virHashTablePtr info = NULL; int ret = -1; - qemuDomainObjEnterMonitor(driver, vm); + if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) + goto cleanup; + ret = qemuMonitorGetChardevInfo(priv->mon, &info); if (qemuDomainObjExitMonitor(driver, vm) < 0) ret = -1; @@ -3312,7 +3315,7 @@ qemuProcessReconnect(void *opaque) if (qemuProcessRefreshDisks(driver, obj, QEMU_ASYNC_JOB_NONE) < 0) goto error; - if (qemuRefreshVirtioChannelState(driver, obj) < 0) + if (qemuRefreshVirtioChannelState(driver, obj, QEMU_ASYNC_JOB_NONE) < 0) goto error; /* If querying of guest's RTC failed, report error, but do not kill the domain. */ diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index 37081ad..21f3b0c 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -180,7 +180,8 @@ int qemuProcessSetupIOThread(virDomainObjPtr vm, virDomainIOThreadIDDefPtr iothread); int qemuRefreshVirtioChannelState(virQEMUDriverPtr driver, - virDomainObjPtr vm); + virDomainObjPtr vm, + qemuDomainAsyncJob asyncJob); int qemuProcessRefreshBalloonState(virQEMUDriverPtr driver, virDomainObjPtr vm, -- 2.9.0

2 1

[libvirt] [PATCH rfc 0/2] devices: filesystem: type volume
by Olga Krishtal 29 Jun '16

29 Jun '16

In-Reply-To: Patches introduce the new type of filesystem device. The first patch adds the possibility to use storage pool volumes as a backend for filesystem, that is accesed from the guest. Such possibility allows to use volumes for container as a source of root directory. Usage: <devices> <filesystem type='volume'> <source pool='pool_name' volume='volume_name'/> ... <filesystem/> The second patch adds the support of filesystem type volume to virtuozzo containers. There is special type of volume for virtuozzo containers, that can be manipulated via storage api. Now, the volume of this type can be added to ct.xml description as filesystem source. However, there is a small issue with the pool/volume to path translation. Usuallyi, in storage pools, virStorageTranslateDiskSourcePool is used, but in the case of filesystem we do not have virDomainDiskDefPtr and and code deduplication in every driver,that uses this possibility, is unavoidable. eg. virStorageTranslatePoolLocal. Now I am looking for the way to avoid it somehow.

4 8

[libvirt] [PATCH] util: swap After/Before clauses in virSystemdCreateMachine
by Quentin Machu 29 Jun '16

29 Jun '16

An unexpected behavior in systemd has been introduced between the versions 225 and 229: when non-existing units are specified in After/Before clauses, systemd fails if the After clause is listed first. What is expected is that systemd simply ignores these clauses. Because the After clause is specified before the Before clause in virSystemdCreateMachine and because libvirt does not tolerate missing the systemd-machined registration, it leads to fatal boot failures, whereas instances could start properly without these units - only the shutdown workflow could be affected. This fixes the following error in some particular cases: `libvirtError: Cannot set property Before, or unknown property.`. If accepted, this bug fix should be backported. https://bugzilla.redhat.com/show_bug.cgi?id=1350909 --- src/util/virsystemd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 871db7e..3a146f8 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -365,8 +365,8 @@ int virSystemdCreateMachine(const char *name, nnicindexes, nicindexes, 3, "Slice", "s", slicename, - "After", "as", 1, "libvirtd.service", - "Before", "as", 1, "libvirt-guests.service") < 0) + "Before", "as", 1, "libvirt-guests.service", + "After", "as", 1, "libvirtd.service") < 0) goto cleanup; if (error.level == VIR_ERR_ERROR) { @@ -406,8 +406,8 @@ int virSystemdCreateMachine(const char *name, rootdir ? rootdir : "", 3, "Slice", "s", slicename, - "After", "as", 1, "libvirtd.service", - "Before", "as", 1, "libvirt-guests.service") < 0) + "Before", "as", 1, "libvirt-guests.service", + "After", "as", 1, "libvirtd.service") < 0) goto cleanup; } -- 1.8.3.1

2 1

[libvirt] [PATCH] Fix possible invalid read in adminClientGetInfo
by Ján Tomko 29 Jun '16

29 Jun '16

virNetServerClientGetInfo returns the client's remote address as a string, which is a part of the client object. Use VIR_STRDUP to make a copy which can be freely accessed even after the virNetServerClient object is unlocked. --- daemon/admin_server.c | 3 ++- src/rpc/virnetserverclient.c | 8 ++++++-- src/rpc/virnetserverclient.h | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/daemon/admin_server.c b/daemon/admin_server.c index cb9079c..9f24f68 100644 --- a/daemon/admin_server.c +++ b/daemon/admin_server.c @@ -221,7 +221,7 @@ adminClientGetInfo(virNetServerClientPtr client, int ret = -1; int maxparams = 0; bool readonly; - const char *sock_addr = NULL; + char *sock_addr = NULL; const char *attr = NULL; virTypedParameterPtr tmpparams = NULL; virIdentityPtr identity = NULL; @@ -300,6 +300,7 @@ adminClientGetInfo(virNetServerClientPtr client, cleanup: virObjectUnref(identity); + VIR_FREE(sock_addr); return ret; } diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index 39fe860..81da82c 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -1606,20 +1606,24 @@ virNetServerClientGetTransport(virNetServerClientPtr client) int virNetServerClientGetInfo(virNetServerClientPtr client, - bool *readonly, const char **sock_addr, + bool *readonly, char **sock_addr, virIdentityPtr *identity) { int ret = -1; + const char *addr; virObjectLock(client); *readonly = client->readonly; - if (!(*sock_addr = virNetServerClientRemoteAddrStringURI(client))) { + if (!(addr = virNetServerClientRemoteAddrStringURI(client))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("No network socket associated with client")); goto cleanup; } + if (VIR_STRDUP(*sock_addr, addr) < 0) + goto cleanup; + if (!client->identity) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("No identity information available for client")); diff --git a/src/rpc/virnetserverclient.h b/src/rpc/virnetserverclient.h index c243a68..a53cc00 100644 --- a/src/rpc/virnetserverclient.h +++ b/src/rpc/virnetserverclient.h @@ -149,7 +149,7 @@ bool virNetServerClientNeedAuth(virNetServerClientPtr client); int virNetServerClientGetTransport(virNetServerClientPtr client); int virNetServerClientGetInfo(virNetServerClientPtr client, - bool *readonly, const char **sock_addr, + bool *readonly, char **sock_addr, virIdentityPtr *identity); #endif /* __VIR_NET_SERVER_CLIENT_H__ */ -- 2.7.3

2 1

[libvirt] [PATCH 0/2] qemu: Use bootindex whenever possible
by Jiri Denemark 29 Jun '16

29 Jun '16

Jiri Denemark (2): qemu: Use bootindex whenever possible qemu: Drop emitBootindex parameter src/qemu/qemu_command.c | 89 ++++++++++------------ .../qemuxml2argv-boot-menu-enable-bootindex.args | 23 ++++++ .../qemuxml2argv-boot-menu-enable-bootindex.xml | 28 +++++++ tests/qemuxml2argvtest.c | 2 +- 4 files changed, 91 insertions(+), 51 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-bootindex.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-bootindex.xml -- 2.9.0

2 6

[libvirt] [PATCH] conf: Allocate structure for 'perf' events in virDomainDefNew
by Peter Krempa 29 Jun '16

29 Jun '16

Some code paths already assume that it is allocated since it was always allocated by virDomainPerfDefParseXML. Move allocation to virDomainDefNew to handle cases that don't go through the XML parser. This fixes crash when attempting to connect to an existing process via virDomainQemuAttach. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1350688 --- src/conf/domain_conf.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ef266af..fb622cd 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2746,6 +2746,9 @@ virDomainDefNew(void) if (!(ret->numa = virDomainNumaNew())) goto error; + if (VIR_ALLOC(ret->perf) < 0) + goto error; + ret->mem.hard_limit = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED; ret->mem.soft_limit = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED; ret->mem.swap_hard_limit = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED; @@ -13136,9 +13139,6 @@ virDomainPerfDefParseXML(virDomainDefPtr def, if ((n = virXPathNodeSet("./perf/event", ctxt, &nodes)) < 0) return n; - if (VIR_ALLOC(def->perf) < 0) - goto cleanup; - for (i = 0; i < n; i++) { if (virDomainPerfEventDefParseXML(def->perf, nodes[i]) < 0) goto cleanup; @@ -13147,8 +13147,6 @@ virDomainPerfDefParseXML(virDomainDefPtr def, ret = 0; cleanup: - if (ret < 0) - VIR_FREE(def->perf); VIR_FREE(nodes); return ret; } @@ -23388,8 +23386,7 @@ virDomainDefFormatInternal(virDomainDefPtr def, virBufferAddLit(buf, "</pm>\n"); } - if (def->perf) - virDomainPerfDefFormat(buf, def->perf); + virDomainPerfDefFormat(buf, def->perf); virBufferAddLit(buf, "<devices>\n"); virBufferAdjustIndent(buf, 2); -- 2.9.0

2 2

[libvirt] [PATCH 0/6] events: don't mandate a uuid
by Cole Robinson 28 Jun '16

28 Jun '16

The generic event infrastructure has the notion of lookup-by-uuid baked into the API, but not all objects have a uuid (nodedev, interfaces). This series enables callers to specify a string key for match purposes. Existing users of the binary uuid value now pass in a converted uuid string. Cole Robinson (6): events: Privatize virObjectEventCallback events: Add virObjectEventCallbackFree events: Cleanup callback variable name events: Pass in UUID as a string events: Add explicit lookup 'key' value events: Rename argument uuid->key src/conf/domain_event.c | 28 +++++-- src/conf/network_event.c | 16 +++- src/conf/object_event.c | 170 +++++++++++++++++++++------------------- src/conf/object_event.h | 3 - src/conf/object_event_private.h | 8 +- src/conf/storage_event.c | 16 +++- 6 files changed, 145 insertions(+), 96 deletions(-) -- 2.7.4

2 9

[libvirt] [PATCH 0/3] qemu: add support for intel-iommu
by Ján Tomko 28 Jun '16

28 Jun '16

https://bugzilla.redhat.com/show_bug.cgi?id=1235581 Note that while support for -device intel-iommu has been merged in QEMU for a while, that option is currently broken. A fix is on the way: https://lists.gnu.org/archive/html/qemu-devel/2016-06/msg03548.html Ján Tomko (3): Introduce <iommu> device Add QEMU_CAPS_DEVICE_INTEL_IOMMU qemu: format intel-iommu on the command line docs/schemas/domaincommon.rng | 11 +++++++ src/conf/domain_conf.c | 37 ++++++++++++++++++++++ src/conf/domain_conf.h | 14 ++++++++ src/libvirt_private.syms | 2 ++ src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 30 ++++++++++++++++++ tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-intel-iommu.args | 22 +++++++++++++ .../qemuxml2argvdata/qemuxml2argv-intel-iommu.xml | 37 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ .../qemuxml2xmlout-intel-iommu.xml | 37 ++++++++++++++++++++++ tests/qemuxml2xmltest.c | 4 +++ 15 files changed, 202 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-intel-iommu.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-intel-iommu.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu.xml -- 2.7.3

2 6

[libvirt] [PATCH v2 1/1] perf: add more perf events support
by Qiaowei Ren 28 Jun '16

28 Jun '16

With current perf framework, this patch adds support to more perf events, including cache missing, cache peference, cpu cycles, instrction, etc.. Signed-off-by: Qiaowei Ren <qiaowei.ren(a)intel.com> --- docs/formatdomain.html.in | 24 +++++++++++++++ docs/schemas/domaincommon.rng | 4 +++ include/libvirt/libvirt-domain.h | 39 ++++++++++++++++++++++++ src/libvirt-domain.c | 8 +++++ src/qemu/qemu_driver.c | 23 +++++++------- src/util/virperf.c | 65 +++++++++++++++++++++++++++++++++++++++- src/util/virperf.h | 4 +++ 7 files changed, 154 insertions(+), 13 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 7d34363..a4064ae 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1839,6 +1839,10 @@ <event name='cmt' enabled='yes'/> <event name='mbmt' enabled='no'/> <event name='mbml' enabled='yes'/> + <event name='cache_misses' enabled='no'/> + <event name='cache_peferences' enabled='no'/> + <event name='instructions' enabled='no'/> + <event name='cpu_cycles' enabled='no'/> </perf> ... </pre> @@ -1864,6 +1868,26 @@ <td>bandwidth of memory traffic for a memory controller</td> <td><code>perf.mbml</code></td> </tr> + <tr> + <td><code>cache_misses</code></td> + <td>the amount of cache missing by applications running on the platform</td> + <td><code>perf.cache_misses</code></td> + </tr> + <tr> + <td><code>cache_peferences</code></td> + <td>the amount of cache hit by applications running on the platform</td> + <td><code>perf.cache_peferences</code></td> + </tr> + <tr> + <td><code>instructions</code></td> + <td>the amount of instructions by applications running on the platform</td> + <td><code>perf.instructions</code></td> + </tr> + <tr> + <td><code>cpu_cycles</code></td> + <td>the amount of cycles one instruction needs</td> + <td><code>perf.cpu_cycles</code></td> + </tr> </table> <h3><a name="elementsDevices">Devices</a></h3> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 162c2e0..01db999 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -414,6 +414,10 @@ <value>cmt</value> <value>mbmt</value> <value>mbml</value> + <value>cache_misses</value> + <value>cache_peferences</value> + <value>instructions</value> + <value>cpu_cycles</value> </choice> </attribute> <attribute name="enabled"> diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index cba4fa5..99c4c48 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -1928,6 +1928,45 @@ void virDomainStatsRecordListFree(virDomainStatsRecordPtr *stats); */ # define VIR_PERF_PARAM_MBML "mbml" +/** + * VIR_PERF_PARAM_CACHE_MISSES: + * + * Macro for typed parameter name that represents cache_misses perf + * event which can be used to measure the amount of cache missing by + * applications running on the platform. It corresponds to the + * "perf.cache_misses" field in the *Stats APIs. + */ +# define VIR_PERF_PARAM_CACHE_MISSES "cache_misses" + +/** + * VIR_PERF_PARAM_CACHE_REFERENCES: + * + * Macro for typed parameter name that represents cache_peferences + * perf event which can be used to measure the amount of cache hit + * by applications running on the platform. It corresponds to the + * "perf.cache_peferences" field in the *Stats APIs. + */ +# define VIR_PERF_PARAM_CACHE_REFERENCES "cache_peferences" + +/** + * VIR_PERF_PARAM_INSTRUCTIONS: + * + * Macro for typed parameter name that represents instructions perf + * event which can be used to measure the amount of instructions + * by applications running on the platform. It corresponds to the + * "perf.instructions" field in the *Stats APIs. + */ +# define VIR_PERF_PARAM_INSTRUCTIONS "instructions" + +/** + * VIR_PERF_PARAM_CPU_CYCLES: + * + * Macro for typed parameter name that represents cpu_cycles perf event + * which can be used to measure how many cycles one instruction needs. + * It corresponds to the "perf.cpu_cycles" field in the *Stats APIs. + */ +# define VIR_PERF_PARAM_CPU_CYCLES "cpu_cycles" + int virDomainGetPerfEvents(virDomainPtr dom, virTypedParameterPtr *params, int *nparams, diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 73ae369..ef71b31 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -11452,6 +11452,14 @@ virConnectGetDomainCapabilities(virConnectPtr conn, * "perf.mbml" - the amount of data (bytes/s) sent through the memory controller * on the socket as unsigned long long. It is produced by mbml * perf event. + * "perf.cache_misses" - the amount of cache missing as unsigned long long. + * It is produced by cache_misses perf event. + * "perf.cache_peferences" - the amount of cache hit as unsigned long long. + * It is produced by cache_peferences perf event. + * "perf.instructions" - the amount of instructions as unsigned long long. + * It is produced by instructions perf event. + * "perf.cpu_cycles" - the amount of cycles one instruction needs as unsigned + * long long. It is produced by cpu_cycles perf event. * * Note that entire stats groups or individual stat fields may be missing from * the output in case they are not supported by the given hypervisor, are not diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d065e45..6210771 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9748,6 +9748,10 @@ qemuDomainSetPerfEvents(virDomainPtr dom, VIR_PERF_PARAM_CMT, VIR_TYPED_PARAM_BOOLEAN, VIR_PERF_PARAM_MBMT, VIR_TYPED_PARAM_BOOLEAN, VIR_PERF_PARAM_MBML, VIR_TYPED_PARAM_BOOLEAN, + VIR_PERF_PARAM_CACHE_MISSES, VIR_TYPED_PARAM_BOOLEAN, + VIR_PERF_PARAM_CACHE_REFERENCES, VIR_TYPED_PARAM_BOOLEAN, + VIR_PERF_PARAM_INSTRUCTIONS, VIR_TYPED_PARAM_BOOLEAN, + VIR_PERF_PARAM_CPU_CYCLES, VIR_TYPED_PARAM_BOOLEAN, NULL) < 0) return -1; @@ -19068,10 +19072,10 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr driver, #undef QEMU_ADD_COUNT_PARAM static int -qemuDomainGetStatsPerfRdt(virPerfPtr perf, - virPerfEventType type, - virDomainStatsRecordPtr record, - int *maxparams) +qemuDomainGetStatsPerfOneEvent(virPerfPtr perf, + virPerfEventType type, + virDomainStatsRecordPtr record, + int *maxparams) { char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; uint64_t value = 0; @@ -19107,14 +19111,9 @@ qemuDomainGetStatsPerf(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, if (!virPerfEventIsEnabled(priv->perf, i)) continue; - switch (i) { - case VIR_PERF_EVENT_CMT: - case VIR_PERF_EVENT_MBMT: - case VIR_PERF_EVENT_MBML: - if (qemuDomainGetStatsPerfRdt(priv->perf, i, record, maxparams) < 0) - goto cleanup; - break; - } + if (qemuDomainGetStatsPerfOneEvent(priv->perf, i, + record, maxparams) < 0) + goto cleanup; } ret = 0; diff --git a/src/util/virperf.c b/src/util/virperf.c index 4661ba3..a3d2bc6 100644 --- a/src/util/virperf.c +++ b/src/util/virperf.c @@ -38,7 +38,9 @@ VIR_LOG_INIT("util.perf"); #define VIR_FROM_THIS VIR_FROM_PERF VIR_ENUM_IMPL(virPerfEvent, VIR_PERF_EVENT_LAST, - "cmt", "mbmt", "mbml"); + "cmt", "mbmt", "mbml", + "cache_misses", "cache_peferences", + "instructions", "cpu_cycles"); struct virPerfEvent { int type; @@ -189,6 +191,60 @@ virPerfRdtEnable(virPerfEventPtr event, return -1; } +static int +virPerfGeneralEnable(virPerfEventPtr event, + pid_t pid) +{ + struct perf_event_attr attr; + + memset(&attr, 0, sizeof(attr)); + attr.size = sizeof(attr); + attr.inherit = 1; + attr.disabled = 1; + attr.enable_on_exec = 0; + + switch (event->type) { + case VIR_PERF_EVENT_CACHE_MISSES: + attr.type = PERF_TYPE_HARDWARE; + attr.config = PERF_COUNT_HW_CACHE_MISSES; + break; + case VIR_PERF_EVENT_CACHE_REFERENCES: + attr.type = PERF_TYPE_HARDWARE; + attr.config = PERF_COUNT_HW_CACHE_REFERENCES; + break; + case VIR_PERF_EVENT_INSTRUCTIONS: + attr.type = PERF_TYPE_HARDWARE; + attr.config = PERF_COUNT_HW_INSTRUCTIONS; + break; + case VIR_PERF_EVENT_CPU_CYCLES: + attr.type = PERF_TYPE_HARDWARE; + attr.config = PERF_COUNT_HW_CPU_CYCLES; + break; + } + + event->fd = syscall(__NR_perf_event_open, &attr, pid, -1, -1, 0); + if (event->fd < 0) { + virReportSystemError(errno, + _("Unable to open perf event for %s"), + virPerfEventTypeToString(event->type)); + goto error; + } + + if (ioctl(event->fd, PERF_EVENT_IOC_ENABLE) < 0) { + virReportSystemError(errno, + _("Unable to enable perf event for %s"), + virPerfEventTypeToString(event->type)); + goto error; + } + + event->enabled = true; + return 0; + + error: + VIR_FORCE_CLOSE(event->fd); + return -1; +} + int virPerfEventEnable(virPerfPtr perf, virPerfEventType type, @@ -205,6 +261,13 @@ virPerfEventEnable(virPerfPtr perf, if (virPerfRdtEnable(event, pid) < 0) return -1; break; + case VIR_PERF_EVENT_CACHE_MISSES: + case VIR_PERF_EVENT_CACHE_REFERENCES: + case VIR_PERF_EVENT_INSTRUCTIONS: + case VIR_PERF_EVENT_CPU_CYCLES: + if (virPerfGeneralEnable(event, pid) < 0) + return -1; + break; case VIR_PERF_EVENT_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("Unexpected perf event type=%d"), type); diff --git a/src/util/virperf.h b/src/util/virperf.h index 7163410..7129370 100644 --- a/src/util/virperf.h +++ b/src/util/virperf.h @@ -28,6 +28,10 @@ typedef enum { VIR_PERF_EVENT_CMT, VIR_PERF_EVENT_MBMT, VIR_PERF_EVENT_MBML, + VIR_PERF_EVENT_CACHE_MISSES, + VIR_PERF_EVENT_CACHE_REFERENCES, + VIR_PERF_EVENT_INSTRUCTIONS, + VIR_PERF_EVENT_CPU_CYCLES, VIR_PERF_EVENT_LAST } virPerfEventType; -- 1.9.1

3 2

[libvirt] [PATCH] virStorageTranslateDiskSourcePool: Avoid double free
by Michal Privoznik 28 Jun '16

28 Jun '16

https://bugzilla.redhat.com/show_bug.cgi?id=1316370 Consider the following disk for a domain: <disk type='volume' device='cdrom'> <driver name='qemu' type='raw'/> <auth username='libvirt'> <secret type='iscsi' usage='libvirtiscsi'/> </auth> <source pool='iscsi-secret-pool' volume='unit:0:0:0' mode='direct' startupPolicy='optional'/> <target dev='sda' bus='scsi'/> <readonly/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> Now, startupPolicy is currently not allowed for iscsi disks, so one would expect an error message to be thrown. But what a surprise is waiting for users if they try to start up such domain: ==15724== Invalid free() / delete / delete[] / realloc() ==15724== at 0x4C2B1F0: free (vg_replace_malloc.c:473) ==15724== by 0x54B7A69: virFree (viralloc.c:582) ==15724== by 0x552DC90: virStorageAuthDefFree (virstoragefile.c:1549) ==15724== by 0x552F023: virStorageSourceClear (virstoragefile.c:2055) ==15724== by 0x552F054: virStorageSourceFree (virstoragefile.c:2067) ==15724== by 0x55556AA: virDomainDiskDefFree (domain_conf.c:1562) ==15724== by 0x5557ABE: virDomainDefFree (domain_conf.c:2547) ==15724== by 0x1B43CC42: qemuProcessStop (qemu_process.c:5918) ==15724== by 0x1B43BA2E: qemuProcessStart (qemu_process.c:5511) ==15724== by 0x1B48993E: qemuDomainObjStart (qemu_driver.c:7050) ==15724== by 0x1B489B9A: qemuDomainCreateWithFlags (qemu_driver.c:7104) ==15724== by 0x1B489C01: qemuDomainCreate (qemu_driver.c:7122) ==15724== Address 0x21cfbb90 is 0 bytes inside a block of size 48 free'd ==15724== at 0x4C2B1F0: free (vg_replace_malloc.c:473) ==15724== by 0x54B7A69: virFree (viralloc.c:582) ==15724== by 0x552DC90: virStorageAuthDefFree (virstoragefile.c:1549) ==15724== by 0x12D1C8D4: virStorageTranslateDiskSourcePool (storage_driver.c:3475) ==15724== by 0x1B4396E4: qemuProcessPrepareDomain (qemu_process.c:4896) ==15724== by 0x1B43B880: qemuProcessStart (qemu_process.c:5466) ==15724== by 0x1B48993E: qemuDomainObjStart (qemu_driver.c:7050) ==15724== by 0x1B489B9A: qemuDomainCreateWithFlags (qemu_driver.c:7104) ==15724== by 0x1B489C01: qemuDomainCreate (qemu_driver.c:7122) ==15724== by 0x561CA97: virDomainCreate (libvirt-domain.c:6787) ==15724== by 0x12B6FD: remoteDispatchDomainCreate (remote_dispatch.h:4116) ==15724== by 0x12B61A: remoteDispatchDomainCreateHelper (remote_dispatch.h:4092) The problem is, in virStorageTranslateDiskSourcePool disk def->src->auth is freed, but the pointer is not set to NULL. So later, when qemuProcessStop starts to free the domain definition, virStorageAuthDefFree() tries to free the memory again, instead of jumping out immediately. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/storage/storage_driver.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 831e6b0..cb9d578 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -3472,7 +3472,10 @@ virStorageTranslateDiskSourcePool(virConnectPtr conn, VIR_FREE(def->src->path); virStorageNetHostDefFree(def->src->nhosts, def->src->hosts); + def->src->nhosts = 0; + def->src->hosts = NULL; virStorageAuthDefFree(def->src->auth); + def->src->auth = NULL; switch ((virStoragePoolType) pooldef->type) { case VIR_STORAGE_POOL_DIR: -- 2.8.4

2 2

[libvirt] [libvirt-perl][PATCH 0/3] Fix a few memleaks
by Michal Privoznik 28 Jun '16

28 Jun '16

I've noticed these while trying to write support for the new libvirt APIs (but Dan was quicker :-)). Michal Privoznik (3): Prefer virTypedParameterPtr over virTypedParameter * get/set_memory_parameters: Favour virTypedParameter over virMemoryParameter Substitute Safefree with virTypedParamsFree Virt.xs | 146 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 74 insertions(+), 72 deletions(-) -- 2.8.4

2 8

[libvirt] [PATCH 0/1] vz: fix build for virNetDev* changes
by Olga Krishtal 28 Jun '16

28 Jun '16

Although this changes have been reverted, it useful to have patch, that makes this changes in vz driver.

3 3

[libvirt] [PATCH v2] logging: fixing log level initialization from cmdline
by Jaroslav Suchanek 28 Jun '16

28 Jun '16

Reorder code for setting default log level from cmdline prior initialization of log outputs. Thus the --verbose option is reflected. This resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1325072 --- Notes: v2: moving up the cmdline override for default logging level also for the virlockd src/locking/lock_daemon.c | 12 ++++++------ src/logging/log_daemon.c | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index 2c45349..9509e0c 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -482,6 +482,12 @@ virLockDaemonSetupLogging(virLockDaemonConfigPtr config, virLogParseOutputs(config->log_outputs); /* + * Command line override for --verbose + */ + if ((verbose) && (virLogGetDefaultPriority() > VIR_LOG_INFO)) + virLogSetDefaultPriority(VIR_LOG_INFO); + + /* * If no defined outputs, and either running * as daemon or not on a tty, then first try * to direct it to the systemd journal @@ -541,12 +547,6 @@ virLockDaemonSetupLogging(virLockDaemonConfigPtr config, VIR_FREE(tmp); } - /* - * Command line override for --verbose - */ - if ((verbose) && (virLogGetDefaultPriority() > VIR_LOG_INFO)) - virLogSetDefaultPriority(VIR_LOG_INFO); - return 0; error: diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 8f1ccc2..9f71ca9 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -405,6 +405,12 @@ virLogDaemonSetupLogging(virLogDaemonConfigPtr config, virLogParseOutputs(config->log_outputs); /* + * Command line override for --verbose + */ + if ((verbose) && (virLogGetDefaultPriority() > VIR_LOG_INFO)) + virLogSetDefaultPriority(VIR_LOG_INFO); + + /* * If no defined outputs, and either running * as daemon or not on a tty, then first try * to direct it to the systemd journal @@ -464,12 +470,6 @@ virLogDaemonSetupLogging(virLogDaemonConfigPtr config, VIR_FREE(tmp); } - /* - * Command line override for --verbose - */ - if ((verbose) && (virLogGetDefaultPriority() > VIR_LOG_INFO)) - virLogSetDefaultPriority(VIR_LOG_INFO); - return 0; error: -- 1.8.3.1

2 2

[libvirt] Fixing libvirt's libxl driver breakage -- where to define LIBXL_API_VERSION?
by Wei Liu 28 Jun '16

28 Jun '16

Hi libvirt maintainers, Xen's control library libxenlight (libxl) requires application (libvirt in this case) to explictily define LIBXL_API_VERSION. This is lacking at the moment so libvirt's libxl driver always gets the latest APIs. We changed one of the APIs in libxl so libvirt's libxl driver can't build at the moment. I want to submit a patch for libvirt to define LIBXL_API_VERSION, but I'm not sure where I should add that to. Can you give me some pointers? Or even better -- a specific file that I should edit? src/Makefile.am and src/Makfile.in are good candicate to me as far as I can tell. Thanks Wei.

9 21

[libvirt] [PATCH] vz: Fix indentation in prlsdkGetNetAddresses()
by Andrea Bolognani 28 Jun '16

28 Jun '16

--- Pushed as trivial. src/vz/vz_sdk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 7e75e44..ae218e9 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -829,7 +829,7 @@ prlsdkGetNetAddresses(PRL_HANDLE sdknet, virDomainNetDefPtr net) prlsdkCheckRetGoto(pret, cleanup); for (i = 0; i < num; ++i) { - virNetDevIPAddrPtr ip = NULL; + virNetDevIPAddrPtr ip = NULL; PRL_UINT32 buflen = 0; char *addr; -- 2.7.4

1 0

[libvirt] [PATCH] qemuDomainDeviceDefValidate: Drop unused qemuCaps
by Jiri Denemark 27 Jun '16

27 Jun '16

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_domain.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 0c107aa..fd25669 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2196,12 +2196,9 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev, void *opaque) { virQEMUDriverPtr driver = opaque; - virQEMUCapsPtr qemuCaps = NULL; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); int ret = -1; - qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, def->emulator); - if (dev->type == VIR_DOMAIN_DEVICE_NET) { const virDomainNetDef *net = dev->data.net; @@ -2216,7 +2213,6 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev, ret = 0; cleanup: - virObjectUnref(qemuCaps); virObjectUnref(cfg); return ret; } -- 2.9.0

2 1

[libvirt] [PATCH RFC 00/48] Sparse streams
by Michal Privoznik 27 Jun '16

27 Jun '16

So, after some time spent working on this, I think I finally have something that works. Finally, we have a formatted messages between iohelper and the daemon. BUT, it there's a corner case because where this does not work 100%. If there's a hole at EOF, it is either not transferred to the other side or not fully seeked. Therefore, hole at EOF is not in the copy. I guess it is some silly mistake somewhere. Anyway, any comments appreciated. v2 can be found here: https://www.redhat.com/archives/libvir-list/2016-May/msg01691.html Michal Privoznik (48): util: Introduce virFileInData src: Move iohelper out from utils/ to a separate dir fdstream: s/struct virFDStreamData */virFDStreamDataPtr/ virFDStreamData: Turn into virObjectLockable Introduce virStreamRecvFlags Implement virStreamRecvFlags to some drivers Introduce virStreamSkip Introduce virStreamHoleSize Introduce VIR_STREAM_RECV_STOP_AT_HOLE flag Introduce virStreamSparseRecvAll Introduce virStreamSparseSendAll Introduce virStreamInData virNetClientStreamNew: Track origin stream Track if stream is skippable RPC: Introduce virNetStreamSkip Introduce VIR_NET_STREAM_SKIP message type Teach wireshark plugin about VIR_NET_STREAM_SKIP daemon: Introduce virNetServerProgramSendStreamSkip virnetclientstream: Introduce virNetClientStreamSendSkip daemon: Implement VIR_NET_STREAM_SKIP handling virnetclientstream: Introduce virNetClientStreamHandleSkip remote_driver: Implement virStreamSkip virNetClientStreamRecvPacket: Introduce @flags argument Introduce virNetClientStreamHoleSize remote: Implement virStreamHoleSize virNetClientStream: Wire up VIR_NET_STREAM_SKIP remote_driver: Implement VIR_STREAM_RECV_STOP_AT_HOLE daemonStreamHandleRead: Wire up seekable stream fdstream: Implement seek gendispatch: Introduce @sparseflag for our calls Introduce virStorageVol{Download,Upload}Flags virsh: Implement sparse stream to vol-download virsh: Implement sparse stream to vol-upload daemon: Don't call virStreamInData so often storage: Enable sparse streams for virStorageVol{Download,Upload} fdstream: Track formatted message fdstream: Handle formatted messages separately iohelper: Introduce iohelper_message iohelper_message: Introduce API stubs iohelper_message: Implement formatted read iohelper_message: Implement formatted write tests: Introduce iohelpermessagetest iohelpermessagetest: test non-blocking read & write iohelper_message: Add support for sparse streams iohelper: Move runIO to runIOBasic iohelper: Introduce setupFDs iohelper: Teach command line 'sparse' argument iohelper: Wire up formatted messages daemon/remote.c | 2 +- daemon/stream.c | 152 +++++++++++- daemon/stream.h | 3 +- include/libvirt/libvirt-storage.h | 9 + include/libvirt/libvirt-stream.h | 86 ++++++- po/POTFILES.in | 2 +- src/Makefile.am | 33 ++- src/driver-stream.h | 23 ++ src/esx/esx_stream.c | 16 +- src/fdstream.c | 267 +++++++++++++++----- src/fdstream.h | 3 +- src/{util => iohelper}/iohelper.c | 234 +++++++++++++++--- src/iohelper/iohelper_message.c | 429 ++++++++++++++++++++++++++++++++ src/iohelper/iohelper_message.h | 53 ++++ src/libvirt-storage.c | 4 +- src/libvirt-stream.c | 455 ++++++++++++++++++++++++++++++++++ src/libvirt_internal.h | 3 + src/libvirt_private.syms | 2 + src/libvirt_public.syms | 8 +- src/libvirt_remote.syms | 3 + src/remote/remote_driver.c | 89 ++++++- src/remote/remote_protocol.x | 2 + src/rpc/gendispatch.pl | 21 +- src/rpc/virnetclient.c | 1 + src/rpc/virnetclientstream.c | 203 ++++++++++++++- src/rpc/virnetclientstream.h | 17 +- src/rpc/virnetprotocol.x | 16 +- src/rpc/virnetserverprogram.c | 33 +++ src/rpc/virnetserverprogram.h | 7 + src/storage/storage_backend.c | 12 +- src/storage/storage_driver.c | 4 +- src/util/virfile.c | 70 ++++++ src/util/virfile.h | 4 + src/virnetprotocol-structs | 4 + tests/Makefile.am | 10 +- tests/iohelpermessagetest.c | 466 +++++++++++++++++++++++++++++++++++ tools/virsh-volume.c | 49 ++-- tools/virsh.c | 36 +++ tools/virsh.h | 17 ++ tools/virsh.pod | 6 +- tools/wireshark/src/packet-libvirt.c | 40 +++ tools/wireshark/src/packet-libvirt.h | 2 + 42 files changed, 2716 insertions(+), 180 deletions(-) rename src/{util => iohelper}/iohelper.c (58%) create mode 100644 src/iohelper/iohelper_message.c create mode 100644 src/iohelper/iohelper_message.h create mode 100644 tests/iohelpermessagetest.c -- 2.8.4

2 59

[libvirt] [PATCH] Drop virStorageBackendLogicalMatchPoolSource
by Ján Tomko 27 Jun '16

27 Jun '16

Regression introduced by commit 71b803a for [1] that prevents starting up a logical pool created with <source><device path=''></source> after it has been moved to a different physical volume. For logical pools <source><name> contains the name of the volume group and uniquely identifies the VG on the host. This also speeds up startup for pools that do not have any <device>s specified. [1] https://bugzilla.redhat.com/show_bug.cgi?id=1025230 --- src/storage/storage_backend_logical.c | 104 +--------------------------------- 1 file changed, 2 insertions(+), 102 deletions(-) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index ca05fe1..057e0b9 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -558,107 +558,11 @@ virStorageBackendLogicalFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSED, } -/* - * virStorageBackendLogicalMatchPoolSource - * @pool: Pointer to the source pool object - * - * Search the output generated by a 'pvs --noheadings -o pv_name,vg_name' - * to match the 'vg_name' with the pool def->source.name and for the list - * of pool def->source.devices[]. - * - * Returns true if the volume group name matches the pool's source.name - * and at least one of the pool's def->source.devices[] matches the - * list of physical device names listed for the pool. Return false if - * we cannot find a matching volume group name and if we cannot match - * the any device list members. - */ -static bool -virStorageBackendLogicalMatchPoolSource(virStoragePoolObjPtr pool) -{ - virStoragePoolSourceList sourceList; - virStoragePoolSource *thisSource = NULL; - size_t i, j; - int matchcount = 0; - bool ret = false; - - memset(&sourceList, 0, sizeof(sourceList)); - sourceList.type = VIR_STORAGE_POOL_LOGICAL; - - if (virStorageBackendLogicalGetPoolSources(&sourceList) < 0) - goto cleanup; - - /* Search the pvs output for this pool's source.name */ - for (i = 0; i < sourceList.nsources; i++) { - thisSource = &sourceList.sources[i]; - if (STREQ(thisSource->name, pool->def->source.name)) - break; - } - - if (i == sourceList.nsources) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("cannot find logical volume group name '%s'"), - pool->def->source.name); - goto cleanup; - } - - /* If the pool has defined source device(s), then let's make sure - * they match as well; otherwise, matching can only occur on the - * pool's name. - */ - if (!pool->def->source.ndevice) { - ret = true; - goto cleanup; - } - - /* Let's make sure the pool's device(s) match what the pvs output has - * for volume group devices. - */ - for (i = 0; i < pool->def->source.ndevice; i++) { - for (j = 0; j < thisSource->ndevice; j++) { - if (STREQ(pool->def->source.devices[i].path, - thisSource->devices[j].path)) - matchcount++; - } - } - - /* If we didn't find any matches, then this pool has listed (a) source - * device path(s) that don't/doesn't match what was created for the pool - */ - if (matchcount == 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("cannot find any matching source devices for logical " - "volume group '%s'"), pool->def->source.name); - goto cleanup; - } - - /* Either there's more devices in the pool source device list or there's - * more devices in the pvs output. Could easily happen if someone decides - * to 'add' to or 'remove' from the volume group outside of libvirt's - * knowledge. Rather than fail on that, provide a warning and move on. - */ - if (matchcount != pool->def->source.ndevice) - VIR_WARN("pool device list count doesn't match pvs device list count"); - - ret = true; - - cleanup: - for (i = 0; i < sourceList.nsources; i++) - virStoragePoolSourceClear(&sourceList.sources[i]); - VIR_FREE(sourceList.sources); - - return ret; -} - - static int virStorageBackendLogicalCheckPool(virStoragePoolObjPtr pool, bool *isActive) { - /* If we can find the target.path as well as ensure that the - * pool's def source - */ - *isActive = virFileExists(pool->def->target.path) && - virStorageBackendLogicalMatchPoolSource(pool); + *isActive = virFileExists(pool->def->target.path); return 0; } @@ -666,11 +570,7 @@ static int virStorageBackendLogicalStartPool(virConnectPtr conn ATTRIBUTE_UNUSED, virStoragePoolObjPtr pool) { - /* Let's make sure that the pool's name matches the pvs output and - * that the pool's source devices match the pvs output. - */ - if (!virStorageBackendLogicalMatchPoolSource(pool) || - virStorageBackendLogicalSetActive(pool, 1) < 0) + if (virStorageBackendLogicalSetActive(pool, 1) < 0) return -1; return 0; -- 2.7.3

3 9

[libvirt] [PATCH] logging: fixing log level initialization from cmdline
by Jaroslav Suchanek 27 Jun '16

27 Jun '16

Reorder code for setting default log level from cmdline prior initialization of log outputs. Thus the --verbose option is reflected. This resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1325072 --- src/logging/log_daemon.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 8f1ccc2..9f71ca9 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -405,6 +405,12 @@ virLogDaemonSetupLogging(virLogDaemonConfigPtr config, virLogParseOutputs(config->log_outputs); /* + * Command line override for --verbose + */ + if ((verbose) && (virLogGetDefaultPriority() > VIR_LOG_INFO)) + virLogSetDefaultPriority(VIR_LOG_INFO); + + /* * If no defined outputs, and either running * as daemon or not on a tty, then first try * to direct it to the systemd journal @@ -464,12 +470,6 @@ virLogDaemonSetupLogging(virLogDaemonConfigPtr config, VIR_FREE(tmp); } - /* - * Command line override for --verbose - */ - if ((verbose) && (virLogGetDefaultPriority() > VIR_LOG_INFO)) - virLogSetDefaultPriority(VIR_LOG_INFO); - return 0; error: -- 1.8.3.1

2 2

[libvirt] [PATCH 0/2] virQEMUCapsFillDomainCaps: Drop redundant parameter
by Jiri Denemark 27 Jun '16

27 Jun '16

Jiri Denemark (2): qemu: Remove redundant parameter in virQEMUCapsFillDomainCaps domaincapstest: Don't read data from host src/qemu/qemu_capabilities.c | 5 ++--- src/qemu/qemu_capabilities.h | 3 +-- src/qemu/qemu_driver.c | 2 +- tests/Makefile.am | 7 +++++++ tests/domaincapsmock.c | 26 ++++++++++++++++++++++++++ tests/domaincapstest.c | 5 ++--- 6 files changed, 39 insertions(+), 9 deletions(-) create mode 100644 tests/domaincapsmock.c -- 2.9.0

2 7

[libvirt] [PATCH 0/2] Fix FreeBSD build
by Andrea Bolognani 27 Jun '16

27 Jun '16

Pushed under the build-breaker rule. Andrea Bolognani (2): util: netdevip: Include vircommand.h Clean up after virNetDevIP creation src/util/virnetdev.h | 21 --------------------- src/util/virnetdevip.c | 5 +++-- tests/qemuxml2argvmock.c | 9 +++++---- 3 files changed, 8 insertions(+), 27 deletions(-) -- 2.7.4

2 5

Re: [libvirt] [Bug] make check fails when LIBVIRT_DEBUG is defined
by Eric Blake 27 Jun '16

27 Jun '16

[moderator note: the mail server balked at 1.3 megabytes of attachments, so I've stripped them in my reply] On 12/31/1969 05:00 PM, wrote: > Hello everybody, > > I set up a clean libvirt repo with: > git clone > ./autogen.sh > make -j5 > > and then executed tests with various values of LIBVIRT_DEBUG using > the following command: > LIBVIRT_DEBUG=0…5 VIR_TEST_DEBUG=1 make check > > The logs are in this mail's attachments. > > > With LIBVIRT_DEBUG=0 (or =5 or probably any invalid value), the logs say: > "Ignoring invalid log level setting” > but still, 10 tests fail due to various reasons. > > With LIBVIRT_DEBUG=1, there is a slight difference. The number of tests > that fail is also 10, but here, commandtest fails instead of eventtest. > > With LIBVIRT_DEBUG=2, only 9 tests fail, because commandtest passes. > > With LIBVIRT_DEBUG=3, only 1 test fails: qemuargv2xmltest. The > reason is the same as in the previous tests. > > With LIBVIRT_DEBUG=4, it’s just qemuargv2xmltest that is failing, > but for a different reason than before: > "qemuParseCommandLineString should have logged a warning”. > > > Perhaps it’s okay that these tests fail, but still there's no harm > in letting people know. > > Thank you rbogorodskiy for guidance on the mailing list :) > > Have a nice day, > Tomasz > I don't know that anyone ever expected the testsuite to work with LIBVIRT_DEBUG set to anything (because turning on debug can change output of libvirt itself). Things are different with VIR_TEST_DEBUG, which explicitly exists to change the verbosity of the testsuite itself, but not affect libvirt. If the testsuite passes without LIBVIRT_DEBUG set, then that's the solution :) But if you still get failures with LIBVIRT_DEBUG removed from the environment on your particular platform, then it is worth investigating how we can fix those failures (it may be a weakness in the testsuite, or an actual libvirt bug). -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

4 4

[libvirt] [PATCH 0/2] util: Small cleanups
by Andrea Bolognani 27 Jun '16

27 Jun '16

What it says on the tin. Andrea Bolognani (2): util: Drop obsolete compatibility code util: Only define /dev/kvm path once src/util/virhostcpu.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) -- 2.7.4

2 8

[libvirt] [PATCH v2 0/3] Small cleanups and improvements
by Andrea Bolognani 27 Jun '16

27 Jun '16

Remove some obsolete code, and improve the behavior of the 'virsh domcapabilities --virttype kvm' command when running on non-Linux platform. Andrea Bolognani (3): util: hostcpu: Add virHostCPUGetKVMMaxVCPUs() stub util: hostcpu: Drop obsolete compatibility code qemu: capabilities: Make virHostCPUGetKVMMaxVCPUs() errors fatal src/qemu/qemu_capabilities.c | 9 ++++++--- src/util/virhostcpu.c | 25 ++++++++++++------------- 2 files changed, 18 insertions(+), 16 deletions(-) -- 2.7.4

1 3

[libvirt] [PATCH v2 00/15] Add support for LUKS encrypted devices
by John Ferlan 27 Jun '16

27 Jun '16

v1: http://www.redhat.com/archives/libvir-list/2016-June/msg00804.html Differences since v1 (beyond those patches already pushed) Patch 1: Adjust via recent comments for patch 8 of previous series Patch 2: Already ACK'd, adjust slightly based on merge conflicts Patch 3: Used to be patch 14 - Use VIR_SECRET_USAGE_TYPE_PASSPHRASE (instead of _KEY) - Use "usage.id" (instead of "usage.key") Patch 4: Used by be patch 11 (wasn't reviewed) Patch 5: Split from patch 13 for separate endian code to read a 16 bit value Patch 6: NEW - based slightly on former patch 12 - No longer use cryptType - Use versionSize instead in order to decode verision data as 16 or 32 bits Patch 7: Former patch 13 with adjustments based on previous patches Patch 8-9: Former patch 15-16 w/ adjustments from review and to keep up with other changes Patch 10: NEW - Reaction to former patch 17 comments with respect to a file name. Need a way to build a path to temporarily save the secret where that path is not in the pool. Chose the "stateDir", but since storage_driver is the only place that knows, added helper API to access. Patch 11: Former patch 17 with adjustments from code review and to handle other changes so far Patches 12-14: NEW - Really a bug fix submitted as a separate patch (although there are a few differences here), but I need it for patch 15 Patch 15: Former patch 19 plus adjustments for hotplug. John Ferlan (15): qemu: Change protocol parameter for secret setup qemu: Remove authdef from secret setup conf: Add new secret type "passphrase" util: Add 'usage' for encryption util: Introduce virReadBufInt16LE and virReadBufInt16BE util: Modify the FileTypeInfo to add a version size util: Add 'luks' to the FileTypeInfo encryption: Add luks parsing for storageencryption encryption: Add <cipher> and <ivgen> to encryption storage: Introduce virStoragePoolObjBuildTempFilePath storage: Add support to create a luks volume qemu: Remove type from qemuBuildSecretInfoProps qemu: Make qemuBuildSecretInfoProps global qemu: Add secinfo for hotplug virtio disk qemu: Add luks support for domain disk docs/aclpolkit.html.in | 4 + docs/formatsecret.html.in | 62 ++++- docs/formatstorageencryption.html.in | 116 ++++++++- docs/schemas/secret.rng | 10 + docs/schemas/storagecommon.rng | 57 ++++- include/libvirt/libvirt-secret.h | 3 +- src/access/viraccessdriverpolkit.c | 13 + src/conf/domain_conf.c | 11 + src/conf/secret_conf.c | 26 +- src/conf/secret_conf.h | 1 + src/conf/virsecretobj.c | 5 + src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 23 +- src/qemu/qemu_command.h | 4 + src/qemu/qemu_domain.c | 126 +++++----- src/qemu/qemu_hotplug.c | 107 ++++++++- src/qemu/qemu_process.c | 19 +- src/storage/storage_backend.c | 266 +++++++++++++++++++-- src/storage/storage_backend.h | 3 +- src/storage/storage_backend_fs.c | 10 +- src/storage/storage_backend_gluster.c | 2 + src/storage/storage_driver.c | 24 ++ src/storage/storage_driver.h | 6 +- src/util/virendian.h | 24 ++ src/util/virqemu.c | 23 ++ src/util/virqemu.h | 6 + src/util/virstorageencryption.c | 152 ++++++++++-- src/util/virstorageencryption.h | 17 +- src/util/virstoragefile.c | 84 +++++-- src/util/virstoragefile.h | 1 + .../qemuxml2argv-encrypted-disk-usage.args | 24 ++ .../qemuxml2argv-encrypted-disk-usage.xml | 32 +++ .../qemuxml2argv-luks-disk-cipher.args | 36 +++ .../qemuxml2argv-luks-disk-cipher.xml | 41 ++++ .../qemuxml2argvdata/qemuxml2argv-luks-disks.args | 36 +++ tests/qemuxml2argvdata/qemuxml2argv-luks-disks.xml | 41 ++++ tests/qemuxml2argvtest.c | 12 +- .../qemuxml2xmlout-encrypted-disk-usage.xml | 36 +++ .../qemuxml2xmlout-luks-disk-cipher.xml | 45 ++++ .../qemuxml2xmlout-luks-disks.xml | 45 ++++ tests/qemuxml2xmltest.c | 3 + tests/secretxml2xmlin/usage-passphrase.xml | 7 + tests/secretxml2xmltest.c | 1 + tests/storagevolxml2argvtest.c | 3 +- tests/storagevolxml2xmlin/vol-luks-cipher.xml | 23 ++ tests/storagevolxml2xmlin/vol-luks.xml | 21 ++ tests/storagevolxml2xmlout/vol-luks-cipher.xml | 23 ++ tests/storagevolxml2xmlout/vol-luks.xml | 21 ++ tests/storagevolxml2xmltest.c | 2 + tests/virendiantest.c | 18 ++ 50 files changed, 1495 insertions(+), 181 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk-usage.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk-usage.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-luks-disk-cipher.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-luks-disk-cipher.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-luks-disks.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-luks-disks.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-encrypted-disk-usage.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-luks-disk-cipher.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-luks-disks.xml create mode 100644 tests/secretxml2xmlin/usage-passphrase.xml create mode 100644 tests/storagevolxml2xmlin/vol-luks-cipher.xml create mode 100644 tests/storagevolxml2xmlin/vol-luks.xml create mode 100644 tests/storagevolxml2xmlout/vol-luks-cipher.xml create mode 100644 tests/storagevolxml2xmlout/vol-luks.xml -- 2.5.5

2 36

[libvirt] [PATCH] Reject USB address without a port
by Ján Tomko 27 Jun '16

27 Jun '16

We would happily accept a usb address with a missing port attribute, then format it back as port='(null)', so the persistent domain would not be able to start (due to the XML sightseeing tour in virDomainObjSetDefTransient) or survive daemon restart. --- src/conf/domain_conf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 79d15c8..d0684eb 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5132,7 +5132,11 @@ virDomainDeviceUSBAddressParseXML(xmlNodePtr node, memset(addr, 0, sizeof(*addr)); - port = virXMLPropString(node, "port"); + if (!(port = virXMLPropString(node, "port"))) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("USB address must have a port")); + goto cleanup; + } bus = virXMLPropString(node, "bus"); if (port && virDomainDeviceUSBAddressParsePort(port) < 0) -- 2.7.3

2 1

[libvirt] [PATCHv3 00/10] Assign addresses to USB devices
by Ján Tomko 27 Jun '16

27 Jun '16

v3: * drop change of commandline order of ccid controllers and USB hubs (that could possibly break compatibility) * assign addresses to redirdevs too * take custom port= setting of xhci controllers into account * hubs without addresses get one assigned only after we took a look on all the other devices Ján Tomko (10): Add USB addresses to qemuhotplug test cases Store USB port path as an array of integers Introduce virDomainUSBDeviceDefForeach Introduce virDomainUSBAddressSet Add functions for adding USB controllers to addrs Add functions for adding USB hubs to addrs Reserve existing USB addresses Assign addresses to USB devices Assign addresses on USB device hotplug Auto-add one hub if there are too many USB devices src/conf/device_conf.h | 2 +- src/conf/domain_addr.c | 491 +++++++++++++++++++++ src/conf/domain_addr.h | 58 +++ src/conf/domain_conf.c | 110 ++++- src/conf/domain_conf.h | 7 + src/libvirt_private.syms | 12 + src/qemu/qemu_command.c | 3 +- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_domain_address.c | 155 ++++++- src/qemu/qemu_hotplug.c | 27 ++ ...otplug-console-compat-2-live+console-virtio.xml | 1 + .../qemuhotplug-hotplug-base-live+disk-usb.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-bios-nvram.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-bios.args | 2 +- .../qemuxml2argv-console-compat-2-live.xml | 1 + .../qemuxml2argv-console-compat-2.xml | 4 +- .../qemuxml2argv-controller-order.args | 8 +- .../qemuxml2argv-disk-usb-device-removable.args | 3 +- .../qemuxml2argv-disk-usb-device.args | 2 +- .../qemuxml2argv-graphics-spice-timeout.args | 2 +- .../qemuxml2argv-graphics-spice-usb-redir.args | 2 +- ...muxml2argv-hostdev-usb-address-device-boot.args | 2 +- .../qemuxml2argv-hostdev-usb-address-device.args | 2 +- .../qemuxml2argv-hostdev-usb-address.args | 2 +- .../qemuxml2argv-hugepages-numa.args | 6 +- .../qemuxml2argv-input-usbmouse.args | 2 +- .../qemuxml2argv-input-usbtablet.args | 2 +- .../qemuxml2argv-pseries-usb-kbd.args | 2 +- .../qemuxml2argv-serial-spiceport.args | 2 +- .../qemuxml2argv-smartcard-controller.args | 2 +- .../qemuxml2argv-smartcard-host-certificates.args | 2 +- .../qemuxml2argv-smartcard-host.args | 2 +- ...emuxml2argv-smartcard-passthrough-spicevmc.args | 2 +- .../qemuxml2argv-smartcard-passthrough-tcp.args | 2 +- .../qemuxml2argv-sound-device.args | 2 +- .../qemuxml2argv-usb-hub-autoadd.args | 28 ++ .../qemuxml2argv-usb-hub-autoadd.xml | 23 + .../qemuxml2argv-usb-hub-conflict.args | 25 ++ .../qemuxml2argv-usb-hub-conflict.xml | 22 + .../qemuxml2argv-usb-port-autoassign.args | 28 ++ .../qemuxml2argv-usb-port-autoassign.xml | 27 ++ .../qemuxml2argv-usb-redir-boot.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args | 2 +- tests/qemuxml2argvtest.c | 9 + 44 files changed, 1048 insertions(+), 44 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-hub-autoadd.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-hub-autoadd.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-hub-conflict.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-hub-conflict.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-port-autoassign.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-port-autoassign.xml -- 2.7.3

2 16

[libvirt] [PATCH] qemu: match controller index for LIVE+CONFIG when doing hotplug
by Laine Stump 27 Jun '16

27 Jun '16

An attempt to attach a new scsi controller with both --live and --config but without specifying an index, e.g.: <controller model="virtio-scsi" type="scsi" /> led to this error: internal error: Cannot parse controller index -1 This was because unspecified indexes are auto-assigned during virDomainDefPostParse(), which doesn't happen for hotplugged devices until after the device has been added to the domainDef, but qemuDomainAttachFlags() makes a copy of the device (for feeding to qemuDomainAttachDeviceLive() *before* it's added to the config, and the copying function actually formats the device object and then re-parses it into a new object. Since qemuDomainAttachDeviceConfig() consumes the device object pointer (i.e. sets it to NULL in the original virDomainDeviceDef) we can't just wait to make the copy. Instead, we need to make a *shallow* copy of the virDomainDeviceDef prior to qemuDomainAttachDeviceConfig(), then make a deep copy of the shallow copy. This resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1344899 --- src/qemu/qemu_driver.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index fa05046..f3e17e2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8199,6 +8199,7 @@ qemuDomainAttachDeviceFlags(virDomainPtr dom, virDomainObjPtr vm = NULL; virDomainDefPtr vmdef = NULL; virDomainDeviceDefPtr dev = NULL, dev_copy = NULL; + virDomainDeviceDef dev_shallow; int ret = -1; unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_ABI_UPDATE; @@ -8237,22 +8238,19 @@ qemuDomainAttachDeviceFlags(virDomainPtr dom, if (dev == NULL) goto endjob; - if (flags & VIR_DOMAIN_AFFECT_CONFIG && - flags & VIR_DOMAIN_AFFECT_LIVE) { - /* If we are affecting both CONFIG and LIVE - * create a deep copy of device as adding - * to CONFIG takes one instance. - */ - dev_copy = virDomainDeviceDefCopy(dev, vm->def, caps, driver->xmlopt); - if (!dev_copy) - goto endjob; - } - if (priv->qemuCaps) qemuCaps = virObjectRef(priv->qemuCaps); else if (!(qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, vm->def->emulator))) goto endjob; + /* Save away the pointer to the device object before it is + * potentially swallowed up by qemuDomainAttachDeviceConfig(). + * This will allow us to make a copy of the device after any + * modifications made by virDomainDefPostParse() (which is called + * after the new device is added to the config + */ + dev_shallow = *dev; + if (flags & VIR_DOMAIN_AFFECT_CONFIG) { /* Make a copy for updated domain. */ vmdef = virDomainObjCopyPersistentDef(vm, caps, driver->xmlopt); @@ -8270,6 +8268,17 @@ qemuDomainAttachDeviceFlags(virDomainPtr dom, } if (flags & VIR_DOMAIN_AFFECT_LIVE) { + if (flags & VIR_DOMAIN_AFFECT_CONFIG) { + /* If we are affecting both CONFIG and LIVE create a deep + * copy of device from the saved shallow copy, as adding + * it to CONFIG has already consumed the original. + */ + dev_copy = virDomainDeviceDefCopy(&dev_shallow, vm->def, + caps, driver->xmlopt); + if (!dev_copy) + goto endjob; + } + if (virDomainDefCompatibleDevice(vm->def, dev_copy, VIR_DOMAIN_DEVICE_ACTION_ATTACH) < 0) goto endjob; -- 2.5.5

5 6

[libvirt] [PATCH] libvirtd.conf: Fix invalid default of max_anonymous_clients
by Michal Privoznik 27 Jun '16

27 Jun '16

https://bugzilla.redhat.com/show_bug.cgi?id=1343442 When a client connects, it is placed into a queue. As soon as it authenticate, it is taken out of that queue and placed into a different one. Now, we have a setting in the daemon config file that allows users to control the length of the queue of yet not authenticated clients. By default, it has a value 20 but in the description to the config knob we clam it's zero. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- daemon/libvirtd.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf index 3b957e5..8466616 100644 --- a/daemon/libvirtd.conf +++ b/daemon/libvirtd.conf @@ -283,8 +283,8 @@ #max_queued_clients = 1000 # The maximum length of queue of accepted but not yet -# authenticated clients. The default value is zero, meaning -# the feature is disabled. +# authenticated clients. The default value is 20. Set this to +# zero to turn this feature off. #max_anonymous_clients = 20 # The minimum limit sets the number of workers to start up -- 2.8.4

2 1

[libvirt] how to make syntax-check on tar-tall released-version
by Zhangbo (Oscar) 27 Jun '16

27 Jun '16

Hi all: I downloaded libvirt v1.3.4 from http://libvirt.org/sources, and try to make syntax-check inside the code tree. But I encounted with many problems, first, I need to have file .gitignore and directory .git, and then have gnulib, many problems still comes out after that. I still have not fixed the problems until now. So what's the right way to make syntax-check on released-version libvirt project? Thanks in advance. Oscar.

3 4

[libvirt] [PATCH 0/2] Make a generic version of virDomainDefMetadataSanitize()
by Laine Stump 27 Jun '16

27 Jun '16

Peter pointed out that Brandon's patch to add metadata to the network XML should "sanitize" it (to remove duplicate namespaces) in the same manner as we do (thanks to Peter!) for the domain metadata. In order to make that simpler, I made a patch that turns virDomainDefMetadataSanitize() into the generic function virXMLNodeSanitizeNamespaces(), then (in a separate patch) changed the domain parser to use that new generic function. I will also add a call to that function into Brandon's patch before pushing it. Laine Stump (2): util: new function virXMLNodeSanitizeNamespaces() qemu: use virXMLNodeSanitizeNamespaces() src/conf/domain_conf.c | 56 ++---------------------------------------------- src/libvirt_private.syms | 1 + src/util/virxml.c | 52 ++++++++++++++++++++++++++++++++++++++++++++ src/util/virxml.h | 2 ++ 4 files changed, 57 insertions(+), 54 deletions(-) -- 2.5.5

2 4

[libvirt] [PATCH 00/28] IP peer address and host-side address config support
by Laine Stump 26 Jun '16

26 Jun '16

This (admittedly very long, but most of the patches are either very small or just code movement/renaming, really!) series started out to be just a replacement for a single patch posted by Vasiliy Tolstov back in April (originally pushed upstream as commit 690969af, which was reverted in commit 1d14b13f when I noticed an inconsistency in behavior between lxc and qemu). But each step forward seemed to require (or strongly suggest) a step sideways to reorganize existing code, or eliminate annoying problems I found, and I ended up with 28 patches. The patches that actually add the new functionality are 24-28 (and they are quite small), all the rest just setting up for that. In particular, the three largest patches (03, 13, 14) are purely moving code and renaming identifiers. Patches 07, 08, 12, and 18 fix minor bugs I found during all the changes. (12 is a bit strange, as it removes an undocumented behavior from the openvz driver that has been there since 2010). The one possible controversy in this series (other than the modification to openvz configuration in patch 12) is my placement of the config info for the host-side network device. I could have either put the IP info for the host-side interface as a subelement of <target> where the host-side interface is named, or I could follow the convention of other device types and make it a subelement of the <source> element of interface (since there is where you're supposed to describe how a device connects to the host side resources). <target> element is used to give the name of the tap interface itself. I went back and forth about this, and in the end decided that since the IP address is configuring how the device connects to the outside world (just as with the "network" and "bridge" attributes of <source> for those other network types), that it makes most sense to put it under <source> Please don't be put off by the large number of patches - most of them are fairly straightforward and should be quick reviews. I promise! :-) Laine Stump (27): util: move virNetDevLinkDump to virnetlink.c util: move virInterface(State|Link)/virNetDevFeature from conf to util global: consistently use IP rather than Ip in identifiers conf: clean up virDomainNetIPParseXML() tests: mock virNetDevSetIPAddress util: allow calling virSocketAddrGetIPPrefix with NULL netmask or address lxc: eliminate extraneous free of netDef->ifname_guest lxc: use correct prefix when setting veth IP address conf: new function virDomainNetDefClear qemu: don't set/clear NetDef IP addresses in qemuConnectDomainXMLToNative() qemu: eliminate memory leaks when converting NetDefs to type='ethernet' conf/openvz: eliminate incorrect/undocumented use of <source dev='blah'/> util: new files virnetdevip.[ch] for IP-related netdev functions util: move IP route & address object-related functions to virnetdevip.c conf: single object containing list of IP addresses, list of routes conf: use virNetDevIPInfo in virDomainHostdevCaps conf: use virNetDevIPInfo for guest-side <interface> config qemu: forbid setting guest-side IP address/route info of <interface> conf: clean up after adding calls to virNetDevIPInfo helpers lxc: move debug/error log when adding IP addresses to virNetDevIPAddrAdd util: new function virNetDevIPInfoAddToDev util: provide default destination IP in alternate virNetDevIPRouteAdd() util: make messages consistent in both versions of virNetDevIPRouteAdd() conf: support host-side IP/route information in <interface> util: support setting peer for virNetDevIPInfo addresses lxc: support setting host-side IP addresses/routes qemu: support setting host-side IP addresses/routes Vasiliy Tolstov (1): conf: allow setting peer address in <ip> element of <interface> docs/formatdomain.html.in | 60 +- docs/schemas/domaincommon.rng | 82 +- po/POTFILES.in | 1 + src/Makefile.am | 1 + src/conf/device_conf.c | 31 +- src/conf/device_conf.h | 44 +- src/conf/domain_conf.c | 399 +++++---- src/conf/domain_conf.h | 28 +- src/conf/interface_conf.c | 38 +- src/conf/interface_conf.h | 10 +- src/conf/network_conf.c | 96 +- src/conf/network_conf.h | 24 +- src/conf/networkcommon_conf.c | 107 +-- src/conf/networkcommon_conf.h | 55 +- src/conf/node_device_conf.h | 2 +- src/esx/esx_driver.c | 44 +- src/esx/esx_interface_driver.c | 4 +- src/esx/esx_vi.c | 4 +- src/esx/esx_vi.h | 2 +- src/libvirt_private.syms | 50 +- src/libxl/libxl_conf.c | 10 +- src/libxl/libxl_domain.c | 2 +- src/lxc/lxc_container.c | 92 +- src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_native.c | 42 +- src/lxc/lxc_process.c | 8 + src/network/bridge_driver.c | 103 +-- src/network/bridge_driver_linux.c | 76 +- src/nwfilter/nwfilter_ebiptables_driver.c | 24 +- src/openvz/openvz_conf.c | 2 +- src/openvz/openvz_driver.c | 15 +- src/qemu/qemu_domain.c | 34 + src/qemu/qemu_driver.c | 76 +- src/qemu/qemu_hotplug.c | 6 +- src/qemu/qemu_interface.c | 6 +- src/uml/uml_conf.c | 4 +- src/util/virnetdev.c | 876 +------------------ src/util/virnetdev.h | 46 +- src/util/virnetdevip.c | 971 +++++++++++++++++++++ src/util/virnetdevip.h | 93 ++ src/util/virnetdevvportprofile.c | 4 +- src/util/virnetlink.c | 135 +++ src/util/virnetlink.h | 5 + src/util/virsocketaddr.c | 12 +- src/util/virsocketaddr.h | 3 +- src/vbox/vbox_common.c | 6 +- src/vbox/vbox_network.c | 8 +- src/vz/vz_sdk.c | 2 +- src/xenconfig/xen_common.c | 14 +- src/xenconfig/xen_sxpr.c | 16 +- tests/lxcxml2xmldata/lxc-ethernet-hostip.xml | 44 + tests/lxcxml2xmltest.c | 1 + .../qemuxml2argv-net-eth-hostip.args | 23 + .../qemuxml2argv-net-eth-hostip.xml | 39 + tests/qemuxml2argvmock.c | 10 +- tests/qemuxml2argvtest.c | 1 + .../qemuxml2xmlout-net-eth-hostip.xml | 44 + tests/qemuxml2xmltest.c | 1 + tests/virnetdevtest.c | 14 +- tests/xml2sexprdata/xml2sexpr-net-routed.xml | 1 - 60 files changed, 2193 insertions(+), 1760 deletions(-) create mode 100644 src/util/virnetdevip.c create mode 100644 src/util/virnetdevip.h create mode 100644 tests/lxcxml2xmldata/lxc-ethernet-hostip.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-eth-hostip.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-eth-hostip.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth-hostip.xml -- 2.5.5

2 72

[libvirt] [PATCH 0/3] Enable admin API functionality and tar distribution
by Erik Skultety 26 Jun '16

26 Jun '16

Finally enable admin API in our code and start distributing it both via a tarball and as part of an rpm package. I also added some usage examples, however the html documentation is missing, because of our current xsl stylesheet, more specifically because of how xsltproc works. It takes a stylesheet and an xml file which it processes and produces index.html for each xml file on its input. This way, we either get TOC for libvirt APIs or just the admin. The same story goes for libvirt-qemu and libvirt-lxc which we neither generate, nor distribute. I talked to Jirka and we thought about merging the xmls somehow to a temporary file and then generate the index.html but that requires some more digging, especially into xslt capabilities. So I haven't figured this one out yet, but once I do, I'll enable it for all of our *.xml API 'recipes'. Erik Skultety (3): admin: enable both admin API functionality and tarball distribution examples: admin: Add some examples for the new admin APIs spec: distribute admin API within libvirt-client package .gitignore | 6 ++ Makefile.am | 2 +- cfg.mk | 4 +- daemon/libvirtd.c | 2 +- docs/Makefile.am | 5 +- examples/Makefile.am | 14 +++- examples/admin/client_close.c | 57 +++++++++++++ examples/admin/client_info.c | 165 +++++++++++++++++++++++++++++++++++++ examples/admin/client_limits.c | 63 ++++++++++++++ examples/admin/list_clients.c | 111 +++++++++++++++++++++++++ examples/admin/list_servers.c | 42 ++++++++++ examples/admin/threadpool_params.c | 65 +++++++++++++++ include/libvirt/Makefile.am | 6 +- libvirt.spec.in | 14 ++-- src/libvirt_admin_public.syms | 2 +- 15 files changed, 538 insertions(+), 20 deletions(-) create mode 100644 examples/admin/client_close.c create mode 100644 examples/admin/client_info.c create mode 100644 examples/admin/client_limits.c create mode 100644 examples/admin/list_clients.c create mode 100644 examples/admin/list_servers.c create mode 100644 examples/admin/threadpool_params.c -- 2.5.5

2 5

[libvirt] [PATCH 00/18] vz: support disk/net/graphics devices updates
by Nikolay Shirokovskiy 25 Jun '16

25 Jun '16

It makes sense to support other devices too as update can be on persistent config only which is always possible, but as AFAIK the main purpose of this API is to change live config the set of devices is just set of devices supported by qemu for live updates. Nikolay Shirokovskiy (18): vz: remove disk cache mode hunk vz: make prlsdkGetDisk more generic vz: reuse edit config frame in for attach/detach functions vz: add device updates vz: leverage disks parameters check on disks updates too vz: move disks checks to device post parse vz: fix memory leaks in attach/detach functions vz: give nice report if network device not found vz: dump ip addresses to domain xml vz: dump route info in domain xml vz: fix updating to no gateways vz: fix minor type safey issues with net union usage vz: trustGuestRxFilters fixes vz: move getting container video devices out from vnc code vz: support attach/detach/update/ of graphics device vz: remove exlicitly setting zeros in dumping graphics vz: support vnc password vz: always pass graphics address to sdk src/conf/networkcommon_conf.c | 2 +- src/conf/networkcommon_conf.h | 2 +- src/libvirt_private.syms | 1 + src/vz/vz_driver.c | 115 +++--- src/vz/vz_sdk.c | 897 +++++++++++++++++++++++------------------- src/vz/vz_sdk.h | 10 +- src/vz/vz_utils.c | 204 ++++++++-- src/vz/vz_utils.h | 7 +- 8 files changed, 740 insertions(+), 498 deletions(-) -- 1.8.3.1

2 36

[libvirt] [Bug] make check fails when LIBVIRT_DEBUG is defined
by Tomasz Flendrich 25 Jun '16

25 Jun '16

Hello everybody, I am resending this email as I suppose that the previous one wasn’t accepted due to a big attachment inside. If I create a double post, please excuse me, I didn’t mean to. I set up a clean libvirt repo with: git clone ./autogen.sh make and then executed tests with various values of LIBVIRT_DEBUG using the following command: LIBVIRT_DEBUG=0…5 VIR_TEST_DEBUG=1 make check With LIBVIRT_DEBUG=0 (or =5 or probably any invalid value), the logs say: "Ignoring invalid log level setting” but still, 10 tests fail due to various reasons. With LIBVIRT_DEBUG=1, there is a slight difference. The number of tests that fail is also 10, but here, commandtest fails instead of eventtest. With LIBVIRT_DEBUG=2, only 9 tests fail, because commandtest passes. With LIBVIRT_DEBUG=3, only 1 test fails: qemuargv2xmltest. The reason is the same as in the previous tests. With LIBVIRT_DEBUG=4, it’s just qemuargv2xmltest that is failing, but for a different reason than before: "qemuParseCommandLineString should have logged a warning”. Links to tests/test-syslog.log, indexed by value of LIBVIRT_DEBUG: 0: http://pastebin.com/bZrDV1K2 <http://pastebin.com/bZrDV1K2> 1: https://gist.github.com/Darge/d180ebdd497573ed633625cf136de73c <https://gist.github.com/Darge/d180ebdd497573ed633625cf136de73c> 2: http://pastebin.com/bhsq1MtC <http://pastebin.com/bhsq1MtC> 3: http://pastebin.com/BSRtR9Rq <http://pastebin.com/BSRtR9Rq> 4: http://pastebin.com/FQn79her <http://pastebin.com/FQn79her> Perhaps it’s okay that these tests fail, but still there's no harm in letting people know. Thank you rbogorodskiy for guidance on the mailing list :) Have a nice day, Tomasz

1 0

[libvirt] [PATCH 0/3] Drop some useless CPU code
by Jiri Denemark 25 Jun '16

25 Jun '16

Jiri Denemark (3): cpu: Consolidate ARM drivers cpu: Drop generic driver cpu: Drop NR_DRIVERS macro po/POTFILES.in | 1 - src/Makefile.am | 2 - src/cpu/cpu.c | 16 ++-- src/cpu/cpu_aarch64.c | 133 ----------------------------- src/cpu/cpu_aarch64.h | 31 ------- src/cpu/cpu_arm.c | 37 +++++---- src/cpu/cpu_generic.c | 226 -------------------------------------------------- src/cpu/cpu_generic.h | 32 ------- 8 files changed, 26 insertions(+), 452 deletions(-) delete mode 100644 src/cpu/cpu_aarch64.c delete mode 100644 src/cpu/cpu_aarch64.h delete mode 100644 src/cpu/cpu_generic.c delete mode 100644 src/cpu/cpu_generic.h -- 2.9.0

3 9

[libvirt] [PATCH v2 1/1] cpu_map.xml: add cmt/mbm feature to x86
by Qiaowei Ren 25 Jun '16

25 Jun '16

Some Intel processor families (e.g. the Intel Xeon processor E5 v3 family) introduced some PQos (Platform Qos) features, including CMT (Cache Monitoring technology) and MBM (Memory Bandwidth Monitoring), to monitor or control shared resource. This patch add them into x86 part of cpu_map.xml to be used for applications based on libvirt to get cpu capabilities. For example, Nova in OpenStack schedules guests based on the CPU features that the host has. Signed-off-by: Qiaowei Ren <qiaowei.ren(a)intel.com> --- src/cpu/cpu_map.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index bf2dfc6..6da8321 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -224,6 +224,9 @@ <feature name='rtm'> <cpuid eax_in='0x07' ebx='0x00000800'/> </feature> + <feature name='cmt'> + <cpuid eax_in='0x07' ebx='0x00001000'/> + </feature> <feature name='mpx'> <cpuid eax_in='0x07' ebx='0x00004000'/> </feature> @@ -266,6 +269,14 @@ <cpuid eax_in='0x0d' ecx_in='0x01' eax='0x00000008'/> </feature> +  + <feature name='mbm_total'>  + <cpuid eax_in='0x0f' ecx_in='0x01' edx='0x00000002'/> + </feature> + <feature name='mbm_local'>  + <cpuid eax_in='0x0f' ecx_in='0x01' edx='0x00000004'/> + </feature> +  <feature name='syscall'>  <cpuid eax_in='0x80000001' edx='0x00000800'/> -- 1.9.1

2 1

[libvirt] Plans for next release 2.0.0
by Daniel Veillard 24 Jun '16

24 Jun '16

So based on the new numbering scheme we should push 2.0.0 at the end of the month. Due to travel and move, I am tempted to enter the freeze on next Sunday (or Monday) to try to push for the release on Friday 1st or the week-end. Hope this works for everyone, 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/

3 2

[libvirt] [PATCH] util: fix build in virNetDevTapGetRealDeviceName
by Roman Bogorodskiy 24 Jun '16

24 Jun '16

Commit e81de04c switched virNetDevTapGetRealDeviceName() to use virDirOpen() instead of opendir(), however it mistakenly dropped DIR *dirp declaration, so restore that to fix build. --- Pushed under the build-breaker rule. src/util/virnetdevtap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index 98e27bb..7488a4c 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -95,6 +95,7 @@ virNetDevTapGetRealDeviceName(char *ifname ATTRIBUTE_UNUSED) #ifdef TAPGIFNAME char *ret = NULL; struct dirent *dp; + DIR *dirp = NULL; char *devpath = NULL; int fd; -- 2.7.4

1 0

[libvirt] [PATCH python] Add support for storage pool refesh callback
by Daniel P. Berrange 24 Jun '16

24 Jun '16

Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- examples/event-test.py | 6 ++++- libvirt-override-virConnect.py | 10 ++++++++ libvirt-override.c | 54 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+), 1 deletion(-) diff --git a/examples/event-test.py b/examples/event-test.py index 241369b..f0341b5 100755 --- a/examples/event-test.py +++ b/examples/event-test.py @@ -572,7 +572,6 @@ def storageEventToString(event): "Undefined", "Started", "Stopped", - "Refreshed", ) return storageEventStrings[event] @@ -581,6 +580,9 @@ def myStoragePoolEventLifecycleCallback(conn, pool, event, detail, opaque): storageEventToString(event), detail)) +def myStoragePoolEventRefreshCallback(conn, pool, event, detail, opaque): + print("myStoragePoolEventRefreshCallback: Storage pool %s" % pool.name()) + ########################################################################## # Set up and run the program ########################################################################## @@ -672,7 +674,9 @@ def main(): vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED, myDomainEventDeviceRemovalFailedCallback, None) vc.networkEventRegisterAny(None, libvirt.VIR_NETWORK_EVENT_ID_LIFECYCLE, myNetworkEventLifecycleCallback, None) + vc.storagePoolEventRegisterAny(None, libvirt.VIR_STORAGE_POOL_EVENT_ID_LIFECYCLE, myStoragePoolEventLifecycleCallback, None) + vc.storagePoolEventRegisterAny(None, libvirt.VIR_STORAGE_POOL_EVENT_ID_REFRESH, myStoragePoolEventRefreshCallback, None) vc.setKeepAlive(5, 3) diff --git a/libvirt-override-virConnect.py b/libvirt-override-virConnect.py index 1aaa586..b085b07 100644 --- a/libvirt-override-virConnect.py +++ b/libvirt-override-virConnect.py @@ -312,6 +312,16 @@ cb(self, virStoragePool(self, _obj=pool), event, detail, opaque) return 0 + def _dispatchStoragePoolEventGenericCallback(self, pool, cbData): + """Dispatches events to python user storage pool + generic event callbacks + """ + cb = cbData["cb"] + opaque = cbData["opaque"] + + cb(self, virStoragePool(self, _obj=pool), opaque) + return 0 + def storagePoolEventDeregisterAny(self, callbackID): """Removes a Storage Pool Event Callback. De-registering for a storage pool callback will disable delivery of this event type""" diff --git a/libvirt-override.c b/libvirt-override.c index 4734b7e..79e3d30 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -8832,6 +8832,56 @@ libvirt_virConnectStoragePoolEventLifecycleCallback(virConnectPtr conn ATTRIBUTE return ret; } +static int +libvirt_virConnectStoragePoolEventGenericCallback(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolPtr pool, + void *opaque) +{ + PyObject *pyobj_cbData = (PyObject*)opaque; + PyObject *pyobj_pool; + 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 virNetworkPtr */ + virStoragePoolRef(pool); + if (!(pyobj_pool = libvirt_virStoragePoolPtrWrap(pool))) { + virStoragePoolFree(pool); + goto cleanup; + } + Py_INCREF(pyobj_cbData); + + /* Call the Callback Dispatcher */ + pyobj_ret = PyObject_CallMethod(pyobj_conn, + (char*)"_dispatchStoragePoolEventGenericCallback", + (char*)"OiiO", + pyobj_pool, + pyobj_cbData); + + Py_DECREF(pyobj_cbData); + Py_DECREF(pyobj_pool); + + 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; +} + static PyObject * libvirt_virConnectStoragePoolEventRegisterAny(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -8863,6 +8913,10 @@ libvirt_virConnectStoragePoolEventRegisterAny(PyObject *self ATTRIBUTE_UNUSED, cb = VIR_STORAGE_POOL_EVENT_CALLBACK(libvirt_virConnectStoragePoolEventLifecycleCallback); break; + case VIR_STORAGE_POOL_EVENT_ID_REFRESH: + cb = VIR_STORAGE_POOL_EVENT_CALLBACK(libvirt_virConnectStoragePoolEventGenericCallback); + break; + case VIR_STORAGE_POOL_EVENT_ID_LAST: break; } -- 2.7.4

2 1

[libvirt] [PATCH] Promote storage pool refresh lifecycle event to top level event
by Daniel P. Berrange 24 Jun '16

24 Jun '16

The VIR_STORAGE_POOL_EVENT_REFRESHED constant does not reflect any change in the lifecycle of the storage pool. It should thus not be part of the storage pool lifecycle event set, but rather be a top level event in its own right. Thus we introduce VIR_STORAGE_POOL_EVENT_ID_REFRESH to replace it. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- NB this breaks API and wire protocol, so we *must* include this before 2.0.0. Ideally we should get it into before we cut any rc release too. daemon/remote.c | 29 +++++++++++++++++ examples/object-events/event-test.c | 14 ++++++-- include/libvirt/libvirt-storage.h | 2 +- src/conf/storage_event.c | 57 +++++++++++++++++++++++++++++++++ src/conf/storage_event.h | 4 +++ src/libvirt_private.syms | 1 + src/remote/remote_driver.c | 30 +++++++++++++++++ src/remote/remote_protocol.x | 13 +++++++- src/remote_protocol-structs | 5 +++ src/storage/storage_driver.c | 12 +++---- src/test/test_driver.c | 4 +-- tests/objecteventtest.c | 29 ++++++++++++----- tools/virsh-pool.c | 64 +++++++++++++++++++++++++++++++------ 13 files changed, 232 insertions(+), 32 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 5ee82bb..4aa43c2 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -1294,8 +1294,37 @@ remoteRelayStoragePoolEventLifecycle(virConnectPtr conn, return 0; } +static int +remoteRelayStoragePoolEventRefresh(virConnectPtr conn, + virStoragePoolPtr pool, + void *opaque) +{ + daemonClientEventCallbackPtr callback = opaque; + remote_storage_pool_event_refresh_msg data; + + if (callback->callbackID < 0 || + !remoteRelayStoragePoolEventCheckACL(callback->client, conn, pool)) + return -1; + + VIR_DEBUG("Relaying storage pool refresh event callback %d", + callback->callbackID); + + /* build return data */ + memset(&data, 0, sizeof(data)); + make_nonnull_storage_pool(&data.pool, pool); + data.callbackID = callback->callbackID; + + remoteDispatchObjectEventSend(callback->client, remoteProgram, + REMOTE_PROC_STORAGE_POOL_EVENT_REFRESH, + (xdrproc_t)xdr_remote_storage_pool_event_refresh_msg, + &data); + + return 0; +} + static virConnectStoragePoolEventGenericCallback storageEventCallbacks[] = { VIR_STORAGE_POOL_EVENT_CALLBACK(remoteRelayStoragePoolEventLifecycle), + VIR_STORAGE_POOL_EVENT_CALLBACK(remoteRelayStoragePoolEventRefresh), }; verify(ARRAY_CARDINALITY(storageEventCallbacks) == VIR_STORAGE_POOL_EVENT_ID_LAST); diff --git a/examples/object-events/event-test.c b/examples/object-events/event-test.c index 215e026..f2f71cc 100644 --- a/examples/object-events/event-test.c +++ b/examples/object-events/event-test.c @@ -349,8 +349,6 @@ storagePoolEventToString(int event) return "Started"; case VIR_STORAGE_POOL_EVENT_STOPPED: return "Stopped"; - case VIR_STORAGE_POOL_EVENT_REFRESHED: - return "Refreshed"; case VIR_STORAGE_POOL_EVENT_LAST: break; } @@ -679,6 +677,17 @@ myStoragePoolEventCallback(virConnectPtr conn ATTRIBUTE_UNUSED, } +static int +myStoragePoolEventRefreshCallback(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolPtr pool, + void *opaque ATTRIBUTE_UNUSED) +{ + printf("%s EVENT: Storage pool %s refresh\n", __func__, + virStoragePoolGetName(pool)); + return 0; +} + + static void eventTypedParamsPrint(virTypedParameterPtr params, int nparams) @@ -936,6 +945,7 @@ struct storagePoolEventData { struct storagePoolEventData storagePoolEvents[] = { STORAGE_POOL_EVENT(VIR_STORAGE_POOL_EVENT_ID_LIFECYCLE, myStoragePoolEventCallback), + STORAGE_POOL_EVENT(VIR_STORAGE_POOL_EVENT_ID_REFRESH, myStoragePoolEventRefreshCallback), }; /* make sure that the events are kept in sync */ diff --git a/include/libvirt/libvirt-storage.h b/include/libvirt/libvirt-storage.h index a67a97f..0974f6e 100644 --- a/include/libvirt/libvirt-storage.h +++ b/include/libvirt/libvirt-storage.h @@ -394,6 +394,7 @@ int virStoragePoolIsPersistent(virStoragePoolPtr pool); */ typedef enum { VIR_STORAGE_POOL_EVENT_ID_LIFECYCLE = 0, /* virConnectStoragePoolEventLifecycleCallback */ + VIR_STORAGE_POOL_EVENT_ID_REFRESH = 1, /* virConnectStoragePoolEventGenericCallback */ # ifdef VIR_ENUM_SENTINELS VIR_STORAGE_POOL_EVENT_ID_LAST @@ -443,7 +444,6 @@ typedef enum { VIR_STORAGE_POOL_EVENT_UNDEFINED = 1, VIR_STORAGE_POOL_EVENT_STARTED = 2, VIR_STORAGE_POOL_EVENT_STOPPED = 3, - VIR_STORAGE_POOL_EVENT_REFRESHED = 4, # ifdef VIR_ENUM_SENTINELS VIR_STORAGE_POOL_EVENT_LAST diff --git a/src/conf/storage_event.c b/src/conf/storage_event.c index c5688be..5768bab 100644 --- a/src/conf/storage_event.c +++ b/src/conf/storage_event.c @@ -48,10 +48,20 @@ struct _virStoragePoolEventLifecycle { typedef struct _virStoragePoolEventLifecycle virStoragePoolEventLifecycle; typedef virStoragePoolEventLifecycle *virStoragePoolEventLifecyclePtr; +struct _virStoragePoolEventRefresh { + virStoragePoolEvent parent; + + bool dummy; +}; +typedef struct _virStoragePoolEventRefresh virStoragePoolEventRefresh; +typedef virStoragePoolEventRefresh *virStoragePoolEventRefreshPtr; + static virClassPtr virStoragePoolEventClass; static virClassPtr virStoragePoolEventLifecycleClass; +static virClassPtr virStoragePoolEventRefreshClass; static void virStoragePoolEventDispose(void *obj); static void virStoragePoolEventLifecycleDispose(void *obj); +static void virStoragePoolEventRefreshDispose(void *obj); static int virStoragePoolEventsOnceInit(void) @@ -68,6 +78,12 @@ virStoragePoolEventsOnceInit(void) sizeof(virStoragePoolEventLifecycle), virStoragePoolEventLifecycleDispose))) return -1; + if (!(virStoragePoolEventRefreshClass = + virClassNew(virStoragePoolEventClass, + "virStoragePoolEventRefresh", + sizeof(virStoragePoolEventRefresh), + virStoragePoolEventRefreshDispose))) + return -1; return 0; } @@ -90,6 +106,14 @@ virStoragePoolEventLifecycleDispose(void *obj) static void +virStoragePoolEventRefreshDispose(void *obj) +{ + virStoragePoolEventRefreshPtr event = obj; + VIR_DEBUG("obj=%p", event); +} + + +static void virStoragePoolEventDispatchDefaultFunc(virConnectPtr conn, virObjectEventPtr event, virConnectObjectEventGenericCallback cb, @@ -115,6 +139,13 @@ virStoragePoolEventDispatchDefaultFunc(virConnectPtr conn, goto cleanup; } + case VIR_STORAGE_POOL_EVENT_ID_REFRESH: + { + ((virConnectStoragePoolEventGenericCallback)cb)(conn, pool, + cbopaque); + goto cleanup; + } + case VIR_STORAGE_POOL_EVENT_ID_LAST: break; } @@ -235,3 +266,29 @@ virStoragePoolEventLifecycleNew(const char *name, return (virObjectEventPtr)event; } + + +/** + * virStoragePoolEventRefreshNew: + * @name: name of the storage pool object the event describes + * @uuid: uuid of the storage pool object the event describes + * + * Create a new storage pool refresh event. + */ +virObjectEventPtr +virStoragePoolEventRefreshNew(const char *name, + const unsigned char *uuid) +{ + virStoragePoolEventRefreshPtr event; + + if (virStoragePoolEventsInitialize() < 0) + return NULL; + + if (!(event = virObjectEventNew(virStoragePoolEventRefreshClass, + virStoragePoolEventDispatchDefaultFunc, + VIR_STORAGE_POOL_EVENT_ID_REFRESH, + 0, name, uuid))) + return NULL; + + return (virObjectEventPtr)event; +} diff --git a/src/conf/storage_event.h b/src/conf/storage_event.h index 7c8ccb7..ea72691 100644 --- a/src/conf/storage_event.h +++ b/src/conf/storage_event.h @@ -57,4 +57,8 @@ virStoragePoolEventLifecycleNew(const char *name, int type, int detail); +virObjectEventPtr +virStoragePoolEventRefreshNew(const char *name, + const unsigned char *uuid); + #endif diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index ef30f7f..0009f89 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -881,6 +881,7 @@ virStorageVolTypeToString; # conf/storage_event.h virStoragePoolEventLifecycleNew; +virStoragePoolEventRefreshNew; virStoragePoolEventStateRegisterID; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 1f81f03..e9904f8 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -362,6 +362,11 @@ remoteStoragePoolBuildEventLifecycle(virNetClientProgramPtr prog ATTRIBUTE_UNUSE void *evdata, void *opaque); static void +remoteStoragePoolBuildEventRefresh(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, + virNetClientPtr client ATTRIBUTE_UNUSED, + void *evdata, void *opaque); + +static void remoteConnectNotifyEventConnectionClosed(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, virNetClientPtr client ATTRIBUTE_UNUSED, void *evdata, void *opaque); @@ -544,6 +549,10 @@ static virNetClientProgramEvent remoteEvents[] = { remoteStoragePoolBuildEventLifecycle, sizeof(remote_storage_pool_event_lifecycle_msg), (xdrproc_t)xdr_remote_storage_pool_event_lifecycle_msg }, + { REMOTE_PROC_STORAGE_POOL_EVENT_REFRESH, + remoteStoragePoolBuildEventRefresh, + sizeof(remote_storage_pool_event_refresh_msg), + (xdrproc_t)xdr_remote_storage_pool_event_refresh_msg }, }; static void @@ -5134,6 +5143,27 @@ remoteStoragePoolBuildEventLifecycle(virNetClientProgramPtr prog ATTRIBUTE_UNUSE } static void +remoteStoragePoolBuildEventRefresh(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, + virNetClientPtr client ATTRIBUTE_UNUSED, + void *evdata, void *opaque) +{ + virConnectPtr conn = opaque; + struct private_data *priv = conn->privateData; + remote_storage_pool_event_refresh_msg *msg = evdata; + virStoragePoolPtr pool; + virObjectEventPtr event = NULL; + + pool = get_nonnull_storage_pool(conn, msg->pool); + if (!pool) + return; + + event = virStoragePoolEventRefreshNew(pool->name, pool->uuid); + virObjectUnref(pool); + + remoteEventQueue(priv, event, msg->callbackID); +} + +static void remoteDomainBuildQemuMonitorEvent(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, virNetClientPtr client ATTRIBUTE_UNUSED, void *evdata, void *opaque) diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index d11bfdf..4403714 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -3126,6 +3126,11 @@ struct remote_storage_pool_event_lifecycle_msg { int detail; }; +struct remote_storage_pool_event_refresh_msg { + int callbackID; + remote_nonnull_storage_pool pool; +}; + struct remote_domain_fsfreeze_args { remote_nonnull_domain dom; remote_nonnull_string mountpoints<REMOTE_DOMAIN_FSFREEZE_MOUNTPOINTS_MAX>; /* (const char **) */ @@ -5871,5 +5876,11 @@ enum remote_procedure { * @generate: both * @acl: domain:write */ - REMOTE_PROC_DOMAIN_SET_GUEST_VCPUS = 372 + REMOTE_PROC_DOMAIN_SET_GUEST_VCPUS = 372, + + /** + * @generate: both + * @acl: none + */ + REMOTE_PROC_STORAGE_POOL_EVENT_REFRESH = 373 }; diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 0d89b15..46e798b 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -2567,6 +2567,10 @@ struct remote_storage_pool_event_lifecycle_msg { int event; int detail; }; +struct remote_storage_pool_event_refresh_msg { + int callbackID; + remote_nonnull_storage_pool pool; +}; struct remote_domain_fsfreeze_args { remote_nonnull_domain dom; struct { @@ -3140,4 +3144,5 @@ enum remote_procedure { REMOTE_PROC_STORAGE_POOL_EVENT_LIFECYCLE = 370, REMOTE_PROC_DOMAIN_GET_GUEST_VCPUS = 371, REMOTE_PROC_DOMAIN_SET_GUEST_VCPUS = 372, + REMOTE_PROC_STORAGE_POOL_EVENT_REFRESH = 373, }; diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index d75c5aa..cef2124 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1206,10 +1206,8 @@ storagePoolRefresh(virStoragePoolPtr obj, goto cleanup; } - event = virStoragePoolEventLifecycleNew(pool->def->name, - pool->def->uuid, - VIR_STORAGE_POOL_EVENT_REFRESHED, - 0); + event = virStoragePoolEventRefreshNew(pool->def->name, + pool->def->uuid); ret = 0; cleanup: @@ -2342,10 +2340,8 @@ virStorageVolPoolRefreshThread(void *opaque) if (backend->refreshPool(NULL, pool) < 0) VIR_DEBUG("Failed to refresh storage pool"); - event = virStoragePoolEventLifecycleNew(pool->def->name, - pool->def->uuid, - VIR_STORAGE_POOL_EVENT_REFRESHED, - 0); + event = virStoragePoolEventRefreshNew(pool->def->name, + pool->def->uuid); cleanup: if (event) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 2622335..baff085 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -4480,9 +4480,7 @@ testStoragePoolRefresh(virStoragePoolPtr pool, goto cleanup; } - event = virStoragePoolEventLifecycleNew(pool->name, pool->uuid, - VIR_STORAGE_POOL_EVENT_REFRESHED, - 0); + event = virStoragePoolEventRefreshNew(pool->name, pool->uuid); ret = 0; cleanup: diff --git a/tests/objecteventtest.c b/tests/objecteventtest.c index ac8cce3..5e8087b 100644 --- a/tests/objecteventtest.c +++ b/tests/objecteventtest.c @@ -67,7 +67,6 @@ typedef struct { int defineEvents; int undefineEvents; int unexpectedEvents; - int refreshEvents; } lifecycleEventCounter; static void @@ -78,7 +77,6 @@ lifecycleEventCounter_reset(lifecycleEventCounter *counter) counter->defineEvents = 0; counter->undefineEvents = 0; counter->unexpectedEvents = 0; - counter->refreshEvents = 0; } typedef struct { @@ -153,8 +151,16 @@ storagePoolLifecycleCb(virConnectPtr conn ATTRIBUTE_UNUSED, counter->defineEvents++; else if (event == VIR_STORAGE_POOL_EVENT_UNDEFINED) counter->undefineEvents++; - else if (event == VIR_STORAGE_POOL_EVENT_REFRESHED) - counter->refreshEvents++; +} + +static void +storagePoolRefreshCb(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolPtr pool ATTRIBUTE_UNUSED, + void* opaque) +{ + int *counter = opaque; + + (*counter)++; } static int @@ -646,18 +652,24 @@ testStoragePoolStartStopEvent(const void *data) { const objecteventTest *test = data; lifecycleEventCounter counter; - int id; + int refreshCounter; + int id1, id2; int ret = 0; if (!test->pool) return -1; lifecycleEventCounter_reset(&counter); + refreshCounter = 0; - id = virConnectStoragePoolEventRegisterAny(test->conn, test->pool, + id1 = virConnectStoragePoolEventRegisterAny(test->conn, test->pool, VIR_STORAGE_POOL_EVENT_ID_LIFECYCLE, VIR_STORAGE_POOL_EVENT_CALLBACK(&storagePoolLifecycleCb), &counter, NULL); + id2 = virConnectStoragePoolEventRegisterAny(test->conn, test->pool, + VIR_STORAGE_POOL_EVENT_ID_REFRESH, + VIR_STORAGE_POOL_EVENT_CALLBACK(&storagePoolRefreshCb), + &refreshCounter, NULL); virStoragePoolCreate(test->pool, 0); virStoragePoolRefresh(test->pool, 0); virStoragePoolDestroy(test->pool); @@ -668,13 +680,14 @@ testStoragePoolStartStopEvent(const void *data) } if (counter.startEvents != 1 || counter.stopEvents != 1 || - counter.refreshEvents != 1 || counter.unexpectedEvents > 0) { + refreshCounter != 1 || counter.unexpectedEvents > 0) { ret = -1; goto cleanup; } cleanup: - virConnectStoragePoolEventDeregisterAny(test->conn, id); + virConnectStoragePoolEventDeregisterAny(test->conn, id1); + virConnectStoragePoolEventDeregisterAny(test->conn, id2); return ret; } diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index 18e218c..6045331 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -1899,8 +1899,7 @@ VIR_ENUM_IMPL(virshPoolEvent, N_("Defined"), N_("Undefined"), N_("Started"), - N_("Stopped"), - N_("Refreshed")) + N_("Stopped")) static const char * virshPoolEventToString(int event) @@ -1909,18 +1908,21 @@ virshPoolEventToString(int event) return str ? _(str) : _("unknown"); } +struct vshEventCallback { + const char *name; + virConnectStoragePoolEventGenericCallback cb; +}; +typedef struct vshEventCallback vshEventCallback; + struct virshPoolEventData { vshControl *ctl; bool loop; bool timestamp; int count; + vshEventCallback *cb; }; typedef struct virshPoolEventData virshPoolEventData; -VIR_ENUM_DECL(virshPoolEventId) -VIR_ENUM_IMPL(virshPoolEventId, - VIR_STORAGE_POOL_EVENT_ID_LAST, - "lifecycle") static void vshEventLifecyclePrint(virConnectPtr conn ATTRIBUTE_UNUSED, @@ -1955,6 +1957,45 @@ vshEventLifecyclePrint(virConnectPtr conn ATTRIBUTE_UNUSED, vshEventDone(data->ctl); } +static void +vshEventGenericPrint(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolPtr pool, + void *opaque) +{ + virshPoolEventData *data = opaque; + + if (!data->loop && data->count) + return; + + if (data->timestamp) { + char timestamp[VIR_TIME_STRING_BUFLEN]; + + if (virTimeStringNowRaw(timestamp) < 0) + timestamp[0] = '\0'; + + vshPrint(data->ctl, _("%s: event '%s'' for storage pool %s\n"), + timestamp, + data->cb->name, + virStoragePoolGetName(pool)); + } else { + vshPrint(data->ctl, _("event '%s' for storage pool %s\n"), + data->cb->name, + virStoragePoolGetName(pool)); + } + + data->count++; + if (!data->loop) + vshEventDone(data->ctl); +} + +static vshEventCallback vshEventCallbacks[] = { + { "lifecycle", + VIR_STORAGE_POOL_EVENT_CALLBACK(vshEventLifecyclePrint), }, + { "refresh", vshEventGenericPrint, } +}; +verify(VIR_STORAGE_POOL_EVENT_ID_LAST == ARRAY_CARDINALITY(vshEventCallbacks)); + + static const vshCmdInfo info_pool_event[] = { {.name = "help", .data = N_("Storage Pool Events") @@ -2009,7 +2050,7 @@ cmdPoolEvent(vshControl *ctl, const vshCmd *cmd) size_t i; for (i = 0; i < VIR_STORAGE_POOL_EVENT_ID_LAST; i++) - vshPrint(ctl, "%s\n", virshPoolEventIdTypeToString(i)); + vshPrint(ctl, "%s\n", vshEventCallbacks[i].name); return true; } @@ -2019,7 +2060,11 @@ cmdPoolEvent(vshControl *ctl, const vshCmd *cmd) vshError(ctl, "%s", _("either --list or event type is required")); return false; } - if ((event = virshPoolEventIdTypeFromString(eventName)) < 0) { + + for (event = 0; event < VIR_STORAGE_POOL_EVENT_ID_LAST; event++) + if (STREQ(eventName, vshEventCallbacks[event].name)) + break; + if (event == VIR_STORAGE_POOL_EVENT_ID_LAST) { vshError(ctl, _("unknown event type %s"), eventName); return false; } @@ -2028,6 +2073,7 @@ cmdPoolEvent(vshControl *ctl, const vshCmd *cmd) data.loop = vshCommandOptBool(cmd, "loop"); data.timestamp = vshCommandOptBool(cmd, "timestamp"); data.count = 0; + data.cb = &vshEventCallbacks[event]; if (vshCommandOptTimeoutToMs(ctl, cmd, &timeout) < 0) return false; @@ -2037,7 +2083,7 @@ cmdPoolEvent(vshControl *ctl, const vshCmd *cmd) goto cleanup; if ((eventId = virConnectStoragePoolEventRegisterAny(priv->conn, pool, event, - VIR_STORAGE_POOL_EVENT_CALLBACK(vshEventLifecyclePrint), + data.cb->cb, &data, NULL)) < 0) goto cleanup; switch (vshEventWait(ctl)) { -- 2.7.4

2 3

[libvirt] [PATCH v2 0/3] Fix the domain capabilities wrt maxvcpus
by Shivaprasad G Bhat 24 Jun '16

24 Jun '16

This series drops the suggested cpu in the domcapabilties output which was implemented in previous version. So, this has just the fix for the domcapabililties output wrt maxvcpus. I'll follow up this series with suggested cpus and the virsh maxvcpus fix. The previous version is available here. http://www.redhat.com/archives/libvir-list/2016-June/msg00947.html --- Shivaprasad G Bhat (3): Rename kvmGetMaxVCPUs() to virHostCPUGetKVMMaxVCPUs() Check the kvm host cpu max limits in virConnectGetDomainCapabilities Document to not rely on virConnectGetMaxVcpus API src/libvirt-host.c | 5 +++- src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 11 ++++++--- src/qemu/qemu_capabilities.h | 3 ++ src/qemu/qemu_driver.c | 54 ++---------------------------------------- src/util/virhostcpu.c | 36 ++++++++++++++++++++++++++++ src/util/virhostcpu.h | 2 ++ tests/domaincapstest.c | 3 ++ 8 files changed, 57 insertions(+), 58 deletions(-) -- Signature

2 6

[libvirt] [PATCH python v4 0/7] Introducing storage pool lifecycle event APIs
by Jovanka Gulicoska 24 Jun '16

24 Jun '16

Introducing implementation of storage pool event APIs. Code changes follow network event APIs. Implemented functions: virStoragePoolEventRegisterAny(), virStoragePoolEventDeregisterAny(), virStoragePoolLifeCycleEventNew(), introduced STARTED, STOPPED, DEFINE, UNDEFINE and REFRESHED. STARTED signal is emiited in storagePoolCreateXML() and storagePoolCreate() DEFINED signal is emitted in storagePoolDefineXML() UNDEFINED signal is emitted in storagePoolUndefine() STOPPED signal is emitted in storagePoolDestroy() and storagePoolRefresh() REFRESHED signal is emitted in storagePoolRefresh() There are also test as well as unittests for the new functions and signals. This is part of a GSOC project: Asynchronous lifecycle events for storage objects As part of the project there should also be implementation for storage volume events. For now there's no signal when volumes are created or deleted, they can also be implemented, but probably the easiest way is to have apps watch for REFRESH signal, and later extend storage driver code to refresh a pool after volume APIs are called. Changes since v1: small changes following comments Changes since v2: #1 - fix broken alignment in datatypes and fix typos in docstring #2 - rename STORAGE_POOL_EVENT_SOURCES to STORAGE_EVENT_SOURCES, change copyright #3 - fixed spacing issue in comments in test driver #4 - fix comment formating, change in comment, move REMOTE_PROC_STORAGE_POOL_EVENT_LIFECYCLE to buttom of list #5 - include storageEventState pointer, change version from 1.3.6 to 2.0.0, use callbackID insted of ret in storageConnectStoragePoolEventRegisterAny() #6 - use domain like lifecycle event callback Changes since v3: moved storage_conf.h from patch #2 to #6, indentation in remote_protocol-stucts (Martin's suggestion) Jovanka Gulicoska (7): Introduce storage lifecycle event APIs conf: add storage_event handling test: implement storage lifecycle event APIs remote: implement storage lifecycle event APIs storage: implement storage lifecycle event APIs event-test: support storage lifecycle event APIs virsh: Introduce virsh-pool command daemon/libvirtd.h | 2 + daemon/remote.c | 207 ++++++++++++++++++++++++++++++- examples/object-events/event-test.c | 73 +++++++++++ include/libvirt/libvirt-storage.h | 93 ++++++++++++++ src/Makefile.am | 5 + src/conf/storage_conf.h | 4 + src/conf/storage_event.c | 237 ++++++++++++++++++++++++++++++++++++ src/conf/storage_event.h | 60 +++++++++ src/datatypes.h | 13 ++ src/driver-storage.h | 13 ++ src/libvirt-storage.c | 125 +++++++++++++++++++ src/libvirt_private.syms | 5 + src/libvirt_public.syms | 6 + src/remote/remote_driver.c | 128 +++++++++++++++++++ src/remote/remote_protocol.x | 43 ++++++- src/remote_protocol-structs | 19 +++ src/storage/storage_driver.c | 110 +++++++++++++++++ src/test/test_driver.c | 71 +++++++++++ tests/objecteventtest.c | 177 +++++++++++++++++++++++++++ tools/virsh-pool.c | 184 ++++++++++++++++++++++++++++ 20 files changed, 1571 insertions(+), 4 deletions(-) create mode 100644 src/conf/storage_event.c create mode 100644 src/conf/storage_event.h -- 2.5.5

3 11

[libvirt] [PATCH] daemon: Drop dependency on libvirt-admin.so
by Michal Privoznik 24 Jun '16

24 Jun '16

Currently, the daemon requires libvirt-admin.so because the functions encoding/decoding RPC messages for admin APIs live there. But this makes it very hard to split admin API into its own separate package: if libvirt-admin.so is going to live in a separate package than the daemon, either both packages must be installed or none. Solve this by statically linking the RPC message handling functions with the daemon. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- I'm a bit torn. I'm tempted to rewrite some parts of admin API so that it follows the driver architecture we have for other areas, e.g. domain drivers. Until then, this patch is needed. daemon/Makefile.am | 2 +- src/Makefile.am | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 927d16f..3b6aafe 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -152,7 +152,7 @@ libvirtd_admin_la_LDFLAGS = \ $(NO_INDIRECT_LDFLAGS) \ $(NULL) libvirtd_admin_la_LIBADD = \ - ../src/libvirt-admin.la + ../src/libvirt-admin-rpc.la man8_MANS = libvirtd.8 diff --git a/src/Makefile.am b/src/Makefile.am index 9f8b638..7c3cef6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -592,7 +592,7 @@ $(srcdir)/lock_protocol-struct: \ $(srcdir)/%-struct: locking/lockd_la-%.lo $(PDWTAGS) $(srcdir)/admin_protocol-struct: \ - $(srcdir)/%-struct: admin/libvirt_admin_la-%.lo + $(srcdir)/%-struct: admin/%.lo $(PDWTAGS) else !WITH_REMOTE @@ -2165,10 +2165,20 @@ libvirt_admin.syms: libvirt_admin_public.syms $(ADMIN_SYM_FILES) \ # need to include it in the dist EXTRA_DIST += admin/admin_remote.c +noinst_LTLIBRARIES += \ + libvirt-admin-rpc.la + +libvirt_admin_rpc_la_SOURCES = \ + $(ADMIN_PROTOCOL_GENERATED) + +libvirt_admin_rpc_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(CYGWIN_EXTRA_LDFLAGS) \ + $(MINGW_EXTRA_LDFLAGS) + lib_LTLIBRARIES += libvirt-admin.la libvirt_admin_la_SOURCES = \ libvirt-admin.c \ - $(ADMIN_PROTOCOL_GENERATED) \ $(DATATYPES_SOURCES) libvirt_admin_la_LDFLAGS = \ @@ -2180,6 +2190,7 @@ libvirt_admin_la_LDFLAGS = \ libvirt_admin_la_LIBADD = \ libvirt.la \ + libvirt-admin-rpc.la \ $(CYGWIN_EXTRA_LIBADD) libvirt_admin_la_CFLAGS = \ -- 2.8.4

5 11

[libvirt] [PATCH] sasl auth：add default mapping of credentials to machines
by longguang.yue 24 Jun '16

24 Jun '16

hi,all: in production environment, it is important to keep safe. libvirt does automatic validation, but it needs to set up mapping for each machine. this patch is to add default certificate mapping , make it easy in lange scale environment. maybe another way is using regex to do exact match, if this idea is helpful, i can continue thanks

2 3

[libvirt] [PATCH 0/3] A few more cleanups
by Ján Tomko 24 Jun '16

24 Jun '16

Ján Tomko (3): Replace some uses STREQLEN with STRPREFIX Fix error detection in virStorageBackendISCSIGetHostNumber openvz: do not open-code STRSKIP src/openvz/openvz_conf.c | 3 +-- src/qemu/qemu_command.c | 2 +- src/storage/storage_backend_iscsi.c | 42 ++++++++++++++++++------------------- src/storage/storage_backend_scsi.c | 2 +- src/xen/xen_hypervisor.c | 4 ++-- 5 files changed, 26 insertions(+), 27 deletions(-) -- 2.7.3

3 5

[libvirt] [PATCH] conf: Allow disks with identical WWN or serial
by Peter Krempa 24 Jun '16

24 Jun '16

Disallowing them broke a use case of testing multipath configurations for storage. The original intent was added as it made it impossible to use certain /dev/disk-by... links. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1349895 --- src/conf/domain_conf.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9443281..68e89ed 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -24906,20 +24906,6 @@ virDomainDiskDefCheckDuplicateInfo(const virDomainDiskDef *a, return -1; } - if (a->wwn && b->wwn && STREQ(a->wwn, b->wwn)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Disks '%s' and '%s' have identical WWN"), - a->dst, b->dst); - return -1; - } - - if (a->serial && b->serial && STREQ(a->serial, b->serial)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Disks '%s' and '%s' have identical serial"), - a->dst, b->dst); - return -1; - } - return 0; } -- 2.9.0

2 3

[libvirt] [PATCH 0/4] Fix the domain capabilities wrt maxvcpus
by Shivaprasad G Bhat 24 Jun '16

24 Jun '16

This series addresses the comments to my patch in http://www.redhat.com/archives/libvir-list/2016-May/msg00218.html The v2 got quite a lot of criticism to not to change the virConnectGetMaxVCPUS() instead document to use the virConnectGetDomainCapabilities(). The virConnectGetDomainCapabilities() is extended to check for the host limits and the NR_CPUs are also returned. I am planning to follow up this series with possible fixes to maxvcpus command once this merged. --- Shivaprasad G Bhat (4): Document to not rely on virConnectGetMaxVcpus API Rename and move kvmGetMaxVCPUs to utils and extend it Check for VFIO too where the Legacy passthrough is checked Check the kvm host cpu max limits in virConnectGetDomainCapabilities() docs/formatdomaincaps.html.in | 4 +-- src/conf/domain_capabilities.c | 10 +++++-- src/conf/domain_capabilities.h | 1 + src/libvirt-host.c | 6 ++++ src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 13 +++++++-- src/qemu/qemu_capabilities.h | 3 +- src/qemu/qemu_driver.c | 57 +++------------------------------------- src/util/virhostcpu.c | 37 ++++++++++++++++++++++++++ src/util/virhostcpu.h | 7 +++++ tests/domaincapstest.c | 3 +- 11 files changed, 78 insertions(+), 64 deletions(-) -- Signature

2 12

[libvirt] [PATCH] docs: Fix whitespace in output
by John Ferlan 24 Jun '16

24 Jun '16

Many moons ago, commit id '8d7800a55' adjusted the format of the output to add a space on the HEADER and the DATA... the docs weren't updated to reflect that... This makes that adjustment. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushed as trivial, but noted as a result of reviews done on LUKS series docs/formatsecret.html.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/formatsecret.html.in b/docs/formatsecret.html.in index 599cb38..c39d2a7 100644 --- a/docs/formatsecret.html.in +++ b/docs/formatsecret.html.in @@ -123,9 +123,9 @@ Secret 1b40a534-8301-45d5-b1aa-11894ebb1735 created # # virsh secret-list - UUID Usage + UUID Usage ----------------------------------------------------------- - 1b40a534-8301-45d5-b1aa-11894ebb1735 cephx ceph_example + 1b40a534-8301-45d5-b1aa-11894ebb1735 cephx ceph_example # # CEPHPHRASE=`printf %s "pass phrase" | base64` # virsh secret-set-value 1b40a534-8301-45d5-b1aa-11894ebb1735 $CEPHPHRASE @@ -209,9 +209,9 @@ Secret c4dbe20b-b1a3-4ac1-b6e6-2ac97852ebb6 created # virsh secret-list - UUID Usage + UUID Usage ----------------------------------------------------------- - c4dbe20b-b1a3-4ac1-b6e6-2ac97852ebb6 iscsi libvirtiscsi + c4dbe20b-b1a3-4ac1-b6e6-2ac97852ebb6 iscsi libvirtiscsi # MYSECRET=`printf %s "mysecret" | base64` # virsh secret-set-value c4dbe20b-b1a3-4ac1-b6e6-2ac97852ebb6 $MYSECRET -- 2.5.5

1 0

[libvirt] [PATCH 0/6] storage: fix issues with pool state cleanup
by Cole Robinson 24 Jun '16

24 Jun '16

This series fixes several issues with pool shutdown cleanup regarding transient pool removal, newDef assignment, and stateFile removal. Cole Robinson (6): storage: Break out storageDriverAutostartPool storage: Add storagePoolSetInactive storage: Handle transient pool removal in driver startup storage: delete: Don't unlink stateFile storage: Unlink stateFile in storagePoolSetInactive conf: sync error reporting for object configFile unlinking src/conf/domain_conf.c | 7 +- src/conf/network_conf.c | 6 +- src/conf/nwfilter_conf.c | 6 +- src/conf/storage_conf.c | 7 +- src/conf/virsecretobj.c | 2 +- src/storage/storage_driver.c | 198 ++++++++++++++++++++++--------------------- 6 files changed, 113 insertions(+), 113 deletions(-) -- 2.7.4

2 15

[libvirt] [PATCHv2] build: increase xz compression level
by Ján Tomko 24 Jun '16

24 Jun '16

Increase the default compression level to 9 from 6. This also increases decompression memory requirements from 9 MB to 65 MB. Also turn on verbosity. --- Makefile.am | 3 +++ 1 file changed, 3 insertions(+) v2: also use -v move the setting to Makefile.am diff --git a/Makefile.am b/Makefile.am index 4b4aad3..ef88067 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,6 +22,9 @@ GENHTML = genhtml SUBDIRS = . gnulib/lib include/libvirt src daemon tools docs gnulib/tests \ tests po examples +XZ_OPT ?= -9ev +export XZ_OPT + ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = \ -- 2.7.3

2 3

[libvirt] [PATCH v2 0/5] bhyve: virConnectDomainXMLFromNative
by Fabian Freyer 24 Jun '16

24 Jun '16

Aaand I'm reposting this series again, in the hope that this time it will consistently send to the mailing list. Again, very sorry for the noise. Differences to v1: - use gnulib's reentrant getopt implementation. This is necessary for thread safety. - config-post.h: __GNUC_PREREQ is defined here, since using gnulib's getopt pulls in other gnulib headers, which rely on __GNUC_PREREQ, which doesn't exist on FreeBSD. This approach is open for discussion: I chose config-post.h as this would likely always be the first header pulled in (through config.h). Link to v1: https://www.redhat.com/archives/libvir-list/2016-June/msg00001.html Fabian Freyer (5): config-post.h: define __GNUC_PREREQ if not defined gnulib: add getopt module bhyve: implement virConnectDomainXMLFromNative bhyve: implement bhyve argument parser bhyve: implement argument parser for loader bootstrap.conf | 1 + config-post.h | 11 + m4/virt-driver-bhyve.m4 | 3 + po/POTFILES.in | 1 + src/Makefile.am | 2 + src/bhyve/bhyve_driver.c | 42 ++ src/bhyve/bhyve_parse_command.c | 875 ++++++++++++++++++++++++++++++++++++++++ src/bhyve/bhyve_parse_command.h | 30 ++ 8 files changed, 965 insertions(+) create mode 100644 src/bhyve/bhyve_parse_command.c create mode 100644 src/bhyve/bhyve_parse_command.h -- 2.7.0

2 12

[libvirt] [PATCH] virStorageBackendISCSIGetHostNumber: correctly use virDirOpen
by Ján Tomko 24 Jun '16

24 Jun '16

Incorrect conflict resolution in my commit e81de04c1 broke this. --- src/storage/storage_backend_iscsi.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) Pushed under the build-breaker rule. diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c index 4a16d2b..98d1141 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -100,9 +100,7 @@ virStorageBackendISCSIGetHostNumber(const char *sysfs_path, virFileWaitForDevices(); - if (virDirOpen(&sysdir, sysfs_path) < 0) - virReportSystemError(errno, - _("Failed to opendir path '%s'"), sysfs_path); + if (virDirOpen(&sysdir, sysfs_path) < 0) { retval = -1; goto out; } -- 2.7.3

1 0

[libvirt] [PATCH 00/18] Allow domains to start with a dot
by Ján Tomko 24 Jun '16

24 Jun '16

Also introduce virDirOpen* and VIR_DIR_CLOSE helpers. https://bugzilla.redhat.com/show_bug.cgi?id=1333248 Ján Tomko (18): Do not save errno in virUSBDeviceSearch Fix error detection in virStorageBackendISCSIGetHostNumber Do not check the return value of closedir Introduce VIR_DIR_CLOSE Introduce virDirOpen Use virDirOpen Add virDirOpenIfExists Use virDirOpenIfExists Introduce virDirOpenQuiet Use virDirOpenQuiet Prohibit opendir in syntax-check Skip '.' and '..' in virDirRead Do not check for '.' and '..' after virDirRead Fix comment in virStorageBackendFileSystemRefresh Do not ignore hidden files in /sys and /proc Do not skip hidden entries when looking for a stable path Allow configs to start with a dot Do not skip files starting with a dot in leases directory cfg.mk | 7 +- src/conf/network_conf.c | 31 +++------ src/conf/nwfilter_conf.c | 15 ++--- src/conf/storage_conf.c | 30 +++------ src/conf/virdomainobjlist.c | 16 ++--- src/conf/virsecretobj.c | 14 ++-- src/libvirt_private.syms | 4 ++ src/network/bridge_driver.c | 17 ++--- src/openvz/openvz_conf.c | 5 +- src/qemu/qemu_driver.c | 14 +--- src/qemu/qemu_hostdev.c | 10 +-- src/storage/storage_backend.c | 11 ++-- src/storage/storage_backend_fs.c | 14 ++-- src/storage/storage_backend_iscsi.c | 47 +++++++------- src/storage/storage_backend_scsi.c | 30 ++------- src/util/vircgroup.c | 43 ++++--------- src/util/virfile.c | 124 ++++++++++++++++++++++++++---------- src/util/virfile.h | 9 +++ src/util/virhostcpu.c | 19 ++---- src/util/virnetdev.c | 10 +-- src/util/virnetdevtap.c | 9 +-- src/util/virnuma.c | 17 ++--- src/util/virpci.c | 36 +++-------- src/util/virprocess.c | 9 +-- src/util/virscsi.c | 22 ++----- src/util/virusb.c | 16 +---- src/util/virutil.c | 32 ++-------- src/xen/xen_inotify.c | 13 ++-- src/xen/xm_internal.c | 10 +-- tests/virschematest.c | 8 +-- tools/nss/libvirt_nss.c | 13 +--- 31 files changed, 245 insertions(+), 410 deletions(-) -- 2.7.3

2 27

[libvirt] [PATCH 1/1] cpu_map.xml: add cmt/mbm feature to x86
by Qiaowei Ren 24 Jun '16

24 Jun '16

Some Intel processor families (e.g. the Intel Xeon processor E5 v3 family) introduced some PQos (Platform Qos) features, including CMT (Cache Monitoring echnology) and MBM (Memory Bandwidth Monitoring), to monitor or control shared resource. This patch add them into x86 part of cpu_map.xml to be used for applications (like OpenStack) based on libvirt to get cpu capabilities. Signed-off-by: Qiaowei Ren <qiaowei.ren(a)intel.com> --- src/cpu/cpu_map.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index 08aded2..2e2cb4f 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -320,6 +320,9 @@ <feature name='rtm'> <cpuid function='0x00000007' ebx='0x00000800'/> </feature> + <feature name='cmt'> + <cpuid function='0x00000007' ebx='0x00001000'/> + </feature> <feature name='mpx'> <cpuid function='0x00000007' ebx='0x00004000'/> </feature> @@ -353,6 +356,14 @@ <cpuid function='0x80000007' edx='0x00000100'/> </feature> +  + <feature name='mbm_total'>  + <cpuid function='0x0000000f' edx='0x00000002'/> + </feature> + <feature name='mbm_local'>  + <cpuid function='0x0000000f' edx='0x00000004'/> + </feature> +  <model name='486'> <feature name='fpu'/> -- 1.9.1

4 6

[libvirt] [PATCH 0/2] Warn users with weird thread/memory alignment
by Martin Kletzander 24 Jun '16

24 Jun '16

People are doing weird things. Let's let them do what they want but gently warn them in case they did not want that exact behaviour and are looking for some possible problems. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1254402 Martin Kletzander (2): qemu: Add qemuProcessSetupPid() qemu: Check for thread <=> memory alignment src/qemu/qemu_driver.c | 4 +- src/qemu/qemu_process.c | 375 ++++++++++++++++++++++-------------------------- src/qemu/qemu_process.h | 6 +- 3 files changed, 181 insertions(+), 204 deletions(-) -- 2.9.0

3 9

[libvirt] [PATCH] Don't allow raneming domains to empty strings
by Martin Kletzander 24 Jun '16

24 Jun '16

It may cause unwanted behaviour (of course, is there any wanted one for that case?) so we should rather disable the possibility of doing so. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1320893 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/libvirt-domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 508520efd6c5..89a2d7efe972 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -8790,7 +8790,7 @@ virDomainRename(virDomainPtr dom, virResetLastError(); virCheckDomainReturn(dom, -1); - virCheckNonNullArgGoto(new_name, error); + virCheckNonEmptyStringArgGoto(new_name, error); virCheckReadOnlyGoto(dom->conn->flags, error); if (dom->conn->driver->domainRename) { -- 2.9.0

4 5

[libvirt] [PATCH 0/3] Add hotplug/unplug for RBD disk with AES secret
by John Ferlan 24 Jun '16

24 Jun '16

Since AES secrets were setup for RBD during qemuDomainSecretDiskPrepare, the secret object needs to be added to the command line when hotplugging. Additionally, when unplugging, if there's an AES secret, we need to remove it. John Ferlan (3): qemu: Remove type from qemuBuildSecretInfoProps qemu: Make qemuBuildSecretInfoProps global qemu: Add secinfo for hotplug virtio disk src/qemu/qemu_command.c | 11 +++-------- src/qemu/qemu_command.h | 4 ++++ src/qemu/qemu_hotplug.c | 44 ++++++++++++++++++++++++++++++++++++++------ 3 files changed, 45 insertions(+), 14 deletions(-) -- 2.5.5

2 6

[libvirt] [libvirt-test-API] Plans for code update
by Ruifeng Bian 24 Jun '16

24 Jun '16

I am not sure how many of you keep an eye on this project. The project is for testing libvirt-python APIs, but many test cases are not fully implemented until now. We want to keep this project updated in the future, the following aspects will be considered to update the code: 1. Code style - Use inspekt to check code style. 2. Pythonizing the code - Replace all shell scripts with python. 3. Bug fixing - Some code bugs need to be fixed. 4. New features - Add more API test cases. Any feedback or suggestion is welcome. Let's work together to contribute to this project. Thanks, Ruifeng Bian

2 4

[libvirt] [PATCH 0/4] Add architecture checks to qemuDomainMachineIs*()
by Andrea Bolognani 24 Jun '16

24 Jun '16

The pseries machine type is only available on ppc64/ppc64le, and in the same way the virt machine type is only available on armv7l/aarch64. Until either machine type is introduced on another architecture, we can perform the architecture checks in a single location instead of repeating them all over the place. Andrea Bolognani (4): qemu: Remove redundant arguments to qemuBuildSerialChrDeviceStr() qemu: Add architecture checks to qemuDomainMachineIsVirt() qemu: Introduce qemuDomainMachineIsPSeries() qemu: Use stricter checks in virQEMUCapsFillDomainDeviceDiskCaps() src/qemu/qemu_capabilities.c | 18 +++++++++--------- src/qemu/qemu_command.c | 25 ++++++++----------------- src/qemu/qemu_domain.c | 31 +++++++++++++++++++++++++------ src/qemu/qemu_domain.h | 1 + src/qemu/qemu_domain_address.c | 9 +++------ src/qemu/qemu_parse_command.c | 12 ++++-------- 6 files changed, 50 insertions(+), 46 deletions(-) -- 2.7.4

2 10

[libvirt] [PATCH] openvz: split single-line if
by Ján Tomko 24 Jun '16

24 Jun '16

Put the 'continue' statement on a separate line. --- src/openvz/openvz_conf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Pushed as trivial. diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index ff5e5b8..aa04bc4 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -741,7 +741,8 @@ openvzReadConfigParam(const char *conf_file, const char *param, char **value) continue; sf = line + strlen(param); - if (*sf++ != '=') continue; + if (*sf++ != '=') + continue; saveptr = NULL; if ((token = strtok_r(sf, "\"\t\n", &saveptr)) != NULL) { -- 2.7.3

1 0

[libvirt] [RFC PATCH] build: increase xz compression level
by Ján Tomko 24 Jun '16

24 Jun '16

Increase the default compression level to 9 from 6. This also increases decompression memory requirements from 9 MB to 65 MB. --- The resulting tarball is 880 kB smaller [10.5 MB] Level 8 requires 33 MB and saves 520 kB [10.8 MB] Level 7 requires 17 MB and saves 170 kB [11.2 MB] Compression time is not much different since we're already using --extreme. The Linux kernel also uses -9, but the tarball is 8x our size. cfg.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cfg.mk b/cfg.mk index e93114c..ebafb0f 100644 --- a/cfg.mk +++ b/cfg.mk @@ -16,6 +16,9 @@ # along with this program. If not, see # <http://www.gnu.org/licenses/>. +XZ_OPT ?= -9e +export XZ_OPT + # Use alpha.gnu.org for alpha and beta releases. # Use ftp.gnu.org for major releases. gnu_ftp_host-alpha = alpha.gnu.org -- 2.7.3

2 1

[libvirt] [PATCH 0/7] *** Add VirtualBox 5 support to libvirt ***
by Martin Pietsch 24 Jun '16

24 Jun '16

*** BLURB HERE *** Martin Pietsch (7): add VirtualBox 5 C API to libvirt add VirtualBox 5 support to vbox_tmpl.c add VirtualBox5 support to vbox_uniformed_api.h add vbox_V5_0.c for libvirt support of VirtualBox 5 append vbox_V5_0.c and vbox_CAPI_v5_0.h to src/Makefile.am add VirtualBox 5 support to vbox_common.h add VirtualBox 5 support to vbox_storage.c src/Makefile.am | 1 + src/vbox/vbox_CAPI_v5_0.h | 25550 ++++++++++++++++++++++++++++++++++++++++ src/vbox/vbox_V5_0.c | 13 + src/vbox/vbox_common.h | 2 + src/vbox/vbox_storage.c | 2 + src/vbox/vbox_tmpl.c | 84 +- src/vbox/vbox_uniformed_api.h | 1 + 7 files changed, 25647 insertions(+), 6 deletions(-) create mode 100644 src/vbox/vbox_CAPI_v5_0.h create mode 100644 src/vbox/vbox_V5_0.c -- 2.7.4

2 1