- Devel - libvirt List Archives

[libvirt] [libvirt-tck][PATCH] Add new api get_all_domain_stats testing
by Zhe Peng 06 Mar '15

06 Mar '15

$vmm->get_all_domain_stats Sys::Virt::GET_ALL_STATS_ACTIVE Sys::Virt::GET_ALL_STATS_INACTIVE Sys::Virt::GET_ALL_STATS_OTHER Sys::Virt::GET_ALL_STATS_PAUSED Sys::Virt::GET_ALL_STATS_PERSISTENT Sys::Virt::GET_ALL_STATS_RUNNING Sys::Virt::GET_ALL_STATS_SHUTOFF Sys::Virt::GET_ALL_STATS_TRANSIENT Sys::Virt::GET_ALL_STATS_ENFORCE_STATS Signed-off-by: Zhe Peng <zpeng(a)redhat.com> --- scripts/domain/800-get-all-stats.t | 137 +++++++++++++++++++++++++++++++++++++ 1 file changed, 137 insertions(+) create mode 100644 scripts/domain/800-get-all-stats.t diff --git a/scripts/domain/800-get-all-stats.t b/scripts/domain/800-get-all-stats.t new file mode 100644 index 0000000..4ff4bf3 --- /dev/null +++ b/scripts/domain/800-get-all-stats.t @@ -0,0 +1,137 @@ +# -*- perl -*- +# +# Copyright (C) 2014 Red Hat, Inc. +# Copyright (C) 2014 Zhe Peng +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# + +=pod + +=head1 NAME + +domain/800-get-all-stats.t + +=head1 DESCRIPTION + +The test case validates that: +$vmm->get_all_domain_stats +Sys::Virt::GET_ALL_STATS_ACTIVE +Sys::Virt::GET_ALL_STATS_INACTIVE +Sys::Virt::GET_ALL_STATS_OTHER +Sys::Virt::GET_ALL_STATS_PAUSED +Sys::Virt::GET_ALL_STATS_PERSISTENT +Sys::Virt::GET_ALL_STATS_RUNNING +Sys::Virt::GET_ALL_STATS_SHUTOFF +Sys::Virt::GET_ALL_STATS_TRANSIENT +Sys::Virt::GET_ALL_STATS_ENFORCE_STATS + +=cut + +use strict; +use warnings; + +use Test::More tests => 11; + +use Sys::Virt::TCK; +use Test::Exception; + +my $tck = Sys::Virt::TCK->new(); +my $conn = eval { $tck->setup(); }; +BAIL_OUT "failed to setup test harness: $@" if $@; +END { + $tck->cleanup if $tck; +} + +my @doms = ("tck1", "tck2", "tck3", "tck4"); + +#create two persistent domain, tck1 and tck2 + +my $xml = $tck->generic_domain(name => "tck1")->as_xml; + +diag "Defining an inactive domain config"; + +my $dom1; + +ok_domain(sub { $dom1 = $conn->define_domain($xml) }, "defined persistent domain config"); + +my $xml2 = $tck->generic_domain(name => "tck2")->as_xml; + +diag "Defining an inactive domain config"; + +my $dom2; + +ok_domain(sub { $dom2 = $conn->define_domain($xml2) }, "defined persistent domain config"); + +my $stats_persistent = Sys::Virt::Domain::GET_ALL_STATS_PERSISTENT|Sys::Virt::Domain::GET_ALL_STATS_INACTIVE; +my @dom_persistent = $conn->get_all_domain_stats(Sys::Virt::Domain::STATS_STATE, undef, $stats_persistent); + +is($#dom_persistent+1, 2, "list all persistent domain"); + +#create two transient domain, tck3 and tck4 + +my $xml3 = $tck->generic_domain(name => "tck3")->as_xml; + +diag "Creating a new transient domain"; +my $dom3; +ok_domain(sub { $dom3 = $conn->create_domain($xml3) }, "created transient domain object"); + +my $xml4 = $tck->generic_domain(name => "tck4")->as_xml; + +diag "Creating a new transient domain"; +my $dom4; +ok_domain(sub { $dom4 = $conn->create_domain($xml4) }, "created transient domain object"); + +my $stats_transient = Sys::Virt::Domain::GET_ALL_STATS_TRANSIENT|Sys::Virt::Domain::GET_ALL_STATS_RUNNING; + +my @dom_transient = $conn->get_all_domain_stats(Sys::Virt::Domain::STATS_STATE, undef, $stats_transient); + +is($#dom_transient+1, 2, "list all transient domain"); + +#start & pause persistent domain 2 and one transient dom +$dom2->create(); +$dom2->suspend(); +$dom3->suspend(); + +my $stats_pause = Sys::Virt::Domain::GET_ALL_STATS_PAUSED; + +my @dom_pause = $conn->get_all_domain_stats(Sys::Virt::Domain::STATS_STATE, undef, $stats_pause); + +is($#dom_pause+1, 2, "list all pause domain"); + +#resume dom2 and dom3 +$dom2->resume(); +$dom3->resume(); + +my $stats_active = Sys::Virt::Domain::GET_ALL_STATS_ACTIVE; + +my@dom_active = $conn->get_all_domain_stats(Sys::Virt::Domain::STATS_STATE, undef, $stats_active); + +is($#dom_active+1, 3, "list all active domain"); + +my $stats_shutoff = Sys::Virt::Domain::GET_ALL_STATS_SHUTOFF; + +my @dom_shutoff = $conn->get_all_domain_stats(Sys::Virt::Domain::STATS_STATE, undef, $stats_shutoff); + +is($#dom_shutoff+1, 1, "list all shutoff domain"); + +my $stats_other = Sys::Virt::Domain::GET_ALL_STATS_OTHER; + +my @dom_other = $conn->get_all_domain_stats(Sys::Virt::Domain::STATS_STATE, undef, $stats_other); + +is($#dom_other+1, 0, "list all other domain"); + +my $stats_enforce = Sys::Virt::Domain::GET_ALL_STATS_ENFORCE_STATS; + +my @dom_enforce = $conn->get_all_domain_stats(Sys::Virt::Domain::STATS_STATE, undef, $stats_enforce); + +is($#dom_enforce+1, 4, "list all enforce domain"); + + + -- 1.9.0

2 1

[libvirt] [libvirt-tck][PATCH] This testcase tests if the open_graphics_fd function works properly.
by Zhe Peng 06 Mar '15

06 Mar '15

Signed-off-by: Hao Liu <hliu(a)redhat.com> --- scripts/domain/275-open-graphics-fd.t | 76 +++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 scripts/domain/275-open-graphics-fd.t diff --git a/scripts/domain/275-open-graphics-fd.t b/scripts/domain/275-open-graphics-fd.t new file mode 100644 index 0000000..9377f50 --- /dev/null +++ b/scripts/domain/275-open-graphics-fd.t @@ -0,0 +1,76 @@ +# -*- perl -*- +# +# Copyright (C) 2012-2014 Red Hat, Inc. +# Copyright (C) 2014 Hao Liu <hliu(a)redhat.com> +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# + +=pod + +=head1 NAME + +domain/275-open-graphics-fd.t - Test open_graphics_fd function + +=head1 DESCRIPTION + +The test case validates that open_graphics_fd function works well + +=cut + +use strict; +use warnings; + +use Test::More tests => 9; + +use Sys::Virt::TCK; +use Test::Exception; +use IO::Handle; + +my $tck = Sys::Virt::TCK->new(); +my $conn = eval { $tck->setup(); }; +BAIL_OUT "failed to setup test harness: $@" if $@; +END { + $tck->cleanup if $tck; +} + + +# looking up domain +my $dom_name ="tck"; +my $xml = $tck->generic_domain(name => $dom_name)->as_xml; +diag "domain xml is $xml"; +my $dom = $conn->define_domain($xml); +$dom->create; +ok($dom->get_id() > 0, "running domain has an ID > 0"); +my $graphics_cnt = xpath($dom, "count(/domain/devices/graphics)")->value(); +my $valid_idx = $graphics_cnt - 1; +my $invalid_idx = $graphics_cnt; + +my $fd = 0; +my $fh = IO::Handle->new(); + +diag "open fd for valid graphics device"; +lives_ok(sub {$fd = $dom->open_graphics_fd($valid_idx, 0)}, "open graphics fd"); +ok($fd > 0, "graphic fd is $fd"); +$fh->fdopen($fd, "r"); +ok($fh->opened, "fd is accessible"); +$fh->close(); + +diag "open fd for valid graphics device skip auth"; +$fd = 0; +lives_ok(sub {$fd = $dom->open_graphics_fd($valid_idx, Sys::Virt::Domain::OPEN_GRAPHICS_SKIPAUTH)}, "open graphics fd"); +ok($fd > 0, "graphic fd is $fd"); +$fh->fdopen($fd, "r"); +ok($fh->opened, "fd is accessible"); +$fh->close(); + +diag "open fd for non-exist graphics device"; +$fd = 0; +ok_error(sub {$fd = $dom->open_graphics_fd($invalid_idx, 0)}, "open graphics fd"); +ok($fd eq 0, "graphic fd is not returned"); -- 1.9.0

2 1

[libvirt] direct device assignment
by Raymond Durand 06 Mar '15

06 Mar '15

I read this in the context of direct device assignment: "All of the guest's memory must kept permanently in memory. This is because the guest may program the device with any address in its address space and the hypervisor has no way of handling a DMA page fault" is it still true? Thanks, Regards,

3 3

[libvirt] memory ballooning and nova
by Raymond Durand 06 Mar '15

06 Mar '15

Is Libvirt memory ballooning managed by nova in OpenStack Juno? Is Libvirt memory ballooning independent from the OpenStack "RAM allocation ratio"? and allow a VM to expand (page out) even though the overall RAM allocation ratio is already at his maximum? Thanks, Regards,

2 4

[libvirt] [PATCH 0/3] libxl: a few minor patches
by Jim Fehlig 06 Mar '15

06 Mar '15

This series contains a few simple changes to the libxl driver. Patches 1 and 2 were included in https://www.redhat.com/archives/libvir-list/2015-February/msg00611.html To make an upcoming V2 of that series easier to review, I removed the mostly unrelated patches and include them here, along with one other small fix. Jim Fehlig (3): libxl: remove redundant calls to libxl_evdisable_domain_death libxl: use libxl_ctx passed to libxlConsoleCallback libxl: remove unneeded cleanup_unlock label src/libxl/libxl_domain.c | 13 ++----------- src/libxl/libxl_driver.c | 10 +++------- 2 files changed, 5 insertions(+), 18 deletions(-) -- 1.8.4.5

2 6

[libvirt] [libvirt-python PATCH 0/2] Python bindings for IOThreads
by John Ferlan 06 Mar '15

06 Mar '15

Going along with the recent libvirt IOThreads API additions, here's the Python patches... These would only be submitted once the libvirt code goes in... See the following for the libvirt patches: http://www.redhat.com/archives/libvir-list/2015-February/msg00593.html Reviewer's NOTE: - Alternatively to the error from patch 1, I could modify the code to not fail on <= 0, but rather just < 0 with the result being the following for a domain without IOThreads configured: $ python iothr.py [] $ Instead of: Traceback (most recent call last): File "iothr.py", line 6, in <module> print dom2.getIOThreadsInfo() File "/usr/lib64/python2.7/site-packages/libvirt.py", line 1197, in getIOThreadsInfo if ret is None: raise libvirtError ('virDomainGetIOThreadsInfo() failed', dom=self) libvirt.libvirtError: virDomainGetIOThreadsInfo() failed John Ferlan (2): Support virDomainGetIOThreadsInfo and virDomainIOThreadsInfoFree Support virDomainSetIOThreads generator.py | 6 ++ libvirt-override-api.xml | 14 ++++ libvirt-override.c | 163 +++++++++++++++++++++++++++++++++++++++++++++++ sanitytest.py | 3 + 4 files changed, 186 insertions(+) -- 2.1.0

4 8

[libvirt] [PATCH v3 0/9] Introduce display of IOThreads Information
by John Ferlan 06 Mar '15

06 Mar '15

v2 here: http://www.redhat.com/archives/libvir-list/2015-February/msg00562.html Changes over v2: Patches 1-4 * Add "resources" and "nresources" in order to return the resources that are using an IOThread * Fixed memory leak - neglected to free the qemuMonitorIOThreadsInfoPtr 'iothreads' in patch 3 Patches 5-9 (NEW) * Patches 5 & 6 implement the API/remote protocol for virDomainSetIOThreads * Patch 7 implements a couple of helper function - copies of existing vcpupin functions * Patch 8 implements the qemu backend qemuDomainSetIOThreads in order to allow setting IOThread pin data either for live or config. Heavily lifted from existing vcpu code * Patch 9 implements the virsh command options in order to set the pinning on a specific thread. As a side effect/benefit one can now display just one IOThread if so desired. All the changes are sufficient to satisfy the following bz: https://bugzilla.redhat.com/show_bug.cgi?id=1135491 John Ferlan (9): Implement public API for virDomainGetIOThreadsInfo remote: Implement the remote plumbing for virDomainGetIOThreadsInfo qemu: Implement the qemu driver fetch for IOThreads virsh: Add 'iothreads' command Implement public API for virDomainSetIOThreads remote: Implement remote plumbing for virDomainSetIOThreads domain: Introduce virDomainIOThreadsPin{Add|Del} qemu: Add qemuDomainSetIOThreads virsh: Allow setting of the iothread pin daemon/remote.c | 99 +++++++- include/libvirt/libvirt-domain.h | 48 +++- src/conf/domain_conf.c | 64 +++++ src/conf/domain_conf.h | 10 + src/driver-hypervisor.h | 16 +- src/libvirt-domain.c | 149 ++++++++++- src/libvirt_private.syms | 2 + src/libvirt_public.syms | 7 + src/qemu/qemu_driver.c | 519 +++++++++++++++++++++++++++++++++++++++ src/remote/remote_driver.c | 94 ++++++- src/remote/remote_protocol.x | 48 +++- src/remote_protocol-structs | 33 +++ src/rpc/gendispatch.pl | 1 + tools/virsh-domain.c | 154 ++++++++++++ tools/virsh.pod | 20 ++ 15 files changed, 1257 insertions(+), 7 deletions(-) -- 2.1.0

4 25

[libvirt] [PATCH 00/10] A bunch of extensions to libxl driver
by Marek Marczykowski-Górecki 05 Mar '15

05 Mar '15

This are some additional features to libxl driver. Some of them require change in domain config structures/syntax. Details described with each patch. Actually this is next iteration of a few years old patch series... Marek Marczykowski-Górecki (10): libxl: update dom->id in libxlDomainCreateWithFlags conf: support backend domain name in disk and network devices libxl: support backend domain setting for disk and net devices libxl: fill HVM SDL and VNC settings based on <graphics/> entries libxl: pass ipaddr to libxl toolstack libxl: add tablet/mouse input device support libxl: prevent attaching multiple netdevs with the same MAC libxl: support domain config modification in virDomainRestoreFlags libxl: stubdom emulator type tests: add some simple libxl XML->XML tests docs/formatdomain.html.in | 43 ++++- docs/schemas/domaincommon.rng | 43 ++++- src/conf/domain_conf.c | 69 +++++++- src/conf/domain_conf.h | 10 ++ src/libxl/libxl_conf.c | 194 ++++++++++++++++++--- src/libxl/libxl_domain.c | 11 ++ src/libxl/libxl_driver.c | 61 ++++++- src/util/virstoragefile.c | 4 +- src/util/virstoragefile.h | 1 + tests/Makefile.am | 9 +- tests/domainschematest | 2 +- tests/xlxml2xmldata/xlxml2xml-hvm-stubdom.xml | 41 +++++ tests/xlxml2xmldata/xlxml2xml-hvm.xml | 40 +++++ tests/xlxml2xmldata/xlxml2xml-network-bridged.xml | 38 ++++ .../xlxml2xml-network-driver-domain.xml | 38 ++++ tests/xlxml2xmldata/xlxml2xml-network-routed.xml | 39 +++++ tests/xlxml2xmldata/xlxml2xml-pv.xml | 38 ++++ tests/xlxml2xmltest.c | 189 ++++++++++++++++++++ 18 files changed, 824 insertions(+), 46 deletions(-) create mode 100644 tests/xlxml2xmldata/xlxml2xml-hvm-stubdom.xml create mode 100644 tests/xlxml2xmldata/xlxml2xml-hvm.xml create mode 100644 tests/xlxml2xmldata/xlxml2xml-network-bridged.xml create mode 100644 tests/xlxml2xmldata/xlxml2xml-network-driver-domain.xml create mode 100644 tests/xlxml2xmldata/xlxml2xml-network-routed.xml create mode 100644 tests/xlxml2xmldata/xlxml2xml-pv.xml create mode 100644 tests/xlxml2xmltest.c -- 1.8.3.1 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= <marmarek(a)invisiblethingslab.com> To: libvirt-list(a)redhat.com Cc: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= <marmarek(a)invisiblethingslab.com> Subject: [PATCH 01/10] libxl: update dom->id in libxlDomainCreateWithFlags Date: Thu, 5 Feb 2015 06:17:07 +0100 Message-Id: <1423113436-18213-2-git-send-email-marmarek(a)invisiblethingslab.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1423113436-18213-1-git-send-email-marmarek(a)invisiblethingslab.com> References: <1423113436-18213-1-git-send-email-marmarek(a)invisiblethingslab.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Organization: Invisible Things Lab Otherwise domainCreateWithFlags via remote returns -1 as domid. Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com> --- src/libxl/libxl_driver.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index c95b387..ce3a99b 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -2375,6 +2375,9 @@ libxlDomainCreateWithFlags(virDomainPtr dom, } ret = libxlDomainStart(driver, vm, (flags & VIR_DOMAIN_START_PAUSED) != 0, -1); + if (ret < 0) + goto cleanup; + dom->id = vm->def->id; cleanup: if (vm) -- 1.8.3.1 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= <marmarek(a)invisiblethingslab.com> To: libvirt-list(a)redhat.com Cc: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= <marmarek(a)invisiblethingslab.com> Subject: [PATCH 02/10] conf: support backend domain name in disk and network devices Date: Thu, 5 Feb 2015 06:17:08 +0100 Message-Id: <1423113436-18213-3-git-send-email-marmarek(a)invisiblethingslab.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1423113436-18213-1-git-send-email-marmarek(a)invisiblethingslab.com> References: <1423113436-18213-1-git-send-email-marmarek(a)invisiblethingslab.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Organization: Invisible Things Lab At least Xen supports backend drivers in another domain (aka "driver domain"). This patch introduces XML config option for such setting as 'domain' attribute of 'source' element. Verification its content is left for the driver. In the future same option will be needed for USB devices (hostdev objects), but for now libxl doesn't have support for PVUSB. Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com> --- Changes in v2: - describe in docs/formatdomain.html.in - enforce empty domain tag (only 'name' attribute allowed) Changes in v3: - change <domain name='xx'/> element to domain='' attribute of source element - this is more logical place - grammar of docs docs/formatdomain.html.in | 29 +++++++++++++++++++++++++++-- docs/schemas/domaincommon.rng | 20 ++++++++++++++++++++ src/conf/domain_conf.c | 33 +++++++++++++++++++++++++++++---- src/conf/domain_conf.h | 1 + src/util/virstoragefile.c | 4 +++- src/util/virstoragefile.h | 1 + 6 files changed, 81 insertions(+), 7 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index c5ad6f4..38c42d5 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1907,13 +1907,17 @@ <span class="since">since 0.0.3</span></dt> <dd> The <code>file</code> attribute specifies the fully-qualified - path to the file holding the disk. + path to the file holding the disk. The optional + <code>domain</code> attribute allows specifying a backend domain + (aka driver domain) where the file is stored. </dd> <dt><code>type='block'</code> <span class="since">since 0.0.3</span></dt> <dd> The <code>dev</code> attribute specifies the path to the - host device to serve as the disk. + host device to serve as the disk. The optional + <code>domain</code> attribute allows specifying a backend domain + (aka driver domain) for the device. </dd> <dt><code>type='dir'</code> <span class="since">since 0.7.5</span></dt> @@ -4336,6 +4340,27 @@ qemu-kvm -net nic,model=? /dev/null element is unspecified is to have the link state <code>up</code>. <span class="since">Since 0.9.5</span> </p> + <h5><a name="elementDomain">Setting up a network backend in a driver domain</a></h5> +<pre> + ... + <devices> + ... + <interface type='bridge'> + <source bridge='br0' <b>domain='netvm'</b>/> + </interface> + ... + </devices> + ...</pre> + + <p> + The optional <code>domain</code> attribute allows specifying a backend + domain (aka driver domain) for the device. Use the <code>name</code> attribute + to specify its name. You can use it to create a direct network link between + domains (so data will not go through host system). Use with type 'ethernet' + to create plain network link, or with 'bridge' to connect to some bridge + inside the driver domain. + <span class="since">Since 1.0.7 (Xen only)</span> + </p> <h5><a name="ipconfig">IP configuration</a></h5> <pre> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index d467dce..a4321f1 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1340,6 +1340,11 @@ <attribute name="file"> <ref name="absFilePath"/> </attribute> + <optional> + <attribute name="domain"> + <ref name="domainName"/> + </attribute> + </optional> </optional> <optional> <ref name="storageStartupPolicy"/> @@ -1365,6 +1370,11 @@ </attribute> </optional> <optional> + <attribute name="domain"> + <ref name="domainName"/> + </attribute> + </optional> + <optional> <ref name="storageStartupPolicy"/> </optional> <optional> @@ -2040,6 +2050,11 @@ <attribute name="bridge"> <ref name="deviceName"/> </attribute> + <optional> + <attribute name="domain"> + <ref name="domainName"/> + </attribute> + </optional> <empty/> </element> </optional> @@ -2059,6 +2074,11 @@ <attribute name="dev"> <ref name="deviceName"/> </attribute> + <optional> + <attribute name="domain"> + <ref name="domainName"/> + </attribute> + </optional> <empty/> </element> </optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4251b13..17b699a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1442,6 +1442,7 @@ void virDomainNetDefFree(virDomainNetDefPtr def) VIR_FREE(def->backend.vhost); VIR_FREE(def->virtPortProfile); VIR_FREE(def->script); + VIR_FREE(def->domain_name); VIR_FREE(def->ifname); VIR_FREE(def->ifname_guest); VIR_FREE(def->ifname_guest_actual); @@ -5520,9 +5521,11 @@ virDomainDiskSourceParse(xmlNodePtr node, switch ((virStorageType)src->type) { case VIR_STORAGE_TYPE_FILE: src->path = virXMLPropString(node, "file"); + src->domain_name = virXMLPropString(node, "domain"); break; case VIR_STORAGE_TYPE_BLOCK: src->path = virXMLPropString(node, "dev"); + src->domain_name = virXMLPropString(node, "domain"); break; case VIR_STORAGE_TYPE_DIR: src->path = virXMLPropString(node, "dir"); @@ -7369,6 +7372,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, char *vhostuser_path = NULL; char *vhostuser_type = NULL; char *trustGuestRxFilters = NULL; + char *domain_name = NULL; virNWFilterHashTablePtr filterparams = NULL; virDomainActualNetDefPtr actual = NULL; xmlNodePtr oldnode = ctxt->node; @@ -7423,12 +7427,14 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, def->type == VIR_DOMAIN_NET_TYPE_BRIDGE && xmlStrEqual(cur->name, BAD_CAST "source")) { bridge = virXMLPropString(cur, "bridge"); + domain_name = virXMLPropString(cur, "domain"); } else if (!dev && (def->type == VIR_DOMAIN_NET_TYPE_ETHERNET || def->type == VIR_DOMAIN_NET_TYPE_DIRECT) && xmlStrEqual(cur->name, BAD_CAST "source")) { dev = virXMLPropString(cur, "dev"); mode = virXMLPropString(cur, "mode"); + domain_name = virXMLPropString(cur, "domain"); } else if (!vhostuser_path && !vhostuser_mode && !vhostuser_type && def->type == VIR_DOMAIN_NET_TYPE_VHOSTUSER && xmlStrEqual(cur->name, BAD_CAST "source")) { @@ -7802,6 +7808,10 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, def->script = script; script = NULL; } + if (domain_name != NULL) { + def->domain_name = domain_name; + domain_name = NULL; + } if (ifname != NULL) { def->ifname = ifname; ifname = NULL; @@ -8061,6 +8071,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, VIR_FREE(addrtype); VIR_FREE(trustGuestRxFilters); VIR_FREE(ips); + VIR_FREE(domain_name); virNWFilterHashTableFree(filterparams); return def; @@ -16544,6 +16555,7 @@ virDomainDiskSourceFormatInternal(virBufferPtr buf, virBufferAddLit(buf, "<source"); virBufferEscapeString(buf, " file='%s'", src->path); virBufferEscapeString(buf, " startupPolicy='%s'", startupPolicy); + virBufferEscapeString(buf, " domain='%s'", src->domain_name); virDomainDiskSourceDefFormatSeclabel(buf, src->nseclabels, src->seclabels, flags, @@ -16554,6 +16566,7 @@ virDomainDiskSourceFormatInternal(virBufferPtr buf, virBufferAddLit(buf, "<source"); virBufferEscapeString(buf, " dev='%s'", src->path); virBufferEscapeString(buf, " startupPolicy='%s'", startupPolicy); + virBufferEscapeString(buf, " domain='%s'", src->domain_name); virDomainDiskSourceDefFormatSeclabel(buf, src->nseclabels, src->seclabels, flags, @@ -17713,8 +17726,14 @@ virDomainNetDefFormat(virBufferPtr buf, break; case VIR_DOMAIN_NET_TYPE_ETHERNET: - virBufferEscapeString(buf, "<source dev='%s'/>\n", - def->data.ethernet.dev); + if (def->data.ethernet.dev || def->domain_name) { + virBufferAddLit(buf, "<source"); + virBufferEscapeString(buf, " dev='%s'", + def->data.ethernet.dev); + virBufferEscapeString(buf, " domain='%s'", + def->domain_name); + virBufferAddLit(buf, "/>\n"); + } break; case VIR_DOMAIN_NET_TYPE_VHOSTUSER: @@ -17730,8 +17749,14 @@ virDomainNetDefFormat(virBufferPtr buf, break; case VIR_DOMAIN_NET_TYPE_BRIDGE: - virBufferEscapeString(buf, "<source bridge='%s'/>\n", - def->data.bridge.brname); + if (def->data.bridge.brname || def->domain_name) { + virBufferAddLit(buf, "<source"); + virBufferEscapeString(buf, " bridge='%s'", + def->data.bridge.brname); + virBufferEscapeString(buf, " domain='%s'", + def->domain_name); + virBufferAddLit(buf, "/>\n"); + } break; case VIR_DOMAIN_NET_TYPE_SERVER: diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 93f2314..28c6920 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -995,6 +995,7 @@ struct _virDomainNetDef { unsigned long sndbuf; } tune; char *script; + char *domain_name; /* backend domain name */ char *ifname; char *ifname_guest; char *ifname_guest_actual; diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 8d3d1f5..c2703b7 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1835,7 +1835,8 @@ virStorageSourceCopy(const virStorageSource *src, VIR_STRDUP(ret->backingStoreRaw, src->backingStoreRaw) < 0 || VIR_STRDUP(ret->snapshot, src->snapshot) < 0 || VIR_STRDUP(ret->configFile, src->configFile) < 0 || - VIR_STRDUP(ret->compat, src->compat) < 0) + VIR_STRDUP(ret->compat, src->compat) < 0 || + VIR_STRDUP(ret->domain_name, src->domain_name)) goto error; if (src->nhosts) { @@ -2023,6 +2024,7 @@ virStorageSourceClear(virStorageSourcePtr def) VIR_FREE(def->path); VIR_FREE(def->volume); + VIR_FREE(def->domain_name); virStorageSourcePoolDefFree(def->srcpool); VIR_FREE(def->driverName); virBitmapFree(def->features); diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index b4c3808..a3c7e1e 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -241,6 +241,7 @@ struct _virStorageSource { char *snapshot; /* for storage systems supporting internal snapshots */ char *configFile; /* some storage systems use config file as part of the source definition */ + char *domain_name; /* name of domain holding backing storage file/dev */ size_t nhosts; virStorageNetHostDefPtr hosts; virStorageSourcePoolDefPtr srcpool; -- 1.8.3.1 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= <marmarek(a)invisiblethingslab.com> To: libvirt-list(a)redhat.com Cc: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= <marmarek(a)invisiblethingslab.com> Subject: [PATCH 03/10] libxl: support backend domain setting for disk and net devices Date: Thu, 5 Feb 2015 06:17:09 +0100 Message-Id: <1423113436-18213-4-git-send-email-marmarek(a)invisiblethingslab.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1423113436-18213-1-git-send-email-marmarek(a)invisiblethingslab.com> References: <1423113436-18213-1-git-send-email-marmarek(a)invisiblethingslab.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Organization: Invisible Things Lab This implement handling of <source domain=''/> parameter introduced in previous patch. Lookup on domain name (to get domain ID) requires libxlDriverPrivate object, so it must be passed down to libxlMakeDisk and libxlMakeNet from top level callers. Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com> --- Changes in v2: - rebase on 1.0.6+ - fix indentation - make libxl_name_to_domid switch more defensive Changes in v3: - rebase on 1.2.12+ - leave name->XID resolution to libxl itself, which greatly simplify the code (but requires Xen at least 4.3) src/libxl/libxl_conf.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 0555b91..1811a83 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -971,6 +971,18 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) return -1; } + if (l_disk->src->domain_name) { +#ifdef LIBXL_HAVE_DEVICE_BACKEND_DOMNAME + if (VIR_STRDUP(x_disk->backend_domname, l_disk->src->domain_name) < 0) + return -1; +#else + virReportError(VIR_ERR_XML_DETAIL, "%s", + _("this version of libxenlight does not " + "support backend domain name")); + return -1; +#endif + } + return 0; } @@ -1098,6 +1110,18 @@ libxlMakeNic(virDomainDefPtr def, return -1; } + if (l_nic->domain_name) { +#ifdef LIBXL_HAVE_DEVICE_BACKEND_DOMNAME + if (VIR_STRDUP(x_nic->backend_domname, l_nic->domain_name) < 0) + return -1; +#else + virReportError(VIR_ERR_XML_DETAIL, "%s", + _("this version of libxenlight does not " + "support backend domain name")); + return -1; +#endif + } + return 0; } -- 1.8.3.1 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= <marmarek(a)invisiblethingslab.com> To: libvirt-list(a)redhat.com Cc: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= <marmarek(a)invisiblethingslab.com> Subject: [PATCH 04/10] libxl: fill HVM SDL and VNC settings based on <graphics/> entries Date: Thu, 5 Feb 2015 06:17:10 +0100 Message-Id: <1423113436-18213-5-git-send-email-marmarek(a)invisiblethingslab.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1423113436-18213-1-git-send-email-marmarek(a)invisiblethingslab.com> References: <1423113436-18213-1-git-send-email-marmarek(a)invisiblethingslab.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Organization: Invisible Things Lab Vfb entries in domain config are used only by PV drivers. Qemu parameters are build based on b_info struct. So fill it with the same data as vfb entries (actually the first one). This will additionally allow graphic-less domain, when no <graphics/> entries are present in domain XML (previously VNC was always enabled). Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com> --- src/libxl/libxl_conf.c | 100 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 74 insertions(+), 26 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 1811a83..c9f8ad5 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -618,12 +618,53 @@ libxlMakeChrdevStr(virDomainChrDefPtr def, char **buf) _("unsupported chardev '%s'"), type); return -1; } + return 0; +} + +static int +libxlMakeVNCInfo(virPortAllocatorPtr graphicsports, + virDomainGraphicsDefPtr l_vfb, + libxl_vnc_info *x_vnc) +{ + unsigned short port; + const char *listenAddr; + + libxl_defbool_set(&x_vnc->enable, 1); + /* driver handles selection of free port */ + libxl_defbool_set(&x_vnc->findunused, 0); + if (l_vfb->data.vnc.autoport) { + + if (virPortAllocatorAcquire(graphicsports, &port) < 0) + return -1; + l_vfb->data.vnc.port = port; + } + x_vnc->display = l_vfb->data.vnc.port - LIBXL_VNC_PORT_MIN; + listenAddr = virDomainGraphicsListenGetAddress(l_vfb, 0); + if (listenAddr) { + /* libxl_device_vfb_init() does VIR_STRDUP("127.0.0.1") */ + VIR_FREE(x_vnc->listen); + if (VIR_STRDUP(x_vnc->listen, listenAddr) < 0) + return -1; + } + return 0; +} + +static int +libxlMakeSDLInfo(virDomainGraphicsDefPtr l_vfb, + libxl_sdl_info *x_sdl) +{ + libxl_defbool_set(&x_sdl->enable, 1); + if (VIR_STRDUP(x_sdl->display, l_vfb->data.sdl.display) < 0) + return -1; + if (VIR_STRDUP(x_sdl->xauthority, l_vfb->data.sdl.xauth) < 0) + return -1; return 0; } static int libxlMakeDomBuildInfo(virDomainDefPtr def, + virPortAllocatorPtr graphicsports, libxl_ctx *ctx, libxl_domain_config *d_config) { @@ -745,6 +786,35 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, return -1; } + /* Disable VNC and SDL until explicitly enabled */ + libxl_defbool_set(&b_info->u.hvm.vnc.enable, 0); + libxl_defbool_set(&b_info->u.hvm.sdl.enable, 0); + + for (i = 0; i < def->ngraphics; i++) { + switch (def->graphics[i]->type) { + case VIR_DOMAIN_GRAPHICS_TYPE_VNC: + if (libxl_defbool_val(b_info->u.hvm.vnc.enable)) + continue; + if (libxlMakeVNCInfo(graphicsports, + def->graphics[i], + &b_info->u.hvm.vnc) < 0) + return -1; + if (def->graphics[i]->data.vnc.keymap && + VIR_STRDUP(b_info->u.hvm.keymap, + def->graphics[i]->data.vnc.keymap) < 0) { + virReportOOMError(); + return -1; + } + break; + case VIR_DOMAIN_GRAPHICS_TYPE_SDL: + if (libxl_defbool_val(b_info->u.hvm.sdl.enable)) + continue; + if (libxlMakeSDLInfo(def->graphics[i], &b_info->u.hvm.sdl) < 0) + return -1; + break; + } + } + /* * The following comment and calculation were taken directly from * libxenlight's internal function libxl_get_required_shadow_memory(): @@ -1171,38 +1241,16 @@ libxlMakeVfb(virPortAllocatorPtr graphicsports, virDomainGraphicsDefPtr l_vfb, libxl_device_vfb *x_vfb) { - unsigned short port; - const char *listenAddr; - libxl_device_vfb_init(x_vfb); switch (l_vfb->type) { case VIR_DOMAIN_GRAPHICS_TYPE_SDL: - libxl_defbool_set(&x_vfb->sdl.enable, 1); - if (VIR_STRDUP(x_vfb->sdl.display, l_vfb->data.sdl.display) < 0) - return -1; - if (VIR_STRDUP(x_vfb->sdl.xauthority, l_vfb->data.sdl.xauth) < 0) + if (libxlMakeSDLInfo(l_vfb, &x_vfb->sdl) < 0) return -1; break; case VIR_DOMAIN_GRAPHICS_TYPE_VNC: - libxl_defbool_set(&x_vfb->vnc.enable, 1); - /* driver handles selection of free port */ - libxl_defbool_set(&x_vfb->vnc.findunused, 0); - if (l_vfb->data.vnc.autoport) { - - if (virPortAllocatorAcquire(graphicsports, &port) < 0) - return -1; - l_vfb->data.vnc.port = port; - } - x_vfb->vnc.display = l_vfb->data.vnc.port - LIBXL_VNC_PORT_MIN; - - listenAddr = virDomainGraphicsListenGetAddress(l_vfb, 0); - if (listenAddr) { - /* libxl_device_vfb_init() does VIR_STRDUP("127.0.0.1") */ - VIR_FREE(x_vfb->vnc.listen); - if (VIR_STRDUP(x_vfb->vnc.listen, listenAddr) < 0) - return -1; - } + if (libxlMakeVNCInfo(graphicsports, l_vfb, &x_vfb->vnc) < 0) + return -1; if (VIR_STRDUP(x_vfb->keymap, l_vfb->data.vnc.keymap) < 0) return -1; break; @@ -1611,7 +1659,7 @@ libxlBuildDomainConfig(virPortAllocatorPtr graphicsports, if (libxlMakeDomCreateInfo(ctx, def, &d_config->c_info) < 0) return -1; - if (libxlMakeDomBuildInfo(def, ctx, d_config) < 0) + if (libxlMakeDomBuildInfo(def, graphicsports, ctx, d_config) < 0) return -1; if (libxlMakeDiskList(def, d_config) < 0) -- 1.8.3.1 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= <marmarek(a)invisiblethingslab.com> To: libvirt-list(a)redhat.com Cc: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= <marmarek(a)invisiblethingslab.com> Subject: [PATCH 05/10] libxl: pass ipaddr to libxl toolstack Date: Thu, 5 Feb 2015 06:17:11 +0100 Message-Id: <1423113436-18213-6-git-send-email-marmarek(a)invisiblethingslab.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1423113436-18213-1-git-send-email-marmarek(a)invisiblethingslab.com> References: <1423113436-18213-1-git-send-email-marmarek(a)invisiblethingslab.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Organization: Invisible Things Lab Do not silently ignore its value. LibXL support only one address, so refuse multiple IPs. Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com> --- src/libxl/libxl_conf.c | 5 +++++ src/libxl/libxl_domain.c | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index c9f8ad5..4730585 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1133,6 +1133,11 @@ libxlMakeNic(virDomainDefPtr def, case VIR_DOMAIN_NET_TYPE_ETHERNET: if (VIR_STRDUP(x_nic->script, l_nic->script) < 0) return -1; + if (l_nic->nips > 0) { + x_nic->ip = virSocketAddrFormat(&l_nic->ips[0]->address); + if (!x_nic->ip) + return -1; + } break; case VIR_DOMAIN_NET_TYPE_NETWORK: { diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 856cfb4..afb0b15 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -482,6 +482,17 @@ libxlDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, STRNEQ(def->os.type, "hvm")) dev->data.chr->targetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_XEN; + if (dev->type == VIR_DOMAIN_DEVICE_NET && + (dev->data.net->type == VIR_DOMAIN_NET_TYPE_BRIDGE || + dev->data.net->type == VIR_DOMAIN_NET_TYPE_ETHERNET)) { + if (dev->data.net->nips > 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("multiple IP addresses not supported on device type %s"), + virDomainNetTypeToString(dev->data.net->type)); + return -1; + } + } + if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV || (dev->type == VIR_DOMAIN_DEVICE_NET && dev->data.net->type == VIR_DOMAIN_NET_TYPE_HOSTDEV)) { -- 1.8.3.1 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= <marmarek(a)invisiblethingslab.com> To: libvirt-list(a)redhat.com Cc: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= <marmarek(a)invisiblethingslab.com> Subject: [PATCH 06/10] libxl: add tablet/mouse input device support Date: Thu, 5 Feb 2015 06:17:12 +0100 Message-Id: <1423113436-18213-7-git-send-email-marmarek(a)invisiblethingslab.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1423113436-18213-1-git-send-email-marmarek(a)invisiblethingslab.com> References: <1423113436-18213-1-git-send-email-marmarek(a)invisiblethingslab.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Organization: Invisible Things Lab Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com> --- Changes in v2: - rebase on 1.2.12+ - multiple devices support src/libxl/libxl_conf.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 4730585..b1131ea 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -815,6 +815,54 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, } } + if (def->ninputs) { +#ifdef LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST + if (VIR_ALLOC_N(b_info->u.hvm.usbdevice_list, def->ninputs+1) < 0) + return -1; +#else + if (def->ninputs > 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("libxenlight supports only one input device")); + return -1; + } +#endif + for (i = 0; i < def->ninputs; i++) { + if (def->inputs[i]->bus != VIR_DOMAIN_INPUT_BUS_USB) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("libxenlight supports only USB input")); + return -1; + } + } + for (i = 0; i < def->ninputs; i++) { + switch (def->inputs[i]->type) { + case VIR_DOMAIN_INPUT_TYPE_MOUSE: +#ifdef LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST + if (VIR_STRDUP(b_info->u.hvm.usbdevice_list[i], "mouse") < 0) + return -1; +#else + VIR_FREE(b_info->u.hvm.usbdevice); + if (VIR_STRDUP(b_info->u.hvm.usbdevice, "mouse") < 0) + return -1; +#endif + break; + case VIR_DOMAIN_INPUT_TYPE_TABLET: +#ifdef LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST + if (VIR_STRDUP(b_info->u.hvm.usbdevice_list[i], "tablet") < 0) + return -1; +#else + VIR_FREE(b_info->u.hvm.usbdevice); + if (VIR_STRDUP(b_info->u.hvm.usbdevice, "tablet") < 0) + return -1; +#endif + break; + default: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Unknown input device type")); + return -1; + } + } + } + /* * The following comment and calculation were taken directly from * libxenlight's internal function libxl_get_required_shadow_memory(): -- 1.8.3.1 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= <marmarek(a)invisiblethingslab.com> To: libvirt-list(a)redhat.com Cc: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= <marmarek(a)invisiblethingslab.com> Subject: [PATCH 07/10] libxl: prevent attaching multiple netdevs with the same MAC Date: Thu, 5 Feb 2015 06:17:13 +0100 Message-Id: <1423113436-18213-8-git-send-email-marmarek(a)invisiblethingslab.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1423113436-18213-1-git-send-email-marmarek(a)invisiblethingslab.com> References: <1423113436-18213-1-git-send-email-marmarek(a)invisiblethingslab.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Organization: Invisible Things Lab It will not be possible to detach such device later. Also improve logging in such cases. Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com> --- src/libxl/libxl_driver.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index ce3a99b..005cc96 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -2787,6 +2787,7 @@ libxlDomainAttachNetDevice(libxlDriverPrivatePtr driver, int actualType; libxl_device_nic nic; int ret = -1; + char mac[VIR_MAC_STRING_BUFLEN]; /* preallocate new slot for device */ if (VIR_REALLOC_N(vm->def->nets, vm->def->nnets + 1) < 0) @@ -2801,6 +2802,14 @@ libxlDomainAttachNetDevice(libxlDriverPrivatePtr driver, actualType = virDomainNetGetActualType(net); + /* -2 means "multiple matches" so then fail also */ + if (virDomainNetFindIdx(vm->def, net) != -1) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("device matching mac address %s already exists"), + virMacAddrFormat(&net->mac, mac)); + return -1; + } + if (actualType == VIR_DOMAIN_NET_TYPE_HOSTDEV) { /* This is really a "smart hostdev", so it should be attached * as a hostdev (the hostdev code will reach over into the @@ -2879,6 +2888,7 @@ libxlDomainAttachDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev) virDomainHostdevDefPtr hostdev; virDomainHostdevDefPtr found; virDomainHostdevSubsysPCIPtr pcisrc; + char mac[VIR_MAC_STRING_BUFLEN]; switch (dev->type) { case VIR_DOMAIN_DEVICE_DISK: @@ -2896,6 +2906,12 @@ libxlDomainAttachDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev) case VIR_DOMAIN_DEVICE_NET: net = dev->data.net; + if (virDomainNetFindIdx(vmdef, net) >= 0) { + virReportError(VIR_ERR_INVALID_ARG, + _("network device with mac %s already exists."), + virMacAddrFormat(&net->mac, mac)); + return -1; + } if (virDomainNetInsert(vmdef, net)) return -1; dev->data.net = NULL; @@ -3060,8 +3076,18 @@ libxlDomainDetachNetDevice(libxlDriverPrivatePtr driver, char mac[VIR_MAC_STRING_BUFLEN]; int ret = -1; - if ((detachidx = virDomainNetFindIdx(vm->def, net)) < 0) + if ((detachidx = virDomainNetFindIdx(vm->def, net)) < 0) { + if (detachidx == -2) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("multiple devices matching mac address %s found"), + virMacAddrFormat(&net->mac, mac)); + } else { + virReportError(VIR_ERR_OPERATION_FAILED, + _("network device %s not found"), + virMacAddrFormat(&net->mac, mac)); + } return -1; + } detach = vm->def->nets[detachidx]; @@ -3136,6 +3162,7 @@ libxlDomainDetachDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev) virDomainHostdevDefPtr hostdev, det_hostdev; virDomainNetDefPtr net; int idx; + char mac[VIR_MAC_STRING_BUFLEN]; switch (dev->type) { case VIR_DOMAIN_DEVICE_DISK: @@ -3150,8 +3177,18 @@ libxlDomainDetachDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev) case VIR_DOMAIN_DEVICE_NET: net = dev->data.net; - if ((idx = virDomainNetFindIdx(vmdef, net)) < 0) + if ((idx = virDomainNetFindIdx(vmdef, net)) < 0) { + if (idx == -2) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("multiple devices matching mac address %s found"), + virMacAddrFormat(&dev->data.net->mac, mac)); + } else { + virReportError(VIR_ERR_OPERATION_FAILED, + _("network device %s not found"), + virMacAddrFormat(&dev->data.net->mac, mac)); + } return -1; + } /* this is guaranteed to succeed */ virDomainNetDefFree(virDomainNetRemove(vmdef, idx)); -- 1.8.3.1 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= <marmarek(a)invisiblethingslab.com> To: libvirt-list(a)redhat.com Cc: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= <marmarek(a)invisiblethingslab.com> Subject: [PATCH 08/10] libxl: support domain config modification in virDomainRestoreFlags Date: Thu, 5 Feb 2015 06:17:14 +0100 Message-Id: <1423113436-18213-9-git-send-email-marmarek(a)invisiblethingslab.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1423113436-18213-1-git-send-email-marmarek(a)invisiblethingslab.com> References: <1423113436-18213-1-git-send-email-marmarek(a)invisiblethingslab.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Organization: Invisible Things Lab Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com> --- There was a discussion about calling virDomainDefCheckABIStability. The use case I have for this is to start multiple domains from the same savefile. This require changing: - UUID - name - IP address Those are exactly type of changes blocked by virDomainDefCheckABIStability. Perhaps some "permissive" mode should be introduced to the virDomainDefCheckABIStability function? src/libxl/libxl_driver.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 005cc96..7539d33 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -1456,11 +1456,6 @@ libxlDomainRestoreFlags(virConnectPtr conn, const char *from, #endif virCheckFlags(VIR_DOMAIN_SAVE_PAUSED, -1); - if (dxml) { - virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("xml modification unsupported")); - return -1; - } fd = libxlDomainSaveImageOpen(driver, cfg, from, &def, &hdr); if (fd < 0) @@ -1469,6 +1464,18 @@ libxlDomainRestoreFlags(virConnectPtr conn, const char *from, if (virDomainRestoreFlagsEnsureACL(conn, def) < 0) goto cleanup_unlock; + if (dxml) { + virDomainDefPtr def2 = NULL; + + if (!(def2 = virDomainDefParseString(dxml, cfg->caps, driver->xmlopt, + 1 << VIR_DOMAIN_VIRT_XEN, + VIR_DOMAIN_XML_INACTIVE))) { + goto cleanup; + } + virDomainDefFree(def); + def = def2; + } + if (!(vm = virDomainObjListAdd(driver->domains, def, driver->xmlopt, VIR_DOMAIN_OBJ_LIST_ADD_LIVE | -- 1.8.3.1 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= <marmarek(a)invisiblethingslab.com> To: libvirt-list(a)redhat.com Cc: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= <marmarek(a)invisiblethingslab.com> Subject: [PATCH 09/10] libxl: Stubdom emulator type Date: Thu, 5 Feb 2015 06:17:15 +0100 Message-Id: <1423113436-18213-10-git-send-email-marmarek(a)invisiblethingslab.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1423113436-18213-1-git-send-email-marmarek(a)invisiblethingslab.com> References: <1423113436-18213-1-git-send-email-marmarek(a)invisiblethingslab.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Organization: Invisible Things Lab Xen have feature of having device model in separate domain (called stub domain). Add a 'type' attribute to 'emulator' element to allow selecting such a configuration. Emulator path is still used for qemu running in dom0 (if any). Libxl currently do not allow to select stubdomain path. Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com> --- I think it would be good idea to introduce the same change to capabilities XML. The problem is I can't include domain_conf.h from capabilities.h, so probably that enum declaration needs to be moved to capabilities.h. Is it the right way? Or it should be done somehow different? docs/formatdomain.html.in | 14 ++++++++++++++ docs/schemas/domaincommon.rng | 23 ++++++++++++++++++++++- src/conf/domain_conf.c | 36 ++++++++++++++++++++++++++++++++++-- src/conf/domain_conf.h | 9 +++++++++ src/libxl/libxl_conf.c | 17 +++++++++++++++++ 5 files changed, 96 insertions(+), 3 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 38c42d5..4f539e2 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1652,6 +1652,20 @@ The <a href="formatcaps.html">capabilities XML</a> specifies the recommended default emulator to use for each particular domain type / architecture combination. + + <span class="since">Since 1.2.13</span>, the <code>emulator</code> + element may contain <code>type</code> attribute. Possible values are: + <dl> + <dt><code>type='default'</code></dt> + <dd>Equivalent to not setting <code>type</code> attribute at all. + </dd> + + <dt><code>type='stubdom'</code></dt> + <dd>Launch emulator in stub domain (Xen only). The emulator path + still indicate which binary is used in dom0 - there is no control + which binary is used as a stub domain. + </dd> + </dl> </dd> </dl> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index a4321f1..2a12073 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2519,7 +2519,28 @@ --> <define name="emulator"> <element name="emulator"> - <ref name="absFilePath"/> + <choice> + <group> + <optional> + <attribute name="type"> + <choice> + <value>qemu</value> + <value>stubdom</value> + </choice> + </attribute> + </optional> + <ref name="absFilePath"/> + </group> + <group> + <attribute name="type"> + <choice> + <value>qemu</value> + <value>stubdom</value> + </choice> + </attribute> + <empty/> + </group> + </choice> </element> </define> <!-- diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 17b699a..c268091 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -741,6 +741,10 @@ VIR_ENUM_IMPL(virDomainDiskTray, VIR_DOMAIN_DISK_TRAY_LAST, "closed", "open"); +VIR_ENUM_IMPL(virDomainEmulatorType, VIR_DOMAIN_EMULATOR_TYPE_LAST, + "qemu", + "stubdom"); + VIR_ENUM_IMPL(virDomainRNGModel, VIR_DOMAIN_RNG_MODEL_LAST, "virtio"); @@ -13712,6 +13716,14 @@ virDomainDefParseXML(xmlDocPtr xml, } def->emulator = virXPathString("string(./devices/emulator[1])", ctxt); + if ((tmp = virXPathString("string(./devices/emulator/@type)", ctxt))) { + def->emulator_type = virDomainEmulatorTypeTypeFromString(tmp); + VIR_FREE(tmp); + if (def->emulator_type < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unknown emulator type '%s'"), tmp); + } + } /* analysis of the disk devices */ if ((n = virXPathNodeSet("./devices/disk", ctxt, &nodes)) < 0) @@ -15690,6 +15702,14 @@ virDomainDefCheckABIStability(virDomainDefPtr src, goto error; } + if (src->emulator_type != dst->emulator_type) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target domain emulator type %s does not match source %s"), + virDomainEmulatorTypeTypeToString(dst->emulator_type), + virDomainEmulatorTypeTypeToString(src->emulator_type)); + goto error; + } + if (!virDomainDefFeaturesCheckABIStability(src, dst)) goto error; @@ -19893,8 +19913,20 @@ virDomainDefFormatInternal(virDomainDefPtr def, virBufferAddLit(buf, "<devices>\n"); virBufferAdjustIndent(buf, 2); - virBufferEscapeString(buf, "<emulator>%s</emulator>\n", - def->emulator); + if (def->emulator || + def->emulator_type != VIR_DOMAIN_EMULATOR_TYPE_DEFAULT) { + virBufferAddLit(buf, "<emulator"); + if (def->emulator_type != VIR_DOMAIN_EMULATOR_TYPE_DEFAULT) { + virBufferAsprintf(buf, " type='%s'", + virDomainEmulatorTypeTypeToString(def->emulator_type)); + } + if (!def->emulator) { + virBufferAddLit(buf, "/>\n"); + } else { + virBufferEscapeString(buf, ">%s</emulator>\n", + def->emulator); + } + } for (n = 0; n < def->ndisks; n++) if (virDomainDiskDefFormat(buf, def->disks[n], flags) < 0) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 28c6920..38b9037 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1918,6 +1918,13 @@ struct _virBlkioDevice { }; typedef enum { + VIR_DOMAIN_EMULATOR_TYPE_DEFAULT, + VIR_DOMAIN_EMULATOR_TYPE_STUBDOM, + + VIR_DOMAIN_EMULATOR_TYPE_LAST +} virDomainEmulatorType; + +typedef enum { VIR_DOMAIN_RNG_MODEL_VIRTIO, VIR_DOMAIN_RNG_MODEL_LAST @@ -2083,6 +2090,7 @@ struct _virDomainDef { virDomainOSDef os; char *emulator; + virDomainEmulatorType emulator_type; /* These three options are of type virTristateSwitch, * except VIR_DOMAIN_FEATURE_CAPABILITIES that is of type * virDomainCapabilitiesPolicy */ @@ -2841,6 +2849,7 @@ VIR_ENUM_DECL(virDomainGraphicsSpiceMouseMode) VIR_ENUM_DECL(virDomainGraphicsVNCSharePolicy) VIR_ENUM_DECL(virDomainHyperv) VIR_ENUM_DECL(virDomainKVM) +VIR_ENUM_DECL(virDomainEmulatorType) VIR_ENUM_DECL(virDomainRNGModel) VIR_ENUM_DECL(virDomainRNGBackend) VIR_ENUM_DECL(virDomainTPMModel) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index b1131ea..a84ce09 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -768,6 +768,23 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, b_info->device_model_version = libxlDomainGetEmulatorType(def); } + /* In case of stubdom there will be two qemu instances: + * - in stubdom (libxl uses hardcoded path for this one), + * - in dom0 as a backend for stubdom (if needed). + * Emulator path control only the second one. It makes a perfect sense + * to use <emulator type='stubdom'/> (yes, without emulator path). + */ + if (def->emulator_type == VIR_DOMAIN_EMULATOR_TYPE_STUBDOM) + libxl_defbool_set(&b_info->device_model_stubdomain, 1); + + if (def->os.cmdline && def->os.cmdline[0]) { + b_info->extra_hvm = virStringSplit(def->os.cmdline, " ", 0); + if (b_info->extra_hvm == NULL) { + virReportOOMError(); + return -1; + } + } + if (def->nserials) { if (def->nserials > 1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, -- 1.8.3.1 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= <marmarek(a)invisiblethingslab.com> To: libvirt-list(a)redhat.com Cc: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= <marmarek(a)invisiblethingslab.com> Subject: [PATCH 10/10] tests: add some simple libxl XML->XML tests Date: Thu, 5 Feb 2015 06:17:16 +0100 Message-Id: <1423113436-18213-11-git-send-email-marmarek(a)invisiblethingslab.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1423113436-18213-1-git-send-email-marmarek(a)invisiblethingslab.com> References: <1423113436-18213-1-git-send-email-marmarek(a)invisiblethingslab.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Organization: Invisible Things Lab Handle features supported only on xen: driver domains, qemu in stubdomain. Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com> --- tests/Makefile.am | 9 +- tests/domainschematest | 2 +- tests/xlxml2xmldata/xlxml2xml-hvm-stubdom.xml | 41 +++++ tests/xlxml2xmldata/xlxml2xml-hvm.xml | 40 +++++ tests/xlxml2xmldata/xlxml2xml-network-bridged.xml | 38 +++++ .../xlxml2xml-network-driver-domain.xml | 38 +++++ tests/xlxml2xmldata/xlxml2xml-network-routed.xml | 39 +++++ tests/xlxml2xmldata/xlxml2xml-pv.xml | 38 +++++ tests/xlxml2xmltest.c | 189 +++++++++++++++++++++ 9 files changed, 431 insertions(+), 3 deletions(-) create mode 100644 tests/xlxml2xmldata/xlxml2xml-hvm-stubdom.xml create mode 100644 tests/xlxml2xmldata/xlxml2xml-hvm.xml create mode 100644 tests/xlxml2xmldata/xlxml2xml-network-bridged.xml create mode 100644 tests/xlxml2xmldata/xlxml2xml-network-driver-domain.xml create mode 100644 tests/xlxml2xmldata/xlxml2xml-network-routed.xml create mode 100644 tests/xlxml2xmldata/xlxml2xml-pv.xml create mode 100644 tests/xlxml2xmltest.c diff --git a/tests/Makefile.am b/tests/Makefile.am index 938270c..48648b9 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -85,6 +85,7 @@ EXTRA_DIST = \ domainsnapshotxml2xmlout \ fchostdata \ interfaceschemadata \ + xlxml2xmldata \ lxcconf2xmldata \ lxcxml2xmldata \ lxcxml2xmloutdata \ @@ -230,7 +231,7 @@ test_programs += xml2sexprtest sexpr2xmltest \ endif WITH_XEN if WITH_LIBXL -test_programs += xlconfigtest +test_programs += xlconfigtest xlxml2xmltest endif WITH_LIBXL if WITH_QEMU @@ -515,8 +516,12 @@ xlconfigtest_SOURCES = \ xlconfigtest.c testutilsxen.c testutilsxen.h \ testutils.c testutils.h xlconfigtest_LDADD =$(libxl_LDADDS) +xlxml2xmltest_SOURCES = \ + xlxml2xmltest.c testutilsxen.c testutilsxen.h \ + testutils.c testutils.h +xlxml2xmltest_LDADD =$(libxl_LDADDS) else ! WITH_LIBXL -EXTRA_DIST += xlconfigtest.c +EXTRA_DIST += xlconfigtest.c xlxml2xmltest.c endif ! WITH_LIBXL QEMUMONITORTESTUTILS_SOURCES = \ diff --git a/tests/domainschematest b/tests/domainschematest index ba90180..18b442b 100755 --- a/tests/domainschematest +++ b/tests/domainschematest @@ -8,7 +8,7 @@ DIRS="" DIRS="$DIRS domainschemadata qemuxml2argvdata sexpr2xmldata" DIRS="$DIRS xmconfigdata xml2sexprdata qemuxml2xmloutdata" DIRS="$DIRS lxcxml2xmldata lxcxml2xmloutdata" -DIRS="$DIRS bhyvexml2argvdata" +DIRS="$DIRS bhyvexml2argvdata xlxml2xmldata" SCHEMA="domain.rng" check_schema "$DIRS" "$SCHEMA" diff --git a/tests/xlxml2xmldata/xlxml2xml-hvm-stubdom.xml b/tests/xlxml2xmldata/xlxml2xml-hvm-stubdom.xml new file mode 100644 index 0000000..ed6440c --- /dev/null +++ b/tests/xlxml2xmldata/xlxml2xml-hvm-stubdom.xml @@ -0,0 +1,41 @@ +<domain type='xen'> + <name>testhvm</name> + <uuid>a3d3fa04-dc23-4136-9eab-b579d2930817</uuid> + <memory unit='KiB'>524288</memory> + <currentMemory unit='KiB'>524288</currentMemory> + <vcpu placement='static'>2</vcpu> + <os> + <type arch='x86_64' machine='xenfv'>hvm</type> + <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader> + <boot dev='cdrom'/> + <boot dev='hd'/> + </os> + <features> + <acpi/> + <apic/> + <pae/> + <viridian/> + </features> + <clock offset='variable' adjustment='0' basis='localtime'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>destroy</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator type='stubdom'>/usr/lib/xen/bin/qemu-dm</emulator> + <disk type='file' device='disk'> + <driver name='file'/> + <source file='/var/lib/libvirt/images/testhvm/root.img'/> + <target dev='xvda' bus='xen'/> + </disk> + <disk type='file' device='disk'> + <driver name='file'/> + <source file='/var/lib/libvirt/images/testhvm/private.img'/> + <target dev='xvdb' bus='xen'/> + </disk> + <interface type='network'> + <mac address='00:16:3e:5e:6c:09'/> + <source network='default'/> + </interface> + <input type='tablet' bus='usb'/> + </devices> +</domain> diff --git a/tests/xlxml2xmldata/xlxml2xml-hvm.xml b/tests/xlxml2xmldata/xlxml2xml-hvm.xml new file mode 100644 index 0000000..95d9b84 --- /dev/null +++ b/tests/xlxml2xmldata/xlxml2xml-hvm.xml @@ -0,0 +1,40 @@ +<domain type='xen'> + <name>testhvm</name> + <uuid>a3d3fa04-dc23-4136-9eab-b579d2930817</uuid> + <memory unit='KiB'>524288</memory> + <currentMemory unit='KiB'>524288</currentMemory> + <vcpu placement='static'>2</vcpu> + <os> + <type arch='x86_64' machine='xenfv'>hvm</type> + <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader> + <boot dev='cdrom'/> + <boot dev='hd'/> + </os> + <features> + <acpi/> + <apic/> + <pae/> + <viridian/> + </features> + <clock offset='variable' adjustment='0' basis='localtime'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>destroy</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <driver name='file'/> + <source file='/var/lib/libvirt/images/testhvm/root.img'/> + <target dev='xvda' bus='xen'/> + </disk> + <disk type='file' device='disk'> + <driver name='file'/> + <source file='/var/lib/libvirt/images/testhvm/private.img'/> + <target dev='xvdb' bus='xen'/> + </disk> + <interface type='network'> + <mac address='00:16:3e:5e:6c:09'/> + <source network='default'/> + </interface> + <input type='tablet' bus='usb'/> + </devices> +</domain> diff --git a/tests/xlxml2xmldata/xlxml2xml-network-bridged.xml b/tests/xlxml2xmldata/xlxml2xml-network-bridged.xml new file mode 100644 index 0000000..a6b8f59 --- /dev/null +++ b/tests/xlxml2xmldata/xlxml2xml-network-bridged.xml @@ -0,0 +1,38 @@ +<domain type='xen'> + <name>testvm</name> + <uuid>900e3685-4998-41ad-a2c9-e496a5ed40a4</uuid> + <memory unit='KiB'>4096000</memory> + <currentMemory unit='KiB'>409600</currentMemory> + <vcpu placement='static'>2</vcpu> + <os> + <type arch='x86_64' machine='xenpv'>linux</type> + <kernel>/boot/vmlinuz-3.12.37-1</kernel> + <initrd>/boot/initramfs-3.12.37-1.img</initrd> + <cmdline>root=/dev/xvda ro nomodeset console=hvc0 rd_NO_PLYMOUTH 3</cmdline> + </os> + <clock offset='utc' adjustment='reset'> + <timer name='tsc' mode='native'/> + </clock> + <on_poweroff>destroy</on_poweroff> + <on_reboot>destroy</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <driver name='file'/> + <source file='/var/lib/libvirt/images/testvm/root.img'/> + <target dev='xvda' bus='xen'/> + </disk> + <disk type='block' device='disk'> + <driver name='file'/> + <source dev='/var/lib/libvirt/images/testvm/home.img'/> + <target dev='xvdb' bus='xen'/> + </disk> + <interface type='bridge'> + <mac address='00:16:3e:5e:6c:09'/> + <source bridge='xenbr0'/> + </interface> + <console type='pty'> + <target type='xen' port='0'/> + </console> + </devices> +</domain> diff --git a/tests/xlxml2xmldata/xlxml2xml-network-driver-domain.xml b/tests/xlxml2xmldata/xlxml2xml-network-driver-domain.xml new file mode 100644 index 0000000..31c0437 --- /dev/null +++ b/tests/xlxml2xmldata/xlxml2xml-network-driver-domain.xml @@ -0,0 +1,38 @@ +<domain type='xen'> + <name>testvm</name> + <uuid>900e3685-4998-41ad-a2c9-e496a5ed40a4</uuid> + <memory unit='KiB'>4096000</memory> + <currentMemory unit='KiB'>409600</currentMemory> + <vcpu placement='static'>2</vcpu> + <os> + <type arch='x86_64' machine='xenpv'>linux</type> + <kernel>/boot/vmlinuz-3.12.37-1</kernel> + <initrd>/boot/initramfs-3.12.37-1.img</initrd> + <cmdline>root=/dev/xvda ro nomodeset console=hvc0 rd_NO_PLYMOUTH 3</cmdline> + </os> + <clock offset='utc' adjustment='reset'> + <timer name='tsc' mode='native'/> + </clock> + <on_poweroff>destroy</on_poweroff> + <on_reboot>destroy</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <driver name='file'/> + <source file='/var/lib/libvirt/images/testvm/root.img'/> + <target dev='xvda' bus='xen'/> + </disk> + <disk type='block' device='disk'> + <driver name='file'/> + <source dev='/var/lib/libvirt/images/testvm/home.img'/> + <target dev='xvdb' bus='xen'/> + </disk> + <interface type='bridge'> + <mac address='00:16:3e:5e:6c:09'/> + <source bridge='xenbr0' domain='netvm'/> + </interface> + <console type='pty'> + <target type='xen' port='0'/> + </console> + </devices> +</domain> diff --git a/tests/xlxml2xmldata/xlxml2xml-network-routed.xml b/tests/xlxml2xmldata/xlxml2xml-network-routed.xml new file mode 100644 index 0000000..fac9d8d --- /dev/null +++ b/tests/xlxml2xmldata/xlxml2xml-network-routed.xml @@ -0,0 +1,39 @@ +<domain type='xen'> + <name>testvm</name> + <uuid>900e3685-4998-41ad-a2c9-e496a5ed40a4</uuid> + <memory unit='KiB'>4096000</memory> + <currentMemory unit='KiB'>409600</currentMemory> + <vcpu placement='static'>2</vcpu> + <os> + <type arch='x86_64' machine='xenpv'>linux</type> + <kernel>/boot/vmlinuz-3.12.37-1</kernel> + <initrd>/boot/initramfs-3.12.37-1.img</initrd> + <cmdline>root=/dev/xvda ro nomodeset console=hvc0 rd_NO_PLYMOUTH 3</cmdline> + </os> + <clock offset='utc' adjustment='reset'> + <timer name='tsc' mode='native'/> + </clock> + <on_poweroff>destroy</on_poweroff> + <on_reboot>destroy</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <driver name='file'/> + <source file='/var/lib/libvirt/images/testvm/root.img'/> + <target dev='xvda' bus='xen'/> + </disk> + <disk type='block' device='disk'> + <driver name='file'/> + <source dev='/var/lib/libvirt/images/testvm/home.img'/> + <target dev='xvdb' bus='xen'/> + </disk> + <interface type='ethernet'> + <mac address='00:16:3e:5e:6c:09'/> + <ip address='192.168.0.1' family='ipv4'/> + <script path='vif-route'/> + </interface> + <console type='pty'> + <target type='xen' port='0'/> + </console> + </devices> +</domain> diff --git a/tests/xlxml2xmldata/xlxml2xml-pv.xml b/tests/xlxml2xmldata/xlxml2xml-pv.xml new file mode 100644 index 0000000..b937b8b --- /dev/null +++ b/tests/xlxml2xmldata/xlxml2xml-pv.xml @@ -0,0 +1,38 @@ +<domain type='xen'> + <name>testvm</name> + <uuid>900e3685-4998-41ad-a2c9-e496a5ed40a4</uuid> + <memory unit='KiB'>4096000</memory> + <currentMemory unit='KiB'>409600</currentMemory> + <vcpu placement='static'>2</vcpu> + <os> + <type arch='x86_64' machine='xenpv'>linux</type> + <kernel>/boot/vmlinuz-3.12.37-1</kernel> + <initrd>/boot/initramfs-3.12.37-1.img</initrd> + <cmdline>root=/dev/xvda ro nomodeset console=hvc0 rd_NO_PLYMOUTH 3</cmdline> + </os> + <clock offset='utc' adjustment='reset'> + <timer name='tsc' mode='native'/> + </clock> + <on_poweroff>destroy</on_poweroff> + <on_reboot>destroy</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <driver name='file'/> + <source file='/var/lib/libvirt/images/testvm/root.img'/> + <target dev='xvda' bus='xen'/> + </disk> + <disk type='block' device='disk'> + <driver name='file'/> + <source dev='/var/lib/libvirt/images/testvm/home.img'/> + <target dev='xvdb' bus='xen'/> + </disk> + <interface type='network'> + <mac address='00:16:3e:5e:6c:09'/> + <source network='default'/> + </interface> + <console type='pty'> + <target type='xen' port='0'/> + </console> + </devices> +</domain> diff --git a/tests/xlxml2xmltest.c b/tests/xlxml2xmltest.c new file mode 100644 index 0000000..131e43b --- /dev/null +++ b/tests/xlxml2xmltest.c @@ -0,0 +1,189 @@ +#include <config.h> + +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include <string.h> + +#include <sys/types.h> +#include <fcntl.h> + +#include "testutils.h" + +#ifdef WITH_LIBXL + +# include "internal.h" +# include "libxl/libxl_conf.h" +# include "libxl/libxl_domain.h" +# include "testutilsxen.h" +# include "virstring.h" + +# define VIR_FROM_THIS VIR_FROM_NONE + +static virCapsPtr caps; +static virDomainXMLOptionPtr xmlopt; + +static int +testCompareXMLToXMLFiles(const char *inxml, const char *outxml, bool live) +{ + char *inXmlData = NULL; + char *outXmlData = NULL; + char *actual = NULL; + int ret = -1; + virDomainDefPtr def = NULL; + unsigned int parse_flags = live ? 0 : VIR_DOMAIN_DEF_PARSE_INACTIVE; + unsigned int format_flags = VIR_DOMAIN_DEF_FORMAT_SECURE; + if (!live) + format_flags |= VIR_DOMAIN_DEF_FORMAT_INACTIVE; + + if (virtTestLoadFile(inxml, &inXmlData) < 0) + goto fail; + if (virtTestLoadFile(outxml, &outXmlData) < 0) + goto fail; + + if (!(def = virDomainDefParseString(inXmlData, caps, xmlopt, + 1 << VIR_DOMAIN_VIRT_XEN, parse_flags))) + goto fail; + + if (!virDomainDefCheckABIStability(def, def)) { + fprintf(stderr, "ABI stability check failed on %s", inxml); + goto fail; + } + + if (!(actual = virDomainDefFormat(def, format_flags))) + goto fail; + + if (STRNEQ(outXmlData, actual)) { + virtTestDifferenceFull(stderr, outXmlData, outxml, actual, inxml); + goto fail; + } + + ret = 0; + fail: + VIR_FREE(inXmlData); + VIR_FREE(outXmlData); + VIR_FREE(actual); + virDomainDefFree(def); + return ret; +} + +enum { + WHEN_INACTIVE = 1, + WHEN_ACTIVE = 2, + WHEN_EITHER = 3, +}; + +struct testInfo { + const char *name; + bool different; + int when; +}; + +static int +testCompareXMLToXMLHelper(const void *data) +{ + const struct testInfo *info = data; + char *xml_in = NULL; + char *xml_out = NULL; + char *xml_out_active = NULL; + char *xml_out_inactive = NULL; + int ret = -1; + + if (virAsprintf(&xml_in, "%s/xlxml2xmldata/xlxml2xml-%s.xml", + abs_srcdir, info->name) < 0 || + virAsprintf(&xml_out, "%s/xlxml2xmldata/xlxml2xml-%s-out.xml", + abs_srcdir, info->name) < 0 || + virAsprintf(&xml_out_active, + "%s/xlxml2xmldata/xlxml2xml-%s-active.xml", + abs_srcdir, info->name) < 0 || + virAsprintf(&xml_out_inactive, + "%s/xlxml2xmldata/xlxml2xml-%s-inactive.xml", + abs_srcdir, info->name) < 0) + goto cleanup; + + if ((info->when & WHEN_INACTIVE)) { + char *out; + if (!info->different) + out = xml_in; + else if (virFileExists(xml_out_inactive)) + out = xml_out_inactive; + else + out = xml_out; + + if (testCompareXMLToXMLFiles(xml_in, out, false) < 0) + goto cleanup; + } + + if ((info->when & WHEN_ACTIVE)) { + char *out; + if (!info->different) + out = xml_in; + else if (virFileExists(xml_out_active)) + out = xml_out_active; + else + out = xml_out; + + if (testCompareXMLToXMLFiles(xml_in, out, true) < 0) + goto cleanup; + } + + ret = 0; + + cleanup: + VIR_FREE(xml_in); + VIR_FREE(xml_out); + VIR_FREE(xml_out_active); + VIR_FREE(xml_out_inactive); + return ret; +} + + +static int +mymain(void) +{ + int ret = 0; + + if ((caps = testXLInitCaps()) == NULL) + return EXIT_FAILURE; + + if (!(xmlopt = libxlCreateXMLConf())) + return EXIT_FAILURE; + +# define DO_TEST_FULL(name, is_different, when) \ + do { \ + const struct testInfo info = {name, is_different, when}; \ + if (virtTestRun("LibXL XML-2-XML " name, \ + testCompareXMLToXMLHelper, &info) < 0) \ + ret = -1; \ + } while (0) + +# define DO_TEST(name) \ + DO_TEST_FULL(name, false, WHEN_EITHER) + +# define DO_TEST_DIFFERENT(name) \ + DO_TEST_FULL(name, true, WHEN_EITHER) + + DO_TEST("hvm"); + DO_TEST("pv"); + DO_TEST("hvm-stubdom"); + DO_TEST("network-bridged"); + DO_TEST("network-routed"); + DO_TEST("network-driver-domain"); + + virObjectUnref(caps); + virObjectUnref(xmlopt); + + return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; +} + +VIRT_TEST_MAIN(mymain) + +#else + +int +main(void) +{ + return EXIT_AM_SKIP; +} + +#endif /* WITH_LIBXL */ -- 1.8.3.1

4 60

[libvirt] [PATCH] domain_conf: Format <pvpanic/> without address correctly
by Michal Privoznik 05 Mar '15

05 Mar '15

We have something like pvpanic device. However, in some cases it does not have any address assigned, in which case we produce this ugly XML (still valid though): <devices> <emulator>/usr/bin/qemu</emulator> ... <panic> </panic> </devices> Lets format "<pvpanic/>" instead. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_conf.c | 20 ++++++++++----- .../qemuxml2argv-panic-no-address.args | 5 ++++ .../qemuxml2argv-panic-no-address.xml | 29 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 +++ tests/qemuxml2xmltest.c | 1 + 5 files changed, 52 insertions(+), 6 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6da02b0..a02d656 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -18750,13 +18750,21 @@ virDomainWatchdogDefFormat(virBufferPtr buf, static int virDomainPanicDefFormat(virBufferPtr buf, virDomainPanicDefPtr def) { - virBufferAddLit(buf, "<panic>\n"); - virBufferAdjustIndent(buf, 2); - if (virDomainDeviceInfoFormat(buf, &def->info, 0) < 0) - return -1; - virBufferAdjustIndent(buf, -2); - virBufferAddLit(buf, "</panic>\n"); + virBuffer childrenBuf = VIR_BUFFER_INITIALIZER; + int indent = virBufferGetIndent(buf, false); + virBufferAddLit(buf, "<panic"); + virBufferAdjustIndent(&childrenBuf, indent + 2); + if (virDomainDeviceInfoFormat(&childrenBuf, &def->info, 0) < 0) + return -1; + if (virBufferUse(&childrenBuf)) { + virBufferAddLit(buf, ">\n"); + virBufferAddBuffer(buf, &childrenBuf); + virBufferAddLit(buf, "</panic>\n"); + } else { + virBufferAddLit(buf, "/>\n"); + } + virBufferFreeAndReset(&childrenBuf); return 0; } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args b/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args new file mode 100644 index 0000000..3cbd688 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args @@ -0,0 +1,5 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 -device pvpanic diff --git a/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.xml b/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.xml new file mode 100644 index 0000000..79f8a1e --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.xml @@ -0,0 +1,29 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='fdc' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='virtio'/> + <panic/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 00fd044..e2ad713 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1522,6 +1522,9 @@ mymain(void) DO_TEST("panic", QEMU_CAPS_DEVICE_PANIC, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); + DO_TEST("panic-no-address", QEMU_CAPS_DEVICE_PANIC, + QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); + DO_TEST("fips-enabled", QEMU_CAPS_ENABLE_FIPS); DO_TEST("shmem", QEMU_CAPS_PCIDEVICE, diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 58917c3..9e85d4e 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -400,6 +400,7 @@ mymain(void) DO_TEST("pcihole64-q35"); DO_TEST("panic"); + DO_TEST("panic-no-address"); DO_TEST_DIFFERENT("disk-backing-chains"); -- 2.0.5

2 1

[libvirt] [PATCHv2] spec: Enable RBD storage driver in RHEL-7
by Peter Krempa 05 Mar '15

05 Mar '15

Use correct package names too as they differ. --- libvirt.spec.in | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 12bd17c..ce792e6 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -108,7 +108,7 @@ %define with_storage_iscsi 0%{!?_without_storage_iscsi:%{server_drivers}} %define with_storage_disk 0%{!?_without_storage_disk:%{server_drivers}} %define with_storage_mpath 0%{!?_without_storage_mpath:%{server_drivers}} -%if 0%{?fedora} >= 16 +%if 0%{?fedora} >= 16 || 0%{?rhel} >= 7 %define with_storage_rbd 0%{!?_without_storage_rbd:%{server_drivers}} %else %define with_storage_rbd 0 @@ -182,6 +182,13 @@ %endif %endif +# librados and librbd are built only on x86_64 on rhel +%ifnarch x86_64 + %if 0%{?rhel} >= 7 + %define with_storage_rbd 0 + %endif +%endif + # RHEL doesn't ship OpenVZ, VBox, UML, PowerHypervisor, # VMWare, libxenserver (xenapi), libxenlight (Xen 4.1 and newer), # or HyperV. @@ -566,7 +573,12 @@ BuildRequires: device-mapper-devel %endif %endif %if %{with_storage_rbd} + %if 0%{?rhel} >= 7 +BuildRequires: librados2-devel +BuildRequires: librbd1-devel + %else BuildRequires: ceph-devel + %endif %endif %if %{with_storage_gluster} %if 0%{?rhel} >= 6 -- 2.2.2

2 2

[libvirt] [PATCH] conf: Remove duplicate entries in <metadata> by namespace
by Peter Krempa 05 Mar '15

05 Mar '15

Since the APIs support just one element per namespace and while modifying an element all duplicates would be removed, let's do this right away in the post parse callback. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1190590 --- src/conf/domain_conf.c | 42 ++++++++++++++++++++++ .../qemuxml2argv-metadata-duplicate.xml | 34 ++++++++++++++++++ .../qemuxml2xmlout-metadata-duplicate.xml | 31 ++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 4 files changed, 108 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-metadata-duplicate.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-metadata-duplicate.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6da02b0..5467bef 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3148,6 +3148,45 @@ virDomainDefRejectDuplicateControllers(virDomainDefPtr def) } +/** + * virDomainDefRemoveDuplicateMetadata: + * @def: Remove duplicate metadata for this def + * + * This function removes metadata elements in @def that share the namespace. + * The first metadata entry of every duplicate namespace is kept. + */ +static void +virDomainDefRemoveDuplicateMetadata(virDomainDefPtr def) +{ + xmlNodePtr child; + xmlNodePtr next; + + if (!def || !def->metadata) + return; + + for (child = def->metadata->children; child; child = child->next) { + /* check that every other child of @root doesn't share the namespace of + * the current one and delete them possibly */ + next = child->next; + while (next) { + xmlNodePtr dupl = NULL; + + if (child->ns && next->ns && + STREQ_NULLABLE((const char *) child->ns->href, + (const char *) next->ns->href)) + dupl = next; + + next = next->next; + + if (dupl) { + xmlUnlinkNode(dupl); + xmlFreeNode(dupl); + } + } + } +} + + static int virDomainDefPostParseInternal(virDomainDefPtr def, virCapsPtr caps ATTRIBUTE_UNUSED) @@ -3316,6 +3355,9 @@ virDomainDefPostParseInternal(virDomainDefPtr def, } } + /* clean up possibly duplicated metadata entries */ + virDomainDefRemoveDuplicateMetadata(def); + return 0; } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-metadata-duplicate.xml b/tests/qemuxml2argvdata/qemuxml2argv-metadata-duplicate.xml new file mode 100644 index 0000000..13fb449 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-metadata-duplicate.xml @@ -0,0 +1,34 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> +  + <metadata> + <app1:foo xmlns:app1="http://foo.org/">fooish</app1:foo> + <app3:foo xmlns:app3="http://foo.org/">fooish</app3:foo> + <app1:foo xmlns:app1="http://foo.org/">fooish</app1:foo> + <app2:bar xmlns:app2="http://bar.com/" maman="baz">barish</app2:bar> + <app1:foo xmlns:app1="http://foo.org/">fooish</app1:foo> + <app2:bar xmlns:app2="http://bar.com/" maman="baz">barish</app2:bar> + </metadata> +</domain> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-metadata-duplicate.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-metadata-duplicate.xml new file mode 100644 index 0000000..e32fb67 --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-metadata-duplicate.xml @@ -0,0 +1,31 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</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> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 58917c3..2bec2b2 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -367,6 +367,7 @@ mymain(void) DO_TEST_DIFFERENT("usb-ich9-ehci-addr"); DO_TEST_DIFFERENT("metadata"); + DO_TEST_DIFFERENT("metadata-duplicate"); DO_TEST("tpm-passthrough"); DO_TEST("pci-bridge"); -- 2.2.2

2 2

[libvirt] [libvirt-python PATCH] Clarify description for virNodeGetSecurityModel
by Ján Tomko 05 Mar '15

05 Mar '15

s/host/hypervisor/ to match the wording used by the C binding. https://bugzilla.redhat.com/show_bug.cgi?id=1198518 --- libvirt-override-api.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Pushed as trivial. diff --git a/libvirt-override-api.xml b/libvirt-override-api.xml index 439cb40..144479c 100644 --- a/libvirt-override-api.xml +++ b/libvirt-override-api.xml @@ -105,7 +105,7 @@ <arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/> </function> <function name='virNodeGetSecurityModel' file='python'> - <info>Extract information about the host security model</info> + <info>Extract information about the hypervisor security model</info> <return type='char *' info='the list of information or None in case of error'/> <arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/> </function> -- 2.0.5

1 0

[libvirt] [PATCH 0/3] unify memtune value representation in libvirt
by Pavel Hrdina 05 Mar '15

05 Mar '15

The first patch rewrites virsh memtune command to accept 0 as valid value instead of ignoring it. In the second patch I'll introduce a simple helper to crop the *_limit values to VIR_DOMAIN_MEMORY_PARAM_UNLIMITED as its used several times while reading values from cgroups. The last patch actually changes the internal representation of unlimited memtune settings. More detailed description is in commit message. My motivation to change it completely is to prevent future bugs with those limits. Pavel Hrdina (3): virsh: fix memtune to also accept 0 as valid value virutil: introduce helper to set memory limits memtune: change the way how we store unlimited value docs/formatdomain.html.in | 4 +- src/conf/domain_conf.c | 75 +++++++++++++++++----- src/libvirt-domain.c | 3 + src/lxc/lxc_cgroup.c | 18 +++--- src/lxc/lxc_driver.c | 3 - src/lxc/lxc_fuse.c | 12 ++-- src/lxc/lxc_native.c | 6 +- src/openvz/openvz_conf.c | 4 +- src/openvz/openvz_driver.c | 4 +- src/qemu/qemu_cgroup.c | 24 +++---- src/qemu/qemu_command.c | 8 ++- src/qemu/qemu_driver.c | 6 +- src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_migration.c | 5 +- src/util/virutil.c | 8 +-- src/util/virutil.h | 4 ++ tests/qemuxml2argvdata/qemuxml2argv-memtune.xml | 2 +- .../qemuxml2xmloutdata/qemuxml2xmlout-memtune.xml | 2 +- tools/virsh-domain.c | 62 ++++++------------ 19 files changed, 140 insertions(+), 112 deletions(-) -- 2.0.5

2 8

[libvirt] [PATCH] spec: Enable RBD storage driver in RHEL-7
by Peter Krempa 05 Mar '15

05 Mar '15

Use correct package names too as they differ. --- libvirt.spec.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 12bd17c..d85bd4e 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -108,7 +108,7 @@ %define with_storage_iscsi 0%{!?_without_storage_iscsi:%{server_drivers}} %define with_storage_disk 0%{!?_without_storage_disk:%{server_drivers}} %define with_storage_mpath 0%{!?_without_storage_mpath:%{server_drivers}} -%if 0%{?fedora} >= 16 +%if 0%{?fedora} >= 16 || 0%{?rhel} >= 7 %define with_storage_rbd 0%{!?_without_storage_rbd:%{server_drivers}} %else %define with_storage_rbd 0 @@ -566,7 +566,12 @@ BuildRequires: device-mapper-devel %endif %endif %if %{with_storage_rbd} + %if %if 0%{?rhel} >= 7 +BuildRequires: librados2-devel +BuildRequires: librbd1-devel + %else BuildRequires: ceph-devel + %endif %endif %if %{with_storage_gluster} %if 0%{?rhel} >= 6 -- 2.2.2

1 1

[libvirt] [PATCH] Fix build on mingw
by Ján Tomko 05 Mar '15

05 Mar '15

Last commit unconditionally included a linux-specific header. Do not do that. --- Pushed as trivial. Forgot to send the mail. src/util/virnetdev.c | 4 ++++ src/util/virnetdev.h | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 36e69a3..971db43 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -47,6 +47,10 @@ # undef HAVE_STRUCT_IFREQ #endif +#if defined(SIOCETHTOOL) && defined(HAVE_STRUCT_IFREQ) +# include <linux/ethtool.h> +#endif + #if HAVE_DECL_LINK_ADDR # include <sys/sockio.h> # include <net/if_dl.h> diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index 643479d..856127b 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -32,7 +32,6 @@ # include "virpci.h" # include "device_conf.h" -# include <linux/ethtool.h> # ifdef HAVE_STRUCT_IFREQ typedef struct ifreq virIfreq; # else -- 2.0.5

1 0

[libvirt] [PATCH v2] qemu: Allow spaces in disk serial
by Michal Privoznik 05 Mar '15

05 Mar '15

https://bugzilla.redhat.com/show_bug.cgi?id=1195660 There's been a bug report appearing on the qemu-devel list, that libvirt is unable to pass spaces in disk serial number [1]. Not only our RNG schema forbids that, the code is not prepared either. However, with a bit of escaping (if needed) we can allow spaces there. 1: https://lists.gnu.org/archive/html/qemu-devel/2015-02/msg04041.html Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v1: - Switch from virBufferEscapeShell to virBufferEscape docs/schemas/domaincommon.rng | 2 +- src/qemu/qemu_command.c | 5 ++-- .../qemuxml2argvdata/qemuxml2argv-disk-serial.args | 7 ++++++ .../qemuxml2argvdata/qemuxml2argv-disk-serial.xml | 27 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 5 ++++ 5 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-serial.xml diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index f41ca43..09bd921 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -5067,7 +5067,7 @@ </define> <define name="diskSerial"> <data type="string"> - <param name="pattern">[A-Za-z0-9_\.\+\-]+</param> + <param name="pattern">[A-Za-z0-9_\.\+\- ]+</param> </data> </define> <define name="bridgeMode"> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index fb3d5ab..25b6499 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2633,7 +2633,7 @@ qemuBuildIoEventFdStr(virBufferPtr buf, } #define QEMU_SERIAL_PARAM_ACCEPTED_CHARS \ - "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_" + "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_ " static int qemuSafeSerialParamValue(const char *value) @@ -3616,7 +3616,8 @@ qemuBuildDriveStr(virConnectPtr conn, virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_SERIAL)) { if (qemuSafeSerialParamValue(disk->serial) < 0) goto error; - virBufferAsprintf(&opt, ",serial=%s", disk->serial); + virBufferAddLit(&opt, ",serial="); + virBufferEscape(&opt, '\\', " ", "%s", disk->serial); } if (disk->cachemode) { diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args new file mode 100644 index 0000000..794b94b --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args @@ -0,0 +1,7 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/libexec/qemu-kvm -S -M pc -cpu qemu32 -m 214 -smp 1 -nographic -nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ +-drive 'file=/dev/HostVG/QEMUGuest1,if=none,\ +id=drive-ide0-0-1,serial=\ \ WD-WMAP9A966149' \ +-device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.xml new file mode 100644 index 0000000..0fe75f3 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.xml @@ -0,0 +1,27 @@ +<domain type='kvm'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/libexec/qemu-kvm</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <serial> WD-WMAP9A966149</serial> + <address type='drive' controller='0' bus='0' target='0' unit='1'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 16f325e..3032d1b 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -904,6 +904,11 @@ mymain(void) QEMU_CAPS_DEVICE, QEMU_CAPS_SCSI_BLOCK, QEMU_CAPS_VIRTIO_BLK_SG_IO, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI); + DO_TEST("disk-serial", + QEMU_CAPS_KVM, + QEMU_CAPS_DEVICE, + QEMU_CAPS_DRIVE, + QEMU_CAPS_DRIVE_SERIAL); DO_TEST("graphics-vnc", QEMU_CAPS_VNC); DO_TEST("graphics-vnc-socket", QEMU_CAPS_VNC); -- 2.0.5

2 1

[libvirt] [PATCHv2] SRIOV NIC offload feature discovery
by James Chapman 05 Mar '15

05 Mar '15

Adding functionality to libvirt that will allow it query the ethtool interface for the availability of certain NIC HW offload features Here is an example of the feature XML definition: <device> <name>net_eth4_90_e2_ba_5e_a5_45</name> <path>/sys/devices/pci0000:00/0000:00:03.0/0000:08:00.1/net/eth4</path> <parent>pci_0000_08_00_1</parent> <capability type='net'> <interface>eth4</interface> <address>90:e2:ba:5e:a5:45</address> <link speed='10000' state='up'/> <feature name='rx'/> <feature name='tx'/> <feature name='sg'/> <feature name='tso'/> <feature name='gso'/> <feature name='gro'/> <feature name='rxvlan'/> <feature name='txvlan'/> <feature name='rxhash'/> <capability type='80203'/> </capability> </device> --- docs/formatnode.html.in | 18 +++ docs/schemas/nodedev.rng | 14 +++ src/conf/device_conf.h | 6 + src/conf/node_device_conf.c | 45 ++++++- src/conf/node_device_conf.h | 2 + src/libvirt_private.syms | 1 + src/node_device/node_device_udev.c | 4 + src/util/virnetdev.c | 143 ++++++++++++++++++++++ src/util/virnetdev.h | 7 ++ tests/nodedevschemadata/net_00_13_02_b9_f9_d3.xml | 9 ++ tests/nodedevschemadata/net_00_15_58_2f_e9_55.xml | 9 ++ 11 files changed, 257 insertions(+), 1 deletion(-) diff --git a/docs/formatnode.html.in b/docs/formatnode.html.in index b820a34..ba9a0f8 100644 --- a/docs/formatnode.html.in +++ b/docs/formatnode.html.in @@ -183,6 +183,24 @@ link. So far, the whole element is just for output, not setting. </dd> + <dt><code>feature</code></dt> + <dd>If present, the hw offloads supported by this network + interface. Possible features are: + <dl> + <dt><code>rx</code></dt><dd>rx-checksumming</dd> + <dt><code>tx</code></dt><dd>tx-checksumming</dd> + <dt><code>sg</code></dt><dd>scatter-gather</dd> + <dt><code>tso</code></dt><dd>tcp-segmentation-offload</dd> + <dt><code>ufo</code></dt><dd>udp-fragmentation-offload</dd> + <dt><code>gso</code></dt><dd>generic-segmentation-offload</dd> + <dt><code>gro</code></dt><dd>generic-receive-offload</dd> + <dt><code>lro</code></dt><dd>large-receive-offload</dd> + <dt><code>rxvlan</code></dt><dd>rx-vlan-offload</dd> + <dt><code>txvlan</code></dt><dd>tx-vlan-offload</dd> + <dt><code>ntuple</code></dt><dd>ntuple-filters</dd> + <dt><code>rxhash</code></dt><dd>receive-hashing</dd> + </dl> + </dd> <dt><code>capability</code></dt> <dd>A network protocol exposed by the device, where the attribute <code>type</code> can be "80203" for IEEE diff --git a/docs/schemas/nodedev.rng b/docs/schemas/nodedev.rng index 13c5402..744dccd 100644 --- a/docs/schemas/nodedev.rng +++ b/docs/schemas/nodedev.rng @@ -275,10 +275,24 @@ <ref name="link-speed-state"/> <zeroOrMore> + <element name='feature'> + <attribute name='name'> + <ref name='netfeaturename'/> + </attribute> + </element> + </zeroOrMore> + + <zeroOrMore> <ref name='subcapnet'/> </zeroOrMore> </define> + <define name='netfeaturename'> + <data type='string'> + <param name='pattern'>[a-zA-Z\-_]+</param> + </data> + </define> + <define name='subcapnet'> <element name='capability'> <choice> diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h index 7256cdc..091f2f0 100644 --- a/src/conf/device_conf.h +++ b/src/conf/device_conf.h @@ -62,6 +62,12 @@ struct _virInterfaceLink { unsigned int speed; /* link speed in Mbits per second */ }; +typedef struct _virDevFeature virDevFeature; +typedef virDevFeature *virDevFeaturePtr; +struct _virDevFeature { + char *name; /* device feature */ +}; + int virDevicePCIAddressIsValid(virDevicePCIAddressPtr addr); int virDevicePCIAddressParseXML(xmlNodePtr node, diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index a728a00..76b53f0 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -437,6 +437,12 @@ char *virNodeDeviceDefFormat(const virNodeDeviceDef *def) virBufferEscapeString(&buf, "<address>%s</address>\n", data->net.address); virInterfaceLinkFormat(&buf, &data->net.lnk); + if (data->net.features) { + for (i = 0; i < data->net.nfeatures; i++) { + virBufferAsprintf(&buf, "<feature name='%s'/>\n", + data->net.features[i].name); + } + } if (data->net.subtype != VIR_NODE_DEV_CAP_NET_LAST) { const char *subtyp = virNodeDevNetCapTypeToString(data->net.subtype); @@ -927,8 +933,10 @@ virNodeDevCapNetParseXML(xmlXPathContextPtr ctxt, union _virNodeDevCapData *data) { xmlNodePtr orignode, lnk; - int ret = -1; + size_t i = -1; + int ret = -1, n = -1; char *tmp; + xmlNodePtr *nodes = NULL; orignode = ctxt->node; ctxt->node = node; @@ -943,6 +951,38 @@ virNodeDevCapNetParseXML(xmlXPathContextPtr ctxt, data->net.address = virXPathString("string(./address[1])", ctxt); + if ((n = virXPathNodeSet("./feature", ctxt, &nodes)) < 0) + goto out; + + if (n > 0) { + if (VIR_RESIZE_N(data->net.features, data->net.nfeatures, data->net.nfeatures, n) < 0) + goto out; + data->net.nfeatures = n; + } + + for (i = 0; i < n; i++) { + char *name; + size_t j; + + if (!(name = virXMLPropString(nodes[i], "name")) || *name == 0) { + VIR_FREE(name); + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Invalid NIC offload feature name")); + goto out; + } + data->net.features[i].name = name; + + for (j = 0; j < i; j++) { + if (STREQ(name, data->net.features[j].name)) { + virReportError(VIR_ERR_XML_ERROR, + _("NIC offload feature '%s' specified more than once"), + name); + VIR_FREE(name); + goto out; + } + } + } + data->net.subtype = VIR_NODE_DEV_CAP_NET_LAST; tmp = virXPathString("string(./capability/@type)", ctxt); @@ -1679,6 +1719,9 @@ void virNodeDevCapsDefFree(virNodeDevCapsDefPtr caps) case VIR_NODE_DEV_CAP_NET: VIR_FREE(data->net.ifname); VIR_FREE(data->net.address); + for (i = 0; i < data->net.nfeatures; i++) + VIR_FREE(data->net.features[i].name); + VIR_FREE(data->net.features); break; case VIR_NODE_DEV_CAP_SCSI_HOST: VIR_FREE(data->scsi_host.wwnn); diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h index fd5d179..918523a 100644 --- a/src/conf/node_device_conf.h +++ b/src/conf/node_device_conf.h @@ -141,6 +141,8 @@ struct _virNodeDevCapsDef { char *ifname; virInterfaceLink lnk; virNodeDevNetCapType subtype; /* LAST -> no subtype */ + size_t nfeatures; + virDevFeaturePtr features; } net; struct { unsigned int host; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index c156b40..aa86560 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1668,6 +1668,7 @@ virNetDevAddRoute; virNetDevClearIPAddress; virNetDevDelMulti; virNetDevExists; +virNetDevGetFeatures; virNetDevGetIndex; virNetDevGetIPv4Address; virNetDevGetLinkInfo; diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 03c7a0b..349733f 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -719,6 +719,10 @@ static int udevProcessNetworkInterface(struct udev_device *device, if (virNetDevGetLinkInfo(data->net.ifname, &data->net.lnk) < 0) goto out; + if (virNetDevGetFeatures(data->net.ifname, &data->net.features, + &data->net.nfeatures) < 0) + goto out; + ret = 0; out: diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 2a0eb43..ab347c5 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -2728,3 +2728,146 @@ int virNetDevGetRxFilter(const char *ifname, *filter = fil; return ret; } + +#if defined(SIOCETHTOOL) && defined(HAVE_STRUCT_IFREQ) + +/** + * virNetDevFeatureAvailable + * This function checks for the availability of a network device feature + * + * @ifname: name of the interface + * @cmd: reference to an ethtool command structure + * + * Returns 0 on success, -1 on failure. + */ +static int +virNetDevFeatureAvailable(const char *ifname, struct ethtool_value *cmd) +{ + int ret = -1; + int sock = -1; + virIfreq ifr; + + sock = socket(AF_LOCAL, SOCK_DGRAM, 0); + if (sock < 0) { + virReportSystemError(errno, "%s", _("Cannot open control socket")); + goto cleanup; + } + + strcpy(ifr.ifr_name, ifname); + ifr.ifr_data = (void*) cmd; + + if (ioctl(sock, SIOCETHTOOL, &ifr) != 0) { + switch (errno) { + case EPERM: + VIR_DEBUG(("virNetDevFeatureAvailable ioctl: permission denied")); + break; + case EINVAL: + VIR_DEBUG(("virNetDevFeatureAvailable ioctl: invalid request")); + break; + case EOPNOTSUPP: + VIR_DEBUG(("virNetDevFeatureAvailable ioctl: request not supported")); + break; + default: + virReportSystemError(errno, "%s", _("virNetDevFeatureAvailable ioctl error")); + goto cleanup; + } + } + + ret = cmd->data > 0 ? 1: 0; + cleanup: + if (sock) + VIR_FORCE_CLOSE(sock); + + return ret; +} + + +/** + * virNetDevGetFeatures: + * This function gets the nic offloads features available for ifname + * + * @ifname: name of the interface + * @features: network device feature structures + * @nfeatures: number of features available + * + * Returns 0 on success, -1 on failure. + */ +int +virNetDevGetFeatures(const char *ifname, + virDevFeaturePtr *features, + size_t *nfeatures) +{ + int ret = -1; + size_t i = -1; + size_t j = -1; + struct ethtool_value cmd; + virDevFeaturePtr tmpfeature = NULL; + + struct elem{ + const char *name; + const int cmd; + }; + /* legacy ethtool getters */ + struct elem cmds[] = { + {"rx", ETHTOOL_GRXCSUM}, + {"tx", ETHTOOL_GTXCSUM }, + {"sg", ETHTOOL_GSG}, + {"tso", ETHTOOL_GTSO}, + {"gso", ETHTOOL_GGSO}, + {"gro", ETHTOOL_GGRO}, + }; + /* ethtool masks */ + struct elem flags[] = { + {"lro", ETH_FLAG_LRO}, + {"rxvlan", ETH_FLAG_RXVLAN}, + {"txvlan", ETH_FLAG_TXVLAN}, + {"ntuple", ETH_FLAG_NTUPLE}, + {"rxhash", ETH_FLAG_RXHASH}, + }; + + for (i = 0; i < ARRAY_CARDINALITY(cmds); i++) { + cmd.cmd = cmds[i].cmd; + if (virNetDevFeatureAvailable(ifname, &cmd)) { + if (VIR_ALLOC(tmpfeature) < 0) + goto cleanup; + if ((ret = VIR_STRDUP(tmpfeature->name, cmds[i].name)) != 1) + goto cleanup; + if (VIR_APPEND_ELEMENT(*features, *nfeatures, *tmpfeature) < 0) + goto cleanup; + } + } + + cmd.cmd = ETHTOOL_GFLAGS; + for (j = 0; j < ARRAY_CARDINALITY(flags); j++) { + if (virNetDevFeatureAvailable(ifname, &cmd)) { + if (cmd.data & (flags[j].cmd)) { + if (VIR_ALLOC(tmpfeature) < 0) + goto cleanup; + if ((ret = VIR_STRDUP(tmpfeature->name, flags[j].name)) != 1) + goto cleanup; + if (VIR_APPEND_ELEMENT(*features, *nfeatures, *tmpfeature) < 0) + goto cleanup; + } + } + } + + ret = 0; + cleanup: + + return ret; + +} +#else +int +virNetDevGetFeatures(const char *ifname, + virDevFeaturePtr *features, + size_t *nfeatures) +{ + VIR_DEBUG("Getting network device features on %s is not implemented on this platform", + ifname); + *features = NULL; + *nfeatures = 0; + + return 0; +} +#endif diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index de8b480..22ef1a2 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -31,6 +31,8 @@ # include "virpci.h" # include "device_conf.h" +# include <linux/ethtool.h> +typedef struct ethtool_cmd virEthCmd; # ifdef HAVE_STRUCT_IFREQ typedef struct ifreq virIfreq; # else @@ -182,6 +184,11 @@ int virNetDevGetVirtualFunctionInfo(const char *vfname, char **pfname, int *vf) ATTRIBUTE_NONNULL(1); +int virNetDevGetFeatures(const char *ifname, + virDevFeaturePtr *features, + size_t *nfeatures) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + int virNetDevGetLinkInfo(const char *ifname, virInterfaceLinkPtr lnk) ATTRIBUTE_NONNULL(1); diff --git a/tests/nodedevschemadata/net_00_13_02_b9_f9_d3.xml b/tests/nodedevschemadata/net_00_13_02_b9_f9_d3.xml index 970ccca..2a34fed 100644 --- a/tests/nodedevschemadata/net_00_13_02_b9_f9_d3.xml +++ b/tests/nodedevschemadata/net_00_13_02_b9_f9_d3.xml @@ -4,6 +4,15 @@ <capability type='net'> <interface>eth0</interface> <address>00:13:02:b9:f9:d3</address> + <feature name='rx'/> + <feature name='tx'/> + <feature name='sg'/> + <feature name='tso'/> + <feature name='gso'/> + <feature name='gro'/> + <feature name='rxvlan'/> + <feature name='txvlan'/> + <feature name='rxhash'/> <capability type='80211'/> </capability> </device> diff --git a/tests/nodedevschemadata/net_00_15_58_2f_e9_55.xml b/tests/nodedevschemadata/net_00_15_58_2f_e9_55.xml index 741c959..81d398c 100644 --- a/tests/nodedevschemadata/net_00_15_58_2f_e9_55.xml +++ b/tests/nodedevschemadata/net_00_15_58_2f_e9_55.xml @@ -4,6 +4,15 @@ <capability type='net'> <interface>eth1</interface> <address>00:15:58:2f:e9:55</address> + <feature name='rx'/> + <feature name='tx'/> + <feature name='sg'/> + <feature name='tso'/> + <feature name='gso'/> + <feature name='gro'/> + <feature name='rxvlan'/> + <feature name='txvlan'/> + <feature name='rxhash'/> <capability type='80203'/> </capability> </device> -- 1.9.1

2 2

[libvirt] [libvirt-tck][PATCH] Fix disk interface hot plug unplug test scripts
by Zhe Peng 05 Mar '15

05 Mar '15

This patch fixed following issues: 1) Hot unplug won't work for a VM without OS. Create a working VM instead. 2) Avoid using multicast MAC address. Signed-off-by: Zhe Peng <zpeng(a)redhat.com> --- scripts/domain/200-disk-hotplug.t | 5 +++-- scripts/domain/205-disk-hotplug-ordering.t | 3 ++- scripts/domain/210-nic-hotplug.t | 5 +++-- scripts/domain/215-nic-hotplug-many.t | 9 +++++---- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/scripts/domain/200-disk-hotplug.t b/scripts/domain/200-disk-hotplug.t index 4c54b6b..7ed5b27 100644 --- a/scripts/domain/200-disk-hotplug.t +++ b/scripts/domain/200-disk-hotplug.t @@ -41,13 +41,14 @@ END { } -my $xml = $tck->generic_domain(name => "tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck", fullos => 1)->as_xml; diag "Creating a new transient domain"; my $dom; ok_domain(sub { $dom = $conn->create_domain($xml) }, "created transient domain object"); +sleep(30); my $path = $tck->create_sparse_disk("200-disk-hotplug", "extra.img", 100); my $dev = "vdb"; @@ -76,4 +77,4 @@ lives_ok(sub { $dom->detach_device($diskxml); }, "disk has been detached"); my $finalxml = $dom->get_xml_description; -is($initialxml, $finalxml, "final XML has removed the disk") +is($finalxml, $initialxml, "final XML has removed the disk") diff --git a/scripts/domain/205-disk-hotplug-ordering.t b/scripts/domain/205-disk-hotplug-ordering.t index bc4990f..c9a300c 100644 --- a/scripts/domain/205-disk-hotplug-ordering.t +++ b/scripts/domain/205-disk-hotplug-ordering.t @@ -41,12 +41,13 @@ END { } -my $xml = $tck->generic_domain(name => "tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck", fullos => 1)->as_xml; diag "Creating a new transient domain"; my $dom; ok_domain(sub { $dom = $conn->create_domain($xml) }, "created transient domain object"); +sleep(30); my $supported = 1; foreach my $dev (qw/vdb sdb/) { my $path = $tck->create_sparse_disk("200-disk-hotplug", "extra-$dev.img", 100); diff --git a/scripts/domain/210-nic-hotplug.t b/scripts/domain/210-nic-hotplug.t index ac9048e..4a2763f 100644 --- a/scripts/domain/210-nic-hotplug.t +++ b/scripts/domain/210-nic-hotplug.t @@ -41,11 +41,12 @@ END { } -my $xml = $tck->generic_domain(name => "tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck", fullos => 1)->as_xml; diag "Creating a new transient domain"; my $dom; ok_domain(sub { $dom = $conn->create_domain($xml) }, "created transient domain object"); +sleep(30); my $mac = "00:11:22:33:44:55"; my $model = "virtio"; @@ -72,4 +73,4 @@ lives_ok(sub { $dom->detach_device($netxml); }, "interface has been detached"); my $finalxml = $dom->get_xml_description; -is($initialxml, $finalxml, "final XML has removed the disk") +is($finalxml, $initialxml, "final XML has removed the interface") diff --git a/scripts/domain/215-nic-hotplug-many.t b/scripts/domain/215-nic-hotplug-many.t index 0270054..d4fa23e 100644 --- a/scripts/domain/215-nic-hotplug-many.t +++ b/scripts/domain/215-nic-hotplug-many.t @@ -41,15 +41,16 @@ END { } -my $xml = $tck->generic_domain(name => "tck")->as_xml; +my $xml = $tck->generic_domain(name => "tck", fullos => 1)->as_xml; diag "Creating a new transient domain"; my $dom; ok_domain(sub { $dom = $conn->create_domain($xml) }, "created transient domain object"); +sleep(30); -my $mac1 = "01:11:22:33:44:55"; -my $mac2 = "02:11:22:33:44:55"; -my $mac3 = "03:11:22:33:44:55"; +my $mac1 = "02:11:22:33:44:55"; +my $mac2 = "04:11:22:33:44:55"; +my $mac3 = "06:11:22:33:44:55"; my $model = "virtio"; my $netxml1 = <<EOF; -- 1.9.0

1 0

[libvirt] [libvirt-tck][PATCH] Add two APIs testing for metadata
by Zhe Peng 05 Mar '15

05 Mar '15

$dom->set_metadata $dom->get_metadata only have title and destription element not support in libvirt now Signed-off-by: Zhe Peng <zpeng(a)redhat.com> --- scripts/domain/500-metadata.t | 72 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 scripts/domain/500-metadata.t diff --git a/scripts/domain/500-metadata.t b/scripts/domain/500-metadata.t new file mode 100644 index 0000000..11f2f6d --- /dev/null +++ b/scripts/domain/500-metadata.t @@ -0,0 +1,72 @@ +# -*- perl -*- +# +# Copyright (C) 2014 Red Hat, Inc. +# Copyright (C) 2014 Zhe Peng +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# + +=pod + +=head1 NAME + +domain/500-metadata.t -- set/get metadata from guest. + +=head1 DESCRIPTION + +The test case validates that libvirt can set/get guest metadata +Sys::Virt::Domain::METADATA_TITLE +Sys::Virt::Domain::METADATA_DESCRIPTION +not support Sys::Virt::Domain::METADATA_ELEMENT + +=cut + +use strict; +use warnings; + +use Test::More tests => 8; + +use Sys::Virt::TCK; +use Test::Exception; + +my $tck = Sys::Virt::TCK->new(); +my $conn = eval { $tck->setup(); }; +BAIL_OUT "failed to setup test harness: $@" if $@; +END { + $tck->cleanup if $tck; +} + +my $xml = $tck->generic_domain(name => "tck")->as_xml; + +diag "Creating a new transient domain"; +my $dom; +ok_domain(sub { $dom = $conn->create_domain($xml) }, "created transient domain object"); + +my $title = "libvirt tck testing title"; +my $des = "perl-Sys-Virt description"; + +lives_ok(sub {$dom->set_metadata(Sys::Virt::Domain::METADATA_TITLE, $title, undef, undef, 0)}, "Set title to $title" ); +lives_ok(sub {$dom->set_metadata(Sys::Virt::Domain::METADATA_DESCRIPTION, $des, undef, undef, 0)}, "Set description to $des" ); + +my $hasMetadata = $dom->get_xml_description; + +ok($hasMetadata =~ m|$title|, "title has added in guest"); +ok($hasMetadata =~ m|$des|, "description has added in guest"); + +my $mTitle = $dom->get_metadata(Sys::Virt::Domain::METADATA_TITLE,undef,0); +my $mDes = $dom->get_metadata(Sys::Virt::Domain::METADATA_DESCRIPTION,undef,0); + +is($mTitle, $title, "Get title from guest"); +is($mDes, $des, "Get description from guest"); + +diag "Destroy domain"; +$dom->destroy; + +ok_error(sub { $conn->get_domain_by_name("tck") }, "NO_DOMAIN error raised from missing domain", 42); + -- 1.9.0

1 0

[libvirt] [PATCH v1 00/31] Drop network driver lock
by Michal Privoznik 05 Mar '15

05 Mar '15

The patchset starts slowly, with small patches, and small changes, accelerating towards the end, with big changes. I know that network driver is not used as intensely as domain drivers, but hey, if we remove 100 lines (and substitute some others) we get fine grained locking! And cleaner code, of course. Oh, and this is meant for next release, obviously :) Michal Privoznik (31): networkLookupByUUID: Improve error message bridge_driver: Don't check network active unlocked testNetworkUpdate: Unlock network at the end networkGetNetworkAddress: Drop empty 'error' label virNetworkObjIsDuplicate: s/@doms/@nets/ virNetworkObjListFree: Accept NULL virNetworkObjListExport: Pass virNetworkObjListPtr test_driver: s/virNetworkObjList/virNetworkObjListPtr/ parallels: s/virNetworkObjList/virNetworkObjListPtr/ bridge_driver: s/virNetworkObjList/virNetworkObjListPtr/ conf: s/virNetworkFindByUUID/virNetworkObjFindByUUID/ conf: s/virNetworkFindByUUID/virNetworkObjFindByUUID/ network_conf: Introduce virNetworkObjListForEach network_conf: Introduce virNetworkObjListGetNames network_conf: Introduce virNetworkObjListNumOfNetworks bridge_driver: Adapt to new virNetworkObjList accessors test_driver: Adapt to new virNetworkObjList accessors parallels_network: Adapt to new virNetworkObjList accessors network_conf: Turn virNetworkObjList into virObject network_conf: Turn struct _virNetworkObjList private network_conf: Make virNetworkObj actually virObject virNetworkObjList: Derive from virObjectLockableClass network_conf: Introduce virNetworkObjEndAPI bridge_driver: Use virNetworkObjEndAPI test_driver: Use virNetworkObjEndAPI parallels_network: Use virNetworkObjEndAPI virNetworkObjListPtr: Make APIs self-locking virNetworkObjFindBy*: Return an reference to found object bridge_driver: Drop networkDriverLock() from almost everywhere test_driver: Drop testDriverLock() from almost everywhere parallels_network: Drop parallelsDriverLock() from everywhere. cfg.mk | 3 - src/conf/network_conf.c | 372 +++++++++++++++++++------- src/conf/network_conf.h | 51 ++-- src/libvirt_private.syms | 14 +- src/network/bridge_driver.c | 502 ++++++++++++++--------------------- src/network/bridge_driver_platform.h | 2 +- src/parallels/parallels_driver.c | 5 +- src/parallels/parallels_network.c | 144 +++------- src/parallels/parallels_utils.h | 2 +- src/test/test_driver.c | 223 ++++------------ tests/networkxml2conftest.c | 4 +- tests/objectlocking.ml | 2 - 12 files changed, 612 insertions(+), 712 deletions(-) -- 2.0.5

4 75

[libvirt] [PATCH v2] qemu: snapshot: remove the redundant 'if' check
by Shanzhi Yu 05 Mar '15

05 Mar '15

When the domain's source disk type is network, if source protocol is rbd or sheepdog, the 'if().. break' will end the current case, which lead to miss check the driver type is raw or qcow2. Libvirt will allow to create internal snapshot for a running domain with raw format disk which based on rbd storage. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1179533 Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- src/qemu/qemu_driver.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e282464..544ed82 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -13422,11 +13422,6 @@ qemuDomainSnapshotPrepare(virConnectPtr conn, active) < 0) goto cleanup; - if (dom_disk->src->type == VIR_STORAGE_TYPE_NETWORK && - (dom_disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_SHEEPDOG || - dom_disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_RBD)) { - break; - } if (vm->def->disks[i]->src->format > 0 && vm->def->disks[i]->src->format != VIR_STORAGE_FILE_QCOW2) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, -- 2.1.0

2 2

[libvirt] [PATCH 0/2] PowerPC : Miscellaneous fixes for 'ppc64le' architecture.
by Prerna Saxena 05 Mar '15

05 Mar '15

>From a28ef5a3e7b9cb023948cf97d9f472bb3a1e06d3 Mon Sep 17 00:00:00 2001 From: Prerna Saxena <prerna(a)linux.vnet.ibm.com> Date: Thu, 26 Feb 2015 22:31:05 +0530 This series adds few miscellaneous fixes for PowerPC 64-bit Little Endian Architecture. Changelog : ========== v1 of Patch 1/2 already posted and acked : https://www.redhat.com/archives/libvir-list/2015-February/msg00486.html Patch 2/2 adds a testcase to supplement patch 1. Prerna Saxena (2): PowerPC: Augment XML schema to include 'ppc64le' arch and newer pseries-2.* machine types. Tests : Add test for 'ppc64le' architecture. docs/schemas/basictypes.rng | 1 + docs/schemas/domaincommon.rng | 7 ++++- .../qemuxml2argv-pseries-cpu-le.args | 7 +++++ .../qemuxml2argv-pseries-cpu-le.xml | 17 ++++++++++++ tests/qemuxml2argvtest.c | 2 ++ tests/testutilsqemu.c | 30 ++++++++++++++++++++++ 6 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-le.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-le.xml -- 1.9.3 -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

3 7

[libvirt] [PATCHv3 0/4] Automaticaly fill <memory> element for NUMA enabled guests
by Peter Krempa 05 Mar '15

05 Mar '15

While there is still a discussion open upstream on a possible change of naming here I'm posting this so that comments can be held against this version. Peter Krempa (4): conf: Replace access to def->mem.max_balloon with accessor functions qemu: command: Add helper to align memory sizes conf: Automatically use NUMA memory size in case NUMA is enabled conf: Make specifying <memory> optional docs/schemas/domaincommon.rng | 18 ++--- src/conf/domain_conf.c | 81 +++++++++++++++++++--- src/conf/domain_conf.h | 4 ++ src/hyperv/hyperv_driver.c | 2 +- src/libvirt_private.syms | 3 + src/libxl/libxl_conf.c | 2 +- src/libxl/libxl_driver.c | 8 +-- src/lxc/lxc_cgroup.c | 2 +- src/lxc/lxc_driver.c | 12 ++-- src/lxc/lxc_fuse.c | 4 +- src/lxc/lxc_native.c | 4 +- src/openvz/openvz_driver.c | 2 +- src/parallels/parallels_driver.c | 2 +- src/parallels/parallels_sdk.c | 12 ++-- src/phyp/phyp_driver.c | 11 +-- src/qemu/qemu_command.c | 23 +++--- src/qemu/qemu_domain.c | 21 ++++++ src/qemu/qemu_domain.h | 2 + src/qemu/qemu_driver.c | 21 +++--- src/qemu/qemu_hotplug.c | 8 ++- src/qemu/qemu_process.c | 2 +- src/test/test_driver.c | 8 +-- src/uml/uml_driver.c | 8 +-- src/vbox/vbox_common.c | 4 +- src/vmware/vmware_driver.c | 2 +- src/vmx/vmx.c | 12 ++-- src/xen/xm_internal.c | 14 ++-- src/xenapi/xenapi_driver.c | 2 +- src/xenapi/xenapi_utils.c | 4 +- src/xenconfig/xen_common.c | 8 ++- src/xenconfig/xen_sxpr.c | 9 +-- .../qemuxml2argv-cpu-numa-no-memory-element.args | 7 ++ .../qemuxml2argv-cpu-numa-no-memory-element.xml | 24 +++++++ .../qemuxml2argv-minimal-no-memory.xml | 25 +++++++ .../qemuxml2argv-numatune-memnode.args | 2 +- tests/qemuxml2argvtest.c | 2 + .../qemuxml2xmlout-cpu-numa-no-memory-element.xml | 28 ++++++++ tests/qemuxml2xmltest.c | 1 + 38 files changed, 299 insertions(+), 105 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-no-memory-element.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-no-memory-element.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-minimal-no-memory.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-no-memory-element.xml -- 2.2.2

1 4

[libvirt] [PATCH] parallels: Cleanup partly opened drivers on connect open failure
by Michal Privoznik 04 Mar '15

04 Mar '15

Well, the parallelsConnectOpen() joins several sub-driver openings into one big if condition. If any of sub-driver fails to open, the whole API finishes immediately. The problem is, sub-drivers may have left some memory allocated. Fortunately, we have a free function for that: parallelsConnectClose(). This is, however, not prepared for partially allocated driver structure. So, prepare the free function for it and call it at the right place, in the if body. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- This commit assumes that virNetworkObjListFree() accepts NULL, and thus depends on this patch (which has been ACKed already): https://www.redhat.com/archives/libvir-list/2015-February/msg01127.html Should I push both during freeze or wait until after the release? src/parallels/parallels_driver.c | 7 ++++++- src/parallels/parallels_network.c | 4 ++++ src/parallels/parallels_storage.c | 6 ++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c index c9338b5..650b790 100644 --- a/src/parallels/parallels_driver.c +++ b/src/parallels/parallels_driver.c @@ -264,8 +264,10 @@ parallelsConnectOpen(virConnectPtr conn, if ((ret = parallelsOpenDefault(conn)) != VIR_DRV_OPEN_SUCCESS || (ret = parallelsStorageOpen(conn, flags)) != VIR_DRV_OPEN_SUCCESS || - (ret = parallelsNetworkOpen(conn, flags)) != VIR_DRV_OPEN_SUCCESS) + (ret = parallelsNetworkOpen(conn, flags)) != VIR_DRV_OPEN_SUCCESS) { + parallelsConnectClose(conn); return ret; + } return VIR_DRV_OPEN_SUCCESS; } @@ -275,6 +277,9 @@ parallelsConnectClose(virConnectPtr conn) { parallelsConnPtr privconn = conn->privateData; + if (!privconn) + return 0; + parallelsNetworkClose(conn); parallelsStorageClose(conn); diff --git a/src/parallels/parallels_network.c b/src/parallels/parallels_network.c index 3e7087d..c5834c5 100644 --- a/src/parallels/parallels_network.c +++ b/src/parallels/parallels_network.c @@ -336,6 +336,10 @@ parallelsNetworkOpen(virConnectPtr conn, int parallelsNetworkClose(virConnectPtr conn) { parallelsConnPtr privconn = conn->privateData; + + if (!privconn) + return 0; + parallelsDriverLock(privconn); virNetworkObjListFree(&privconn->networks); parallelsDriverUnlock(privconn); diff --git a/src/parallels/parallels_storage.c b/src/parallels/parallels_storage.c index d2c5bf2..56c1b42 100644 --- a/src/parallels/parallels_storage.c +++ b/src/parallels/parallels_storage.c @@ -72,9 +72,15 @@ parallelsStorageClose(virConnectPtr conn) { parallelsConnPtr privconn = conn->privateData; + if (!privconn) + return 0; + virStorageDriverStatePtr storageState = privconn->storageState; privconn->storageState = NULL; + if (!storageState) + return 0; + parallelsStorageLock(storageState); virStoragePoolObjListFree(&privconn->pools); VIR_FREE(storageState->configDir); -- 2.0.5

3 2

[libvirt] QEMU, libvirt, and KVM are participating in Outreachy May-August 2015
by Stefan Hajnoczi 04 Mar '15

04 Mar '15

QEMU, libvirt, and KVM are participating in the Outreachy (formerly known as Outreach Program for Women) May-August 2015 round. Outreachy is a 12-week full-time paid internship for working on open source projects. We are able to participate thanks to sponsors who will be listed on the Outreachy website in the future: http://outreachy.org/ >From the website: Outreachy is "open to women (cis and trans), trans men, genderqueer people, and all participants of the Ascend Project (http://ascendproject.org/) regardless of gender". Check out the project ideas list and details on how to apply: http://qemu-project.org/Outreachy_2015_MayAugust We encourage applicants to apply for both Outreachy and Google Summer of Code if they are eligible: http://qemu-project.org/Google_Summer_of_Code_2015 Stefan

1 0

[libvirt] [libvirt-designer][PATCH] Makefile: Build tests at the same time as the rest
by Michal Privoznik 04 Mar '15

04 Mar '15

Currently, since we were using check_PROGRAMS in the Makefile template, the test program build was postponed until 'make check' was run. That's not optimal. Lets build (not run!) test program in the 'make all' phase. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- >From my libvirt development experience, I'm used to just run make from my text editor. For instance, when changing some function header, I just run make and let the compiler catch all the places that need fixing. I think it's common practice. libvirt-designer/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt-designer/Makefile.am b/libvirt-designer/Makefile.am index bda4240..fd7627d 100644 --- a/libvirt-designer/Makefile.am +++ b/libvirt-designer/Makefile.am @@ -82,9 +82,9 @@ libvirt-designer-enum-types.c: $(DESIGNER_HEADER_FILES) libvirt-designer-enum-ty $(AM_V_GEN) ( $(GLIB_MKENUMS) --template $(srcdir)/libvirt-designer-enum-types.c.template $(DESIGNER_HEADER_FILES:%=$(srcdir)/%) ) | \ sed -e "s/G_TYPE_VIR_CONFIG/GVIR_CONFIG_TYPE/" -e "s/g_vir/gvir/" > libvirt-designer-enum-types.c -check_PROGRAMS = test-designer-domain +noinst_PROGRAMS = test-designer-domain -TESTS = $(check_PROGRAMS) +TESTS = $(noinst_PROGRAMS) test_designer_domain_CFLAGS = \ -I$(top_srcdir) \ -- 2.0.5

2 2

[libvirt] [PATCH] storage: tweak condition to properly test lseek
by Erik Skultety 04 Mar '15

04 Mar '15

According to the POSIX standard, off_t (returned by lseek) is defined as signed integral type no shorter than int. Because our offset variable is defined as unsigned long long, the original check was passed successfully if UINT64_MAX had been used as offset value, due to implicit conversion. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1177219 --- src/fdstream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fdstream.c b/src/fdstream.c index 5d80fc2..b8ea86e 100644 --- a/src/fdstream.c +++ b/src/fdstream.c @@ -610,7 +610,7 @@ virFDStreamOpenFileInternal(virStreamPtr st, } if (offset && - lseek(fd, offset, SEEK_SET) != offset) { + lseek(fd, offset, SEEK_SET) < 0) { virReportSystemError(errno, _("Unable to seek %s to %llu"), path, offset); -- 1.9.3

3 2

[libvirt] [PATCH] virsh: tweak domif-getlink link state reporting message
by Erik Skultety 04 Mar '15

04 Mar '15

According to docs, we only support 2 link states for an interface up/down, 'up' being the default state if link state is unspecified in domain's XML, so the message when no link state is provided should be changed a little. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1141119 --- tools/virsh-domain-monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 925eb1b..18ce9ae 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -756,7 +756,7 @@ cmdDomIfGetLink(vshControl *ctl, const vshCmd *cmd) if ((state = virXPathString("string(./link/@state)", ctxt))) vshPrint(ctl, "%s %s", iface, state); else - vshPrint(ctl, "%s default", iface); + vshPrint(ctl, "%s up", iface); ret = true; -- 1.9.3

2 2

[libvirt] [libvirt-designer 1/2] Fix gvir_designer_domain_get_fallback_disk_controller leak
by Christophe Fergeau 04 Mar '15

04 Mar '15

When the list of devices is empty (osinfo_list_get_length(devices) == 0), the 'devices' object would be leaked. --- libvirt-designer/libvirt-designer-domain.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libvirt-designer/libvirt-designer-domain.c b/libvirt-designer/libvirt-designer-domain.c index c1a0e83..6629fb5 100644 --- a/libvirt-designer/libvirt-designer-domain.c +++ b/libvirt-designer/libvirt-designer-domain.c @@ -1517,7 +1517,7 @@ gvir_designer_domain_get_fallback_disk_controller(GVirDesignerDomain *design, GError **error) { OsinfoEntity *dev = NULL; - OsinfoDeviceList *devices; + OsinfoDeviceList *devices = NULL; OsinfoFilter *filter; int virt_type; @@ -1552,9 +1552,11 @@ gvir_designer_domain_get_fallback_disk_controller(GVirDesignerDomain *design, dev = osinfo_list_get_nth(OSINFO_LIST(devices), 0); g_object_ref(G_OBJECT(dev)); - g_object_unref(G_OBJECT(devices)); cleanup: + if (devices != NULL) + g_object_unref(G_OBJECT(devices)); + return OSINFO_DEVICE(dev); } -- 2.1.0

2 3

[libvirt] [libvirt-designer][PATCH] test: Add new SimpleDisk test
by Michal Privoznik 04 Mar '15

04 Mar '15

This test is meant for adding CDROM, floppy and disk to a domain. For now, each method has _file and _device variant, which are tested for now. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Funny, when reviewing Chritophe's patches, I've found one forgotten branch too. libvirt-designer/test-designer-domain.c | 101 ++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/libvirt-designer/test-designer-domain.c b/libvirt-designer/test-designer-domain.c index bbd5a28..90f7e68 100644 --- a/libvirt-designer/test-designer-domain.c +++ b/libvirt-designer/test-designer-domain.c @@ -125,6 +125,41 @@ static const gchar *capslxcxml = " </guest>" "</capabilities>"; +static const gchar *domain_machine_simple_iso_result = + "<domain>\n" + " <devices>\n" + " <disk type=\"file\">\n" + " <source file=\"/foo/bar1\"/>\n" + " <driver name=\"qemu\" type=\"raw\"/>\n" + " <target bus=\"ide\" dev=\"hda\"/>\n" + " </disk>\n" + " <disk type=\"block\">\n" + " <source dev=\"/foo/bar2\"/>\n" + " <driver name=\"qemu\" type=\"raw\"/>\n" + " <target bus=\"ide\" dev=\"hdb\"/>\n" + " </disk>\n" + " <disk type=\"file\">\n" + " <source file=\"/foo/bar3\"/>\n" + " <driver name=\"qemu\" type=\"qcow2\"/>\n" + " <target bus=\"ide\" dev=\"hdc\"/>\n" + " </disk>\n" + " <disk type=\"block\">\n" + " <source dev=\"/foo/bar4\"/>\n" + " <driver name=\"qemu\" type=\"raw\"/>\n" + " <target bus=\"ide\" dev=\"hdd\"/>\n" + " </disk>\n" + " <disk type=\"file\">\n" + " <source file=\"/foo/bar5\"/>\n" + " <driver name=\"qemu\" type=\"bochs\"/>\n" + " <target bus=\"ide\" dev=\"hde\"/>\n" + " </disk>\n" + " <disk type=\"block\">\n" + " <source dev=\"/foo/bar6\"/>\n" + " <driver name=\"qemu\" type=\"raw\"/>\n" + " <target bus=\"ide\" dev=\"hdf\"/>\n" + " </disk>\n" + " </devices>\n" + "</domain>"; static void test_domain_machine_setup(GVirDesignerDomain **design, gconstpointer opaque) { @@ -142,6 +177,49 @@ static void test_domain_machine_setup(GVirDesignerDomain **design, gconstpointer } +static void test_domain_machine_simple_disk_setup(GVirDesignerDomain **design, gconstpointer opaque) +{ + GError *error = NULL; + GVirConfigDomainDisk *disk; + OsinfoOs *os = osinfo_os_new("http://myoperatingsystem/amazing/4.2"); + OsinfoDb *db = osinfo_db_new(); + OsinfoPlatform *platform = osinfo_platform_new("http://myhypervisor.org/awesome/6.6.6"); + GVirConfigCapabilities *caps = gvir_config_capabilities_new_from_xml(capsqemuxml, NULL); + + *design = gvir_designer_domain_new(db, os, platform, caps); + g_assert(*design); + + disk = gvir_designer_domain_add_cdrom_file(*design, "/foo/bar1", "raw", &error); + g_assert(disk); + g_object_unref(disk); + + disk = gvir_designer_domain_add_cdrom_device(*design, "/foo/bar2", &error); + g_assert(disk); + g_object_unref(disk); + + disk = gvir_designer_domain_add_disk_file(*design, "/foo/bar3", "qcow2", &error); + g_assert(disk); + g_object_unref(disk); + + disk = gvir_designer_domain_add_disk_device(*design, "/foo/bar4", &error); + g_assert(disk); + g_object_unref(disk); + + disk = gvir_designer_domain_add_floppy_file(*design, "/foo/bar5", "bochs", &error); + g_assert(disk); + g_object_unref(disk); + + disk = gvir_designer_domain_add_disk_device(*design, "/foo/bar6", &error); + g_assert(disk); + g_object_unref(disk); + + g_object_unref(os); + g_object_unref(db); + g_object_unref(platform); + g_object_unref(caps); +} + + static void test_domain_container_setup(GVirDesignerDomain **design, gconstpointer opaque) { OsinfoOs *os = osinfo_os_new("http://myoperatingsystem/amazing/4.2"); @@ -243,6 +321,22 @@ static void test_domain_machine_alt_arch_run(GVirDesignerDomain **design, gconst g_object_unref(osconfig); } +static void test_domain_machine_simple_disk_run(GVirDesignerDomain **design, gconstpointer opaque) +{ + GError *error = NULL; + gboolean ret; + GVirConfigDomain *config; + gchar *xml; + + config = gvir_designer_domain_get_config(*design); + xml = gvir_config_object_to_xml(GVIR_CONFIG_OBJECT(config)); + g_test_message("XML %s", xml); + g_assert_cmpstr(xml, + ==, + domain_machine_simple_iso_result); + g_free(xml); +} + static void test_domain_container_host_arch_run(GVirDesignerDomain **design, gconstpointer opaque) { GError *error = NULL; @@ -362,5 +456,12 @@ int main(int argc, char **argv) test_domain_container_setup, test_domain_container_alt_arch_run, test_domain_teardown); + g_test_add("/TestDesignerDomain/SimpleDisk", + GVirDesignerDomain *, + &domain, + test_domain_machine_simple_disk_setup, + test_domain_machine_simple_disk_run, + test_domain_teardown); + return g_test_run(); } -- 2.0.5

2 2

[libvirt] overlayfs support to lxc driver
by Vasiliy Tolstov 04 Mar '15

04 Mar '15

Hello. I'm interesting in implementing overlayfs support to lxc libvirt driver. As i see i simply can utilize filesystem type='template' for this usage. In case os template fs i need to mount with lowerdir /var/lib/libvirt/filesystems/template to /var/lib/libvirt/filesystems/name But i have problem: overlayfs fs need upperdir that store differences and mountpoint that used by clients. In case of libvirt usage - upperdir need to be places in /var/lib/libvirt/filesystems, but where i can put mountpoint dir ? /var/run/libvirt or in /tmp/libvirt-XXXXX ? Also what is the preferred way to integrate overlayfs support to libvirt? I can addd mount type to filesystem type='mount' or use (like now) template type. What is the preferred way? Thanks -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru jabber: vase(a)selfip.ru

2 4

[libvirt] [libvirt-designer 0/7]
by Christophe Fergeau 04 Mar '15

04 Mar '15

Hey, After seeing the libvirt-designer GSoC idea, I remembered about a bunch of libvirt-designer patches I had never sent :) Here they are, a few leak fixes/build cleanups, and addition of 2 new methods for completeness. Christophe

2 9

[libvirt] [PATCH] qemu: fix not remove the pidfile when close a vm after restart libvirtd
by Luyao Huang 04 Mar '15

04 Mar '15

https://bugzilla.redhat.com/show_bug.cgi?id=1197600 when create a happy vm and then restart libvirtd, we will loss priv->pidfile, because we don't check if it is there is a pidfile. However we only use this pidfile when we start the vm, and won't use it after it start, so this is not a big deal. But it is strange when vm is offline but pidfile still exist, so remove vmname.pid in state dir (maybe /run/libvirt/qemu/)when priv->pidfile is NULL. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_process.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 515402e..46b93b3 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -92,6 +92,7 @@ qemuProcessRemoveDomainStatus(virQEMUDriverPtr driver, { char ebuf[1024]; char *file = NULL; + char *pidfile = NULL; qemuDomainObjPrivatePtr priv = vm->privateData; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); int ret = -1; @@ -99,16 +100,19 @@ qemuProcessRemoveDomainStatus(virQEMUDriverPtr driver, if (virAsprintf(&file, "%s/%s.xml", cfg->stateDir, vm->def->name) < 0) goto cleanup; + if (virAsprintf(&pidfile, "%s/%s.pid", cfg->stateDir, vm->def->name) < 0) + goto cleanup; + if (unlink(file) < 0 && errno != ENOENT && errno != ENOTDIR) VIR_WARN("Failed to remove domain XML for %s: %s", vm->def->name, virStrerror(errno, ebuf, sizeof(ebuf))); VIR_FREE(file); - if (priv->pidfile && - unlink(priv->pidfile) < 0 && + if (unlink(priv->pidfile ? priv->pidfile : pidfile) < 0 && errno != ENOENT) VIR_WARN("Failed to remove PID file for %s: %s", vm->def->name, virStrerror(errno, ebuf, sizeof(ebuf))); + VIR_FREE(pidfile); ret = 0; cleanup: -- 1.8.3.1

3 2

[libvirt] [PATCH] docs: add a mention for start a vm with rawio = 'yes'
by Luyao Huang 03 Mar '15

03 Mar '15

When we start a vm which have rawio = 'yes' settings without any file caps settings for qemu, qemu process still cannot use this caps (CAP_SYS_RAWIO) and the /proc/pidofqemu/status like this: CapInh: 0000000000020000 CapPrm: 0000000000000000 CapEff: 0000000000000000 CapBnd: 0000001fffffffff this is because we do not set file caps for qemu (see man 7 capabilities), although laine have mentioned this in commit e11451, i think it will be good if we add this in docs. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- docs/formatdomain.html.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index fb0a0d1..2bcb59d 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1886,7 +1886,10 @@ than that (per-process basis, affects all the domain disks). To confine the capability as much as possible for QEMU driver as this stage, <code>sgio</code> is recommended, it's more - secure than <code>rawio</code>. + secure than <code>rawio</code>. If you really want use rawio + = 'yes', please also add file caps for qemu (like this + 'setcap "cap_sys_rawio+ie" /usr/libexec/qemu-kvm', for more details + please see capabilities(7)). </dd> <dt><code>sgio</code> attribute <span class="since">since 1.0.2</span></dt> -- 1.8.3.1

4 3

[libvirt] [PATCH] qemuProcessReconnect: Fill in pid file path
by Michal Privoznik 03 Mar '15

03 Mar '15

https://bugzilla.redhat.com/show_bug.cgi?id=1197600 So, libvirt uses pid file to track pid of started qemus. Whenever a domain is started, its pid is put into corresponding pid file. The pid file path is generated based on domain name and stored into domain object internals. However, it's not stored in the status XML and therefore lost on daemon restarts. Hence, later, when domain is being shut down, the daemon does not know which pid file to unlink, and the correct pid file is left behind. To avoid this, lets generate the pid file path again in qemuProcessReconnect(). Reported-by: Luyao Huang <lhuang(a)redhat.com> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_process.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7ce6115..e77616a 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3762,6 +3762,13 @@ qemuProcessReconnect(void *opaque) cfg = virQEMUDriverGetConfig(driver); priv = obj->privateData; + /* XXX If we ever gonna change pid file pattern, come up with + * some intelligence here to deal with old paths. */ + if (!(priv->pidfile = virPidFileBuildPath(cfg->stateDir, obj->def->name))) { + virReportSystemError(errno, "%s", _("Failed to build pidfile path.")); + goto killvm; + } + if (qemuDomainObjBeginJob(driver, obj, QEMU_JOB_MODIFY) < 0) goto killvm; -- 2.0.5

3 2

[libvirt] [PATCH v3 0/9] qemu: Add quorum support to libvirt
by Matthias Gatto 03 Mar '15

03 Mar '15

The purpose of these patches is to introduce quorum for libvirt I've try to follow this proposal: http://www.redhat.com/archives/libvir-list/2014-May/msg00533.html This feature ask for 6 task: 1) Allow a _virStorageSource to contain more than one backing store. Because all the actual libvirt code use the backingStore field as a pointer and we needs want to change that, I've decide to encapsulate the backingStore field to simplifie the array manipulation. 2) Add the missing field a quorum need in _virStorageSource and the VIR_STORAGE_TYPE_QUORUM and VIR_STORAGE_FILE_QUORUM in their respectives enums. 3) Parse and format the xml Because a quorum allows to have more than one backing store at the same level we need to change virDomainDiskDefFormat and virDomainDiskDefParseXML to call virDomainDiskBackingStoreFormat and virDomainDiskBackingStoreParse in a loop. virDomainDiskBackingStoreFormat and virDomainDiskBackingStoreParse can call themself recursively in a loop because a quorum can contain another quorum 4) Add nodename We need to add nodename support in _virStorageSource because qemu use them for their child. 5) Build qemu string As for the xml, we have to call the function which create quorum recursively. But this task have the problem explained here: http://www.redhat.com/archives/libvir-list/2014-October/msg00529.html The _virStorageSource missing some informations that can be passed to a child, and therefore this version of quorum is incomplet. 6) Allow to hotplug/change a disk in a quorum This part is not present in these patches because for this task we have to use blockdev-add, and currently libvirt use device_add for hotpluging that doesn't allow to hotplug quorum childs. There is 3 way to handle this problem: 1) create a virDomainBlockDevAdd function in libvirt witch call blockdev-add. 2) use blockdev-add instead of device_add in qemuMonitorJSONAddDevice 3) write a hack which uses blockdev-add when only attaching quorum (but i'm pretty sure this solution is not the good one) V2: -Rebase on master -Add Documentation V3: -Transforme the backingStore field in virStorageSource into an array of pointer instead of a pointer -Modify virStorageSourceSetBackingStore to allow it to expand the backingStore size. Matthias Gatto (9): virstoragefile: Add virStorageSourceGetBackingStore virstoragefile: Always use virStorageSourceGetBackingStore to get backing store virstoragefile: Add virStorageSourceSetBackingStore virstoragefile: Always use virStorageSourceSetBackingStore to set backing store virstoragefile: change backingStore to backingStores. virstoragefile: Add quorum in virstoragefile domain_conf: Read and Write quorum config qemu: Add quorum support in qemuBuildDriveDevStr virstoragefile: Add node-name docs/formatdomain.html.in | 27 ++++- docs/schemas/domaincommon.rng | 96 +++++++++++------ docs/schemas/storagecommon.rng | 1 + docs/schemas/storagevol.rng | 1 + src/conf/domain_conf.c | 195 ++++++++++++++++++++++++++-------- src/conf/storage_conf.c | 23 ++-- src/libvirt_private.syms | 2 + src/qemu/qemu_cgroup.c | 4 +- src/qemu/qemu_command.c | 114 ++++++++++++++++++++ src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 30 +++--- src/qemu/qemu_migration.c | 1 + src/security/security_dac.c | 2 +- src/security/security_selinux.c | 4 +- src/security/virt-aa-helper.c | 2 +- src/storage/storage_backend.c | 33 +++--- src/storage/storage_backend_fs.c | 36 ++++--- src/storage/storage_backend_gluster.c | 10 +- src/storage/storage_backend_logical.c | 15 ++- src/storage/storage_driver.c | 2 +- src/util/virstoragefile.c | 116 +++++++++++++++++--- src/util/virstoragefile.h | 12 ++- tests/virstoragetest.c | 18 ++-- 23 files changed, 573 insertions(+), 173 deletions(-) -- 1.8.3.1

2 12

[libvirt] [PATCH] schema: Fix interface link state schema
by Peter Krempa 03 Mar '15

03 Mar '15

In commit edd1295e1da6bfe8e4e257e5fbfad71ac0bf7c87 I've introduced an XML element that allows to configure state of the network interface link. Somehow the RNG schema hunk ended up in a weird place in the network schema definition. Move it to the right place and add a test case. Note that the link state is set up via the monitor at VM startup so I originally didn't think of adding a test case. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1173468 --- docs/schemas/domaincommon.rng | 12 ++++++++++++ docs/schemas/network.rng | 11 ----------- tests/qemuxml2argvdata/qemuxml2argv-interface-driver.xml | 1 + 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 4e4fe9f..6c45b1c 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2314,10 +2314,22 @@ - the name of the script used to set up the binding - the target device used - boot order + - link state --> <define name="interface-options"> <interleave> <optional> + <element name="link"> + <attribute name="state"> + <choice> + <value>up</value> + <value>down</value> + </choice> + </attribute> + <empty/> + </element> + </optional> + <optional> <element name="target"> <attribute name="dev"> <ref name="deviceName"/> diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index 56b6086..4edb6eb 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -299,17 +299,6 @@ <optional> <ref name="vlan"/> </optional> - <optional> - <element name="link"> - <attribute name="state"> - <choice> - <value>up</value> - <value>down</value> - </choice> - </attribute> - <empty/> - </element> - </optional>  <zeroOrMore> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-interface-driver.xml b/tests/qemuxml2argvdata/qemuxml2argv-interface-driver.xml index ec5ab61..d907b9b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-interface-driver.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-interface-driver.xml @@ -39,6 +39,7 @@ <mac address='52:54:00:e5:48:58'/> <model type='virtio'/> <driver ioeventfd='on' event_idx='on' queues='5'/> + <link state='up'/> </interface> <serial type='pty'> <target port='0'/> -- 2.2.2

2 2

[libvirt] [PATCH 0/2] Update find-storage-pool-source[-as] man page
by John Ferlan 03 Mar '15

03 Mar '15

https://bugzilla.redhat.com/show_bug.cgi?id=921426 The first patch is just a change to the error message. As it turns out only the host is necessary to find iSCSI targets. I have to assume over time adjustments to the code made the need to provide the name obsolete, but I did not research exactly which change may have done that... The second patch is a virsh man page change to describe the functionality based on how the code works today. It's perhaps "of interest" that the rbd and sheepdog backends provide to means to find all possible sources. I also suppose zfs could use something, but I don't build with zfs. John Ferlan (2): iscsi: Adjust error message for findStorageSources backend virsh.pod: Update find-storage-pool-sources[-as] man page src/storage/storage_backend_iscsi.c | 5 ++--- tools/virsh.pod | 45 ++++++++++++++++++++++++++++++++----- 2 files changed, 41 insertions(+), 9 deletions(-) -- 2.1.0

2 5

[libvirt] [PATCH 0/2] Disallow the usage of the same target dev value
by John Ferlan 03 Mar '15

03 Mar '15

https://bugzilla.redhat.com/show_bug.cgi?id=1142631 Patch 1 was found when adjusting the bz to get the disk by the pool source instead of directly by file attribute. When using domblklist, the source wasn't displayed. Followed the model of the iscsi '@name' and added '@volume' (eg, <source pool='default' volume='test-1g.img'/>) Patch 2 started as a simple (hah!) double loop looking for duplicate dst strings. I chose a separate API called before qemuCheckDiskConfig since it's more of a "common" check that could be used by other drivers as opposed to the perhaps more specific single disk checks made. Besides I didn't want a ndisk factorial checking algorithm each time a disk was checked for something that could be checked once. With the code in place, running make check tripped over a number of existing tests that duplicated that '<target dev=...' value, so I fixed those. Of interest for a few was that the test would duplicate the supposedly unique alias id - those are cleaned up as well as a byproduct of the changes. John Ferlan (2): virsh: Adjust domblklist to understand disk volume syntax disk: Disallow duplicated target 'dev' values src/conf/domain_conf.c | 29 ++++++++++++++++++++++ src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 3 +++ .../qemuxml2argv-disk-scsi-disk-split.xml | 2 +- ...qemuxml2argv-disk-scsi-lun-passthrough-sgio.xml | 2 +- .../qemuxml2argv-disk-scsi-lun-passthrough.xml | 2 +- .../qemuxml2argv-disk-source-pool-mode.xml | 2 +- .../qemuxml2argv-disk-source-pool.xml | 2 +- .../qemuxml2argv-pci-bridge-many-disks.args | 4 +-- .../qemuxml2argv-pci-bridge-many-disks.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-pci-many.args | 8 +++--- tests/qemuxml2argvdata/qemuxml2argv-pci-many.xml | 4 +-- .../qemuxml2xmlout-disk-source-pool.xml | 2 +- .../qemuxml2xmlout-pci-bridge-many-disks.xml | 2 +- tools/virsh-domain-monitor.c | 3 ++- 16 files changed, 52 insertions(+), 17 deletions(-) -- 2.1.0

2 5

[libvirt] QEMU, libvirt, and KVM are participating in Google Summer of Code 2015
by Stefan Hajnoczi 03 Mar '15

03 Mar '15

I am delighted to announce that QEMU, libvirt, and KVM are participating in Google Summer of Code 2015. Thanks to Google's generous funding we are inviting students to apply for 12-week full-time work from May to August 2015. Here is our project ideas list page where students can select a project to apply for: http://qemu-project.org/Google_Summer_of_Code_2015 Steps for students: 1. Check out the project ideas list (http://qemu-project.org/Google_Summer_of_Code_2015) 2. Get in touch with the mentors for the project you are interested in, begin discussing your application with them 3. Submit your application at http://google-melange.com/ from March 16-27 For more information on Google Summer of Code, please see: https://www.google-melange.com/gsoc/document/show/gsoc_program/google/gsoc2… Timeline: https://www.google-melange.com/gsoc/events/google/gsoc2015 Stefan

1 0

[libvirt] [PATCH] qemu: Don't crash in qemuDomainOpenChannel()
by Martin Kletzander 03 Mar '15

03 Mar '15

The problem here was that when opening a channel, we were checking whether the channel given is alias (can't be NULL for running domain) or it's name, which can be NULL (for example with spicevmc). In case of such domain qemuDomainOpenChannel() made the daemon crash. STREQ_NULLABLE() is safe to use since the code in question is wrapped in "if (name)" and is more readable, so use that instead of checking for non-NULL "vm->def->channels[i]->target.name". Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 83a4e18..c87cc05 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15450,7 +15450,7 @@ qemuDomainOpenChannel(virDomainPtr dom, if (vm->def->channels[i]->targetType == \ VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO && - STREQ(name, vm->def->channels[i]->target.name)) + STREQ_NULLABLE(name, vm->def->channels[i]->target.name)) chr = vm->def->channels[i]; } } else { -- 2.3.1

3 2

[libvirt] [PATCH] conf: De-duplicate scheduling policy enums
by Martin Kletzander 03 Mar '15

03 Mar '15

Since adding the support for scheduler policy settings in commit 8680ea97, there are two enums with the same information. That was caused by rewriting the patch since first draft. Find out thanks to clang, but there was no impact whatsoever. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/conf/domain_conf.c | 20 +++++++------------- src/conf/domain_conf.h | 14 ++------------ src/libvirt_private.syms | 2 -- src/qemu/qemu_process.c | 2 +- 4 files changed, 10 insertions(+), 28 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9b7ae3f..95175ea 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -772,13 +772,6 @@ VIR_ENUM_IMPL(virDomainLoader, "rom", "pflash") -VIR_ENUM_IMPL(virDomainThreadSched, VIR_DOMAIN_THREAD_SCHED_LAST, - "other", /* default */ - "batch", - "idle", - "fifo", - "rr") - /* Internal mapping: subset of block job types that can be present in * <mirror> XML (remaining types are not two-phase). */ VIR_ENUM_DECL(virDomainBlockJob) @@ -12867,7 +12860,7 @@ virDomainThreadSchedParse(xmlNodePtr node, virDomainThreadSchedParamPtr sp) { char *tmp = NULL; - int sched = 0; + int pol = 0; tmp = virXMLPropString(node, name); if (!tmp) { @@ -12892,16 +12885,17 @@ virDomainThreadSchedParse(xmlNodePtr node, tmp = virXMLPropString(node, "scheduler"); if (tmp) { - if ((sched = virDomainThreadSchedTypeFromString(tmp)) <= 0) { + if ((pol = virProcessSchedPolicyTypeFromString(tmp)) <= 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid scheduler attribute: '%s'"), tmp); goto error; } - sp->scheduler = sched; + sp->policy = pol; VIR_FREE(tmp); - if (sp->scheduler >= VIR_DOMAIN_THREAD_SCHED_FIFO) { + if (sp->policy == VIR_PROC_POLICY_FIFO || + sp->policy == VIR_PROC_POLICY_RR) { tmp = virXMLPropString(node, "priority"); if (!tmp) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -19888,7 +19882,7 @@ virDomainDefFormatInternal(virDomainDefPtr def, if (!(ids = virBitmapFormat(sp->ids))) goto error; virBufferAsprintf(buf, "<vcpusched vcpus='%s' scheduler='%s'", - ids, virDomainThreadSchedTypeToString(sp->scheduler)); + ids, virProcessSchedPolicyTypeToString(sp->policy)); VIR_FREE(ids); if (sp->priority) @@ -19903,7 +19897,7 @@ virDomainDefFormatInternal(virDomainDefPtr def, if (!(ids = virBitmapFormat(sp->ids))) goto error; virBufferAsprintf(buf, "<iothreadsched iothreads='%s' scheduler='%s'", - ids, virDomainThreadSchedTypeToString(sp->scheduler)); + ids, virProcessSchedPolicyTypeToString(sp->policy)); VIR_FREE(ids); if (sp->priority) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 02ddd93..aafeadd 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -50,6 +50,7 @@ # include "virbitmap.h" # include "virstoragefile.h" # include "virseclabel.h" +# include "virprocess.h" /* forward declarations of all device types, required by * virDomainDeviceDef @@ -1813,21 +1814,11 @@ typedef enum { VIR_DOMAIN_CPU_PLACEMENT_MODE_LAST } virDomainCpuPlacementMode; -typedef enum { - VIR_DOMAIN_THREAD_SCHED_OTHER = 0, - VIR_DOMAIN_THREAD_SCHED_BATCH, - VIR_DOMAIN_THREAD_SCHED_IDLE, - VIR_DOMAIN_THREAD_SCHED_FIFO, - VIR_DOMAIN_THREAD_SCHED_RR, - - VIR_DOMAIN_THREAD_SCHED_LAST -} virDomainThreadSched; - typedef struct _virDomainThreadSchedParam virDomainThreadSchedParam; typedef virDomainThreadSchedParam *virDomainThreadSchedParamPtr; struct _virDomainThreadSchedParam { virBitmapPtr ids; - virDomainThreadSched scheduler; + virProcessSchedPolicy policy; int priority; }; @@ -2881,7 +2872,6 @@ VIR_ENUM_DECL(virDomainRNGModel) VIR_ENUM_DECL(virDomainRNGBackend) VIR_ENUM_DECL(virDomainTPMModel) VIR_ENUM_DECL(virDomainTPMBackend) -VIR_ENUM_DECL(virDomainThreadSched) /* from libvirt.h */ VIR_ENUM_DECL(virDomainState) VIR_ENUM_DECL(virDomainNostateReason) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index ba05cc6..ead1b45 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -415,8 +415,6 @@ virDomainStateTypeFromString; virDomainStateTypeToString; virDomainTaintTypeFromString; virDomainTaintTypeToString; -virDomainThreadSchedTypeFromString; -virDomainThreadSchedTypeToString; virDomainTimerModeTypeFromString; virDomainTimerModeTypeToString; virDomainTimerNameTypeFromString; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index bd63fd7..faf9907 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2614,7 +2614,7 @@ qemuProcessSetSchedParams(int id, if (!s) return 0; - return virProcessSetScheduler(pid, s->scheduler, s->priority); + return virProcessSetScheduler(pid, s->policy, s->priority); } static int -- 2.3.1

2 1

[libvirt] [PATCH 0/2] fix corner case of spice graphics channel mode settings
by Pavel Hrdina 03 Mar '15

03 Mar '15

Pavel Hrdina (2): qemu: remove duplicated code for allocating spice ports qemu: check defaultMode for spice graphics independently src/qemu/qemu_driver.c | 45 ++---------------------------- src/qemu/qemu_process.c | 73 ++++++++++++++++++++++++++++--------------------- src/qemu/qemu_process.h | 5 ++++ 3 files changed, 49 insertions(+), 74 deletions(-) -- 2.0.5

2 4

[libvirt] [PATCH] Add ability to set rlimits at container boot
by Ryan Cleere 02 Mar '15

02 Mar '15

--- docs/formatdomain.html.in | 49 +++++++++++++++++++++++ docs/schemas/domaincommon.rng | 89 +++++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.c | 92 +++++++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 33 ++++++++++++++++ src/libvirt_private.syms | 1 + src/lxc/lxc_controller.c | 32 +++++++++++++++ src/util/virprocess.c | 4 +- src/util/virprocess.h | 2 + 8 files changed, 300 insertions(+), 2 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index f8d5f89..5aec51c 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -348,6 +348,55 @@ </pre> + <p> + If you want to set an rlimit of the containter init process instead of + inheriting from the host init, set the <code>rlimits</code> element. You + are able to set any of the rlimits that setrlimits is able to set using + any of the following sub-elements: + </p> + + <dl> + <dt><code>as</code></dt> + <dd>Used to set RLIMIT_AS.</dd> + <dt><code>core</code></dt> + <dd>Used to set RLIMIT_CORE.</dd> + <dt><code>cpu</code></dt> + <dd>Used to set RLIMIT_CPU.</dd> + <dt><code>data</code></dt> + <dd>Used to set RLIMIT_DATA.</dd> + <dt><code>fsize</code></dt> + <dd>Used to set RLIMIT_FSIZE.</dd> + <dt><code>locks</code></dt> + <dd>Used to set RLIMIT_LOCKS.</dd> + <dt><code>memlock</code></dt> + <dd>Used to set RLIMIT_MEMLOCK.</dd> + <dt><code>msgqueue</code></dt> + <dd>Used to set RLIMIT_MSGQUEUE.</dd> + <dt><code>nice</code></dt> + <dd>Used to set RLIMIT_NICE.</dd> + <dt><code>nofile</code></dt> + <dd>Used to set RLIMIT_NOFILE.</dd> + <dt><code>nproc</code></dt> + <dd>Used to set RLIMIT_NPROC.</dd> + <dt><code>rss</code></dt> + <dd>Used to set RLIMIT_RSS.</dd> + <dt><code>rtprio</code></dt> + <dd>Used to set RLIMIT_RTPRIO.</dd> + <dt><code>rttime</code></dt> + <dd>Used to set RLIMIT_RTTIME.</dd> + <dt><code>sigpending</code></dt> + <dd>Used to set RLIMIT_SIGPENDING.</dd> + <dt><code>stack</code></dt> + <dd>Used to set RLIMIT_STACK.</dd> + </dl> + + <pre> + <rlimits> + <nofile>10240</nofile> + </rlimits> + </pre> + + <h3><a name="elementsSysinfo">SMBIOS System Information</a></h3> <p> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index d467dce..b98f8d5 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -59,6 +59,9 @@ <ref name="idmap"/> </optional> <optional> + <ref name="rlimits"/> + </optional> + <optional> <ref name="devices"/> </optional> <zeroOrMore> @@ -570,6 +573,92 @@ </interleave> </element> </define> + <define name="rlimits"> + <element name="rlimits"> + <interleave> + <optional> + <element name="cpu"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="fsize"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="data"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="stack"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="core"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="rss"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="nproc"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="nofile"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="memlock"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="as"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="locks"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="sigpending"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="msgqueue"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="nice"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="rtprio"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="rttime"> + <ref name='scaledInteger'/> + </element> + </optional> + </interleave> + </element> + </define> <!-- Resources usage defines the amount of memory (maximum and possibly current usage) and number of virtual CPUs used by that domain. diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d562e1a..399976e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -772,6 +772,24 @@ VIR_ENUM_IMPL(virDomainLoader, "rom", "pflash") +VIR_ENUM_IMPL(virDomainRLimit, VIR_DOMAIN_RLIMIT_LAST, + "cpu", + "fsize", + "data", + "stack", + "core", + "rss", + "nproc", + "nofile", + "memlock", + "as", + "locks", + "sigpending", + "msgqueue", + "nice", + "rtprio", + "rttime") + /* Internal mapping: subset of block job types that can be present in * <mirror> XML (remaining types are not two-phase). */ VIR_ENUM_DECL(virDomainBlockJob) @@ -979,7 +997,40 @@ virDomainBlkioDeviceParseXML(xmlNodePtr root, return -1; } +static virDomainRLimitsPtr +virDomainRLimitParseXML(xmlNodePtr node) +{ + char *c = NULL; + long long val; + virDomainRLimitsPtr def; + + if (VIR_ALLOC(def) < 0) + return NULL; + if (node->type == XML_ELEMENT_NODE) { + c = (char *)xmlNodeGetContent(node); + if (virStrToLong_ll(c, NULL, 10, &val) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("could not parse rlimit value of %s"), + c); + goto error; + } + VIR_FREE(c); + + def->limit = val; + if ((def->resource = virDomainRLimitTypeFromString((const char *)node->name)) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("could not determine resource type of '%s'"), + node->name); + goto error; + } + } + return def; + error: + VIR_FREE(c); + VIR_FREE(def); + return NULL; +} static void virDomainObjListDataFree(void *payload, const void *name ATTRIBUTE_UNUSED) @@ -14423,6 +14474,34 @@ virDomainDefParseXML(xmlDocPtr xml, virHashFree(bootHash); + if ((node = virXPathNode("./rlimits[1]", ctxt)) != NULL && (n = virXMLChildElementCount(node)) > 0) { + xmlNodePtr cur = node->children; + if (n && VIR_ALLOC_N(def->rlimits, n) < 0) + goto error; + + for (i = 0; i < n; i++) { + if (!(def->rlimits[i] = virDomainRLimitParseXML(cur))) { + for (j = 0; j < i; j++) + VIR_FREE(def->rlimits[j]); + VIR_FREE(def->rlimits); + goto error; + } + def->nrlimits++; + for (j = 0; j < i; j++) { + if (def->rlimits[j]->resource == def->rlimits[i]->resource) { + virReportError(VIR_ERR_XML_ERROR, + _("duplicate rlimit resources '%s'"), + virDomainRLimitTypeToString(def->rlimits[j]->resource)); + for (int k = 0; k < i; k++) + VIR_FREE(def->rlimits[k]); + VIR_FREE(def->rlimits); + goto error; + } + } + cur = cur->next; + } + } + return def; error: @@ -20048,6 +20127,19 @@ virDomainDefFormatInternal(virDomainDefPtr def, goto error; } + if (def->nrlimits > 0) { + virBufferAddLit(buf, "<rlimits>\n"); + virBufferAdjustIndent(buf, 2); + for (n = 0; n < def->nrlimits; n++) { + virBufferAsprintf(buf, "<%s>%lld</%s>\n", + virDomainRLimitTypeToString(def->rlimits[n]->resource), + def->rlimits[n]->limit, + virDomainRLimitTypeToString(def->rlimits[n]->resource)); + } + virBufferAdjustIndent(buf, -2); + virBufferAddLit(buf, "</rlimits>\n"); + } + virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "</domain>\n"); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 93f2314..b032202 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1851,6 +1851,27 @@ typedef enum { VIR_DOMAIN_CLOCK_BASIS_LAST } virDomainClockBasis; +typedef enum { + VIR_DOMAIN_RLIMIT_CPU, + VIR_DOMAIN_RLIMIT_FSIZE, + VIR_DOMAIN_RLIMIT_DATA, + VIR_DOMAIN_RLIMIT_STACK, + VIR_DOMAIN_RLIMIT_CORE, + VIR_DOMAIN_RLIMIT_RSS, + VIR_DOMAIN_RLIMIT_NPROC, + VIR_DOMAIN_RLIMIT_NOFILE, + VIR_DOMAIN_RLIMIT_MEMLOCK, + VIR_DOMAIN_RLIMIT_AS, + VIR_DOMAIN_RLIMIT_LOCKS, + VIR_DOMAIN_RLIMIT_SIGPENDING, + VIR_DOMAIN_RLIMIT_MSGQUEUE, + VIR_DOMAIN_RLIMIT_NICE, + VIR_DOMAIN_RLIMIT_RTPRIO, + VIR_DOMAIN_RLIMIT_RTTIME, + + VIR_DOMAIN_RLIMIT_LAST +} virDomainRLimit; + typedef struct _virDomainClockDef virDomainClockDef; typedef virDomainClockDef *virDomainClockDefPtr; struct _virDomainClockDef { @@ -2039,6 +2060,14 @@ struct _virDomainPowerManagement { int s4; }; +typedef struct _virDomainRLimits virDomainRLimits; +typedef virDomainRLimits *virDomainRLimitsPtr; + +struct _virDomainRLimits { + int resource; + long long limit; +}; + /* * Guest VM main configuration * @@ -2156,6 +2185,9 @@ struct _virDomainDef { size_t nshmems; virDomainShmemDefPtr *shmems; + size_t nrlimits; + virDomainRLimitsPtr *rlimits; + /* Only 1 */ virDomainWatchdogDefPtr watchdog; virDomainMemballoonDefPtr memballoon; @@ -2844,6 +2876,7 @@ VIR_ENUM_DECL(virDomainRNGModel) VIR_ENUM_DECL(virDomainRNGBackend) VIR_ENUM_DECL(virDomainTPMModel) VIR_ENUM_DECL(virDomainTPMBackend) +VIR_ENUM_DECL(virDomainRLimit) /* from libvirt.h */ VIR_ENUM_DECL(virDomainState) VIR_ENUM_DECL(virDomainNostateReason) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index bd7870f..7b71ff1 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1896,6 +1896,7 @@ virProcessGetNamespaces; virProcessGetStartTime; virProcessKill; virProcessKillPainfully; +virProcessPrLimit; virProcessRunInMountNamespace; virProcessSetAffinity; virProcessSetMaxFiles; diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 8a7c7e8..5c63a1b 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -798,6 +798,35 @@ static int virLXCControllerSetupCgroupLimits(virLXCControllerPtr ctrl) return ret; } +static int virLXCControllerSetupRLimits(virLXCControllerPtr ctrl) +{ + int i, ret = -1; + struct rlimit rlim; + + VIR_DEBUG("Setting up rlimits"); + + VIR_DEBUG("nrlimits = %d", (int)ctrl->def->nrlimits); + VIR_DEBUG("setting limits on process %d", ctrl->initpid); + if (ctrl->def->nrlimits > 0) { + for (i = 0; i < ctrl->def->nrlimits; i++) { + rlim.rlim_max = rlim.rlim_cur = ctrl->def->rlimits[i]->limit; + VIR_DEBUG("Setting rlimit %s(%d) on pid %d to %lld", + virDomainRLimitTypeToString(ctrl->def->rlimits[i]->resource), + ctrl->def->rlimits[i]->resource, + ctrl->initpid, + ctrl->def->rlimits[i]->limit); + if (virProcessPrLimit(ctrl->initpid, ctrl->def->rlimits[i]->resource, &rlim) < 0) { + virReportSystemError(errno, "%s", + _("Unable to set rlimit")); + goto cleanup; + } + } + } + ret = 0; + cleanup: + return ret; +} + static void virLXCControllerClientCloseHook(virNetServerClientPtr client) { @@ -2318,6 +2347,9 @@ virLXCControllerRun(virLXCControllerPtr ctrl) if (virLXCControllerSetupCgroupLimits(ctrl) < 0) goto cleanup; + if (virLXCControllerSetupRLimits(ctrl) < 0) + goto cleanup; + if (virLXCControllerSetupUserns(ctrl) < 0) goto cleanup; diff --git a/src/util/virprocess.c b/src/util/virprocess.c index d0a1500..d83ae28 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -676,13 +676,13 @@ int virProcessSetNamespaces(size_t nfdlist, } #if HAVE_PRLIMIT -static int +int virProcessPrLimit(pid_t pid, int resource, struct rlimit *rlim) { return prlimit(pid, resource, rlim, NULL); } #elif HAVE_SETRLIMIT -static int +int virProcessPrLimit(pid_t pid ATTRIBUTE_UNUSED, int resource ATTRIBUTE_UNUSED, struct rlimit *rlim ATTRIBUTE_UNUSED) diff --git a/src/util/virprocess.h b/src/util/virprocess.h index bcaede5..c40b41a 100644 --- a/src/util/virprocess.h +++ b/src/util/virprocess.h @@ -22,6 +22,7 @@ #ifndef __VIR_PROCESS_H__ # define __VIR_PROCESS_H__ +# include <sys/resource.h> # include <sys/types.h> # include "internal.h" @@ -73,4 +74,5 @@ typedef int (*virProcessNamespaceCallback)(pid_t pid, void *opaque); int virProcessRunInMountNamespace(pid_t pid, virProcessNamespaceCallback cb, void *opaque); +int virProcessPrLimit(pid_t pid, int resource, struct rlimit *rlim); #endif /* __VIR_PROCESS_H__ */ -- 1.9.3 (Apple Git-50)

4 6

[libvirt] [PATCH] virsh.pod: Add information regarding LXC for setmem, memtune, and dominfo
by John Ferlan 02 Mar '15

02 Mar '15

https://bugzilla.redhat.com/show_bug.cgi?id=1070695 Modify the virsh man page to more accurately describe which values are set by the virsh setmem and displayed by the virsh memtune or dominfo based on the setmem command results. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- tools/virsh.pod | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/virsh.pod b/tools/virsh.pod index 343f26f..e435d01 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1925,6 +1925,13 @@ For example, vSphere/ESX rounds the parameter up to mebibytes (1024 kibibytes). For Xen, you can only adjust the memory of a running domain if the domain is paravirtualized or running the PV balloon driver. +For LXC, the value being set is the cgroups value for limit_in_bytes or the +maximum amount of user memory (including file cache). When viewing memory +inside the container, this is the /proc/meminfo "MemTotal" value. When viewing +the value from the host, use the B<virsh memtune> command. In order to view +the current memory in use and the maximum value allowed to set memory, use +the B<virsh dominfo> command. + =item B<setmaxmem> I<domain> B<size> [[I<--config>] [I<--live>] | [I<--current>]] @@ -1973,6 +1980,9 @@ Thus, when counting them, one needs to add up guest RAM, guest video RAM, and some memory overhead of QEMU itself. The last piece is hard to determine so one needs guess and try. +For LXC, the displayed hard_limit value is the current memory setting +from the XML or the results from a B<virsh setmem> command. + =over 4 =item I<--hard-limit> -- 2.1.0

2 1

[libvirt] [PATCH] disk: Provide a default storage source format type.
by John Ferlan 02 Mar '15

02 Mar '15

https://bugzilla.redhat.com/show_bug.cgi?id=1181062 According to the formatstorage.html description for <source> element and "format" attribute: "All drivers are required to have a default value for this, so it is optional." As it turns out the disk backend did not choose a default value, so I added a default of "msdos" if the source type is "unknown" as well as updating the storage.html backend disk volume driver documentation to indicate the default format is dos. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- docs/storage.html.in | 1 + src/storage/storage_backend_disk.c | 13 ++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/docs/storage.html.in b/docs/storage.html.in index f920dae..b9b503d 100644 --- a/docs/storage.html.in +++ b/docs/storage.html.in @@ -346,6 +346,7 @@ on the size and placement of volumes. The 'free extents' information will detail the regions which are available for creating new volumes. A volume cannot span across 2 different free extents. + It will default to using <code>msdos</code> as the pool source format. </p> <h3>Example pool input</h3> diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index 39082cc..9a79325 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -468,13 +468,20 @@ virStorageBackendDiskBuildPool(virConnectPtr conn ATTRIBUTE_UNUSED, } if (ok_to_mklabel) { - /* eg parted /dev/sda mklabel msdos */ + /* eg parted /dev/sda mklabel --script msdos */ + int format = pool->def->source.format; + const char *fmt; + if (format == VIR_STORAGE_POOL_DISK_UNKNOWN || + format == VIR_STORAGE_POOL_DISK_DOS) + fmt = "msdos"; + else + fmt = virStoragePoolFormatDiskTypeToString(format); + cmd = virCommandNewArgList(PARTED, pool->def->source.devices[0].path, "mklabel", "--script", - ((pool->def->source.format == VIR_STORAGE_POOL_DISK_DOS) ? "msdos" : - virStoragePoolFormatDiskTypeToString(pool->def->source.format)), + fmt, NULL); ret = virCommandRun(cmd, NULL); } -- 2.1.0

2 1

[libvirt] [PATCH] docs: add a note that attr 'managed' is only used by PCI devices
by Erik Skultety 02 Mar '15

02 Mar '15

Our documentation isn't 100% clear about hostdev 'managed' attribute usage, because it only makes sense to use it with PCI devices, yet we format this attribute to all hostdev devices. By adding a note into the docs, we can possibly avoid confusion from customer's side and also avoid a solution using ternary logic. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1155887 --- docs/formatdomain.html.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index fb0a0d1..6276a61 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3110,6 +3110,12 @@ then this setting not required. </dd> </dl> + <p> + Note: The <code>managed</code> attribute is only used with PCI devices + and is ignored by all the other device types, thus setting + <code>managed</code> explicitly with other than PCI device has the same + effect as omitting it. + </p> </dd> <dt><code>source</code></dt> <dd>The source element describes the device as seen from the host using -- 1.9.3

2 2

[libvirt] [PATCH] storage: sheepdog: Avoid skipping variable initialization
by Peter Krempa 02 Mar '15

02 Mar '15

Commit 155ca616eb231181f6978efc9e3a1eb0eb60af8a added a error message that skips initialization of the 'cmd' variable. Fortunately it was not released. --- Pushed under the trivial && build-breaker rule. src/storage/storage_backend_sheepdog.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c index f389d9b..af15c3b 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -263,6 +263,7 @@ virStorageBackendSheepdogBuildVol(virConnectPtr conn, unsigned int flags) { int ret = -1; + virCommandPtr cmd = NULL; virCheckFlags(0, -1); @@ -272,7 +273,7 @@ virStorageBackendSheepdogBuildVol(virConnectPtr conn, goto cleanup; } - virCommandPtr cmd = virCommandNewArgList(COLLIE, "vdi", "create", vol->name, NULL); + cmd = virCommandNewArgList(COLLIE, "vdi", "create", vol->name, NULL); virCommandAddArgFormat(cmd, "%llu", vol->target.capacity); virStorageBackendSheepdogAddHostArg(cmd, pool); if (virCommandRun(cmd, NULL) < 0) -- 2.2.2

1 0

[libvirt] [libvirt-test-API][PATCH 0/2] Add freepages test cases
by Jincheng Miao 02 Mar '15

02 Mar '15

Add freepages test cases. Jincheng Miao (2): Add freepage test Add freepage test case to test_connection.conf cases/test_connection.conf | 6 +++ repos/virconn/free_pages.py | 97 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 0 deletions(-) create mode 100644 repos/virconn/free_pages.py

2 3

[libvirt] Release of libvirt-1.2.13
by Daniel Veillard 02 Mar '15

02 Mar '15

As planned I just made the release for libvirt-1.2.13, it's tagged in git, and signed tarballs and rpms are available at the usual place: ftp://libvirt.org/libvirt/ I also pushed a 1.2.13 for libvirt-python but it's really for completeness as it's virtuallyequivalent to 1.2.12. February is short, that release packs 'only' 220 commits, mostly bug fixes and a fair set of improvment, with the NUMA handling area getting a fairly large update: Features: - a lot of NUMA updates and improvments (Peter Krempa) Documentation: - Add mist.io as libvirt-based application (Michal Privoznik) - Fix typos in messages (Yuri Chornoivan) - Clarify behavior or virDomainDetachDevice (Ján Tomko) - virsh: Add missing parenthesis into man page (Martin Kletzander) - man: moved virsh command cpu-models (Daniel Hansel) - clarify nat range behavior (Ján Tomko) - add page about virtlockd setup (Daniel P. Berrange) - split out sanlock setup docs (Daniel P. Berrange) - Fix version reference in vcpu/iothread scheduling (Martin Kletzander) - S390: Documentation for ccw address type (Stefan Zimmermann) - conf: fix a minor typo (Erik Skultety) - virsh: man: Document behavior of some blkdeviotune's flags when querying (Peter Krempa) Portability: - virprocess: fix MinGW build and RHEL-5 build (Pavel Hrdina) - virutil: fix MinGW build (Pavel Hrdina) - Make tests independant of system page size (Daniel P. Berrange) Bug Fixes: - Really fix XML formatting flags in SaveImageUpdateDef (Ján Tomko) - Ignore listen attribute of <graphics> for type network listens (Ján Tomko) - util: storage: Fix error type in virStorageSourceParseBackingURI (Peter Krempa) - util: storagefile: Don't crash on gluster URIs without path (Peter Krempa) - conf: error out on invalid host id (Luyao Huang) - qemu: fix ifindex array reported to systemd (Laine Stump) - util: check for null ifname inside virNetDevBandwidthSet() (Laine Stump) - network: only clear bandwidth if it has been set (Laine Stump) - Fix error messages in virStorageFileGetMetadataFromFD (Ján Tomko) - Assign default SCSI controller model before checking attribute validity (Ján Tomko) - qemu: Use correct flags for ABI stability check in SaveImageUpdateDef (Michal Privoznik) - qemu: fix memory leak while starting a guest (Pavel Hrdina) - network_conf: Forbid commas in DNS TXT (Michal Privoznik) - qemuMigrationDriveMirror: Listen to events (Michal Privoznik) - qemu: Exit job on error path of qemuDomainSetVcpusFlags() (Peter Krempa) - daemon: Fix segfault by reloading daemon right after start (Pavel Hrdina) - qemu_cgroup: initialize mem_mask to NULL (Pavel Hrdina) - PowerPC : Forbid NULL CPU model with 'host-model' mode. (Prerna Saxena) - qemu: fix vm deadlock when try to use numatune in session mode (Luyao Huang) - virsh: fix IP address in vncdisplay for listen type='network' (Luyao Huang) - libxl: Resolve Coverity CHECKED_RETURN (John Ferlan) - security: Resolve Coverity RESOURCE_LEAK (John Ferlan) - lxc: Fix container cleanup for LXCProcessStart (Luyao Huang) - lxc: Move console checks in LXCProcessStart (Luyao Huang) - security: Refactor virSecurityManagerGenLabel (Erik Skultety) - security: introduce virSecurityManagerCheckAllLabel function (Erik Skultety) - Fix a syntax error in the description text of libvirtd.conf (Zhang Bo) - Allow shrinking of file based volumes (Daniel P. Berrange) - qemu: do upfront check for vcpupids being null when querying pinning (Daniel P. Berrange) - qemu: fix setting of VM CPU affinity with TCG (Daniel P. Berrange) - libxl: disable VNC and SDL until explicitly enabled (Marek Marczykowski-Górecki) - libxl: pass ipaddr to libxl toolstack (Marek Marczykowski-Górecki) - domain: avoid potential memory leak in virDomainGraphicsListenSet*() (Laine Stump) - domain: backfill listen address to parent <graphics> listen attribute (Laine Stump) - virsh: fix IP address in domdisplay for listen type='network' (Luyao Huang) - bhyvexml2argvmock: change int to size_t for tapfdSize (Pavel Hrdina) - qemu: fix crash when migrateuri has no scheme (Luyao Huang) - conf: Fix libvirtd crash and memory leak caused by virDomainVcpuPinDel() (Zhang Bo) - conf: forbid seclabel duplicates for domain devices (Erik Skultety) - Fix qemu job handling in SetSchedulerParameters (Ján Tomko) - conf: disallow invalid values for video attributes (Martin Kletzander) - Clear dynamic seclabels on LXCProcessStart failure (Cédric Bosdonnat) - network: don't allow multiple portgroups with the same name in a network (Laine Stump) - Error out when custom tap device path makes no sense (Ján Tomko) - Only parse custom vhost path for virtio interfaces (Ján Tomko) - Trivially support DomainHasManagedSaveImage (Ján Tomko) - libxl: update dom->id in libxlDomainCreateWithFlags (Marek Marczykowski-Górecki) - qemu: Properly report error on uuid mismatch in the migration cookie (Luyao Huang) - lxc: fix double close handshakefds[1] (Luyao Huang) - util: storage: Fix parsing of nbd:// URI without path (Peter Krempa) - conf: Properly report error of unsupported input bus type (Luyao Huang) - conf: Properly report error when an unsupported chr device name is passed (Luyao Huang) - virnetdev: fix some issues found by coverity and mingw builds (Pavel Hrdina) - storage: Need to clear pool prior to refreshPool during Autostart (John Ferlan) - qemu: command: Don't combine old and modern NUMA node creation (Peter Krempa) - xend: Don't crash in virDomainXMLDevID (Michal Privoznik) - conf: Don't mangle vcpu placement randomly (Michal Privoznik) - qemu: Don't unconditionally delete file in qemuOpenFileAs (John Ferlan) - virfile: Need to check for ENOTCONN from recvfd failure (John Ferlan) - Remove flag checking in MacVLanCreate helper stub (Ján Tomko) - storage: Check the partition name against provided name (John Ferlan) - storage: Fix check for partition type for disk backing volumes (John Ferlan) - qemu: fix cannot set graphic passwd via qemuDomainSaveImageDefineXML (Luyao Huang) - hotplug: only add a chardev to vmdef after monitor call (Ján Tomko) - systemd: don't report an error if the guest is already terminated (Daniel P. Berrange) Improvements: - conf: error out on missing dhcp host attributes (Ján Tomko) - schema: Allow interleaving the /domain/os/type element (Peter Krempa) - schema: Add virtio-mmio address type into RNG (Martin Kletzander) - cpu: Format <cpu/> properly (Michal Privoznik) - virCPUDefFormatBufFull: Use our general error handling pattern (Michal Privoznik) - util: Introduce virBufferAddBuffer (Michal Privoznik) - Rework s390 architecture checking (Stefan Zimmermann) - Prevent default creation of usb controller on s390 and s390x (Stefan Zimmermann) - po: Add config file for zanata (Daniel P. Berrange) - libvirt-guests: Allow time sync on guests resume (Michal Privoznik) - qemu: Fix AAVMF/OVMF #define names (Cole Robinson) - libxl: support backend domain setting for disk and net devices (Marek Marczykowski) - conf: support backend domain name in disk and network devices (Marek Marczykowski) - network: allow <pf> together with <interface>/<address> in network status (Laine Stump) - qemu: caps: Add capability bit for the "pc-dimm" device (Peter Krempa) - conf: Hoist validation of memory size into the post parse callback (Peter Krempa) - conf: numa: Check ABI stability of NUMA configuration (Peter Krempa) - conf: ABI: Hugepage backing definition is not guest ABI (Peter Krempa) - conf: Move all NUMA configuration to virDomainNuma (Peter Krempa) - conf: numa: Add setter/getter for NUMA node memory size (Peter Krempa) - conf: numa: Add accessor to NUMA node's memory access mode (Peter Krempa) - conf: numa: Add accessor for the NUMA node cpu mask (Peter Krempa) - conf: numa: Add helper to get guest NUMA node count and refactor users (Peter Krempa) - qemu: command: Unify retrieval of NUMA cell count in qemuBuildNumaArgStr (Peter Krempa) - conf: numa: Don't pass double pointer to virDomainNumatuneParseXML (Peter Krempa) - numa: conf: Tweak parameters of virDomainNumatuneSet (Peter Krempa) - conf: numa: Always allocate the NUMA config (Peter Krempa) - conf: Allocate domain definition with the new helper (Peter Krempa) - conf: Separate helper for creating domain objects (Peter Krempa) - conf: numa: Format <numatune> XML only if necessary (Peter Krempa) - conf: numa: Refactor logic in virDomainNumatuneParseXML (Peter Krempa) - conf: numa: Reformat virDomainNumatuneParseXML (Peter Krempa) - conf: numa: Improve error message in case a numa node doesn't have cpus (Peter Krempa) - conf: numa: Recalculate rather than remember total NUMA cpu count (Peter Krempa) - conf: Move enum virMemAccess to the NUMA code and rename it (Peter Krempa) - conf: numa: Rename virDomainNumatune to virDomainNuma (Peter Krempa) - conf: Move NUMA cell formatter to numa_conf (Peter Krempa) - conf: numa: Don't duplicate NUMA cell cpumask (Peter Krempa) - conf: Refactor virDomainNumaDefCPUParseXML (Peter Krempa) - conf: Move NUMA cell parsing code from cpu conf to numa conf (Peter Krempa) - conf: Move numatune_conf to numa_conf (Peter Krempa) - virsh: fix vcpupin info (Pavel Hrdina) - virQEMUCapsCacheLookupCopy: Filter qemuCaps based on machineType (Michal Privoznik) - virQEMUCapsCacheLookupCopy: Pass machine type (Michal Privoznik) - virsh-edit: Make force editing usable (Martin Kletzander) - parallels: Set the first HDD from XML as bootable (Mikhail Feoktistov) - parallels: Use IS_CT() macro instead of STREQ("exe") (Mikhail Feoktistov) - parallels: code aligment (Mikhail Feoktistov) - Search for schemas and cpu_map.xml in source tree (Jiri Denemark) - qemuProcessHandleBlockJob: Take status into account (Michal Privoznik) - qemuProcessHandleBlockJob: Set disk->mirrorState more often (Michal Privoznik) - PowerPC : Make 'qemu-system-ppc64' the default emulator on ppc64[le]. (Prerna Saxena) - qemuBuildMemoryBackendStr: Report backend requirement more appropriately (Michal Privoznik) - qemuxml2argvtest: Fake response from numad (Michal Privoznik) - numatune_conf: Expose virDomainNumatuneNodeSpecified (Michal Privoznik) - lxc: Modify/add some debug messages (John Ferlan) - Wire up mrg_rxbuf option for qemu (Ján Tomko) - Add mrg_rxbuf option to virtio interfaces (Ján Tomko) - virsh attach-interface: Allow macvtap hotplug (Michal Privoznik) - virsh attach-interface: Use virDomainNetType{From,To}String() (Michal Privoznik) - virsh attach-interface: Use enum instead of arbitrary integers (Michal Privoznik) - libvirt_private.syms: Expose virDomainNetTypeFromString (Michal Privoznik) - qemu: Add support for setting vCPU and I/O thread scheduler setting (Martin Kletzander) - docs, schema, conf: Add support for setting scheduler parameters of guest threads (Martin Kletzander) - util: Add virProcessSetScheduler() function for scheduler settings (Martin Kletzander) - domain: include portgroup in interface status xml (Laine Stump) - qemu: qemuOpenFileAs - set flag VIR_FILE_OPEN_FORCE_MODE (John Ferlan) - virfile: Adjust error path for virFileOpenForked (John Ferlan) - schema: allow multiple seclabel for devices in domaincommon.rng (Erik Skultety) - qemu: Implement random number generator hotunplug (Luyao Huang) - qemu: Implement random number generator hotplug (Luyao Huang) - qemu: Implement random number generator cold (un)plug (Peter Krempa) - conf: Add helpers to insert/remove/find RNG devices in domain def (Luyao Huang) - audit: export virDomainAuditRNG (Luyao Huang) - qemu: command: Refactor creation of RNG device commandline (Peter Krempa) - qemu: command: Break some very long lines in qemuBuildRNGDevStr() (Peter Krempa) - qemu: command: Shuffle around formatting of alias for RNG device backend (Peter Krempa) - qemu: command: Make RNG backend device IDs unique (Luyao Huang) - qemu: refactor qemuBuildRNGDeviceArgs to allow reuse in RNG hotplug (Luyao Huang) - qemu: Add helper to assign RNG device aliases (Luyao Huang) - conf: Introduce helper to find duplicate device address (Peter Krempa) - S390: ccw support for virsh attach-disk address parameter (Stefan Zimmermann) - maint: improve usage of autogen's --no-git (Stefan Zimmermann) - qemu: include libvirt & QEMU versions in QEMU log files (Daniel P. Berrange) - nodedev: check/add for scsi_host caps for NumOfCaps and ListCaps (John Ferlan) - nodedev: check/add for scsi_host caps for ListDevices (Shivaprasad G Bhat) - cpu: add Freescale ppc64 CPU models (Olivia Yin) - tests: virstoragetest: Switch backing chain test to use automatic numbering (Peter Krempa) - virsh-volume: add support for --reflink (Chen Hanxiao) - util: make virNetDev(Get|Set)IFFlags() static (Laine Stump) - qemu: command: Refactor NUMA backend object formatting to use JSON objs (Peter Krempa) - qemu: command: Switch to bytes when formatting size for memory backends (Peter Krempa) - qemu: command: Unify values for boolean values when formating memory backends (Peter Krempa) - qemu: command: Shuffle around formating of alias for memory backend objs (Peter Krempa) - qemu: Extract code to setup memory backing objects (Peter Krempa) - qemu: command: Add helper to format -object strings from JSON representation (Peter Krempa) - util: json: add helper to iterate JSON object key=value pairs (Peter Krempa) - util: json: Add functions to convert JSON arrays from/to virBitmaps (Peter Krempa) - util: bitmap: Add option to allocate bitmap without reporting error (Peter Krempa) - util: json: make value object creator universal by supporting adding (Peter Krempa) - test: utils: Add helpers for automatic numbering of test cases (Peter Krempa) - conf: numatune: Extract code for requesting memory nodeset from formatting (Peter Krempa) - qemu: change macvtap device options in response to NIC_RX_FILTER_CHANGED (Tony Krowiak) - util: Functions for getting/setting device options (Tony Krowiak) - qemu: Adjust EndAsyncJob for qemuDomainSaveInternal error path (John Ferlan) - schemas: Allow all generic elements and attributes for all interfaces (Michal Privoznik) - qemu: Add AAVMF to the list of known UEFIs (Michal Privoznik) - qemu: Allow UEFI paths to be specified at compile time (Michal Privoznik) - Fix syntax-check (Ján Tomko) - util: bitmap: Tolerate NULL bitmaps in virBitmapEqual (Peter Krempa) - storage: When delete extended partition, need to refresh pool (John Ferlan) - storage: Adjust how to refresh extended partition disk data (John Ferlan) - storage: Attempt error recovery in virStorageBackendDiskCreateVol (John Ferlan) - storage: Move virStorageBackendDiskDeleteVol (John Ferlan) - libvirt.spec: remove vbox storage and network .so files (Pavel Hrdina) - Split qemuDomainChrInsert into two parts (Ján Tomko) - lxc: report veth device indexes to systemd (Daniel P. Berrange) - lxc: more logging during startup paths (Daniel P. Berrange) - lxc: delay setup of cgroup until we have the init pid (Daniel P. Berrange) - lxc: only write XML once for lxc controller (Daniel P. Berrange) - lxc: re-arrange startup synchronization sequence with controller (Daniel P. Berrange) - lxc: don't build pidfile string multiple times (Daniel P. Berrange) - qemu: report TAP device indexes to systemd (Daniel P. Berrange) - Fix shadowed variable warning (Ján Tomko) - storage: add a flag to clone files on btrfs (Chen Hanxiao) - storage: introduce btrfsCloneFile() for COW copy (Chen Hanxiao) - Removing probing of secondary drivers (Daniel P. Berrange) - don't disable state driver when libvirtd is not built (Daniel P. Berrange) - Remove all secondary driver private data fields (Daniel P. Berrange) - Remove use of interfacePrivateData from udev driver (Daniel P. Berrange) - Remove use of nodeDevicePrivateData from nodeDev driver (Daniel P. Berrange) - Remove use of storagePrivateData/networkPrivateData from vbox (Daniel P. Berrange) - Remove use of nwfilterPrivateData from nwfilter driver (Daniel P. Berrange) - Remove use of secretPrivateData from secret driver (Daniel P. Berrange) - qemu: Fix job handling in qemuDomainSetMetadata (Peter Krempa) - qemu: Fix job type in qemuDomainGetBlockIoTune (Peter Krempa) - qemu: Fix job handling in qemuDomainSetSchedulerParametersFlags (Peter Krempa) - qemu: Fix job handling in qemuDomainSetMemoryParameters (Peter Krempa) - qemu: Fix job handling in qemuDomainSetAutostart (Peter Krempa) - qemu: Fix job handling in qemuDomainPinEmulator (Peter Krempa) - qemu: Fix job handling in qemuDomainPinVcpuFlags (Peter Krempa) So thanks everyone for the help with this release, be it with reports, patches, reviews or documentation ! 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