- Devel - libvirt List Archives

[libvirt] [PATCH] Fix potential double free in virDomainObjParseXML()
by Matthias Bolte 08 Dec '09

08 Dec '09

--- src/conf/domain_conf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6a8fd5d..8730f37 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3493,6 +3493,7 @@ static virDomainObjPtr virDomainObjParseXML(virConnectPtr conn, error: VIR_FREE(nodes); virDomainChrDefFree(obj->monitor_chr); + obj->monitor_chr = NULL; virDomainObjUnref(obj); return NULL; } -- 1.6.0.4

2 2

[libvirt] C# (Mono) bindings for libvirt - SharpLibVirt
by Jaromír Červenka 08 Dec '09

08 Dec '09

Hello, following the example of email Richard W.M. Jones (https://www.redhat.com/archives/libvir-list/2008-September/msg00283.html) I decided to write libvirt interface for Mono. Everything is implemented in one C# file, including in-line help (see http://download.cervajz.com/sharplibvirt.png) which is taken from API documentation. All functions wich are implemented were tested on KVM hypervisor. Everything revolves around a few objects. It is possible call libvirt functions directly thru static class SharpLibVirt.libvirt (SharpLibVirt. virterror) or use my "helpers objects" - SharpLibVirt.slvConnection, SharpLibVirt.slvDomain, SharpLibVirt.slvStoragePool, SharpLibVirt.slvStorageVol, etc... Current status of binding is: Version: 0.7.4 virConnect: 95% virDommain: 95% virEvent: 0% virInterface: 0% virNetwork: 0% (I am currently working on it) virNodeDevice: 0% virNode: 98% virSecret: 0% virStoragePool: 100% virStorageVol: 100% virStream: 0% Others: 100% ----- virterror: 100% In the future I will keep SharpLibVirt up to date by C headers. Greetings, Jaromír "Cervajz" Červenka Official openSUSE community member Web: http://www.cervajz.com/ Jabber: cervajz(a)cervajz.com MSN: jara.cervenka(a)seznam.cz Tel.: +420 607 592 687 Alt. e-mails: jaromir.cervenka(a)opensuse.org, jaromir.cervenka(a)speel.cz

2 1

[libvirt] [PATCH] Fix virDomainObj ref handling in QEMU driver
by Daniel P. Berrange 08 Dec '09

08 Dec '09

Since the monitor I/O is processed out of band from the main thread(s) invoking monitor commands, the virDomainObj may be deleted by the I/O thread. The qemuDomainObjBeginJob takes an extra reference to protect against final deletion, but this reference is released by the corresponding EndJob call. THus after the EndJob call it may not be valid to reference the virDomainObj any more. To allow callers to detect this, the EndJob call is changed to return the remaining reference count. * src/conf/domain_conf.c: Make virDomainObjUnref return the remaining reference count * src/qemu/qemu_driver.c: Avoid referencing virDomainObjPtr after qemuDomainObjEndJob if it has been deleted. --- src/conf/domain_conf.c | 6 +- src/qemu/qemu_driver.c | 133 +++++++++++++++++++++++++++++------------------- 2 files changed, 84 insertions(+), 55 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 21d509d..dca2e49 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -231,7 +231,7 @@ static void virDomainObjListDeallocator(void *payload, const char *name ATTRIBUT { virDomainObjPtr obj = payload; virDomainObjLock(obj); - if (!virDomainObjUnref(obj)) + if (virDomainObjUnref(obj) > 0) virDomainObjUnlock(obj); } @@ -637,9 +637,9 @@ int virDomainObjUnref(virDomainObjPtr dom) if (dom->refs == 0) { virDomainObjUnlock(dom); virDomainObjFree(dom); - return 1; + return 0; } - return 0; + return dom->refs; } static virDomainObjPtr virDomainObjNew(virConnectPtr conn, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7dfd1e6..7e60d0e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -371,15 +371,18 @@ static int qemuDomainObjBeginJobWithDriver(struct qemud_driver *driver, * * To be called after completing the work associated with the * earlier qemuDomainBeginJob() call + * + * Returns remaining refcount on 'obj', maybe 0 to indicated it + * was deleted */ -static void qemuDomainObjEndJob(virDomainObjPtr obj) +static int ATTRIBUTE_RETURN_CHECK qemuDomainObjEndJob(virDomainObjPtr obj) { qemuDomainObjPrivatePtr priv = obj->privateData; priv->jobActive = 0; virCondSignal(&priv->jobCond); - virDomainObjUnref(obj); + return virDomainObjUnref(obj); } @@ -3039,9 +3042,9 @@ static virDomainPtr qemudDomainCreate(virConnectPtr conn, const char *xml, goto cleanup; /* XXXX free the 'vm' we created ? */ if (qemudStartVMDaemon(conn, driver, vm, NULL, -1) < 0) { - qemuDomainObjEndJob(vm); - virDomainRemoveInactive(&driver->domains, - vm); + if (qemuDomainObjEndJob(vm) > 0) + virDomainRemoveInactive(&driver->domains, + vm); vm = NULL; goto endjob; } @@ -3054,8 +3057,9 @@ static virDomainPtr qemudDomainCreate(virConnectPtr conn, const char *xml, if (dom) dom->id = vm->def->id; endjob: - if (vm) - qemuDomainObjEndJob(vm); + if (vm && + qemuDomainObjEndJob(vm) == 0) + vm = NULL; cleanup: virDomainDefFree(def); @@ -3110,7 +3114,8 @@ static int qemudDomainSuspend(virDomainPtr dom) { ret = 0; endjob: - qemuDomainObjEndJob(vm); + if (qemuDomainObjEndJob(vm) == 0) + vm = NULL; cleanup: if (vm) @@ -3169,7 +3174,8 @@ static int qemudDomainResume(virDomainPtr dom) { ret = 0; endjob: - qemuDomainObjEndJob(vm); + if (qemuDomainObjEndJob(vm) == 0) + vm = NULL; cleanup: if (vm) @@ -3213,7 +3219,8 @@ static int qemudDomainShutdown(virDomainPtr dom) { qemuDomainObjExitMonitor(vm); endjob: - qemuDomainObjEndJob(vm); + if (qemuDomainObjEndJob(vm) == 0) + vm = NULL; cleanup: if (vm) @@ -3252,16 +3259,17 @@ static int qemudDomainDestroy(virDomainPtr dom) { VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED_DESTROYED); if (!vm->persistent) { - qemuDomainObjEndJob(vm); - virDomainRemoveInactive(&driver->domains, - vm); + if (qemuDomainObjEndJob(vm) > 0) + virDomainRemoveInactive(&driver->domains, + vm); vm = NULL; } ret = 0; endjob: - if (vm) - qemuDomainObjEndJob(vm); + if (vm && + qemuDomainObjEndJob(vm) == 0) + vm = NULL; cleanup: if (vm) @@ -3402,7 +3410,8 @@ static int qemudDomainSetMemory(virDomainPtr dom, unsigned long newmem) { ret = 0; endjob: - qemuDomainObjEndJob(vm); + if (qemuDomainObjEndJob(vm) == 0) + vm = NULL; cleanup: if (vm) @@ -3452,7 +3461,8 @@ static int qemudDomainGetInfo(virDomainPtr dom, err = qemuMonitorGetBalloonInfo(priv->mon, &balloon); qemuDomainObjExitMonitor(vm); if (err < 0) { - qemuDomainObjEndJob(vm); + if (qemuDomainObjEndJob(vm) == 0) + vm = NULL; goto cleanup; } @@ -3462,7 +3472,10 @@ static int qemudDomainGetInfo(virDomainPtr dom, else info->memory = balloon; - qemuDomainObjEndJob(vm); + if (qemuDomainObjEndJob(vm) == 0) { + vm = NULL; + goto cleanup; + } } else { info->memory = vm->def->memory; } @@ -3671,15 +3684,16 @@ static int qemudDomainSave(virDomainPtr dom, VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED_SAVED); if (!vm->persistent) { - qemuDomainObjEndJob(vm); - virDomainRemoveInactive(&driver->domains, - vm); + if (qemuDomainObjEndJob(vm) > 0) + virDomainRemoveInactive(&driver->domains, + vm); vm = NULL; } endjob: - if (vm) - qemuDomainObjEndJob(vm); + if (vm && + qemuDomainObjEndJob(vm) == 0) + vm = NULL; cleanup: if (fd != -1) @@ -3766,7 +3780,8 @@ static int qemudDomainCoreDump(virDomainPtr dom, } endjob: - qemuDomainObjEndJob(vm); + if (qemuDomainObjEndJob(vm) == 0) + vm = NULL; cleanup: if (vm) @@ -3827,7 +3842,8 @@ static int qemudDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus) { ret = 0; endjob: - qemuDomainObjEndJob(vm); + if (qemuDomainObjEndJob(vm) == 0) + vm = NULL; cleanup: if (vm) @@ -4235,9 +4251,9 @@ static int qemudDomainRestore(virConnectPtr conn, fd = -1; if (ret < 0) { if (!vm->persistent) { - qemuDomainObjEndJob(vm); - virDomainRemoveInactive(&driver->domains, - vm); + if (qemuDomainObjEndJob(vm) > 0) + virDomainRemoveInactive(&driver->domains, + vm); vm = NULL; } goto endjob; @@ -4265,8 +4281,9 @@ static int qemudDomainRestore(virConnectPtr conn, ret = 0; endjob: - if (vm) - qemuDomainObjEndJob(vm); + if (vm && + qemuDomainObjEndJob(vm) == 0) + vm = NULL; cleanup: virDomainDefFree(def); @@ -4314,7 +4331,10 @@ static char *qemudDomainDumpXML(virDomainPtr dom, qemuDomainObjEnterMonitor(vm); err = qemuMonitorGetBalloonInfo(priv->mon, &balloon); qemuDomainObjExitMonitor(vm); - qemuDomainObjEndJob(vm); + if (qemuDomainObjEndJob(vm) == 0) { + vm = NULL; + goto cleanup; + } if (err < 0) goto cleanup; if (err > 0) @@ -4547,7 +4567,8 @@ static int qemudDomainStart(virDomainPtr dom) { VIR_DOMAIN_EVENT_STARTED_BOOTED); endjob: - qemuDomainObjEndJob(vm); + if (qemuDomainObjEndJob(vm) == 0) + vm = NULL; cleanup: if (vm) @@ -5338,7 +5359,8 @@ static int qemudDomainAttachDevice(virDomainPtr dom, ret = -1; endjob: - qemuDomainObjEndJob(vm); + if (qemuDomainObjEndJob(vm) == 0) + vm = NULL; cleanup: if (cgroup) @@ -5672,7 +5694,8 @@ static int qemudDomainDetachDevice(virDomainPtr dom, ret = -1; endjob: - qemuDomainObjEndJob(vm); + if (qemuDomainObjEndJob(vm) == 0) + vm = NULL; cleanup: virDomainDeviceDefFree(dev); @@ -5996,7 +6019,8 @@ qemudDomainBlockStats (virDomainPtr dom, qemuDomainObjExitMonitor(vm); endjob: - qemuDomainObjEndJob(vm); + if (qemuDomainObjEndJob(vm) == 0) + vm = NULL; cleanup: VIR_FREE(qemu_dev_name); @@ -6214,7 +6238,8 @@ qemudDomainMemoryPeek (virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(vm); + if (qemuDomainObjEndJob(vm) == 0) + vm = NULL; cleanup: VIR_FREE(tmp); @@ -6708,8 +6733,8 @@ qemudDomainMigratePrepareTunnel(virConnectPtr dconn, if (qemust == NULL) { qemudShutdownVMDaemon(NULL, driver, vm); if (!vm->persistent) { - qemuDomainObjEndJob(vm); - virDomainRemoveInactive(&driver->domains, vm); + if (qemuDomainObjEndJob(vm) > 0) + virDomainRemoveInactive(&driver->domains, vm); vm = NULL; } virReportSystemError(dconn, errno, @@ -6727,8 +6752,9 @@ qemudDomainMigratePrepareTunnel(virConnectPtr dconn, ret = 0; endjob: - if (vm) - qemuDomainObjEndJob(vm); + if (vm && + qemuDomainObjEndJob(vm) == 0) + vm = NULL; cleanup: virDomainDefFree(def); @@ -6895,8 +6921,8 @@ qemudDomainMigratePrepare2 (virConnectPtr dconn, * should have already done that. */ if (!vm->persistent) { - qemuDomainObjEndJob(vm); - virDomainRemoveInactive(&driver->domains, vm); + if (qemuDomainObjEndJob(vm) > 0) + virDomainRemoveInactive(&driver->domains, vm); vm = NULL; } goto endjob; @@ -6908,8 +6934,9 @@ qemudDomainMigratePrepare2 (virConnectPtr dconn, ret = 0; endjob: - if (vm) - qemuDomainObjEndJob(vm); + if (vm && + qemuDomainObjEndJob(vm) == 0) + vm = NULL; cleanup: virDomainDefFree(def); @@ -7399,8 +7426,8 @@ qemudDomainMigratePerform (virDomainPtr dom, VIR_DOMAIN_EVENT_STOPPED_MIGRATED); if (!vm->persistent || (flags & VIR_MIGRATE_UNDEFINE_SOURCE)) { virDomainDeleteConfig(dom->conn, driver->configDir, driver->autostartDir, vm); - qemuDomainObjEndJob(vm); - virDomainRemoveInactive(&driver->domains, vm); + if (qemuDomainObjEndJob(vm) > 0) + virDomainRemoveInactive(&driver->domains, vm); vm = NULL; } ret = 0; @@ -7424,8 +7451,9 @@ endjob: VIR_DOMAIN_EVENT_RESUMED, VIR_DOMAIN_EVENT_RESUMED_MIGRATED); } - if (vm) - qemuDomainObjEndJob(vm); + if (vm && + qemuDomainObjEndJob(vm) == 0) + vm = NULL; cleanup: if (vm) @@ -7523,15 +7551,16 @@ qemudDomainMigrateFinish2 (virConnectPtr dconn, VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED_FAILED); if (!vm->persistent) { - qemuDomainObjEndJob(vm); - virDomainRemoveInactive(&driver->domains, vm); + if (qemuDomainObjEndJob(vm) > 0) + virDomainRemoveInactive(&driver->domains, vm); vm = NULL; } } endjob: - if (vm) - qemuDomainObjEndJob(vm); + if (vm && + qemuDomainObjEndJob(vm) == 0) + vm = NULL; cleanup: if (vm) -- 1.6.5.2

3 2

[libvirt] Add vncdisplay to virsh list
by Дмитрий Ильин 08 Dec '09

08 Dec '09

I think adding vncdisplay to virsh list output will be very usefull. For example output could be like this: Id Name State Display ---------------------------------------------------- 1 test1 running :2 2 test2 running :5 3 test3 running :13 4 server1 running n/g 5 sdltest running sdl - test4 shut off off - test5 shut off off :n - vnc display number n/g - no graphics sdl - sdl output You can use "--display" to enable it command: virsh list --all --display Also I would like to see "--pretend" option in virt-install. Just generate xml and dump it to stdout without doing anything else.

2 1

[libvirt] is libvirt test suite available
by Sharadha Prabhakar (3P) 08 Dec '09

08 Dec '09

Hi, I'd like to know if there is a client test suite available to test libvirt. If so Where can I locate it? Thanks, SP

2 1

[libvirt] [PATCH 0/3] fix migration of paused vms
by Paolo Bonzini 08 Dec '09

08 Dec '09

From: Paolo Bonzini <pbonzini(a)gnu.org> This is yet another try on fixing migration of paused vms. Since the driver-only solution didn't work out, I'm now fixing it directly in libvirt.c. The first two patches are the same as for the previous series. The first is a bugfix for failed migration for the QEMU driver; the second adds a "virsh migrate --suspend" option to leave the VM not running on the destination machine. As in the previous version of the patch, --suspend/VIR_MIGRATE_PAUSED is the bulk of implementing the new feature. I just query the domain state and, if it is paused, I implicitly add the VIR_MIGRATE_PAUSED flag to the migration. This is the third patch. I thought about transmitting the state in the end (since it works well if VIR_MIGRATE_PAUSED is passed only to MigrateFinish and not to MigratePerform), but I don't think it's a good idea to commit it now as it's basically untestable. It's in the fourth patch, but if you want it now and think the approach is sound, tell me and I'll test it more heavily.

2 10

[libvirt] [PATCH] udev_device_get_devpath might return NULL
by Guido Günther 08 Dec '09

08 Dec '09

Fix crash on daemon strdup in that case. udev_device_get_devpath returs NULL for '/sys/devices/virtual/block/dm-*' devices. In that case the later strdup segfaults. O.k. to apply? 19:12:46.319: info : udevGetDeviceProperty:111 : udev reports device 'dm-0' does not have property 'DRIVER' 19:12:46.319: debug : udevProcessStorage:954 : No devnode for '/devices/virtual/block/dm-0' 19:12:46.319: info : udevProcessDeviceListEntry:1261 : Failed to create node device for udev device '/sys/devices/virtual/block/dm-0' --- src/node_device/node_device_udev.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 9b48052..c7238fc 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -947,8 +947,14 @@ static int udevProcessStorage(struct udev_device *device, { union _virNodeDevCapData *data = &def->caps->data; int ret = -1; + const char* devnode; - data->storage.block = strdup(udev_device_get_devnode(device)); + devnode = udev_device_get_devnode(device); + if(!devnode) { + VIR_DEBUG("No devnode for '%s'\n", udev_device_get_devpath(device)); + goto out; + } + data->storage.block = strdup(devnode); if (udevGetStringProperty(device, "DEVNAME", &data->storage.block) == PROPERTY_ERROR) { -- 1.6.5.3

3 3

[libvirt] [PATCH] Avoid an type-punned pointer aliasing pbm
by Daniel Veillard 08 Dec '09

08 Dec '09

Anmother fix for a warning which I didn't commited yet: commit 3109546b28b5fc55bf451e62cdb80908cf025ff8 Author: Daniel Veillard <veillard(a)redhat.com> Date: Tue Dec 8 11:14:55 2009 +0100 Avoid an type-punned pointer aliasing pbm Fix this warning, there is no need to use an intermediate, different array pointer. network.c: In function 'getIPv6Addr': network.c:50: warning: dereferencing type-punned pointer will break strict-aliasing rules * src/util/network.c: avoid an intermediary pointer cast diff --git a/src/util/network.c b/src/util/network.c index aaea436..9b9b848 100644 --- a/src/util/network.c +++ b/src/util/network.c @@ -41,16 +41,13 @@ static int getIPv4Addr(virSocketAddrPtr addr, virIPv4AddrPtr tab) { } static int getIPv6Addr(virSocketAddrPtr addr, virIPv6AddrPtr tab) { - virIPv6AddrPtr val; int i; if ((addr == NULL) || (tab == NULL) || (addr->stor.ss_family != AF_INET6)) return(-1); - val = (virIPv6AddrPtr) &(addr->inet6.sin6_addr.s6_addr16); - for (i = 0;i < 8;i++) { - (*tab)[i] = ntohs((*val)[i]); + (*tab)[i] = ntohs(addr->inet6.sin6_addr.s6_addr16[i]); } return(0); -- 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/

1 0

[libvirt] [PATCH] Fix compilation for configure --disable-nls
by Matthias Bolte 07 Dec '09

07 Dec '09

--- src/opennebula/one_conf.c | 2 +- src/opennebula/one_driver.c | 16 ++++++++-------- src/phyp/phyp_driver.c | 22 +++++++++++----------- src/xen/xen_driver.c | 6 +++--- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/opennebula/one_conf.c b/src/opennebula/one_conf.c index 415f832..baef217 100644 --- a/src/opennebula/one_conf.c +++ b/src/opennebula/one_conf.c @@ -147,7 +147,7 @@ int oneSubmitVM(virConnectPtr conn, if ((oneid = c_oneAllocateTemplate(templ)) < 0) { oneError(conn, NULL, VIR_ERR_OPERATION_FAILED, - _("Error submitting virtual machine to OpenNebula")); + "%s", _("Error submitting virtual machine to OpenNebula")); VIR_FREE(templ); return -1; } diff --git a/src/opennebula/one_driver.c b/src/opennebula/one_driver.c index 4857f54..a30c110 100644 --- a/src/opennebula/one_driver.c +++ b/src/opennebula/one_driver.c @@ -280,13 +280,13 @@ static int oneDomainUndefine(virDomainPtr dom) vm =virDomainFindByUUID(&driver->domains, dom->uuid); if (!vm) { oneError(dom->conn, dom, VIR_ERR_INVALID_DOMAIN, - _("no domain with matching uuid")); + "%s", _("no domain with matching uuid")); goto return_point; } if (!vm->persistent) { oneError(dom->conn, dom, VIR_ERR_INTERNAL_ERROR, - _("cannot undefine transient domain")); + "%s", _("cannot undefine transient domain")); goto return_point; } virDomainRemoveInactive(&driver->domains, vm); @@ -499,7 +499,7 @@ static int oneDomainShutdown(virDomainPtr dom) if (c_oneShutdown(vm->pid)) { oneError(dom->conn, dom, VIR_ERR_OPERATION_INVALID, - _("Wrong state to perform action")); + "%s", _("Wrong state to perform action")); goto return_point; } vm->state=VIR_DOMAIN_SHUTDOWN; @@ -535,7 +535,7 @@ static int oneDomainDestroy(virDomainPtr dom) /* VM not running, delete the instance at ONE DB */ if(c_oneFinalize(vm->pid)){ oneError(dom->conn, dom, VIR_ERR_OPERATION_INVALID, - _("Wrong state to perform action")); + "%s", _("Wrong state to perform action")); goto return_point; } } @@ -570,11 +570,11 @@ static int oneDomainSuspend(virDomainPtr dom) goto return_point; } oneError(dom->conn, dom, VIR_ERR_OPERATION_INVALID, - _("Wrong state to perform action")); + "%s", _("Wrong state to perform action")); goto return_point; } oneError(dom->conn,dom, VIR_ERR_OPERATION_INVALID, - _("domain is not running")); + "%s", _("domain is not running")); } else { oneError(dom->conn, dom, VIR_ERR_INVALID_DOMAIN, _("no domain with matching id %d"), dom->id); @@ -603,11 +603,11 @@ static int oneDomainResume(virDomainPtr dom) goto return_point; } oneError(dom->conn, dom, VIR_ERR_OPERATION_INVALID, - _("Wrong state to perform action")); + "%s", _("Wrong state to perform action")); goto return_point; } oneError(dom->conn,dom, VIR_ERR_OPERATION_INVALID, - _("domain is not paused ")); + "%s", _("domain is not paused")); } else { oneError(dom->conn, dom, VIR_ERR_INVALID_DOMAIN, _("no domain with matching id %d"), dom->id); diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index ea9555a..dfbc968 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -91,19 +91,19 @@ phypOpen(virConnectPtr conn, if (conn->uri->server == NULL) { PHYP_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - _("Missing server name in phyp:// URI")); + "%s", _("Missing server name in phyp:// URI")); return VIR_DRV_OPEN_ERROR; } if (conn->uri->path == NULL) { PHYP_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - _("Missing managed system name in phyp:// URI")); + "%s", _("Missing managed system name in phyp:// URI")); return VIR_DRV_OPEN_ERROR; } if (conn->uri->user == NULL) { PHYP_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - _("Missing username in phyp:// URI")); + "%s", _("Missing username in phyp:// URI")); return VIR_DRV_OPEN_ERROR; } @@ -150,13 +150,13 @@ phypOpen(virConnectPtr conn, if (escape_specialcharacters(conn->uri->path, string, len) == -1) { PHYP_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - _("Error parsing 'path'. Invalid characters.")); + "%s", _("Error parsing 'path'. Invalid characters.")); goto failure; } if ((session = openSSHSession(conn, auth, &internal_socket)) == NULL) { PHYP_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - _("Error while opening SSH session.")); + "%s", _("Error while opening SSH session.")); goto failure; } //conn->uri->path = string; @@ -314,7 +314,7 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth, LIBSSH2_ERROR_EAGAIN) ; if (rc) { PHYP_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - _("Failure establishing SSH session.")); + "%s", _("Failure establishing SSH session.")); goto disconnect; } @@ -344,7 +344,7 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth, if (!auth || !auth->cb) { PHYP_ERROR(conn, VIR_ERR_AUTH_FAILED, - _("No authentication callback provided.")); + "%s", _("No authentication callback provided.")); goto disconnect; } @@ -355,7 +355,7 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth, if (!hasPassphrase) { PHYP_ERROR(conn, VIR_ERR_AUTH_FAILED, - _("Required credentials are not supported.")); + "%s", _("Required credentials are not supported.")); goto disconnect; } @@ -364,7 +364,7 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth, if (res < 0) { PHYP_ERROR(conn, VIR_ERR_AUTH_FAILED, - _("Unable to fetch credentials.")); + "%s", _("Unable to fetch credentials.")); goto disconnect; } @@ -372,7 +372,7 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth, password = creds[0].result; } else { PHYP_ERROR(conn, VIR_ERR_AUTH_FAILED, - _("Unable to get password certificates")); + "%s", _("Unable to get password certificates")); goto disconnect; } @@ -383,7 +383,7 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth, if (rc) { PHYP_ERROR(conn, VIR_ERR_AUTH_FAILED, - _("Authentication failed")); + "%s", _("Authentication failed")); goto disconnect; } else goto exit; diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 4bfcce4..ed94bed 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -1316,14 +1316,14 @@ xenUnifiedDomainMigrateFinish (virConnectPtr dconn, domain_xml = xenDaemonDomainDumpXML (dom, 0, NULL); if (! domain_xml) { xenUnifiedError(dconn, VIR_ERR_MIGRATE_PERSIST_FAILED, - _("failed to get XML representation of migrated domain")); + "%s", _("failed to get XML representation of migrated domain")); goto failure; } dom_new = xenDaemonDomainDefineXML (dconn, domain_xml); if (! dom_new) { - xenUnifiedError (dconn, VIR_ERR_MIGRATE_PERSIST_FAILED, - _("failed to define domain on destination host")); + xenUnifiedError(dconn, VIR_ERR_MIGRATE_PERSIST_FAILED, + "%s", _("failed to define domain on destination host")); goto failure; } -- 1.6.0.4

2 2

[libvirt] [BUG] connection to vbox 3.1 fails
by Florian Vichot 07 Dec '09

07 Dec '09

Hello all, As confirmed on IRC by Matthias, when trying to open a connection of any sort (vbox:///session or vbox:///system) to the vbox driver with a VirtualBox 3.1 installed, the connection fails with: "internal error nsIEventQueue object is null" This is printed by line 726 in vbox_tmpl.c. This is with the 3.1 support patch commited earlier today. The driver with a VirtualBox version 3.0.8 or 3.0.12 works fine with that patch. Thanks, Florian

3 4