- Devel - libvirt List Archives

[libvirt] Plan for the next release
by Daniel Veillard 27 Aug '14

27 Aug '14

We already have a number of commits in, over 150, I can't freeze next monday but I could do this next Tuesday (the 26) for a planned release around Sep 1st, So unless there is a good reason to change this, that's the plan :) 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/

4 4

[libvirt] [libvirt-python PATCH] Implement virDomainOpenGraphicsFD
by Ján Tomko 27 Aug '14

27 Aug '14

--- generator.py | 1 + libvirt-override-api.xml | 7 +++++++ libvirt-override.c | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/generator.py b/generator.py index a12c52b..32ae34d 100755 --- a/generator.py +++ b/generator.py @@ -464,6 +464,7 @@ skip_impl = ( 'virConnectGetCPUModelNames', 'virNodeGetFreePages', 'virNetworkGetDHCPLeases', + 'virDomainOpenGraphicsFD', ) lxc_skip_impl = ( diff --git a/libvirt-override-api.xml b/libvirt-override-api.xml index 09bbbf8..c7b6152 100644 --- a/libvirt-override-api.xml +++ b/libvirt-override-api.xml @@ -640,5 +640,12 @@ <arg name='flags' type='unsigned int' info='unused, pass 0'/> <return type='char *' info="list of leases"/> </function> + <function name="virDomainOpenGraphicsFD" file='python'> + <info>Returns a file descriptor connected to the graphics framebuffer </info> + <arg name='domain' type='virDomainPtr' info='a domain object'/> + <arg name='idx' type='int' info='index of the graphics framebuffer'/> + <arg name='flags' type='unsigned int' info='bitwise OR of virDomainOpenGraphicsFlags'/> + <return type='char *' info="list of fds"/> + </function> </symbols> </api> diff --git a/libvirt-override.c b/libvirt-override.c index b2271ae..42a4b05 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -7955,6 +7955,40 @@ libvirt_virNetworkGetDHCPLeases(PyObject *self ATTRIBUTE_UNUSED, #endif /* LIBVIR_CHECK_VERSION(1, 2, 6) */ + +#if LIBVIR_CHECK_VERSION(1, 2, 8) + +static PyObject * +libvirt_virDomainOpenGraphicsFD(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) +{ + PyObject *py_retval; + int c_retval; + virDomainPtr domain; + PyObject *pyobj_domain; + int idx; + int fd; + unsigned int flags; + + if (!PyArg_ParseTuple(args, (char *)"Oii:virDomainOpenGraphicsFD", + &pyobj_domain, &idx, &flags)) + return NULL; + + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virDomainOpenGraphicsFD(domain, idx, &fd, flags); + LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) + return VIR_PY_NONE; + + py_retval = PyList_New(1); + PyList_SetItem(py_retval, 0, libvirt_intWrap(fd)); + return py_retval; +} + +#endif /* LIBVIR_CHECK_VERSION(1, 2, 8) */ + + /************************************************************************ * * * The registration stuff * @@ -8140,6 +8174,9 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virNodeGetFreePages", libvirt_virNodeGetFreePages, METH_VARARGS, NULL}, {(char *) "virNetworkGetDHCPLeases", libvirt_virNetworkGetDHCPLeases, METH_VARARGS, NULL}, #endif /* LIBVIR_CHECK_VERSION(1, 2, 6) */ +#if LIBVIR_CHECK_VERSION(1, 2, 8) + {(char *) "virDomainOpenGraphicsFD", libvirt_virDomainOpenGraphicsFD, METH_VARARGS, NULL}, +#endif /* LIBVIR_CHECK_VERSION(1, 2, 8) */ {NULL, NULL, 0, NULL} }; -- 1.8.5.5

3 2

[libvirt] [PATCHv2 0/5] Bulk domain stats query API
by Peter Krempa 27 Aug '14

27 Aug '14

This version adds implementation in the qemu driver and virsh and fixes the following bugs from v1: *bad type of typed param count *off-by-one when counting and verifying domain objects in libvirt.c *off-by-one when allocating returned array in remote driver *the all domain stats func not working as the return value wasn't handled properly Peter Krempa (5): lib: Introduce API for retrieving bulk domain stats remote: Implement bulk domain stats APIs in the remote driver qemu: Implement bulk stats API and one of the stats groups to return virsh: domain: Split out code to lookup domain from string virsh: Implement command to excercise the bulk stats APIs daemon/remote.c | 91 ++++++++++++++++++++++ include/libvirt/libvirt.h.in | 26 +++++++ src/driver.h | 9 +++ src/libvirt.c | 180 +++++++++++++++++++++++++++++++++++++++++++ src/libvirt_public.syms | 7 ++ src/qemu/qemu_driver.c | 175 +++++++++++++++++++++++++++++++++++++++++ src/remote/remote_driver.c | 88 +++++++++++++++++++++ src/remote/remote_protocol.x | 26 ++++++- src/remote_protocol-structs | 23 ++++++ tools/virsh-domain-monitor.c | 140 +++++++++++++++++++++++++++++++++ tools/virsh-domain.c | 80 ++++++++++++------- tools/virsh-domain.h | 4 + 12 files changed, 819 insertions(+), 30 deletions(-) -- 2.0.2

2 19

[libvirt] [Libvirt] segfault with patch "libxl: fix framebuffer port setting for HVM domains"
by Chris 27 Aug '14

27 Aug '14

Hello, I encountered segfaults with libvirt + libxl with this specific patch : http://libvirt.org/git/?p=libvirt.git;a=commitdiff;h=b55cc5f4e31b488c4f9c3c… My Libvirt/Xen environment (on a slackware64-14.1) : virsh # version Compiled against library: libvirt 1.2.6 Using library: libvirt 1.2.6 Using API: Xen 1.2.6 Running hypervisor: Xen 4.4.0 My Libvirt "configure line" : ./configure \ --prefix=/usr \ --libdir=/usr/lib64 \ --bindir=/usr/sbin \ --sbindir=/usr/sbin \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/libvirt-1.2.6 \ --enable-static=no \ --enable-shared=yes \ --with-yajl \ --with-qemu-group=root \ --with-init-script=none \ --without-xen \ --without-xenapi \ --with-libxl The XML of my VM : <domain type='xen'> <name>vm.infra.ld</name> <uuid>0b648359-099a-4d64-ba7a-12f32fb4f3dc</uuid> <memory unit='KiB'>1048576</memory> <currentMemory unit='KiB'>1048576</currentMemory> <vcpu placement='static'>2</vcpu> <os> <type arch='x86_64' machine='xenfv'>hvm</type> <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='network'/> <boot dev='hd'/> </os> <features> <acpi/> <apic/> <pae/> <hap/> <viridian/> </features> <clock offset='variable' adjustment='0' basis='utc'> <timer name='hpet' present='no'/> </clock> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <disk type='block' device='disk'> <driver name='phy'/> <source dev='/dev/data/vm.infra.ld-disk'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <controller type='ide' index='0'/> <interface type='bridge'> <mac address='00:16:3e:xx:xx:xx'/> <source bridge='xenbr0'/> <script path='/etc/xen/scripts/vif-openvswitch'/> </interface> <serial type='pty'> <target port='0'/> </serial> <console type='pty'> <target type='serial' port='0'/> </console> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes' listen='0.0.0.0' keymap='fr'> <listen type='address' address='0.0.0.0'/> </graphics> <video> <model type='cirrus' vram='9216' heads='1'/> </video> </devices> </domain> The VM starts fine with "virsh start" (cf attached libxl log), the VNC process is listening as requested on 0.0.0.0 but whenever I open a new virsh cli and send a command (e.g. "list"), libvirtd segfaults. I attached a gdb trace to this mail. If I rebuild libvirt without the patch mentioned earlier, no more segfaults, but of course the VNC process is listening on 127.0.0.1 instead of requested 0.0.0.0 when I start the VM. I may have done something wrong but don't understand what. Regards, Chris

3 4

[libvirt] [PATCHv2] blkdeviotune: check for overflow when parsing XML
by Erik Skultety 26 Aug '14

26 Aug '14

According to docs/schemas/domaincommon.rng and _virDomainBlockIoTuneInfo all the iotune values are interpreted as unsigned long long, however according to qemu_monitor_json.c, qemu silently truncates numbers larger than LLONG_MAX. There's really not much of a usage for such large numbers anyway yet. This patch provides the same overflow check during a domain start as it does during setting a blkdeviotune element in qemu_driver.c and thus reports an error when a larger number than LLONG_MAX is detected. --- src/qemu/qemu_command.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6dac9d3..9213a60 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3620,6 +3620,18 @@ qemuBuildDriveStr(virConnectPtr conn, goto error; } + if (disk->blkdeviotune.total_bytes_sec > LLONG_MAX || + disk->blkdeviotune.read_bytes_sec > LLONG_MAX || + disk->blkdeviotune.write_bytes_sec > LLONG_MAX || + disk->blkdeviotune.total_iops_sec > LLONG_MAX || + disk->blkdeviotune.read_iops_sec > LLONG_MAX || + disk->blkdeviotune.write_iops_sec > LLONG_MAX) { + virReportError(VIR_ERR_OVERFLOW, + _("block I/O throttle limit must " + "be less than %llu using QEMU"), LLONG_MAX); + goto error; + } + if (disk->blkdeviotune.total_bytes_sec) { virBufferAsprintf(&opt, ",bps=%llu", disk->blkdeviotune.total_bytes_sec); -- 1.9.3

2 1

[libvirt] [PATCH] virsh: fix password auth failed on ssh connection
by Seyeong Kim 26 Aug '14

26 Aug '14

When try to connect to another host using virsh with password auth on ssh env, can't put password properly because it's waiting IO from STDIN. This patch check if it's in pts so make that doesn't poll from STDIN. --- tools/virsh-domain.c | 3 +++ tools/virsh.c | 11 +++++++++++ tools/virsh.h | 2 ++ 3 files changed, 16 insertions(+) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 2562326..b079261 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -3698,6 +3698,9 @@ vshWatchJob(vshControl *ctl, /* don't poll on STDIN if we are not using a terminal */ if (!vshTTYAvailable(ctl)) npollfd = 1; + /* don't poll on STDIN if we are using a pseudo terminal slave */ + if (vshPTSAvailable(ctl)) + npollfd = 1; GETTIMEOFDAY(&start); while (1) { diff --git a/tools/virsh.c b/tools/virsh.c index 30a84c1..84f9500 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2429,6 +2429,13 @@ vshTTYAvailable(vshControl *ctl) } +bool +vshPTSAvailable(vshControl *ctl) +{ + return ctl->ispts; +} + + int vshTTYDisableInterrupt(vshControl *ctl ATTRIBUTE_UNUSED) { @@ -3646,6 +3653,10 @@ main(int argc, char **argv) if (isatty(STDIN_FILENO)) { ctl->istty = true; + char* tty_name = ttyname(STDIN_FILENO); + if (strstr(tty_name, "pts")) + ctl->ispts = true; + #ifndef WIN32 if (tcgetattr(STDIN_FILENO, &ctl->termattr) < 0) ctl->istty = false; diff --git a/tools/virsh.h b/tools/virsh.h index b4df24b..700c786 100644 --- a/tools/virsh.h +++ b/tools/virsh.h @@ -256,6 +256,7 @@ struct _vshControl { struct termios termattr; /* settings of the tty terminal */ # endif bool istty; /* is the terminal a tty */ + bool ispts; /* is the terminal a pts */ }; struct _vshCmdGrp { @@ -386,6 +387,7 @@ int vshTTYDisableInterrupt(vshControl *ctl); int vshTTYRestore(vshControl *ctl); int vshTTYMakeRaw(vshControl *ctl, bool report_errors); bool vshTTYAvailable(vshControl *ctl); +bool vshPTSAvailable(vshControl *ctl); /* waiting for events */ enum { -- 1.9.1

2 1

[libvirt] [PATCH 0/2] Bulk stats APIs
by Peter Krempa 26 Aug '14

26 Aug '14

Unfortunately I wasn't able to finish the virsh and qemu driver IMPL but as the release is closer than I'd like I'm sending this out for an early review pass. Thanks in advance for any takers. Peter Krempa (2): lib: Introduce API for retrieving bulk domain stats remote: Implement bulk domain stats APIs in the remote driver daemon/remote.c | 91 ++++++++++++++++++++++ include/libvirt/libvirt.h.in | 26 +++++++ src/driver.h | 9 +++ src/libvirt.c | 179 +++++++++++++++++++++++++++++++++++++++++++ src/libvirt_public.syms | 7 ++ src/remote/remote_driver.c | 88 +++++++++++++++++++++ src/remote/remote_protocol.x | 26 ++++++- src/remote_protocol-structs | 23 ++++++ 8 files changed, 448 insertions(+), 1 deletion(-) -- 2.0.2

2 10

[libvirt] [PATCH] blkdeviotune: check for overflow when parsing XML
by Erik Skultety 26 Aug '14

26 Aug '14

According to docs/schemas/domaincommon.rng and _virDomainBlockIoTuneInfo all the iotune values are interpreted as unsigned long long, however according to qemu_monitor_json.c, qemu silently truncates numbers larger than LLONG_MAX. There's really not much of a usage for such large numbers anyway yet. This patch provides the same overflow check during domain XML parsing phase as it does during setting a blkdeviotune element in qemu_driver.c and thus reports an error when a larger number than LLONG_MAX is detected. --- src/conf/domain_conf.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 22a7f7e..4cc900f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5711,6 +5711,18 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, def->blkdeviotune.write_iops_sec = 0; } + if (def->blkdeviotune.total_bytes_sec > LLONG_MAX || + def->blkdeviotune.read_bytes_sec > LLONG_MAX || + def->blkdeviotune.write_bytes_sec > LLONG_MAX || + def->blkdeviotune.total_iops_sec > LLONG_MAX || + def->blkdeviotune.read_iops_sec > LLONG_MAX || + def->blkdeviotune.write_iops_sec > LLONG_MAX) { + virReportError(VIR_ERR_OVERFLOW, + _("block I/O throttle limit must " + "be less than %llu"), LLONG_MAX); + goto error; + } + if ((def->blkdeviotune.total_bytes_sec && def->blkdeviotune.read_bytes_sec) || (def->blkdeviotune.total_bytes_sec && -- 1.9.3

2 2

[libvirt] [PATCH] virsh: Initialize vshData in cmdMigrate
by Ján Tomko 26 Aug '14

26 Aug '14

If the virConnect did not succeeed, we called virConnectClose on uninitialized data. Introduced by commit 7eabd55. --- tools/virsh-domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Pushed as trivial. diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 2562326..fcfbf74 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9122,7 +9122,7 @@ cmdMigrate(vshControl *ctl, const vshCmd *cmd) bool functionReturn = false; int timeout = 0; bool live_flag = false; - vshCtrlData data; + vshCtrlData data = { .dconn = NULL }; if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; -- 1.8.5.5

1 0

[libvirt] Mentors wanted for Outreach Program for Women October 2014
by Stefan Hajnoczi 26 Aug '14

26 Aug '14

Dear mentors and core contributors, Outreach Program for Women is starting the next round in October 2014. OPW funds women to work on open source software for 12 weeks with the help of mentors: https://wiki.gnome.org/OutreachProgramForWomen/ We just completed a successful round of OPW and Google Summer of Code. Other organizations have also been participating successfully in OPW like the Linux kernel with Greg KH and other mentors. Would you like to mentor in OPW October 2014? Regular code contributors to QEMU, KVM, and libvirt are eligible to participate as mentors. We also need project ideas that are achievable in 12 weeks by someone skilled in programming but not necessarily familiar with open source or our codebase. Ideas welcome! Stefan

3 7

[libvirt] [PATCH] storage: remove unused 'canonPath' in virStorageFileGetMetadata
by Chen Fan 26 Aug '14

26 Aug '14

Signed-off-by: Chen Fan <chen.fan.fnst(a)cn.fujitsu.com> --- src/storage/storage_driver.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 3604613..5ddc23a 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -2892,7 +2892,6 @@ virStorageFileGetMetadata(virStorageSourcePtr src, src->path, src->format, (int)uid, (int)gid, allow_probe); virHashTablePtr cycle = NULL; - char *canonPath = NULL; int ret = -1; if (!(cycle = virHashCreate(5, NULL))) @@ -2904,7 +2903,6 @@ virStorageFileGetMetadata(virStorageSourcePtr src, ret = virStorageFileGetMetadataRecurse(src, uid, gid, allow_probe, cycle); - VIR_FREE(canonPath); virHashFree(cycle); return ret; } -- 1.9.3

2 1

[libvirt] [PATCH v2] Add new 'kvm' domain feature and ability to hide KVM signature
by Alex Williamson 26 Aug '14

26 Aug '14

QEMU 2.1 added support for the kvm=off option to the -cpu command, allowing the KVM hypervisor signature to be hidden from the guest. This enables disabling of some paravirualization features in the guest as well as allowing certain drivers which test for the hypervisor to load. Domain XML syntax is as follows: <domain type='kvm> ... <features> ... <kvm> <hidden state='on'/> </kvm> </features> ... Signed-off-by: Alex Williamson <alex.williamson(a)redhat.com> --- Hearing no further comments, here's v2: - white space fix in docs/formatdomain.html.in - s/virBufferAsprintf/virBufferAddLit/ in src/qemu/qemu_command.c docs/formatdomain.html.in | 21 ++++ docs/schemas/domaincommon.rng | 18 +++- src/conf/domain_conf.c | 100 ++++++++++++++++++++ src/conf/domain_conf.h | 9 ++ src/qemu/qemu_command.c | 22 ++++ tests/qemuargv2xmltest.c | 2 .../qemuxml2argv-kvm-features-off.args | 5 + .../qemuxml2argv-kvm-features-off.xml | 27 +++++ .../qemuxml2argv-kvm-features.args | 5 + .../qemuxml2argvdata/qemuxml2argv-kvm-features.xml | 27 +++++ tests/qemuxml2argvtest.c | 3 + tests/qemuxml2xmltest.c | 3 + 12 files changed, 240 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-kvm-features-off.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-kvm-features-off.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-kvm-features.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-kvm-features.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index bd99ae0..bcc0bbd 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1232,6 +1232,9 @@ <vapic state='on'/> <spinlocks state='on' retries='4096'/> </hyperv> + <kvm> + <hidden state='on'/> + </kvm> <pvspinlock/> </features> @@ -1310,7 +1313,23 @@ can be explicitly disabled by using <code>state='off'</code> attribute. </dd> - + <dt><code>kvm</code></dt> + <dd>Various features to change the behavior of the KVM hypervisor. + <table class="top_table"> + <tr> + <th>Feature</th> + <th>Description</th> + <th>Value</th> + <th>Since</th> + </tr> + <tr> + <td>hidden</td> + <td>Hide the KVM hypervisor from standard MSR based discovery</td> + <td>on, off</td> + <td><span class="since">2.1.0 (QEMU only)</span></td> + </tr> + </table> + </dd> </dl> <h3><a name="elementsTime">Time keeping</a></h3> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 033f2f6..5c99a14 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -3826,7 +3826,7 @@ </define>  <define name="features"> <optional> @@ -3868,6 +3868,9 @@ </element> </optional> <optional> + <ref name="kvm"/> + </optional> + <optional> <element name="privnet"> <empty/> </element> @@ -4472,6 +4475,19 @@ </element> </define> +  + <define name="kvm"> + <element name="kvm"> + <interleave> + <optional> + <element name="hidden"> + <ref name="featurestate"/> + </element> + </optional> + </interleave> + </element> + </define> +  <define name="capabilities"> <element name="capabilities"> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 934f6cb..8b0bdb0 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -142,6 +142,7 @@ VIR_ENUM_IMPL(virDomainFeature, VIR_DOMAIN_FEATURE_LAST, "viridian", "privnet", "hyperv", + "kvm", "pvspinlock", "capabilities") @@ -155,6 +156,9 @@ VIR_ENUM_IMPL(virDomainHyperv, VIR_DOMAIN_HYPERV_LAST, "vapic", "spinlocks") +VIR_ENUM_IMPL(virDomainKVM, VIR_DOMAIN_KVM_LAST, + "hidden") + VIR_ENUM_IMPL(virDomainCapsFeature, VIR_DOMAIN_CAPS_FEATURE_LAST, "audit_control", "audit_write", @@ -12168,6 +12172,7 @@ virDomainDefParseXML(xmlDocPtr xml, case VIR_DOMAIN_FEATURE_VIRIDIAN: case VIR_DOMAIN_FEATURE_PRIVNET: case VIR_DOMAIN_FEATURE_HYPERV: + case VIR_DOMAIN_FEATURE_KVM: def->features[val] = VIR_TRISTATE_SWITCH_ON; break; @@ -12295,6 +12300,54 @@ virDomainDefParseXML(xmlDocPtr xml, ctxt->node = node; } + if (def->features[VIR_DOMAIN_FEATURE_KVM] == VIR_TRISTATE_SWITCH_ON) { + int feature; + int value; + node = ctxt->node; + if ((n = virXPathNodeSet("./features/kvm/*", ctxt, &nodes)) < 0) + goto error; + + for (i = 0; i < n; i++) { + feature = virDomainKVMTypeFromString((const char *)nodes[i]->name); + if (feature < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported KVM feature: %s"), + nodes[i]->name); + goto error; + } + + ctxt->node = nodes[i]; + + switch ((virDomainKVM) feature) { + case VIR_DOMAIN_KVM_HIDDEN: + if (!(tmp = virXPathString("string(./@state)", ctxt))) { + virReportError(VIR_ERR_XML_ERROR, + _("missing 'state' attribute for " + "KVM feature '%s'"), + nodes[i]->name); + goto error; + } + + if ((value = virTristateSwitchTypeFromString(tmp)) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("invalid value of state argument " + "for KVM feature '%s'"), + nodes[i]->name); + goto error; + } + + VIR_FREE(tmp); + def->kvm_features[feature] = value; + break; + + case VIR_DOMAIN_KVM_LAST: + break; + } + } + VIR_FREE(nodes); + ctxt->node = node; + } + if ((n = virXPathNodeSet("./features/capabilities/*", ctxt, &nodes)) < 0) goto error; @@ -14303,6 +14356,29 @@ virDomainDefFeaturesCheckABIStability(virDomainDefPtr src, } } + /* kvm */ + if (src->features[VIR_DOMAIN_FEATURE_KVM] == VIR_TRISTATE_SWITCH_ON) { + for (i = 0; i < VIR_DOMAIN_KVM_LAST; i++) { + switch ((virDomainKVM) i) { + case VIR_DOMAIN_KVM_HIDDEN: + if (src->kvm_features[i] != dst->kvm_features[i]) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("State of KVM feature '%s' differs: " + "source: '%s', destination: '%s'"), + virDomainKVMTypeToString(i), + virTristateSwitchTypeToString(src->kvm_features[i]), + virTristateSwitchTypeToString(dst->kvm_features[i])); + return false; + } + + break; + + case VIR_DOMAIN_KVM_LAST: + break; + } + } + } + return true; } @@ -18133,6 +18209,30 @@ virDomainDefFormatInternal(virDomainDefPtr def, virBufferAddLit(buf, "</hyperv>\n"); break; + case VIR_DOMAIN_FEATURE_KVM: + if (def->features[i] != VIR_TRISTATE_SWITCH_ON) + break; + + virBufferAddLit(buf, "<kvm>\n"); + virBufferAdjustIndent(buf, 2); + for (j = 0; j < VIR_DOMAIN_KVM_LAST; j++) { + switch ((virDomainKVM) j) { + case VIR_DOMAIN_KVM_HIDDEN: + if (def->kvm_features[j]) + virBufferAsprintf(buf, "<%s state='%s'/>\n", + virDomainKVMTypeToString(j), + virTristateSwitchTypeToString( + def->kvm_features[j])); + break; + + case VIR_DOMAIN_KVM_LAST: + break; + } + } + virBufferAdjustIndent(buf, -2); + virBufferAddLit(buf, "</kvm>\n"); + break; + case VIR_DOMAIN_FEATURE_CAPABILITIES: if (def->features[i] == VIR_DOMAIN_CAPABILITIES_POLICY_DEFAULT && !virDomainDefHasCapabilitiesFeatures(def)) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index ff7d640..cca9c0f 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1515,6 +1515,7 @@ typedef enum { VIR_DOMAIN_FEATURE_VIRIDIAN, VIR_DOMAIN_FEATURE_PRIVNET, VIR_DOMAIN_FEATURE_HYPERV, + VIR_DOMAIN_FEATURE_KVM, VIR_DOMAIN_FEATURE_PVSPINLOCK, VIR_DOMAIN_FEATURE_CAPABILITIES, @@ -1530,6 +1531,12 @@ typedef enum { } virDomainHyperv; typedef enum { + VIR_DOMAIN_KVM_HIDDEN = 0, + + VIR_DOMAIN_KVM_LAST +} virDomainKVM; + +typedef enum { VIR_DOMAIN_CAPABILITIES_POLICY_DEFAULT = 0, VIR_DOMAIN_CAPABILITIES_POLICY_ALLOW, VIR_DOMAIN_CAPABILITIES_POLICY_DENY, @@ -1943,6 +1950,7 @@ struct _virDomainDef { int features[VIR_DOMAIN_FEATURE_LAST]; int apic_eoi; int hyperv_features[VIR_DOMAIN_HYPERV_LAST]; + int kvm_features[VIR_DOMAIN_KVM_LAST]; unsigned int hyperv_spinlocks; /* These options are of type virTristateSwitch: ON = keep, OFF = drop */ @@ -2626,6 +2634,7 @@ VIR_ENUM_DECL(virDomainGraphicsSpiceStreamingMode) VIR_ENUM_DECL(virDomainGraphicsSpiceMouseMode) VIR_ENUM_DECL(virDomainGraphicsVNCSharePolicy) VIR_ENUM_DECL(virDomainHyperv) +VIR_ENUM_DECL(virDomainKVM) VIR_ENUM_DECL(virDomainRNGModel) VIR_ENUM_DECL(virDomainRNGBackend) VIR_ENUM_DECL(virDomainTPMModel) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 8a69976..d9f4b71 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6228,6 +6228,25 @@ qemuBuildCpuArgStr(virQEMUDriverPtr driver, } } + if (def->features[VIR_DOMAIN_FEATURE_KVM] == VIR_TRISTATE_SWITCH_ON) { + if (!have_cpu) { + virBufferAdd(&buf, default_model, -1); + have_cpu = true; + } + + for (i = 0; i < VIR_DOMAIN_KVM_LAST; i++) { + switch ((virDomainKVM) i) { + case VIR_DOMAIN_KVM_HIDDEN: + if (def->kvm_features[i] == VIR_TRISTATE_SWITCH_ON) + virBufferAddLit(&buf, ",kvm=off"); + break; + + case VIR_DOMAIN_KVM_LAST: + break; + } + } + } + if (virBufferCheckError(&buf) < 0) goto cleanup; @@ -10692,6 +10711,9 @@ qemuParseCommandLineCPU(virDomainDefPtr dom, } virStringFreeList(hv_tokens); hv_tokens = NULL; + } else if (STREQ(tokens[i], "kvm=off")) { + dom->features[VIR_DOMAIN_FEATURE_KVM] = VIR_TRISTATE_SWITCH_ON; + dom->kvm_features[VIR_DOMAIN_KVM_HIDDEN] = VIR_TRISTATE_SWITCH_ON; } } diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index 6bad7d6..9c00cd9 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -284,6 +284,8 @@ mymain(void) DO_TEST("hyperv"); + DO_TEST("kvm-features"); + DO_TEST("pseries-nvram"); DO_TEST("pseries-disk"); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-features-off.args b/tests/qemuxml2argvdata/qemuxml2argv-kvm-features-off.args new file mode 100644 index 0000000..363fd2a --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvm-features-off.args @@ -0,0 +1,5 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S -M pc -cpu qemu32 -m 214 -smp 6 -nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-boot n -usb -net none -serial none -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-features-off.xml b/tests/qemuxml2argvdata/qemuxml2argv-kvm-features-off.xml new file mode 100644 index 0000000..64b8cd8 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvm-features-off.xml @@ -0,0 +1,27 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>6</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='network'/> + </os> + <features> + <acpi/> + <kvm> + <hidden state='off'/> + </kvm> + </features> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-features.args b/tests/qemuxml2argvdata/qemuxml2argv-kvm-features.args new file mode 100644 index 0000000..b223951 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvm-features.args @@ -0,0 +1,5 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu -S -M pc \ +-cpu qemu32,kvm=off -m 214 -smp 6 -nographic -monitor \ +unix:/tmp/test-monitor,server,nowait -boot n -usb -net none -serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-features.xml b/tests/qemuxml2argvdata/qemuxml2argv-kvm-features.xml new file mode 100644 index 0000000..3f2817e --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvm-features.xml @@ -0,0 +1,27 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>6</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='network'/> + </os> + <features> + <acpi/> + <kvm> + <hidden state='on'/> + </kvm> + </features> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 62b969c..427ebfc 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -666,6 +666,9 @@ mymain(void) DO_TEST("hyperv", NONE); DO_TEST("hyperv-off", NONE); + DO_TEST("kvm-features", NONE); + DO_TEST("kvm-features-off", NONE); + DO_TEST("hugepages", QEMU_CAPS_MEM_PATH); DO_TEST("hugepages-pages", QEMU_CAPS_MEM_PATH, QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 5941323..3a174c0 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -196,6 +196,9 @@ mymain(void) DO_TEST("hyperv"); DO_TEST("hyperv-off"); + DO_TEST("kvm-features"); + DO_TEST("kvm-features-off"); + DO_TEST("hugepages"); DO_TEST("hugepages-pages"); DO_TEST("hugepages-pages2");

2 2

[libvirt] [PATCHv2] iotune: setting an invalid value now reports error
by Erik Skultety 26 Aug '14

26 Aug '14

When trying to set an invalid value into iotune element, standard behavior was to not report any error, rather to reset all affected subelements of the iotune element back to 0 which results in ignoring those particular subelements by XML generator. Patch further examines the return code of the virXPathULongLong function and in case of an invalid non-integer value raises an error. Fixed to preserve consistency with invalid value checking of other elements. Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1131811 --- src/conf/domain_conf.c | 67 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 49 insertions(+), 18 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9557020..bf8d30c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5416,6 +5416,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, char *mirrorType = NULL; int expected_secret_usage = -1; int auth_secret_usage = -1; + int ret = 0; if (!(def = virDomainDiskDefNew())) return NULL; @@ -5644,39 +5645,69 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, goto error; } } else if (xmlStrEqual(cur->name, BAD_CAST "iotune")) { - if (virXPathULongLong("string(./iotune/total_bytes_sec)", - ctxt, - &def->blkdeviotune.total_bytes_sec) < 0) { + ret = virXPathULongLong("string(./iotune/total_bytes_sec)", + ctxt, + &def->blkdeviotune.total_bytes_sec); + if (ret == -2) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("total throughput limit must be an integer")); + goto error; + } else if (ret < 0) { def->blkdeviotune.total_bytes_sec = 0; } - if (virXPathULongLong("string(./iotune/read_bytes_sec)", - ctxt, - &def->blkdeviotune.read_bytes_sec) < 0) { + ret = virXPathULongLong("string(./iotune/read_bytes_sec)", + ctxt, + &def->blkdeviotune.read_bytes_sec); + if (ret == -2) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("read throughput limit must be an integer")); + goto error; + } else if (ret < 0) { def->blkdeviotune.read_bytes_sec = 0; } - if (virXPathULongLong("string(./iotune/write_bytes_sec)", - ctxt, - &def->blkdeviotune.write_bytes_sec) < 0) { + ret = virXPathULongLong("string(./iotune/write_bytes_sec)", + ctxt, + &def->blkdeviotune.write_bytes_sec); + if (ret == -2) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("write throughput limit must be an integer")); + goto error; + } else if (ret < 0) { def->blkdeviotune.write_bytes_sec = 0; } - if (virXPathULongLong("string(./iotune/total_iops_sec)", - ctxt, - &def->blkdeviotune.total_iops_sec) < 0) { + ret = virXPathULongLong("string(./iotune/total_iops_sec)", + ctxt, + &def->blkdeviotune.total_iops_sec); + if (ret == -2) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("total I/O operations limit must be an integer")); + goto error; + } else if (ret < 0) { def->blkdeviotune.total_iops_sec = 0; } - if (virXPathULongLong("string(./iotune/read_iops_sec)", - ctxt, - &def->blkdeviotune.read_iops_sec) < 0) { + ret = virXPathULongLong("string(./iotune/read_iops_sec)", + ctxt, + &def->blkdeviotune.read_iops_sec); + if (ret == -2) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("read I/O operations limit must be an integer")); + goto error; + } else if (ret < 0) { def->blkdeviotune.read_iops_sec = 0; } - if (virXPathULongLong("string(./iotune/write_iops_sec)", - ctxt, - &def->blkdeviotune.write_iops_sec) < 0) { + ret = virXPathULongLong("string(./iotune/write_iops_sec)", + ctxt, + &def->blkdeviotune.write_iops_sec); + if (ret == -2) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("write I/O operations limit must be an integer")); + goto error; + } else if (ret < 0) { def->blkdeviotune.write_iops_sec = 0; } -- 1.9.3

2 2

[libvirt] [PATCH] blockcopy: allow block device destination
by Eric Blake 26 Aug '14

26 Aug '14

To date, anyone performing a block copy and pivot ends up with the destination being treated as <disk type='file'>. While this works for data access for a block device, it has at least one noticeable shortcoming: virDomainGetBlockInfo() reports allocation differently for block devices visited as files (the size of the device) than for block devices visited as <disk type='block'> (the maximum sector used, as reported by qemu); and this difference is significant when trying to manage qcow2 format on block devices that can be grown as needed. I still plan to add a virDomainBlockCopy() API that takes the destination disk as XML, allowing full expressive capability to copy to a network disk. But a new API can't be backported, while a new flag to an existing API can. So this patch enhances blockcopy to let the user flag when the resulting XML after the copy must list the device as type='block'. * include/libvirt/libvirt.h.in (VIR_DOMAIN_BLOCK_REBASE_COPY_DEV): New flag. * src/libvirt.c (virDomainBlockRebase): Document it. * tools/virsh-domain.c (opts_block_copy, blockJobImpl): Add --blockdev option. * tools/virsh.pod (blockcopy): Document it. * src/qemu/qemu_driver.c (qemuDomainBlockRebase): Allow new flag. (qemuDomainBlockCopy): Remember the flag. * tests/qemuxml2argvdata/qemuxml2argv-disk-mirror.xml: Test it. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- include/libvirt/libvirt.h.in | 2 ++ src/libvirt.c | 8 ++++++-- src/qemu/qemu_driver.c | 12 ++++++++---- .../qemuxml2argvdata/qemuxml2argv-disk-mirror.xml | 4 ++-- tools/virsh-domain.c | 6 ++++++ tools/virsh.pod | 7 +++++-- 6 files changed, 29 insertions(+), 10 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 47ea695..f2a02ea 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -2590,6 +2590,8 @@ typedef enum { VIR_DOMAIN_BLOCK_REBASE_RELATIVE = 1 << 4, /* Keep backing chain referenced using relative names */ + VIR_DOMAIN_BLOCK_REBASE_COPY_DEV = 1 << 5, /* Treat destination as block + device instead of file */ } virDomainBlockRebaseFlags; int virDomainBlockRebase(virDomainPtr dom, const char *disk, diff --git a/src/libvirt.c b/src/libvirt.c index 992e4f2..c4643e8 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -19881,7 +19881,10 @@ virDomainBlockPull(virDomainPtr dom, const char *disk, * pre-create files with relative backing file names, rather than the default * of absolute backing file names; as a security precaution, you should * generally only use reuse_ext with the shallow flag and a non-raw - * destination file. + * destination file. By default, the copy destination will be treated as + * type='file', but using VIR_DOMAIN_BLOCK_REBASE_COPY_DEV treats the + * destination as type='block' (affecting how virDomainGetBlockInfo() will + * report allocation after pivoting). * * A copy job has two parts; in the first phase, the @bandwidth parameter * affects how fast the source is pulled into the destination, and the job @@ -19950,7 +19953,8 @@ virDomainBlockRebase(virDomainPtr dom, const char *disk, virCheckNonNullArgGoto(base, error); } else if (flags & (VIR_DOMAIN_BLOCK_REBASE_SHALLOW | VIR_DOMAIN_BLOCK_REBASE_REUSE_EXT | - VIR_DOMAIN_BLOCK_REBASE_COPY_RAW)) { + VIR_DOMAIN_BLOCK_REBASE_COPY_RAW | + VIR_DOMAIN_BLOCK_REBASE_COPY_DEV)) { virReportInvalidArg(flags, _("use of flags in %s requires a copy job"), __FUNCTION__); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b6219ba..e74227e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15295,7 +15295,8 @@ qemuDomainBlockCopy(virDomainObjPtr vm, /* Preliminaries: find the disk we are editing, sanity checks */ virCheckFlags(VIR_DOMAIN_BLOCK_REBASE_SHALLOW | - VIR_DOMAIN_BLOCK_REBASE_REUSE_EXT, -1); + VIR_DOMAIN_BLOCK_REBASE_REUSE_EXT | + VIR_DOMAIN_BLOCK_REBASE_COPY_DEV, -1); priv = vm->privateData; cfg = virQEMUDriverGetConfig(driver); @@ -15374,7 +15375,8 @@ qemuDomainBlockCopy(virDomainObjPtr vm, if (VIR_ALLOC(mirror) < 0) goto endjob; /* XXX Allow non-file mirror destinations */ - mirror->type = VIR_STORAGE_TYPE_FILE; + mirror->type = flags & VIR_DOMAIN_BLOCK_REBASE_COPY_DEV ? + VIR_STORAGE_TYPE_BLOCK : VIR_STORAGE_TYPE_FILE; if (format) { if ((mirror->format = virStorageFileFormatTypeFromString(format)) <= 0) { @@ -15466,7 +15468,8 @@ qemuDomainBlockRebase(virDomainPtr dom, const char *path, const char *base, VIR_DOMAIN_BLOCK_REBASE_REUSE_EXT | VIR_DOMAIN_BLOCK_REBASE_COPY | VIR_DOMAIN_BLOCK_REBASE_COPY_RAW | - VIR_DOMAIN_BLOCK_REBASE_RELATIVE, -1); + VIR_DOMAIN_BLOCK_REBASE_RELATIVE | + VIR_DOMAIN_BLOCK_REBASE_COPY_DEV, -1); if (!(vm = qemuDomObjFromDomain(dom))) return -1; @@ -15482,7 +15485,8 @@ qemuDomainBlockRebase(virDomainPtr dom, const char *path, const char *base, format = "raw"; flags &= ~(VIR_DOMAIN_BLOCK_REBASE_COPY | VIR_DOMAIN_BLOCK_REBASE_COPY_RAW); - return qemuDomainBlockCopy(vm, dom->conn, path, base, format, bandwidth, flags); + return qemuDomainBlockCopy(vm, dom->conn, path, base, format, + bandwidth, flags); } return qemuDomainBlockJobImpl(vm, dom->conn, path, base, bandwidth, NULL, diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-mirror.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-mirror.xml index 46f2a3e..7495a45 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-mirror.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-mirror.xml @@ -17,8 +17,8 @@ <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <backingStore/> - <mirror type='file' file='/dev/HostVG/QEMUGuest1Copy' job='copy' ready='yes'> - <source file='/dev/HostVG/QEMUGuest1Copy'/> + <mirror type='block' job='copy' ready='yes'> + <source dev='/dev/HostVG/QEMUGuest1Copy'/> </mirror> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index f7193cb..1fbd36e 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1521,6 +1521,8 @@ blockJobImpl(vshControl *ctl, const vshCmd *cmd, flags |= VIR_DOMAIN_BLOCK_REBASE_REUSE_EXT; if (vshCommandOptBool(cmd, "raw")) flags |= VIR_DOMAIN_BLOCK_REBASE_COPY_RAW; + if (vshCommandOptBool(cmd, "blockdev")) + flags |= VIR_DOMAIN_BLOCK_REBASE_COPY_DEV; if (vshCommandOptStringReq(ctl, cmd, "dest", &base) < 0) goto cleanup; ret = virDomainBlockRebase(dom, path, base, bandwidth, flags); @@ -1828,6 +1830,10 @@ static const vshCmdOptDef opts_block_copy[] = { .type = VSH_OT_BOOL, .help = N_("use raw destination file") }, + {.name = "blockdev", + .type = VSH_OT_BOOL, + .help = N_("copy destination is block device instead of regular file") + }, {.name = "wait", .type = VSH_OT_BOOL, .help = N_("wait for job to reach mirroring phase") diff --git a/tools/virsh.pod b/tools/virsh.pod index f07deec..8178868 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -873,7 +873,8 @@ unlimited. The hypervisor can choose whether to reject the value or convert it to the maximum value allowed. =item B<blockcopy> I<domain> I<path> I<dest> [I<bandwidth>] [I<--shallow>] -[I<--reuse-external>] [I<--raw>] [I<--wait> [I<--async>] [I<--verbose>]] +[I<--reuse-external>] [I<--raw>] [I<--blockdev>] +[I<--wait> [I<--async>] [I<--verbose>]] [{I<--pivot> | I<--finish>}] [I<--timeout> B<seconds>] Copy a disk backing image chain to I<dest>. By default, this command @@ -891,7 +892,9 @@ The format of the destination is determined by the first match in the following list: if I<--raw> is specified, it will be raw; if I<--reuse-external> is specified, the existing destination is probed for a format; and in all other cases, the destination format will -match the source format. +match the source format. The destination is treated as a regular +file unless I<--blockdev> is used to signal that it is a block +device. By default, the copy job runs in the background, and consists of two phases. Initially, the job must copy all data from the source, and -- 1.7.1

3 3

[libvirt] [PATCH] maint: drop spurious semicolons
by Eric Blake 26 Aug '14

26 Aug '14

I noticed a line 'int nparams = 0;;' in remote_dispatch.h, and tracked down where it was generated. While at it, I found a couple of other double semicolons. Additionally, I noticed that commit df0b57a95 left a stale reference to the file name remote_dispatch_bodies.h. * src/conf/numatune_conf.c (virDomainNumatuneNodeParseXML): Drop empty statement. * tests/virdbustest.c (testMessageStruct, testMessageSimple): Likewise. * src/rpc/gendispatch.pl (remote_dispatch_bodies.h): Likewise, and update stale comments. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. Syntax check can't easily catch this, because we want to allow 'for (int i = 0;; i++)' on a loop that uses break to exit, so this is just done by manual inspection. src/conf/numatune_conf.c | 2 +- src/rpc/gendispatch.pl | 4 ++-- tests/virdbustest.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/conf/numatune_conf.c b/src/conf/numatune_conf.c index ff0f3eb..21d9a64 100644 --- a/src/conf/numatune_conf.c +++ b/src/conf/numatune_conf.c @@ -81,7 +81,7 @@ virDomainNumatuneNodeParseXML(virDomainNumatunePtr *numatunePtr, xmlXPathContextPtr ctxt) { char *tmp = NULL; - int n = 0;; + int n = 0; int ret = -1; size_t i = 0; virDomainNumatunePtr numatune = *numatunePtr; diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index d820d0e..27093d2 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -380,7 +380,7 @@ if ($mode eq "debug") { } } -# Bodies for dispatch functions ("remote_dispatch_bodies.h"). +# Bodies for dispatch functions ("remote_dispatch.h"). elsif ($mode eq "server") { my %generate = map { $_ => 1 } @autogen; my @keys = sort (keys %calls); @@ -537,7 +537,7 @@ elsif ($mode eq "server") { push(@args_list, "args->$1.$1_len"); } elsif ($args_member =~ m/^remote_typed_param (\S+)<(\S+)>;/) { push(@vars_list, "virTypedParameterPtr $1 = NULL"); - push(@vars_list, "int n$1 = 0;"); + push(@vars_list, "int n$1 = 0"); if ($call->{ProcName} eq "NodeSetMemoryParameters") { push(@args_list, "priv->conn"); } diff --git a/tests/virdbustest.c b/tests/virdbustest.c index a798fbe..0079b41 100644 --- a/tests/virdbustest.c +++ b/tests/virdbustest.c @@ -62,7 +62,7 @@ static int testMessageSimple(const void *args ATTRIBUTE_UNUSED) unsigned int in_uint32 = 200000000, out_uint32 = 0; long long in_int64 = 1000000000000LL, out_int64 = 0; unsigned long long in_uint64 = 2000000000000LL, out_uint64 = 0; - double in_double = 3.14159265359, out_double = 0;; + double in_double = 3.14159265359, out_double = 0; const char *in_string = "Hello World"; char *out_string = NULL; const char *in_objectpath = "/org/libvirt/test"; @@ -338,7 +338,7 @@ static int testMessageStruct(const void *args ATTRIBUTE_UNUSED) unsigned int in_uint32 = 200000000, out_uint32 = 0; long long in_int64 = -1000000000000LL, out_int64 = 0; unsigned long long in_uint64 = 2000000000000LL, out_uint64 = 0; - double in_double = 3.14159265359, out_double = 0;; + double in_double = 3.14159265359, out_double = 0; const char *in_string = "Hello World"; char *out_string = NULL; const char *in_objectpath = "/org/libvirt/test"; -- 1.9.3

2 2

[libvirt] [PATCH] libxl: fix memory corruption introduced by commit b55cc5f4e
by Jim Fehlig 26 Aug '14

26 Aug '14

Commit b55cc5f4e did a shallow copy of libxl_{sdl,vnc}_info from the domain config to the build info, which resulted in double-freeing strings contained in the structures during cleanup, which later resulted in a libvirtd crash. Fix by performing a deep copy of the structure, VIR_STRDUP'ing embedded strings instead of simply copying their pointers. Fixes the following issue reported on the libvirt dev list https://www.redhat.com/archives/libvir-list/2014-August/msg01112.html Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_conf.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 1210500..1dbdd9c 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1130,10 +1130,24 @@ libxlMakeVfbList(virPortAllocatorPtr graphicsports, libxl_domain_build_info *b_info = &d_config->b_info; libxl_device_vfb vfb = d_config->vfbs[0]; - if (libxl_defbool_val(vfb.vnc.enable)) - memcpy(&b_info->u.hvm.vnc, &vfb.vnc, sizeof(libxl_vnc_info)); - else if (libxl_defbool_val(vfb.sdl.enable)) - memcpy(&b_info->u.hvm.sdl, &vfb.sdl, sizeof(libxl_sdl_info)); + if (libxl_defbool_val(vfb.vnc.enable)) { + libxl_defbool_set(&b_info->u.hvm.vnc.enable, true); + if (VIR_STRDUP(b_info->u.hvm.vnc.listen, vfb.vnc.listen) < 0) + goto error; + if (VIR_STRDUP(b_info->u.hvm.vnc.passwd, vfb.vnc.passwd) < 0) + goto error; + b_info->u.hvm.vnc.display = vfb.vnc.display; + libxl_defbool_set(&b_info->u.hvm.vnc.findunused, + libxl_defbool_val(vfb.vnc.findunused)); + } else if (libxl_defbool_val(vfb.sdl.enable)) { + libxl_defbool_set(&b_info->u.hvm.sdl.enable, true); + libxl_defbool_set(&b_info->u.hvm.sdl.opengl, + libxl_defbool_val(vfb.sdl.opengl)); + if (VIR_STRDUP(b_info->u.hvm.sdl.display, vfb.sdl.display) < 0) + goto error; + if (VIR_STRDUP(b_info->u.hvm.sdl.xauthority, vfb.sdl.xauthority) < 0) + goto error; + } } return 0; -- 1.8.4.5

2 2

[libvirt] [PATCH v2] spec: drop anything older than Fedora 13
by Eric Blake 26 Aug '14

26 Aug '14

RHEL 5 is based on libvirt 0.8.2, as was Fedora 13. RHEL 5 also happens to be the oldest box that we actively support with a buildbot, so it is time to clean up some crufty conditionals in the spec file that no longer are necessary for modern Fedora. Although it is probably okay to make further simplifications to a newer minimum Fedora version, that can be done as a later patch. This patch just focuses on cleaning any comparison of %{?fedora} that will always be true or false once we assume a minimum of F13. * libvirt.spec.in: Make with_audit default to on. Move other conditionals to a single RHEL-5 block. Simplify any fedora comparison older than 13. Document our assumptions. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- v2: rebase to latest libvirt.git libvirt.spec.in | 69 ++++++++++++++++++++------------------------------------- 1 file changed, 24 insertions(+), 45 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 3932313..9126277 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1,5 +1,7 @@ # -*- rpm-spec -*- +# This spec file assumes you are building for Fedora 13 or newer, +# or for RHEL 5 or newer. It may need some tweaks for other distros. # If neither fedora nor rhel was defined, try to guess them from %{dist} %if !0%{?rhel} && !0%{?fedora} %{expand:%(echo "%{?dist}" | \ @@ -139,7 +141,6 @@ %define with_libpcap 0%{!?_without_libpcap:0} %define with_macvtap 0%{!?_without_macvtap:0} %define with_libnl 0%{!?_without_libnl:0} -%define with_audit 0%{!?_without_audit:0} %define with_dtrace 0%{!?_without_dtrace:0} %define with_cgconfig 0%{!?_without_cgconfig:0} %define with_sanlock 0%{!?_without_sanlock:0} @@ -153,6 +154,7 @@ # Non-server/HV driver defaults which are always enabled %define with_sasl 0%{!?_without_sasl:1} +%define with_audit 0%{!?_without_audit:1} # Finally set the OS / architecture specific special cases @@ -223,31 +225,21 @@ %define with_libxl 0 %endif -# PolicyKit was introduced in Fedora 8 / RHEL-6 or newer -%if 0%{?fedora} >= 8 || 0%{?rhel} >= 6 - %define with_polkit 0%{!?_without_polkit:1} -%endif - -# libcapng is used to manage capabilities in Fedora 12 / RHEL-6 or newer -%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 - %define with_capng 0%{!?_without_capng:1} -%endif - # fuse is used to provide virtualized /proc for LXC %if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 %define with_fuse 0%{!?_without_fuse:1} %endif -# netcf is used to manage network interfaces in Fedora 12 / RHEL-6 or newer -%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 - %define with_netcf 0%{!?_without_netcf:%{server_drivers}} -%endif - -# udev is used to manage host devices in Fedora 12 / RHEL-6 or newer -%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 - %define with_udev 0%{!?_without_udev:%{server_drivers}} -%else +# RHEL 5 lacks newer tools +%if 0%{?rhel} == 5 %define with_hal 0%{!?_without_hal:%{server_drivers}} +%else + %define with_polkit 0%{!?_without_polkit:1} + %define with_capng 0%{!?_without_capng:1} + %define with_netcf 0%{!?_without_netcf:%{server_drivers}} + %define with_udev 0%{!?_without_udev:%{server_drivers}} + %define with_yajl 0%{!?_without_yajl:%{server_drivers}} + %define with_dtrace 1 %endif # interface requires netcf @@ -255,11 +247,6 @@ %define with_interface 0 %endif -# Enable yajl library for JSON mode with QEMU -%if 0%{?fedora} >= 13 || 0%{?rhel} >= 6 - %define with_yajl 0%{!?_without_yajl:%{server_drivers}} -%endif - # Enable sanlock library for lock management with QEMU # Sanlock is available only on arches where kvm is available for RHEL %if 0%{?fedora} >= 16 @@ -320,16 +307,8 @@ %define with_libnl 1 %endif -%if 0%{?fedora} >= 11 || 0%{?rhel} >= 5 - %define with_audit 0%{!?_without_audit:1} -%endif - -%if 0%{?fedora} >= 13 || 0%{?rhel} >= 6 - %define with_dtrace 1 -%endif - # Pull in cgroups config system -%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 +%if 0%{?fedora} || 0%{?rhel} >= 6 %if %{with_qemu} || %{with_lxc} %define with_cgconfig 0%{!?_without_cgconfig:1} %endif @@ -349,7 +328,7 @@ # Force QEMU to run as non-root -%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 +%if 0%{?fedora} || 0%{?rhel} >= 6 %define qemu_user qemu %define qemu_group qemu %else @@ -473,7 +452,7 @@ BuildRequires: libattr-devel # For pool-build probing for existing pools BuildRequires: libblkid-devel >= 2.17 %endif -%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 +%if 0%{?fedora} || 0%{?rhel} >= 6 # for augparse, optionally used in testing BuildRequires: augeas %endif @@ -538,7 +517,7 @@ BuildRequires: cyrus-sasl-devel %if 0%{?fedora} >= 20 || 0%{?rhel} >= 7 BuildRequires: polkit-devel >= 0.112 %else - %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 + %if 0%{?fedora} || 0%{?rhel} >= 6 BuildRequires: polkit-devel >= 0.93 %else BuildRequires: PolicyKit-devel >= 0.6 @@ -621,7 +600,7 @@ BuildRequires: netcf-devel >= 0.1.4 %endif %endif %if %{with_esx} - %if 0%{?fedora} >= 9 || 0%{?rhel} >= 6 + %if 0%{?fedora} || 0%{?rhel} >= 6 BuildRequires: libcurl-devel %else BuildRequires: curl-devel @@ -705,7 +684,7 @@ Requires: avahi-libs %if 0%{?fedora} >= 20 || 0%{?rhel} >= 7 Requires: polkit >= 0.112 %else - %if 0%{?fedora} >= 12 || 0%{?rhel} >=6 + %if 0%{?fedora} || 0%{?rhel} >=6 Requires: polkit >= 0.93 %else Requires: PolicyKit >= 0.6 @@ -865,7 +844,7 @@ Requires: nfs-utils # For mkfs Requires: util-linux # For glusterfs - %if 0%{?fedora} >= 11 + %if 0%{?fedora} Requires: glusterfs-client >= 2.0.1 %endif %endif @@ -1579,7 +1558,7 @@ mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp \ %endif %endif -%if 0%{?fedora} < 14 && 0%{?rhel} < 6 +%if 0%{?rhel} == 5 rm -f $RPM_BUILD_ROOT%{_prefix}/lib/sysctl.d/libvirtd.conf %endif @@ -1607,7 +1586,7 @@ fi %if ! %{with_driver_modules} %if %{with_qemu} %pre daemon - %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 + %if 0%{?fedora} || 0%{?rhel} >= 6 # We want soft static allocation of well-known ids, as disk images # are commonly shared across NFS mounts by id rather than name; see # https://fedoraproject.org/wiki/Packaging:UsersAndGroups @@ -1776,7 +1755,7 @@ fi %if %{with_driver_modules} %if %{with_qemu} %pre daemon-driver-qemu - %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 + %if 0%{?fedora} || 0%{?rhel} >= 6 # We want soft static allocation of well-known ids, as disk images # are commonly shared across NFS mounts by id rather than name; see # https://fedoraproject.org/wiki/Packaging:UsersAndGroups @@ -1884,7 +1863,7 @@ exit 0 %config(noreplace) %{_sysconfdir}/sysconfig/virtlockd %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf %config(noreplace) %{_sysconfdir}/libvirt/virtlockd.conf - %if 0%{?fedora} >= 14 || 0%{?rhel} >= 6 + %if 0%{?fedora} || 0%{?rhel} >= 6 %config(noreplace) %{_prefix}/lib/sysctl.d/libvirtd.conf %endif @@ -1912,7 +1891,7 @@ exit 0 %endif %if %{with_polkit} - %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 + %if 0%{?fedora} || 0%{?rhel} >= 6 %{_datadir}/polkit-1/actions/org.libvirt.unix.policy %{_datadir}/polkit-1/actions/org.libvirt.api.policy %else -- 1.9.3

2 2

[libvirt] [RFC PATCH 0/5] add virDomainBlockCopy API
by Eric Blake 26 Aug '14

26 Aug '14

Patch series is not complete yet, but I'm posting the front end now to get feedback on whether it has a chance of being included in 1.2.8. Still to go: patch 6 will actually implement the new function in qemu driver, by parsing a <disk> XML snippet into a virStorageSource; patch 7 will add monitor support for the qemu 1.4 parameters of granularity and buffer size. Individual commit messages should give more hints on where I'm taking this series. Ultimately, I'm hoping that Peter's work on gluster backends for block commit can be expanded into also covering gluster backends for the copy destination. Eric Blake (5): blockcopy: virDomainBlockCopy with XML destination, typed params blockcopy: split out virsh implementation blockcopy: expose new API in virsh blockcopy: remote implementation for new API blockcopy: tweak how rebase calls into copy include/libvirt/libvirt.h.in | 57 ++++++++++++++-- src/driver.h | 11 +++- src/libvirt.c | 118 ++++++++++++++++++++++++++++++++- src/libvirt_public.syms | 5 ++ src/qemu/qemu_driver.c | 104 ++++++++++++++++++----------- src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 18 ++++- tools/virsh-domain.c | 153 ++++++++++++++++++++++++++++++++++++------- tools/virsh.pod | 35 ++++++---- 9 files changed, 422 insertions(+), 80 deletions(-) -- 1.9.3

2 7

[libvirt] [PATCH] docs: fix bootmenu timeout description
by Martin Kletzander 26 Aug '14

26 Aug '14

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: Pushed as 'trivial'. docs/formatdomain.html.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 9b8802d..59127bb 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -160,9 +160,8 @@ Since 0.8.3</span> Additional attribute <code>timeout</code> takes the number of milliseconds the boot menu should wait until it times out. Allowed values are numbers - in range [0, 65535] inclusive and it is valid if and only if the previous - <code>enable</code> is set to "yes". - <span class="since"> Since 1.2.8</span> + in range [0, 65535] inclusive and it is ignored unless <code>enable</code> + is set to "yes". <span class="since">Since 1.2.8</span> </dd> <dt><code>smbios</code></dt> <dd>How to populate SMBIOS information visible in the guest. -- 2.0.4

1 0

[libvirt] [PATCH 0/3] Add support for boot menu timeout
by Martin Kletzander 26 Aug '14

26 Aug '14

This is basically just for qemu's '-boot splash-time' parameter. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1021703 Martin Kletzander (3): docs, conf: add support for bootmenu timeout qemu: add capability probing for splash-timeout qemu: add support for splash-timeout docs/formatdomain.html.in | 7 +++++- docs/schemas/domaincommon.rng | 5 ++++ src/conf/domain_conf.c | 21 ++++++++++++++-- src/conf/domain_conf.h | 2 ++ src/qemu/qemu_capabilities.c | 5 ++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 15 +++++++++++ tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + tests/qemuhelptest.c | 12 ++++++--- ...qemuxml2argv-boot-menu-disable-with-timeout.xml | 29 ++++++++++++++++++++++ ...2argv-boot-menu-enable-with-timeout-invalid.xml | 29 ++++++++++++++++++++++ ...qemuxml2argv-boot-menu-enable-with-timeout.args | 15 +++++++++++ .../qemuxml2argv-boot-menu-enable-with-timeout.xml | 29 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 5 ++++ ...muxml2xmlout-boot-menu-disable-with-timeout.xml | 29 ++++++++++++++++++++++ tests/qemuxml2xmltest.c | 2 ++ 18 files changed, 202 insertions(+), 7 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-with-timeout.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout-invalid.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-menu-disable-with-timeout.xml -- 2.0.4

3 7

[libvirt] [PATCH] daemon: Fix option -v missing info priority log
by Wang Rui 25 Aug '14

25 Aug '14

From: Zhou Yimin <zhouyimin(a)huawei.com> Introduce by 63fbcc692. When start libvirtd with commandline "/usr/sbin/libvirtd -d -l -v", we expect verbose(info level) log if neither environment variable nor config file about logging controls is set. But in fact we can't get any info priority log in the default output file. The log priority of default output is VIR_LOG_DEFAULT(VIR_LOG_WARN), so the info log is filtered out. To record info priority log we must parse option -v before setting the default output. After this patch, we get all verbose log in the default output file. Signed-off-by: Zhou Yimin <zhouyimin(a)huawei.com> --- daemon/libvirtd.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 4cf78e6..87af903 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -683,6 +683,12 @@ daemonSetupLogging(struct daemonConfig *config, virLogParseOutputs(config->log_outputs); /* + * Command line override for --verbose + */ + if ((verbose) && (virLogGetDefaultPriority() > VIR_LOG_INFO)) + virLogSetDefaultPriority(VIR_LOG_INFO); + + /* * If no defined outputs, and either running * as daemon or not on a tty, then first try * to direct it to the systemd journal @@ -748,12 +754,6 @@ daemonSetupLogging(struct daemonConfig *config, VIR_FREE(tmp); } - /* - * Command line override for --verbose - */ - if ((verbose) && (virLogGetDefaultPriority() > VIR_LOG_INFO)) - virLogSetDefaultPriority(VIR_LOG_INFO); - return 0; error: -- 1.7.12.4

2 1

[libvirt] [PATCH] libvirt: lxc: Add Get/Set vcpus for lxc
by Li Yang 25 Aug '14

25 Aug '14

1.Add function to get vcpu count for lxc(vcpucount) 2.Add function to set vcpu count for lxc(setvcpus) Signed-off-by: Li Yang <liyang.fnst(a)cn.fujitsu.com> --- src/lxc/lxc_driver.c | 159 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 159 insertions(+), 0 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 4741632..4df0738 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -5617,6 +5617,162 @@ lxcDomainGetMetadata(virDomainPtr dom, return ret; } +static int +lxcDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, + unsigned int flags) +{ + virLXCDriverPtr driver = dom->conn->privateData; + virDomainObjPtr vm = NULL; + virDomainDefPtr persistentDef; + int ret = -1; + bool maximum; + unsigned int maxvcpus = 0; + virLXCDriverConfigPtr cfg = NULL; + virCapsPtr caps = NULL; + + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG | + VIR_DOMAIN_VCPU_MAXIMUM | + VIR_DOMAIN_VCPU_GUEST, -1); + + if (!nvcpus || (unsigned short) nvcpus != nvcpus) { + virReportError(VIR_ERR_INVALID_ARG, + _("argument out of range: %d"), nvcpus); + return -1; + } + + if (!(vm = lxcDomObjFromDomain(dom))) + goto cleanup; + + cfg = virLXCDriverGetConfig(driver); + + if (virDomainSetVcpusFlagsEnsureACL(dom->conn, vm->def, flags) < 0) + goto cleanup; + + if (!(caps = virLXCDriverGetCapabilities(driver, false))) + goto cleanup; + + maximum = (flags & VIR_DOMAIN_VCPU_MAXIMUM) != 0; + flags &= ~VIR_DOMAIN_VCPU_MAXIMUM; + + if (virDomainLiveConfigHelperMethod(caps, driver->xmlopt, vm, &flags, + &persistentDef) < 0) + goto cleanup; + + /* MAXIMUM cannot be mixed with LIVE. */ + if (maximum && (flags & VIR_DOMAIN_AFFECT_LIVE)) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("cannot adjust maximum on running domain")); + goto cleanup; + } + + if (flags & VIR_DOMAIN_AFFECT_LIVE) + maxvcpus = vm->def->maxvcpus; + if (flags & VIR_DOMAIN_AFFECT_CONFIG) { + if (!maxvcpus || maxvcpus > persistentDef->maxvcpus) + maxvcpus = persistentDef->maxvcpus; + } + if (!maximum && nvcpus > maxvcpus) { + virReportError(VIR_ERR_INVALID_ARG, + _("requested vcpus is greater than max allowable" + " vcpus for the domain: %d > %d"), + nvcpus, maxvcpus); + goto cleanup; + } + + if (flags & VIR_DOMAIN_VCPU_GUEST) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("changing of vCPU count isn't supported " + "via guest agent")); + goto cleanup; + } else { + if (flags & VIR_DOMAIN_AFFECT_LIVE) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("Cannot hotplug vCPUS for LXC hypervisor")); + goto cleanup; + } + + if (flags & VIR_DOMAIN_AFFECT_CONFIG) { + if (maximum) { + persistentDef->maxvcpus = nvcpus; + if (nvcpus < persistentDef->vcpus) + persistentDef->vcpus = nvcpus; + } else { + persistentDef->vcpus = nvcpus; + } + + if (virDomainSaveConfig(cfg->configDir, persistentDef) < 0) + goto cleanup; + } + } + + ret = 0; + + cleanup: + if (vm) + virObjectUnlock(vm); + virObjectUnref(caps); + virObjectUnref(cfg); + return ret; +} + + +static int +lxcDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus) +{ + return lxcDomainSetVcpusFlags(dom, nvcpus, VIR_DOMAIN_AFFECT_LIVE); +} + + +static int +lxcDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags) +{ + virLXCDriverPtr driver = dom->conn->privateData; + virDomainObjPtr vm; + virDomainDefPtr def; + int ret = -1; + virCapsPtr caps = NULL; + + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG | + VIR_DOMAIN_VCPU_MAXIMUM | + VIR_DOMAIN_VCPU_GUEST, -1); + + if (!(vm = lxcDomObjFromDomain(dom))) + return -1; + + if (virDomainGetVcpusFlagsEnsureACL(dom->conn, vm->def, flags) < 0) + goto cleanup; + + if (!(caps = virLXCDriverGetCapabilities(driver, false))) + goto cleanup; + + if (virDomainLiveConfigHelperMethod(caps, driver->xmlopt, + vm, &flags, &def) < 0) + goto cleanup; + + if (flags & VIR_DOMAIN_AFFECT_LIVE) + def = vm->def; + + if (flags & VIR_DOMAIN_VCPU_GUEST) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("vCPU count cannot be provided by the guest agent" + " for LXC hypervisor")); + goto cleanup; + } else { + if (flags & VIR_DOMAIN_VCPU_MAXIMUM) + ret = def->maxvcpus; + else + ret = def->vcpus; + } + + cleanup: + if (vm) + virObjectUnlock(vm); + virObjectUnref(caps); + return ret; +} + static int lxcDomainGetCPUStats(virDomainPtr dom, @@ -5746,6 +5902,9 @@ static virDriver lxcDriver = { .domainBlockStatsFlags = lxcDomainBlockStatsFlags, /* 1.2.2 */ .domainInterfaceStats = lxcDomainInterfaceStats, /* 0.7.3 */ .domainMemoryStats = lxcDomainMemoryStats, /* 1.2.2 */ + .domainSetVcpus = lxcDomainSetVcpus, /* 1.2.8 */ + .domainSetVcpusFlags = lxcDomainSetVcpusFlags, /* 1.2.8 */ + .domainGetVcpusFlags = lxcDomainGetVcpusFlags, /* 1.2.8 */ .nodeGetCPUStats = lxcNodeGetCPUStats, /* 0.9.3 */ .nodeGetMemoryStats = lxcNodeGetMemoryStats, /* 0.9.3 */ .nodeGetCellsFreeMemory = lxcNodeGetCellsFreeMemory, /* 0.6.5 */ -- 1.7.1

3 2

[libvirt] [RFCv2] Introduce API for retrieving bulk domain stats v2
by Peter Krempa 25 Aug '14

25 Aug '14

I'd like to propose a (hopefully) fairly future-proof API to retrieve various statistics for domains. The motivation is that management layers that use libvirt usually poll libvirt for statistics using various split up APIs we currently provide. To get all the necessary stuff, the mgmt app need to issue Ndomains * Napis calls and cope with the various returned formats. The APIs I'm wanting to introduce here will: 1) Return data in a format that we can expand in the future and is hierarchical. This version returns the data as typed parameters where the fields are constructed as dot-separated strings containing names and other stuff in a list of typed params. 2) Stats for multiple (all) domains can be queried at once and are returned in one call. This will allow to decrease the overhead necessary to issue multiple calls per domain multiplied by the count of domains. 3) Selectable (bit mask) fields in the returned format. This will allow to retrieve only specific stats according to the APPs need. Initially the implementation will introduce the option to retrieve block, interface and cpu stats with the possibility to add more in the future. The stats groups will be enabled using a bit field @stats passed as the function argument. A few groups for inspiration: VIR_DOMAIN_STATS_STATE VIR_DOMAIN_STATS_CPU VIR_DOMAIN_STATS_BLOCK VIR_DOMAIN_STATS_INTERFACE the returned typed params will use the following scheme state.state = running state.reason = started cpu.count = 8 cpu.0.state = running cpu.0.time = 1234 ... I'm also thinking of doing an async version of this, where the user would provide a callback that would be called for each returned domain but I'm not quite sure if that would play nicely with our RPC so that requires a bit more investigation first. Peter --- include/libvirt/libvirt.h.in | 26 +++++++ src/driver.h | 9 +++ src/libvirt.c | 178 +++++++++++++++++++++++++++++++++++++++++++ src/libvirt_public.syms | 7 ++ 4 files changed, 220 insertions(+) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 47ea695..962f740 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -2501,6 +2501,32 @@ int virDomainDetachDeviceFlags(virDomainPtr domain, int virDomainUpdateDeviceFlags(virDomainPtr domain, const char *xml, unsigned int flags); +typedef struct _virDomainStatsRecord virDomainStatsRecord; +typedef virDomainStatsRecord *virDomainStatsRecordPtr; +struct _virDomainStatsRecord { + virDomainPtr dom; + unsigned int nparams; + virTypedParameterPtr params; +}; + +typedef enum { + VIR_DOMAIN_STATS_ALL = (1 << 0), /* return all stats fields + implemented in the daemon */ + VIR_DOMAIN_STATS_STATE = (1 << 1), /* return domain state */ +} virDomainStatsTypes; + +int virConnectGetAllDomainStats(virConnectPtr conn, + unsigned int stats, + virDomainStatsRecordPtr **retStats, + unsigned int flags); + +int virDomainListGetStats(virDomainPtr *doms, + unsigned int stats, + virDomainStatsRecordPtr **retStats, + unsigned int flags); + +void virDomainStatsRecordListFree(virDomainStatsRecordPtr *stats); + /* * BlockJob API */ diff --git a/src/driver.h b/src/driver.h index 158df79..eab794d 100644 --- a/src/driver.h +++ b/src/driver.h @@ -1191,6 +1191,14 @@ typedef int unsigned int flags); +typedef int +(*virDrvDomainListGetStats)(virConnectPtr conn, + virDomainPtr *doms, + unsigned int ndoms, + unsigned int stats, + virDomainStatsRecordPtr **retStats, + unsigned int flags); + typedef struct _virDriver virDriver; typedef virDriver *virDriverPtr; @@ -1411,6 +1419,7 @@ struct _virDriver { virDrvDomainSetTime domainSetTime; virDrvNodeGetFreePages nodeGetFreePages; virDrvConnectGetDomainCapabilities connectGetDomainCapabilities; + virDrvDomainListGetStats domainListGetStats; }; diff --git a/src/libvirt.c b/src/libvirt.c index 8349261..c2244d0 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -21341,3 +21341,181 @@ virConnectGetDomainCapabilities(virConnectPtr conn, virDispatchError(conn); return NULL; } + + +/** + * virConnectGetAllDomainStats: + * @conn: pointer to the hypervisor connection + * @stats: stats to return, binary-OR of virDomainStatsTypes + * @retStats: Pointer that will be filled with the array of returned stats. + * @flags: extra flags; not used yet, so callers should always pass 0 + * + * Query statistics for all domains on a given connection. + * + * Report statistics of various parameters for a running VM according to @stats + * field. The statistics are returned as an array of structures for each queried + * domain. The structure contains an array of typed parameters containing the + * individual statistics. The typed parameter name for each statistic field + * consists of a dot-separated string containing name of the requested group + * followed by a group specific description of the statistic value. + * + * The statistic groups are enabled using the @stats parameter which is a + * binary-OR of enum virDomainStatsTypes. The following groups are available + * (although not necessarily implemented for each storage driver): + * + * VIR_DOMAIN_STATS_ALL: Return all statistics supported by the hypervisor + * driver. This allows to query everything the driver supports without getting + * an error. + * + * VIR_DOMAIN_STATS_STATE: Return domain state and reason for entering that + * state. The typed parameter keys are in format: + * "state.state" - state of the VM, returned as int from virDomainState enum + * "state.reason" - reason for entering given state, returned as in from + * virDomain*Reason enmum corresponding to given state. + * + * Returns the count of returned statistics strucutres on success, -1 on error. + * The requested data are returned in the @retStats parameter. The returned + * array should be freed by the caller. See virDomainStatsRecordListFree. + */ +int +virConnectGetAllDomainStats(virConnectPtr conn, + unsigned int stats, + virDomainStatsRecordPtr **retStats, + unsigned int flags) +{ + int ret = -1; + + VIR_DEBUG("conn=%p, stats=0x%x, retStats=%p, flags=0x%x", + conn, stats, retStats, flags); + + virResetLastError(); + + virCheckConnectReturn(conn, -1); + + if (!conn->driver->domainListGetStats) { + virReportUnsupportedError(); + goto cleanup; + } + + ret = conn->driver->domainListGetStats(conn, NULL, 0, stats, + retStats, flags); + + cleanup: + if (ret < 0) + virDispatchError(conn); + + return ret; +} + + +/** + * virDomainListGetStats: + * @doms: NULL terminated array of domains + * @stats: stats to return, binary-OR of virDomainStatsTypes + * @retStats: Pointer that will be filled with the array of returned stats. + * @flags: extra flags; not used yet, so callers should always pass 0 + * + * Query statistics for domains provided by @doms. Note that all domains in + * @doms must share the same connection. + * + * Report statistics of various parameters for a running VM according to @stats + * field. The statistics are returned as an array of structures for each queried + * domain. The structure contains an array of typed parameters containing the + * individual statistics. The typed parameter name for each statistic field + * consists of a dot-separated string containing name of the requested group + * followed by a group specific description of the statistic value. + * + * The statistic groups are enabled using the @stats parameter which is a + * binary-OR of enum virDomainStatsTypes. The following groups are available + * (although not necessarily implemented for each storage driver): + * + * VIR_DOMAIN_STATS_ALL: Return all statistics supported by the hypervisor + * driver. This allows to query everything the driver supports without getting + * an error. + * + * VIR_DOMAIN_STATS_STATE: Return domain state and reason for entering that + * state. The typed parameter keys are in format: + * "state.state" - state of the VM, returned as int from virDomainState enum + * "state.reason" - reason for entering given state, returned as in from + * virDomain*Reason enmum corresponding to given state. + * + * Returns the count of returned statistics strucutres on success, -1 on error. + * The requested data are returned in the @retStats parameter. The returned + * array should be freed by the caller. See virDomainStatsRecordListFree. + */ +int +virDomainListGetStats(virDomainPtr *doms, + unsigned int stats, + virDomainStatsRecordPtr **retStats, + unsigned int flags) +{ + virConnectPtr conn = NULL; + virDomainPtr *nextdom = doms; + unsigned int ndoms = 0; + int ret = -1; + + VIR_DEBUG("doms=%p, stats=0x%x, retStats=%p, flags=0x%x", + doms, stats, retStats, flags); + + virResetLastError(); + + if (!*doms) { + virReportError(VIR_ERR_INVALID_ARG, + _("doms array in %s must contain at leas one domain"), + __FUNCTION__); + goto cleanup; + } + + conn = doms[0]->conn; + + if (!conn->driver->domainListGetStats) { + virReportUnsupportedError(); + goto cleanup; + } + + while (*(++nextdom)) { + virDomainPtr dom = *nextdom; + + virCheckDomainGoto(dom, cleanup); + + if (dom->conn != conn) { + virReportError(VIR_ERR_INVALID_ARG, + _("domains in 'doms' array must belong to a " + "single connection in %s"), __FUNCTION__); + goto cleanup; + } + + ndoms++; + } + + ret = conn->driver->domainListGetStats(conn, doms, ndoms, stats, retStats, + flags); + + cleanup: + if (ret < 0) + virDispatchError(conn); + return ret; +} + + +/** + * virDomainStatsRecordListFree: + * @stats: NULL terminated array of virDomainStatsRecords to free + * + * Convenience function to free a list of domain stats returned by + * virDomainListGetStats and virConnectGetAllDomainStats. + */ +void +virDomainStatsRecordListFree(virDomainStatsRecordPtr *stats) +{ + virDomainStatsRecordPtr *next = stats; + + while (*next) { + virTypedParamsFree((*next)->params, (*next)->nparams); + virDomainFree((*next)->dom); + VIR_FREE((*next)); + next++; + } + + VIR_FREE(stats); +} diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index 9f4016a..3714159 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -670,4 +670,11 @@ LIBVIRT_1.2.7 { virConnectGetDomainCapabilities; } LIBVIRT_1.2.6; +LIBVIRT_1.2.8 { + global: + virDomainListGetStats; + virConnectGetAllDomainStats; + virDomainStatsRecordListFree; +} LIBVIRT_1.2.7; + # .... define new API here using predicted next version number .... -- 2.0.2

3 2

[libvirt] [PATCH] fix mingw build
by Pavel Hrdina 25 Aug '14

25 Aug '14

The commit "f5b4c141" introduced new "force" parameter for "virFDStreamOpenFileInternal" but forget to update one call of that function. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed as build breaker. src/fdstream.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/fdstream.c b/src/fdstream.c index 4cf152a..9ff7e2a 100644 --- a/src/fdstream.c +++ b/src/fdstream.c @@ -769,7 +769,8 @@ int virFDStreamOpenPTY(virStreamPtr st, { return virFDStreamOpenFileInternal(st, path, offset, length, - oflags | O_CREAT, 0); + oflags | O_CREAT, 0, + false); } #endif /* !HAVE_CFMAKERAW */ -- 1.8.5.5

2 1

[libvirt] [PATCH 0/3] storage: zfs: implement download and upload
by Roman Bogorodskiy 25 Aug '14

25 Aug '14

Roman Bogorodskiy (3): fdstream: report error if virSetNonBlock fails fdstream: introduce virFDStreamOpenBlockDevice storage: zfs: implement download and upload src/fdstream.c | 30 +++++++++++++++++++++++------- src/fdstream.h | 5 +++++ src/libvirt_private.syms | 1 + src/storage/storage_backend.c | 6 ++++-- src/storage/storage_backend_zfs.c | 2 ++ 5 files changed, 35 insertions(+), 9 deletions(-) -- 1.9.0

3 10

[libvirt] [PATCH] maint: fix comment typo
by Eric Blake 24 Aug '14

24 Aug '14

* src/util/virbuffer.h: s/occured/occurred/ Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. src/util/virbuffer.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virbuffer.h b/src/util/virbuffer.h index bdfff5e..90e248d 100644 --- a/src/util/virbuffer.h +++ b/src/util/virbuffer.h @@ -1,7 +1,7 @@ /* * virbuffer.h: buffers for libvirt * - * Copyright (C) 2005-2008, 2011-2013 Red Hat, Inc. + * Copyright (C) 2005-2008, 2011-2014 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -64,7 +64,7 @@ int virBufferCheckErrorInternal(const virBuffer *buf, * * Checks if the buffer is in error state and reports an error. * - * Returns 0 if no error has occured, otherwise an error is reported + * Returns 0 if no error has occurred, otherwise an error is reported * and -1 is returned. */ # define virBufferCheckError(buf) \ -- 1.9.3

1 0

[libvirt] [PATCH] qemu: check for active domain after agent interaction
by Eric Blake 23 Aug '14

23 Aug '14

Commit b606bbb41 reminded me that any time we drop locks to run back-to-back guest interaction commands, we have to check that the guest didn't disappear in between the two commands. A quick audit found a couple of spots that were missing this check. * src/qemu/qemu_driver.c (qemuDomainShutdownFlags) (qemuDomainSetVcpusFlags): Check that domain is still up. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I found this by inspection, and did not try to actually reproduce if it would cause failures. I think a failure could be easier to reproduce by temporarily sticking a strategic sleep() call just prior to the qemuDomainObjExtAgent() call, and during the time while libvirtd is sleeping, manually cause the guest to exit. But we've definitely fixed issues like this before. src/qemu/qemu_driver.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 02088cc..4ae76e5 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1921,6 +1921,13 @@ static int qemuDomainShutdownFlags(virDomainPtr dom, unsigned int flags) (ret < 0 && (acpiRequested || !flags))) { qemuDomainSetFakeReboot(driver, vm, isReboot); + /* Even if agent failed, we have to check if guest went away + * by itself while our locks were down. */ + if (useAgent && !virDomainObjIsActive(vm)) { + ret = 0; + goto endjob; + } + qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorSystemPowerdown(priv->mon); qemuDomainObjExitMonitor(driver, vm); @@ -4360,6 +4367,12 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, if (ncpuinfo < 0) goto endjob; + if (!virDomainObjIsActive(vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("domain is not running")); + goto endjob; + } + if (qemuAgentUpdateCPUInfo(nvcpus, cpuinfo, ncpuinfo) < 0) goto endjob; -- 1.9.3

2 2

[libvirt] [PATCH] Fix spacing around commas
by Michal Privoznik 23 Aug '14

23 Aug '14

On some places in the libvirt code we have: f(a,z) instead of f(a, z) This trivial patch fixes couple of such occurrences. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. HACKING | 2 +- docs/hacking.html.in | 2 +- examples/object-events/event-test.c | 2 +- src/driver.h | 2 +- src/internal.h | 26 +++++++++++++------------- src/locking/lock_driver_lockd.c | 2 +- src/locking/lock_driver_sanlock.c | 2 +- src/lxc/lxc_conf.c | 2 +- src/nwfilter/nwfilter_dhcpsnoop.c | 2 +- src/qemu/qemu_conf.c | 2 +- src/storage/parthelper.c | 2 +- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/HACKING b/HACKING index 4cf2906..88a4286 100644 --- a/HACKING +++ b/HACKING @@ -477,7 +477,7 @@ Use parenthesis when checking if a macro is defined, and use indentation to track nesting: #if defined(HAVE_POSIX_FALLOCATE) && !defined(HAVE_FALLOCATE) - # define fallocate(a,ignored,b,c) posix_fallocate(a,b,c) + # define fallocate(a, ignored, b, c) posix_fallocate(a, b, c) #endif diff --git a/docs/hacking.html.in b/docs/hacking.html.in index 6a92f46..bc76542 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -614,7 +614,7 @@ </p> <pre> #if defined(HAVE_POSIX_FALLOCATE) && !defined(HAVE_FALLOCATE) - # define fallocate(a,ignored,b,c) posix_fallocate(a,b,c) + # define fallocate(a, ignored, b, c) posix_fallocate(a, b, c) #endif </pre> diff --git a/examples/object-events/event-test.c b/examples/object-events/event-test.c index 2a5a83b..d6cfe46 100644 --- a/examples/object-events/event-test.c +++ b/examples/object-events/event-test.c @@ -10,7 +10,7 @@ #include <libvirt/virterror.h> #define VIR_DEBUG(fmt) printf("%s:%d: " fmt "\n", __func__, __LINE__) -#define STREQ(a,b) (strcmp(a,b) == 0) +#define STREQ(a, b) (strcmp(a, b) == 0) #ifndef ATTRIBUTE_UNUSED # define ATTRIBUTE_UNUSED __attribute__((__unused__)) diff --git a/src/driver.h b/src/driver.h index 158df79..ba7c1fc 100644 --- a/src/driver.h +++ b/src/driver.h @@ -78,7 +78,7 @@ typedef enum { * != 0 Feature is supported. * 0 Feature is not supported. */ -# define VIR_DRV_SUPPORTS_FEATURE(drv,conn,feature) \ +# define VIR_DRV_SUPPORTS_FEATURE(drv, conn, feature) \ ((drv)->connectSupportsFeature ? \ (drv)->connectSupportsFeature((conn), (feature)) > 0 : 0) diff --git a/src/internal.h b/src/internal.h index d355344..f6a88b2 100644 --- a/src/internal.h +++ b/src/internal.h @@ -78,16 +78,16 @@ # endif /* String equality tests, suggested by Jim Meyering. */ -# define STREQ(a,b) (strcmp(a,b) == 0) -# define STRCASEEQ(a,b) (c_strcasecmp(a,b) == 0) -# define STRNEQ(a,b) (strcmp(a,b) != 0) -# define STRCASENEQ(a,b) (c_strcasecmp(a,b) != 0) -# define STREQLEN(a,b,n) (strncmp(a,b,n) == 0) -# define STRCASEEQLEN(a,b,n) (c_strncasecmp(a,b,n) == 0) -# define STRNEQLEN(a,b,n) (strncmp(a,b,n) != 0) -# define STRCASENEQLEN(a,b,n) (c_strncasecmp(a,b,n) != 0) -# define STRPREFIX(a,b) (strncmp(a,b,strlen(b)) == 0) -# define STRSKIP(a,b) (STRPREFIX(a,b) ? (a) + strlen(b) : NULL) +# define STREQ(a, b) (strcmp(a, b) == 0) +# define STRCASEEQ(a, b) (c_strcasecmp(a, b) == 0) +# define STRNEQ(a, b) (strcmp(a, b) != 0) +# define STRCASENEQ(a, b) (c_strcasecmp(a, b) != 0) +# define STREQLEN(a, b, n) (strncmp(a, b, n) == 0) +# define STRCASEEQLEN(a, b, n) (c_strncasecmp(a, b, n) == 0) +# define STRNEQLEN(a, b, n) (strncmp(a, b, n) != 0) +# define STRCASENEQLEN(a, b, n) (c_strncasecmp(a, b, n) != 0) +# define STRPREFIX(a, b) (strncmp(a, b, strlen(b)) == 0) +# define STRSKIP(a, b) (STRPREFIX(a, b) ? (a) + strlen(b) : NULL) # define STREQ_NULLABLE(a, b) \ ((a) ? (b) && STREQ((a) ? (a) : "", (b) ? (b) : "") : !(b)) @@ -109,7 +109,7 @@ # define __GNUC_PREREQ(maj, min) \ ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) # else -# define __GNUC_PREREQ(maj,min) 0 +# define __GNUC_PREREQ(maj, min) 0 # endif /* Work around broken limits.h on debian etch */ @@ -162,10 +162,10 @@ */ # ifndef ATTRIBUTE_FMT_PRINTF # if __GNUC_PREREQ (4, 4) -# define ATTRIBUTE_FMT_PRINTF(fmtpos,argpos) \ +# define ATTRIBUTE_FMT_PRINTF(fmtpos, argpos) \ __attribute__((__format__ (__gnu_printf__, fmtpos, argpos))) # else -# define ATTRIBUTE_FMT_PRINTF(fmtpos,argpos) \ +# define ATTRIBUTE_FMT_PRINTF(fmtpos, argpos) \ __attribute__((__format__ (__printf__, fmtpos, argpos))) # endif # endif diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c index 367d0ce..0a40e94 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -99,7 +99,7 @@ static int virLockManagerLockDaemonLoadConfig(const char *configFile) if (!(conf = virConfReadFile(configFile, 0))) return -1; -#define CHECK_TYPE(name,typ) if (p && p->type != (typ)) { \ +#define CHECK_TYPE(name, typ) if (p && p->type != (typ)) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ "%s: %s: expected type " #typ, \ configFile, (name)); \ diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index ea43051..aade437 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -118,7 +118,7 @@ static int virLockManagerSanlockLoadConfig(const char *configFile) if (!(conf = virConfReadFile(configFile, 0))) return -1; -#define CHECK_TYPE(name,typ) if (p && p->type != (typ)) { \ +#define CHECK_TYPE(name, typ) if (p && p->type != (typ)) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ "%s: %s: expected type " #typ, \ configFile, (name)); \ diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c index b5fd3cb..17df7a8 100644 --- a/src/lxc/lxc_conf.c +++ b/src/lxc/lxc_conf.c @@ -259,7 +259,7 @@ virLXCLoadDriverConfig(virLXCDriverConfigPtr cfg, if (!conf) goto done; -#define CHECK_TYPE(name,typ) if (p && p->type != (typ)) { \ +#define CHECK_TYPE(name, typ) if (p && p->type != (typ)) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ "%s: %s: expected type " #typ, \ filename, (name)); \ diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c index bfd0553..a2f58ba 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -1229,7 +1229,7 @@ virNWFilterSnoopRateLimit(virNWFilterSnoopRateLimitConfPtr rl) { time_t now = time(0); int diff; -# define IN_BURST(n,b) ((n)-(b) <= 1) /* bursts span 2 discrete seconds */ +# define IN_BURST(n, b) ((n)-(b) <= 1) /* bursts span 2 discrete seconds */ if (rl->prev != now && !IN_BURST(now, rl->burst)) { rl->prev = now; diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 25e6d5e..e2ec54f 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -347,7 +347,7 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, if (!(conf = virConfReadFile(filename, 0))) goto cleanup; -#define CHECK_TYPE(name,typ) \ +#define CHECK_TYPE(name, typ) \ if (p && p->type != (typ)) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ "%s: %s: expected type " #typ, \ diff --git a/src/storage/parthelper.c b/src/storage/parthelper.c index c04f1bd..84e7ba0 100644 --- a/src/storage/parthelper.c +++ b/src/storage/parthelper.c @@ -48,7 +48,7 @@ #include "virstring.h" /* we don't need to include the full internal.h just for this */ -#define STREQ(a,b) (strcmp(a,b) == 0) +#define STREQ(a, b) (strcmp(a, b) == 0) /* Make the comparisons below fail if your parted headers are so old that they lack the definition. */ -- 1.8.5.5

2 1

[libvirt] [PATCH 0/3] Resolve some Coverity issues
by John Ferlan 23 Aug '14

23 Aug '14

Resolve some issues seen by my daily Coverity run. Interesting that they didn't show up on the internal Jenkins Coverity scanner, but did show up on my daily run. Perhaps because I have 7.0.3 and the Jenkins has 7.0.0... I also see 7.5.0 is available - I'll give that a go too... John Ferlan (3): commandtest: Resolve Coverity RESOURCE_LEAK virnetsocket: Resolve Coverity RESOURCE_LEAK xenconfig: Resolve Coverity RESOURCE_LEAK src/rpc/virnetsocket.c | 8 ++++++-- src/xenconfig/xen_common.c | 2 ++ tests/commandtest.c | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) -- 1.9.3

3 13

[libvirt] [PATCH 0/2] parallels: use parallels SDK instead of prlctl tool
by Dmitry Guryanov 23 Aug '14

23 Aug '14

This patchset begins reworking of parallels driver. We have published Opensource version of parallels SDK (under LGPL license), so libvirt can link with it. Dmitry Guryanov (2): parallels: build with parallels SDK parallels: login to parallels SDK configure.ac | 11 +++++----- po/POTFILES.in | 1 + src/Makefile.am | 8 +++++-- src/parallels/parallels_driver.c | 46 +++++++++++++++++++++++++++++++++++++++- src/parallels/parallels_utils.h | 3 +++ 5 files changed, 60 insertions(+), 9 deletions(-) -- 1.9.3

2 7

[libvirt] [PATCH v2 0/3] Wrong allocation size displayed for NFS volumes
by John Ferlan 22 Aug '14

22 Aug '14

Changes over v1 - different tact as more research discovers that the posix_fallocate() does not perform the correct pre-allocation of space for an NFS backed file/disk, some details of the findings can be found: http://www.redhat.com/archives/libvir-list/2014-August/msg00367.html The first patch in this series will refactor the safezero to allow for more fallback than the current code. Initially implemented as a series of three 'safezero()' functions in commit id 'c29d0929' using build conditionals to determine which of the 3 is being used. The refactored code will have one function that will make a series of calls rather the just failing on whatever is built into the system. The first is a global virFileFdPosixFallocate() with the build conditional controlling only whether the function runs or will just return -1. It will also be re-used by the Volume Resize code in a future patch. If on creation the virFileFdPosixFallocate() fails, attempts will be made to then try the mmap() method (if it exists), and then fall back to the slow, old, safewrite of zero filled buffers. The mmap function will follow the format of the posix_fallocate insomuch as if HAVE_MMAP is defined, then that will be attempted or a -1 will be returned immediately. The major change of this patch over the prior code is the fallback. One other minor change is if the virFileFdPosixFallocate() tries to call posix_fallocate() and fails, then a VIR_WARN will be used to indicate something went wrong. Previously, the code would return errno and eventually that would filter back to a caller which would use the errno in a sys error message. This I think only is odd when it comes to the resize path. The second patch looks to resolve the first issue discovered by: https://bugzilla.redhat.com/show_bug.cgi?id=1077068 It does this by checking the returned size/len of the file in the posix_fallocate() call and if it does not match a VIR_WARN will be posted and a failure returned allowing either the mmap or write of zero filled buffers to the file. The third patch changes the virStorageFileResize() logic to follow the safezero() logic with respect to build conditionals. Also, rather than reinvent the wheel, it will reuse the virFileFdPosixFallocate(). The new static API resizeSysFallocate() will return -1 if the build conditionals are not met. A current "downside" is by calling virFileFdPosixFallocate() twice (once directly and the other indirectly through safezero), the VIR_WARN will be displayed twice, but that should only affect someone trying to debug things. NOTE: Investigation and testing while creating this series also showed it's possible to modify the NFS Pool Start code to add a "-o wsize=4096" to the MOUNT command in order to force smaller write's. While that did fix the symptoms, the fix just didn't "feel right". The block size of the "source" export was 4096 bytes, while the block size of the "target" file was 1048576 bytes (current NFSv4 wsize default value when not specified). Whether those play into what posix_fallocate() does I am not sure, but if it does and that's fixed, then the way these patches are coded up - it won't matter. Compared to perhaps needing to revisit or document heavily how to set some new field in the pool XML source - this just seems more right. John Ferlan (3): virfile: Refactor safezero, introduce virFileFdPosixFallocate virfile: Check returned size from virFileFdPosixFallocate virstoragefile: Refactor virStorageFileResize src/libvirt_private.syms | 1 + src/util/virfile.c | 58 ++++++++++++++++++++++++++++++++++++++--------- src/util/virfile.h | 2 ++ src/util/virstoragefile.c | 52 +++++++++++++++++++++++++++--------------- 4 files changed, 84 insertions(+), 29 deletions(-) -- 1.9.3

3 14

[libvirt] [PATCHv2] qemu: min_guarantee: Parameter 'min_guarantee' not supported
by Erik Skultety 22 Aug '14

22 Aug '14

The 'min_guarantee' is used by VMware ESX and OpenVZ drivers, with qemu however, libvirt should report error when starting a domain, because this element is not used. Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1122455 --- docs/formatdomain.html.in | 3 ++- src/qemu/qemu_process.c | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index bd99ae0..eacf8db 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -713,7 +713,8 @@ <dt><code>min_guarantee</code></dt> <dd> The optional <code>min_guarantee</code> element is the guaranteed minimum memory allocation for the guest. The units for this value are - kibibytes (i.e. blocks of 1024 bytes)</dd> + kibibytes (i.e. blocks of 1024 bytes). This element is only supported + by VMware ESX and OpenVZ drivers.</dd> </dl> diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 9e6a9ae..39cce7c 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3993,6 +3993,13 @@ int qemuProcessStart(virConnectPtr conn, flags & VIR_QEMU_PROCESS_START_COLD) < 0) goto cleanup; + if (vm->def->mem.min_guarantee) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Parameter 'min_guarantee' " + "not supported by QEMU.")); + goto cleanup; + } + if (VIR_ALLOC(priv->monConfig) < 0) goto cleanup; -- 1.9.3

2 1

[libvirt] [PATCHv3] numatune: setting --mode does not work well
by Erik Skultety 22 Aug '14

22 Aug '14

When trying to set numatune mode directly using virsh numatune command, correct error is raised, however numatune structure was not deallocated, thus resulting in creating an empty numatune element in the guest XML, if none was present before. Running the same command aftewards results in a successful change with broken XML structure. Patch fixes the deallocation problem as well as checking for invalid attribute combination VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO + a nonempty nodeset. Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1129998 --- src/conf/numatune_conf.c | 45 ++++++++++++++-------- ...-numad-auto-vcpu-static-numatune-no-nodeset.xml | 31 +++++++++++++++ tests/qemuxml2argvtest.c | 1 + 3 files changed, 62 insertions(+), 15 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune-no-nodeset.xml diff --git a/src/conf/numatune_conf.c b/src/conf/numatune_conf.c index 48d1d04..ff0f3eb 100644 --- a/src/conf/numatune_conf.c +++ b/src/conf/numatune_conf.c @@ -437,14 +437,27 @@ virDomainNumatuneSet(virDomainNumatunePtr *numatunePtr, int mode, virBitmapPtr nodeset) { - bool create = !*numatunePtr; /* Whether we are creating new struct */ + bool created = false; int ret = -1; - virDomainNumatunePtr numatune = NULL; + virDomainNumatunePtr numatune; /* No need to do anything in this case */ if (mode == -1 && placement == -1 && !nodeset) return 0; + if (!(*numatunePtr)) { + if (VIR_ALLOC(*numatunePtr) < 0) + goto cleanup; + + created = true; + if (mode == -1) + mode = VIR_DOMAIN_NUMATUNE_MEM_STRICT; + if (placement == -1) + placement = VIR_DOMAIN_NUMATUNE_PLACEMENT_DEFAULT; + } + + numatune = *numatunePtr; + /* Range checks */ if (mode != -1 && (mode < 0 || mode >= VIR_DOMAIN_NUMATUNE_MEM_LAST)) { @@ -453,6 +466,7 @@ virDomainNumatuneSet(virDomainNumatunePtr *numatunePtr, mode); goto cleanup; } + if (placement != -1 && (placement < 0 || placement >= VIR_DOMAIN_NUMATUNE_PLACEMENT_LAST)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -461,21 +475,9 @@ virDomainNumatuneSet(virDomainNumatunePtr *numatunePtr, goto cleanup; } - if (create && VIR_ALLOC(*numatunePtr) < 0) - goto cleanup; - numatune = *numatunePtr; - - if (create) { - /* Defaults for new struct */ - if (mode == -1) - mode = VIR_DOMAIN_NUMATUNE_MEM_STRICT; - - if (placement == -1) - placement = VIR_DOMAIN_NUMATUNE_PLACEMENT_DEFAULT; - } - if (mode != -1) numatune->memory.mode = mode; + if (nodeset) { virBitmapFree(numatune->memory.nodeset); numatune->memory.nodeset = virBitmapNewCopy(nodeset); @@ -500,13 +502,26 @@ virDomainNumatuneSet(virDomainNumatunePtr *numatunePtr, goto cleanup; } + /* setting nodeset when placement auto is invalid */ + if (placement == VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO && + numatune->memory.nodeset) { + virBitmapFree(numatune->memory.nodeset); + numatune->memory.nodeset = NULL; + } + if (placement != -1) numatune->memory.placement = placement; numatune->memory.specified = true; ret = 0; + cleanup: + if (ret < 0 && created) { + virDomainNumatuneFree(*numatunePtr); + *numatunePtr = NULL; + } + return ret; } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune-no-nodeset.xml b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune-no-nodeset.xml new file mode 100644 index 0000000..b3cb5c5 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune-no-nodeset.xml @@ -0,0 +1,31 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='auto'>2</vcpu> + <numatune> + <memory mode='interleave' placement='static'/> + </numatune> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <cpu> + <topology sockets='2' cores='1' threads='1'/> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 65dc9c7..b289d0e 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1223,6 +1223,7 @@ mymain(void) DO_TEST_PARSE_ERROR("numatune-memnodes-problematic", NONE); DO_TEST("numad", NONE); DO_TEST("numad-auto-vcpu-static-numatune", NONE); + DO_TEST_PARSE_ERROR("numad-auto-vcpu-static-numatune-no-nodeset", NONE); DO_TEST("numad-auto-memory-vcpu-cpuset", NONE); DO_TEST("numad-auto-memory-vcpu-no-cpuset-and-placement", NONE); DO_TEST("numad-static-memory-auto-vcpu", NONE); -- 1.9.3

2 1

[libvirt] [PATCH] iotune: setting an invalid value now reports error
by Erik Skultety 22 Aug '14

22 Aug '14

When trying to set an invalid value into iotune element, standard behavior was to not report any error, rather to reset all affected subelements of the iotune element back to 0 which results in ignoring those particular subelements by XML generator. Patch further examines the return code of the virXPathULongLong function and in case of an invalid non-integer value raises an error. Fixed to preserve consistency with invalid value checking of other elements. Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1131811 --- src/conf/domain_conf.c | 55 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 43 insertions(+), 12 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9557020..592aa94 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5416,6 +5416,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, char *mirrorType = NULL; int expected_secret_usage = -1; int auth_secret_usage = -1; + int ret = 0; if (!(def = virDomainDiskDefNew())) return NULL; @@ -5644,40 +5645,70 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, goto error; } } else if (xmlStrEqual(cur->name, BAD_CAST "iotune")) { - if (virXPathULongLong("string(./iotune/total_bytes_sec)", + ret = virXPathULongLong("string(./iotune/total_bytes_sec)", ctxt, - &def->blkdeviotune.total_bytes_sec) < 0) { + &def->blkdeviotune.total_bytes_sec); + if (ret < 0 && ret != -2) { def->blkdeviotune.total_bytes_sec = 0; + } else if (ret == -2) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("total throughput limit must be an integer")); + goto error; } - if (virXPathULongLong("string(./iotune/read_bytes_sec)", + ret = virXPathULongLong("string(./iotune/read_bytes_sec)", ctxt, - &def->blkdeviotune.read_bytes_sec) < 0) { + &def->blkdeviotune.read_bytes_sec); + if (ret < 0 && ret != -2) { def->blkdeviotune.read_bytes_sec = 0; + } else if (ret == -2) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("read throughput limit must be an integer")); + goto error; } - if (virXPathULongLong("string(./iotune/write_bytes_sec)", + ret = virXPathULongLong("string(./iotune/write_bytes_sec)", ctxt, - &def->blkdeviotune.write_bytes_sec) < 0) { + &def->blkdeviotune.write_bytes_sec); + if (ret < 0 && ret != -2) { def->blkdeviotune.write_bytes_sec = 0; + } else if (ret == -2) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("write throughput limit must be an integer")); + goto error; } - if (virXPathULongLong("string(./iotune/total_iops_sec)", + ret = virXPathULongLong("string(./iotune/total_iops_sec)", ctxt, - &def->blkdeviotune.total_iops_sec) < 0) { + &def->blkdeviotune.total_iops_sec); + if (ret < 0 && ret != -2) { def->blkdeviotune.total_iops_sec = 0; + } else if (ret == -2) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("total I/O operations limit must be an integer")); + goto error; } - if (virXPathULongLong("string(./iotune/read_iops_sec)", + ret = virXPathULongLong("string(./iotune/read_iops_sec)", ctxt, - &def->blkdeviotune.read_iops_sec) < 0) { + &def->blkdeviotune.read_iops_sec); + if (ret < 0 && ret != -2) { def->blkdeviotune.read_iops_sec = 0; + } else if (ret == -2) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("read I/O operations limit must be an integer")); + goto error; } - if (virXPathULongLong("string(./iotune/write_iops_sec)", + ret = virXPathULongLong("string(./iotune/write_iops_sec)", ctxt, - &def->blkdeviotune.write_iops_sec) < 0) { + &def->blkdeviotune.write_iops_sec); + if (ret < 0 && ret != -2) { def->blkdeviotune.write_iops_sec = 0; + } else if (ret == -2) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("write I/O operations limit must be an integer")); + goto error; } if ((def->blkdeviotune.total_bytes_sec && -- 1.9.3

2 1

[libvirt] [PATCH v2 0/5] Parallels: patchset
by Alexander Burluka 22 Aug '14

22 Aug '14

Another patchset for Parallels libvirt driver. This patchset includes some minor bugfixing and adds some functions required to start OpenStack Changes in v2: fixed wrong error codes in config error handling. Alexander Burluka (5): Parallels: add virNodeGetCPUMap(). Parallels: fix error with video card RAM dimension Parallels: Change config report errors code. Parallels: Add domainCreateWithFlags() function. Parallels: add events emiting while creating domain. src/parallels/parallels_driver.c | 155 ++++++++++++++++++++++++++++----------- 1 file changed, 113 insertions(+), 42 deletions(-) -- 1.9.1

3 10

[libvirt] [PATCH v5 0/3] OVMF exposure
by Michal Privoznik 22 Aug '14

22 Aug '14

Diff to v4: -rebased onto current master -introduced nvram/@template as requested by Dan -yet another Laszlo's review worked in Michal Privoznik (3): conf: Extend <loader/> and introduce <nvram/> qemu: Implement extended loader and nvram qemu: Automatically create NVRAM store docs/formatdomain.html.in | 22 +++- docs/schemas/domaincommon.rng | 28 +++++ libvirt.spec.in | 2 + src/Makefile.am | 1 + src/conf/domain_conf.c | 96 ++++++++++++++- src/conf/domain_conf.h | 23 +++- src/libvirt_private.syms | 3 + src/qemu/libvirtd_qemu.aug | 3 + src/qemu/qemu.conf | 14 +++ src/qemu/qemu_command.c | 97 ++++++++++++++- src/qemu/qemu_conf.c | 94 ++++++++++++++ src/qemu/qemu_conf.h | 5 + src/qemu/qemu_process.c | 137 +++++++++++++++++++++ src/qemu/test_libvirtd_qemu.aug.in | 3 + src/security/security_dac.c | 8 ++ src/security/security_selinux.c | 8 ++ src/security/virt-aa-helper.c | 4 +- src/vbox/vbox_common.c | 7 +- src/xenapi/xenapi_driver.c | 3 +- src/xenconfig/xen_common.c | 7 +- src/xenconfig/xen_sxpr.c | 16 +-- tests/domainschemadata/domain-bios-nvram-empty.xml | 40 ++++++ .../qemuxml2argvdata/qemuxml2argv-bios-nvram.args | 10 ++ tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.xml | 40 ++++++ tests/qemuxml2argvtest.c | 2 + .../qemuxml2xmlout-pci-bridge-many-disks.xml | 2 +- tests/qemuxml2xmltest.c | 2 + tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml | 2 +- .../sexpr2xml-fv-serial-dev-2-ports.xml | 2 +- .../sexpr2xml-fv-serial-dev-2nd-port.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml | 2 +- .../sexpr2xml-fv-serial-tcp-telnet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-sound.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-utc.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-v2.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml | 2 +- tests/xmconfigdata/test-escape-paths.xml | 2 +- tests/xmconfigdata/test-fullvirt-force-hpet.xml | 2 +- tests/xmconfigdata/test-fullvirt-force-nohpet.xml | 2 +- tests/xmconfigdata/test-fullvirt-localtime.xml | 2 +- tests/xmconfigdata/test-fullvirt-net-ioemu.xml | 2 +- tests/xmconfigdata/test-fullvirt-net-netfront.xml | 2 +- tests/xmconfigdata/test-fullvirt-new-cdrom.xml | 2 +- tests/xmconfigdata/test-fullvirt-old-cdrom.xml | 2 +- tests/xmconfigdata/test-fullvirt-parallel-tcp.xml | 2 +- .../test-fullvirt-serial-dev-2-ports.xml | 2 +- .../test-fullvirt-serial-dev-2nd-port.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-file.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-null.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-pipe.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-pty.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-stdio.xml | 2 +- .../test-fullvirt-serial-tcp-telnet.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-tcp.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-udp.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-unix.xml | 2 +- tests/xmconfigdata/test-fullvirt-sound.xml | 2 +- tests/xmconfigdata/test-fullvirt-usbmouse.xml | 2 +- tests/xmconfigdata/test-fullvirt-usbtablet.xml | 2 +- tests/xmconfigdata/test-fullvirt-utc.xml | 2 +- tests/xmconfigdata/test-no-source-cdrom.xml | 2 +- tests/xmconfigdata/test-pci-devs.xml | 2 +- 82 files changed, 705 insertions(+), 82 deletions(-) create mode 100644 tests/domainschemadata/domain-bios-nvram-empty.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.xml -- 1.8.5.5

2 6

[libvirt] [PATCH] virsh: Fix help info for freepages
by Li Yang 22 Aug '14

22 Aug '14

Signed-off-by: Li Yang <liyang.fnst(a)cn.fujitsu.com> --- tools/virsh-host.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh-host.c b/tools/virsh-host.c index ae14311..ad821b3 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -263,10 +263,10 @@ cmdFreecell(vshControl *ctl, const vshCmd *cmd) */ static const vshCmdInfo info_freepages[] = { {.name = "help", - .data = N_("NUMA free memory") + .data = N_("NUMA free pages") }, {.name = "desc", - .data = N_("display available free memory for the NUMA cell.") + .data = N_("display available free pages for the NUMA cell.") }, {.name = NULL} }; -- 1.7.1

2 1

[libvirt] [PATCH] util: compare floor attribute in virNetDevBandwidthEqual
by Martin Kletzander 22 Aug '14

22 Aug '14

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1064770 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/util/virnetdevbandwidth.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c index 1e00116..5fa231a 100644 --- a/src/util/virnetdevbandwidth.c +++ b/src/util/virnetdevbandwidth.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2013 Red Hat, Inc. + * Copyright (C) 2009-2014 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -342,6 +342,7 @@ virNetDevBandwidthEqual(virNetDevBandwidthPtr a, if (a->in->average != b->in->average || a->in->peak != b->in->peak || + a->in->floor != b->in->floor || a->in->burst != b->in->burst) return false; } else if (b->in) { @@ -355,6 +356,7 @@ virNetDevBandwidthEqual(virNetDevBandwidthPtr a, if (a->out->average != b->out->average || a->out->peak != b->out->peak || + a->out->floor != b->out->floor || a->out->burst != b->out->burst) return false; } else if (b->out) { -- 2.0.4

2 1

[libvirt] [PATCH] build: fix mingw build with virCommandReorderFDs
by Martin Kletzander 22 Aug '14

22 Aug '14

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: pushed as a build-breaker src/util/vircommand.c | 4 ++-- src/util/virutil.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 3b3e6f5..1d6dbd9 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -201,6 +201,8 @@ virCommandFDSet(virCommandPtr cmd, return 0; } +#ifndef WIN32 + static void virCommandReorderFDs(virCommandPtr cmd) { @@ -273,8 +275,6 @@ virCommandReorderFDs(virCommandPtr cmd) return; } -#ifndef WIN32 - /** * virFork: * diff --git a/src/util/virutil.c b/src/util/virutil.c index 1d897d9..2edbec5 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -2397,6 +2397,8 @@ void virUpdateSelfLastChanged(const char *path) } } +#ifndef WIN32 + /** * virGetListenFDs: * @@ -2458,3 +2460,13 @@ virGetListenFDs(void) return nfds; } + +#else /* WIN32 */ + +unsigned int +virGetListenFDs(void) +{ + return 0; +} + +#endif /* WIN32 */ -- 2.0.4

1 0

[libvirt] RFC: sVirt disk isolation with network based storage
by Daniel P. Berrange 22 Aug '14

22 Aug '14

As everyone knows sVirt is our nice solution to isolating guest resources from other (malicious) guests through SELinux labelling of the appropriate files / device nodes. This has been pretty effective since we introduced it to libvirt. In the last year or two, particularly in the cloud arena, there has been a big shift towards use of network based storage. Initially we were relying on kernel drivers / FUSE layers that exposed this network storage as devices or nodes in the host filesystem, so sVirt still stood a chance of being useful if the devices /FUSE layer supported labelling. Now though QEMU has native support for talking to gluster, ceph/rbd, iscsi and even nfs servers. This support is increasingly used in preference to using the kernel drivers / FUSE layers since it provides a simpler and thus (in theory) better performing I/O path for the network storage and does not require any privileged setup tasks on the host ahead of time. The problem is that I beleive this is blowing a decent sized hole in our sVirt isolation story. eg when we launch QEMU with an argument like this: -drive 'file=rbd:pool/image:auth_supported=none:\ mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;\ mon3.example.org\:6322,if=virtio,format=raw' We are trusting QEMU to only ever access the disk volume 'pool/image'. There are, in all likelihood, many 100's or 1000's of disk images on the server it is connecting to and nothing is stopping QEMU from accessing any of them AFAICT. There is no currrently implemented mechanism by which the sVirt label that QEMU runs under is made available to the remote RBD server to use for enforcement, nor any way in which libvirt could tell the RBD server which label was applied for which disk. The same seems to apply for Gluster, iSCSI, and NFS too when accessed directly from a network client inside the QEMU process. As it stands the only approach I see for isolating each virtual machines disk(s) from other virtual machines is to make use of user authentication with these services. eg each virtual machine would need to have its own dedicated user account on the RBD/Gluster/iSCSI/NFS server, and the disk volumes for the VM would have to be made accessible solely to that user account. Assuming such user account / disk mapping exists in the servers today that can be made to work but it is an incredibly awful solution to deal with when VMs are being dynamically created & deleted very frequently. Today apps like OpenStack just have a single RBD username and password for everything they do. Any virtual machines running with RBD storage on OpenStack thus have no sVirt protection for their disk images AFAICT. To protect images OpenStack would have to dynamically create & delete new user accounts on the RBD server & setup disk access for them. I don't see that kind of approach being viable. IIUC, there is some mechanism at the IP stack level where the kernel can take the SELinux label of the process that establishes the network connection and pass it across to the server. If there was a way in the RBD API for libvirt to label the volumes, then potentially we could have a system where the RBD server did sVirt enforcement, based on the instructions from libvirt & the label of the client process. Thoughts on what to do about this ? Network based storage, where the network client is inside each QEMU server, is here to stay so I don't think we can ignore the problem long term. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

3 4

Re: [libvirt] pvspinlock not accepted by libvirt
by bancfc＠openmailbox.org 22 Aug '14

22 Aug '14

I'm using libvirt version 1.1.3.5 at the moment. I am sure I followed the right syntax as I put it under the features section: <features> ... <pvspinlock/> </features> It says: error internal error: unexpected feature pvspinlock Failed. try again?

2 1

[libvirt] pvspinlock not accepted by libvirt
by bancfc＠openmailbox.org 22 Aug '14

22 Aug '14

Hello, I have been experimenting with the various options to squeeze out the last bit of performance gains so I added the <pvspinlock/> feature to my machines. However when saving the xml, libvirt complains and refuses to accept this tag. AFAIK this is a feature that can be used by KVM too. My guests are Linux of course. So what am I doing wrong here?

2 1

[libvirt] [PATCH] formatdomain: Reformat vCPU description
by John Ferlan 22 Aug '14

22 Aug '14

Reformat the vCPU description to use list elements rather than one long run-on paragraphc Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- While working on some changes I was trying to read this section and suffice to say my eyes hurt. I didn't push as trivial just in case someone had a desire to "change" the words to describe things more clearly. For the most part the changes are just a reformat, although there were a few extra "the"'s added and replacement of a couple of semi-colons with periods. docs/formatdomain.html.in | 75 +++++++++++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 31 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index ed17389..6d0ef8e 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -419,37 +419,50 @@ <dt><code>vcpu</code></dt> <dd>The content of this element defines the maximum number of virtual CPUs allocated for the guest OS, which must be between 1 and - the maximum supported by the hypervisor. <span class="since">Since - 0.4.4</span>, this element can contain an optional - <code>cpuset</code> attribute, which is a comma-separated - list of physical CPU numbers that domain process and virtual CPUs - can be pinned to by default. (NB: The pinning policy of domain - process and virtual CPUs can be specified separately by - <code>cputune</code>. If attribute <code>emulatorpin</code> - of <code>cputune</code> is specified, <code>cpuset</code> - specified by <code>vcpu</code> here will be ignored; Similarly, - For virtual CPUs which has <code>vcpupin</code> specified, - <code>cpuset</code> specified by <code>cpuset</code> here - will be ignored; For virtual CPUs which doesn't have - <code>vcpupin</code> specified, it will be pinned to the physical - CPUs specified by <code>cpuset</code> here). - Each element in that list is either a single CPU number, - a range of CPU numbers, or a caret followed by a CPU number to - be excluded from a previous range. <span class="since">Since - 0.8.5</span>, the optional attribute <code>current</code> can - be used to specify whether fewer than the maximum number of - virtual CPUs should be enabled. <span class="since">Since - 0.9.11 (QEMU and KVM only)</span>, the optional attribute - <code>placement</code> can be used to indicate the CPU placement - mode for domain process, its value can be either "static" or - "auto", defaults to <code>placement</code> of <code>numatune</code>, - or "static" if <code>cpuset</code> is specified. "auto" indicates - the domain process will be pinned to the advisory nodeset from querying - numad, and the value of attribute <code>cpuset</code> will be ignored - if it's specified. If both <code>cpuset</code> and <code>placement</code> - are not specified, or if <code>placement</code> is "static", but no - <code>cpuset</code> is specified, the domain process will be pinned to - all the available physical CPUs. + the maximum supported by the hypervisor. + <dl> + <dt><code>cpuset</code></dt> + <dd> + The optional attribute <code>cpuset</code> is a comma-separated + list of physical CPU numbers that domain process and virtual CPUs + can be pinned to by default. (NB: The pinning policy of domain + process and virtual CPUs can be specified separately by + <code>cputune</code>. If the attribute <code>emulatorpin</code> + of <code>cputune</code> is specified, the <code>cpuset</code> + specified by <code>vcpu</code> here will be ignored. Similarly, + for virtual CPUs which have the <code>vcpupin</code> specified, + the <code>cpuset</code> specified by <code>cpuset</code> here + will be ignored. For virtual CPUs which don't have + <code>vcpupin</code> specified, each will be pinned to the physical + CPUs specified by <code>cpuset</code> here). + Each element in that list is either a single CPU number, + a range of CPU numbers, or a caret followed by a CPU number to + be excluded from a previous range. + <span class="since">Since 0.4.4</span> + </dd> + <dt><code>current</code></dt> + <dd> + The optional attribute <code>current</code> can + be used to specify whether fewer than the maximum number of + virtual CPUs should be enabled. + <span class="since">Since 0.8.5</span> + </dd> + <dt><code>placement</code></dt> + <dd> + The optional attribute <code>placement</code> can be used to + indicate the CPU placement mode for domain process. The value can + be either "static" or "auto", but defaults to <code>placement</code> + of <code>numatune</code> or "static" if <code>cpuset</code> is + specified. Using "auto" indicates the domain process will be pinned + to the advisory nodeset from querying numad and the value of + attribute <code>cpuset</code> will be ignored if it's specified. + If both <code>cpuset</code> and <code>placement</code> are not + specified or if <code>placement</code> is "static", but no + <code>cpuset</code> is specified, the domain process will be + pinned to all the available physical CPUs. + <span class="since">Since 0.9.11 (QEMU and KVM only)</span> + </dd> + </dl> </dd> </dl> -- 1.9.3

2 1

[libvirt] [PATCH v4 0/9] Series on passing FDs to daemon
by Martin Kletzander 22 Aug '14

22 Aug '14

v3 is here: https://www.redhat.com/archives/libvir-list/2014-July/msg01185.html the bug I'm still trying to fix is here: https://bugzilla.redhat.com/show_bug.cgi?id=927369 Martin Kletzander (9): util: abstract parsing of passed FDs into virGetListenFDs() remote: create virNetServerServiceNewFDOrUNIX() wrapper rpc: set listen backlog on FDs as well as on other sockets daemon: support passing FDs from the calling process cfg.mk: allow integers to be assigned a value computed with i|j|k tests: support dynamic prefixes in commandtest util: add virCommandPassListenFDs() function rpc: pass listen FD to the daemon being started daemon: use socket activation with systemd .gitignore | 1 + cfg.mk | 2 +- daemon/Makefile.am | 14 +++++- daemon/libvirtd.c | 45 ++++++++++-------- daemon/libvirtd.conf | 5 ++ daemon/libvirtd.service.in | 5 -- daemon/libvirtd.socket.in | 11 +++++ libvirt.spec.in | 25 ++++++++-- src/libvirt_private.syms | 2 + src/libvirt_remote.syms | 1 + src/locking/lock_daemon.c | 47 ++----------------- src/rpc/virnetserverservice.c | 55 +++++++++++++++++++++- src/rpc/virnetserverservice.h | 15 +++++- src/rpc/virnetsocket.c | 85 ++++++++++++++++++++++++++-------- src/util/vircommand.c | 99 +++++++++++++++++++++++++++++++++++++++ src/util/vircommand.h | 4 +- src/util/virutil.c | 62 +++++++++++++++++++++++++ src/util/virutil.h | 2 + tests/commanddata/test24.log | 7 +++ tests/commandtest.c | 105 ++++++++++++++++++++++++++++++++++-------- 20 files changed, 478 insertions(+), 114 deletions(-) create mode 100644 daemon/libvirtd.socket.in create mode 100644 tests/commanddata/test24.log -- 2.0.4

2 19

[libvirt] [PATCHv2] numatune: setting --mode does not work well
by Erik Skultety 21 Aug '14

21 Aug '14

When trying to set numatune mode directly using virsh numatune command, correct error is raised, however numatune structure was not deallocated, thus resulting in creating an empty numatune element in the guest XML, if none was present before. Running the same command aftewards results in a successful change with broken XML structure. Patch fixes the deallocation problem as well as checking for invalid attribute combination VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO + a nonempty nodeset. Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1129998 --- src/conf/numatune_conf.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/src/conf/numatune_conf.c b/src/conf/numatune_conf.c index 48d1d04..3bfac56 100644 --- a/src/conf/numatune_conf.c +++ b/src/conf/numatune_conf.c @@ -439,7 +439,7 @@ virDomainNumatuneSet(virDomainNumatunePtr *numatunePtr, { bool create = !*numatunePtr; /* Whether we are creating new struct */ int ret = -1; - virDomainNumatunePtr numatune = NULL; + virDomainNumatunePtr numatune = *numatunePtr; /* No need to do anything in this case */ if (mode == -1 && placement == -1 && !nodeset) @@ -461,9 +461,15 @@ virDomainNumatuneSet(virDomainNumatunePtr *numatunePtr, goto cleanup; } - if (create && VIR_ALLOC(*numatunePtr) < 0) + if (placement_static && !nodeset) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("nodeset for NUMA memory tuning must be set " + "if 'placement' is 'static'")); + goto cleanup; + } + + if (create && VIR_ALLOC(numatune) < 0) goto cleanup; - numatune = *numatunePtr; if (create) { /* Defaults for new struct */ @@ -492,12 +498,11 @@ virDomainNumatuneSet(virDomainNumatunePtr *numatunePtr, placement = VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO; } - if (placement == VIR_DOMAIN_NUMATUNE_PLACEMENT_STATIC && - !numatune->memory.nodeset) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("nodeset for NUMA memory tuning must be set " - "if 'placement' is 'static'")); - goto cleanup; + /* setting nodeset when placement auto is invalid */ + if (placement == VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO && + numatune->memory.nodeset) { + virBitmapFree(numatune->memory.nodeset); + numatune->memory.nodeset = NULL; } if (placement != -1) @@ -505,8 +510,17 @@ virDomainNumatuneSet(virDomainNumatunePtr *numatunePtr, numatune->memory.specified = true; + if (create) { + *numatunePtr = numatune; + numatune = NULL; + } + ret = 0; + return ret; + cleanup: + if (create) + virDomainNumatuneFree(numatune); return ret; } -- 1.9.3

2 1

[libvirt] [PATCH] conf: net: Correctly switch how to format address fields
by Peter Krempa 21 Aug '14

21 Aug '14

When formatting the forward mode addresses or interfaces the switch was done based on the type of the network rather than of the type of the individual <interface>/<address> element. In case a user would specify an incorrect network type ("passhtrough") with <address> elements, libvirtd would crash as it would attempt to format an <interface>. Use the type of the individual element to format the XML. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1132347 --- The parser would be better of with a refactor. This is a minimal change to fix the crash. src/conf/network_conf.c | 5 ++--- tests/networkxml2xmlin/passthrough-address-crash.xml | 7 +++++++ tests/networkxml2xmlout/passthrough-address-crash.xml | 7 +++++++ tests/networkxml2xmltest.c | 1 + 4 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 tests/networkxml2xmlin/passthrough-address-crash.xml create mode 100644 tests/networkxml2xmlout/passthrough-address-crash.xml diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 756b9de..dc25c6e 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -2731,7 +2731,7 @@ virNetworkDefFormatBuf(virBufferPtr buf, if (def->forward.nifs && (!def->forward.npfs || !(flags & VIR_NETWORK_XML_INACTIVE))) { for (i = 0; i < def->forward.nifs; i++) { - if (def->forward.type != VIR_NETWORK_FORWARD_HOSTDEV) { + if (def->forward.ifs[i].type == VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_NETDEV) { virBufferEscapeString(buf, "<interface dev='%s'", def->forward.ifs[i].device.dev); if (!(flags & VIR_NETWORK_XML_INACTIVE) && @@ -2740,8 +2740,7 @@ virNetworkDefFormatBuf(virBufferPtr buf, def->forward.ifs[i].connections); } virBufferAddLit(buf, "/>\n"); - } - else { + } else { if (def->forward.ifs[i].type == VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_PCI) { if (virDevicePCIAddressFormat(buf, def->forward.ifs[i].device.pci, diff --git a/tests/networkxml2xmlin/passthrough-address-crash.xml b/tests/networkxml2xmlin/passthrough-address-crash.xml new file mode 100644 index 0000000..a05dbbf --- /dev/null +++ b/tests/networkxml2xmlin/passthrough-address-crash.xml @@ -0,0 +1,7 @@ +<network> + <name>passthrough_001</name> + <uuid>50e92386-8dd1-4a95-8a4b-9a888274eb66</uuid> + <forward mode='passthrough'> + <address type='pci' domain='0x0000' bus='0x11' slot='0x10' function='0x1'/> + </forward> +</network> diff --git a/tests/networkxml2xmlout/passthrough-address-crash.xml b/tests/networkxml2xmlout/passthrough-address-crash.xml new file mode 100644 index 0000000..a05dbbf --- /dev/null +++ b/tests/networkxml2xmlout/passthrough-address-crash.xml @@ -0,0 +1,7 @@ +<network> + <name>passthrough_001</name> + <uuid>50e92386-8dd1-4a95-8a4b-9a888274eb66</uuid> + <forward mode='passthrough'> + <address type='pci' domain='0x0000' bus='0x11' slot='0x10' function='0x1'/> + </forward> +</network> diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c index c6e0f6f..65ac591 100644 --- a/tests/networkxml2xmltest.c +++ b/tests/networkxml2xmltest.c @@ -119,6 +119,7 @@ mymain(void) DO_TEST_FULL("passthrough-pf", VIR_NETWORK_XML_INACTIVE); DO_TEST("hostdev"); DO_TEST_FULL("hostdev-pf", VIR_NETWORK_XML_INACTIVE); + DO_TEST("passthrough-address-crash"); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 2.0.2

2 2

[libvirt] [PATCH] virsh: man: Add LXC format info for domxml-from/to-native
by Li Yang 21 Aug '14

21 Aug '14

Signed-off-by: Li Yang <liyang.fnst(a)cn.fujitsu.com> --- tools/virsh.pod | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 9efb920..015f119 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1128,14 +1128,16 @@ in order to get or set the guest time. Convert the file I<config> in the native guest configuration format named by I<format> to a domain XML format. For QEMU/KVM hypervisor, the I<format> argument must be B<qemu-argv>. For Xen hypervisor, the -I<format> argument may be B<xen-xm> or B<xen-sxpr>. +I<format> argument may be B<xen-xm> or B<xen-sxpr>. For LXC hypervisor, +the I<format> argument must be B<lxc-tools>. =item B<domxml-to-native> I<format> I<xml> Convert the file I<xml> in domain XML format to the native guest configuration format named by I<format>. For QEMU/KVM hypervisor, the I<format> argument must be B<qemu-argv>. For Xen hypervisor, the -I<format> argument may be B<xen-xm> or B<xen-sxpr>. +I<format> argument may be B<xen-xm> or B<xen-sxpr>. For LXC hypervisor, +the I<format> argument must be B<lxc-tools>. =item B<dump> I<domain> I<corefilepath> [I<--bypass-cache>] { [I<--live>] | [I<--crash>] | [I<--reset>] } [I<--verbose>] [I<--memory-only>] -- 1.7.1

2 1

[libvirt] [PATCH v2] Perform disk config validity checking for attach-device config
by John Ferlan 21 Aug '14

21 Aug '14

https://bugzilla.redhat.com/show_bug.cgi?id=1078126 Using 'virsh attach-device --config' (or --persistent) to attach a file backed lun device will succeed; however, subsequent domain restarts will result in failure because the configuration of a file backed lun is not supported. Although allowing 'illegal configurations' is something that can be allowed, it may not be practical in this case. Generally, when attaching a device to a domain means the domain must be running. A way around this is using the --config (or --persistent) option. When an attach is done to a running domain, a temporary configuration is modified first followed by the live update. The live update will make a number of disk validity checks when building the qemu command to attach the disk. If any fail, then change is rejected. Rather than allow a potentially illegal combination, adjust the code in the configuration path to make the same checks as the running path will make with respect to disk validity checks. This way we avoid having the potential for some subsequent start/reboot to fail because an illegal combination was allowed. NB: The live path still checks the configuration since it is possible to just do --live guest modification... Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Changes since V1: http://www.redhat.com/archives/libvir-list/2014-August/msg00045.html Based on #virt IRC discussion this morning - move the qemu_caps checking to only occur during the live check - slightly change the name of the called routine src/qemu/qemu_command.c | 127 +++++++++++++++++++++++++++--------------------- src/qemu/qemu_command.h | 2 + src/qemu/qemu_driver.c | 2 + 3 files changed, 76 insertions(+), 55 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 033a5a8..c1791d9 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3230,6 +3230,73 @@ qemuGetDriveSourceString(virStorageSourcePtr src, } +/* Perform disk definition config validity checks */ +int +qemuBuildCheckDiskConfig(virDomainDiskDefPtr disk) +{ + if (virDiskNameToIndex(disk->dst) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unsupported disk type '%s'"), disk->dst); + goto error; + } + + if (disk->wwn) { + if ((disk->bus != VIR_DOMAIN_DISK_BUS_IDE) && + (disk->bus != VIR_DOMAIN_DISK_BUS_SCSI)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Only ide and scsi disk support wwn")); + goto error; + } + } + + if ((disk->vendor || disk->product) && + disk->bus != VIR_DOMAIN_DISK_BUS_SCSI) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Only scsi disk supports vendor and product")); + goto error; + } + + if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) { + /* make sure that both the bus supports type='lun' (SG_IO). */ + if (disk->bus != VIR_DOMAIN_DISK_BUS_VIRTIO && + disk->bus != VIR_DOMAIN_DISK_BUS_SCSI) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("disk device='lun' is not supported for bus='%s'"), + virDomainDiskQEMUBusTypeToString(disk->bus)); + goto error; + } + if (disk->src->type == VIR_STORAGE_TYPE_NETWORK) { + if (disk->src->protocol != VIR_STORAGE_NET_PROTOCOL_ISCSI) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("disk device='lun' is not supported " + "for protocol='%s'"), + virStorageNetProtocolTypeToString(disk->src->protocol)); + goto error; + } + } else if (!virDomainDiskSourceIsBlockType(disk)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("disk device='lun' is only valid for block " + "type disk source")); + goto error; + } + if (disk->wwn) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Setting wwn is not supported for lun device")); + goto error; + } + if (disk->vendor || disk->product) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Setting vendor or product is not supported " + "for lun device")); + goto error; + } + } + return 0; + error: + return -1; +} + + char * qemuBuildDriveStr(virConnectPtr conn, virDomainDiskDefPtr disk, @@ -3616,68 +3683,18 @@ qemuBuildDriveDevStr(virDomainDefPtr def, { virBuffer opt = VIR_BUFFER_INITIALIZER; const char *bus = virDomainDiskQEMUBusTypeToString(disk->bus); - int idx = virDiskNameToIndex(disk->dst); int controllerModel; - if (idx < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unsupported disk type '%s'"), disk->dst); + if (qemuBuildCheckDiskConfig(disk) < 0) goto error; - } - - if (disk->wwn) { - if ((disk->bus != VIR_DOMAIN_DISK_BUS_IDE) && - (disk->bus != VIR_DOMAIN_DISK_BUS_SCSI)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Only ide and scsi disk support wwn")); - goto error; - } - } - - if ((disk->vendor || disk->product) && - disk->bus != VIR_DOMAIN_DISK_BUS_SCSI) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Only scsi disk supports vendor and product")); - goto error; - } + /* Live only checks */ if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) { - /* make sure that both the bus and the qemu binary support - * type='lun' (SG_IO). - */ - if (disk->bus != VIR_DOMAIN_DISK_BUS_VIRTIO && - disk->bus != VIR_DOMAIN_DISK_BUS_SCSI) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("disk device='lun' is not supported for bus='%s'"), - bus); - goto error; - } - if (disk->src->type == VIR_STORAGE_TYPE_NETWORK) { - if (disk->src->protocol != VIR_STORAGE_NET_PROTOCOL_ISCSI) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("disk device='lun' is not supported for protocol='%s'"), - virStorageNetProtocolTypeToString(disk->src->protocol)); - goto error; - } - } else if (!virDomainDiskSourceIsBlockType(disk)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("disk device='lun' is only valid for block type disk source")); - goto error; - } + /* make sure that the qemu binary supports type='lun' (SG_IO). */ if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_BLK_SG_IO)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("disk device='lun' is not supported by this QEMU")); - goto error; - } - if (disk->wwn) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Setting wwn is not supported for lun device")); - goto error; - } - if (disk->vendor || disk->product) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Setting vendor or product is not supported " - "for lun device")); + _("disk device='lun' is not supported by " + "this QEMU")); goto error; } } diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index b71e964..446f696 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -271,4 +271,6 @@ qemuParseKeywords(const char *str, int qemuGetDriveSourceString(virStorageSourcePtr src, virConnectPtr conn, char **source); + +int qemuBuildCheckDiskConfig(virDomainDiskDefPtr disk); #endif /* __QEMU_COMMAND_H__*/ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 96835bc..b6a2207 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6746,6 +6746,8 @@ qemuDomainAttachDeviceConfig(virQEMUCapsPtr qemuCaps, _("target %s already exists"), disk->dst); return -1; } + if (qemuBuildCheckDiskConfig(disk) < 0) + return -1; if (virDomainDiskInsert(vmdef, disk)) return -1; /* vmdef has the pointer. Generic codes for vmdef will do all jobs */ -- 1.9.3

2 2

[libvirt] [PATCH] hvsupport: Adapt to vbox driver rewrite
by Michal Privoznik 21 Aug '14

21 Aug '14

Since vbox driver rewrite the virDriver structure init moved from vbox_tmpl.c into vbox_common.c. However, our hvsupport.pl script doesn't count with that. It still parses vbox_tmp.c and looks for virDriver structure which is not found there anymore. As a result, at hvsupport page is seems like vbox driver doesn't support anything. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/hvsupport.pl | 2 +- src/vbox/vbox_driver.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/hvsupport.pl b/docs/hvsupport.pl index f8483f9..34ba599 100755 --- a/docs/hvsupport.pl +++ b/docs/hvsupport.pl @@ -28,7 +28,7 @@ my %groupheaders = ( my @srcs; find({ wanted => sub { - if (m!$srcdir/.*/\w+_(driver|tmpl|monitor|hal|udev)\.c$!) { + if (m!$srcdir/.*/\w+_(driver|common|tmpl|monitor|hal|udev)\.c$!) { push @srcs, $_ if $_ !~ /vbox_driver\.c/; } }, no_chdir => 1}, $srcdir); diff --git a/src/vbox/vbox_driver.c b/src/vbox/vbox_driver.c index f0c05fe..498be71 100644 --- a/src/vbox/vbox_driver.c +++ b/src/vbox/vbox_driver.c @@ -210,5 +210,5 @@ static virDrvOpenStatus dummyConnectOpen(virConnectPtr conn, static virDriver vboxDriverDummy = { VIR_DRV_VBOX, "VBOX", - .connectOpen = dummyConnectOpen, + .connectOpen = dummyConnectOpen, /* 0.6.3 */ }; -- 1.8.5.5

3 3

[libvirt] Libvirtd not initializing after 65b7d553
by David Kiarie 21 Aug '14

21 Aug '14

For some I cannot be able able to use virsh after 65b7d553. Libvirtd initializes without errors but I guess something is going unreported $libvirtd -d 2014-08-21 09:29:22.748+0000: 468: info : libvirt version: 1.2.8 2014-08-21 09:29:22.748+0000: 468: warning : virGetHostname:665 : getaddrinfo failed for 'linux-xzc4': Name or service not known $ps aux | grep libvirtd root 471 0.0 0.1 375692 10268 ? SLl 12:29 0:00 libvirtd -d root 570 0.0 0.0 10520 928 pts/0 S+ 12:30 0:00 grep --color=auto libvirtd $virsh nodeinfo error: failed to connect to the hypervisor error: no valid connection error: An error occurred, but the cause is unknown $libvirtd -vvv 2014-08-21 09:31:12.549+0000: 584: info : libvirt version: 1.2.8 2014-08-21 09:31:12.549+0000: 584: warning : virGetHostname:665 : getaddrinfo failed for 'linux-xzc4': Name or service not known 2014-08-21 09:31:12.919+0000: 596: info : libvirt version: 1.2.8 2014-08-21 09:31:12.919+0000: 596: warning : virQEMUCapsInit:976 : Failed to query host NUMA topology, disabling NUMA capabilities 2014-08-21 09:31:12.920+0000: 596: warning : virQEMUCapsInit:980 : Failed to get host CPU 2014-08-21 09:31:12.978+0000: 596: warning : virLXCDriverCapsInit:82 : Failed to query host NUMA topology, disabling NUMA capabilities 2014-08-21 09:31:12.979+0000: 596: warning : umlCapsInit:70 : Failed to query host NUMA topology, disabling NUMA capabilities I have no idea whether this is related to my system or the commit but libvirt master before that commit work perfectly with me.

4 4