- Devel - libvirt List Archives

Re: [libvirt] [PATCH] netns: unix: only allow to find out unix socket in same net namespace
by Gao feng 26 Aug '13

26 Aug '13

cc libvirt-list On 08/21/2013 01:30 PM, Eric W. Biederman wrote: > Gao feng <gaofeng(a)cn.fujitsu.com> writes: > >> Unix sockets are private resources of net namespace, >> allowing one net namespace to access to other netns's unix >> sockets is meaningless. > > Allowing one net namespace to access another netns's unix socket is > deliberate behavior. This is a desired and useful feature, and > only a misconfiguration of visible files would allow this to be a > problem. > >> I'm researching a problem about shutdown from container, >> if the cotainer shares the same file /run/systemd/private >> with host, when we run shutdown -h xxx in container, the >> shutdown message will be send to the systemd-shutdownd >> through unix socket /run/systemd/private, and because >> systemd-shutdownd is running in host, so finally, the host >> will become shutdown. > > The simple answer is don't do that then. I can see no reason > to share /run outside of the container unless you want this kind of > behavior. > > Quite frankly I want this behavior if I am using network namespaces > to support multiple routing contexts. That is if I am using scripts > like: > > ip netns add other > ip netns exec other script > > I don't want to have to remember to say > ip netns orig exec shutdown -h now > > There are more compelling uses and there is no cost in supporting this > in the kernel. > > What kind of misconfiguration caused someone to complain about this? > libvirt lxc allows user to set up a container which shares the same root directory with host. seems like the unix sockets whose sun_path is an abstract socket address are net namespace aware. Should we use "abstract" type of address instead of a file system pathname for systemd in this case?

6 14

[libvirt] [PATCH] schema: Allow dots in device aliases
by Jiri Denemark 26 Aug '13

26 Aug '13

Commit 01b88127 changed aliases for PCI controller devices to "pcie.0" or "pci.%u". Thus device aliases may now contain dots. --- docs/schemas/domaincommon.rng | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index dfcd61c..b537fee 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -4302,7 +4302,7 @@ </define> <define name='aliasName'> <data type="string"> - <param name="pattern">[a-zA-Z0-9_\-]+</param> + <param name="pattern">[a-zA-Z0-9_\-.]+</param> </data> </define> <define name='alias'> -- 1.8.3.2

2 2

[libvirt] [PATCH] qemu: Don't update count of vCPUs if hot-plug fails silently
by Peter Krempa 26 Aug '13

26 Aug '13

When cpu hotplug fails without reporting an error, we would fail the command but update the count of vCPUs anyways. Commit 761fc481365703b861429d73a341bde352ba8d41 fixed the case when CPU hot-unplug failed silently, but forgot to fix up the value in this case. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1000357 --- src/qemu/qemu_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0a8e518..c39f04d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3982,6 +3982,7 @@ static int qemuDomainHotplugVcpus(virQEMUDriverPtr driver, _("got wrong number of vCPU pids from QEMU monitor. " "got %d, wanted %d"), ncpupids, vcpus); + vcpus = oldvcpus; ret = -1; goto cleanup; } -- 1.8.3.2

2 2

[libvirt] [PATCH] Fix loosing the pidfile string of struct _qemuDomainObjPrivate after libvirtd service restarted.
by Wangyufei (A) 26 Aug '13

26 Aug '13

*src/qemu/qemu_domain.c (qemuDomainObjPrivateXMLFormat): Add codes of saving pidfile string to vm'state file. *src/qemu/qemu_domain.c (qemuDomainObjPrivateXMLParse): Add codes of loading pidfile path saved in vm's state file to the pidfile string. Signed-off-by: Xu Chao <xuchao1(a)huawei.com> --- src/qemu/qemu_domain.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 7f4d17d..3c792ab 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -294,6 +294,7 @@ qemuDomainObjPrivateXMLFormat(virBufferPtr buf, void *data) virDomainChrTypeToString(priv->monConfig->type)); } + virBufferEscapeString(buf, " <pidfile path='%s'/>\n", priv->pidfile); if (priv->nvcpupids) { size_t i; @@ -398,6 +399,13 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, void *data) goto error; } + if (!(priv->pidfile = + virXPathString("string(./pid[1]/@path)", ctxt))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("no pidfile path")); + goto error; + } + n = virXPathNodeSet("./vcpus/vcpu", ctxt, &nodes); if (n < 0) goto error; Best Regards, -WangYufei

2 1

Re: [libvirt] [PATCH] kvm: warn if num cpus is greater than num recommended
by Eduardo Habkost 26 Aug '13

26 Aug '13

On 22/08/2013, at 12:39, Andrew Jones <drjones(a)redhat.com> wrote: > The comment in kvm_max_vcpus() states that it's using the recommended > procedure from the kernel API documentation to get the max number > of vcpus that kvm supports. It is, but by always returning the > maximum number supported. The maximum number should only be used > for development purposes. qemu should check KVM_CAP_NR_VCPUS for > the recommended number of vcpus. This patch adds a warning if a user > specifies a number of cpus between the recommended and max. > > Signed-off-by: Andrew Jones <drjones(a)redhat.com> CCing libvir-list. It is probably interesting for libvirt to expose or warn about the recommended VCPU limit somehow, and in this case a simple warning on stderr won't be enough. > --- > kvm-all.c | 45 +++++++++++++++++++++++++++------------------ > 1 file changed, 27 insertions(+), 18 deletions(-) > > diff --git a/kvm-all.c b/kvm-all.c > index 716860f617455..9092e13ae60ea 100644 > --- a/kvm-all.c > +++ b/kvm-all.c > @@ -1313,24 +1313,24 @@ static int kvm_irqchip_create(KVMState *s) > return 0; > } > > -static int kvm_max_vcpus(KVMState *s) > +/* Find number of supported CPUs using the recommended > + * procedure from the kernel API documentation to cope with > + * older kernels that may be missing capabilities. > + */ > +static int kvm_recommended_vcpus(KVMState *s) > { > int ret; > > - /* Find number of supported CPUs using the recommended > - * procedure from the kernel API documentation to cope with > - * older kernels that may be missing capabilities. > - */ > - ret = kvm_check_extension(s, KVM_CAP_MAX_VCPUS); > - if (ret) { > - return ret; > - } > ret = kvm_check_extension(s, KVM_CAP_NR_VCPUS); > - if (ret) { > - return ret; > - } > + return (ret) ? ret : 4; > +} > > - return 4; > +static int kvm_max_vcpus(KVMState *s) > +{ > + int ret; > + > + ret = kvm_check_extension(s, KVM_CAP_MAX_VCPUS); > + return (ret) ? ret : kvm_recommended_vcpus(s); > } > > int kvm_init(void) > @@ -1383,12 +1383,21 @@ int kvm_init(void) > goto err; > } > > - max_vcpus = kvm_max_vcpus(s); > + max_vcpus = kvm_recommended_vcpus(s); > if (smp_cpus > max_vcpus) { > - ret = -EINVAL; > - fprintf(stderr, "Number of SMP cpus requested (%d) exceeds max cpus " > - "supported by KVM (%d)\n", smp_cpus, max_vcpus); > - goto err; > + fprintf(stderr, > + "Warning: Number of SMP cpus requested (%d) exceeds " > + "recommended cpus supported by KVM (%d)\n", > + smp_cpus, max_vcpus); > + > + max_vcpus = kvm_max_vcpus(s); > + if (smp_cpus > max_vcpus) { > + ret = -EINVAL; > + fprintf(stderr, "Number of SMP cpus requested (%d) exceeds " > + "max cpus supported by KVM (%d)\n", > + smp_cpus, max_vcpus); > + goto err; > + } > } > > s->vmfd = kvm_ioctl(s, KVM_CREATE_VM, 0); > -- > 1.8.1.4 > -- Eduardo

4 4

[libvirt] How to deal with LXC cgroup access control with apparmor ?
by 止语 26 Aug '13

26 Aug '13

I don't know if it “legal” to send the email here ：） ================ I am playing with libvirt 1.1.1 (lxc) when I was starting a LXC container, the process location of cgroup is pretty , just the root directory from the process. But I could tune the cgroup in a container as an user that logged, This is not accepted... I wonder how to restrict it with apparmor ,so one can not modify files in the cgroup fs, e.g the cpus or mem, if i restrict it with "deny /sys/fs/cgroup/** wrklx," in apparmor ,the container woulld not start up . "Permission denied", because that a process would mount the cgroup, it seems done by libvirt_lxc, Any way to restrict the cgroup in the container or just not mount cgroup in the container ?? Any help would be appreciated, thanks . ------------------ 止语

1 0

[libvirt] [RFC PATCH v2 0/3] Start fixing the pvpanic mess
by Paolo Bonzini 25 Aug '13

25 Aug '13

The pvpanic mess is even bigger than anticipated. Let's fix the monitor's behavior (patch 1), get rid of all traces that the broken pvpanic existed (patch 2), and give it a new name so that libvirt can detect a design that works (patch 3). All downstreams are urged to apply patches 1+2 as soon as they are merged in QEMU. Still, there are still other problems to solve. In QEMU, exposing "-device isa-pvpanic" in the ACPI tables. Quite frankly I don't have the time to fix this. We have ~3 months though. Patch 3 should not be applied until it is fixed. Also, libvirt needs to know under which circumstances to add "-device isa-pvpanic", besides obviously the availability of the device. IMHO it is just too complicated to retrofit all complications in <on_crash>. In fact, I suspect <on_crash> would match more closely QEMU's "internal error" state, and it would be quite useful to add that to the QEMU driver. Thus, libvirt could add support for an <on_panic> element with the following values: - default, which depends on the hypervisor and is "crash" for Xen, "ignore" for everything else - "crash", which is the only supported value on Xen and means "use the value of <on_crash>" - ignore, which is the behavior of old libvirt that don't know pvpanic - restart, destroy, preserve, rename-restart as for <on_crash>. In particular, preserve can still use the crashed_guest_panicked status, thus keeping the API compatible. - pause, to pause the VM (with a new substatus) <on_panic> would also have a coredump='yes/no' attribute, where yes is only valid if the element is *not* one of default/crash/ignore. Only "default" and "ignore" would be accepted for QEMU that does not support the isa-pvpanic device. Ideally, the coredump attribute would be added to <on_crash> too for simplicity (Xen would refuse coredump + rename-restart and coredump + preserve). Paolo Paolo Bonzini (3): vl: allow "cont" from panicked state pc: get rid of builtin pvpanic pvpanic: rename to isa-pvpanic gdbstub.c | 3 --- hw/i386/pc_piix.c | 8 -------- hw/i386/pc_q35.c | 6 ------ hw/misc/pvpanic.c | 16 +++------------- include/hw/i386/pc.h | 3 --- vl.c | 6 ++---- 6 files changed, 5 insertions(+), 37 deletions(-) -- 1.8.3.1

7 31

[libvirt] [PATCHv3 0/5] Introduce API to query IP addresses for given domain
by nehaljwani 24 Aug '13

24 Aug '13

This feature has been requested for a very long time. Since qemu guest agent gives us reliable results, now the wait is over. The RFC was first proposed by Michal Privoznik: http://www.mail-archive.com/libvir-list@redhat.com/msg51857.html A patch was submitted, using structs: http://www.mail-archive.com/libvir-list@redhat.com/msg57141.html Another patch was submitted, using XML: http://www.mail-archive.com/libvir-list@redhat.com/msg57829.html Neither of the patches were accepted, probably due to lack of extensibility and usability. Hence, we thought of using virTypedParameters for reporting list of interfaces along with their MAC address and IP addresses. The RFC can be found here: http://www.mail-archive.com/libvir-list@redhat.com/msg79793.html The idea of extensibility was rejected and rendered out of scope of libvirt. Hence, we were back to structs. This API is called virDomainInterfacesAddresses which returns a dynamically allocated array of virDomainInterface struct. The great disadvantage is once this gets released, it's written in stone and we cannot change or add an item into it. The API supports two methods: * Return information (list of all associated interfaces with MAC address and IP addresses) of all of the domain interfaces by default (if no interface name is provided) * Return information for the specified interface (if an interface name is provided) nehaljwani (5): domifaddr: Implement the public API domifaddr: Implement the remote protocol domifaddr: Implement the API for qemu domifaddr: Add virsh support domifaddr: Expose python binding daemon/remote.c | 123 +++++++++++++++++++++++++++++++ examples/python/Makefile.am | 2 +- examples/python/README | 1 + examples/python/domipaddrs.py | 50 +++++++++++++ include/libvirt/libvirt.h.in | 33 +++++++++ python/generator.py | 3 + python/libvirt-override-api.xml | 8 +- python/libvirt-override.c | 114 +++++++++++++++++++++++++++++ src/driver.h | 6 ++ src/libvirt.c | 110 ++++++++++++++++++++++++++++ src/libvirt_public.syms | 6 ++ src/qemu/qemu_agent.c | 157 ++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_agent.h | 3 + src/qemu/qemu_driver.c | 55 ++++++++++++++ src/remote/remote_driver.c | 87 ++++++++++++++++++++++ src/remote/remote_protocol.x | 41 ++++++++++- src/remote_protocol-structs | 24 ++++++ tests/qemuagenttest.c | 90 ++++++++++++++++++++++- tools/virsh-domain-monitor.c | 99 +++++++++++++++++++++++++ tools/virsh.pod | 10 +++ 20 files changed, 1018 insertions(+), 4 deletions(-) create mode 100755 examples/python/domipaddrs.py -- 1.7.11.7

6 17

[libvirt] [PATCH] tests: skip schema validation tests if xmllint is missing
by Eric Blake 24 Aug '13

24 Aug '13

On IRC, someone complained that a system without xmllint installed failed a number of tests. * tests/schematestutils.sh: Probe for xmllint. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- tests/schematestutils.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/schematestutils.sh b/tests/schematestutils.sh index e594f04..a0ff77e 100644 --- a/tests/schematestutils.sh +++ b/tests/schematestutils.sh @@ -1,5 +1,7 @@ #!/bin/sh +(xmllint --version) >/dev/null 2>&1 || skip_test_ 'Missing xmllint' + check_schema () { DIRS=$1 -- 1.8.3.1

2 2

[libvirt] [PATCH] python: simplify complicated conditional assignment
by Claudio Bley 23 Aug '13

23 Aug '13

Signed-off-by: Claudio Bley <cbley(a)av-test.de> --- Just noticed this while reading the generated .py files. Might save a few cycles eventually... python/generator.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/python/generator.py b/python/generator.py index 427cebc..10390c3 100755 --- a/python/generator.py +++ b/python/generator.py @@ -1455,8 +1455,7 @@ def buildWrappers(module): elif classname in [ "virDomainSnapshot" ]: classes.write(" self._dom = dom\n") classes.write(" self._conn = dom.connect()\n") - classes.write(" if _obj != None:self._o = _obj;return\n") - classes.write(" self._o = None\n\n") + classes.write(" self._o = _obj\n\n") destruct=None if classes_destructors.has_key(classname): classes.write(" def __del__(self):\n") -- 1.7.9.5

2 3

[libvirt] [PATCH] qemuBuildNicDevStr: Set vectors= on Multiqueue
by Michal Privoznik 23 Aug '13

23 Aug '13

Yet another advice appeared on the Multiqueue wiki page: http://www.linux-kvm.org/page/Multiqueue#Enable_MQ_feature We should add vectors=N onto the qemu command line, where N = 2 * (number of queues) + 1. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_command.c | 13 +++++++------ src/qemu/qemu_command.h | 2 +- src/qemu/qemu_hotplug.c | 4 +--- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index b5ac15a..dbfa0dc 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4730,7 +4730,7 @@ qemuBuildNicDevStr(virDomainDefPtr def, virDomainNetDefPtr net, int vlan, int bootindex, - bool multiqueue, + int vhostfdSize, virQEMUCapsPtr qemuCaps) { virBuffer buf = VIR_BUFFER_INITIALIZER; @@ -4783,8 +4783,11 @@ qemuBuildNicDevStr(virDomainDefPtr def, virDomainVirtioEventIdxTypeToString(net->driver.virtio.event_idx)); } } - if (usingVirtio && multiqueue) - virBufferAddLit(&buf, ",mq=on"); + if (usingVirtio && vhostfdSize > 1) { + /* As advised at http://www.linux-kvm.org/page/Multiqueue + * we should add vectors=2*N+1 where N is the vhostfdSize */ + virBufferAsprintf(&buf, ",mq=on,vectors=%d", 2 * vhostfdSize + 1); + } if (vlan == -1) virBufferAsprintf(&buf, ",netdev=host%s", net->info.alias); else @@ -7278,10 +7281,8 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, virCommandAddArgList(cmd, "-netdev", host, NULL); } if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { - bool multiqueue = tapfdSize > 1 || vhostfdSize > 1; - if (!(nic = qemuBuildNicDevStr(def, net, vlan, bootindex, - multiqueue, qemuCaps))) + vhostfdSize, qemuCaps))) goto cleanup; virCommandAddArgList(cmd, "-device", nic, NULL); } else { diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index a9854a3..4761705 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -102,7 +102,7 @@ char * qemuBuildNicDevStr(virDomainDefPtr def, virDomainNetDefPtr net, int vlan, int bootindex, - bool multiqueue, + int vhostfdSize, virQEMUCapsPtr qemuCaps); char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk, diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 9727410..3491fd6 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -859,10 +859,8 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, } if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { - bool multiqueue = tapfdSize > 1 || vhostfdSize > 1; - if (!(nicstr = qemuBuildNicDevStr(vm->def, net, vlan, 0, - multiqueue, priv->qemuCaps))) + vhostfdSize, priv->qemuCaps))) goto try_remove; } else { if (!(nicstr = qemuBuildNicStr(net, NULL, vlan))) -- 1.8.1.5

1 0

[libvirt] virsh "cpu-stats" not working !!!
by SHREE DUTH AWASTHI 23 Aug '13

23 Aug '13

> > Hi All, > > Can you please guide us in solving this issue. > > Version used : libvirt-1.0.6 > # rpm -qa | egrep "libvirt|qemu" > qemu-kvm-0.14.1-1_WR4.3.x86_64_XXX.x86_64 > libvirt-1.0.6-1_WR4.3.x86_64_XXX.2.x86_64 > > Problem : > > # virsh cpu-stats CLA-0 > error: Failed to retrieve CPU statistics for domain 'CLA-0' > *error: internal error error accessing cgroup cpuacct for vcpu* > > Related info : > > # cat /proc/cgroups > #subsys_name hierarchy num_cgroups enabled > cpuset 3 4 1 > ns 0 1 1 > cpu 1 6 1 > cpuacct 7 3 1 > memory 2 3 1 > freezer 0 1 1 > net_cls 0 1 1 > blkio 0 1 1 > > # cat /proc/mounts | grep cpu > cpu /dev/cgroup_cpu cgroup rw,relatime,cpu 0 0 > cpuset /dev/cgroup_cpuset cgroup rw,relatime,cpuset 0 0 > cpuacct /dev/cgroup_cpuacct cgroup rw,relatime,cpuacct 0 0 > > # cat /proc/self/cgroup > 7:cpuacct:/ > 3:cpuset:/ > 2:memory:/ > 1:cpu:/ > > virsh # vcpucount CLA-0 > maximum config 3 > maximum live 3 > current config 3 > current live 3 > > virsh # vcpuinfo CLA-0 > VCPU: 0 > CPU: 0 > State: running > CPU time: 5.7s > CPU Affinity: yyyyyyyy > > virsh # vcpupin CLA-0 --current > VCPU: CPU Affinity > ---------------------------------- > 0: 0-7 > 1: 0-7 > 2: 0-7 > > # cat /dev/cgroup_cpuacct/cpuacct.usage_percpu > 532996776861 117928641102 125174572624 167825543709 155234053284 > 97350309867 122372010702 110640812251 > # cat /dev/cgroup_cpuacct/cpuacct.usage > 1431288376064 > # cat /dev/cgroup_cpuacct/cpuacct.stat > user 12148 > system 81469 > > # cat /dev/cgroup_cpuacct/*machine*/cpuacct.usage_percpu > 0 0 0 0 0 0 0 0 > # cat /dev/cgroup_cpuacct/*machine/*cpuacct.usage > 0 > > # chkconfig --list | grep cg > cgroups_mount 0:off 1:on 2:on 3:on 4:on 5:on 6:off > > We have also found that there is no "*cgroup*" directory created under * > "/sys/fs/".* We have tried mounting the same manually using the below > commands but we were not successful. > > mkdir -p /dev/cgroup_cpuacct > mount -t cgroup -o cpuacct cpuacct /dev/cgroup_cpuacct > > (or) > > mkdir -p /sys/fs/cgroup > mount -t cgroup -o cgroup cgroup /sys/fs/cgroup > > > Please find the the domain info used for the creation of VM in the > attachment. Please let us know, how to proceed futher. > > Your inputs would be of great help to us. > > Thanks and Regards, > Shree Duth Awasthi. >

2 3

[libvirt] [PATCH] Test for object identity when checking for None in Python
by Claudio Bley 23 Aug '13

23 Aug '13

Consistently use "is" or "is not" to compare variables to None, because doing so is preferrable, as per PEP 8 (http://www.python.org/dev/peps/pep-0008/#programming-recommendations) > Comparisons to singletons like None should always be done with is or > is not, never the equality operators. Signed-off-by: Claudio Bley <cbley(a)av-test.de> --- Purely mechanical change, using: find . -name '*.py' -exec sed -i -e 's,[ \t][ \t]*!=[ \t][ \t]*None, is not None,g' '{}' \+ find . -name '*.py' -exec sed -i -e 's,[ \t][ \t]*==[ \t][ \t]*None, is None,g' '{}' \+ docs/apibuild.py | 254 ++++++++++++++++----------------- docs/index.py | 178 +++++++++++------------ examples/python/consolecallback.py | 2 +- examples/python/dominfo.py | 2 +- examples/python/domrestore.py | 2 +- examples/python/domsave.py | 2 +- examples/python/domstart.py | 4 +- python/generator.py | 30 ++-- python/libvirt-override-virConnect.py | 2 +- python/libvirt-override-virStream.py | 4 +- 10 files changed, 240 insertions(+), 240 deletions(-) diff --git a/docs/apibuild.py b/docs/apibuild.py index 5c55d79..ab6b0b4 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -111,7 +111,7 @@ class identifier: self.extra = extra self.lineno = lineno self.static = 0 - if conditionals == None or len(conditionals) == 0: + if conditionals is None or len(conditionals) == 0: self.conditionals = None else: self.conditionals = conditionals[:] @@ -123,13 +123,13 @@ class identifier: r = "%s %s:" % (self.type, self.name) if self.static: r = r + " static" - if self.module != None: + if self.module is not None: r = r + " from %s" % (self.module) - if self.info != None: + if self.info is not None: r = r + " " + `self.info` - if self.extra != None: + if self.extra is not None: r = r + " " + `self.extra` - if self.conditionals != None: + if self.conditionals is not None: r = r + " " + `self.conditionals` return r @@ -149,7 +149,7 @@ class identifier: def set_static(self, static): self.static = static def set_conditionals(self, conditionals): - if conditionals == None or len(conditionals) == 0: + if conditionals is None or len(conditionals) == 0: self.conditionals = None else: self.conditionals = conditionals[:] @@ -178,17 +178,17 @@ class identifier: if self.name == debugsym and not quiet: print "=> update %s : %s" % (debugsym, (module, type, info, extra, conditionals)) - if header != None and self.header == None: + if header is not None and self.header is None: self.set_header(module) - if module != None and (self.module == None or self.header == self.module): + if module is not None and (self.module is None or self.header == self.module): self.set_module(module) - if type != None and self.type == None: + if type is not None and self.type is None: self.set_type(type) - if info != None: + if info is not None: self.set_info(info) - if extra != None: + if extra is not None: self.set_extra(extra) - if conditionals != None: + if conditionals is not None: self.set_conditionals(conditionals) class index: @@ -217,10 +217,10 @@ class index: d = identifier(name, header, module, type, lineno, info, extra, conditionals) self.identifiers[name] = d - if d != None and static == 1: + if d is not None and static == 1: d.set_static(1) - if d != None and name != None and type != None: + if d is not None and name is not None and type is not None: self.references[name] = d if name == debugsym and not quiet: @@ -239,10 +239,10 @@ class index: d = identifier(name, header, module, type, lineno, info, extra, conditionals) self.identifiers[name] = d - if d != None and static == 1: + if d is not None and static == 1: d.set_static(1) - if d != None and name != None and type != None: + if d is not None and name is not None and type is not None: if type == "function": self.functions[name] = d elif type == "functype": @@ -432,7 +432,7 @@ class CLexer: else: line = self.line self.line = "" - if line == None: + if line is None: return None if line[0] == '#': @@ -461,7 +461,7 @@ class CLexer: tok = tok + line if found == 0: line = self.getline() - if line == None: + if line is None: return None self.last = ('string', tok) return self.last @@ -486,7 +486,7 @@ class CLexer: tok = tok + line if found == 0: line = self.getline() - if line == None: + if line is None: return None self.last = ('comment', tok) return self.last @@ -598,7 +598,7 @@ class CParser: self.is_header = 0 self.input = open(filename) self.lexer = CLexer(self.input) - if idx == None: + if idx is None: self.index = index() else: self.index = idx @@ -707,7 +707,7 @@ class CParser: com = token[1] if self.top_comment == "": self.top_comment = com - if self.comment == None or com[0] == '*': + if self.comment is None or com[0] == '*': self.comment = com else: self.comment = self.comment + com @@ -731,7 +731,7 @@ class CParser: args = [] desc = "" - if self.comment == None: + if self.comment is None: if not quiet: self.warning("Missing comment for type %s" % (name)) return((args, desc)) @@ -780,7 +780,7 @@ class CParser: args = [] desc = "" - if self.comment == None: + if self.comment is None: if not quiet: self.warning("Missing comment for macro %s" % (name)) return((args, desc)) @@ -860,7 +860,7 @@ class CParser: desc = "" retdesc = "" - if self.comment == None: + if self.comment is None: if not quiet: self.warning("Missing comment for function %s" % (name)) return(((ret[0], retdesc), args, desc)) @@ -958,7 +958,7 @@ class CParser: # i = 0 while i < nbargs: - if args[i][2] == None and args[i][0] != "void" and args[i][1] != None: + if args[i][2] is None and args[i][0] != "void" and args[i][1] is not None: self.warning("Function comment for %s lacks description of arg %s" % (name, args[i][1])) i = i + 1 if retdesc == "" and ret[0] != "void": @@ -975,7 +975,7 @@ class CParser: name = token[1] if name == "#include": token = self.lexer.token() - if token == None: + if token is None: return None if token[0] == 'preproc': self.index_add(token[1], self.filename, not self.is_header, @@ -984,14 +984,14 @@ class CParser: return token if name == "#define": token = self.lexer.token() - if token == None: + if token is None: return None if token[0] == 'preproc': # TODO macros with arguments name = token[1] lst = [] token = self.lexer.token() - while token != None and token[0] == 'preproc' and \ + while token is not None and token[0] == 'preproc' and \ token[1][0] != '#': lst.append(token[1]) token = self.lexer.token() @@ -1059,7 +1059,7 @@ class CParser: self.conditionals = self.conditionals[:-1] self.defines = self.defines[:-1] token = self.lexer.token() - while token != None and token[0] == 'preproc' and \ + while token is not None and token[0] == 'preproc' and \ token[1][0] != '#': token = self.lexer.token() return token @@ -1076,7 +1076,7 @@ class CParser: global ignored_words token = self.lexer.token() - while token != None: + while token is not None: if token[0] == 'comment': token = self.parseComment(token) continue @@ -1088,7 +1088,7 @@ class CParser: return token elif token[0] == "name" and token[1] == "__attribute": token = self.lexer.token() - while token != None and token[1] != ";": + while token is not None and token[1] != ";": token = self.lexer.token() return token elif token[0] == "name" and ignored_words.has_key(token[1]): @@ -1109,20 +1109,20 @@ class CParser: # Parse a typedef, it records the type and its name. # def parseTypedef(self, token): - if token == None: + if token is None: return None token = self.parseType(token) - if token == None: + if token is None: self.error("parsing typedef") return None base_type = self.type type = base_type #self.debug("end typedef type", token) - while token != None: + while token is not None: if token[0] == "name": name = token[1] signature = self.signature - if signature != None: + if signature is not None: type = string.split(type, '(')[0] d = self.mergeFunctionComment(name, ((type, None), signature), 1) @@ -1143,15 +1143,15 @@ class CParser: self.error("parsing typedef: expecting a name") return token #self.debug("end typedef", token) - if token != None and token[0] == 'sep' and token[1] == ',': + if token is not None and token[0] == 'sep' and token[1] == ',': type = base_type token = self.token() - while token != None and token[0] == "op": + while token is not None and token[0] == "op": type = type + token[1] token = self.token() - elif token != None and token[0] == 'sep' and token[1] == ';': + elif token is not None and token[0] == 'sep' and token[1] == ';': break - elif token != None and token[0] == 'name': + elif token is not None and token[0] == 'name': type = base_type continue else: @@ -1165,7 +1165,7 @@ class CParser: # the balancing } included # def parseBlock(self, token): - while token != None: + while token is not None: if token[0] == "sep" and token[1] == "{": token = self.token() token = self.parseBlock(token) @@ -1205,7 +1205,7 @@ class CParser: def parseStruct(self, token): fields = [] #self.debug("start parseStruct", token) - while token != None: + while token is not None: if token[0] == "sep" and token[1] == "{": token = self.token() token = self.parseTypeBlock(token) @@ -1220,7 +1220,7 @@ class CParser: #self.debug("before parseType", token) token = self.parseType(token) #self.debug("after parseType", token) - if token != None and token[0] == "name": + if token is not None and token[0] == "name": fname = token[1] token = self.token() if token[0] == "sep" and token[1] == ";": @@ -1236,12 +1236,12 @@ class CParser: self.comment = None else: self.error("parseStruct: expecting ;", token) - elif token != None and token[0] == "sep" and token[1] == "{": + elif token is not None and token[0] == "sep" and token[1] == "{": token = self.token() token = self.parseTypeBlock(token) - if token != None and token[0] == "name": + if token is not None and token[0] == "name": token = self.token() - if token != None and token[0] == "sep" and token[1] == ";": + if token is not None and token[0] == "sep" and token[1] == ";": token = self.token() else: self.error("parseStruct: expecting ;", token) @@ -1260,7 +1260,7 @@ class CParser: def parseUnion(self, token): fields = [] # self.debug("start parseUnion", token) - while token != None: + while token is not None: if token[0] == "sep" and token[1] == "{": token = self.token() token = self.parseTypeBlock(token) @@ -1275,7 +1275,7 @@ class CParser: # self.debug("before parseType", token) token = self.parseType(token) # self.debug("after parseType", token) - if token != None and token[0] == "name": + if token is not None and token[0] == "name": fname = token[1] token = self.token() if token[0] == "sep" and token[1] == ";": @@ -1286,12 +1286,12 @@ class CParser: self.comment = None else: self.error("parseUnion: expecting ;", token) - elif token != None and token[0] == "sep" and token[1] == "{": + elif token is not None and token[0] == "sep" and token[1] == "{": token = self.token() token = self.parseTypeBlock(token) - if token != None and token[0] == "name": + if token is not None and token[0] == "name": token = self.token() - if token != None and token[0] == "sep" and token[1] == ";": + if token is not None and token[0] == "sep" and token[1] == ";": token = self.token() else: self.error("parseUnion: expecting ;", token) @@ -1313,14 +1313,14 @@ class CParser: self.comment = None comment = "" value = "0" - while token != None: + while token is not None: if token[0] == "sep" and token[1] == "{": token = self.token() token = self.parseTypeBlock(token) elif token[0] == "sep" and token[1] == "}": - if name != None: + if name is not None: self.cleanupComment() - if self.comment != None: + if self.comment is not None: comment = self.comment self.comment = None self.enums.append((name, value, comment)) @@ -1328,8 +1328,8 @@ class CParser: return token elif token[0] == "name": self.cleanupComment() - if name != None: - if self.comment != None: + if name is not None: + if self.comment is not None: comment = string.strip(self.comment) self.comment = None self.enums.append((name, value, comment)) @@ -1451,7 +1451,7 @@ class CParser: # the balancing } # def parseTypeBlock(self, token): - while token != None: + while token is not None: if token[0] == "sep" and token[1] == "{": token = self.token() token = self.parseTypeBlock(token) @@ -1472,7 +1472,7 @@ class CParser: self.struct_fields = [] self.union_fields = [] self.signature = None - if token == None: + if token is None: return token while token[0] == "name" and ( @@ -1524,13 +1524,13 @@ class CParser: if token[0] == "name": nametok = token token = self.token() - if token != None and token[0] == "sep" and token[1] == "{": + if token is not None and token[0] == "sep" and token[1] == "{": token = self.token() token = self.parseStruct(token) - elif token != None and token[0] == "op" and token[1] == "*": + elif token is not None and token[0] == "op" and token[1] == "*": self.type = self.type + " " + nametok[1] + " *" token = self.token() - while token != None and token[0] == "op" and token[1] == "*": + while token is not None and token[0] == "op" and token[1] == "*": self.type = self.type + " *" token = self.token() if token[0] == "name": @@ -1539,11 +1539,11 @@ class CParser: else: self.error("struct : expecting name", token) return token - elif token != None and token[0] == "name" and nametok != None: + elif token is not None and token[0] == "name" and nametok is not None: self.type = self.type + " " + nametok[1] return token - if nametok != None: + if nametok is not None: self.lexer.push(token) token = nametok return token @@ -1558,14 +1558,14 @@ class CParser: if token[0] == "name": nametok = token token = self.token() - if token != None and token[0] == "sep" and token[1] == "{": + if token is not None and token[0] == "sep" and token[1] == "{": token = self.token() token = self.parseUnion(token) - elif token != None and token[0] == "name" and nametok != None: + elif token is not None and token[0] == "name" and nametok is not None: self.type = self.type + " " + nametok[1] return token - if nametok != None: + if nametok is not None: self.lexer.push(token) token = nametok return token @@ -1577,13 +1577,13 @@ class CParser: self.type = self.type + " " + token[1] self.enums = [] token = self.token() - if token != None and token[0] == "sep" and token[1] == "{": + if token is not None and token[0] == "sep" and token[1] == "{": token = self.token() token = self.parseEnumBlock(token) else: self.error("parsing enum: expecting '{'", token) enum_type = None - if token != None and token[0] != "name": + if token is not None and token[0] != "name": self.lexer.push(token) token = ("name", "enum") else: @@ -1595,24 +1595,24 @@ class CParser: return token elif token[0] == "name" and token[1] == "VIR_ENUM_DECL": token = self.token() - if token != None and token[0] == "sep" and token[1] == "(": + if token is not None and token[0] == "sep" and token[1] == "(": token = self.token() token = self.parseVirEnumDecl(token) else: self.error("parsing VIR_ENUM_DECL: expecting '('", token) - if token != None: + if token is not None: self.lexer.push(token) token = ("name", "virenumdecl") return token elif token[0] == "name" and token[1] == "VIR_ENUM_IMPL": token = self.token() - if token != None and token[0] == "sep" and token[1] == "(": + if token is not None and token[0] == "sep" and token[1] == "(": token = self.token() token = self.parseVirEnumImpl(token) else: self.error("parsing VIR_ENUM_IMPL: expecting '('", token) - if token != None: + if token is not None: self.lexer.push(token) token = ("name", "virenumimpl") return token @@ -1627,7 +1627,7 @@ class CParser: token) return token token = self.token() - while token != None and (token[0] == "op" or + while token is not None and (token[0] == "op" or token[0] == "name" and token[1] == "const"): self.type = self.type + " " + token[1] token = self.token() @@ -1635,22 +1635,22 @@ class CParser: # # if there is a parenthesis here, this means a function type # - if token != None and token[0] == "sep" and token[1] == '(': + if token is not None and token[0] == "sep" and token[1] == '(': self.type = self.type + token[1] token = self.token() - while token != None and token[0] == "op" and token[1] == '*': + while token is not None and token[0] == "op" and token[1] == '*': self.type = self.type + token[1] token = self.token() - if token == None or token[0] != "name" : + if token is None or token[0] != "name" : self.error("parsing function type, name expected", token) return token self.type = self.type + token[1] nametok = token token = self.token() - if token != None and token[0] == "sep" and token[1] == ')': + if token is not None and token[0] == "sep" and token[1] == ')': self.type = self.type + token[1] token = self.token() - if token != None and token[0] == "sep" and token[1] == '(': + if token is not None and token[0] == "sep" and token[1] == '(': token = self.token() type = self.type token = self.parseSignature(token) @@ -1668,25 +1668,25 @@ class CParser: # # do some lookahead for arrays # - if token != None and token[0] == "name": + if token is not None and token[0] == "name": nametok = token token = self.token() - if token != None and token[0] == "sep" and token[1] == '[': + if token is not None and token[0] == "sep" and token[1] == '[': self.type = self.type + " " + nametok[1] - while token != None and token[0] == "sep" and token[1] == '[': + while token is not None and token[0] == "sep" and token[1] == '[': self.type = self.type + token[1] token = self.token() - while token != None and token[0] != 'sep' and \ + while token is not None and token[0] != 'sep' and \ token[1] != ']' and token[1] != ';': self.type = self.type + token[1] token = self.token() - if token != None and token[0] == 'sep' and token[1] == ']': + if token is not None and token[0] == 'sep' and token[1] == ']': self.type = self.type + token[1] token = self.token() else: self.error("parsing array type, ']' expected", token) return token - elif token != None and token[0] == "sep" and token[1] == ':': + elif token is not None and token[0] == "sep" and token[1] == ':': # remove :12 in case it's a limited int size token = self.token() token = self.token() @@ -1700,25 +1700,25 @@ class CParser: # up to the ')' included def parseSignature(self, token): signature = [] - if token != None and token[0] == "sep" and token[1] == ')': + if token is not None and token[0] == "sep" and token[1] == ')': self.signature = [] token = self.token() return token - while token != None: + while token is not None: token = self.parseType(token) - if token != None and token[0] == "name": + if token is not None and token[0] == "name": signature.append((self.type, token[1], None)) token = self.token() - elif token != None and token[0] == "sep" and token[1] == ',': + elif token is not None and token[0] == "sep" and token[1] == ',': token = self.token() continue - elif token != None and token[0] == "sep" and token[1] == ')': + elif token is not None and token[0] == "sep" and token[1] == ')': # only the type was provided if self.type == "...": signature.append((self.type, "...", None)) else: signature.append((self.type, None, None)) - if token != None and token[0] == "sep": + if token is not None and token[0] == "sep": if token[1] == ',': token = self.token() continue @@ -1813,17 +1813,17 @@ class CParser: static = 0 if token[1] == 'extern': token = self.token() - if token == None: + if token is None: return token if token[0] == 'string': if token[1] == 'C': token = self.token() - if token == None: + if token is None: return token if token[0] == 'sep' and token[1] == "{": token = self.token() # print 'Entering extern "C line ', self.lineno() - while token != None and (token[0] != 'sep' or + while token is not None and (token[0] != 'sep' or token[1] != "}"): if token[0] == 'name': token = self.parseGlobal(token) @@ -1840,7 +1840,7 @@ class CParser: elif token[1] == 'static': static = 1 token = self.token() - if token == None or token[0] != 'name': + if token is None or token[0] != 'name': return token if token[1] == 'typedef': @@ -1849,22 +1849,22 @@ class CParser: else: token = self.parseType(token) type_orig = self.type - if token == None or token[0] != "name": + if token is None or token[0] != "name": return token type = type_orig self.name = token[1] token = self.token() - while token != None and (token[0] == "sep" or token[0] == "op"): + while token is not None and (token[0] == "sep" or token[0] == "op"): if token[0] == "sep": if token[1] == "[": type = type + token[1] token = self.token() - while token != None and (token[0] != "sep" or \ + while token is not None and (token[0] != "sep" or \ token[1] != ";"): type = type + token[1] token = self.token() - if token != None and token[0] == "op" and token[1] == "=": + if token is not None and token[0] == "op" and token[1] == "=": # # Skip the initialization of the variable # @@ -1874,15 +1874,15 @@ class CParser: token = self.parseBlock(token) else: self.comment = None - while token != None and (token[0] != "sep" or \ + while token is not None and (token[0] != "sep" or \ (token[1] != ';' and token[1] != ',')): token = self.token() self.comment = None - if token == None or token[0] != "sep" or (token[1] != ';' and + if token is None or token[0] != "sep" or (token[1] != ';' and token[1] != ','): self.error("missing ';' or ',' after value") - if token != None and token[0] == "sep": + if token is not None and token[0] == "sep": if token[1] == ";": self.comment = None token = self.token() @@ -1897,7 +1897,7 @@ class CParser: elif token[1] == "(": token = self.token() token = self.parseSignature(token) - if token == None: + if token is None: return None if token[0] == "sep" and token[1] == ";": self.checkLongLegacyFunction(self.name, type, self.signature) @@ -1920,10 +1920,10 @@ class CParser: "variable", type) type = type_orig token = self.token() - while token != None and token[0] == "sep": + while token is not None and token[0] == "sep": type = type + token[1] token = self.token() - if token != None and token[0] == "name": + if token is not None and token[0] == "name": self.name = token[1] token = self.token() else: @@ -1935,7 +1935,7 @@ class CParser: if not quiet: print "Parsing %s" % (self.filename) token = self.token() - while token != None: + while token is not None: if token[0] == 'name': token = self.parseGlobal(token) else: @@ -1977,7 +1977,7 @@ class docBuilder: print >>sys.stderr, "Error:", msg def indexString(self, id, str): - if str == None: + if str is None: return str = string.replace(str, "'", ' ') str = string.replace(str, '"', ' ') @@ -2069,17 +2069,17 @@ class docBuilder: id = self.idx.enums[name] output.write(" <enum name='%s' file='%s'" % (name, self.modulename_file(id.header))) - if id.info != None: + if id.info is not None: info = id.info - if info[0] != None and info[0] != '': + if info[0] is not None and info[0] != '': try: val = eval(info[0]) except: val = info[0] output.write(" value='%s'" % (val)) - if info[2] != None and info[2] != '': + if info[2] is not None and info[2] != '': output.write(" type='%s'" % info[2]) - if info[1] != None and info[1] != '': + if info[1] is not None and info[1] != '': output.write(" info='%s'" % escape(info[1])) output.write("/>\n") @@ -2087,15 +2087,15 @@ class docBuilder: id = self.idx.macros[name] output.write(" <macro name='%s' file='%s'>\n" % (name, self.modulename_file(id.header))) - if id.info != None: + if id.info is not None: try: (args, desc) = id.info - if desc != None and desc != "": + if desc is not None and desc != "": output.write(" <info><![CDATA[%s]]></info>\n" % (desc)) self.indexString(name, desc) for arg in args: (name, desc) = arg - if desc != None and desc != "": + if desc is not None and desc != "": output.write(" <arg name='%s' info='%s'/>\n" % ( name, escape(desc))) self.indexString(name, desc) @@ -2110,7 +2110,7 @@ class docBuilder: output.write(" <union>\n") for f in field[3]: desc = f[2] - if desc == None: + if desc is None: desc = '' else: desc = escape(desc) @@ -2133,7 +2133,7 @@ class docBuilder: for field in self.idx.structs[name].info: desc = field[2] self.indexString(name, desc) - if desc == None: + if desc is None: desc = '' else: desc = escape(desc) @@ -2151,7 +2151,7 @@ class docBuilder: name, self.modulename_file(id.header), id.info)) try: desc = id.extra - if desc != None and desc != "": + if desc is not None and desc != "": output.write(">\n <info><![CDATA[%s]]></info>\n" % (desc)) output.write(" </typedef>\n") else: @@ -2161,7 +2161,7 @@ class docBuilder: def serialize_variable(self, output, name): id = self.idx.variables[name] - if id.info != None: + if id.info is not None: output.write(" <variable name='%s' file='%s' type='%s'/>\n" % ( name, self.modulename_file(id.header), id.info)) else: @@ -2179,7 +2179,7 @@ class docBuilder: # # Processing of conditionals modified by Bill 1/1/05 # - if id.conditionals != None: + if id.conditionals is not None: apstr = "" for cond in id.conditionals: if apstr != "": @@ -2190,10 +2190,10 @@ class docBuilder: (ret, params, desc) = id.info output.write(" <info><![CDATA[%s]]></info>\n" % (desc)) self.indexString(name, desc) - if ret[0] != None: + if ret[0] is not None: if ret[0] == "void": output.write(" <return type='void'/>\n") - elif (ret[1] == None or ret[1] == '') and not ignored_functions.has_key(name): + elif (ret[1] is None or ret[1] == '') and not ignored_functions.has_key(name): self.error("Missing documentation for return of function `%s'" % name) else: output.write(" <return type='%s' info='%s'/>\n" % ( @@ -2202,7 +2202,7 @@ class docBuilder: for param in params: if param[0] == 'void': continue - if (param[2] == None or param[2] == ''): + if (param[2] is None or param[2] == ''): if ignored_functions.has_key(name): output.write(" <arg name='%s' type='%s' info=''/>\n" % (param[1], param[0])) else: @@ -2219,7 +2219,7 @@ class docBuilder: module = self.modulename_file(file) output.write(" <file name='%s'>\n" % (module)) dict = self.headers[file] - if dict.info != None: + if dict.info is not None: for data in ('Summary', 'Description', 'Author'): try: output.write(" <%s>%s</%s>\n" % ( @@ -2352,12 +2352,12 @@ class docBuilder: ids.sort() for id in ids: if id[0] != letter: - if letter != None: + if letter is not None: output.write(" </letter>\n") letter = id[0] output.write(" <letter name='%s'>\n" % (letter)) output.write(" <ref name='%s'/>\n" % (id)) - if letter != None: + if letter is not None: output.write(" </letter>\n") def serialize_xrefs_references(self, output): @@ -2383,8 +2383,8 @@ class docBuilder: if len(index[id]) > 30: continue if id[0] != letter: - if letter == None or count > 200: - if letter != None: + if letter is None or count > 200: + if letter is not None: output.write(" </letter>\n") output.write(" </chunk>\n") count = 0 @@ -2392,7 +2392,7 @@ class docBuilder: output.write(" <chunk name='chunk%s'>\n" % (chunk)) first_letter = id[0] chunk = chunk + 1 - elif letter != None: + elif letter is not None: output.write(" </letter>\n") letter = id[0] output.write(" <letter name='%s'>\n" % (letter)) @@ -2407,7 +2407,7 @@ class docBuilder: output.write(" <ref name='%s'/>\n" % (token)) count = count + 1 output.write(" </word>\n") - if letter != None: + if letter is not None: output.write(" </letter>\n") output.write(" </chunk>\n") if count != 0: diff --git a/docs/index.py b/docs/index.py index ce5180f..2f0ad26 100755 --- a/docs/index.py +++ b/docs/index.py @@ -127,9 +127,9 @@ DB=None def createTable(db, name): global TABLES - if db == None: + if db is None: return -1 - if name == None: + if name is None: return -1 c = db.cursor() @@ -147,7 +147,7 @@ def createTable(db, name): def checkTables(db, verbose = 1): global TABLES - if db == None: + if db is None: return -1 c = db.cursor() nbtables = c.execute("show tables") @@ -191,7 +191,7 @@ def checkTables(db, verbose = 1): def openMySQL(db="libvir", passwd=None, verbose = 1): global DB - if passwd == None: + if passwd is None: try: passwd = os.environ["MySQL_PASS"] except: @@ -199,7 +199,7 @@ def openMySQL(db="libvir", passwd=None, verbose = 1): sys.exit(1) DB = MySQLdb.connect(passwd=passwd, db=db) - if DB == None: + if DB is None: return -1 ret = checkTables(DB, verbose) return ret @@ -207,13 +207,13 @@ def openMySQL(db="libvir", passwd=None, verbose = 1): def updateWord(name, symbol, relevance): global DB - if DB == None: + if DB is None: openMySQL() - if DB == None: + if DB is None: return -1 - if name == None: + if name is None: return -1 - if symbol == None: + if symbol is None: return -1 c = DB.cursor() @@ -238,15 +238,15 @@ def updateSymbol(name, module, type, desc): global DB updateWord(name, name, 50) - if DB == None: + if DB is None: openMySQL() - if DB == None: + if DB is None: return -1 - if name == None: + if name is None: return -1 - if module == None: + if module is None: return -1 - if type == None: + if type is None: return -1 try: @@ -299,11 +299,11 @@ def addFunctype(name, module, desc = ""): def addPage(resource, title): global DB - if DB == None: + if DB is None: openMySQL() - if DB == None: + if DB is None: return -1 - if resource == None: + if resource is None: return -1 c = DB.cursor() @@ -327,17 +327,17 @@ def addPage(resource, title): def updateWordHTML(name, resource, desc, id, relevance): global DB - if DB == None: + if DB is None: openMySQL() - if DB == None: + if DB is None: return -1 - if name == None: + if name is None: return -1 - if resource == None: + if resource is None: return -1 - if id == None: + if id is None: id = "" - if desc == None: + if desc is None: desc = "" else: try: @@ -367,11 +367,11 @@ def updateWordHTML(name, resource, desc, id, relevance): def checkXMLMsgArchive(url): global DB - if DB == None: + if DB is None: openMySQL() - if DB == None: + if DB is None: return -1 - if url == None: + if url is None: return -1 c = DB.cursor() @@ -379,7 +379,7 @@ def checkXMLMsgArchive(url): ret = c.execute( """SELECT ID FROM archives WHERE resource='%s'""" % (url)) row = c.fetchone() - if row == None: + if row is None: return -1 except: return -1 @@ -389,13 +389,13 @@ def checkXMLMsgArchive(url): def addXMLMsgArchive(url, title): global DB - if DB == None: + if DB is None: openMySQL() - if DB == None: + if DB is None: return -1 - if url == None: + if url is None: return -1 - if title == None: + if title is None: title = "" else: title = string.replace(title, "'", " ") @@ -408,7 +408,7 @@ def addXMLMsgArchive(url, title): cmd = """SELECT ID FROM archives WHERE resource='%s'""" % (url) ret = c.execute(cmd) row = c.fetchone() - if row == None: + if row is None: print "addXMLMsgArchive failed to get the ID: %s" % (url) return -1 except: @@ -420,13 +420,13 @@ def addXMLMsgArchive(url, title): def updateWordArchive(name, id, relevance): global DB - if DB == None: + if DB is None: openMySQL() - if DB == None: + if DB is None: return -1 - if name == None: + if name is None: return -1 - if id == None: + if id is None: return -1 c = DB.cursor() @@ -533,9 +533,9 @@ def splitIdentifier(str): def addWord(word, module, symbol, relevance): global wordsDict - if word == None or len(word) < 3: + if word is None or len(word) < 3: return -1 - if module == None or symbol == None: + if module is None or symbol is None: return -1 if dropWords.has_key(word): return 0 @@ -544,7 +544,7 @@ def addWord(word, module, symbol, relevance): if wordsDict.has_key(word): d = wordsDict[word] - if d == None: + if d is None: return 0 if len(d) > 500: wordsDict[word] = None @@ -559,7 +559,7 @@ def addWord(word, module, symbol, relevance): return relevance def addString(str, module, symbol, relevance): - if str == None or len(str) < 3: + if str is None or len(str) < 3: return -1 ret = 0 str = cleanupWordsString(str) @@ -573,9 +573,9 @@ def addString(str, module, symbol, relevance): def addWordHTML(word, resource, id, section, relevance): global wordsDictHTML - if word == None or len(word) < 3: + if word is None or len(word) < 3: return -1 - if resource == None or section == None: + if resource is None or section is None: return -1 if dropWords.has_key(word): return 0 @@ -586,14 +586,14 @@ def addWordHTML(word, resource, id, section, relevance): if wordsDictHTML.has_key(word): d = wordsDictHTML[word] - if d == None: + if d is None: print "skipped %s" % (word) return 0 try: (r,i,s) = d[resource] - if i != None: + if i is not None: id = i - if s != None: + if s is not None: section = s relevance = relevance + r except: @@ -605,7 +605,7 @@ def addWordHTML(word, resource, id, section, relevance): return relevance def addStringHTML(str, resource, id, section, relevance): - if str == None or len(str) < 3: + if str is None or len(str) < 3: return -1 ret = 0 str = cleanupWordsString(str) @@ -626,9 +626,9 @@ def addStringHTML(str, resource, id, section, relevance): def addWordArchive(word, id, relevance): global wordsDictArchive - if word == None or len(word) < 3: + if word is None or len(word) < 3: return -1 - if id == None or id == -1: + if id is None or id == -1: return -1 if dropWords.has_key(word): return 0 @@ -637,7 +637,7 @@ def addWordArchive(word, id, relevance): if wordsDictArchive.has_key(word): d = wordsDictArchive[word] - if d == None: + if d is None: print "skipped %s" % (word) return 0 try: @@ -652,7 +652,7 @@ def addWordArchive(word, id, relevance): return relevance def addStringArchive(str, id, relevance): - if str == None or len(str) < 3: + if str is None or len(str) < 3: return -1 ret = 0 str = cleanupWordsString(str) @@ -683,9 +683,9 @@ def loadAPI(filename): return doc def foundExport(file, symbol): - if file == None: + if file is None: return 0 - if symbol == None: + if symbol is None: return 0 addFunction(symbol, file) l = splitIdentifier(symbol) @@ -697,7 +697,7 @@ def analyzeAPIFile(top): count = 0 name = top.prop("name") cur = top.children - while cur != None: + while cur is not None: if cur.type == 'text': cur = cur.next continue @@ -712,7 +712,7 @@ def analyzeAPIFiles(top): count = 0 cur = top.children - while cur != None: + while cur is not None: if cur.type == 'text': cur = cur.next continue @@ -725,10 +725,10 @@ def analyzeAPIFiles(top): def analyzeAPIEnum(top): file = top.prop("file") - if file == None: + if file is None: return 0 symbol = top.prop("name") - if symbol == None: + if symbol is None: return 0 addEnum(symbol, file) @@ -740,10 +740,10 @@ def analyzeAPIEnum(top): def analyzeAPIConst(top): file = top.prop("file") - if file == None: + if file is None: return 0 symbol = top.prop("name") - if symbol == None: + if symbol is None: return 0 addConst(symbol, file) @@ -755,10 +755,10 @@ def analyzeAPIConst(top): def analyzeAPIType(top): file = top.prop("file") - if file == None: + if file is None: return 0 symbol = top.prop("name") - if symbol == None: + if symbol is None: return 0 addType(symbol, file) @@ -769,10 +769,10 @@ def analyzeAPIType(top): def analyzeAPIFunctype(top): file = top.prop("file") - if file == None: + if file is None: return 0 symbol = top.prop("name") - if symbol == None: + if symbol is None: return 0 addFunctype(symbol, file) @@ -783,10 +783,10 @@ def analyzeAPIFunctype(top): def analyzeAPIStruct(top): file = top.prop("file") - if file == None: + if file is None: return 0 symbol = top.prop("name") - if symbol == None: + if symbol is None: return 0 addStruct(symbol, file) @@ -795,7 +795,7 @@ def analyzeAPIStruct(top): addWord(word, file, symbol, 10) info = top.prop("info") - if info != None: + if info is not None: info = string.replace(info, "'", " ") info = string.strip(info) l = string.split(info) @@ -806,17 +806,17 @@ def analyzeAPIStruct(top): def analyzeAPIMacro(top): file = top.prop("file") - if file == None: + if file is None: return 0 symbol = top.prop("name") - if symbol == None: + if symbol is None: return 0 symbol = string.replace(symbol, "'", " ") symbol = string.strip(symbol) info = None cur = top.children - while cur != None: + while cur is not None: if cur.type == 'text': cur = cur.next continue @@ -829,7 +829,7 @@ def analyzeAPIMacro(top): for word in l: addWord(word, file, symbol, 10) - if info == None: + if info is None: addMacro(symbol, file) print "Macro %s description has no <info>" % (symbol) return 0 @@ -845,17 +845,17 @@ def analyzeAPIMacro(top): def analyzeAPIFunction(top): file = top.prop("file") - if file == None: + if file is None: return 0 symbol = top.prop("name") - if symbol == None: + if symbol is None: return 0 symbol = string.replace(symbol, "'", " ") symbol = string.strip(symbol) info = None cur = top.children - while cur != None: + while cur is not None: if cur.type == 'text': cur = cur.next continue @@ -863,23 +863,23 @@ def analyzeAPIFunction(top): info = cur.content elif cur.name == "return": rinfo = cur.prop("info") - if rinfo != None: + if rinfo is not None: rinfo = string.replace(rinfo, "'", " ") rinfo = string.strip(rinfo) addString(rinfo, file, symbol, 7) elif cur.name == "arg": ainfo = cur.prop("info") - if ainfo != None: + if ainfo is not None: ainfo = string.replace(ainfo, "'", " ") ainfo = string.strip(ainfo) addString(ainfo, file, symbol, 5) name = cur.prop("name") - if name != None: + if name is not None: name = string.replace(name, "'", " ") name = string.strip(name) addWord(name, file, symbol, 7) cur = cur.next - if info == None: + if info is None: print "Function %s description has no <info>" % (symbol) addFunction(symbol, file, "") else: @@ -898,7 +898,7 @@ def analyzeAPISymbols(top): count = 0 cur = top.children - while cur != None: + while cur is not None: if cur.type == 'text': cur = cur.next continue @@ -923,14 +923,14 @@ def analyzeAPISymbols(top): def analyzeAPI(doc): count = 0 - if doc == None: + if doc is None: return -1 root = doc.getRootElement() if root.name != "api": print "Unexpected root name" return -1 cur = root.children - while cur != None: + while cur is not None: if cur.type == 'text': cur = cur.next continue @@ -1056,7 +1056,7 @@ def analyzeHTMLPages(): import time def getXMLDateArchive(t = None): - if t == None: + if t is None: t = time.time() T = time.gmtime(t) month = time.strftime("%B", T) @@ -1065,7 +1065,7 @@ def getXMLDateArchive(t = None): return url def scanXMLMsgArchive(url, title, force = 0): - if url == None or title == None: + if url is None or title is None: return 0 ID = checkXMLMsgArchive(url) @@ -1082,7 +1082,7 @@ def scanXMLMsgArchive(url, title, force = 0): doc = libxml2.htmlParseFile(url, None) except: doc = None - if doc == None: + if doc is None: print "Failed to parse %s" % (url) return 0 @@ -1105,7 +1105,7 @@ def scanXMLDateArchive(t = None, force = 0): doc = libxml2.htmlParseFile(url, None) except: doc = None - if doc == None: + if doc is None: print "Failed to parse %s" % (url) return -1 ctxt = doc.xpathNewContext() @@ -1114,16 +1114,16 @@ def scanXMLDateArchive(t = None, force = 0): newmsg = 0 for anchor in anchors: href = anchor.prop("href") - if href == None or href[0:3] != "msg": + if href is None or href[0:3] != "msg": continue try: links = links + 1 msg = libxml2.buildURI(href, url) title = anchor.content - if title != None and title[0:4] == 'Re: ': + if title is not None and title[0:4] == 'Re: ': title = title[4:] - if title != None and title[0:6] == '[xml] ': + if title is not None and title[0:6] == '[xml] ': title = title[6:] newmsg = newmsg + scanXMLMsgArchive(msg, title, force) @@ -1148,7 +1148,7 @@ def analyzeArchives(t = None, force = 0): skipped = 0 for word in wordsDictArchive.keys(): refs = wordsDictArchive[word] - if refs == None: + if refs is None: skipped = skipped + 1 continue for id in refs.keys(): @@ -1168,7 +1168,7 @@ def analyzeHTMLTop(): skipped = 0 for word in wordsDictHTML.keys(): refs = wordsDictHTML[word] - if refs == None: + if refs is None: skipped = skipped + 1 continue for resource in refs.keys(): @@ -1197,7 +1197,7 @@ def analyzeAPITop(): skipped = 0 for word in wordsDict.keys(): refs = wordsDict[word] - if refs == None: + if refs is None: skipped = skipped + 1 continue for (module, symbol) in refs.keys(): diff --git a/examples/python/consolecallback.py b/examples/python/consolecallback.py index 23316ce..d8e33a9 100644 --- a/examples/python/consolecallback.py +++ b/examples/python/consolecallback.py @@ -29,7 +29,7 @@ class Console(object): def check_console(console): if (console.state[0] == libvirt.VIR_DOMAIN_RUNNING or console.state[0] == libvirt.VIR_DOMAIN_PAUSED): - if console.stream == None: + if console.stream is None: console.stream = console.connection.newStream(libvirt.VIR_STREAM_NONBLOCK) console.domain.openConsole(None, console.stream, 0) console.stream.eventAddCallback(libvirt.VIR_STREAM_EVENT_READABLE, stream_callback, console) diff --git a/examples/python/dominfo.py b/examples/python/dominfo.py index 0d3238b..bfa3ca3 100755 --- a/examples/python/dominfo.py +++ b/examples/python/dominfo.py @@ -35,7 +35,7 @@ name = sys.argv[1] # Connect to libvirt conn = libvirt.openReadOnly(None) -if conn == None: +if conn is None: print 'Failed to open connection to the hypervisor' sys.exit(1) diff --git a/examples/python/domrestore.py b/examples/python/domrestore.py index ccc82f6..fffc90f 100755 --- a/examples/python/domrestore.py +++ b/examples/python/domrestore.py @@ -21,7 +21,7 @@ dir = sys.argv[1] imgs = os.listdir(dir) conn = libvirt.open(None) -if conn == None: +if conn is None: print 'Failed to open connection to the hypervisor' sys.exit(1) diff --git a/examples/python/domsave.py b/examples/python/domsave.py index 12ffac1..bac4536 100755 --- a/examples/python/domsave.py +++ b/examples/python/domsave.py @@ -19,7 +19,7 @@ if len(sys.argv) != 2: dir = sys.argv[1] conn = libvirt.open(None) -if conn == None: +if conn is None: print 'Failed to open connection to the hypervisor' sys.exit(1) diff --git a/examples/python/domstart.py b/examples/python/domstart.py index b1e89b8..b14fad1 100755 --- a/examples/python/domstart.py +++ b/examples/python/domstart.py @@ -33,7 +33,7 @@ if len(sys.argv) != 2: (name, xmldesc) = read_domain(sys.argv[1]) conn = libvirt.open(None) -if conn == None: +if conn is None: print 'Failed to open connection to the hypervisor' sys.exit(1) @@ -43,7 +43,7 @@ except libvirt.libvirtError: print "Starting domain %s ... " % name, sys.stdout.flush() dom = conn.createLinux(xmldesc, 0) - if dom == None: + if dom is None: print "failed" sys.exit(1) else: diff --git a/python/generator.py b/python/generator.py index 427cebc..6c7414a 100755 --- a/python/generator.py +++ b/python/generator.py @@ -136,7 +136,7 @@ class docParser(xml.sax.handler.ContentHandler): print "end %s" % tag if tag == 'function': # fuctions come from source files, hence 'virerror.c' - if self.function != None: + if self.function is not None: if (self.function_module == "libvirt" or self.function_module == "virevent" or self.function_module == "virerror"): @@ -641,9 +641,9 @@ def print_function_wrapper(module, name, output, export, include): (f, t, n, c) = py_types[arg[1]] if (f == 'z') and (name in foreign_encoding_args) and (num_bufs == 0): f = 't#' - if f != None: + if f is not None: format = format + f - if t != None: + if t is not None: format_args = format_args + ", &pyobj_%s" % (arg[0]) c_args = c_args + " PyObject *pyobj_%s;\n" % (arg[0]) c_convert = c_convert + \ @@ -686,7 +686,7 @@ def print_function_wrapper(module, name, output, export, include): elif py_types.has_key(ret[0]): (f, t, n, c) = py_types[ret[0]] c_return = " %s c_retval;\n" % (ret[0]) - if file == "python_accessor" and ret[2] != None: + if file == "python_accessor" and ret[2] is not None: c_call = "\n c_retval = %s->%s;\n" % (args[0][0], ret[2]) else: c_call = "\n c_retval = %s(%s);\n" % (name, c_call) @@ -708,7 +708,7 @@ def print_function_wrapper(module, name, output, export, include): unknown_types[ret[0]] = [name] return -1 - if cond != None and cond != "": + if cond is not None and cond != "": include.write("#if %s\n" % cond) export.write("#if %s\n" % cond) output.write("#if %s\n" % cond) @@ -729,14 +729,14 @@ def print_function_wrapper(module, name, output, export, include): if file == "python": # Those have been manually generated - if cond != None and cond != "": + if cond is not None and cond != "": include.write("#endif\n") export.write("#endif\n") output.write("#endif\n") return 1 if file == "python_accessor" and ret[0] != "void" and ret[2] is None: # Those have been manually generated - if cond != None and cond != "": + if cond is not None and cond != "": include.write("#endif\n") export.write("#endif\n") output.write("#endif\n") @@ -771,7 +771,7 @@ def print_function_wrapper(module, name, output, export, include): output.write(" LIBVIRT_END_ALLOW_THREADS;\n") output.write(ret_convert) output.write("}\n\n") - if cond != None and cond != "": + if cond is not None and cond != "": include.write("#endif /* %s */\n" % cond) export.write("#endif /* %s */\n" % cond) output.write("#endif /* %s */\n" % cond) @@ -1313,7 +1313,7 @@ def buildWrappers(module): classes.write("#\n") classes.write("# WARNING WARNING WARNING WARNING\n") classes.write("#\n") - if extra != None: + if extra is not None: classes.writelines(extra.readlines()) classes.write("#\n") classes.write("# WARNING WARNING WARNING WARNING\n") @@ -1321,7 +1321,7 @@ def buildWrappers(module): classes.write("# Automatically written part of python bindings for libvirt\n") classes.write("#\n") classes.write("# WARNING WARNING WARNING WARNING\n") - if extra != None: + if extra is not None: extra.close() if function_classes.has_key("None"): @@ -1460,7 +1460,7 @@ def buildWrappers(module): destruct=None if classes_destructors.has_key(classname): classes.write(" def __del__(self):\n") - classes.write(" if self._o != None:\n") + classes.write(" if self._o is not None:\n") classes.write(" libvirtmod.%s(self._o)\n" % classes_destructors[classname]) classes.write(" self._o = None\n\n") @@ -1776,7 +1776,7 @@ def qemuBuildWrappers(module): fd.write("#\n") fd.write("# WARNING WARNING WARNING WARNING\n") fd.write("#\n") - if extra != None: + if extra is not None: fd.writelines(extra.readlines()) fd.write("#\n") fd.write("# WARNING WARNING WARNING WARNING\n") @@ -1784,7 +1784,7 @@ def qemuBuildWrappers(module): fd.write("# Automatically written part of python bindings for libvirt\n") fd.write("#\n") fd.write("# WARNING WARNING WARNING WARNING\n") - if extra != None: + if extra is not None: extra.close() fd.write("try:\n") @@ -1888,7 +1888,7 @@ def lxcBuildWrappers(module): fd.write("#\n") fd.write("# WARNING WARNING WARNING WARNING\n") fd.write("#\n") - if extra != None: + if extra is not None: fd.writelines(extra.readlines()) fd.write("#\n") fd.write("# WARNING WARNING WARNING WARNING\n") @@ -1896,7 +1896,7 @@ def lxcBuildWrappers(module): fd.write("# Automatically written part of python bindings for libvirt\n") fd.write("#\n") fd.write("# WARNING WARNING WARNING WARNING\n") - if extra != None: + if extra is not None: extra.close() fd.write("try:\n") diff --git a/python/libvirt-override-virConnect.py b/python/libvirt-override-virConnect.py index 044faa0..4ba3d30 100644 --- a/python/libvirt-override-virConnect.py +++ b/python/libvirt-override-virConnect.py @@ -7,7 +7,7 @@ except AttributeError: pass - if self._o != None: + if self._o is not None: libvirtmod.virConnectClose(self._o) self._o = None diff --git a/python/libvirt-override-virStream.py b/python/libvirt-override-virStream.py index b5cec2a..53000da 100644 --- a/python/libvirt-override-virStream.py +++ b/python/libvirt-override-virStream.py @@ -5,7 +5,7 @@ except AttributeError: pass - if self._o != None: + if self._o is not None: libvirtmod.virStreamFree(self._o) self._o = None @@ -103,7 +103,7 @@ the request would block, integer -2 is returned. """ ret = libvirtmod.virStreamRecv(self._o, nbytes) - if ret == None: raise libvirtError ('virStreamRecv() failed') + if ret is None: raise libvirtError ('virStreamRecv() failed') return ret def send(self, data): -- 1.7.9.5

2 2

[libvirt] configuring a disconnected <interface>
by Dan Kenigsberg 23 Aug '13

23 Aug '13

Hi List, Like most of us, I've bought my actual computer with an Ethernet interface card, that I can connect to a wall jack at will. It's quite easy to disconnect the Ethernet cable from the wall, as well. I would like to expose this behavior to virtual computers, too. Via libvirt, of course. That's useful, since an admin may need to disconnect a running VM from a network temporarily, without resorting to hot-unplugging its nic. How should the domxml represent this situation? An interface that is connected to a specific LAN1 bridge is <interface type='bridge'> <source bridge='LAN1'> <target dev='vnet1'/> <model type='virtio'/> </interface> Would the following make sense for an interface with no bridge at the source? <interface type='bridge'> <source/> <target dev='vnet1'/> <model type='virtio'/> </interface> And how about the recommended config for <interface>s, which is type='network'? Would it make sense to predefine <network> <name>null-bridge-network</name> <forward mode='bridge'> <bridge/> </network> so that <interface type='network'> <source network='null-bridge-network'/> </interface> means "keep this interface dangling out there"? Regards, Dan.

5 12

[libvirt] memory leak in snapshot and since at least 1.0.2?
by Serge Hallyn 23 Aug '13

23 Aug '13

Hi, https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1201938 documents a memory leak we're seeing in libvirt. I've reproduced it in 1.0.2, 1.0.6, and an hourly snapshot from yesterday morning (which is built at https://launchpad.net/~serge-hallyn/+archive/libvirt-mav) To reproduce it, I define and start one domain and run virt-manager locally (just leaving it running in a vnc server). The RSS as observed by top grows over time, starting at 10M and becoming 87M in about 12 hours. When I stop the running vm, the memleak does seem to stop. Presumably having >1 domain would speed up the memleak (explaining the original bug reporter's woes) thanks, -serge

2 3

[libvirt] [PATCH] qemuagenttest.c: Missing documentation (Timeout)
by nehaljwani 23 Aug '13

23 Aug '13

From: Nehal J Wani <nehaljw.kkd1(a)gmail.com> In tests/qemuagenttest.c, the Timeout test should always be called last. Any additional tests should come before this. --- tests/qemuagenttest.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index e338c98..cf32fc4 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -605,7 +605,8 @@ mymain(void) DO_TEST(Shutdown); DO_TEST(CPU); DO_TEST(ArbitraryCommand); - DO_TEST(Timeout); + + DO_TEST(Timeout); /*Timeout should always be called last*/ virObjectUnref(xmlopt); -- 1.7.11.7

2 1

[libvirt] [PATCH V2] Allow a HTTP URL for cdrom ISO image
by Aline Manera 23 Aug '13

23 Aug '13

From: Aline Manera <alinefm(a)br.ibm.com> V1 -> V2: - Use -drive instead of legacy -cdrom option Aline Manera (1): Allow a HTTP URL for cdrom ISO image src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 7 ++++ .../qemuxml2argv-disk-cdrom-network.args | 5 +++ .../qemuxml2argv-disk-cdrom-network.xml | 37 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ 6 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network.xml -- 1.7.10.4

3 4

[libvirt] [PATCH] HACKING: Introduce basic Signed-off-by politic
by Michal Privoznik 23 Aug '13

23 Aug '13

With the rising number of signed-off patches appearing on the list, we should have policy what signed-off means, and advice (enforce?) contributors to use it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- HACKING | 8 ++++++-- docs/hacking.html.in | 12 ++++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/HACKING b/HACKING index f9f8381..e54e584 100644 --- a/HACKING +++ b/HACKING @@ -73,8 +73,12 @@ commit introduced the problem, mentioning that is useful. If the patch resolves a bugzilla report, mentioning the URL of the bug number is useful; but also summarize the issue rather than making all readers follow the link. You can use 'git shortlog -30' to get an idea of typical summary lines. -Libvirt does not currently attach any meaning to Signed-off-by: lines, so it -is up to you if you want to include or omit them in the commit message. +Moreover, you should sign off your patches, meaning you are the original +author(s) of them and you have right to submit them under the open source +license indicated in the file. To add the "Signed-off-by:" line to the commit +message automatically, you can tweak the git configuration: + + git config format.signoff true diff --git a/docs/hacking.html.in b/docs/hacking.html.in index 543c77e..f1a5c59 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -78,10 +78,14 @@ of the bug number is useful; but also summarize the issue rather than making all readers follow the link. You can use 'git shortlog -30' to get an idea of typical summary lines. - Libvirt does not currently attach any meaning to - Signed-off-by: lines, so it is up to you if you want to - include or omit them in the commit message. - + Moreover, you should sign off your patches, meaning you are the + original author(s) of them and you have right to submit them under + the open source license indicated in the file. To add the + <code>Signed-off-by:</code> line to the commit message automatically, + you can tweak the git configuration: +<pre> + git config format.signoff true +</pre> </li> <li>Split large changes into a series of smaller patches, -- 1.8.1.5

3 2

[libvirt] [PATCHv4 0/4]write separate module for hostdev passthrough
by cyliu＠suse.com 22 Aug '13

22 Aug '13

From: Chunyan Liu <cyliu(a)suse.com> These patches implements a separate module for hostdev passthrough so that it could be shared by different drivers and can maintain a global state of a host device. Plus, add passthrough to libxl driver, and change qemu driver and lxc driver to use hostdev common library instead of their own hostdev APIs. --- Changes to v3: * fix Jim's comments v3 is here: https://www.redhat.com/archives/libvir-list/2013-August/msg00019.html Changes to v2: * add patches for qemu driver and lxc driver, use common library APIs instead of their own hostdev APIs. * add APIs for nodedev-detach and nodedev-reattach calling. * rename functions to use unified prefix 'virHostdev' * use VIR_ONCE_GLOBAL_INIT() as others instead of previous Init and Cleanup. * use VIR_STRDUP instead of strdup * rebase to latest code v2 is here: https://www.redhat.com/archives/libvir-list/2013-June/msg00263.html root (4): add hostdev passthrough common library add pci passthrough to libxl driver change qemu driver to use hostdev common library change lxc driver to use common library po/POTFILES.in | 3 +- src/Makefile.am | 3 +- src/libvirt_private.syms | 22 + src/libxl/libxl_conf.c | 63 ++ src/libxl/libxl_conf.h | 4 + src/libxl/libxl_driver.c | 262 +++++++- src/lxc/lxc_conf.h | 4 - src/lxc/lxc_driver.c | 45 +- src/lxc/lxc_hostdev.c | 413 ------------ src/lxc/lxc_hostdev.h | 43 -- src/lxc/lxc_process.c | 21 +- src/qemu/qemu_command.c | 1 - src/qemu/qemu_conf.h | 9 +- src/qemu/qemu_driver.c | 72 +-- src/qemu/qemu_hostdev.c | 1289 ----------------------------------- src/qemu/qemu_hostdev.h | 72 -- src/qemu/qemu_hotplug.c | 126 ++-- src/qemu/qemu_process.c | 34 +- src/util/virhostdev.c | 1679 ++++++++++++++++++++++++++++++++++++++++++++++ src/util/virhostdev.h | 129 ++++ src/util/virpci.c | 21 +- src/util/virpci.h | 7 +- src/util/virscsi.c | 22 +- src/util/virscsi.h | 8 +- src/util/virusb.c | 23 +- src/util/virusb.h | 8 +- 26 files changed, 2355 insertions(+), 2028 deletions(-) delete mode 100644 src/lxc/lxc_hostdev.c delete mode 100644 src/lxc/lxc_hostdev.h delete mode 100644 src/qemu/qemu_hostdev.c delete mode 100644 src/qemu/qemu_hostdev.h create mode 100644 src/util/virhostdev.c create mode 100644 src/util/virhostdev.h

4 10

[libvirt] [PATCH v4 3/3] python: Use RELRO_LDFLAGS and NO_INDIRECT_LDFLAGS
by Guido Günther 22 Aug '13

22 Aug '13

A readonly GOT and detecting indirect linkage is useful here too. --- python/Makefile.am | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/python/Makefile.am b/python/Makefile.am index 925e1f4..3f967a9 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -28,6 +28,10 @@ INCLUDES = \ $(GETTEXT_CPPFLAGS) AM_CFLAGS = $(WARN_CFLAGS) +AM_LDFLAGS = \ + $(RELRO_LDFLAGS) \ + $(NO_INDIRECT_LDFLAGS) \ + $(NULL) CLASSES_EXTRA = \ libvirt-override-virConnect.py \ @@ -74,6 +78,7 @@ libvirtmod_la_CFLAGS = $(WARN_CFLAGS) $(WARN_PYTHON_CFLAGS) libvirtmod_la_LDFLAGS = -module -avoid-version -shared \ -L$(top_builddir)/src/.libs \ + $(AM_LDFLAGS) \ $(CYGWIN_EXTRA_LDFLAGS) libvirtmod_la_LIBADD = $(mylibs) \ $(CYGWIN_EXTRA_LIBADD) $(CYGWIN_EXTRA_PYTHON_LIBADD) @@ -86,6 +91,7 @@ libvirtmod_qemu_la_CFLAGS = $(WARN_PYTHON_CFLAGS) libvirtmod_qemu_la_LDFLAGS = -module -avoid-version -shared \ -L$(top_builddir)/src/.libs \ + $(AM_LDFLAGS) \ $(CYGWIN_EXTRA_LDFLAGS) libvirtmod_qemu_la_LIBADD = $(myqemulibs) \ $(CYGWIN_EXTRA_LIBADD) $(CYGWIN_EXTRA_PYTHON_LIBADD) @@ -98,6 +104,7 @@ libvirtmod_lxc_la_CFLAGS = $(WARN_PYTHON_CFLAGS) libvirtmod_lxc_la_LDFLAGS = -module -avoid-version -shared \ -L$(top_builddir)/src/.libs \ + $(AM_LDFLAGS) \ $(CYGWIN_EXTRA_LDFLAGS) libvirtmod_lxc_la_LIBADD = $(mylxclibs) \ $(CYGWIN_EXTRA_LIBADD) $(CYGWIN_EXTRA_PYTHON_LIBADD) -- 1.8.4.rc3

2 2

[libvirt] [PATCH v3] BSD: implement virNetDev(Set|Clear)IPv4Address
by Roman Bogorodskiy 22 Aug '13

22 Aug '13

Provide an implementation of virNetDev(Set|Clear)IPv4Address based on BSD ifconfig tool in addition to 'ip' from Linux iproute2 package. --- configure.ac | 15 +++++++++++++++ src/util/virnetdev.c | 24 ++++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/configure.ac b/configure.ac index cc2213d..7667430 100644 --- a/configure.ac +++ b/configure.ac @@ -387,6 +387,10 @@ if test "$prefix" = "/usr" && test "$sysconfdir" = '${prefix}/etc' ; then sysconfdir='/etc' fi +dnl Specify if we rely on ifconfig instead of iproute2 (e.g. in case +dnl we're working on BSD) +want_ifconfig=no + dnl Make some notes about which OS we're compiling for, as the lxc and qemu dnl drivers require linux headers, and storage_mpath, dtrace, and nwfilter dnl are also linux specific. The "network" and storage_fs drivers are known @@ -409,6 +413,8 @@ if test $with_linux = no; then fi if test $with_freebsd = yes; then + want_ifconfig=yes + with_firewalld=no fi @@ -2429,6 +2435,15 @@ AC_CHECK_DECLS([BRDGSFD, BRDGADD, BRDGDEL], #include <net/if_bridgevar.h> ]) +# Check if we need to look for ifconfig +if test "$want_ifconfig" = "yes"; then + AC_PATH_PROG([IFCONFIG_PATH], [ifconfig]) + if test -z "$IFCONFIG_PATH"; then + AC_MSG_ERROR([Failed to find ifconfig.]) + fi + AC_DEFINE_UNQUOTED([IFCONFIG_PATH], "$IFCONFIG_PATH", [path to ifconfig binary]) +fi + # Detect when running under the clang static analyzer's scan-build driver # or Coverity-prevent's cov-build. Define STATIC_ANALYSIS accordingly. AC_CACHE_CHECK([whether this build is done by a static analysis tool], diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 30df7a6..8eb4d4c 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -810,12 +810,25 @@ int virNetDevSetIPv4Address(const char *ifname, !(bcaststr = virSocketAddrFormat(&broadcast)))) { goto cleanup; } +#ifdef IFCONFIG_PATH + cmd = virCommandNew(IFCONFIG_PATH); + virCommandAddArg(cmd, ifname); + if (VIR_SOCKET_ADDR_IS_FAMILY(addr, AF_INET6)) + virCommandAddArg(cmd, "inet6"); + else + virCommandAddArg(cmd, "inet"); + virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); + if (bcaststr) + virCommandAddArgList(cmd, "broadcast", bcaststr, NULL); + virCommandAddArg(cmd, "alias"); +#else cmd = virCommandNew(IP_PATH); virCommandAddArgList(cmd, "addr", "add", NULL); virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); if (bcaststr) virCommandAddArgList(cmd, "broadcast", bcaststr, NULL); virCommandAddArgList(cmd, "dev", ifname, NULL); +#endif if (virCommandRun(cmd, NULL) < 0) goto cleanup; @@ -895,10 +908,21 @@ int virNetDevClearIPv4Address(const char *ifname, if (!(addrstr = virSocketAddrFormat(addr))) goto cleanup; +#ifdef IFCONFIG_PATH + cmd = virCommandNew(IFCONFIG_PATH); + virCommandAddArg(cmd, ifname); + if (VIR_SOCKET_ADDR_IS_FAMILY(addr, AF_INET6)) + virCommandAddArg(cmd, "inet6"); + else + virCommandAddArg(cmd, "inet"); + virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); + virCommandAddArg(cmd, "-alias"); +#else cmd = virCommandNew(IP_PATH); virCommandAddArgList(cmd, "addr", "del", NULL); virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); virCommandAddArgList(cmd, "dev", ifname, NULL); +#endif if (virCommandRun(cmd, NULL) < 0) goto cleanup; -- 1.8.2.3

2 4

[libvirt] [PATCH v2] tests: Add URI precedence checking
by Martin Kletzander 22 Aug '13

22 Aug '13

Commit a0b6a36f is fixing what commit abfff210 broke, so to avoid having to deal with this issue again, herec comes "virsh-uriprecedence". Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: v2: - Changed the name to virsh-uriprecedence - Using $PWD instead of temporary dir tests/Makefile.am | 2 ++ tests/virsh-uriprecedence | 76 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100755 tests/virsh-uriprecedence diff --git a/tests/Makefile.am b/tests/Makefile.am index 09144d6..2fb8f37 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -98,6 +98,7 @@ EXTRA_DIST = \ storagevolxml2xmlout \ sysinfodata \ test-lib.sh \ + virsh-uriprecedence \ vmx2xmldata \ xencapsdata \ xmconfigdata \ @@ -235,6 +236,7 @@ test_scripts += \ read-bufsiz \ read-non-seekable \ start \ + virsh-uriprecedence \ vcpupin \ virsh-all \ virsh-optparse \ diff --git a/tests/virsh-uriprecedence b/tests/virsh-uriprecedence new file mode 100755 index 0000000..f4d84a4 --- /dev/null +++ b/tests/virsh-uriprecedence @@ -0,0 +1,76 @@ +#!/bin/sh + +: ${srcdir=.} +. $srcdir/test-lib.sh + +# This test checks if virsh obeys the proper precedence of different +# URI settings +test_intro "virsh-uriprecedence" + +virsh_bin="$abs_top_builddir/tools/virsh" +counter=1 +ret=0 + +cleanup_() { rm -rf "$tmphome"; } + +# Create all mock files/directories to avoid permission problems +tmphome="$PWD/tmp_home" +export XDG_CONFIG_HOME="$tmphome/.config" +export XDG_CACHE_HOME="$tmphome/.cache" +export XDG_RUNTIME_HOME="XDG_CACHE_HOME" + +mkdir -p "$XDG_CONFIG_HOME/libvirt" "$XDG_CONFIG_HOME/virsh" +mkdir -p "$XDG_CACHE_HOME/libvirt" "$XDG_CACHE_HOME/virsh" +mkdir -p "$XDG_RUNTIME_HOME/libvirt" "$XDG_RUNTIME_HOME/virsh" + +# Main function checking for the proper uri being returned +test_uri() +{ + result=0 + if [ "$($virsh_bin uri)" != "$good_uri" ]; then + result=1 + ret=1 + fi + test_result "$counter" "$1" "$result" + counter="$((counter+1))" +} + +# Precedence is the following (lowest priority first): +# +# 1) if run as root, 'uri_default' from /etc/libvirtd/libvirt.conf, +# otherwise qemu:///session. There is no way to mock this file for +# virsh/libvirt.so and the user may have set anything in there that +# would spoil the test, so we don't test this +# +# 2) 'uri_default' from $XDG_CONFIG_HOME/libvirt/libvirt.conf +# +# 3) LIBVIRT_DEFAULT_URI +# +# 4) VIRSH_DEFAULT_CONNECT_URI +# +# 5) parameter -c (--connect) + +unset LIBVIRT_DEFAULT_URI +unset VIRSH_DEFAULT_CONNECT_URI +bad_uri="test:///default?bad_uri" +good_uri="test:///default?good_uri" + +printf "uri_default=\"%s\"\n" "$good_uri" >"$XDG_CONFIG_HOME/libvirt/libvirt.conf" +test_uri "User config file" + +printf "uri_default=\"%s\"\n" "$bad_uri" >"$XDG_CONFIG_HOME/libvirt/libvirt.conf" +export LIBVIRT_DEFAULT_URI="$good_uri" +test_uri "LIBVIRT_DEFAULT_URI" + +export LIBVIRT_DEFAULT_URI="$bad_uri" +export VIRSH_DEFAULT_CONNECT_URI="$good_uri" +test_uri "VIRSH_DEFAULT_CONNECT_URI" + +export VIRSH_DEFAULT_CONNECT_URI="$bad_uri" +virsh_bin="$virsh_bin --connect $good_uri" +test_uri "Parameter" + +# test_uri() increases $counter even for the last test, so we must +# decrement it +test_final "$((counter-1))" "$ret" +(exit "$ret"); exit "$ret" -- 1.8.3.2

4 6

[libvirt] [PATCH] Set security label on FD for virDomainOpenGraphics
by Daniel P. Berrange 22 Aug '13

22 Aug '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The virDomainOpenGraphics method accepts a UNIX socket FD from the client app. It must set the label on this FD otherwise QEMU will be prevented from receiving it with recvmsg. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_driver.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 5124f27..0a8e518 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14777,6 +14777,10 @@ qemuDomainOpenGraphics(virDomainPtr dom, goto cleanup; } + if (virSecurityManagerSetImageFDLabel(driver->securityManager, vm->def, + fd) < 0) + goto cleanup; + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; qemuDomainObjEnterMonitor(driver, vm); -- 1.8.3.1

2 2

[libvirt] [PATCH v2 0/9] virsh: More intelligent auto-completion
by Tomas Meszaros 22 Aug '13

22 Aug '13

Original series + some fixes/improvements. Tomas Meszaros (9): virsh: C99 style for info_domfstrim and opts_lxc_enter_namespace virsh: Add vshCmdCompleter and vshOptCompleter virsh: Improve readline generators and readline completion virsh: Add vshDomainCompleter virsh: Add vshSuspendTargetCompleter virsh: Add vshRebootShutdownModeCompleter virsh: Add completer functions to domManaggementCmds virsh: Add completer functions to snapshotCmds virsh: Add completer functions to domMonitoringCmds tools/virsh-domain-monitor.c | 32 ++- tools/virsh-domain.c | 248 ++++++++++++++++----- tools/virsh-snapshot.c | 45 +++- tools/virsh.c | 504 +++++++++++++++++++++++++++++++++++++++++-- tools/virsh.h | 11 + 5 files changed, 748 insertions(+), 92 deletions(-) -- 1.8.3.1

4 17

[libvirt] [PATCH] vl: allow "cont" from panicked state
by Paolo Bonzini 22 Aug '13

22 Aug '13

After reporting the GUEST_PANICKED monitor event, QEMU stops the VM. The reason for this is that events are edge-triggered, and can be lost if management dies at the wrong time. Stopping a panicked VM lets management know of a panic even if it has crashed; management can learn about the panic when it restarts and queries running QEMU processes. The downside is of course that the VM will be paused while management is not running, but that is acceptable if it only happens with explicit "-device pvpanic". Upon learning of a panic, management (if configured to do so) can pick a variety of behaviors: leave the VM paused, reset it, destroy it. In addition to all of these behaviors, it is possible dumping the VM core from the host. However, right now, the panicked state is irreversible, and can only be exited by resetting the machine. This means that any policy decision is entirely in the hands of the host. In particular there is no way to use the "reboot on panic" option together with pvpanic. This patch makes the panicked state reversible (and removes various workarounds that were there because of the state being irreversible). With this change, management has a wider set of possible policies: it can just log the crash and leave policy to the guest, it can leave the VM paused. In particular, the "log the crash and continue" is implemented simply by sending a "cont" as soon as management learns about the panic. Management could also implement the "irreversible paused state" itself. And again, all such actions can be coupled with dumping the VM core. Unfortunately we cannot change the behavior of 1.6.0. Thus, even if it uses "-device pvpanic", management should check for "cont" failures. If "cont" fails, management can then log that the VM remained paused and urge the administrator to update QEMU. I suggest that this patch be included in an 1.6.1 release as soon as possible, and perhaps in the 1.5 branch too. Cc: qemu-stable(a)nongnu.org Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com> --- gdbstub.c | 3 --- vl.c | 6 ++---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index 35ca7c2..747e67d 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -372,9 +372,6 @@ static inline void gdb_continue(GDBState *s) #ifdef CONFIG_USER_ONLY s->running_state = 1; #else - if (runstate_check(RUN_STATE_GUEST_PANICKED)) { - runstate_set(RUN_STATE_DEBUG); - } if (!runstate_needs_reset()) { vm_start(); } diff --git a/vl.c b/vl.c index 25b8f2f..818d99e 100644 --- a/vl.c +++ b/vl.c @@ -637,9 +637,8 @@ static const RunStateTransition runstate_transitions_def[] = { { RUN_STATE_WATCHDOG, RUN_STATE_RUNNING }, { RUN_STATE_WATCHDOG, RUN_STATE_FINISH_MIGRATE }, - { RUN_STATE_GUEST_PANICKED, RUN_STATE_PAUSED }, + { RUN_STATE_GUEST_PANICKED, RUN_STATE_RUNNING }, { RUN_STATE_GUEST_PANICKED, RUN_STATE_FINISH_MIGRATE }, - { RUN_STATE_GUEST_PANICKED, RUN_STATE_DEBUG }, { RUN_STATE_MAX, RUN_STATE_MAX }, }; @@ -685,8 +684,7 @@ int runstate_is_running(void) bool runstate_needs_reset(void) { return runstate_check(RUN_STATE_INTERNAL_ERROR) || - runstate_check(RUN_STATE_SHUTDOWN) || - runstate_check(RUN_STATE_GUEST_PANICKED); + runstate_check(RUN_STATE_SHUTDOWN); } StatusInfo *qmp_query_status(Error **errp) -- 1.8.3.1

5 21

[libvirt] [PATCH] docs: Reformat <disk> attribute description in formatdomain
by John Ferlan 22 Aug '13

22 Aug '13

Reformat the description to more cleanly delineate the attributes for a <disk> element. --- Similar to the recently changed <source> attribute. docs/formatdomain.html.in | 121 +++++++++++++++++++++++++++------------------- 1 file changed, 71 insertions(+), 50 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 0d1a74f..9d12293 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1562,56 +1562,77 @@ <dl> <dt><code>disk</code></dt> <dd>The <code>disk</code> element is the main container for describing - disks. The <code>type</code> attribute is either "file", - "block", "dir", "network", or "volume" - and refers to the underlying source for the disk. The optional - <code>device</code> attribute indicates how the disk is to be exposed - to the guest OS. Possible values for this attribute are - "floppy", "disk", "cdrom", and "lun", defaulting to - "disk". "lun" (since 0.9.10) is only - valid when type is "block" and the target element's "bus" - attribute is "virtio", and behaves identically to "disk", - except that generic SCSI commands from the guest are accepted - and passed through to the physical device - - also note that device='lun' will only be recognized for - actual raw devices, never for individual partitions or LVM - partitions (in those cases, the kernel will reject the generic - SCSI commands, making it identical to device='disk'). - The optional <code>rawio</code> attribute - (since 0.9.10) indicates whether - the disk is needs rawio capability; valid settings are "yes" - or "no" (default is "no"). If any one disk in a domain has - rawio='yes', rawio capability will be enabled for all disks in - the domain (because, in the case of QEMU, this capability can - only be set on a per-process basis). This attribute is only - valid when device is "lun". NB, <code>rawio</code> intends to - confine the capability per-device, however, current QEMU - implementation gives the domain process broader capability - than that (per-process basis, affects all the domain disks). - To confine the capability as much as possible for QEMU driver - as this stage, <code>sgio</code> is recommended, it's more - secure than <code>rawio</code>. - The optional <code>sgio</code> (since 1.0.2) - attribute indicates whether the kernel will filter unprivileged - SG_IO commands for the disk, valid settings are "filtered" or - "unfiltered". Defaults to "filtered". Similar to <code>rawio</code>, - <code>sgio</code> is only valid for device 'lun'. - The optional <code>snapshot</code> attribute indicates the default - behavior of the disk during disk snapshots: "internal" - requires a file format such as qcow2 that can store both the - snapshot and the data changes since the snapshot; - "external" will separate the snapshot from the live data; and - "no" means the disk will not participate in snapshots. - Read-only disks default to "no", while the default for other - disks depends on the hypervisor's capabilities. Some - hypervisors allow a per-snapshot choice as well, - during <a href="formatsnapshot.html">domain snapshot - creation</a>. Not all snapshot modes are supported; - for example, <code>snapshot='yes'</code> with a transient disk - generally does not make sense. Since 0.0.3; - "device" attribute since 0.1.4; - "network" attribute since 0.8.7; "snapshot" since - 0.9.5</dd> + disks (since 0.0.3). + <dl> + <dt><code>type</code> attribute + since 0.0.3</dt> + <dd> + Valid values are "file", "block", + "dir" (since 0.7.5), + "network" (since 0.8.7), or + "volume" (since 1.0.5) + and refer to the underlying source for the disk. + </dd> + <dt><code>device</code> attribute + since 0.1.4</dt> + <dd> + Indicates how the disk is to be exposed to the guest OS. Possible + values for this attribute are "floppy", "disk", "cdrom", and "lun", + defaulting to "disk". + + Using "lun" (since 0.9.10) is only + valid when type is "block" and the target element's "bus" + attribute is "virtio", and behaves identically to "disk", + except that generic SCSI commands from the guest are accepted + and passed through to the physical device. Also note that + device='lun' will only be recognized for actual raw devices, + but never for individual partitions or LVM partitions (in those + cases, the kernel will reject the generic SCSI commands, making + it identical to device='disk'). + + </dd> + <dt><code>rawio</code> attribute + since 0.9.10</dt> + <dd> + Indicates whether the disk is needs rawio capability; valid + settings are "yes" or "no" (default is "no"). If any one disk + in a domain has rawio='yes', rawio capability will be enabled + for all disks in the domain (because, in the case of QEMU, this + capability can only be set on a per-process basis). This attribute + is only valid when device is "lun". NB, <code>rawio</code> intends + to confine the capability per-device, however, current QEMU + implementation gives the domain process broader capability + than that (per-process basis, affects all the domain disks). + To confine the capability as much as possible for QEMU driver + as this stage, <code>sgio</code> is recommended, it's more + secure than <code>rawio</code>. + </dd> + <dt><code>sgio</code> attribute + since 1.0.2</dt> + <dd> + Indicates whether the kernel will filter unprivileged + SG_IO commands for the disk, valid settings are "filtered" or + "unfiltered". Defaults to "filtered". Similar to <code>rawio</code>, + <code>sgio</code> is only valid for device 'lun'. + </dd> + <dt><code>snapshot</code> attribute + since 0.9.5</dt> + <dd> + Indicates the default behavior of the disk during disk snapshots: + "internal" requires a file format such as qcow2 that can store + both the snapshot and the data changes since the snapshot; + "external" will separate the snapshot from the live data; and + "no" means the disk will not participate in snapshots. Read-only + disks default to "no", while the default for other disks depends + on the hypervisor's capabilities. Some hypervisors allow a + per-snapshot choice as well, during + <a href="formatsnapshot.html">domain snapshot creation</a>. + Not all snapshot modes are supported; for example, + <code>snapshot='yes'</code> with a transient disk generally + does not make sense. + </dd> + </dl> + </dd> <dt><code>source</code></dt> <dd>Representation of the disk <code>source</code> depends on the disk <code>type</code> attribute value as follows: -- 1.8.3.1

2 2

[libvirt] [PATCH] tests: Add URI precedence checking
by Martin Kletzander 22 Aug '13

22 Aug '13

Commit a0b6a36f is fixing what commit abfff210 broke, so to avoid having to deal with this issue again, I present you The "uriprecedencetest". Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- tests/Makefile.am | 2 ++ tests/uriprecedencetest | 77 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100755 tests/uriprecedencetest diff --git a/tests/Makefile.am b/tests/Makefile.am index 09144d6..419db8b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -98,6 +98,7 @@ EXTRA_DIST = \ storagevolxml2xmlout \ sysinfodata \ test-lib.sh \ + uriprecedencetest \ vmx2xmldata \ xencapsdata \ xmconfigdata \ @@ -235,6 +236,7 @@ test_scripts += \ read-bufsiz \ read-non-seekable \ start \ + uriprecedencetest \ vcpupin \ virsh-all \ virsh-optparse \ diff --git a/tests/uriprecedencetest b/tests/uriprecedencetest new file mode 100755 index 0000000..9515e63 --- /dev/null +++ b/tests/uriprecedencetest @@ -0,0 +1,77 @@ +#!/bin/sh + +: ${srcdir=.} +. $srcdir/test-lib.sh + +# This test checks if virsh obeys the proper precedence of different +# URI settings +test_intro "uriprecedencetest" + +virsh_bin="$abs_top_builddir/tools/virsh" +counter=1 +ret=0 + +tmpdir="$(mktemp -d)" +cleanup_() { rm -rf "$tmpdir"; } + +# Create all mock files/directories to avoid permission problems +tmphome="$tmpdir/tmp_home" +export XDG_CONFIG_HOME="$tmpdir/.config" +export XDG_CACHE_HOME="$tmpdir/.cache" +export XDG_RUNTIME_HOME="XDG_CACHE_HOME" + +mkdir -p "$XDG_CONFIG_HOME/libvirt" "$XDG_CONFIG_HOME/virsh" +mkdir -p "$XDG_CACHE_HOME/libvirt" "$XDG_CACHE_HOME/virsh" +mkdir -p "$XDG_RUNTIME_HOME/libvirt" "$XDG_RUNTIME_HOME/virsh" + +# Main function checking for the proper uri being returned +test_uri() +{ + result=0 + if [ "$($virsh_bin uri)" != "$good_uri" ]; then + result=1 + ret=1 + fi + test_result "$counter" "$1" "$result" + counter="$((counter+1))" +} + +# Precedence is the following (lowest priority first): +# +# 1) if run as root, 'uri_default' from /etc/libvirtd/libvirt.conf, +# otherwise qemu:///session. There is no way to mock this file for +# virsh/libvirt.so and the user may have set anything in there that +# would spoil the test, so we don't test this +# +# 2) 'uri_default' from $XDG_CONFIG_HOME/libvirt/libvirt.conf +# +# 3) LIBVIRT_DEFAULT_URI +# +# 4) VIRSH_DEFAULT_CONNECT_URI +# +# 5) parameter -c (--connect) + +unset LIBVIRT_DEFAULT_URI +unset VIRSH_DEFAULT_CONNECT_URI +bad_uri="test:///default?bad_uri" +good_uri="test:///default?good_uri" + +printf "uri_default=\"%s\"\n" "$good_uri" >"$XDG_CONFIG_HOME/libvirt/libvirt.conf" +test_uri "User config file" + +printf "uri_default=\"%s\"\n" "$bad_uri" >"$XDG_CONFIG_HOME/libvirt/libvirt.conf" +export LIBVIRT_DEFAULT_URI="$good_uri" +test_uri "LIBVIRT_DEFAULT_URI" + +export LIBVIRT_DEFAULT_URI="$bad_uri" +export VIRSH_DEFAULT_CONNECT_URI="$good_uri" +test_uri "VIRSH_DEFAULT_CONNECT_URI" + +export VIRSH_DEFAULT_CONNECT_URI="$bad_uri" +virsh_bin="$virsh_bin --connect $good_uri" +test_uri "Parameter" + +# test_uri() increases $counter even for the last test, so we must +# decrement it +test_final "$((counter-1))" "$ret" +(exit "$ret"); exit "$ret" -- 1.8.3.2

2 1

[libvirt] [PATCH] qemuBuildNicDevStr: Add mq=on for multiqueue networking
by Michal Privoznik 22 Aug '13

22 Aug '13

If user requested multiqueue networking, beside multiple /dev/tap and /dev/vhost-net openings, we forgot to pass mq=on onto the -device virtio-net-pci command line. This is advised at: http://www.linux-kvm.org/page/Multiqueue#Enable_MQ_feature --- Notes: Maybe worth backporting to maintainer branches too. The MQ was introduced in the 1.0.6 release. src/qemu/qemu_command.c | 7 ++++++- src/qemu/qemu_command.h | 1 + src/qemu/qemu_hotplug.c | 4 +++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f151173..d73872a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4730,6 +4730,7 @@ qemuBuildNicDevStr(virDomainDefPtr def, virDomainNetDefPtr net, int vlan, int bootindex, + bool multiqueue, virQEMUCapsPtr qemuCaps) { virBuffer buf = VIR_BUFFER_INITIALIZER; @@ -4782,6 +4783,8 @@ qemuBuildNicDevStr(virDomainDefPtr def, virDomainVirtioEventIdxTypeToString(net->driver.virtio.event_idx)); } } + if (usingVirtio && multiqueue) + virBufferAddLit(&buf, ",mq=on"); if (vlan == -1) virBufferAsprintf(&buf, ",netdev=host%s", net->info.alias); else @@ -7275,7 +7278,9 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, virCommandAddArgList(cmd, "-netdev", host, NULL); } if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { - if (!(nic = qemuBuildNicDevStr(def, net, vlan, bootindex, qemuCaps))) + bool multiqueue = tapfdSize > 1 || vhostfdSize > 1; + if (!(nic = qemuBuildNicDevStr(def, net, vlan, bootindex, + multiqueue, qemuCaps))) goto cleanup; virCommandAddArgList(cmd, "-device", nic, NULL); } else { diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 5c5c025..a9854a3 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -102,6 +102,7 @@ char * qemuBuildNicDevStr(virDomainDefPtr def, virDomainNetDefPtr net, int vlan, int bootindex, + bool multiqueue, virQEMUCapsPtr qemuCaps); char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk, diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 478f331..b49073b 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -859,7 +859,9 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, } if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { - if (!(nicstr = qemuBuildNicDevStr(vm->def, net, vlan, 0, priv->qemuCaps))) + bool multiqueue = tapfdSize > 1 || vhostfdSize > 1; + if (!(nicstr = qemuBuildNicDevStr(vm->def, net, vlan, 0, + multiqueue, priv->qemuCaps))) goto try_remove; } else { if (!(nicstr = qemuBuildNicStr(net, NULL, vlan))) -- 1.8.1.5

2 1

[libvirt] [PATCH] LXC: mount a fresh /run directory for container
by Gao feng 22 Aug '13

22 Aug '13

The unix socket file /run/systemd/private is used to send reboot/shutdown messages. and since this type of unix sockets are not per net namespace , they are global resources. systemctl in container can use this unix socket to send shutdown message to the systemd-shutdownd running on host. finally the host will be poweroff. this problem occurs when container shares the same root directory with host. this patch umount host's /run directory and mount the /run directory of container as tmpfs. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 8abaea0..aae8e6a 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -772,6 +772,10 @@ static int lxcContainerMountBasicFS(void) { "sysfs", "/sys", "sysfs", NULL, MS_BIND|MS_REMOUNT|MS_RDONLY }, { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV }, { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_BIND|MS_REMOUNT|MS_RDONLY }, + /* We should mount /run directory as tmpfs, since it contains some + * global files such as /run/systemd/private which can be used to + * send reboot/shutdown message from container to host. */ + { "tmpfs", "/run", "tmpfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV }, #if WITH_SELINUX { SELINUX_MOUNT, SELINUX_MOUNT, "selinuxfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV }, { SELINUX_MOUNT, SELINUX_MOUNT, NULL, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY }, @@ -1526,6 +1530,7 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, if (STREQ(root->src, "/") && (lxcContainerUnmountSubtree("/sys", false) < 0 || lxcContainerUnmountSubtree("/dev", false) < 0 || + lxcContainerUnmountSubtree("/run", false) < 0 || lxcContainerUnmountSubtree("/proc", false) < 0)) goto cleanup; -- 1.8.3.1

2 6

[libvirt] [PATCH]LXC: force container to enable network namespace
by Chen Hanxiao 22 Aug '13

22 Aug '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> If we don't enable network namespace, we could shutdown host inside container by command 'shutdown', which is unacceptable. This patch will force users to enable network namespace before they start container. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index c7a22ab..5631ad7 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1937,6 +1937,12 @@ int lxcContainerStart(virDomainDefPtr def, if (lxcNeedNetworkNamespace(def)) { VIR_DEBUG("Enable network namespaces"); cflags |= CLONE_NEWNET; + } else { + errno = EINVAL; + + virReportSystemError(errno, "%s", + _("Network namespace needed")); + return -1; } pid = clone(lxcContainerChild, stacktop, cflags, &args); -- 1.7.1

4 4

[libvirt] Is it a problem that "a vm has been shutdown, but its pidfile has not been removed"
by Wangyufei (A) 22 Aug '13

22 Aug '13

Hello, when do steps as follows: 1. start a vm 2. restart libvirtd service 3. shutdown the vm I found the pidfile associated with the vm has not been removed. Analyzing related piece of code, I found when libvirtd service restarted, the vm's _virDomainObj structure(named dom here) in libvirtd will be re-established according to the vm's state-file or config-file, but its member of privateData.pidfile will not be reassigned value. By the way, qemudriver is used in my libvirt. So when the vm is shutdown, its pidfile will not be removed, because the member of privateData.pidfile is NULL. My questions are : 1. Do you think it is a problem when a vm has been shutdown, but its pidfile has not been removed ? 2. Do you think it is expected that the member of privateData.pidfile's value missed after libvirtd restart? If it's a bug then I'll submit the patch to fix it. Also list the related piece of code about removing the vm's pidfile in libvirt for your information: if (priv->pidfile && unlink(priv->pidfile) < 0 && errno != ENOENT) VIR_WARN("Failed to remove PID file for %s: %s", vm->def->name, virStrerror(errno, ebuf, sizeof(ebuf))); Best Regards, -WangYufei

2 1

[libvirt] [PATCHv2] virBitmapParse: Fix behavior in case of error and fix up callers
by Peter Krempa 22 Aug '13

22 Aug '13

Re-arrange the code so that the returned bitmap is always initialized to NULL even on early failures and return an error message as some callers are already expecting it. Fix up the rest not to shadow the error. --- Version 2: - squashed cleanup of callers into this patch po/POTFILES.in | 1 + src/conf/domain_conf.c | 5 +---- src/conf/network_conf.c | 3 --- src/nodeinfo.c | 5 +---- src/qemu/qemu_driver.c | 2 -- src/util/virbitmap.c | 18 +++++++++--------- src/xenxs/xen_sxpr.c | 5 +---- tests/cpuset | 2 +- 8 files changed, 14 insertions(+), 27 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 36d027a..9a83069 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -147,6 +147,7 @@ src/util/viralloc.c src/util/viraudit.c src/util/virauth.c src/util/virauthconfig.c +src/util/virbitmap.c src/util/vircgroup.c src/util/virclosecallbacks.c src/util/vircommand.c diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ea49d2c..8a187a6 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10981,11 +10981,8 @@ virDomainDefParseXML(xmlDocPtr xml, tmp = virXPathString("string(./vcpu[1]/@cpuset)", ctxt); if (tmp) { if (virBitmapParse(tmp, 0, &def->cpumask, - VIR_DOMAIN_CPUMASK_LEN) < 0) { - virReportError(VIR_ERR_XML_ERROR, - "%s", _("topology cpuset syntax error")); + VIR_DOMAIN_CPUMASK_LEN) < 0) goto error; - } VIR_FREE(tmp); } } diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index bbc980b..8aef609 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -2897,9 +2897,6 @@ virNetworkLoadState(virNetworkObjListPtr nets, if ((class_id = virXPathString("string(./class_id[1]/@bitmap)", ctxt))) { if (virBitmapParse(class_id, 0, &class_id_map, CLASS_ID_BITMAP_SIZE) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Malformed 'class_id' attribute: %s"), - class_id); VIR_FREE(class_id); goto error; } diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 4df4851..33a79b7 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -1547,11 +1547,8 @@ virNodeGetSiblingsList(const char *dir, int cpu_id) if (virFileReadAll(path, SYSFS_THREAD_SIBLINGS_LIST_LENGTH_MAX, &buf) < 0) goto cleanup; - if (virBitmapParse(buf, 0, &ret, NUMA_MAX_N_CPUS) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Failed to parse thread siblings")); + if (virBitmapParse(buf, 0, &ret, NUMA_MAX_N_CPUS) < 0) goto cleanup; - } cleanup: VIR_FREE(buf); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2ad236e..5124f27 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8357,8 +8357,6 @@ qemuDomainSetNumaParameters(virDomainPtr dom, if (virBitmapParse(params[i].value.s, 0, &nodeset, VIR_DOMAIN_CPUMASK_LEN) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Failed to parse nodeset")); ret = -1; continue; } diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c index 47c678e..289a7b9 100644 --- a/src/util/virbitmap.c +++ b/src/util/virbitmap.c @@ -298,23 +298,21 @@ virBitmapParse(const char *str, size_t bitmapSize) { bool neg = false; - const char *cur; + const char *cur = str; char *tmp; size_t i; int start, last; - if (!str) + if (!(*bitmap = virBitmapNew(bitmapSize))) return -1; - cur = str; - virSkipSpaces(&cur); + if (!str) + goto error; - if (*cur == 0) - return -1; + virSkipSpaces(&cur); - *bitmap = virBitmapNew(bitmapSize); - if (!*bitmap) - return -1; + if (*cur == '\0') + goto error; while (*cur != 0 && *cur != terminator) { /* @@ -384,6 +382,8 @@ virBitmapParse(const char *str, return virBitmapCountBits(*bitmap); error: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to parse bitmap '%s'"), str); virBitmapFree(*bitmap); *bitmap = NULL; return -1; diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c index fbbbaa9..6209c68 100644 --- a/src/xenxs/xen_sxpr.c +++ b/src/xenxs/xen_sxpr.c @@ -1160,11 +1160,8 @@ xenParseSxpr(const struct sexpr *root, if (cpus != NULL) { if (virBitmapParse(cpus, 0, &def->cpumask, - VIR_DOMAIN_CPUMASK_LEN) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("invalid CPU mask %s"), cpus); + VIR_DOMAIN_CPUMASK_LEN) < 0) goto error; - } } def->maxvcpus = sexpr_int(root, "domain/vcpus"); diff --git a/tests/cpuset b/tests/cpuset index b617d6f..8bcaae9 100755 --- a/tests/cpuset +++ b/tests/cpuset @@ -42,7 +42,7 @@ sed "s/vcpu placement='static'>/vcpu cpuset='aaa'>/" xml > xml-invalid || fail=1 $abs_top_builddir/tools/virsh --connect test:///default define xml-invalid > out 2>&1 && fail=1 cat <<\EOF > exp || fail=1 error: Failed to define domain from xml-invalid -error: XML error: topology cpuset syntax error +error: internal error: Failed to parse bitmap 'aaa' EOF compare exp out || fail=1 -- 1.8.3.2

2 2

[libvirt] [PATCH] Fix URI connect precedence
by Martin Kletzander 22 Aug '13

22 Aug '13

Commit abfff210 changed the order of vshParseArgv() and vshInit() in order to make fix debugging of parameter parsing. However, vshInit() did a vshReconnect() even though ctl->name wasn't set according to the '-c' parameter yet. In order to keep both issues fixed, I've split the vshInit() into vshInitDebug() and vshInit(). One simple memleak of ctl->name is fixed as a part of this patch, since it is related to the issue it's fixing. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=999323 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- tools/virsh.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 15f529e..2ea44a6 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2294,16 +2294,13 @@ vshEventLoop(void *opaque) /* - * Initialize connection. + * Initialize debug settings. */ -static bool -vshInit(vshControl *ctl) +static void +vshInitDebug(vshControl *ctl) { char *debugEnv; - if (ctl->conn) - return false; - if (ctl->debug == VSH_DEBUG_DEFAULT) { /* log level not set from commandline, check env variable */ debugEnv = getenv("VIRSH_DEBUG"); @@ -2328,6 +2325,16 @@ vshInit(vshControl *ctl) } vshOpenLogFile(ctl); +} + +/* + * Initialize connection. + */ +static bool +vshInit(vshControl *ctl) +{ + if (ctl->conn) + return false; /* set up the library error handler */ virSetErrorFunc(NULL, virshErrorHandler); @@ -3017,6 +3024,7 @@ vshParseArgv(vshControl *ctl, int argc, char **argv) ctl->timing = true; break; case 'c': + VIR_FREE(ctl->name); ctl->name = vshStrdup(ctl, optarg); break; case 'v': @@ -3192,12 +3200,10 @@ main(int argc, char **argv) ctl->name = vshStrdup(ctl, defaultConn); } - if (!vshInit(ctl)) { - vshDeinit(ctl); - exit(EXIT_FAILURE); - } + vshInitDebug(ctl); - if (!vshParseArgv(ctl, argc, argv)) { + if (!vshParseArgv(ctl, argc, argv) || + !vshInit(ctl)) { vshDeinit(ctl); exit(EXIT_FAILURE); } -- 1.8.3.2

2 2

[libvirt] [PATCH 0/5] RFC: VMX parsing improvements
by Doug Goldstein 22 Aug '13

22 Aug '13

A user came into #virt the other day and was trying to get libvirtd to work with VMWare Fusion 5, which is basically the Mac OS X version of VMWare Workstation. In helping him out I noticed a few limitations of our VMX parser so I've added support through this patchset. However I came across the fact that we only support 2 types of CD-ROMs instead of the 3 types that VMWare has which leads me to believe we need to extend our XML syntax to define VMWare VMs so I'm asking for feedback and input. CD-ROM types: - cdrom-image = Provides the ISO to the domain - atapi-cdrom = Provides a NEC emulated ATAPI CD-ROM - cdrom-raw = Passthru for a host CD-ROM drive Currently we model 'atapi-cdrom' as (example uses IDE): <disk type='block' device='cdrom'> <source dev='/dev/scd0'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> I was thinking of making that: <disk type='block' device='cdrom'> <driver name='vmware' type='atapi'/> <source dev='/dev/scd0'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> And making 'cdrom-raw' as: <disk type='block' device='cdrom'> <driver name='vmware' type='raw'/> <source dev='/dev/scd0'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> The documentation is a bit ambiguous if I should instead do: <driver name='atapi'/> and <driver name='raw'/> Which is why the request for input. The other reason I'm asking for input is I'm not quite sure what we want to do about CD-ROMs marked as 'auto detect', which is what VMWare Workstation and VMWare Fusion according to their documentation use as the default for 'cdrom-raw' device type. It will either at boot time connect your CD-ROM drive to the VM or dynamically when the user requests it. In this patchset I've modeled it as an opened CD-ROM drive and expect that VMWare will give us a tray closed event or CD-ROM attached event when it gets attached. I unfortunately don't have VMWare and have not used their products in many years so I can't test this myself. Doug Goldstein (5): VMX: Improve disk parse error for unknown values VMX: Add cdrom-raw dev type from VMWare Fusion VMX: Add support for 'auto detect' fileNames VMX: Some serial ports are not actually connected VMX: Add a VMWare Fusion 5 configuration for tests src/vmx/vmx.c | 41 ++++++---- .../vmx2xml-cdrom-ide-raw-auto-detect.vmx | 5 ++ .../vmx2xml-cdrom-ide-raw-auto-detect.xml | 23 ++++++ tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.vmx | 5 ++ tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.xml | 24 ++++++ tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.vmx | 88 ++++++++++++++++++++++ tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml | 38 ++++++++++ tests/vmx2xmltest.c | 4 + 8 files changed, 214 insertions(+), 14 deletions(-) create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.xml create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.xml create mode 100644 tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml -- 1.8.1.5

2 7

[libvirt] [PATCH v2] bridge driver: implement networkEnableIpForwarding for BSD
by Roman Bogorodskiy 22 Aug '13

22 Aug '13

Implement networkEnableIpForwarding() using BSD style sysctl. --- configure.ac | 7 ++++--- src/network/bridge_driver.c | 13 +++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index d3219ce..cc2213d 100644 --- a/configure.ac +++ b/configure.ac @@ -207,7 +207,8 @@ dnl Availability of various common functions (non-fatal if missing), dnl and various less common threadsafe functions AC_CHECK_FUNCS_ONCE([cfmakeraw geteuid getgid getgrnam_r getmntent_r \ getpwuid_r getuid kill mmap newlocale posix_fallocate posix_memalign \ - prlimit regexec sched_getaffinity setgroups setns setrlimit symlink]) + prlimit regexec sched_getaffinity setgroups setns setrlimit symlink \ + sysctlbyname]) dnl Availability of pthread functions (if missing, win32 threading is dnl assumed). Because of $LIB_PTHREAD, we cannot use AC_CHECK_FUNCS_ONCE. @@ -220,8 +221,8 @@ LIBS=$old_libs dnl Availability of various common headers (non-fatal if missing). AC_CHECK_HEADERS([pwd.h paths.h regex.h sys/un.h \ sys/poll.h syslog.h mntent.h net/ethernet.h linux/magic.h \ - sys/un.h sys/syscall.h netinet/tcp.h ifaddrs.h libtasn1.h \ - sys/ucred.h sys/mount.h]) + sys/un.h sys/syscall.h sys/sysctl.h netinet/tcp.h ifaddrs.h \ + libtasn1.h sys/ucred.h sys/mount.h]) dnl Check whether endian provides handy macros. AC_CHECK_DECLS([htole64], [], [], [[#include <endian.h>]]) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index dd30244..80a5bc0 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -41,6 +41,9 @@ #include <sys/wait.h> #include <sys/ioctl.h> #include <net/if.h> +#if HAVE_SYS_SYSCTL_H +# include <sys/sysctl.h> +#endif #include "virerror.h" #include "datatypes.h" @@ -1537,10 +1540,20 @@ static int networkEnableIpForwarding(bool enableIPv4, bool enableIPv6) { int ret = 0; +#ifdef HAVE_SYSCTLBYNAME + int enabled = 1; + if (enableIPv4) + ret = sysctlbyname("net.inet.ip.forwarding", NULL, 0, + &enabled, sizeof(enabled)); + if (enableIPv6 && ret == 0) + ret = sysctlbyname("net.inet6.ip6.forwarding", NULL, 0, + &enabled, sizeof(enabled)); +#else if (enableIPv4) ret = virFileWriteStr("/proc/sys/net/ipv4/ip_forward", "1\n", 0); if (enableIPv6 && ret == 0) ret = virFileWriteStr("/proc/sys/net/ipv6/conf/all/forwarding", "1\n", 0); +#endif return ret; } -- 1.8.2.3

2 2

[libvirt] [PATCHv2 0/5] Introduce API to query IP addresses for given domain
by nehaljwani 22 Aug '13

22 Aug '13

This feature has been requested for a very long time. Since qemu guest agent gives us reliable results, now the wait is over. The RFC was first proposed by Michal Privoznik: http://www.mail-archive.com/libvir-list@redhat.com/msg51857.html A patch was submitted, using structs: http://www.mail-archive.com/libvir-list@redhat.com/msg57141.html Another patch was submitted, using XML: http://www.mail-archive.com/libvir-list@redhat.com/msg57829.html Neither of the patches were accepted, probably due to lack of extensibility and usability. Hence, we thought of using virTypedParameters for reporting list of interfaces along with their MAC address and IP addresses. The RFC can be found here: http://www.mail-archive.com/libvir-list@redhat.com/msg79793.html The idea of extensibility was rejected and rendered out of scope of libvirt. Hence, we were back to structs. This API is called virDomainInterfacesAddresses which returns a dynamically allocated array of virDomainInterface struct. The great disadvantage is once this gets released, it's written in stone and we cannot change or add an item into it. The API supports two methods: * Return information (list of all associated interfaces with MAC address and IP addresses) of all of the domain interfaces by default (if no interface name is provided) * Return information for the specified interface (if an interface name is provided) nehaljwani (5): domifaddr: Implement the public API domifaddr: Implement the remote protocol domifaddr: Implement the API for qemu domifaddr: Add virsh support domifaddr: Expose python binding daemon/remote.c | 122 ++++++++++++++++++++++++++++++++ examples/python/Makefile.am | 2 +- examples/python/README | 1 + examples/python/domipaddrs.py | 50 +++++++++++++ include/libvirt/libvirt.h.in | 32 +++++++++ python/generator.py | 1 + python/libvirt-override-api.xml | 8 ++- python/libvirt-override.c | 117 +++++++++++++++++++++++++++++++ src/driver.h | 7 ++ src/libvirt.c | 99 ++++++++++++++++++++++++++ src/libvirt_public.syms | 5 ++ src/qemu/qemu_agent.c | 151 ++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_agent.h | 4 ++ src/qemu/qemu_driver.c | 56 +++++++++++++++ src/remote/remote_driver.c | 88 +++++++++++++++++++++++ src/remote/remote_protocol.x | 30 +++++++- src/remote_protocol-structs | 24 +++++++ tools/virsh-domain-monitor.c | 102 +++++++++++++++++++++++++++ tools/virsh.pod | 10 +++ 19 files changed, 906 insertions(+), 3 deletions(-) create mode 100755 examples/python/domipaddrs.py -- 1.7.11.7

4 19

[libvirt] [PATCH 0/2] Support setting the 'removable' flag for USB disks
by Fred A. Kemp 22 Aug '13

22 Aug '13

From: "Fred A. Kemp" <anonym(a)riseup.net> The commit message of patch #2 explains the purpose of this patch set. A review would be greatly appreciated! Note that I've only added the new capability for usb-storage.removable to the qemu help tests of qemu(-kvm) version 1.2.0, since that's what I had easily available to get the output of `-device usb-storage,?` from. I hope that's not an issue, otherwise, is there a way to obtain these outputs without having to hunt down and install all supported versions? Previous submissions of this patch set to this list: http://www.redhat.com/archives/libvir-list/2013-March/msg01051.html http://www.redhat.com/archives/libvir-list/2013-May/msg02039.html https://www.redhat.com/archives/libvir-list/2013-July/msg01635.html Fred A. Kemp (2): qemu: Add capability flag for usb-storage qemu: Support setting the 'removable' flag for USB disks docs/formatdomain.html.in | 8 +++-- docs/schemas/domaincommon.rng | 8 +++++ src/conf/domain_conf.c | 31 ++++++++++++++++++-- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 10 +++++++ src/qemu/qemu_capabilities.h | 2 ++ src/qemu/qemu_command.c | 23 +++++++++++++-- tests/qemuhelpdata/qemu-1.2.0-device | 11 +++++++ tests/qemuhelpdata/qemu-kvm-1.2.0-device | 11 +++++++ tests/qemuhelptest.c | 20 +++++++++---- .../qemuxml2argv-disk-usb-device-removable.args | 8 +++++ .../qemuxml2argv-disk-usb-device-removable.xml | 27 +++++++++++++++++ tests/qemuxml2argvtest.c | 6 +++- 13 files changed, 151 insertions(+), 15 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.xml -- 1.7.10.4

4 7

[libvirt] [PATCH] Allow a HTTP URL for cdrom ISO image
by Aline Manera 22 Aug '13

22 Aug '13

From: Aline Manera <alinefm(a)br.ibm.com> Hi all, qemu/KVM has support to iso streaming, allowing a HTTP UTL for cdrom iso image. I just added it to libvirt as well. Aline Manera (1): Allow a HTTP URL for cdrom ISO image src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 20 +++++++++-- .../qemuxml2argv-disk-cdrom-network.args | 5 +++ .../qemuxml2argv-disk-cdrom-network.xml | 37 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ 6 files changed, 65 insertions(+), 3 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network.xml -- 1.7.10.4

2 3

[libvirt] [PATCH] libxl: fix libvirtd crash when reconnecting domains
by Jim Fehlig 22 Aug '13

22 Aug '13

More fallout from commit d72ef888. When reconnecting to running domains, the libxl_ctx in libxlDomainObjPrivate was used before initializing it, causing a segfault in libxl and consequently crashing libvirtd. Initialize the libxlDomainObjPrivate libxl_ctx in libxlReconnectDomain, and while at it use this ctx in libxlReconnectDomain instead of the driver-wide ctx. --- src/libxl/libxl_driver.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index f09ad61..9fb4fa5 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -1118,6 +1118,7 @@ libxlReconnectDomain(virDomainObjPtr vm, void *opaque) { libxlDriverPrivatePtr driver = opaque; + libxlDomainObjPrivatePtr priv = vm->privateData; int rc; libxl_dominfo d_info; int len; @@ -1125,8 +1126,9 @@ libxlReconnectDomain(virDomainObjPtr vm, virObjectLock(vm); + libxlDomainObjPrivateInitCtx(vm); /* Does domain still exist? */ - rc = libxl_domain_info(driver->ctx, &d_info, vm->def->id); + rc = libxl_domain_info(priv->ctx, &d_info, vm->def->id); if (rc == ERROR_INVAL) { goto out; } else if (rc != 0) { @@ -1136,7 +1138,7 @@ libxlReconnectDomain(virDomainObjPtr vm, } /* Is this a domain that was under libvirt control? */ - if (libxl_userdata_retrieve(driver->ctx, vm->def->id, + if (libxl_userdata_retrieve(priv->ctx, vm->def->id, "libvirt-xml", &data, &len)) { VIR_DEBUG("libxl_userdata_retrieve failed, ignoring domain %d", vm->def->id); goto out; -- 1.8.1.4

2 2

Re: [libvirt] [Qemu-devel] [ANNOUNCE] Key Signing Party at KVM Forum 2013
by Eric Blake 21 Aug '13

21 Aug '13

FYI for those libvirt developers attending KVM Forum in October. On 07/24/2013 06:50 AM, Anthony Liguori wrote: > > I will be hosting a key signing party at this year's KVM Forum. > > http://wiki.qemu.org/KeySigningParty2013 > > Starting for the 1.7 release (begins in December), I will only accepted > signed pull requests so please try to attend this event or make > alternative arrangements to have someone sign your key who will attend > the event. > > I will also be attending LinuxCon/CloudOpen/Plumbers North America if > anyone wants to have another key signing party at that event and cannot > attend KVM Forum. > > Regards, > > Anthony Liguori > > > -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

1 0

[libvirt] [PATCH] migration: do not restore labels on failed migration
by Eric Blake 21 Aug '13

21 Aug '13

https://bugzilla.redhat.com/show_bug.cgi?id=822052 When doing a live migration, if the destination fails for any reason after the point in which files should be labeled, then the cleanup of the destination would restore the labels to their defaults, even though the source is still trying to continue running with the image open. Bug 822052 mentioned one source of live migration failure - a mismatch in SELinux virt_use_nfs settings (on for source, off for destination); but I found other situations that would also trigger it (for example, having a graphics device tied to port 5999 on the source, and a different domain on the destination already using that port, so that the destination cannot reuse the port). In short, just as cleanup of the source on a successful migration must not relabel files (because the destination would be crippled by the relabel), cleanup of the destination on a failed migraion must not relabel files (because the source would be crippled). * src/qemu/qemu_process.c (qemuProcessStart): Set flag to avoid label restoration when cleaning up on failed migration. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- src/qemu/qemu_process.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 31de759..d727fc4 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3466,6 +3466,10 @@ int qemuProcessStart(virConnectPtr conn, * restore any security label as we would overwrite labels * we did not set. */ stop_flags = VIR_QEMU_PROCESS_STOP_NO_RELABEL; + /* If we fail while doing incoming migration, then we must not + * relabel, as the source is still using the files. */ + if (migrateFrom) + stop_flags |= VIR_QEMU_PROCESS_STOP_MIGRATED; hookData.conn = conn; hookData.vm = vm; -- 1.8.3.1

2 4

[libvirt] [[libvirt-cim PATCH]] libvirt-cim.spec.in: Uninstall open-pegasus-specific providers
by Ján Tomko 21 Aug '13

21 Aug '13

Older libvirt-cim might've installed these in the sblim-sfcb repository, causing errors when calling sfcbrepos on libvirt-cim update. --- libvirt-cim.spec.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libvirt-cim.spec.in b/libvirt-cim.spec.in index a027246..cd399b1 100644 --- a/libvirt-cim.spec.in +++ b/libvirt-cim.spec.in @@ -84,6 +84,13 @@ rm -fr $RPM_BUILD_ROOT -n @CIM_VIRT_NS@ \ -r %{REGISTRATION} -m %{SCHEMA} >/dev/null 2>&1 || true +# Remove open-pegasus-specific providers installed in sfcb repository +# by older libvirt-cim packages +%{_datadir}/%{name}/provider-register.sh -d -t sfcb \ + -n root/PG_InterOp \ + -r %{PGINTEROP_REG} -m %{PGINTEROP_MOF} >/dev/null 2>&1 || true + + %post /sbin/ldconfig -- 1.8.1.5

2 1

[libvirt] [PATCH] tests: fix building without xattr support
by Claudio Bley 21 Aug '13

21 Aug '13

Only compile securityselinuxhelper.c if xattr support was detected to avoid this error: securityselinuxhelper.c:34:24: fatal error: attr/xattr.h: No such file or directory compilation terminated. Since all SELinux tests depend upon the securityselinuxhelper library, these test programs are now only build when xattr support is available. Signed-off-by: Claudio Bley <cbley(a)av-test.de> --- I'm by no means an automake/SELinux expert and thus I am unsure whether this is the right thing to do. Especially since in commit 95577af442e5 Eric commented that the "Makefile already guaranteed xattr support." which is obviously not the the case, but maybe I'm just missing something... tests/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 9098dec..09144d6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -131,23 +131,23 @@ test_programs = virshtest sockettest \ if WITH_DBUS test_programs += virdbustest \ virsystemdtest endif if WITH_GNUTLS test_programs += virnettlscontexttest virnettlssessiontest endif if WITH_SECDRIVER_SELINUX +if WITH_ATTR test_programs += securityselinuxtest if WITH_QEMU -if WITH_ATTR test_programs += securityselinuxlabeltest endif endif endif if WITH_DRIVER_MODULES test_programs += virdrivermoduletest endif # This is a fake SSH we use from virnetsockettest @@ -702,39 +702,39 @@ virkeyfiletest_LDADD = $(LDADDS) virauthconfigtest_SOURCES = \ virauthconfigtest.c testutils.h testutils.c virauthconfigtest_LDADD = $(LDADDS) seclabeltest_SOURCES = \ seclabeltest.c seclabeltest_LDADD = $(LDADDS) if WITH_SECDRIVER_SELINUX +if WITH_ATTR if WITH_TESTS noinst_LTLIBRARIES += libsecurityselinuxhelper.la else check_LTLIBRARIES += libsecurityselinuxhelper.la endif libsecurityselinuxhelper_la_SOURCES = \ securityselinuxhelper.c libsecurityselinuxhelper_la_LDFLAGS = -module -avoid-version \ -rpath /evil/libtool/hack/to/force/shared/lib/creation securityselinuxtest_SOURCES = \ securityselinuxtest.c testutils.h testutils.c securityselinuxtest_LDADD = $(LDADDS) $(SELINUX_LIBS) securityselinuxtest_DEPENDENCIES = libsecurityselinuxhelper.la \ ../src/libvirt.la if WITH_QEMU -if WITH_ATTR securityselinuxlabeltest_SOURCES = \ securityselinuxlabeltest.c testutils.h testutils.c \ testutilsqemu.h testutilsqemu.c securityselinuxlabeltest_LDADD = $(qemu_LDADDS) $(SELINUX_LIBS) securityselinuxlabeltest_DEPENDENCIES = libsecurityselinuxhelper.la \ ../src/libvirt.la endif endif endif EXTRA_DIST += securityselinuxtest.c securityselinuxlabeltest.c \ -- 1.7.9.5

3 3

[libvirt] [PATCHv2 0/2] Fix error reporting of virBitmapParse
by Peter Krempa 21 Aug '13

21 Aug '13

Please see notes in individual patches. Peter Krempa (2): virBitmapParse: Fix behavior in case of error virBitmapParse: Don't shadow errors po/POTFILES.in | 1 + src/conf/domain_conf.c | 5 +---- src/conf/network_conf.c | 3 --- src/nodeinfo.c | 5 +---- src/qemu/qemu_driver.c | 2 -- src/util/virbitmap.c | 18 +++++++++--------- src/xenxs/xen_sxpr.c | 5 +---- tests/cpuset | 2 +- 8 files changed, 14 insertions(+), 27 deletions(-) -- 1.8.3.2

2 4

[libvirt] [PATCH v4 2/3] Check for --no-copy-dt-needed linker flag
by Guido Günther 21 Aug '13

21 Aug '13

and use it when available --- configure.ac | 1 + daemon/Makefile.am | 1 + m4/virt-linker-no-indirect.m4 | 32 ++++++++++++++++++++++++++++++++ src/Makefile.am | 1 + tests/Makefile.am | 1 + tools/Makefile.am | 1 + 6 files changed, 37 insertions(+) create mode 100644 m4/virt-linker-no-indirect.m4 diff --git a/configure.ac b/configure.ac index ac8cfa1..25d91ce 100644 --- a/configure.ac +++ b/configure.ac @@ -160,6 +160,7 @@ AC_MSG_RESULT([$VERSION_SCRIPT_FLAGS]) LIBVIRT_COMPILE_WARNINGS LIBVIRT_COMPILE_PIE LIBVIRT_LINKER_RELRO +LIBVIRT_LINKER_NO_INDIRECT LIBVIRT_CHECK_APPARMOR LIBVIRT_CHECK_ATTR diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 5cd95aa..e34868b 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -129,6 +129,7 @@ libvirtd_LDFLAGS = \ $(PIE_LDFLAGS) \ $(RELRO_LDFLAGS) \ $(COVERAGE_LDFLAGS) \ + $(NO_INDIRECT_LDFLAGS) \ $(NULL) libvirtd_LDADD = \ diff --git a/m4/virt-linker-no-indirect.m4 b/m4/virt-linker-no-indirect.m4 new file mode 100644 index 0000000..b344f70 --- /dev/null +++ b/m4/virt-linker-no-indirect.m4 @@ -0,0 +1,32 @@ +dnl +dnl Check for --no-copy-dt-needed-entries +dnl +dnl Copyright (C) 2013 Guido Günther <agx(a)sigxcpu.org> +dnl +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License, or (at your option) any later version. +dnl +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. +dnl +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library. If not, see +dnl <http://www.gnu.org/licenses/>. +dnl + +AC_DEFUN([LIBVIRT_LINKER_NO_INDIRECT],[ + AC_MSG_CHECKING([for how to avoid indirect lib deps]) + + NO_INDIRECT_LDFLAGS= + case `$LD --help 2>&1` in + *"--no-copy-dt-needed-entries"*) + NO_INDIRECT_LDFLAGS="-Wl,--no-copy-dt-needed-entries" ;; + esac + AC_SUBST([NO_INDIRECT_LDFLAGS]) + + AC_MSG_RESULT([$NO_INDIRECT_LDFLAGS]) +]) diff --git a/src/Makefile.am b/src/Makefile.am index 7c3d8a1..faa2cd6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -35,6 +35,7 @@ AM_CFLAGS = $(LIBXML_CFLAGS) \ AM_LDFLAGS = $(DRIVER_MODULE_LDFLAGS) \ $(COVERAGE_LDFLAGS) \ $(RELRO_LDFLAGS) \ + $(NO_INDIRECT_LDFLAGS) \ $(NULL) EXTRA_DIST = $(conf_DATA) util/keymaps.csv diff --git a/tests/Makefile.am b/tests/Makefile.am index 9098dec..86c3e11 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -50,6 +50,7 @@ endif LDADDS = \ $(WARN_CFLAGS) \ + $(NO_INDIRECT_LDFLAGS) \ $(PROBES_O) \ ../src/libvirt.la \ ../gnulib/lib/libgnu.la diff --git a/tools/Makefile.am b/tools/Makefile.am index be7ed23..c5bd5bb 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -24,6 +24,7 @@ INCLUDES = \ AM_LDFLAGS = \ $(RELRO_LDFLAGS) \ + $(NO_INDIRECT_LDFLAGS) \ $(NULL) POD2MAN = pod2man -c "Virtualization Support" -r "$(PACKAGE)-$(VERSION)" -- 1.8.4.rc3

2 1

[libvirt] [PATCH v4 1/3] Simplify RELRO_LDFLAGS
by Guido Günther 21 Aug '13

21 Aug '13

by adding it to AM_LDFLAGS instead of every linking rule and by avoiding a forked grep. --- daemon/Makefile.am | 4 +++- m4/virt-linker-relro.m4 | 11 +++++++---- src/Makefile.am | 13 +++---------- tools/Makefile.am | 18 +++++++++++++----- 4 files changed, 26 insertions(+), 20 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index ad7544c..5cd95aa 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -125,9 +125,11 @@ libvirtd_CFLAGS = \ -DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\"" libvirtd_LDFLAGS = \ + $(RELRO_LDFLAGS) \ $(PIE_LDFLAGS) \ $(RELRO_LDFLAGS) \ - $(COVERAGE_LDFLAGS) + $(COVERAGE_LDFLAGS) \ + $(NULL) libvirtd_LDADD = \ $(LIBXML_LIBS) \ diff --git a/m4/virt-linker-relro.m4 b/m4/virt-linker-relro.m4 index 9bca90e..079a095 100644 --- a/m4/virt-linker-relro.m4 +++ b/m4/virt-linker-relro.m4 @@ -22,10 +22,13 @@ AC_DEFUN([LIBVIRT_LINKER_RELRO],[ AC_MSG_CHECKING([for how to force completely read-only GOT table]) RELRO_LDFLAGS= - `$LD --help 2>&1 | grep -- "-z relro" >/dev/null` && \ - RELRO_LDFLAGS="-Wl,-z -Wl,relro" - `$LD --help 2>&1 | grep -- "-z now" >/dev/null` && \ - RELRO_LDFLAGS="$RELRO_LDFLAGS -Wl,-z -Wl,now" + ld_help=`$LD --help 2>&1` + case $ld_help in + *"-z relro"*) RELRO_LDFLAGS="-Wl,-z -Wl,relro" ;; + esac + case $ld_help in + *"-z now"*) RELRO_LDFLAGS="$RELRO_LDFLAGS -Wl,-z -Wl,now" ;; + esac AC_SUBST([RELRO_LDFLAGS]) AC_MSG_RESULT([$RELRO_LDFLAGS]) diff --git a/src/Makefile.am b/src/Makefile.am index 4702cde..7c3d8a1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -33,7 +33,9 @@ AM_CFLAGS = $(LIBXML_CFLAGS) \ $(WIN32_EXTRA_CFLAGS) \ $(COVERAGE_CFLAGS) AM_LDFLAGS = $(DRIVER_MODULE_LDFLAGS) \ - $(COVERAGE_LDFLAGS) + $(COVERAGE_LDFLAGS) \ + $(RELRO_LDFLAGS) \ + $(NULL) EXTRA_DIST = $(conf_DATA) util/keymaps.csv @@ -1812,7 +1814,6 @@ libvirt_la_LDFLAGS = \ -version-info $(LIBVIRT_VERSION_INFO) \ $(LIBVIRT_NODELETE) \ $(AM_LDFLAGS) \ - $(RELRO_LDFLAGS) \ $(CYGWIN_EXTRA_LDFLAGS) \ $(MINGW_EXTRA_LDFLAGS) \ $(NULL) @@ -1896,7 +1897,6 @@ libvirt_qemu_la_LDFLAGS = \ $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_QEMU_SYMBOL_FILE) \ -version-info $(LIBVIRT_VERSION_INFO) \ $(AM_LDFLAGS) \ - $(RELRO_LDFLAGS) \ $(CYGWIN_EXTRA_LDFLAGS) \ $(MINGW_EXTRA_LDFLAGS) \ $(NULL) @@ -1908,7 +1908,6 @@ libvirt_lxc_la_LDFLAGS = \ $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_LXC_SYMBOL_FILE) \ -version-info $(LIBVIRT_VERSION_INFO) \ $(AM_LDFLAGS) \ - $(RELRO_LDFLAGS) \ $(CYGWIN_EXTRA_LDFLAGS) \ $(MINGW_EXTRA_LDFLAGS) \ $(NULL) @@ -1964,7 +1963,6 @@ virtlockd_CFLAGS = \ virtlockd_LDFLAGS = \ $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ - $(RELRO_LDFLAGS) \ $(CYGWIN_EXTRA_LDFLAGS) \ $(MINGW_EXTRA_LDFLAGS) \ $(NULL) @@ -2243,7 +2241,6 @@ libvirt_iohelper_SOURCES = $(UTIL_IO_HELPER_SOURCES) libvirt_iohelper_LDFLAGS = \ $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ - $(RELRO_LDFLAGS) \ $(NULL) libvirt_iohelper_LDADD = \ libvirt_util.la \ @@ -2266,7 +2263,6 @@ libvirt_parthelper_SOURCES = $(STORAGE_HELPER_DISK_SOURCES) libvirt_parthelper_LDFLAGS = \ $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ - $(RELRO_LDFLAGS) \ $(NULL) libvirt_parthelper_LDADD = \ $(LIBPARTED_LIBS) \ @@ -2298,7 +2294,6 @@ libvirt_sanlock_helper_CFLAGS = \ libvirt_sanlock_helper_LDFLAGS = \ $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ - $(RELRO_LDFLAGS) \ $(NULL) libvirt_sanlock_helper_LDADD = libvirt.la endif @@ -2314,7 +2309,6 @@ libvirt_lxc_SOURCES = \ libvirt_lxc_LDFLAGS = \ $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ - $(RELRO_LDFLAGS) \ $(NULL) libvirt_lxc_LDADD = \ $(FUSE_LIBS) \ @@ -2358,7 +2352,6 @@ virt_aa_helper_SOURCES = $(SECURITY_DRIVER_APPARMOR_HELPER_SOURCES) virt_aa_helper_LDFLAGS = \ $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ - $(RELRO_LDFLAGS) \ $(NULL) virt_aa_helper_LDADD = \ libvirt_conf.la \ diff --git a/tools/Makefile.am b/tools/Makefile.am index f85c35c..be7ed23 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -22,6 +22,10 @@ INCLUDES = \ -I$(top_srcdir) \ $(GETTEXT_CPPFLAGS) +AM_LDFLAGS = \ + $(RELRO_LDFLAGS) \ + $(NULL) + POD2MAN = pod2man -c "Virtualization Support" -r "$(PACKAGE)-$(VERSION)" ICON_FILES = \ @@ -118,8 +122,8 @@ virt_host_validate_SOURCES = \ $(NULL) virt_host_validate_LDFLAGS = \ + $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ - $(RELRO_LDFLAGS) \ $(COVERAGE_LDFLAGS) \ $(NULL) @@ -137,11 +141,13 @@ virt_host_validate_CFLAGS = \ virt_login_shell_SOURCES = \ virt-login-shell.c -virt_login_shell_LDFLAGS = $(COVERAGE_LDFLAGS) +virt_login_shell_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(COVERAGE_LDFLAGS) \ + $(NULL) virt_login_shell_LDADD = \ $(STATIC_BINARIES) \ $(PIE_LDFLAGS) \ - $(RELRO_LDFLAGS) \ ../src/libvirt.la \ ../src/libvirt-lxc.la \ ../gnulib/lib/libgnu.la @@ -167,11 +173,13 @@ virsh_SOURCES = \ virsh-volume.c virsh-volume.h \ $(NULL) -virsh_LDFLAGS = $(COVERAGE_LDFLAGS) +virsh_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(COVERAGE_LDFLAGS) \ + $(NULL) virsh_LDADD = \ $(STATIC_BINARIES) \ $(PIE_LDFLAGS) \ - $(RELRO_LDFLAGS) \ ../src/libvirt.la \ ../src/libvirt-lxc.la \ ../src/libvirt-qemu.la \ -- 1.8.4.rc3

2 1

[libvirt] [PATCH] Test handling of non-existant x509 certs
by Daniel P. Berrange 21 Aug '13

21 Aug '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> In commit f905cc998449c89339d0e2894a71d9a9e45293e5 a use of uninitialized data was fixed based on a coverity report. It turns out it was possible to trigger this issue by pointing libvirt at non-existant certificate files, typically causing a crash. This adds a test case for that scenario. With the above commit reverted, this new test case will crash with a SEGV. With the fix applied, it passes, reporting a normal libvirt error to the caller. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- tests/virnettlscontexttest.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c index 2c7d400..33f239c 100644 --- a/tests/virnettlscontexttest.c +++ b/tests/virnettlscontexttest.c @@ -563,6 +563,8 @@ mymain(void) DO_CTX_TEST(true, "cacertchain-ctx.pem", servercertlevel3areq.filename, false); DO_CTX_TEST(false, "cacertchain-ctx.pem", clientcertlevel2breq.filename, false); + DO_CTX_TEST(false, "cacertdoesnotexist.pem", "servercertdoesnotexist.pem", true); + testTLSDiscardCert(&cacertreq); testTLSDiscardCert(&cacert1req); testTLSDiscardCert(&cacert2req); -- 1.8.3.1

2 1

[libvirt] SIGSEGV using virConnect.newStream with Python
by Claudio Bley 21 Aug '13

21 Aug '13

Hi. I tried this on Fedora 19, using libvirt 1.0.5 and also tested with git v1.1.1-maint as well as git master on Ubuntu 12.04. How to reproduce: ---- python ----- import libvirt as l c = l.virConnect("test:///default") v = c.virStream() ----------------- Here's my GDB session with git master: $ gdb python GNU gdb (Ubuntu/Linaro 7.4-2012.04-0ubuntu2.1) 7.4-2012.04 Copyright (C) 2012 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-linux-gnu". For bug reporting instructions, please see: <http://bugs.launchpad.net/gdb-linaro/>... Reading symbols from /usr/bin/python...(no debugging symbols found)...done. (gdb) run Starting program: /usr/bin/python [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". Python 2.7.3 (default, Apr 10 2013, 06:20:15) [GCC 4.6.3] on linux2 Type "help", "copyright", "credits" or "license" for more information. >>> import libvirt as l 2013-08-20 09:21:39.437+0000: 12678: info : libvirt version: 1.1.1 2013-08-20 09:21:39.437+0000: 12678: debug : virGlobalInit:438 : register drivers 2013-08-20 09:21:39.437+0000: 12678: debug : virRegisterDriver:764 : driver=0x7ffff5dc6760 name=Test 2013-08-20 09:21:39.437+0000: 12678: debug : virRegisterDriver:776 : registering Test as driver 0 2013-08-20 09:21:39.437+0000: 12678: debug : virRegisterNetworkDriver:611 : registering Test as network driver 0 2013-08-20 09:21:39.437+0000: 12678: debug : virRegisterInterfaceDriver:638 : registering Test as interface driver 0 2013-08-20 09:21:39.437+0000: 12678: debug : virRegisterStorageDriver:665 : registering Test as storage driver 0 2013-08-20 09:21:39.437+0000: 12678: debug : virRegisterNodeDeviceDriver:692 : registering Test as device driver 0 2013-08-20 09:21:39.437+0000: 12678: debug : virRegisterSecretDriver:719 : registering Test as secret driver 0 2013-08-20 09:21:39.437+0000: 12678: debug : virRegisterNWFilterDriver:746 : registering Test as network filter driver 0 2013-08-20 09:21:39.437+0000: 12678: debug : virRegisterSecretDriver:719 : registering Test as secret driver 0 [19/1965] 2013-08-20 09:21:39.437+0000: 12678: debug : virRegisterNWFilterDriver:746 : registering Test as network filter driver 0 2013-08-20 09:21:39.437+0000: 12678: debug : virRegisterDriver:764 : driver=0x7ffff5dc7ec0 name=OPENVZ 2013-08-20 09:21:39.437+0000: 12678: debug : virRegisterDriver:776 : registering OPENVZ as driver 1 2013-08-20 09:21:39.437+0000: 12678: debug : virRegisterDriver:764 : driver=0x7ffff5dc84e0 name=VMWARE 2013-08-20 09:21:39.437+0000: 12678: debug : virRegisterDriver:776 : registering VMWARE as driver 2 2013-08-20 09:21:39.437+0000: 12678: debug : parallelsRegister:2423 : Can't find prlctl command in the PATH env 2013-08-20 09:21:39.437+0000: 12678: debug : virRegisterDriver:764 : driver=0x7ffff5dc71a0 name=remote 2013-08-20 09:21:39.437+0000: 12678: debug : virRegisterDriver:776 : registering remote as driver 3 2013-08-20 09:21:39.437+0000: 12678: debug : virRegisterNetworkDriver:611 : registering remote as network driver 1 2013-08-20 09:21:39.437+0000: 12678: debug : virRegisterInterfaceDriver:638 : registering remote as interface driver 1 2013-08-20 09:21:39.437+0000: 12678: debug : virRegisterStorageDriver:665 : registering remote as storage driver 1 2013-08-20 09:21:39.437+0000: 12678: debug : virRegisterNodeDeviceDriver:692 : registering remote as device driver 1 2013-08-20 09:21:39.437+0000: 12678: debug : virRegisterSecretDriver:719 : registering remote as secret driver 1 2013-08-20 09:21:39.437+0000: 12678: debug : virRegisterNWFilterDriver:746 : registering remote as network filter driver 1 >>> c = l.virConnect("test:///default") >>> v = c.newStream() 2013-08-20 09:22:08.120+0000: 12678: debug : virStreamNew:16922 : conn=0xf, flags=0 Program received signal SIGSEGV, Segmentation fault. 0x00007ffff59be0e9 in virObjectIsClass (anyobj=<optimized out>, klass=0x0) at util/virobject.c:362 362 return virClassIsDerivedFrom(obj->klass, klass); (gdb) bt full #0 0x00007ffff59be0e9 in virObjectIsClass (anyobj=<optimized out>, klass=0x0) at util/virobject.c:362 obj = 0xf #1 0x00007ffff5a7fca8 in virStreamNew (conn=0xf, flags=0) at libvirt.c:16926 st = <optimized out> __func__ = "virStreamNew" __FUNCTION__ = "virStreamNew" #2 0x00007ffff5df7f72 in libvirt_virStreamNew (self=<optimized out>, args=<optimized out>) at libvirt.c:2617 _save = 0x0 c_retval = <optimized out> conn = 0xf pyobj_conn = 0x7ffff7edd5a8 flags = 0 #3 0x0000000000466254 in PyEval_EvalFrameEx () No symbol table info available. #4 0x000000000057bd02 in PyEval_EvalCodeEx () No symbol table info available. #5 0x00000000004667f8 in PyEval_EvalFrameEx () No symbol table info available. #6 0x000000000057bd02 in PyEval_EvalCodeEx () No symbol table info available. #7 0x000000000057d991 in PyRun_InteractiveOneFlags () No symbol table info available. #8 0x000000000057dbfa in PyRun_InteractiveLoopFlags () No symbol table info available. #9 0x000000000057e8e3 in PyRun_AnyFileExFlags () No symbol table info available. #10 0x0000000000512cfd in Py_Main () No symbol table info available. #11 0x00007ffff68cc76d in __libc_start_main (main=0x41ba20 <main>, argc=1, ubp_av=0x7fffffffe5f8, init=<optimized out>, fini=<optimized out>, rtld_fini=<optimized out>, stack_end=0x7fffffffe5e8) at libc-start.c:226 result = <optimized out> unwind_buf = {cancel_jmp_buf = {{jmp_buf = {0, -4474691967429585002, 4307496, 140737488348656, 0, 0, 4474691967066888086, 4474711353541580694}, mask_was_saved = 0}}, priv = {pad = {0x0, 0x0, 0x57e930, 0x7fffffffe5f8}, data = { ---Type <return> to continue, or q <return> to quit--- prev = 0x0, cleanup = 0x0, canceltype = 5761328}}} not_first_call = <optimized out> #12 0x000000000041ba51 in _start () No symbol table info available. Can anybody make any sense out of this already? What else can I do helping to solve this? / Claudio -- AV-Test GmbH, Henricistraße 20, 04155 Leipzig, Germany Phone: +49 341 265 310 19 Web:<http://www.av-test.org> Eingetragen am / Registered at: Amtsgericht Stendal (HRB 114076) Geschaeftsfuehrer (CEO): Andreas Marx, Guido Habicht, Maik Morgenstern

2 2

[libvirt] [PATCH 1/2] Simplify RELRO_LDFLAGS
by Guido Günther 21 Aug '13

21 Aug '13

by adding it to AM_LDFLAGS instead of every linking rule and by avoiding a forked grep. --- Daniel kind of nacked the AM_LDFLAGS part already but I think it's a reasonable cleanup. We should rather use AM_LDFLAGS everywhere which (we currently don't and which would be another cleanup). Or are there any reasons to not have a read only GOT? daemon/Makefile.am | 4 +++- m4/virt-linker-relro.m4 | 8 ++++---- src/Makefile.am | 13 +++---------- tools/Makefile.am | 18 +++++++++++++----- 4 files changed, 23 insertions(+), 20 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index ad7544c..5cd95aa 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -125,9 +125,11 @@ libvirtd_CFLAGS = \ -DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\"" libvirtd_LDFLAGS = \ + $(RELRO_LDFLAGS) \ $(PIE_LDFLAGS) \ $(RELRO_LDFLAGS) \ - $(COVERAGE_LDFLAGS) + $(COVERAGE_LDFLAGS) \ + $(NULL) libvirtd_LDADD = \ $(LIBXML_LIBS) \ diff --git a/m4/virt-linker-relro.m4 b/m4/virt-linker-relro.m4 index 9bca90e..d287cbc 100644 --- a/m4/virt-linker-relro.m4 +++ b/m4/virt-linker-relro.m4 @@ -22,10 +22,10 @@ AC_DEFUN([LIBVIRT_LINKER_RELRO],[ AC_MSG_CHECKING([for how to force completely read-only GOT table]) RELRO_LDFLAGS= - `$LD --help 2>&1 | grep -- "-z relro" >/dev/null` && \ - RELRO_LDFLAGS="-Wl,-z -Wl,relro" - `$LD --help 2>&1 | grep -- "-z now" >/dev/null` && \ - RELRO_LDFLAGS="$RELRO_LDFLAGS -Wl,-z -Wl,now" + case `$LD --help 2>&1` in + *"-z relro"*) RELRO_LDFLAGS="-Wl,-z -Wl,relro" ;& + *"-z now"*) RELRO_LDFLAGS="$RELRO_LDFLAGS -Wl,-z -Wl,now" ;; + esac AC_SUBST([RELRO_LDFLAGS]) AC_MSG_RESULT([$RELRO_LDFLAGS]) diff --git a/src/Makefile.am b/src/Makefile.am index 4702cde..7c3d8a1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -33,7 +33,9 @@ AM_CFLAGS = $(LIBXML_CFLAGS) \ $(WIN32_EXTRA_CFLAGS) \ $(COVERAGE_CFLAGS) AM_LDFLAGS = $(DRIVER_MODULE_LDFLAGS) \ - $(COVERAGE_LDFLAGS) + $(COVERAGE_LDFLAGS) \ + $(RELRO_LDFLAGS) \ + $(NULL) EXTRA_DIST = $(conf_DATA) util/keymaps.csv @@ -1812,7 +1814,6 @@ libvirt_la_LDFLAGS = \ -version-info $(LIBVIRT_VERSION_INFO) \ $(LIBVIRT_NODELETE) \ $(AM_LDFLAGS) \ - $(RELRO_LDFLAGS) \ $(CYGWIN_EXTRA_LDFLAGS) \ $(MINGW_EXTRA_LDFLAGS) \ $(NULL) @@ -1896,7 +1897,6 @@ libvirt_qemu_la_LDFLAGS = \ $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_QEMU_SYMBOL_FILE) \ -version-info $(LIBVIRT_VERSION_INFO) \ $(AM_LDFLAGS) \ - $(RELRO_LDFLAGS) \ $(CYGWIN_EXTRA_LDFLAGS) \ $(MINGW_EXTRA_LDFLAGS) \ $(NULL) @@ -1908,7 +1908,6 @@ libvirt_lxc_la_LDFLAGS = \ $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_LXC_SYMBOL_FILE) \ -version-info $(LIBVIRT_VERSION_INFO) \ $(AM_LDFLAGS) \ - $(RELRO_LDFLAGS) \ $(CYGWIN_EXTRA_LDFLAGS) \ $(MINGW_EXTRA_LDFLAGS) \ $(NULL) @@ -1964,7 +1963,6 @@ virtlockd_CFLAGS = \ virtlockd_LDFLAGS = \ $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ - $(RELRO_LDFLAGS) \ $(CYGWIN_EXTRA_LDFLAGS) \ $(MINGW_EXTRA_LDFLAGS) \ $(NULL) @@ -2243,7 +2241,6 @@ libvirt_iohelper_SOURCES = $(UTIL_IO_HELPER_SOURCES) libvirt_iohelper_LDFLAGS = \ $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ - $(RELRO_LDFLAGS) \ $(NULL) libvirt_iohelper_LDADD = \ libvirt_util.la \ @@ -2266,7 +2263,6 @@ libvirt_parthelper_SOURCES = $(STORAGE_HELPER_DISK_SOURCES) libvirt_parthelper_LDFLAGS = \ $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ - $(RELRO_LDFLAGS) \ $(NULL) libvirt_parthelper_LDADD = \ $(LIBPARTED_LIBS) \ @@ -2298,7 +2294,6 @@ libvirt_sanlock_helper_CFLAGS = \ libvirt_sanlock_helper_LDFLAGS = \ $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ - $(RELRO_LDFLAGS) \ $(NULL) libvirt_sanlock_helper_LDADD = libvirt.la endif @@ -2314,7 +2309,6 @@ libvirt_lxc_SOURCES = \ libvirt_lxc_LDFLAGS = \ $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ - $(RELRO_LDFLAGS) \ $(NULL) libvirt_lxc_LDADD = \ $(FUSE_LIBS) \ @@ -2358,7 +2352,6 @@ virt_aa_helper_SOURCES = $(SECURITY_DRIVER_APPARMOR_HELPER_SOURCES) virt_aa_helper_LDFLAGS = \ $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ - $(RELRO_LDFLAGS) \ $(NULL) virt_aa_helper_LDADD = \ libvirt_conf.la \ diff --git a/tools/Makefile.am b/tools/Makefile.am index f85c35c..be7ed23 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -22,6 +22,10 @@ INCLUDES = \ -I$(top_srcdir) \ $(GETTEXT_CPPFLAGS) +AM_LDFLAGS = \ + $(RELRO_LDFLAGS) \ + $(NULL) + POD2MAN = pod2man -c "Virtualization Support" -r "$(PACKAGE)-$(VERSION)" ICON_FILES = \ @@ -118,8 +122,8 @@ virt_host_validate_SOURCES = \ $(NULL) virt_host_validate_LDFLAGS = \ + $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ - $(RELRO_LDFLAGS) \ $(COVERAGE_LDFLAGS) \ $(NULL) @@ -137,11 +141,13 @@ virt_host_validate_CFLAGS = \ virt_login_shell_SOURCES = \ virt-login-shell.c -virt_login_shell_LDFLAGS = $(COVERAGE_LDFLAGS) +virt_login_shell_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(COVERAGE_LDFLAGS) \ + $(NULL) virt_login_shell_LDADD = \ $(STATIC_BINARIES) \ $(PIE_LDFLAGS) \ - $(RELRO_LDFLAGS) \ ../src/libvirt.la \ ../src/libvirt-lxc.la \ ../gnulib/lib/libgnu.la @@ -167,11 +173,13 @@ virsh_SOURCES = \ virsh-volume.c virsh-volume.h \ $(NULL) -virsh_LDFLAGS = $(COVERAGE_LDFLAGS) +virsh_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(COVERAGE_LDFLAGS) \ + $(NULL) virsh_LDADD = \ $(STATIC_BINARIES) \ $(PIE_LDFLAGS) \ - $(RELRO_LDFLAGS) \ ../src/libvirt.la \ ../src/libvirt-lxc.la \ ../src/libvirt-qemu.la \ -- 1.8.4.rc3

2 2

[libvirt] [PATCH v2]LXC: Helper function for checking ownership of dir when userns enabled
by Chen Hanxiao 21 Aug '13

21 Aug '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> If we enable userns, the ownership of dir we provided for containers should match the uid/gid in idmap. Currently, the debug log is very implicit or misleading sometimes. This patch will help clarify this for us when using debug log or virsh. v2: syntax-check clean Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index b910b10..2ccdc61 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1815,6 +1815,49 @@ lxcNeedNetworkNamespace(virDomainDefPtr def) return false; } +/* + * Helper function for helping check + * whether we have enough privilege + * to operate the source dir when userns enabled + * @vmDef: pointer to vm definition structure + * Returns 0 on success or -1 in case of error + */ +static int +lxcContainerUsernsSrcOwnershipCheck(virDomainDefPtr vmDef) +{ + struct stat buf; + size_t i; + uid_t uid; + gid_t gid; + + VIR_DEBUG("vmDef->nfss %d", (int)vmDef->nfss); + for (i = 0; i < vmDef->nfss; i++) { + VIR_DEBUG("dst is %s, src is %s", + vmDef->fss[i]->dst, + vmDef->fss[i]->src); + + uid = vmDef->idmap.uidmap[0].target; + gid = vmDef->idmap.gidmap[0].target; + + if (lstat(vmDef->fss[i]->src, &buf) < 0) { + virReportSystemError(errno, _("Cannot access '%s'"), + vmDef->fss[i]->src); + return -1; + } else if (uid != buf.st_uid || gid != buf.st_gid) { + VIR_DEBUG("In userns uid is %d, gid is %d\n", + uid, gid); + errno = EINVAL; + + virReportSystemError(errno, + _("[userns] Src dir '%s' does not belong to uid/gid: %d/%d"), + vmDef->fss[i]->src, uid, gid); + return -1; + } + } + + return 0; +} + /** * lxcContainerStart: * @def: pointer to virtual machine structure @@ -1866,6 +1909,9 @@ int lxcContainerStart(virDomainDefPtr def, if (userns_supported()) { VIR_DEBUG("Enable user namespace"); cflags |= CLONE_NEWUSER; + if (lxcContainerUsernsSrcOwnershipCheck(def) < 0) { + return -1; + } } else { virReportSystemError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Kernel doesn't support user namespace")); -- 1.7.1

3 3