- Devel - libvirt List Archives

[libvirt] [PATCH] remote_driver.c: fix non-literal format strings w/o args
by Laine Stump 11 Nov '10

11 Nov '10

Pushed another of these under the trivial rule (with correct email address this time!). I guess I run into these so often because I build with --disable-nls and most other people don't... --- src/remote/remote_driver.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 4492b6b..f45476a 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -8481,7 +8481,7 @@ remoteStreamEventAddCallback(virStreamPtr st, if (privst->cb) { remoteError(VIR_ERR_INTERNAL_ERROR, - _("multiple stream callbacks not supported")); + "%s", _("multiple stream callbacks not supported")); goto cleanup; } @@ -8521,7 +8521,7 @@ remoteStreamEventUpdateCallback(virStreamPtr st, if (!privst->cb) { remoteError(VIR_ERR_INTERNAL_ERROR, - _("no stream callback registered")); + "%s", _("no stream callback registered")); goto cleanup; } @@ -8548,7 +8548,7 @@ remoteStreamEventRemoveCallback(virStreamPtr st) if (!privst->cb) { remoteError(VIR_ERR_INTERNAL_ERROR, - _("no stream callback registered")); + "%s", _("no stream callback registered")); goto cleanup; } -- 1.7.1

3 2

[libvirt] [PATCH] ignore SELinuxSetFilecon error in SELinuxSetSecurityFileLabel if on nfs
by Laine Stump 11 Nov '10

11 Nov '10

If virDomainAttachDevice() was called with an image that was located on a root-squashed NFS server, and in a directory that was unreadable by root on the machine running libvirtd, the attach would fail due to an attempt to change the selinux label of the image with EACCES (which isn't covered as an ignore case in SELinuxSetFilecon()) NFS doesn't support SELinux labelling anyway, so we mimic the failure handling of commit 93a18bbafaf11729d3ca1241e11bee133d77fa77, which just ignores the errors if the target is on an NFS filesystem (in SELinuxSetSecurityAllLabel() only, though.) This can be seen as a follow-on to commit 347d266c51705f4987fa5ce2a0ecb314ed8745ce, which ignores file open failures of files on NFS that occur directly in virDomainDiskDefForeachPath() (also necessary), but does not ignore failures in functions that are called from there (eg SELinuxSetSecurityFileLabel()). --- src/security/security_selinux.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 7dd9b14..a9b63ea 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -453,20 +453,27 @@ SELinuxSetSecurityFileLabel(virDomainDiskDefPtr disk, void *opaque) { const virSecurityLabelDefPtr secdef = opaque; + int ret; if (depth == 0) { if (disk->shared) { - return SELinuxSetFilecon(path, default_image_context); + ret = SELinuxSetFilecon(path, default_image_context); } else if (disk->readonly) { - return SELinuxSetFilecon(path, default_content_context); + ret = SELinuxSetFilecon(path, default_content_context); } else if (secdef->imagelabel) { - return SELinuxSetFilecon(path, secdef->imagelabel); + ret = SELinuxSetFilecon(path, secdef->imagelabel); } else { return 0; } } else { - return SELinuxSetFilecon(path, default_content_context); + ret = SELinuxSetFilecon(path, default_content_context); } + if (ret < 0 && + virStorageFileIsSharedFSType(path, + VIR_STORAGE_FILE_SHFS_NFS) != 1) + return ret; + else + return 0; } static int -- 1.7.1

2 2

[libvirt] Different approach to locking
by Richard W.M. Jones 11 Nov '10

11 Nov '10

I get the feeling that the locking manager is meant to be a libvirt-internal API. I'll throw out this idea instead: How about making the concept of "reserving" a VM into a public libvirt API? /* Reserve 'dom'. * * flags: * VIR_DOMAIN_RESERVE_READONLY: reserve for read-only access */ int virDomainReserve (virDomainPtr dom, unsigned flags); /* Drop reservation of 'dom'. */ int virDomainUnReserve (virDomainPtr dom); The reservation would also be dropped when the current libvirt connection is closed. libvirt/libvirtd would acquire the locks on our behalf. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into Xen guests. http://et.redhat.com/~rjones/virt-p2v

2 2

[libvirt] Per user preference file
by Justin Clift 11 Nov '10

11 Nov '10

Hi all, Had a thought the other night, about a possible approach to having a "per user" libvirt preferences file. How about, in the user's home directory, we have a single text file, say ".libvirt-prefs", structured something like this: [common] default_uri = qemu+ssh://somehost/system default_socket = /path/to/somewhere-socket default_session_type = system tls_client_cert = /path/to/somewhere.cert tls_client_key = /path/to/somewhere.key log_file=/path/to/logfile.log some_other_preference=value [gtk-vnc] tls_client_cert = /path/that/overrides/the/common/section/if/present/somefile.cert tls_client_key = /path/that/overrides/the/common/section/if/present/somefile.key [virt-viewer] more_overrides=/value/foo The suggestion being, that we have a [common] section with preferences that general libvirt client apps can use (ie virsh). But also allowing other libvirt client apps (ie virt-viewer), to store overrides to that. Just thinking it would be useful to have these things in one place, so sensible defaults can be set once (ie for TLS certs), and things will then "automagically" use them. + Justin

4 8

[libvirt] dommemstat return nothing
by arnaud.champion＠devatom.fr 11 Nov '10

11 Nov '10

?Hi, I'm currently working on dommemstat C# bindings, and I have a little problem, with virsh under fedora or under linux, dommemstat return nothing. Is it normal ? A suggestion ? Regards, Arnaud Champion

3 3

[libvirt] auto-generating HACKING?
by Eric Blake 11 Nov '10

11 Nov '10

Right now, docs/hacking.html.in contains more data than HACKING. Back in March(! - commit d1c754168) the plan was to add a Makefile rule to autogenerate HACKING via some xml filter; but this still hasn't happened. Can anyone with a better skill set than me at setting up xml filters step in and help? -- Eric Blake eblake(a)redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org

2 1

[libvirt] [PATCH v2] show compiled in options in virsh --version
by Daniel Veillard 11 Nov '10

11 Nov '10

To ease debugging this trivial patch allows to find what was compiled in in the local version of libvirt, this doesn't work for remote access but that's probably sufficient. With the patch I get on my machine: paphio:~/libvirt/tools -> ./virsh -V Virsh command line tool of libvirt 0.8.4 See web site at http://libvirt.org/ Compiled with support for: Hypervisors: Xen QEmu/KVM UML OpenVZ LXC ESX PHYP Test Networking: Remote Daemon Network Bridging Netcf Nwfilter Storage: Dir Disk Filesystem SCSI Multipath iSCSI LVM Miscellaneous: SELinux Secrets Debug Readline paphio:~/libvirt/tools -> v2: map the command to -V and leave -v/--version unchanged change the way spacing is done Daniel -- 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/

4 8

[libvirt] Per user preference file
by Justin Clift 11 Nov '10

11 Nov '10

Hi all, Had a thought the other night, about a possible approach to having a "per user" libvirt preferences file. How about, in the user's home directory, we have a single text file, say ".libvirt-prefs", structured something like this: [common] default_uri = qemu+ssh://somehost/system default_socket = /path/to/somewhere-socket default_session_type = system tls_client_cert = /path/to/somewhere.cert tls_client_key = /path/to/somewhere.key log_file=/path/to/logfile.log some_other_preference=value [gtk-vnc] tls_client_cert = /path/that/overrides/the/common/section/if/present/somefile.cert tls_client_key = /path/that/overrides/the/common/section/if/present/somefile.key [virt-viewer] more_overrides=/value/foo The suggestion being, that we have a [common] section with preferences that general libvirt client apps can use (ie virsh). But also allowing other libvirt client apps (ie virt-viewer), to store overrides to that. Just thinking it would be useful to have these things in one place, so sensible defaults can be set once (ie for TLS certs), and things will then "automagically" use them. + Justin

1 0

[libvirt] RFC [0/3]: A proposal for lock manager plugins
by Daniel P. Berrange 10 Nov '10

10 Nov '10

A few weeks back David introduce sync-manager as a means for protecting against the same VM being started on multiple hosts: https://www.redhat.com/archives/libvir-list/2010-August/msg00179.html This is obviously a desirable feature for libvirt, but we don't want to have a hardcoded dependancy on a particular implementation. We can achieve isolation between libvirt & sync-manager, allowing for alternative implementations by specifying a formal plugin for supervisor processes. What follows is my mockup of what a plugin API would look like, its internal libvirt API and an outline of the usage scenarios in psuedo code. At the minimum level of compliance, the plugin implementation provides for per-VM level exclusion. Optionally a plugin can declare that it - supports locks against individual resources (disks) - supports hotplug of individual resources - supports migration of the supervised process Migration/hotplug will be forbid if those capabilities aren't declared by the plugin. In parallel with David's work on sync-manager, I intend to write a simple plugin implementation based solely on fcntl() locking. It is important that we have 2 independant implementations to prove the validity of the plugin API. The fcntl() impl should provide a zero-config impl we can deploy out of the box that will provide protection against 2 vms using the same disk image on a host, and limited protection in multi-host scenarios with shared filesystems (no protection for shared block devs). Perhaps we should have a 3rd impl based on libdlm too, for Red Hat ClusterSuite scenarios, though sync-manager may well be general & simple enough to easily cope with this already. Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://deltacloud.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

7 26

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

10 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