- Devel - libvirt List Archives

[libvirt] [PATCH v2] qemu: Add flag to force a CDROM eject
by Cole Robinson 11 Nov '10

11 Nov '10

QEMU allows forcing a CDROM eject even if the guest has locked the device. Expose this via a new UpdateDevice flag, VIR_DOMAIN_DEVICE_MODIFY_FORCE. This has been requested for RHEV: https://bugzilla.redhat.com/show_bug.cgi?id=626305 v2: Change flag name, bool cleanups Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- include/libvirt/libvirt.h.in | 2 ++ src/qemu/qemu_driver.c | 15 ++++++++++----- src/qemu/qemu_monitor.c | 9 +++++---- src/qemu/qemu_monitor.h | 6 ++---- src/qemu/qemu_monitor_json.c | 5 +++-- src/qemu/qemu_monitor_json.h | 3 ++- src/qemu/qemu_monitor_text.c | 5 +++-- src/qemu/qemu_monitor_text.h | 3 ++- 8 files changed, 29 insertions(+), 19 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 81db3a2..5c78270 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -1033,6 +1033,8 @@ typedef enum { VIR_DOMAIN_DEVICE_MODIFY_CURRENT = 0, /* Modify device allocation based on current domain state */ VIR_DOMAIN_DEVICE_MODIFY_LIVE = (1 << 0), /* Modify live device allocation */ VIR_DOMAIN_DEVICE_MODIFY_CONFIG = (1 << 1), /* Modify persisted device allocation */ + VIR_DOMAIN_DEVICE_MODIFY_FORCE = (1 << 2), /* Forcibly modify device + (ex. force eject a cdrom) */ } virDomainDeviceModifyFlags; int virDomainAttachDevice(virDomainPtr domain, const char *xml); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e7b37e1..2728448 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7686,7 +7686,8 @@ cleanup: static int qemudDomainChangeEjectableMedia(struct qemud_driver *driver, virDomainObjPtr vm, virDomainDiskDefPtr disk, - unsigned long long qemuCmdFlags) + unsigned long long qemuCmdFlags, + bool force) { virDomainDiskDefPtr origdisk = NULL; int i; @@ -7747,7 +7748,7 @@ static int qemudDomainChangeEjectableMedia(struct qemud_driver *driver, driveAlias, disk->src, format); } else { - ret = qemuMonitorEjectMedia(priv->mon, driveAlias); + ret = qemuMonitorEjectMedia(priv->mon, driveAlias, force); } qemuDomainObjExitMonitorWithDriver(driver, vm); @@ -8719,7 +8720,8 @@ static int qemudDomainAttachDevice(virDomainPtr dom, case VIR_DOMAIN_DISK_DEVICE_FLOPPY: ret = qemudDomainChangeEjectableMedia(driver, vm, dev->data.disk, - qemuCmdFlags); + qemuCmdFlags, + false); if (ret == 0) dev->data.disk = NULL; break; @@ -8906,10 +8908,12 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom, unsigned long long qemuCmdFlags; virCgroupPtr cgroup = NULL; int ret = -1; + bool force = (flags & VIR_DOMAIN_DEVICE_MODIFY_FORCE) != 0; virCheckFlags(VIR_DOMAIN_DEVICE_MODIFY_CURRENT | VIR_DOMAIN_DEVICE_MODIFY_LIVE | - VIR_DOMAIN_DEVICE_MODIFY_CONFIG, -1); + VIR_DOMAIN_DEVICE_MODIFY_CONFIG | + VIR_DOMAIN_DEVICE_MODIFY_FORCE, -1); if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) { qemuReportError(VIR_ERR_OPERATION_INVALID, @@ -8964,7 +8968,8 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom, case VIR_DOMAIN_DISK_DEVICE_FLOPPY: ret = qemudDomainChangeEjectableMedia(driver, vm, dev->data.disk, - qemuCmdFlags); + qemuCmdFlags, + force); if (ret == 0) dev->data.disk = NULL; break; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 2366fdb..3600fd8 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1146,10 +1146,11 @@ int qemuMonitorSetCPU(qemuMonitorPtr mon, int cpu, int online) int qemuMonitorEjectMedia(qemuMonitorPtr mon, - const char *devname) + const char *devname, + bool force) { int ret; - DEBUG("mon=%p devname=%s", mon, devname); + DEBUG("mon=%p devname=%s force=%d", mon, devname, force); if (!mon) { qemuReportError(VIR_ERR_INVALID_ARG, "%s", @@ -1158,9 +1159,9 @@ int qemuMonitorEjectMedia(qemuMonitorPtr mon, } if (mon->json) - ret = qemuMonitorJSONEjectMedia(mon, devname); + ret = qemuMonitorJSONEjectMedia(mon, devname, force); else - ret = qemuMonitorTextEjectMedia(mon, devname); + ret = qemuMonitorTextEjectMedia(mon, devname, force); return ret; } diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 7d09145..41b3135 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -203,12 +203,10 @@ int qemuMonitorSetCPU(qemuMonitorPtr mon, int cpu, int online); /* XXX should we pass the virDomainDiskDefPtr instead * and hide devname details inside monitor. Reconsider * this when doing the QMP implementation - * - * XXXX 'eject' has gained a 'force' flag we might like - * to make use of... */ int qemuMonitorEjectMedia(qemuMonitorPtr mon, - const char *devname); + const char *devname, + bool force); int qemuMonitorChangeMedia(qemuMonitorPtr mon, const char *devname, const char *newmedia, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index d2c6f0a..da51a4f 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1348,12 +1348,13 @@ cleanup: int qemuMonitorJSONEjectMedia(qemuMonitorPtr mon, - const char *devname) + const char *devname, + bool force) { int ret; virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("eject", "s:device", devname, - "b:force", 0, + "b:force", force ? 1 : 0, NULL); virJSONValuePtr reply = NULL; if (!cmd) diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index 94806c1..c78ee24 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -68,7 +68,8 @@ int qemuMonitorJSONSetBalloon(qemuMonitorPtr mon, int qemuMonitorJSONSetCPU(qemuMonitorPtr mon, int cpu, int online); int qemuMonitorJSONEjectMedia(qemuMonitorPtr mon, - const char *devname); + const char *devname, + bool force); int qemuMonitorJSONChangeMedia(qemuMonitorPtr mon, const char *devname, const char *newmedia, diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 7f15008..2552111 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -848,13 +848,14 @@ int qemuMonitorTextSetCPU(qemuMonitorPtr mon, int cpu, int online) int qemuMonitorTextEjectMedia(qemuMonitorPtr mon, - const char *devname) + const char *devname, + bool force) { char *cmd = NULL; char *reply = NULL; int ret = -1; - if (virAsprintf(&cmd, "eject %s", devname) < 0) { + if (virAsprintf(&cmd, "eject %s%s", force ? "-f " : "", devname) < 0) { virReportOOMError(); goto cleanup; } diff --git a/src/qemu/qemu_monitor_text.h b/src/qemu/qemu_monitor_text.h index c017509..983f402 100644 --- a/src/qemu/qemu_monitor_text.h +++ b/src/qemu/qemu_monitor_text.h @@ -66,7 +66,8 @@ int qemuMonitorTextSetBalloon(qemuMonitorPtr mon, int qemuMonitorTextSetCPU(qemuMonitorPtr mon, int cpu, int online); int qemuMonitorTextEjectMedia(qemuMonitorPtr mon, - const char *devname); + const char *devname, + bool force); int qemuMonitorTextChangeMedia(qemuMonitorPtr mon, const char *devname, const char *newmedia, -- 1.7.2.1

2 2

Re: [libvirt] Startup/Shutdown scripts for KVM Machines in Debian (libvirt)
by Avi Kivity 11 Nov '10

11 Nov '10

On 11/10/2010 10:01 AM, Hermann Himmelbauer wrote: > Hi, > I manage my KVM machines via libvirt and wonder if there are any init.d > scripts for automatically starting up and shutting down virtual machines > during boot/shutdown of the host? > > Writing this for myself seems to be not that simple, as when shutting down, > the system has somehow to wait until all machines are halted (not responding > guests have to be destroyed etc.), and I don't really know how to accomplish > this. > > My host system is Debian Lenny, is there anything available? > Perhaps libvirt offers something I'm unaware of? > I think it does. Copying the libvirt mailing list. -- error compiling committee.c: too many arguments to function

4 3

[libvirt] [PATCHv2] rpm: fix /var/lib/libvirt permissions
by Eric Blake 11 Nov '10

11 Nov '10

https://bugzilla.redhat.com/show_bug.cgi?id=649511 Regression of forcing 0700 permissions (which breaks guest startup because the qemu user can't see /var/lib/libvirt/*.monitor) was introduced in commit 66823690e, as part of libvirt 0.8.2. * libvirt.spec.in (%files): Drop %{_localstatedir}/lib/libvirt, since libvirt depends on libvirt-client. (%files client): Guarantee 755 permissions on %(_localstatedir}/lib/libvirt, since the qemu user must be able to do pathname resolution to a subdirectory. --- v2 changes: don't declare directory twice (v1 at https://www.redhat.com/archives/libvir-list/2010-November/msg00238.html) libvirt.spec.in | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 813e0c0..f77626e 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -793,7 +793,6 @@ fi %dir %{_localstatedir}/run/libvirt/ -%dir %{_localstatedir}/lib/libvirt/ %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/images/ %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/boot/ %dir %attr(0700, root, root) %{_localstatedir}/cache/libvirt/ @@ -883,7 +882,7 @@ fi %{_sysconfdir}/rc.d/init.d/libvirt-guests %config(noreplace) %{_sysconfdir}/sysconfig/libvirt-guests -%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt +%dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/ %if %{with_sasl} %config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf -- 1.7.3.2

2 2

[libvirt] [PATCH] Augment bug reporting documentation
by Daniel Veillard 11 Nov '10

11 Nov '10

With some instruction on how to attach useful gdb backtraces Daniel diff --git a/docs/bugs.html.in b/docs/bugs.html.in index 201705b..560dfa4 100644 --- a/docs/bugs.html.in +++ b/docs/bugs.html.in @@ -78,6 +78,35 @@ </ul> + If the bug leads to a tool linked to libvirt crash, then the best + is to provide a backtrace along with the scenario used to get the + crash, the simplest is to run the program under gdb, reproduce the + steps leading to the crash and then issue a gdb "bt" command to + get the stack trace, attach it to the bug. Note that for the + data to be really useful libvirt debug informations must be present + for example by installing libvirt debuginfo package on Fedora or + Red Hat Enterprise Linux (with debuginfo-install libvirt) prior + to running gdb. + + It may also happen that the libvirt daemon itself crashes or get stuck, + in the first case run it (as root) under gdb, and reproduce the sequence + leading to the crash, similary to a normal program provide the + "bt" backtrace information to where gdb will have stopped. + But if libvirtd get stuck, for example seems to stop processing + commands, try to attach to the faulty daemon and issue a gdb command + "thread apply all bt" to show all the threads backtraces, as in: + <pre> # ps -o etime,pid `pgrep libvirt` +... note the process id from the output +# gdb /usr/sbin/libvirtd +.... some informations about gdb and loading debug data +(gdb) attach $the_damon_process_id +.... +(gdb) thread apply all bt +.... informations to attach to the bug +(gdb) +</pre> + + If requesting a new feature attach any available patch to the ticket and also email the patch to the libvirt mailing list for discussion -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

3 3

[libvirt] [PATCH] Fix LXC container console device setup
by Daniel P. Berrange 10 Nov '10

10 Nov '10

From: Daniel P. Berrange <dan(a)berrange.com> The /dev/console device inside the container must NOT map to the real /dev/console device node, since this allows the container control over the current host console. A fun side effect of this is that starting a container containing a real Fedora OS will kill off your X server. Remove the /dev/console node, and replace it with a symlink to the primary console TTY * src/lxc/lxc_container.c: Replace /dev/console with a symlink to /dev/pty/0 * src/lxc/lxc_controller.c: Remove /dev/console from cgroups ACL --- src/lxc/lxc_container.c | 6 +++++- src/lxc/lxc_controller.c | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 0e06a2d..7013667 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -466,7 +466,6 @@ static int lxcContainerPopulateDevices(void) { LXC_DEV_MAJ_MEMORY, LXC_DEV_MIN_NULL, 0666, "/dev/null" }, { LXC_DEV_MAJ_MEMORY, LXC_DEV_MIN_ZERO, 0666, "/dev/zero" }, { LXC_DEV_MAJ_MEMORY, LXC_DEV_MIN_FULL, 0666, "/dev/full" }, - { LXC_DEV_MAJ_TTY, LXC_DEV_MIN_CONSOLE, 0600, "/dev/console" }, { LXC_DEV_MAJ_MEMORY, LXC_DEV_MIN_RANDOM, 0666, "/dev/random" }, { LXC_DEV_MAJ_MEMORY, LXC_DEV_MIN_URANDOM, 0666, "/dev/urandom" }, }; @@ -508,6 +507,11 @@ static int lxcContainerPopulateDevices(void) _("Failed to symlink /dev/pts/0 to /dev/tty1")); return -1; } + if (symlink("/dev/pts/0", "/dev/console") < 0) { + virReportSystemError(errno, "%s", + _("Failed to symlink /dev/pts/0 to /dev/console")); + return -1; + } return 0; } diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index eb0148e..478f0d1 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -80,7 +80,6 @@ static int lxcSetContainerResources(virDomainDefPtr def) {'c', LXC_DEV_MAJ_MEMORY, LXC_DEV_MIN_RANDOM}, {'c', LXC_DEV_MAJ_MEMORY, LXC_DEV_MIN_URANDOM}, {'c', LXC_DEV_MAJ_TTY, LXC_DEV_MIN_TTY}, - {'c', LXC_DEV_MAJ_TTY, LXC_DEV_MIN_CONSOLE}, {'c', LXC_DEV_MAJ_TTY, LXC_DEV_MIN_PTMX}, {0, 0, 0}}; -- 1.7.2.3

2 1

[libvirt] "transient" vs "temporary"
by Justin Clift 10 Nov '10

10 Nov '10

Hi all, While writing up the descriptions for persistent vs transient objects (domains, virtual networks, etc), I'm personally finding the word "temporary" seems a better fit than "transient". Is there anything particularly wrong with using "temporary" in this context instead? Thinking that if "temporary" is ok, I'll do a search-n-replace, changing "transient" to "temporary" across docs (and any code). Bad idea? Regards and best wishes, Justin Clift

3 5

[libvirt] [PATCH] qemu: Fix non-literal format string
by Jiri Denemark 10 Nov '10

10 Nov '10

--- src/qemu/qemu_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Pushed as a trivial build breaker. diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 7d2a1d6..a506064 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -4185,7 +4185,7 @@ int qemudBuildCommandLine(virConnectPtr conn, /* should we really error out or just warn in those cases ? */ if (def->os.smbios_mode == VIR_DOMAIN_SMBIOS_HOST) { if (driver->hostsysinfo == NULL) { - qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Host SMBIOS information is not available")); goto error; } -- 1.7.3.2

2 1

[libvirt] [PATCH] Allow non-file disk backingStores
by Adam Litke 10 Nov '10

10 Nov '10

I am trying to use a qcow image with libvirt where the backing 'file' is a qemu-nbd server. Unfortunately virDomainDiskDefForeachPath() assumes that backingStore is always a real file so something like 'nbd:0:3333' is rejected because a file with that name cannot be accessed. Note that I am not worried about directly using nbd images. That would require a new disk type with XML markup, etc. I only want it to be permitted as a backingStore The following patch implements danpb's suggestion: > I think I'm inclined to push the logic for skipping NBD one stage higher. > I'd rather expect virStorageFileGetMetadata() to return all backing > stores, even if not files. The virDomainDiskDefForeachPath() method > should definitely ignore non-file backing stores though. > > So what I'm thinking is to extend the virStorageFileMetadata struct and > just add a 'bool isFile' field to it. Default this field to true, unless > you see the prefix of nbd: in which case set it to false. The > virDomainDiskDefForeachPath() method can then skip over any backing > store with isFile == false Signed-off-by: Adam Litke <agl(a)us.ibm.com> Cc: Daniel P. Berrange <berrange(a)redhat.com> --- src/conf/domain_conf.c | 7 +++++++ src/util/storage_file.c | 16 +++++++++++++++- src/util/storage_file.h | 1 + 3 files changed, 23 insertions(+), 1 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index fe93711..2d11785 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7813,6 +7813,13 @@ int virDomainDiskDefForeachPath(virDomainDiskDefPtr disk, depth++; nextpath = meta.backingStore; + /* Stop iterating if we reach a non-file backing store */ + if (nextpath && meta.backingStoreIsFile == false) { + VIR_DEBUG("Stopping iteration on non-file backing store: %s", + nextpath); + break; + } + format = meta.backingStoreFormat; if (format == VIR_STORAGE_FILE_AUTO && diff --git a/src/util/storage_file.c b/src/util/storage_file.c index 6f48b10..6e099ed 100644 --- a/src/util/storage_file.c +++ b/src/util/storage_file.c @@ -509,6 +509,14 @@ virStorageFileMatchesVersion(int format, return true; } +static bool +virBackingStoreIsFile(const char *backing) +{ + /* Backing store is a network block device */ + if (STRPREFIX(backing, "nbd:")) + return false; + return true; +} static int virStorageFileGetMetadataFromBuf(int format, @@ -579,8 +587,14 @@ virStorageFileGetMetadataFromBuf(int format, if (ret == BACKING_STORE_ERROR) return -1; + meta->backingStoreIsFile = false; if (backing != NULL) { - meta->backingStore = absolutePathFromBaseFile(path, backing); + if (virBackingStoreIsFile(backing)) { + meta->backingStoreIsFile = true; + meta->backingStore = absolutePathFromBaseFile(path, backing); + } else { + meta->backingStore = strdup(backing); + } VIR_FREE(backing); if (meta->backingStore == NULL) { virReportOOMError(); diff --git a/src/util/storage_file.h b/src/util/storage_file.h index fb0c005..c4d4650 100644 --- a/src/util/storage_file.h +++ b/src/util/storage_file.h @@ -49,6 +49,7 @@ VIR_ENUM_DECL(virStorageFileFormat); typedef struct _virStorageFileMetadata { char *backingStore; int backingStoreFormat; + bool backingStoreIsFile; unsigned long long capacity; bool encrypted; } virStorageFileMetadata; -- 1.7.1 -- Thanks, Adam

2 1

[libvirt] RH EL5 test failure on interfaceshematest and xencapstest
by Andy Howell 10 Nov '10

10 Nov '10

I'm trying to build a new RPM for libvirt-0.8.5. Two tests are failing: interfaceschematest xencapstest Are these known errors? Any work-arounds? Thanks, Andy ./interfaceschematest 1) interfaceschemadata/bridge.xml ... FAILED xmllint --relaxng /usr/src/redhat/BUILD/libvirt-0.8.5/tests/../docs/schemas/interface.rng --noout /usr/src/redhat/BUILD/libvirt-0.8.5/tests/interfaceschemadata/bridge.xml /usr/src/redhat/BUILD/libvirt-0.8.5/tests/interfaceschemadata/bridge.xml:8: element interface: Relax-NG validity error : Element interface failed to validate attributes /usr/src/redhat/BUILD/libvirt-0.8.5/tests/interfaceschemadata/bridge.xml:9: element mac: Relax-NG validity error : Did not expect element mac there /usr/src/redhat/BUILD/libvirt-0.8.5/tests/interfaceschemadata/bridge.xml:11: element interface: Relax-NG validity error : Element interface failed to validate attributes /usr/src/redhat/BUILD/libvirt-0.8.5/tests/interfaceschemadata/bridge.xml:11: element interface: Relax-NG validity error : Expecting an element , got nothing /usr/src/redhat/BUILD/libvirt-0.8.5/tests/interfaceschemadata/bridge.xml:3: element mtu: Relax-NG validity error : Expecting element bridge, got mtu /usr/src/redhat/BUILD/libvirt-0.8.5/tests/interfaceschemadata/bridge.xml fails to validate 2) interfaceschemadata/vlan.xml ... OK 3) interfaceschemadata/ipv6-dhcp.xml ... OK 4) interfaceschemadata/bond-arp.xml ... OK 5) interfaceschemadata/ipv6-autoconf-dhcp.xml ... OK 6) interfaceschemadata/ethernet-static.xml ... OK 7) interfaceschemadata/ipv6-autoconf.xml ... OK 8) interfaceschemadata/bridge-vlan.xml ... FAILED xmllint --relaxng /usr/src/redhat/BUILD/libvirt-0.8.5/tests/../docs/schemas/interface.rng --noout /usr/src/redhat/BUILD/libvirt-0.8.5/tests/interfaceschemadata/bridge-vlan.xml /usr/src/redhat/BUILD/libvirt-0.8.5/tests/interfaceschemadata/bridge-vlan.xml:7: element interface: Relax-NG validity error : Element interface failed to validate attributes /usr/src/redhat/BUILD/libvirt-0.8.5/tests/interfaceschemadata/bridge-vlan.xml:8: element vlan: Relax-NG validity error : Did not expect element vlan there /usr/src/redhat/BUILD/libvirt-0.8.5/tests/interfaceschemadata/bridge-vlan.xml:1: element interface: Relax-NG validity error : Element interface failed to validate content /usr/src/redhat/BUILD/libvirt-0.8.5/tests/interfaceschemadata/bridge-vlan.xml:3: element protocol: Relax-NG validity error : Expecting element bond, got protocol /usr/src/redhat/BUILD/libvirt-0.8.5/tests/interfaceschemadata/bridge-vlan.xml:3: element protocol: Relax-NG validity error : Expecting element vlan, got protocol /usr/src/redhat/BUILD/libvirt-0.8.5/tests/interfaceschemadata/bridge-vlan.xml fails to validate 9) interfaceschemadata/bridge-no-address.xml ... FAILED xmllint --relaxng /usr/src/redhat/BUILD/libvirt-0.8.5/tests/../docs/schemas/interface.rng --noout /usr/src/redhat/BUILD/libvirt-0.8.5/tests/interfaceschemadata/bridge-no-address.xml /usr/src/redhat/BUILD/libvirt-0.8.5/tests/interfaceschemadata/bridge-no-address.xml:5: element interface: Relax-NG validity error : Element interface failed to validate attributes /usr/src/redhat/BUILD/libvirt-0.8.5/tests/interfaceschemadata/bridge-no-address.xml:6: element mac: Relax-NG validity error : Did not expect element mac there /usr/src/redhat/BUILD/libvirt-0.8.5/tests/interfaceschemadata/bridge-no-address.xml:8: element interface: Relax-NG validity error : Element interface failed to validate attributes /usr/src/redhat/BUILD/libvirt-0.8.5/tests/interfaceschemadata/bridge-no-address.xml:8: element interface: Relax-NG validity error : Expecting an element , got nothing /usr/src/redhat/BUILD/libvirt-0.8.5/tests/interfaceschemadata/bridge-no-address.xml:1: element interface: Relax-NG validity error : Element interface failed to validate content /usr/src/redhat/BUILD/libvirt-0.8.5/tests/interfaceschemadata/bridge-no-address.xml fails to validate 10) interfaceschemadata/ethernet-static-no-prefix.xml ... OK 11) interfaceschemadata/bridge42.xml ... FAILED xmllint --relaxng /usr/src/redhat/BUILD/libvirt-0.8.5/tests/../docs/schemas/interface.rng --noout /usr/src/redhat/BUILD/libvirt-0.8.5/tests/interfaceschemadata/bridge42.xml /usr/src/redhat/BUILD/libvirt-0.8.5/tests/interfaceschemadata/bridge42.xml:5: element interface: Relax-NG validity error : Element interface failed to validate attributes /usr/src/redhat/BUILD/libvirt-0.8.5/tests/interfaceschemadata/bridge42.xml:5: element interface: Relax-NG validity error : Expecting an element , got nothing /usr/src/redhat/BUILD/libvirt-0.8.5/tests/interfaceschemadata/bridge42.xml:1: element interface: Relax-NG validity error : Element interface failed to validate content /usr/src/redhat/BUILD/libvirt-0.8.5/tests/interfaceschemadata/bridge42.xml:1: element interface: Relax-NG validity error : Element interface failed to validate attributes /usr/src/redhat/BUILD/libvirt-0.8.5/tests/interfaceschemadata/bridge42.xml fails to validate 12) interfaceschemadata/bridge-empty.xml ... OK 13) interfaceschemadata/ipv6-local.xml ... OK 14) interfaceschemadata/ipv6-static-multi.xml ... OK 15) interfaceschemadata/ethernet-dhcp.xml ... OK 16) interfaceschemadata/bridge-bond.xml ... FAILED xmllint --relaxng /usr/src/redhat/BUILD/libvirt-0.8.5/tests/../docs/schemas/interface.rng --noout /usr/src/redhat/BUILD/libvirt-0.8.5/tests/interfaceschemadata/bridge-bond.xml /usr/src/redhat/BUILD/libvirt-0.8.5/tests/interfaceschemadata/bridge-bond.xml:1: element interface: Relax-NG validity error : Element interface failed to validate content /usr/src/redhat/BUILD/libvirt-0.8.5/tests/interfaceschemadata/bridge-bond.xml:1: element interface: Relax-NG validity error : Element interface failed to validate attributes /usr/src/redhat/BUILD/libvirt-0.8.5/tests/interfaceschemadata/bridge-bond.xml fails to validate 17) interfaceschemadata/bond.xml ... OK 18) interfaceschemadata/ipv6-static.xml ... OK ./xencapstest TEST: xencapstest 1) Capabilities for i686, no PAE, no HVM ... FAILED 2) Capabilities for i686, PAE, no HVM ... FAILED 3) Capabilities for i686, PAE, HVM ... FAILED 4) Capabilities for x86_64, no HVM ... FAILED 5) Capabilities for x86_64, HVM ... FAILED 6) Capabilities for ia64, no HVM, LE ... FAILED 7) Capabilities for ia64, HVM, LE ... FAILED 8) Capabilities for ia64, no HVM, BE ... FAILED 9) Capabilities for ia64, HVM, BE ... FAILED 10) Capabilities for ppc64 ... FAILED

4 7

[libvirt] [PATCH] virsh: fix non-literal string format
by Laine Stump 10 Nov '10

10 Nov '10

I just pushed this under the trivial rule. These are in the newly added -V output. --- tools/virsh.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 6a9b5d9..0c91f15 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -11546,8 +11546,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) vshPrint(ctl, _("Virsh command line tool of libvirt %s\n"), VERSION); vshPrint(ctl, _("See web site at %s\n\n"), "http://libvirt.org/"); - vshPrint(ctl, _("Compiled with support for:\n")); - vshPrint(ctl, _(" Hypervisors:")); + vshPrint(ctl, "%s", _("Compiled with support for:\n")); + vshPrint(ctl, "%s", _(" Hypervisors:")); #ifdef WITH_XEN vshPrint(ctl, " Xen"); #endif @@ -11583,7 +11583,7 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) #endif vshPrint(ctl, "\n"); - vshPrint(ctl, _(" Networking:")); + vshPrint(ctl, "%s", _(" Networking:")); #ifdef WITH_REMOTE vshPrint(ctl, " Remote"); #endif @@ -11610,7 +11610,7 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) #endif vshPrint(ctl, "\n"); - vshPrint(ctl, _(" Storage:")); + vshPrint(ctl, "%s", _(" Storage:")); #ifdef WITH_STORAGE_DIR vshPrint(ctl, " Dir"); #endif @@ -11634,7 +11634,7 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) #endif vshPrint(ctl, "\n"); - vshPrint(ctl, _(" Miscellaneous:")); + vshPrint(ctl, "%s", _(" Miscellaneous:")); #ifdef ENABLE_SECDRIVER_APPARMOR vshPrint(ctl, " AppArmor"); #endif -- 1.7.2.3

2 2