- Devel - libvirt List Archives

[libvirt] [PATCH] docs: Add mist.io as libvirt-based application
by Michal Privoznik 01 Mar '15

01 Mar '15

As reported on the libvirt-users list [1], there's new web application called mist.io which uses libvirt as one of its backends. Lets add it into our list of libivrt based applications. 1: https://www.redhat.com/archives/libvirt-users/2015-February/msg00096.html Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/apps.html.in | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/apps.html.in b/docs/apps.html.in index 4403ce6..79ee73a 100644 --- a/docs/apps.html.in +++ b/docs/apps.html.in @@ -404,6 +404,14 @@ functions, such as live migration that allows for load balancing between cluster nodes, monitoring CPU, memory. </dd> + <dt><a href="http://mist.io/">mist.io</a></dt> + <dd> + Mist.io is an open source project and a service that can assist you in + managing your virtual machines on a unified way, providing a simple + interface for all of your infrastructure (multiple public cloud + providers, OpenStack based public/private clouds, Docker servers, bare + metal servers and now KVM hypervisors). + </dd> </dl> <h2><a name="mobile">Mobile applications</a></h2> -- 2.0.5

2 2

[libvirt] new warning from ar on rawhide systems
by Eric Blake 28 Feb '15

28 Feb '15

When compiling libvirt (and probably other packages) on Fedora rawhide systems, I'm seeing a new warning message on every link line. # rpm -q libtool gcc binutils libtool-2.4.6-1.fc23.x86_64 gcc-5.0.0-0.16.fc23.x86_64 binutils-2.25-6.fc23.x86_64 For an example of the warning during a 'make V=1': > libtool: link: rm -fr .libs/libvirt_driver_qemu_impl.a .libs/libvirt_driver_qemu_impl.la > libtool: link: ar cru .libs/libvirt_driver_qemu_impl.a qemu/.libs/libvirt_driver_qemu_impl_la-qemu_agent.o qemu/.libs/libvirt_driver_qemu_impl_la-qemu_capabilities.o qemu/.libs/libvirt_driver_qemu_impl_la-qemu_command.o qemu/.libs/libvirt_driver_qemu_impl_la-qemu_domain.o qemu/.libs/libvirt_driver_qemu_impl_la-qemu_cgroup.o qemu/.libs/libvirt_driver_qemu_impl_la-qemu_hostdev.o qemu/.libs/libvirt_driver_qemu_impl_la-qemu_hotplug.o qemu/.libs/libvirt_driver_qemu_impl_la-qemu_conf.o qemu/.libs/libvirt_driver_qemu_impl_la-qemu_process.o qemu/.libs/libvirt_driver_qemu_impl_la-qemu_migration.o qemu/.libs/libvirt_driver_qemu_impl_la-qemu_monitor.o qemu/.libs/libvirt_driver_qemu_impl_la-qemu_monitor_text.o qemu/.libs/libvirt_driver_qemu_impl_la-qemu_monitor_json.o qemu/.libs/libvirt_driver_qemu_impl_la-qemu_driver.o qemu/.libs/libvirt_driver_qemu_impl_la-qemu_interface.o > ar: `u' modifier ignored since `D' is the default (see `U') > libtool: link: ranlib .libs/libvirt_driver_qemu_impl.a Reading 'man ar', it looks like a relatively new binutils invention, one that Fedora chose to flip on by default, but also one that might be worth using even when ar is built with 'U' rather than 'D' as the default: > D Operate in deterministic mode. When adding files and the archive > index use zero for UIDs, GIDs, timestamps, and use consistent file > modes for all files. When this option is used, if ar is used with > identical options and identical input files, multiple runs will > create identical output files regardless of the input files' > owners, groups, file modes, or modification times. > > If binutils was configured with --enable-deterministic-archives, > then this mode is on by default. It can be disabled with the U > modifier, below. Is it worth teaching libtool to change ARFLAGS to be 'crD' instead of 'cru' when it is detected that ar is new enough to support deterministic libraries, in part to shut up the warning message being printed on every single libtool link line? (Note that I would explicitly include 'D', because even though Fedora chose to make 'D' the default, other distros may choose to make 'U' the default). Or conversely, do we want ARFLAGS to be 'cruU', to force non-deterministic mode, since any speedups made possible by timestamp comparison ('u') are only possible in non-deterministic mode? Does the use of 'u' buy us much measurable time when repeatedly and incrementally linking large libraries, where the new 'D' mode is forced to link everything instead of just the new inputs? And of course there's the question of how easy is it to detect that ar is new enough to understand the 'D'/'U' dichotomy? Is this something I should redirect to automake instead of libtool? -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

2 1

[libvirt] [PATCH 0/3] Only talk to qemu guest agent when the domain is running
by Ján Tomko 28 Feb '15

28 Feb '15

Previously, only virDomainObjIsActive() was used to check domain liveness. This includes states like 'VIR_DOMAIN_PMSUSPENDED', where QEMU is running, but the guest is not. Explicitly check the state against VIR_DOMAIN_RUNNING and refuse to communicate with the agent if it does not match. https://bugzilla.redhat.com/show_bug.cgi?id=872424 Ján Tomko (3): Check for qemu guest agent availability after getting the job Pass virDomainObjPtr to qemuDomainAgentAvailable Check if domain is running in qemuDomainAgentIsAvailable src/qemu/qemu_domain.c | 11 ++++++++++- src/qemu/qemu_domain.h | 2 +- src/qemu/qemu_driver.c | 49 +++++++++++++++++++++++++------------------------ 3 files changed, 36 insertions(+), 26 deletions(-) -- 2.0.5

2 4

Re: [libvirt] [Xen-devel] [xen-unstable test] 35257: regressions - FAIL
by Jim Fehlig 28 Feb '15

28 Feb '15

Ian Campbell wrote: > On Thu, 2015-02-26 at 20:14 +0000, xen.org wrote: > >> flight 35257 xen-unstable real [real] >> http://www.chiark.greenend.org.uk/~xensrcts/logs/35257/ >> >> Regressions :-( >> >> Tests which did not succeed and are blocking, >> including tests which could not be run: >> test-armhf-armhf-libvirt 12 guest-start.2 fail REGR. vs. 34629 >> > > logs: > http://www.chiark.greenend.org.uk/~xensrcts/logs/35257/test-armhf-armhf-lib… > > http://www.chiark.greenend.org.uk/~xensrcts/logs/35257/test-armhf-armhf-lib… > 2015-02-23 20:21:48 Z executing ssh ... root(a)10.80.229.106 virsh domxml-from-native xen-xl /etc/xen/debian.guest.osstest.cfg > /etc/xen/debian.guest.osstest.cfg.xml > error: failed to connect to the hypervisor > error: no valid connection > error: Failed to connect socket to '/var/run/libvirt/libvirt-sock': Connection refused > > http://www.chiark.greenend.org.uk/~xensrcts/logs/35257/test-armhf-armhf-lib… > appears to show no libvirtd process. > > http://www.chiark.greenend.org.uk/~xensrcts/logs/35257/test-armhf-armhf-lib… > says: > 2015-02-23 20:13:15.556+0000: 2133: info : libvirt version: 1.2.13 > 2015-02-23 20:13:15.556+0000: 2133: error : dnsmasqCapsRefreshInternal:726 : Cannot check dnsmasq binary dnsmasq: No such file or directory > > 2015-02-23 20:13:15.845+0000: 2133: error : > virFirewallValidateBackend:193 : direct firewall backend requested, > but /sbin/ebtables is not available: No such file or directory Odd, since ebtables was found when building checking for ebtables... /sbin/ebtables But AFAICT, that wont prevent libvirtd from starting. > > I think these are just spurious. > > 2015-02-23 20:13:15.845+0000: 2133: error : virFirewallApply:936 : out of memory > > > 2015-02-23 20:13:16.092+0000: 2133: error : virExec:491 : Cannot find 'pm-is-supported' in path: No such file or directory > 2015-02-23 20:13:16.092+0000: 2133: warning : virQEMUCapsInit:999 : Failed to get host power management capabilities > > As are these two. > > 2015-02-23 20:13:16.400+0000: 2133: error : virFirewallApply:936 : out of memory > > Has these OOM messages resulted in libvirtd exiting? No, I don't think so. The related code is int virFirewallApply(virFirewallPtr firewall) { size_t i, j; int ret = -1; virMutexLock(&ruleLock); if (!firewall || firewall->err == ENOMEM) { virReportOOMError(); goto cleanup; ... } I suspect 'firewall' is null, so OOM error is reported and the function returns -1. But I also don't see this preventing libvirtd from starting. I've cc'd the libvirt list for verification that these errors won't prevent libvirtd from starting. > I don't see any > evidence of a crash elsewhere in the logs (i.e. no "process segfaulted" > in dmesg, no OOM killing going on etc). > > We don't seem to collect dom0 freemem info, but that most likely > wouldn't help given the libvirtd process has exited. > > > Any ideas where to look next? Can you access the test environment and try starting libvirtd in the foreground? Or enable debug log level in /etc/libvirt/libvirtd.conf? Regards, Jim

2 1

[libvirt] [PATCH] Really fix XML formatting flags in SaveImageUpdateDef
by Ján Tomko 27 Feb '15

27 Feb '15

Commit cf2d4c6 used a logical or instead of bitwise or, effectively passing 1, that is VIR_DOMAIN_XML_INACTIVE. Yep, that's right. This was caught by a warning when building with clang. https://bugzilla.redhat.com/show_bug.cgi?id=1183869 --- 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 e9aa0b5..e282464 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5734,7 +5734,7 @@ qemuDomainSaveImageUpdateDef(virQEMUDriverPtr driver, if (!(newdef_migr = qemuDomainDefCopy(driver, newdef, - QEMU_DOMAIN_FORMAT_LIVE_FLAGS || + QEMU_DOMAIN_FORMAT_LIVE_FLAGS | VIR_DOMAIN_XML_MIGRATABLE))) goto cleanup; -- 2.0.5

3 2

[libvirt] [PATCH 0/4] add support for graphics to get a IPv6 address
by Luyao Huang 27 Feb '15

27 Feb '15

https://bugzilla.redhat.com/show_bug.cgi?id=1192318 We already support add a IPv6 address to graphics listen address and xml like this: <graphics type='spice' port='5900' autoport='yes' listen='2001b8:ca2:2::1' keymap='en-us'> <listen type='address' address='2001b8:ca2:2::1'/> </graphics> However we do not support get a IPv6 address for the network. add some helpers and rework networkGetNetworkAddress to make it can get a IPv6 address when we need. Luyao Huang (4): util: introduce a new helper for get interface IPv6 address conf: introduce new family attribute in graphics listen for chose IP family network: rework networkGetNetworkAddress to make it can get IPv6 address qemu: fix a error coverd issue in 2 place docs/formatdomain.html.in | 10 +++- docs/schemas/domaincommon.rng | 9 +++ src/conf/domain_conf.c | 21 +++++++ src/conf/domain_conf.h | 10 ++++ src/conf/network_conf.c | 2 +- src/conf/network_conf.h | 1 + src/libvirt_private.syms | 2 + src/network/bridge_driver.c | 50 +++++++++++----- src/network/bridge_driver.h | 6 +- src/qemu/qemu_command.c | 18 ++---- src/util/virnetdev.c | 70 ++++++++++++++++++++++ src/util/virnetdev.h | 2 + .../qemuxml2argv-graphics-listen-network.xml | 2 +- .../qemuxml2argv-graphics-listen-network2.xml | 2 +- .../qemuxml2xmlout-graphics-listen-network2.xml | 2 +- 15 files changed, 174 insertions(+), 33 deletions(-) -- 1.8.3.1

5 22

[libvirt] [PATCH 0/5] Add VIR_CONNECT_BASELINE_CPU_MIGRATABLE flag
by Ján Tomko 27 Feb '15

27 Feb '15

Add a flag to virConnectBaselineCPU to filter out features that block migration. Ján Tomko (5): Also store features blocking migration as CPUx86Data in the cpu map Add VIR_CONNECT_BASELINE_CPU_MIGRATABLE flag Implement VIR_CONNECT_BASELINE_CPU_MIGRATABLE in the x86 cpu driver Trivially implement VIR_CONNECT_BASELINE_CPU_MIGRATABLE for non-x86 cpus Add --migratable support to virsh cpu-baseline include/libvirt/libvirt-host.h | 1 + src/bhyve/bhyve_driver.c | 3 +- src/cpu/cpu_aarch64.c | 3 +- src/cpu/cpu_arm.c | 3 +- src/cpu/cpu_generic.c | 3 +- src/cpu/cpu_powerpc.c | 3 +- src/cpu/cpu_x86.c | 47 ++++++++++++++++++++++++- src/libvirt-host.c | 3 ++ src/qemu/qemu_driver.c | 3 +- tests/cputest.c | 6 ++++ tests/cputestdata/x86-baseline-6-migratable.xml | 10 ++++++ tests/cputestdata/x86-baseline-6-result.xml | 11 ++++++ tests/cputestdata/x86-baseline-6.xml | 37 +++++++++++++++++++ tools/virsh-domain.c | 6 ++++ tools/virsh.pod | 5 +-- 15 files changed, 135 insertions(+), 9 deletions(-) create mode 100644 tests/cputestdata/x86-baseline-6-migratable.xml create mode 100644 tests/cputestdata/x86-baseline-6-result.xml create mode 100644 tests/cputestdata/x86-baseline-6.xml -- 2.0.5

2 11

[libvirt] [PATCH] qemu: snapshot: post error when create internal system checkpoint snapshot with rbd backend
by Shanzhi Yu 27 Feb '15

27 Feb '15

When create internel system checkpoint snapshot with source file based on rbd backend, libvirt miss to check if the format of source file support internal snapshot. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1179533 Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- src/qemu/qemu_driver.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 26fc6a2..6dd0a5c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -13423,8 +13423,7 @@ qemuDomainSnapshotPrepare(virConnectPtr conn, 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)) { + dom_disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_SHEEPDOG) { break; } if (vm->def->disks[i]->src->format > 0 && -- 2.1.0

2 2

[libvirt] [PATCH] Ignore listen attribute of <graphics> for type network listens
by Ján Tomko 27 Feb '15

27 Feb '15

Commit 6992994 started filling the listen attribute of the parent <graphics> elements from type='network' listens. When this XML is passed to UpdateDevice, parsing fails: XML error: graphics listen attribute 10.20.30.40 must match address attribute of first listen element (found none) Ignore the address in the parent <graphics> attribute when no type='address' listens are found, the same we ignore the address for the <listen> subelements when parsing inactive XML. --- src/conf/domain_conf.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d95dd3e..d458195 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9614,12 +9614,16 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, break; } } - if (!matched) { + if (found && !matched) { virReportError(VIR_ERR_XML_ERROR, _("graphics listen attribute %s must match address " "attribute of first listen element (found %s)"), - listenAddr, found ? found : "none"); + listenAddr, found); goto error; + } else if (!found && !matched) { + /* quietly ignore listen address if none of the listens + * are of type address */ + VIR_FREE(listenAddr); } } } -- 2.0.5

4 9

[libvirt] [PATCH] qemu: forbid large value wraparound in balloon period collection
by Erik Skultety 27 Feb '15

27 Feb '15

We do parse and represent period collection as unsigned int in our internal structures, however commit d5c67e7f4523450023b89b69c16472582c85eeaf converts this to int, thus wrapping around inputs greater than INT_MAX which results in an error from QEMU. This patch adds a check into QEMU driver, because period attribute is only supported by QEMU. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1140958 --- src/qemu/qemu_driver.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index bec05d4..46bd880 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2414,6 +2414,12 @@ static int qemuDomainSetMemoryStatsPeriod(virDomainPtr dom, int period, /* Set the balloon driver collection interval */ priv = vm->privateData; + if (period < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("invalid value for collection period")); + goto endjob; + } + if (flags & VIR_DOMAIN_AFFECT_LIVE) { qemuDomainObjEnterMonitor(driver, vm); -- 1.9.3

3 4

[libvirt] [PATCH] docs: add a note that spice channel is ignoret without spice graphics
by Pavel Hrdina 26 Feb '15

26 Feb '15

To prevent a confusion about missing chardev argument in qemu command line add a note about that behavior into documentation. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- docs/formatdomain.html.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index fb0a0d1..cd179a6 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -5372,6 +5372,10 @@ qemu-kvm -net nic,model=? /dev/null under a channel name specified in the <code>channel</code> attribute. <span class="since">Since 1.2.2</span> </p> + <p> + NOTE: if spice graphics is not defined the spice channel will + be ignored. + </p> <pre> ... -- 2.0.5

2 2

[libvirt] Adding timestamps for all emulator output
by Andrey Korolyov 26 Feb '15

26 Feb '15

Hello, I think it would be useful if libvirt will be able to prefix all messages from emulator pipes with the date stamping, for example I am trying to catch very rare and non-fatal race with virtio-serial-bus: Guest failure in adding device virtio-serial0.0 which is specific to the Windows guests on qemu-kvm. I have supporting infrastructure which can tell me exact times for every action upon this VM, but as bug is not frequent, the continuous monitoring looks like an overkill for a desired goal - find a correlation between emulator event and message from stderr. Patching emulator itself is barely an option, as it is ugly, requires refresh of the running code via loopback migration and completely non-universal, as every hypervisor should be modified seperately. I`d highly appreciate positive consideration for such functionality addition or can write a patch shortly, if needed. Thanks!

2 3

[libvirt] [PATCH 0/2] For 1.2.13 - Fix crash with gluster URIs
by Peter Krempa 26 Feb '15

26 Feb '15

Peter Krempa (2): util: storagefile: Don't crash on gluster URIs without path util: storage: Fix error type in virStorageSourceParseBackingURI src/util/virstoragefile.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) -- 2.2.2

2 4

[libvirt] [PATCHv2 00/10] Add support for memory hotplug
by Peter Krempa 26 Feb '15

26 Feb '15

Version 2 fixes review comments and rebases to the current state. This series applies on top of: [PATCHv2 0/7] Automaticaly fill <memory> element for NUMA enabled guests For convenience you can fetch the changes at: git fetch git://pipo.sk/pipo/libvirt.git memory-hotplug-2 Peter Krempa (10): conf: Add support for parsing and formatting max memory and slot count qemu: Implement setup of memory hotplug parameters conf: Add device address type for dimm devices conf: Add interface to parse and format memory device information qemu: memdev: Add infrastructure to load memory device information qemu: migration: Forbid migration with memory modules lacking info qemu: add support for memory devices qemu: conf: Add support for memory device cold(un)plug qemu: Implement memory device hotplug qemu: Implement memory device hotunplug docs/formatdomain.html.in | 98 ++++ docs/schemas/domaincommon.rng | 76 +++ src/bhyve/bhyve_domain.c | 9 +- src/conf/domain_conf.c | 564 ++++++++++++++++++++- src/conf/domain_conf.h | 59 +++ src/libvirt_private.syms | 7 + src/libxl/libxl_domain.c | 8 + src/lxc/lxc_domain.c | 8 + src/openvz/openvz_driver.c | 14 +- src/parallels/parallels_driver.c | 6 +- src/phyp/phyp_driver.c | 6 +- src/qemu/qemu_command.c | 166 +++++- src/qemu/qemu_command.h | 15 + src/qemu/qemu_domain.c | 80 +++ src/qemu/qemu_domain.h | 5 + src/qemu/qemu_driver.c | 29 ++ src/qemu/qemu_hotplug.c | 177 +++++++ src/qemu/qemu_hotplug.h | 6 + src/qemu/qemu_migration.c | 14 + src/qemu/qemu_monitor.c | 42 ++ src/qemu/qemu_monitor.h | 14 + src/qemu/qemu_monitor_json.c | 122 +++++ src/qemu/qemu_monitor_json.h | 5 + src/qemu/qemu_process.c | 4 + src/uml/uml_driver.c | 9 +- src/vbox/vbox_common.c | 6 +- src/vmware/vmware_driver.c | 6 +- src/vmx/vmx.c | 6 +- src/xen/xen_driver.c | 7 + src/xenapi/xenapi_driver.c | 9 +- tests/domainschemadata/maxMemory.xml | 19 + .../qemuxml2argv-memory-hotplug-dimm.args | 11 + .../qemuxml2argv-memory-hotplug-dimm.xml | 50 ++ .../qemuxml2argv-memory-hotplug-nonuma.xml | 22 + .../qemuxml2argv-memory-hotplug.args | 6 + .../qemuxml2argv-memory-hotplug.xml | 34 ++ tests/qemuxml2argvtest.c | 6 + tests/qemuxml2xmltest.c | 4 + 38 files changed, 1706 insertions(+), 23 deletions(-) create mode 100644 tests/domainschemadata/maxMemory.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nonuma.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.xml -- 2.2.2

2 12

[libvirt] [PATCH] util: do not take it as wrong if no PortData is found while getting migrateData
by Zhang Bo 26 Feb '15

26 Feb '15

The function virNetDevOpenvswitchGetMigrateData() uses the cmd ovs-vsctl to get portdata. If no portdata is available, rather than failure in running the cmd, we think we should just print a warning message here, rather than taking it as wrong, because PortData is just optional for an ovs interface. If we take it as wrong anyway, in function qemuMigrationBakeCookie() it will terminate in the middle, and cookies such as NBD would not be baked, further more errors would happen, such as nbd ports get overflowed, etc. Thus, we add an if branch in virNetDevOpenvswitchGetMigrateData() to just warn if portdata is unavailable. Signed-off-by: Zhang Bo <oscar.zhangbo(a)huawei.com> Signed-off-by: Zhou Yimin <zhouyimin(a)huawei.com> --- src/util/virnetdevopenvswitch.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index e5c87bb..6116377 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -30,9 +30,12 @@ #include "virerror.h" #include "virmacaddr.h" #include "virstring.h" +#include "virlog.h" #define VIR_FROM_THIS VIR_FROM_NONE +VIR_LOG_INIT("util.netdevopenvswitch"); + /** * virNetDevOpenvswitchAddPort: * @brname: the bridge name @@ -204,18 +207,29 @@ int virNetDevOpenvswitchRemovePort(const char *brname ATTRIBUTE_UNUSED, const ch int virNetDevOpenvswitchGetMigrateData(char **migrate, const char *ifname) { virCommandPtr cmd = NULL; + char *errbuf = NULL; int ret = -1; cmd = virCommandNewArgList(OVSVSCTL, "--timeout=5", "get", "Interface", ifname, "external_ids:PortData", NULL); virCommandSetOutputBuffer(cmd, migrate); + virCommandSetErrorBuffer(cmd, &errbuf); /* Run the command */ - if (virCommandRun(cmd, NULL) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to run command to get OVS port data for " - "interface %s"), ifname); + ret = virCommandRun(cmd, NULL); + if (ret < 0) { + /*PortData is optional, thus do not take it as wrong if the PortData is not found.*/ + if (strstr(errbuf, "no key \"PortData\" in Interface record")) { + VIR_WARN("Can't find OVS port data for interface %s", ifname); + if (*migrate) + VIR_FREE(*migrate); + ret = 0; + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to run command to get OVS port data for " + "interface %s"), ifname); + } goto cleanup; } @@ -223,6 +237,7 @@ int virNetDevOpenvswitchGetMigrateData(char **migrate, const char *ifname) (*migrate)[strlen(*migrate) - 1] = '\0'; ret = 0; cleanup: + VIR_FREE(errbuf); virCommandFree(cmd); return ret; } @@ -241,6 +256,11 @@ int virNetDevOpenvswitchSetMigrateData(char *migrate, const char *ifname) virCommandPtr cmd = NULL; int ret = -1; + if (NULL == migrate) { + VIR_INFO("There is no need to set OVS port data for interface %s", ifname); + return 0; + } + cmd = virCommandNewArgList(OVSVSCTL, "--timeout=5", "set", "Interface", ifname, NULL); virCommandAddArgFormat(cmd, "external_ids:PortData=%s", migrate); -- 1.7.12.4

3 4

[libvirt] [PATCH] conf: error out on missing dhcp host attributes
by Ján Tomko 26 Feb '15

26 Feb '15

In virNetworkDHCPHostDefParseXML an error is reported when partialOkay == true, and none of ip, mac, name were supplied. Add the missing goto and error out in this case. --- src/conf/network_conf.c | 1 + 1 file changed, 1 insertion(+) Pushed as trivial. diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 52fcf3d..0f4fc1e 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -746,6 +746,7 @@ virNetworkDHCPHostDefParseXML(const char *networkName, "must be specified for static host definition " "in network '%s' "), networkName); + goto cleanup; } } else { /* normal usage - you need at least name (IPv6) or one of MAC -- 2.0.5

1 0

[libvirt] [PATCH] conf: fix not jump to cleanup when parse a host id is invalid
by Luyao Huang 26 Feb '15

26 Feb '15

https://bugzilla.redhat.com/show_bug.cgi?id=1196503 We already check whether the host id is valid or not, add a jump to forbid invalid host id. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/conf/network_conf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 3d8bf05..52fcf3d 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -717,6 +717,7 @@ virNetworkDHCPHostDefParseXML(const char *networkName, virReportError(VIR_ERR_XML_ERROR, _("Invalid character '%c' in id '%s' of network '%s'"), *cp, id, networkName); + goto cleanup; } } -- 1.8.3.1

3 2

[libvirt] [PATCH 0/2] check for null ifname when setting/clearing bandwidth
by Laine Stump 26 Feb '15

26 Feb '15

When John Ferlan ran the Coverity static checker on my patches to fix the problem with nicindexes, it began complaining about calling the virNetDevBandwidth* functions with a null ifname. Investigation pointed out some real problems with this that are fixed by these two patches (which will be pushed *before* the nicindex fix patch). Laine Stump (2): network: only clear bandwidth if it has been set util: check for null ifname inside virNetDevBandwidthSet() src/conf/netdev_bandwidth_conf.c | 6 ++++-- src/lxc/lxc_driver.c | 7 ++++++- src/network/bridge_driver.c | 6 ++++-- src/qemu/qemu_hotplug.c | 4 +++- src/util/virnetdevbandwidth.c | 9 ++++++++- src/util/virnetdevbandwidth.h | 4 ++-- 6 files changed, 27 insertions(+), 9 deletions(-) -- 2.1.0

4 10

[libvirt] Entering freeze for libvirt-1.2.13
by Daniel Veillard 26 Feb '15

26 Feb '15

As suggested yesterday, and hearing no opposition, I have just tagged Redlease Candidate 1 for libvirt-1.2.13 in git and signed tarballs and rpms for it available at the usual place: ftp://libvirt.org/libvirt/ Based on my own but minimal testing this seems to work, but obviously please give it a try so we can squash bugs and portability issues in time. A candidate release 2 on Thursday and a final 1.2.13 release next Monday is the schedule assumeing no major issue is found, so please give it a test ! Thanks, Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 1

[libvirt] [PATCH 1/3] utils: Implement virCommandPassFDGetFDIndex
by Stefan Berger 26 Feb '15

26 Feb '15

Implement virCommandPassFDGetFDIndex to determine the index a given file descriptor will have when passed to the child process. When this function is called, a flag is set to prevent the reordering of the file descriptors. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- src/libvirt_private.syms | 1 + src/util/vircommand.c | 33 +++++++++++++++++++++++++++++++++ src/util/vircommand.h | 3 +++ 3 files changed, 37 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index c156b40..aadb833 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1213,6 +1213,7 @@ virCommandNewArgList; virCommandNewArgs; virCommandNonblockingFDs; virCommandPassFD; +virCommandPassFDGetFDIndex; virCommandPassListenFDs; virCommandRawStatus; virCommandRequireHandshake; diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 6527d85..2616446 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -67,6 +67,7 @@ enum { VIR_EXEC_RUN_SYNC = (1 << 3), VIR_EXEC_ASYNC_IO = (1 << 4), VIR_EXEC_LISTEN_FDS = (1 << 5), + VIR_EXEC_FIXED_FDS = (1 << 6), }; typedef struct _virCommandFD virCommandFD; @@ -214,6 +215,12 @@ virCommandReorderFDs(virCommandPtr cmd) if (!cmd || cmd->has_error || !cmd->npassfd) return; + if ((cmd->flags & VIR_EXEC_FIXED_FDS)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("The fds are fixed and cannot be reordered")); + goto error; + } + for (i = 0; i < cmd->npassfd; i++) maxfd = MAX(cmd->passfd[i].fd, maxfd); @@ -1019,6 +1026,32 @@ virCommandPassListenFDs(virCommandPtr cmd) cmd->flags |= VIR_EXEC_LISTEN_FDS; } +/* + * virCommandPassFDGetFDIndex: + * @cmd: pointer to virCommand + * @fd: FD to get index of + * + * Determine the index of the FD in the transfer set. + * + * Returns index >= 0 if @set contains @fd, + * -1 otherwise. + */ +int +virCommandPassFDGetFDIndex(virCommandPtr cmd, int fd) +{ + size_t i = 0; + + while (i < cmd->npassfd) { + if (cmd->passfd[i].fd == fd) { + cmd->flags |= VIR_EXEC_FIXED_FDS; + return i; + } + i++; + } + + return -1; +} + /** * virCommandSetPidFile: * @cmd: the command to modify diff --git a/src/util/vircommand.h b/src/util/vircommand.h index bf65de4..198da2f 100644 --- a/src/util/vircommand.h +++ b/src/util/vircommand.h @@ -62,6 +62,9 @@ void virCommandPassFD(virCommandPtr cmd, void virCommandPassListenFDs(virCommandPtr cmd); +int virCommandPassFDGetFDIndex(virCommandPtr cmd, + int fd); + void virCommandSetPidFile(virCommandPtr cmd, const char *pidfile) ATTRIBUTE_NONNULL(2); -- 1.9.3

3 12

[libvirt] [PATCHv2 0/2] Boot options cleanup
by Ján Tomko 26 Feb '15

26 Feb '15

Depends on the first two (ACKed) patches from: https://www.redhat.com/archives/libvir-list/2015-February/msg00662.html Patch 4/5 Rename boot_buf to boot_opts was dropped. In this version, only one virBuffer is used and just the strings are separate. Ján Tomko (2): Make -boot arg generation more readable Use virBufferTrim when generating boot options src/qemu/qemu_command.c | 59 ++++++++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 33 deletions(-) -- 2.0.5

4 7

[libvirt] [PATCH 0/2] schema: Improve schema for the <os> element
by Peter Krempa 26 Feb '15

26 Feb '15

Peter Krempa (2): schema: Visually separate <define> blocks in RNG schema: Allow interleaving the /domain/os/type element docs/schemas/domaincommon.rng | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) -- 2.2.2

2 4

[libvirt] [PATCH] spec: Yet another permission fix for qemu dirs
by Martin Kletzander 25 Feb '15

25 Feb '15

Since we autogenerate path for QEMU guest agent into LOCALSTATEDIR /lib/libvirt/qemu/channel/target/, the process should be able to access that socket no matter under what user/group it is running co you can set the user/group in qemu.conf. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1146886 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- libvirt.spec.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 7f8be38..f300423 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1960,9 +1960,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/ %ghost %dir %attr(0700, root, root) %{_localstatedir}/run/libvirt/qemu/ -%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/ -%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/ -%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/target/ +%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/ +%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/ +%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/target/ %dir %attr(0711, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/nvram/ %dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/ %{_datadir}/augeas/lenses/libvirtd_qemu.aug -- 2.3.0

3 5

[libvirt] [PATCH] Fix typos in messages
by Yuri Chornoivan 25 Feb '15

25 Feb '15

--- src/parallels/parallels_sdk.c | 2 +- src/qemu/qemu_monitor_json.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/parallels/parallels_sdk.c b/src/parallels/parallels_sdk.c index bbc26ef..36c6c5f 100644 --- a/src/parallels/parallels_sdk.c +++ b/src/parallels/parallels_sdk.c @@ -2307,7 +2307,7 @@ static int prlsdkCheckDiskUnsupportedParams(virDomainDiskDefPtr disk) virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Only hard disks and cdroms are supported " - "supported by parallels driver.")); + "by parallels driver.")); return -1; } diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index da5c14d..832f589 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1320,7 +1320,7 @@ qemuMonitorJSONUpdateVideoMemorySize(qemuMonitorPtr mon, case VIR_DOMAIN_VIDEO_TYPE_VGA: if (qemuMonitorJSONGetObjectProperty(mon, path, "vgamem_mb", &prop) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("QOM Objext '%s' has no property 'vgamem_mb'"), + _("QOM Object '%s' has no property 'vgamem_mb'"), path); return -1; } @@ -1329,21 +1329,21 @@ qemuMonitorJSONUpdateVideoMemorySize(qemuMonitorPtr mon, case VIR_DOMAIN_VIDEO_TYPE_QXL: if (qemuMonitorJSONGetObjectProperty(mon, path, "vram_size", &prop) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("QOM Objext '%s' has no property 'vram_size'"), + _("QOM Object '%s' has no property 'vram_size'"), path); return -1; } video->vram = prop.val.ul / 1024; if (qemuMonitorJSONGetObjectProperty(mon, path, "ram_size", &prop) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("QOM Objext '%s' has no property 'ram_size'"), + _("QOM Object '%s' has no property 'ram_size'"), path); return -1; } video->ram = prop.val.ul / 1024; if (qemuMonitorJSONGetObjectProperty(mon, path, "vgamem_mb", &prop) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("QOM Objext '%s' has no property 'vgamem_mb'"), + _("QOM Object '%s' has no property 'vgamem_mb'"), path); return -1; } @@ -1352,7 +1352,7 @@ qemuMonitorJSONUpdateVideoMemorySize(qemuMonitorPtr mon, case VIR_DOMAIN_VIDEO_TYPE_VMVGA: if (qemuMonitorJSONGetObjectProperty(mon, path, "vgamem_mb", &prop) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("QOM Objext '%s' has no property 'vgamem_mb'"), + _("QOM Object '%s' has no property 'vgamem_mb'"), path); return -1; } -- 1.8.5.6

3 2

[libvirt] Reopening file descriptors
by Christopher Pereira 25 Feb '15

25 Feb '15

Hi, I'm chasing a bug related with libvirt not being able to resume a VM paused because of an IO Error for images stored on a gluster volume. The bug was reported in oVirt here: https://bugzilla.redhat.com/show_bug.cgi?id=1058300#c39 To reproduce: 1) Run a VM on a gluster volume 2) Stop the gluser volume (VM will be paused) 3) Start the gluster volume 4) virsh resume VM (will fail) QEMU logs will say: block I/O error in device 'drive-virtio-disk0': Transport endpoint is not connected (107) And VM will not be resumed. My guess is that libvirt is not telling QEMU to reopen its file descriptors. Can someone please confirm or fix?

2 1

[libvirt] [PATCH 0/9] Make capacity optional when creating volumes
by Ján Tomko 25 Feb '15

25 Feb '15

If the volume has a <backingStore> or we are cloning a volume, we don't need to know the capacity upfront. https://bugzilla.redhat.com/show_bug.cgi?id=958510 Ján Tomko (9): Add flags argument to virStorageVolDefParse* Parse backingStore before capacity in volume XML Allow parsing volumes without specifying the capacity Allow cloning volumes with no capacity specified Fix error messages in virStorageFileGetMetadataFromFD Probe for capacity in virStorageBackendUpdateVolTargetInfo Revert "Restore skipping of setting capacity" Allow omitting volume capacity when backing store is specified Allow creating volumes with a backing store but no capacity src/conf/storage_conf.c | 99 ++++++++++++---------- src/conf/storage_conf.h | 15 +++- src/esx/esx_storage_backend_vmfs.c | 4 +- src/parallels/parallels_storage.c | 6 +- src/phyp/phyp_driver.c | 2 +- src/storage/storage_backend.c | 60 +++++++++---- src/storage/storage_backend.h | 5 +- src/storage/storage_backend_disk.c | 4 +- src/storage/storage_backend_fs.c | 17 ++-- src/storage/storage_backend_gluster.c | 2 +- src/storage/storage_backend_logical.c | 2 +- src/storage/storage_backend_mpath.c | 2 +- src/storage/storage_backend_rbd.c | 6 ++ src/storage/storage_backend_scsi.c | 2 +- src/storage/storage_backend_sheepdog.c | 6 ++ src/storage/storage_driver.c | 17 +++- src/test/test_driver.c | 6 +- src/util/virstoragefile.c | 4 +- src/vbox/vbox_storage.c | 2 +- tests/storagebackendsheepdogtest.c | 2 +- .../qcow2-nocapacity-convert-prealloc.argv | 4 + tests/storagevolxml2argvdata/qcow2-nocapacity.argv | 5 ++ tests/storagevolxml2argvtest.c | 29 +++++-- .../vol-qcow2-nocapacity-backing.xml | 23 +++++ tests/storagevolxml2xmlin/vol-qcow2-nocapacity.xml | 19 +++++ .../storagevolxml2xmlout/vol-qcow2-nocapacity.xml | 21 +++++ tests/storagevolxml2xmltest.c | 15 ++-- 27 files changed, 269 insertions(+), 110 deletions(-) create mode 100644 tests/storagevolxml2argvdata/qcow2-nocapacity-convert-prealloc.argv create mode 100644 tests/storagevolxml2argvdata/qcow2-nocapacity.argv create mode 100644 tests/storagevolxml2xmlin/vol-qcow2-nocapacity-backing.xml create mode 100644 tests/storagevolxml2xmlin/vol-qcow2-nocapacity.xml create mode 100644 tests/storagevolxml2xmlout/vol-qcow2-nocapacity.xml -- 2.0.5

2 22

[libvirt] [PATCH] virsh: Add missing parenthesis into man page
by Martin Kletzander 25 Feb '15

25 Feb '15

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed as trivial. tools/virsh.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index cdcb862..a7e0bb0 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -736,7 +736,7 @@ Get network interface stats for a running domain. =item B<domif-setlink> I<domain> I<interface-device> I<state> [I<--config>] Modify link state of the domain's virtual interface. Possible values for -state are "up" and "down. If I<--config> is specified, only the persistent +state are "up" and "down". If I<--config> is specified, only the persistent configuration of the domain is modified, for compatibility purposes, I<--persistent> is alias of I<--config>. I<interface-device> can be the interface's target name or the MAC address. -- 2.3.0

2 2

[libvirt] [PATCH for 1.2.13] schema: Add virtio-mmio address type into RNG
by Martin Kletzander 25 Feb '15

25 Feb '15

The "virtio-mmio" is perfectly valid address type which we parse and format correctly, but it's missing in our RNG schemas, hence editing a domain with device having such address fails the validation. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- docs/schemas/domaincommon.rng | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index f41ca43..6e73e7c 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -4415,6 +4415,11 @@ </attribute> <ref name="isaaddress"/> </group> + <group> + <attribute name="type"> + <value>virtio-mmio</value> + </attribute> + </group> </choice> </element> </define> -- 2.3.0

4 5

[libvirt] QEMU's File Descriptors
by Christopher Pereira 25 Feb '15

25 Feb '15

Dear Martin, Does libvirt currently reopen image files when resuming a VM? There is an issue of an IO Error after restarting a gluster volume and probably doing other maintenance tasks (VM will not resume) which probably invalidates QEMU's File Descriptors. It's an old BZ. Martin Kletzander <mkletzan(a)redhat.com> wrote: >On Tue, Feb 24, 2015 at 09:24:51AM -0500, Stefan Berger wrote: >>On 02/24/2015 08:34 AM, Martin Kletzander wrote: >>>On Mon, Feb 23, 2015 at 06:50:46AM -0500, Stefan Berger wrote: >>>>Implement virCommandPassFDGetFDIndex to determine the index a given >>>>file descriptor will have when passed to the child process. When this >>>>function is called, a flag is set to prevent the reordering of the >>>>file descriptors. >>>> >>>>Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> >>>>--- >>>>src/libvirt_private.syms | 1 + >>>>src/util/vircommand.c | 33 +++++++++++++++++++++++++++++++++ >>>>src/util/vircommand.h | 3 +++ >>>>3 files changed, 37 insertions(+) >>>> >>>>diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms >>>>index c156b40..aadb833 100644 >>>>--- a/src/libvirt_private.syms >>>>+++ b/src/libvirt_private.syms >>>>@@ -1213,6 +1213,7 @@ virCommandNewArgList; >>>>virCommandNewArgs; >>>>virCommandNonblockingFDs; >>>>virCommandPassFD; >>>>+virCommandPassFDGetFDIndex; >>>>virCommandPassListenFDs; >>>>virCommandRawStatus; >>>>virCommandRequireHandshake; >>>>diff --git a/src/util/vircommand.c b/src/util/vircommand.c >>>>index 6527d85..2616446 100644 >>>>--- a/src/util/vircommand.c >>>>+++ b/src/util/vircommand.c >>>>@@ -67,6 +67,7 @@ enum { >>>> VIR_EXEC_RUN_SYNC = (1 << 3), >>>> VIR_EXEC_ASYNC_IO = (1 << 4), >>>> VIR_EXEC_LISTEN_FDS = (1 << 5), >>>>+ VIR_EXEC_FIXED_FDS = (1 << 6), >>> >>>The descriptors shouldn't get reordered *unless* there is >>>VIR_EXEC_LISTEN_FDS flag added, so FIXED_FDS shouldn't be necessary. >>>Or is there a bug in that approach that needs fixing? >> >>Hm, it depends on the order in which APIs are called where we either >>need to protect against re-ordering (if we use indices) or we cannot >>allow indices to be used if we need to reorder them. So, actually the >>way the patch is, it isn't correct, either. >> >>The problem of having to prevent the reordering of file descriptors >>when we are building the QEMU command line with file descriptors >>already exists today. So maybe I could just remove this flag and the >>related check knowing that reordering of file descriptors and building >>the QEMU command line that contains file descriptor (from before the >>order) would not be allowed today without any of the patches I am >>trying to add. >> > >You surely and safely can. The point behind reordering FDs was that >when you're using FD passing as done by systemd, those FDs passed must >start from number 3. However, because we are already passing a bunch >of file descriptors to QEMU and other commands, we *must not* reorder >any file descriptors because it wouldn't work, of course. > >Martin > >-- >libvir-list mailing list >libvir-list(a)redhat.com >https://www.redhat.com/mailman/listinfo/libvir-list

2 3

[libvirt] Unattended guest installation fails
by ChandraShekar Shastri 25 Feb '15

25 Feb '15

Hi, I am following the below link to install a Fedora19 guest on Fedora19 Host. http://kashyapc.com/2011/08/18/unattended-guest-install-with-a-local-kickst… Version : libvirtd (libvirt) 1.0.5.1, QEMU emulator version 1.4.2, Copyright (c) 2003-2008 Fabrice Bellard I have the iso which I loop mounted and created a http repo using python module "python -m SimpleHTTPServer". This repo is properly accessible and the guest is able to pull the initrd.img and vmlinuz but further it fails. Please find the attached xml and console messages and let me know how to proceed further. Thanks, Chandrashekar

3 3

[libvirt] [PATCH 0/4] Couple of <cpu/> fixes
by Michal Privoznik 25 Feb '15

25 Feb '15

*** BLURB HERE *** Michal Privoznik (4): util: Introduce virBufferAddBuffer virCPUDefFormatBufFull: Use our general error handling pattern cpu: Format <cpu/> properly qemu: Use correct flags for ABI stability check in SaveImageUpdateDef src/conf/cpu_conf.c | 31 ++++-- src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 4 +- src/util/virbuffer.c | 33 +++++- src/util/virbuffer.h | 1 + .../qemuxml2argv-cpu-host-kvmclock.xml | 3 +- tests/virbuftest.c | 112 +++++++++++++++++++++ 7 files changed, 169 insertions(+), 16 deletions(-) -- 2.0.5

2 10

[libvirt] Libvirt Forwarding Incoming Connections
by kim 25 Feb '15

25 Feb '15

Hi Libvirt Developers The link at http://wiki.libvirt.org/page/Networking under "Forwarding Incoming Connections " for the advanced version of the script is not working. We experienced problems with the script in that there is no interface specified and although the port forwarding worked, it was too global and caused a loop when we forwarded port 80 to a guest machine that required outbound port 80 connectivity. The advanced script might (and probably does) resolve the problems that we experienced but as it is not available here is our script in the hope that it may be useful to others. Start of script: #!/bin/sh # derived from script at "http://wiki.libvirt.org/page/Networking" debugfile=/dev/null # set debugfile to desired path and uncomment to debug #debugfile=/mydebugpath/libvirt_hooks_qemu.debug # ${1} AND ${2} ARE PASSED TO THIS SCRIPT BY LIBVIRTD VIR_DOMAIN=${1} ACTION=${2} echo -e "VIR_DOMAIN="${VIR_DOMAIN}'\n'"ACTION="${ACTION}'\n' > ${debugfile} function setiptables () { local Host_interface=${1} local Guest_name=${2} local Guest_ipaddr=${3} local -a Host_port=("${!4}") local -a Guest_port=("${!5}") echo -e "Host_interface="${Host_interface}'\n'"Guest_name="${Guest_name}'\n'"Guest_ipaddr="${Guest_ipaddr}'\n'"Host_port= ${Host_port[@]}"'\n'"Guest_port=${Guest_port[@]}"'\n' >> ${debugfile} length=$(( ${#Host_port[@]} - 1 )) if [ "${VIR_DOMAIN}" = "${Guest_name}" ]; then if [ "${ACTION}" = "stopped" -o "${ACTION}" = "reconnect" ]; then for i in `seq 0 $length`; do PrerouteCmd="iptables -t nat -D PREROUTING -p tcp --dport ${Host_port[$i]} -j DNAT -i ${Host_interface} --to ${Guest_ipaddr}:${Guest_port[$i]}" ForwardCmd="iptables -D FORWARD -d ${Guest_ipaddr}/32 -p tcp -m state --state NEW -m tcp --dport ${Guest_port[$i]} -j ACCEPT" sh -c "${PrerouteCmd}" sh -c "${ForwardCmd}" echo -e ${PrerouteCmd}'\n'${ForwardCmd}'\n' >> ${debugfile} done fi if [ "${ACTION}" = "start" -o "${ACTION}" = "reconnect" ]; then for i in `seq 0 $length`; do PrerouteCmd="iptables -t nat -A PREROUTING -p tcp --dport ${Host_port[$i]} -j DNAT -i ${Host_interface} --to ${Guest_ipaddr}:${Guest_port[$i]}" ForwardCmd="iptables -I FORWARD -d ${Guest_ipaddr}/32 -p tcp -m state --state NEW -m tcp --dport ${Guest_port[$i]} -j ACCEPT" sh -c "${PrerouteCmd}" sh -c "${ForwardCmd}" echo -e ${PrerouteCmd}'\n'${ForwardCmd}'\n' >> ${debugfile} done fi echo -e '\n' >> ${debugfile} fi return 0 } # ********************************** # Guest1 * # ********************************** Guest=Guest1 Guest_ip=192.168.122.xxx # Forwarding from ethernet Interface eno1 interface=eno1 # This will route port 80 on ethernet interface eno1 to Guest IP address 192.168.122.xxx port 8080 # This will route port 443 on ethernet interface eno1 to Guest IP address 192.168.122.xxx port 443 # use an equal number of guest and host ports Host_port_array=( '80' '443' ) Guest_port_array=( '8080' '443' ) setiptables ${interface} ${Guest} ${Guest_ip} Host_port_array[@] Guest_port_array[@] # Forwarding from vpn interface tun0 (example for openvpn connection) interface=tun0 # This will route port 3395 on vpn interface tun0 to Guest IP address 192.168.122.xxx port 3395 # use an equal number of guest and host ports Host_port_array=( '3395' ) Guest_port_array=( '3395' ) setiptables ${interface} ${Guest} ${Guest_ip} Host_port_array[@] Guest_port_array[@] # Multiple guest machines can be configured in a similar way # ********* end of script ***********

1 0

[libvirt] [PATCH] util: do not resotre the VF that is in use by another active guest
by Zhang Bo 25 Feb '15

25 Feb '15

If we assign a VF, which has already been used by an active guest, to another guest, and try to start the 2nd guest later on, the 2nd guest would not start, and the VF won't work anymore. Steps to reproduce the problem: 1 Assign a VF to guest A, and start the guest. The VF works fine. 2 Assign the VF to guest B, and try to start guest B. guest B can't start. 3 Guest A's network becomes unreachable, because its VF now doesn't work. Reasons for this problem is: 1 When we start guest B, libvirtd checks whether the VF is already used by another guest, if so, qemuPrepareHostDevices() returns with failure. 2 Then, libvirtd calls qemuProcessStop() to cleanup resourses, which would restore the VFs of guest B. Specifically, it reads /var/run/libvirt/hostdevmgr/ethX_vfX to get the VF's original MAC/VLAN, and set it back to current VF. 3 As that the VF is still in use by guest A, libvirtd just set its MAC/VLAN to another value, the VF doesn't work anymore. Detailed flow: qemuProcessStart \___qemuPrepareHostDevices(if it fails, goto cleanup) \ \_qemuPrepareHostdevPCIDevices \ \_____virHostdevPreparePCIDevices \ \____LOOP1:virPCIDeviceListFind \ (whether the device is in use by another active guest) \ if the VF has been assigned to, qemuPrepareHostDevices() fails \___cleanup: \__qemuProcessStop \____qemuDomainReAttachHostDevices \____qemuDomainReAttachHostdevDevices \____virHostdevReAttachPCIDevices \_____virHostdevNetConfigRestore (it gets MAC/VLAN form /var/run/libvirt/hostdevmgr/ethX_vfX, and set it back to the VF, making the VF unusable) This patch checks whether the VF is already in use before restoring it. Signed-off-by: Zhang Bo <oscar.zhangbo(a)huawei.com> Signed-off-by: Zhuang Yanying <zhuangyanying(a)huawei.com> --- src/util/virhostdev.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c index 9678e2b..ee19400 100644 --- a/src/util/virhostdev.c +++ b/src/util/virhostdev.c @@ -816,9 +816,21 @@ virHostdevReAttachPCIDevices(virHostdevManagerPtr hostdev_mgr, * For SRIOV net host devices, unset mac and port profile before * reset and reattach device */ - for (i = 0; i < nhostdevs; i++) + for (i = 0; i < nhostdevs; i++){ + virPCIDevicePtr devNotInuse = NULL; + virDevicePCIAddressPtr addr = NULL; + virDomainHostdevDefPtr hostdev = hostdevs[i]; + addr = &hostdev->source.subsys.u.pci.addr; + devNotInuse = virPCIDeviceListFindByIDs(pcidevs, + addr->domain, addr->bus, + addr->slot, addr->function); + if (!devNotInuse) { + continue; + } + virHostdevNetConfigRestore(hostdevs[i], hostdev_mgr->stateDir, oldStateDir); + } for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) { virPCIDevicePtr dev = virPCIDeviceListGet(pcidevs, i); -- 1.7.12.4

3 2

[libvirt] [PATCH 0/7] Automaticaly fill <memory> element for NUMA enabled guests
by Peter Krempa 25 Feb '15

25 Feb '15

Conclusion of the memory refactoring series. These patches depend on the two previous series and for convenience can be fetched at: git fetch git://pipo.sk/pipo/libvirt.git/ memory-refactors This series changes the behavior of the <memory> element in case the guest has NUMA enabled and fills automatically the sum of sizes of numa nodes instead of relying on the user passing correct data. Peter Krempa (7): qemu: Forbid seting maximum memory size with the API with NUMA enabled qemu: lxc: Clarify error message when setting current memory conf: Hoist validation of memory size into the post parse callback conf: Replace access to def-mem.max_balloon with accessor functions qemu: command: Add helper to align memory sizes conf: numa: Add helper to count total memory size configured in NUMA conf: Automatically use NUMA memory size in case NUMA is enabled src/conf/domain_conf.c | 101 ++++++++++++++++----- src/conf/domain_conf.h | 4 + src/conf/numa_conf.c | 13 +++ src/conf/numa_conf.h | 1 + src/hyperv/hyperv_driver.c | 2 +- src/libvirt_private.syms | 4 + src/libxl/libxl_conf.c | 2 +- src/libxl/libxl_driver.c | 8 +- src/lxc/lxc_cgroup.c | 2 +- src/lxc/lxc_driver.c | 27 +++--- 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 | 44 +++++---- 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-numatune-memnode.args | 2 +- 33 files changed, 248 insertions(+), 124 deletions(-) -- 2.2.2

2 18

[libvirt] [PATCH 00/11] Add support for memory hot(un)plug
by Peter Krempa 25 Feb '15

25 Feb '15

A final version of the memory hotplug series. This version incorporates feedback on the RFC and fixes the few missing bits. This series depends on the three previous refactor series: http://www.redhat.com/archives/libvir-list/2015-February/msg00532.html [libvirt] [PATCH 00/24] Move all NUMA related configuration into one structure http://www.redhat.com/archives/libvir-list/2015-February/msg00557.html [libvirt] [PATCH 0/3] Fix memory ABI stability check issues http://www.redhat.com/archives/libvir-list/2015-February/msg00633.html [libvirt] [PATCH 0/7] Automaticaly fill <memory> element for NUMA enabled guests For convenience, you can fetch the complete series in my public branch: git fetch git://pipo.sk/pipo/libvirt.git memory-hotplug-v1 Peter Krempa (11): qemu: caps: Add capability bit for the "pc-dimm" device conf: Add support for parsing and formatting max memory and slot count qemu: Implement setup of memory hotplug parameters conf: Add device address type for dimm devices conf: Add interface to parse and format memory device information qemu: memdev: Add infrastructure to load memory device information qemu: migration: Forbid migration with memory modules lacking info qemu: add support for memory devices qemu: conf: Add support for memory device cold(un)plug qemu: Implement memory device hotplug qemu: Implement memory device hotunplug docs/formatdomain.html.in | 98 ++++ docs/schemas/domaincommon.rng | 76 +++ src/bhyve/bhyve_domain.c | 9 +- src/conf/domain_conf.c | 566 ++++++++++++++++++++- src/conf/domain_conf.h | 59 +++ src/libvirt_private.syms | 7 + src/libxl/libxl_domain.c | 8 + src/lxc/lxc_domain.c | 8 + src/openvz/openvz_driver.c | 14 +- src/parallels/parallels_driver.c | 6 +- src/phyp/phyp_driver.c | 6 +- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 166 +++++- src/qemu/qemu_command.h | 15 + src/qemu/qemu_domain.c | 80 +++ src/qemu/qemu_domain.h | 5 + src/qemu/qemu_driver.c | 29 ++ src/qemu/qemu_hotplug.c | 177 +++++++ src/qemu/qemu_hotplug.h | 6 + src/qemu/qemu_migration.c | 14 + src/qemu/qemu_monitor.c | 42 ++ src/qemu/qemu_monitor.h | 14 + src/qemu/qemu_monitor_json.c | 122 +++++ src/qemu/qemu_monitor_json.h | 5 + src/qemu/qemu_process.c | 4 + src/uml/uml_driver.c | 9 +- src/vbox/vbox_common.c | 6 +- src/vmware/vmware_driver.c | 6 +- src/vmx/vmx.c | 6 +- src/xen/xen_driver.c | 7 + src/xenapi/xenapi_driver.c | 9 +- tests/domainschemadata/maxMemory.xml | 19 + tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 1 + .../qemuxml2argv-memory-hotplug-dimm.args | 11 + .../qemuxml2argv-memory-hotplug-dimm.xml | 50 ++ .../qemuxml2argv-memory-hotplug-nonuma.xml | 22 + .../qemuxml2argv-memory-hotplug.args | 6 + .../qemuxml2argv-memory-hotplug.xml | 34 ++ tests/qemuxml2argvtest.c | 6 + tests/qemuxml2xmltest.c | 4 + 41 files changed, 1712 insertions(+), 23 deletions(-) create mode 100644 tests/domainschemadata/maxMemory.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nonuma.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.xml -- 2.2.2

3 23

[libvirt] [PATCH] qemu: fix memory leak while starting a guest
by Pavel Hrdina 24 Feb '15

24 Feb '15

In commit cc41c648 I've re-factored qemuMonitorFindBalloonObjectPath, but missed that there is a memory leak. The "nextpath" variable is overridden while looping in for cycle and we have to free it before next cycle. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/qemu/qemu_monitor.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 6882a50..94495cd 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1067,6 +1067,7 @@ qemuMonitorFindObjectPath(qemuMonitorPtr mon, } ret = qemuMonitorFindObjectPath(mon, nextpath, name, path); + VIR_FREE(nextpath); } } -- 2.0.5

2 2

[libvirt] [python][RFC] more python bulk stats API
by Francesco Romani 24 Feb '15

24 Feb '15

Hi, I was wondering if there is room in libvirt-python for a couple of new APIs which could make life easier for python developers. It is not just a theoretical thing, when developing VDSM, part of oVirt, I found myself repeating these patterns long enough. 1. return dict from getAllDomainStats and domainListGetStats both bulk stats API returns on success a list of tuples, each tuple being (DomainReference, DictOfStats) , and I often find myself in need to translate them into a dict like {VMUUID:DictOfStats} , using some code like def _translate(bulk_stats): return dict((dom.UUIDString(), stats) for dom, stats in bulk_stats) So I'd like to suggest new APIs: virConnection.getAllDomainStatsMap() virConnection.domainListGetStatsMap() which directly return the dict()s above; arguments should be like getAllDomainStats and domainListGetStats, respectively. 2. get all the bulk stats from a single VM it is trival and efficient to do this in C, but to do that in python means to use throwaway temporary lists, one for the domain and one for the result No big deal, but again, why to waste? I'd like to have virDomain.getBulkStats(stats) # stats is like in getAllDomainStats that should return just the DictOfStats on success. For performance reasons, all of the above should be done in C. Just in case, I have proof of concept code for all the above. I can post a tentative patch if maintainers like these ideas. Thanks, Thoughts welcome -- Francesco Romani RedHat Engineering Virtualization R & D Phone: 8261328 IRC: fromani

1 0

[libvirt] [PATCH] network_conf: Forbid commas in DNS TXT
by Michal Privoznik 24 Feb '15

24 Feb '15

https://bugzilla.redhat.com/show_bug.cgi?id=1151942 While the restriction doesn't have origin in any RFC, it matters to us while constructing the dnsmasq config file (or command line previously). For better picture, this is how the corresponding part of network XML look like: <dns> <forwarder addr='8.8.4.4'/> <txt name='example' value='example value'/> </dns> And this is how the config file looks like then: server=8.8.4.4 txt-record=example,example value Now we can see why there can't be any commas in the TXT name. They are used by dnsmasq to separate @name and @value. Funny, we have it in the documentation, but the code (which was pushed back in 2011) didn't reflect that. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/network_conf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index dce3360..3d8bf05 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1057,15 +1057,17 @@ virNetworkDNSTxtDefParseXML(const char *networkName, virNetworkDNSTxtDefPtr def, bool partialOkay) { + const char *bad = " ,"; + if (!(def->name = virXMLPropString(node, "name"))) { virReportError(VIR_ERR_XML_DETAIL, _("missing required name attribute in DNS TXT record " "of network %s"), networkName); goto error; } - if (strchr(def->name, ' ') != NULL) { + if (strcspn(def->name, bad) != strlen(def->name)) { virReportError(VIR_ERR_XML_DETAIL, - _("prohibited space character in DNS TXT record " + _("prohibited character in DNS TXT record " "name '%s' of network %s"), def->name, networkName); goto error; } -- 2.0.5

2 1

[libvirt] [PATCH] qemu: bulk stats: implement (cpu) tune group.
by Francesco Romani 24 Feb '15

24 Feb '15

Management applications, like oVirt, may need to setup cpu quota limits to enforce QoS for VMs. For this purpose, management applications also need to check how VMs are behaving with respect to CPU quota. This data is avaialble using the virDomainGetSchedulerParameters API. This patch adds a new group to bulk stats API to obtain the same information. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1191428 --- include/libvirt/libvirt-domain.h | 1 + src/libvirt-domain.c | 16 ++++++++ src/qemu/qemu_driver.c | 84 ++++++++++++++++++++++++++++++++++++++++ tools/virsh-domain-monitor.c | 7 ++++ 4 files changed, 108 insertions(+) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 4dbd7f5..3d8c6af 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -1700,6 +1700,7 @@ typedef enum { VIR_DOMAIN_STATS_VCPU = (1 << 3), /* return domain virtual CPU info */ VIR_DOMAIN_STATS_INTERFACE = (1 << 4), /* return domain interfaces info */ VIR_DOMAIN_STATS_BLOCK = (1 << 5), /* return domain block info */ + VIR_DOMAIN_STATS_TUNE_CPU = (1 << 6), /* return domain CPU tuning info */ } virDomainStatsTypes; typedef enum { diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 492e90a..a4effa3 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -10990,6 +10990,22 @@ virConnectGetDomainCapabilities(virConnectPtr conn, * "block.<num>.physical" - physical size in bytes of the container of the * backing image as unsigned long long. * + * VIR_DOMAIN_STATS_TUNE_CPU: Return CPU tuning statistics + * and usage information. + * The typed parameter keys are in this format: + * "tune.vcpu.quota" - max allowed bandwith, in microseconds, as + * long long integer. -1 means 'infinite'. + * "tune.vcpu.period" - timeframe on which the virtual cpu quota is + * enforced, in microseconds, as unsigned long long. + * "tune.emu.quota" - max allowd bandwith for emulator threads, + * in microseconds, as long long integer. + * -1 means 'infinite'. + * "tune.emu.period" - timeframe on which the emulator quota is + * enforced, in microseconds, as unsigned long long. + * "tune.cpu.shares" - weight of this VM. This value is meaningful + * only if compared with the other values of + * the running vms. Expressed as unsigned long long. + * * Note that entire stats groups or individual stat fields may be missing from * the output in case they are not supported by the given hypervisor, are not * applicable for the current state of the guest domain, or their retrieval diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 26fc6a2..5548626 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18797,6 +18797,89 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr driver, #undef QEMU_ADD_COUNT_PARAM + +#define QEMU_ADD_PARAM_LL(record, maxparams, name, value) \ +do { \ + if (virTypedParamsAddLLong(&(record)->params, \ + &(record)->nparams, \ + maxparams, \ + name, \ + value) < 0) \ + goto cleanup; \ +} while (0) + +#define QEMU_ADD_PARAM_ULL(record, maxparams, name, value) \ +do { \ + if (virTypedParamsAddULLong(&(record)->params, \ + &(record)->nparams, \ + maxparams, \ + name, \ + value) < 0) \ + goto cleanup; \ +} while (0) + +static int +qemuDomainGetStatsCpuTune(virQEMUDriverPtr driver, + virDomainObjPtr dom, + virDomainStatsRecordPtr record, + int *maxparams, + unsigned int privflags ATTRIBUTE_UNUSED) +{ + int ret = -1; + unsigned long long shares = 0; + qemuDomainObjPrivatePtr priv = dom->privateData; + virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); + + if (!cfg->privileged || + !virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_CPU)) { + ret = 0; + goto cleanup; + } + + if (virCgroupGetCpuShares(priv->cgroup, &shares) < 0) { + ret = 0; + goto cleanup; + } + + QEMU_ADD_PARAM_ULL(record, maxparams, "tune.cpu.shares", shares); + + if (virCgroupSupportsCpuBW(priv->cgroup)) { + unsigned long long period = 0; + long long quota = 0; + unsigned long long emulator_period = 0; + long long emulator_quota = 0; + int err; + + err = qemuGetVcpusBWLive(dom, &period, &quota); + if (!err) { + QEMU_ADD_PARAM_ULL(record, maxparams, + "tune.vcpu.period", period); + QEMU_ADD_PARAM_LL(record, maxparams, + "tune.vcpu.quota", quota); + } + + err = qemuGetEmulatorBandwidthLive(dom, priv->cgroup, + &emulator_period, &emulator_quota); + if (!err) { + QEMU_ADD_PARAM_ULL(record, maxparams, + "tune.emu.period", emulator_period); + QEMU_ADD_PARAM_LL(record, maxparams, + "tune.emu.quota", emulator_quota); + } + } + + ret = 0; + + cleanup: + virObjectUnref(cfg); + return ret; +} + +#undef QEMU_ADD_PARAM_LL + +#undef QEMU_ADD_PARAM_ULL + + typedef int (*qemuDomainGetStatsFunc)(virQEMUDriverPtr driver, virDomainObjPtr dom, @@ -18817,6 +18900,7 @@ static struct qemuDomainGetStatsWorker qemuDomainGetStatsWorkers[] = { { qemuDomainGetStatsVcpu, VIR_DOMAIN_STATS_VCPU, false }, { qemuDomainGetStatsInterface, VIR_DOMAIN_STATS_INTERFACE, false }, { qemuDomainGetStatsBlock, VIR_DOMAIN_STATS_BLOCK, true }, + { qemuDomainGetStatsCpuTune, VIR_DOMAIN_STATS_TUNE_CPU, false }, { NULL, 0, false } }; diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 925eb1b..e425e43 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -1997,6 +1997,10 @@ static const vshCmdOptDef opts_domstats[] = { .type = VSH_OT_BOOL, .help = N_("report domain block device statistics"), }, + {.name = "tune-cpu", + .type = VSH_OT_BOOL, + .help = N_("report domain cpu scheduler parameters"), + }, {.name = "list-active", .type = VSH_OT_BOOL, .help = N_("list only active domains"), @@ -2107,6 +2111,9 @@ cmdDomstats(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "block")) stats |= VIR_DOMAIN_STATS_BLOCK; + if (vshCommandOptBool(cmd, "tune-cpu")) + stats |= VIR_DOMAIN_STATS_TUNE_CPU; + if (vshCommandOptBool(cmd, "list-active")) flags |= VIR_CONNECT_GET_ALL_DOMAINS_STATS_ACTIVE; -- 2.1.0

2 2

[libvirt] [PATCH] qemu: fix ifindex array reported to systemd
by Laine Stump 24 Feb '15

24 Feb '15

Commit f7afeddc added code to report to systemd an array of interface indexes for all tap devices used by a guest. Unfortunately it not only didn't add code to report the ifindexes for macvtap interfaces (interface type='direct') or the tap devices used by type='ethernet', it ended up sending "-1" as the ifindex for each macvtap or hostdev interface. This resulted in a failure to start any domain that had a macvtap or hostdev interface (or actually any type other than "network" or "bridge"). This patch modifies qemuBuildInterfaceCommandLine() to only add an entry to the array of ifindexes for appropriate types, and to do so for all appropriate types ("network", "bridge", and "direct"). --- src/qemu/qemu_command.c | 59 ++++++++++++++++++++++++++++++++++++++----------- src/qemu/qemu_command.h | 5 ++--- src/qemu/qemu_hotplug.c | 6 ++--- 3 files changed, 50 insertions(+), 20 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 7853125..81f6982 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -289,8 +289,7 @@ qemuNetworkIfaceConnect(virDomainDefPtr def, virDomainNetDefPtr net, virQEMUCapsPtr qemuCaps, int *tapfd, - size_t *tapfdSize, - int *nicindex) + size_t *tapfdSize) { const char *brname; int ret = -1; @@ -337,8 +336,6 @@ qemuNetworkIfaceConnect(virDomainDefPtr def, virDomainAuditNetDevice(def, net, tunpath, false); goto cleanup; } - if (virNetDevGetIndex(net->ifname, nicindex) < 0) - goto cleanup; if (virDomainNetGetActualBridgeMACTableManager(net) == VIR_NETWORK_BRIDGE_MAC_TABLE_MANAGER_LIBVIRT) { /* libvirt is managing the FDB of the bridge this device @@ -7756,7 +7753,8 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, int bootindex, virNetDevVPortProfileOp vmop, bool standalone, - int *nicindex) + size_t *nnicindexes, + int **nicindexes) { int ret = -1; char *nic = NULL, *host = NULL; @@ -7770,8 +7768,6 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, virNetDevBandwidthPtr actualBandwidth; size_t i; - *nicindex = -1; - if (actualType == VIR_DOMAIN_NET_TYPE_VHOSTUSER) return qemuBuildVhostuserCommandLine(cmd, def, net, qemuCaps); @@ -7818,7 +7814,7 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, if (qemuNetworkIfaceConnect(def, driver, net, qemuCaps, tapfd, - &tapfdSize, nicindex) < 0) + &tapfdSize) < 0) goto cleanup; } else if (actualType == VIR_DOMAIN_NET_TYPE_DIRECT) { if (VIR_ALLOC(tapfd) < 0 || VIR_ALLOC(tapfdName) < 0) @@ -7830,6 +7826,47 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, goto cleanup; } + /* For types whose implementions use a netdev on the host, add an + * entry to nicifindexes for passing on to systemd. + */ + switch ((virDomainNetType)actualType) { + case VIR_DOMAIN_NET_TYPE_ETHERNET: + case VIR_DOMAIN_NET_TYPE_NETWORK: + case VIR_DOMAIN_NET_TYPE_BRIDGE: + case VIR_DOMAIN_NET_TYPE_DIRECT: + { + int nicindex; + + /* network and bridge use a tap device, and direct uses a + * macvtap device + */ + if (virNetDevGetIndex(net->ifname, &nicindex) < 0 || + VIR_APPEND_ELEMENT(*nicindexes, *nnicindexes, nicindex) < 0) + goto cleanup; + break; + } + + case VIR_DOMAIN_NET_TYPE_USER: + case VIR_DOMAIN_NET_TYPE_VHOSTUSER: + case VIR_DOMAIN_NET_TYPE_SERVER: + case VIR_DOMAIN_NET_TYPE_CLIENT: + case VIR_DOMAIN_NET_TYPE_MCAST: + case VIR_DOMAIN_NET_TYPE_INTERNAL: + case VIR_DOMAIN_NET_TYPE_HOSTDEV: + case VIR_DOMAIN_NET_TYPE_LAST: + /* These types don't use a network device on the host, but + * instead use some other type of connection to the emulated + * device in the qemu process. + * + * (Note that hostdev can't be considered as "using a network + * device", because by the time it is being used, it has been + * detached from the hostside network driver so it doesn't show + * up in the list of interfaces on the host - it's just some + * PCI device.) + */ + break; + } + /* Set bandwidth or warn if requested and not supported. */ actualBandwidth = virDomainNetGetActualBandwidth(net); if (actualBandwidth) { @@ -9279,13 +9316,9 @@ qemuBuildCommandLine(virConnectPtr conn, else vlan = i; - if (VIR_EXPAND_N(*nicindexes, *nnicindexes, 1) < 0) - goto error; - if (qemuBuildInterfaceCommandLine(cmd, driver, def, net, qemuCaps, vlan, bootNet, vmop, - standalone, - &((*nicindexes)[*nnicindexes - 1])) < 0) + standalone, nnicindexes, nicindexes) < 0) goto error; last_good_net = i; diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 89e8351..ee81f92 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -1,7 +1,7 @@ /* * qemu_command.h: QEMU command generation * - * Copyright (C) 2006-2014 Red Hat, Inc. + * Copyright (C) 2006-2015 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -208,8 +208,7 @@ int qemuNetworkIfaceConnect(virDomainDefPtr def, virDomainNetDefPtr net, virQEMUCapsPtr qemuCaps, int *tapfd, - size_t *tapfdSize, - int *nicindex) + size_t *tapfdSize) ATTRIBUTE_NONNULL(2); int qemuPhysIfaceConnect(virDomainDefPtr def, diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 8691c7e..7db044d 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1,7 +1,7 @@ /* * qemu_hotplug.c: QEMU device hotplug management * - * Copyright (C) 2006-2014 Red Hat, Inc. + * Copyright (C) 2006-2015 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -846,7 +846,6 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, qemuDomainObjPrivatePtr priv = vm->privateData; char **tapfdName = NULL; int *tapfd = NULL; - int nicindex = -1; size_t tapfdSize = 0; char **vhostfdName = NULL; int *vhostfd = NULL; @@ -916,8 +915,7 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, goto cleanup; memset(vhostfd, -1, sizeof(*vhostfd) * vhostfdSize); if (qemuNetworkIfaceConnect(vm->def, driver, net, - priv->qemuCaps, tapfd, &tapfdSize, - &nicindex) < 0) + priv->qemuCaps, tapfd, &tapfdSize) < 0) goto cleanup; iface_connected = true; if (qemuOpenVhostNet(vm->def, net, priv->qemuCaps, vhostfd, &vhostfdSize) < 0) -- 2.1.0

3 3

[libvirt] [PATCH 0/5] Boot options cleanup
by Ján Tomko 24 Feb '15

24 Feb '15

Remove the -bootloader option from the QEMU driver, for https://bugzilla.redhat.com/show_bug.cgi?id=1176050 as it was only supported by xenner. Remove the -domid option, also xenner-only. Cleanup -boot command line generation. Ján Tomko (5): Remove bootloader option from QEMU Remove code handling the QEMU_CAPS_DOMID capability Make -boot arg generation more readable Rename boot_buf to boot_opts Use virBufferTrim when generating boot options src/qemu/qemu_command.c | 240 ++++++++++----------- src/qemu/qemu_domain.c | 6 + .../qemuxml2argvdata/qemuxml2argv-bootloader.args | 5 - tests/qemuxml2argvdata/qemuxml2argv-bootloader.xml | 27 --- tests/qemuxml2argvdata/qemuxml2argv-input-xen.args | 5 - tests/qemuxml2argvdata/qemuxml2argv-input-xen.xml | 34 --- tests/qemuxml2argvtest.c | 7 +- tests/qemuxml2xmltest.c | 2 - tests/qemuxmlnstest.c | 5 +- 9 files changed, 122 insertions(+), 209 deletions(-) delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-bootloader.args delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-bootloader.xml delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-input-xen.args delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-input-xen.xml -- 2.0.5

2 10

[libvirt] SR-IOV with libvirt
by Florin Stingaciu 24 Feb '15

24 Feb '15

Hello, For the last little while I've been trying to configure a VM with a passthrough interface using SR-IOV. I've managed to configure SR-IOV on the hypervisor correctly. I'm working with a Mellanox ConnectX3 card with two infiniband ports and hypervisors running Centos 7. I can see the PCI devices (ie. virtual functions) using the `virsh nodedev-list` command. The majority of tutorials online (including the tutorials on the libvirt site), suggest one configures an SR-IOV passthrough interface in the following manner in the VM definition file: <interface type='hostdev' managed='yes'> <mac address='52:54:00:d7:cd:aa'/> <source> <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x2'/> </source> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> For example the above configuration should configure the second VF as a passthrough interface for this VM. When I try to launch the VM, I get the following error: error: Failed to start domain test error: internal error: missing IFLA_VF_INFO in netlink response I've done research on this error quite extensively. This used to be a very popular error a while back for scenarios where the total number of VFs is > 64. This is not the case here as I only have 8. I've was never able to overcome this error but I did manage to get this working another way. The VM will boot just fine and detect a new interface if you define one of the VFs as a PCI in the following manner within the VM definition file: <hostdev mode='subsystem' type='pci' managed='yes'> <source> <address domain='0x0000' bus='0x01' slot='0x00' function='0x2'/> </source> <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> </hostdev> As you can see the from the source bus and function, it's the same VF I was trying with the definition above. I'm wondering if there is any particular reason for this or how could I get around this error. Normally, I would just use the second configuration, however I'm about to begin work within an openstack environment where the sriovnicswitch ml2 plugin will be used for networking. This plugin, when configuring passthrough interfaces uses the first definition that does not work and spits out that error. Considering even the official libvirt tutorials suggest the first way, I feel like I must be missing something, or something broke and noone noticed in one of the latest updates. Any help would be greatly appreciated. Thanks, -F

2 1

[libvirt] [PATCHv2] Clarify behavior or virDomainDetachDevice
by Ján Tomko 24 Feb '15

24 Feb '15

Document that a complete device definition should be used and a partial match can lead to the device being detached. https://bugzilla.redhat.com/show_bug.cgi?id=872028 --- src/libvirt-domain.c | 14 ++++++++++++++ tools/virsh.pod | 9 ++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 492e90a..fb85a28 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -8266,6 +8266,13 @@ virDomainAttachDeviceFlags(virDomainPtr domain, * into S4 state (also known as hibernation) unless you also modify the * persistent domain definition. * + * The supplied XML description of the device should be as specific + * as its definition in the domain XML. The set of attributes used + * to match the device are internal to the drivers. Using a partial definition, + * or attempting to detach a device that is not present in the domain XML, + * but shares some specific attributes with one that is present + * may lead to unexpected results. + * * Returns 0 in case of success, -1 in case of failure. */ int @@ -8341,6 +8348,13 @@ virDomainDetachDevice(virDomainPtr domain, const char *xml) * into S4 state (also known as hibernation) unless you also modify the * persistent domain definition. * + * The supplied XML description of the device should be as specific + * as its definition in the domain XML. The set of attributes used + * to match the device are internal to the drivers. Using a partial definition, + * or attempting to detach a device that is not present in the domain XML, + * but shares some specific attributes with one that is present + * may lead to unexpected results. + * * Returns 0 in case of success, -1 in case of failure. */ int diff --git a/tools/virsh.pod b/tools/virsh.pod index 50de32c..09663f5 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2439,9 +2439,12 @@ as command B<attach-device>. For passthrough host devices, see also B<nodedev-reattach>, needed if the device does not use managed mode. -B<Note>: using of partial device definition XML files may lead to unexpected -results as some fields may be autogenerated and thus match devices other than -expected. +B<Note>: The supplied XML description of the device should be as specific +as its definition in the domain XML. The set of attributes used +to match the device are internal to the drivers. Using a partial definition, +or attempting to detach a device that is not present in the domain XML, +but shares some specific attributes with one that is present +may lead to unexpected results. If I<--live> is specified, affect a running domain. If I<--config> is specified, affect the next startup of a persistent domain. -- 2.0.5

2 1

[libvirt] [PATCH] Clarify behavior or virDomainDetachDevice
by Ján Tomko 24 Feb '15

24 Feb '15

Doucment that not all attributes are used for matching. https://bugzilla.redhat.com/show_bug.cgi?id=872028 --- src/libvirt-domain.c | 5 +++++ tools/virsh.pod | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 492e90a..a95c096 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -8341,6 +8341,11 @@ virDomainDetachDevice(virDomainPtr domain, const char *xml) * into S4 state (also known as hibernation) unless you also modify the * persistent domain definition. * + * Note that not all attributes from the XML definition are checked. + * For example, if the mac address and the pci address specified in the XML + * match an existing interface, but source and interface type do not, + * the existing interface will be detached. + * * Returns 0 in case of success, -1 in case of failure. */ int diff --git a/tools/virsh.pod b/tools/virsh.pod index 50de32c..2c584d3 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2441,7 +2441,9 @@ the device does not use managed mode. B<Note>: using of partial device definition XML files may lead to unexpected results as some fields may be autogenerated and thus match devices other than -expected. +expected. Not every device attribute is checked when matching the device. +For example a network interface can be detatched if the mac and PCI addresses +match, even if the type does not. If I<--live> is specified, affect a running domain. If I<--config> is specified, affect the next startup of a persistent domain. -- 2.0.5

4 5

[libvirt] [PATCH] qemu: Allow spaces in disk serial
by Michal Privoznik 24 Feb '15

24 Feb '15

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> --- docs/schemas/domaincommon.rng | 2 +- src/qemu/qemu_command.c | 5 ++-- .../qemuxml2argvdata/qemuxml2argv-disk-serial.args | 6 +++++ .../qemuxml2argvdata/qemuxml2argv-disk-serial.xml | 27 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 5 ++++ 5 files changed, 42 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 7853125..b9adef6 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="); + virBufferEscapeShell(&opt, 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..8b08cfb --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args @@ -0,0 +1,6 @@ +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] [PATCH 0/3] s390: rework and prevent default usb controller
by Stefan Zimmermann 24 Feb '15

24 Feb '15

Stefan Zimmermann (3): Prevent default creation of usb controller on s390 and s390x Adjust s390 test cases by removing usb device instances Rework s390 architecture checking src/qemu/qemu_command.c | 4 +++- src/qemu/qemu_domain.c | 13 +++++++++---- tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args | 2 +- .../qemuxml2argv-s390-piix-controllers.args | 2 +- .../qemuxml2xmlout-s390-defaultconsole.xml | 1 - 5 files changed, 14 insertions(+), 8 deletions(-) -- 2.1.4

2 4

[libvirt] [PATCH] Assign default SCSI controller model before checking attribute validity
by Ján Tomko 24 Feb '15

24 Feb '15

If the qemu binary on x86 does not support lsi SCSI controller, but it supports virtio-scsi, we reject the virtio-specific attributes for no reason. Move the default controller assignment before the check. https://bugzilla.redhat.com/show_bug.cgi?id=1168849 --- src/qemu/qemu_command.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 743d6f0..882a97c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4353,10 +4353,15 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef, int *nusbcontroller) { virBuffer buf = VIR_BUFFER_INITIALIZER; - int model; + int model = def->model; + + if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI) { + if ((qemuSetSCSIControllerModel(domainDef, qemuCaps, &model)) < 0) + return NULL; + } if (!(def->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI && - def->model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI)) { + model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI)) { if (def->queues) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("'queues' is only supported by virtio-scsi controller")); @@ -4376,10 +4381,6 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef, switch (def->type) { case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: - model = def->model; - if ((qemuSetSCSIControllerModel(domainDef, qemuCaps, &model)) < 0) - return NULL; - switch (model) { case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI: if (def->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) -- 2.0.5

2 1

[libvirt] [PATCH] man: moved virsh command cpu-models
by Daniel Hansel 24 Feb '15

24 Feb '15

The description of the virsh command 'cpu-models' was written in the wrong context (i.e. beside the domain states). This patch moves the command description just to the cpu related commands like 'cpu-baseline' and 'cpu-compare'. Signed-off-by: Daniel Hansel <daniel.hansel(a)linux.vnet.ibm.com> --- tools/virsh.pod | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 50de32c..b86c415 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -422,10 +422,6 @@ current domain is in. =over 4 -=item B<cpu-models> I<arch> - -Print the list of CPU models known for the specified architecture. - =item B<running> The domain is currently running on a CPU @@ -573,6 +569,10 @@ I<cellno> modifier can be used to narrow the modification down to a single host NUMA cell. On the other end of spectrum lies I<--all> which executes the modification on all NUMA cells. +=item B<cpu-models> I<arch> + +Print the list of CPU models known for the specified architecture. + =item B<cpu-baseline> I<FILE> [I<--features>] Compute baseline CPU which will be supported by all host CPUs given in <file>. -- 1.9.3

2 1

[libvirt] [PATCH] SRIOV NIC offload feature discovery
by James Chapman 23 Feb '15

23 Feb '15

Adding functionality to libvirt that will allow it query the ethtool interface for the availability of certain NIC HW offload features --- src/conf/device_conf.h | 6 ++ src/conf/node_device_conf.c | 7 ++ src/conf/node_device_conf.h | 2 + src/libvirt_private.syms | 1 + src/node_device/node_device_udev.c | 4 ++ src/util/virnetdev.c | 134 +++++++++++++++++++++++++++++++++++++ src/util/virnetdev.h | 12 +++- 7 files changed, 165 insertions(+), 1 deletion(-) 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..7f4dbfe 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); @@ -1679,6 +1685,7 @@ void virNodeDevCapsDefFree(virNodeDevCapsDefPtr caps) case VIR_NODE_DEV_CAP_NET: VIR_FREE(data->net.ifname); VIR_FREE(data->net.address); + 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 c07a561..1d165a9 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1659,6 +1659,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..e513c85 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -2728,3 +2728,137 @@ 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. + */ +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) { + /* Privileged command, no error */ + if (errno == EPERM || errno == EINVAL) { + virReportSystemError(errno, "%s", _("ioctl")); + /* Some kernels dont support named feature, no error */ + } else if (errno == EOPNOTSUPP) { + virReportSystemError(errno, "%s", _("Warning")); + } else { + virReportSystemError(errno, "%s", _("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; + + 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 < (sizeof(cmds)/sizeof(struct elem)); i++) { + cmd.cmd = cmds[i].cmd; + if (_virNetDevFeatureAvailable(ifname, &cmd)) { + if (VIR_EXPAND_N(*features, *nfeatures, 1) < 0) + goto cleanup; + if ((ret = VIR_STRDUP((*features)[i].name, cmds[i].name)) != 1) + goto cleanup; + } + } + + cmd.cmd = ETHTOOL_GFLAGS; + for (j = 0; j < (sizeof(flags)/sizeof(struct elem)); j++) { + if (_virNetDevFeatureAvailable(ifname, &cmd)) { + if (cmd.data & (flags[j].cmd)) { + if (VIR_EXPAND_N(*features, *nfeatures, 1) < 0) + goto cleanup; + if ((ret = VIR_STRDUP((*features)[i++].name, flags[j].name)) != 1) + 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..3847c68 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,9 +184,17 @@ 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); + +int _virNetDevFeatureAvailable(const char *ifname, struct ethtool_value *cmd) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + int virNetDevGetLinkInfo(const char *ifname, virInterfaceLinkPtr lnk) - ATTRIBUTE_NONNULL(1); + ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; virNetDevRxFilterPtr virNetDevRxFilterNew(void) ATTRIBUTE_RETURN_CHECK; -- 2.1.0

4 4

[libvirt] Exact meaning of "nativeMode" attribute in vlan tags
by Laine Stump 23 Feb '15

23 Feb '15

You'd think that I would know this, since I'm the person who reviewed jrobson's patch adding support for the nativeMode attribute to the vlan tag element. But you'd be wrong. Here is what the config looks like: <vlan trunk='yes'> <tag id='42' nativeMode='untagged'/> <tag id='47'/> </vlan> I understand that trunk='yes' means that packets with any of the tags listed in a <tag> subelement can be sent out this port (and the tag will *not* be removed), and likewise packets arriving into the bridge from the port are allowed to have any of the listed tags (and, again, no tag will be removed). But what exactly do nativeMode='untagged' and nativeMode='tagged' mean? As I understand it, (nativeMode='untagged'|nativeMode='tagged') means that packets (arriving from|sent to) the port (without a tag/with that tag) will be (tagged|untagged). Can someone who fully understands this please select A or B for each of the 4 parenthesized items (in as many permutations as make sense). I guess that in one of the modes, untagged packets going in one direction or the other will be tagged, and vice versa, I just don't know which direction does which, and for which mode, and don't want to guess. (I'm asking this because I want to implement identical functionality for standard Linux host bridges - I want to make sure there are no surprises for people switching between OVS and Linux host bridge implementations).

3 2