January 2012 - Devel - libvirt List Archives

[libvirt] [PATCH libvirt-glib] Fix libvirt error message after finishing a stream
by Marc-André Lureau 11 Jan '12

11 Jan '12

The callback is now added & removed from libvirt-gobject-stream.c It should have been part of c5a239423a215435626bf6d1af75458c5ec03147. #0 virErrorMsg (error=VIR_ERR_INTERNAL_ERROR, info=0x7fffffffcf00 "no stream callback registered") at util/virterror.c:760 #1 0x00007ffff627f304 in virReportErrorHelper (domcode=7, errcode=1, filename=0x7ffff6479a4d "rpc/virnetclientstream.c", funcname=0x7ffff6479ca0 "virNetClientStreamEventRemoveCallback", linenr=514, fmt=<optimized out>) at util/virterror.c:1260 #2 0x00007ffff6339aa4 in virNetClientStreamEventRemoveCallback (st=0x1de8ef0) at rpc/virnetclientstream.c:513 #3 0x00007ffff631a6ba in remoteStreamEventRemoveCallback (st=<optimized out>) at remote/remote_driver.c:3713 #4 0x00007ffff62fe97d in virStreamEventRemoveCallback (stream=0x1db9e00) at libvirt.c:14781 #5 0x00007ffff69114f3 in gvir_stream_update_events (stream=0x1db2570) at libvirt-gobject-stream.c:561 #6 0x00007ffff6911616 in gvir_stream_source_finalize (source=0x1da25e0) at libvirt-gobject-stream.c:606 --- libvirt-gobject/libvirt-gobject-input-stream.c | 1 - libvirt-gobject/libvirt-gobject-output-stream.c | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-input-stream.c b/libvirt-gobject/libvirt-gobject-input-stream.c index 733049b..29d1c29 100644 --- a/libvirt-gobject/libvirt-gobject-input-stream.c +++ b/libvirt-gobject/libvirt-gobject-input-stream.c @@ -197,7 +197,6 @@ static gssize gvir_input_stream_read_finish(GInputStream *stream, count = g_simple_async_result_get_op_res_gssize(simple); - virStreamEventRemoveCallback(handle); virStreamFree(handle); return count; diff --git a/libvirt-gobject/libvirt-gobject-output-stream.c b/libvirt-gobject/libvirt-gobject-output-stream.c index bb82bd3..88fff85 100644 --- a/libvirt-gobject/libvirt-gobject-output-stream.c +++ b/libvirt-gobject/libvirt-gobject-output-stream.c @@ -197,7 +197,6 @@ static gssize gvir_output_stream_write_finish(GOutputStream *stream, count = g_simple_async_result_get_op_res_gssize(simple); - virStreamEventRemoveCallback(handle); virStreamFree(handle); return count; -- 1.7.7.5

2 1

[libvirt] [PATCH 0/4] New command for changing media of changeable disk
by Osier Yang 11 Jan '12

11 Jan '12

This is an improved version of : https://www.redhat.com/archives/libvir-list/2011-December/msg00976.html The changes are: * New helper functions to find and change the disk XML * Use the helper functions in cmdDetachDisk * Merge insert-media and eject-media as change-media * Support --update option. [PATCH 0/4] introduces two new helper functions: vshFindDisk is to find the disk XML node in xml doc with the flags (indicates it's normal disk or changeable disk). VshPrepareDiskXML is to prepare the disk XML for disk changing commands' use. Such as detach-disk. The purpose of this patch is to prepare for upcoming new command "change-disk", which will use the two helper functions too. NB, as I explained previously, the new QEMU commands to separate tray and media management shouldn't block us. [PATCH 1/4] virsh: Two new helper functions for disk device changes [PATCH 2/4] virsh: Use vshFindDisk and vshPrepareDiskXML in [PATCH 3/4] virsh: New command cmdChangeMedia [PATCH 4/4] virsh: Add document for cmdChangeMedia Regards, Osier

1 4

[libvirt] Issue with building libvirt
by Shradha Shah 11 Jan '12

11 Jan '12

Hello all, I have been facing an issue when building libvirt using the following steps: 1) ./autogen.sh --prefix=/usr/ --enable-compile-warnings=error 2) make 3) make install The issue is that the above steps puts the binary in /usr/lib instead of /usr/lib64 on a 64 bit OS (RHEL). [root@c6100l lib]# cat /etc/issue Red Hat Enterprise Linux Server release 6.2 (Santiago) Kernel \r on an \m [root@c6100l lib]# uname -r 2.6.32-220.el6.x86_64 [root@c6100l sshah]# cd /usr/lib [root@c6100l lib]# ll libvirt* -rw-r--r-- 1 root root 14156670 Jan 10 13:59 libvirt.a -rwxr-xr-x 1 root root 998 Jan 10 13:59 libvirt.la -rw-r--r-- 1 root root 75920 Jan 10 13:59 libvirt-qemu.a -rwxr-xr-x 1 root root 1053 Jan 10 13:59 libvirt-qemu.la lrwxrwxrwx 1 root root 21 Jan 10 13:59 libvirt-qemu.so -> libvirt-qemu.so.0.9.4 lrwxrwxrwx 1 root root 21 Jan 10 13:59 libvirt-qemu.so.0 -> libvirt-qemu.so.0.9.4 -rwxr-xr-x 1 root root 55148 Jan 10 13:59 libvirt-qemu.so.0.9.4 lrwxrwxrwx 1 root root 16 Jan 10 13:59 libvirt.so -> libvirt.so.0.9.4 lrwxrwxrwx 1 root root 16 Jan 10 13:59 libvirt.so.0 -> libvirt.so.0.9.4 -rwxr-xr-x 1 root root 7521681 Jan 10 13:59 libvirt.so.0.9.4 This leads to a whole list of other problems. Please may I ask for your help to resolve this issue? Many Thanks, Regards, Shradha Shah

3 4

[libvirt] [PATCH v2] Add new attribute writeout to <filesystem> element
by Deepak C Shetty 10 Jan '12

10 Jan '12

This introduces new attribute writeout with only supported value as immediate. This will be an optional attribute with no defaults. This helps specify whether to skip the host page cache. When writeout is specified, meaning when writeout=immediate a writeback is explicitly initiated for the dirty pages in the host page cache as part of the guest file write operation. Usage: <filesystem type='mount' accessmode='passthrough' writeout='immediate'> <source dir='/export/to/guest'/> <target dir='mount_tag'/> </filesystem> Currently this only works with type='mount' for the QEMU/KVM driver. Signed-off-by: Deepak C Shetty <deepakcs(a)linux.vnet.ibm.com> --- v2: - added writeout as a qemu cap - cosmetic changes in comments - moved to using VIR_ERR_CONFIG_UNSUPPORTED - corrected doc docs/formatdomain.html.in | 9 ++++++++- docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 29 +++++++++++++++++++++++++++-- src/conf/domain_conf.h | 10 ++++++++++ src/qemu/qemu_capabilities.c | 3 +++ src/qemu/qemu_capabilities.h | 5 +++-- src/qemu/qemu_command.c | 14 ++++++++++++++ 7 files changed, 70 insertions(+), 5 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 9cf0f12..93f754a 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1303,7 +1303,7 @@ <source name='my-vm-template'/> <target dir='/'/> </filesystem> - <filesystem type='mount' accessmode='passthrough'> + <filesystem type='mount' accessmode='passthrough' writeout='immediate'> <driver type='path'/> <source dir='/export/to/guest'/> <target dir='/import/from/host'/> @@ -1379,6 +1379,13 @@ </dd> </dl> + The filesystem block has an optional attribute <code>writeout</code> with the only + supported value as <code>immediate</code>. It helps specify whether to skip the host page cache. + When writeout is specified, meaning when writeout=immediate a writeback is explicitly initiated + for the dirty pages in the host page cache as part of the guest file write operation. + When this attribute is not specified, there are no defaults, meaning explicit writeback won't + be initiated. + </dd> <dt><code>source</code></dt> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 553a6f0..0b37f05 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1106,6 +1106,11 @@ <value>squash</value> </choice> </attribute> + <attribute name="writeout"> + <choice> + <value>immediate</value> + </choice> + </attribute> </optional> </element> </define> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 495ed33..a548b90 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -257,6 +257,9 @@ VIR_ENUM_IMPL(virDomainFSAccessMode, VIR_DOMAIN_FS_ACCESSMODE_LAST, "mapped", "squash") +VIR_ENUM_IMPL(virDomainFSWriteout, VIR_DOMAIN_FS_WRITEOUT_LAST, + "default", + "immediate") VIR_ENUM_IMPL(virDomainNet, VIR_DOMAIN_NET_TYPE_LAST, "user", @@ -3297,6 +3300,7 @@ virDomainFSDefParseXML(xmlNodePtr node, char *source = NULL; char *target = NULL; char *accessmode = NULL; + char *writeout = NULL; if (VIR_ALLOC(def) < 0) { virReportOOMError(); @@ -3325,6 +3329,17 @@ virDomainFSDefParseXML(xmlNodePtr node, def->accessmode = VIR_DOMAIN_FS_ACCESSMODE_PASSTHROUGH; } + writeout = virXMLPropString(node, "writeout"); + if (writeout) { + if ((def->writeout = virDomainFSWriteoutTypeFromString(writeout)) < 0) { + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown filesystem writeout '%s'"), writeout); + goto error; + } + } else { + def->writeout = VIR_DOMAIN_FS_WRITEOUT_DEFAULT; + } + cur = node->children; while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE) { @@ -3387,6 +3402,7 @@ cleanup: VIR_FREE(target); VIR_FREE(source); VIR_FREE(accessmode); + VIR_FREE(writeout); return def; @@ -10046,6 +10062,7 @@ virDomainFSDefFormat(virBufferPtr buf, const char *type = virDomainFSTypeToString(def->type); const char *accessmode = virDomainFSAccessModeTypeToString(def->accessmode); const char *fsdriver = virDomainFSDriverTypeTypeToString(def->fsdriver); + const char *writeout = virDomainFSWriteoutTypeToString(def->writeout); if (!type) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, @@ -10062,12 +10079,20 @@ virDomainFSDefFormat(virBufferPtr buf, if (def->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_PATH || def->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_DEFAULT) { virBufferAsprintf(buf, - " <filesystem type='%s' accessmode='%s'>\n", + " <filesystem type='%s' accessmode='%s'", type, accessmode); } else { virBufferAsprintf(buf, - " <filesystem type='%s'>\n", type); + " <filesystem type='%s'", type); } + + /* Don't generate anything if writeout is set to default */ + if (def->writeout) { + virBufferAsprintf(buf, " writeout='%s'", writeout); + } + + /* close the filesystem element */ + virBufferAddLit(buf,">\n"); if (def->fsdriver) { virBufferAsprintf(buf, " <driver type='%s'/>\n", fsdriver); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 1f6e442..6f65b4a 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -459,12 +459,21 @@ enum virDomainFSAccessMode { VIR_DOMAIN_FS_ACCESSMODE_LAST }; +/* Filesystem Writeout */ +enum virDomainFSWriteout { + VIR_DOMAIN_FS_WRITEOUT_DEFAULT = 0, + VIR_DOMAIN_FS_WRITEOUT_IMMEDIATE, + + VIR_DOMAIN_FS_WRITEOUT_LAST +}; + typedef struct _virDomainFSDef virDomainFSDef; typedef virDomainFSDef *virDomainFSDefPtr; struct _virDomainFSDef { int type; int fsdriver; int accessmode; + int writeout; char *src; char *dst; unsigned int readonly : 1; @@ -1974,6 +1983,7 @@ VIR_ENUM_DECL(virDomainControllerModelUSB) VIR_ENUM_DECL(virDomainFS) VIR_ENUM_DECL(virDomainFSDriverType) VIR_ENUM_DECL(virDomainFSAccessMode) +VIR_ENUM_DECL(virDomainFSWriteout) VIR_ENUM_DECL(virDomainNet) VIR_ENUM_DECL(virDomainNetBackend) VIR_ENUM_DECL(virDomainNetVirtioTxMode) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 43c7578..2af16f3 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -144,6 +144,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "ich9-ahci", "no-acpi", "fsdev-readonly", + "fsdev-writeout", ); struct qemu_feature_flags { @@ -1083,6 +1084,8 @@ qemuCapsComputeCmdFlags(const char *help, qemuCapsSet(flags, QEMU_CAPS_FSDEV); if (strstr(fsdev, "readonly")) qemuCapsSet(flags, QEMU_CAPS_FSDEV_READONLY); + if (strstr(fsdev, "writeout")) + qemuCapsSet(flags, QEMU_CAPS_FSDEV_WRITEOUT); } if (strstr(help, "-smbios type")) qemuCapsSet(flags, QEMU_CAPS_SMBIOS_TYPE); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index c759baf..5b2f932 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -113,10 +113,11 @@ enum qemuCapsFlags { QEMU_CAPS_NO_SHUTDOWN = 74, /* usable -no-shutdown */ QEMU_CAPS_DRIVE_CACHE_UNSAFE = 75, /* Is cache=unsafe supported? */ - QEMU_CAPS_PCI_ROMBAR = 76, /* -device rombar=0|1 */ + QEMU_CAPS_PCI_ROMBAR = 76, /* -device rombar=0|1 */ QEMU_CAPS_ICH9_AHCI = 77, /* -device ich9-ahci */ QEMU_CAPS_NO_ACPI = 78, /* -no-acpi */ - QEMU_CAPS_FSDEV_READONLY =79, /* -fsdev readonly supported */ + QEMU_CAPS_FSDEV_READONLY = 79, /* -fsdev readonly supported */ + QEMU_CAPS_FSDEV_WRITEOUT = 80, /* -fsdev writeout supported */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 76f3632..adfc738 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -108,6 +108,10 @@ VIR_ENUM_IMPL(qemuDomainFSDriver, VIR_DOMAIN_FS_DRIVER_TYPE_LAST, "local", "handle"); +VIR_ENUM_DECL(qemuDomainFSWriteout) +VIR_ENUM_IMPL(qemuDomainFSWriteout, VIR_DOMAIN_FS_WRITEOUT_LAST, + "default", + "immediate"); static void uname_normalize (struct utsname *ut) @@ -2084,6 +2088,7 @@ char *qemuBuildFSStr(virDomainFSDefPtr fs, { virBuffer opt = VIR_BUFFER_INITIALIZER; const char *driver = qemuDomainFSDriverTypeToString(fs->fsdriver); + const char *writeout = qemuDomainFSWriteoutTypeToString(fs->writeout); if (fs->type != VIR_DOMAIN_FS_TYPE_MOUNT) { qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -2108,6 +2113,15 @@ char *qemuBuildFSStr(virDomainFSDefPtr fs, virBufferAddLit(&opt, ",security_model=none"); } } + + if (fs->writeout != VIR_DOMAIN_FS_WRITEOUT_DEFAULT) { + if (qemuCapsGet(qemuCaps, QEMU_CAPS_FSDEV_WRITEOUT)) { + virBufferAsprintf(&opt, ",writeout=%s", writeout); + } else { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("filesystem writeout not supported")); + } + } virBufferAsprintf(&opt, ",id=%s%s", QEMU_FSDEV_HOST_PREFIX, fs->info.alias); virBufferAsprintf(&opt, ",path=%s", fs->src);

4 7

[libvirt] Would it make sense to have a <disk device='logicalvolume'>?
by Francesco Pretto 10 Jan '12

10 Jan '12

The questions is this: 1) would it make sense to expose a block device in the host to be mapped like a "logical volume" in the guest (I mean: not actually exposing it as a physical disk)? 2) Is there any existing hypervisor that could be made to work like this? Example scenario: Just suppose I have a real logical volume in the *host* called "/dev/mapper/domain0_home" (it could be any block device, but this would be a real useful configuration). Consider the following hypothetical libvirt configuration: <disk type='block' device='lv'> <source dev='/dev/mapper/domain0_home'/> <target dev='home' bus='virtio'/> </disk> 'lv' stands for "logicavolume". The block device should be automatically mapped in the *guest* as "/dev/mapper/home", and not advertised as a physical disk.

2 5

[libvirt] [PATCH 0/2] VirtFS fixes needed for supporting fs driver in VMM
by Deepak C Shetty 10 Jan '12

10 Jan '12

These are the libvirt changes needed to ensure that the virt-manager changes done for supporting fs driver work well. --- Deepak C Shetty (2): Set default fs driver when not provided in input xml Do not generate security_model when fs driver is anything but 'path' src/conf/domain_conf.c | 15 +++++++++++---- src/qemu/qemu_command.c | 15 +++++++++------ 2 files changed, 20 insertions(+), 10 deletions(-) -- Signature

2 9

[libvirt] [PATCH] Docs: Document Android application using libvirt
by Michal Privoznik 10 Jan '12

10 Jan '12

This is acutally a patch for VM Manager for Android. https://www.redhat.com/archives/libvirt-users/2011-November/msg00076.html --- docs/apps.html.in | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/docs/apps.html.in b/docs/apps.html.in index 8d27b70..29bebbd 100644 --- a/docs/apps.html.in +++ b/docs/apps.html.in @@ -348,5 +348,16 @@ </dd> </dl> + <h2><a name="mobile">Mobile applications</a></h2> + + <dl> + <dt><a href="https://market.android.com/details?id=vm.manager">VM Manager</a></dt> + <dd> + VM Manager is VM (libvirt) manager (over SSH) application. VM Manager + is an application for libvirt VM / Domain management over SSH. + Please keep in mind that this software is under heavy development. + </dd> + </dl> + </body> </html> -- 1.7.3.4

2 2

[libvirt] [PATCH] npiv: Auto-generate WWN if it's not specified
by Osier Yang 10 Jan '12

10 Jan '12

The auto-generated WWN comply with the new addressing schema of WWN: <quote> the first nibble is either hex 5 or 6 followed by a 3-byte vendor identifier and 36 bits for a vendor-specified serial number. </quote> We choose hex 5 for the first nibble. And use Qumranet's OUI (00:1A:4A) as the 3-byte vendor indentifier. The last 36 bits are auto-generated. --- src/conf/node_device_conf.c | 35 ++++++++++++++++++----------------- src/libvirt_private.syms | 1 + src/util/util.c | 20 ++++++++++++++++++++ src/util/util.h | 1 + 4 files changed, 40 insertions(+), 17 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index d9dc9ac..e7cc243 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -63,19 +63,12 @@ VIR_ENUM_IMPL(virNodeDevHBACap, VIR_NODE_DEV_CAP_HBA_LAST, static int virNodeDevCapsDefParseString(const char *xpath, xmlXPathContextPtr ctxt, - char **string, - virNodeDeviceDefPtr def, - const char *missing_error_fmt) + char **string) { char *s; - s = virXPathString(xpath, ctxt); - if (s == NULL) { - virNodeDeviceReportError(VIR_ERR_INTERNAL_ERROR, - missing_error_fmt, - def->name); + if (!(s = virXPathString(xpath, ctxt))) return -1; - } *string = s; return 0; @@ -763,18 +756,26 @@ virNodeDevCapScsiHostParseXML(xmlXPathContextPtr ctxt, if (virNodeDevCapsDefParseString("string(./wwnn[1])", ctxt, - &data->scsi_host.wwnn, - def, - _("no WWNN supplied for '%s'")) < 0) { - goto out; + &data->scsi_host.wwnn) < 0) { + if (virGenerateWWN(&data->scsi_host.wwnn) < 0) { + virNodeDeviceReportError(VIR_ERR_INTERNAL_ERROR, + _("no WWNN supplied for '%s', and " + "auto-generation failed"), + def->name); + goto out; + } } if (virNodeDevCapsDefParseString("string(./wwpn[1])", ctxt, - &data->scsi_host.wwpn, - def, - _("no WWPN supplied for '%s'")) < 0) { - goto out; + &data->scsi_host.wwpn) < 0) { + if (virGenerateWWN(&data->scsi_host.wwpn) < 0) { + virNodeDeviceReportError(VIR_ERR_INTERNAL_ERROR, + _("no WWPN supplied for '%s', and " + "auto-generation failed"), + def->name); + goto out; + } } ctxt->node = orignode2; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index ac2c52e..3b3b322 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1100,6 +1100,7 @@ virFileWriteStr; virFindFileInPath; virFormatMacAddr; virGenerateMacAddr; +virGenerateWWN; virGetGroupID; virGetHostname; virGetUserDirectory; diff --git a/src/util/util.c b/src/util/util.c index 6f46d53..e6f4559 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -1837,6 +1837,26 @@ void virGenerateMacAddr(const unsigned char *prefix, addr[5] = virRandom(256); } +#define QUMRANET_OUI "001a4a" + +int virGenerateWWN(char **wwn) { + int suffix[5]; + + suffix[0] = virRandom(16); + suffix[1] = virRandom(256); + suffix[2] = virRandom(256); + suffix[3] = virRandom(256); + suffix[4] = virRandom(256); + + if (virAsprintf(wwn, "%x%s%x%02x%02x%02x%02x", 0x5, QUMRANET_OUI, + suffix[0], suffix[1], suffix[2], + suffix[3], suffix[4]) < 0) { + virReportOOMError(); + return -1; + } + + return 0; +} int virEnumFromString(const char *const*types, unsigned int ntypes, diff --git a/src/util/util.h b/src/util/util.h index c9c785b..d7a0840 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -186,6 +186,7 @@ void virFormatMacAddr(const unsigned char *addr, char *str); void virGenerateMacAddr(const unsigned char *prefix, unsigned char *addr); +int virGenerateWWN(char **wwn); int virDiskNameToIndex(const char* str); char *virIndexToDiskName(int idx, const char *prefix); -- 1.7.7.3

1 0

[libvirt] [test-API][PATCH] Add domain event type "Shutdown"
by Wayne Sun 10 Jan '12

10 Jan '12

* domain have 7 event types, add the missing shutdown type * shutdown only have 1 detail type 'Finished' --- repos/domain/eventhandler.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/repos/domain/eventhandler.py b/repos/domain/eventhandler.py index cdbba90..7d8b635 100644 --- a/repos/domain/eventhandler.py +++ b/repos/domain/eventhandler.py @@ -48,16 +48,18 @@ def eventToString(event): "Suspended", "Resumed", "Stopped" ); + "Shutdown" ); return eventStrings[event]; def detailToString(event, detail): eventStrings = ( ( "Added", "Updated" ), - ( "Removed" ), + ( "Removed", ), ( "Booted", "Migrated", "Restored", "Snapshot" ), ( "Paused", "Migrated", "IOError", "Watchdog" ), ( "Unpaused", "Migrated"), ( "Shutdown", "Destroyed", "Crashed", "Migrated", "Saved", "Failed", "Snapshot") + ( "Finished", ) ) return eventStrings[event][detail] -- 1.7.1

2 1

[libvirt] [PATCH] PolicyKit: Check auth before asking client to obtain it
by Jim Fehlig 10 Jan '12

10 Jan '12

I previously mentioned [1] a PolicyKit issue where libvirt would proceed with authentication even though polkit-auth failed: testusr xen134:~> virsh list --all Attempting to obtain authorization for org.libvirt.unix.manage. polkit-grant-helper: given auth type (8 -> yes) is bogus Failed to obtain authorization for org.libvirt.unix.manage. Id Name State ---------------------------------- 0 Domain-0 running - sles11sp1-pv shut off AFAICT, libvirt attempts to obtain a privilege it already has, causing polkit-auth to fail with above message. Instead of calling obtain and then checking auth, IMO the workflow should be for the server to check auth first, and if that fails ask the client to obtain it and check again. This workflow also allows for checking only successful exit of polkit-auth in virConnectAuthGainPolkit(). [1] https://www.redhat.com/archives/libvir-list/2011-December/msg00837.html --- src/libvirt.c | 2 +- src/remote/remote_driver.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index feb3ca6..9e04a38 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -119,7 +119,7 @@ static int virConnectAuthGainPolkit(const char *privilege) { cmd = virCommandNewArgList(POLKIT_AUTH, "--obtain", privilege, NULL); if (virCommandRun(cmd, &status) < 0 || - status > 1) + status > 0) goto cleanup; ret = 0; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 7580477..e28840b 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -3121,6 +3121,14 @@ remoteAuthPolkit (virConnectPtr conn, struct private_data *priv, }; VIR_DEBUG("Client initialize PolicyKit-0 authentication"); + /* Check auth first and if it succeeds we are done. */ + memset (&ret, 0, sizeof ret); + if (call (conn, priv, 0, REMOTE_PROC_AUTH_POLKIT, + (xdrproc_t) xdr_void, (char *)NULL, + (xdrproc_t) xdr_remote_auth_polkit_ret, (char *) &ret) == 0) + goto out; + + /* Auth failed. Ask client to obtain it and check again. */ if (auth && auth->cb) { /* Check if the necessary credential type for PolicyKit is supported */ for (i = 0 ; i < auth->ncredtype ; i++) { @@ -3138,9 +3146,11 @@ remoteAuthPolkit (virConnectPtr conn, struct private_data *priv, } } else { VIR_DEBUG("Client auth callback does not support PolicyKit"); + return -1; } } else { VIR_DEBUG("No auth callback provided"); + return -1; } memset (&ret, 0, sizeof ret); @@ -3150,6 +3160,7 @@ remoteAuthPolkit (virConnectPtr conn, struct private_data *priv, return -1; /* virError already set by call */ } +out: VIR_DEBUG("PolicyKit-0 authentication complete"); return 0; } -- 1.7.7

3 4