- Devel - libvirt List Archives

[libvirt] [PATCH] Remove two unused PATH_MAX-sized char arrays from the stack
by Matthias Bolte 19 Jan '11

19 Jan '11

--- src/storage/storage_driver.c | 16 ++-------------- src/uml/uml_driver.c | 8 ++------ 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 67d043b..5373025 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -127,9 +127,9 @@ storageDriverAutostart(virStorageDriverStatePtr driver) { * Initialization function for the QEmu daemon */ static int -storageDriverStartup(int privileged) { +storageDriverStartup(int privileged) +{ char *base = NULL; - char driverConf[PATH_MAX]; if (VIR_ALLOC(driverState) < 0) return -1; @@ -160,11 +160,6 @@ storageDriverStartup(int privileged) { /* Configuration paths are either ~/.libvirt/storage/... (session) or * /etc/libvirt/storage/... (system). */ - if (snprintf (driverConf, sizeof(driverConf), - "%s/storage.conf", base) == -1) - goto out_of_memory; - driverConf[sizeof(driverConf)-1] = '\0'; - if (virAsprintf(&driverState->configDir, "%s/storage", base) == -1) goto out_of_memory; @@ -175,13 +170,6 @@ storageDriverStartup(int privileged) { VIR_FREE(base); - /* - if (virStorageLoadDriverConfig(driver, driverConf) < 0) { - virStorageDriverShutdown(); - return -1; - } - */ - if (virStoragePoolLoadAllConfigs(&driverState->pools, driverState->configDir, driverState->autostartDir) < 0) diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 57f50f6..ef2a5b6 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -342,10 +342,10 @@ cleanup: * Initialization function for the Uml daemon */ static int -umlStartup(int privileged) { +umlStartup(int privileged) +{ uid_t uid = geteuid(); char *base = NULL; - char driverConf[PATH_MAX]; char *userdir = NULL; if (VIR_ALLOC(uml_driver) < 0) @@ -398,10 +398,6 @@ umlStartup(int privileged) { /* Configuration paths are either ~/.libvirt/uml/... (session) or * /etc/libvirt/uml/... (system). */ - if (snprintf (driverConf, sizeof(driverConf), "%s/uml.conf", base) == -1) - goto out_of_memory; - driverConf[sizeof(driverConf)-1] = '\0'; - if (virAsprintf(&uml_driver->configDir, "%s/uml", base) == -1) goto out_of_memory; -- 1.7.0.4

2 2

[libvirt] [PATCH] docs: add buildbot to the apps page
by Justin Clift 19 Jan '11

19 Jan '11

--- Should have probably included this in the previous commit, but didn't notice this BuildBot project until closing other browser windows. :/ docs/apps.html.in | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/docs/apps.html.in b/docs/apps.html.in index 153584c..054e8c2 100644 --- a/docs/apps.html.in +++ b/docs/apps.html.in @@ -23,6 +23,18 @@ <img src="madeWith.png" alt="Made with libvirt"/> </p> + <h2><a name="automatedtesting">Automated compile/testing</a></h2> + + <dl> + <dt><a href="http://buildbot.net">BuildBot</a></dt> + <dd> + BuildBot is a system to automate the compile/test cycle required + by most software projects. CVS commits trigger new builds, run on + a variety of client machines. Build status (pass/fail/etc) are + displayed on a web page or through other protocols. + </dd> + </dl> + <h2><a name="clientserver">Client/Server applications</a></h2> <dl> -- 1.7.3.5

2 2

[libvirt] [PATCH] docs: add new conversion heading to the apps listing
by Justin Clift 19 Jan '11

19 Jan '11

--- docs/apps.html.in | 43 +++++++++++++++++++++++++++++++++++++++---- 1 files changed, 39 insertions(+), 4 deletions(-) diff --git a/docs/apps.html.in b/docs/apps.html.in index 9a8ffc0..153584c 100644 --- a/docs/apps.html.in +++ b/docs/apps.html.in @@ -93,6 +93,40 @@ </dd> </dl> + <h2><a name="conversion">Conversion</a></h2> + + <dl> + <dt><a href="https://rwmj.wordpress.com/2009/10/13/poor-mans-p2v/">Poor mans p2v</a></dt> + <dd> + A simple approach for converting a physical machine to a virtual + machine, using a rescue CD. + </dd> + <dt><a href="http://et.redhat.com/~rjones/virt-p2v/">virt-p2v</a></dt> + <dd> + An older tool for converting a physical machine into a virtual + machine. It is a LiveCD which is booted on the machine to be + converted. It collects a little information from the user, then + copies the disks over to a remote machine and defines the XML for a + domain to run the guest. + </dd> + <dt><a href="http://git.fedorahosted.org/git/?p=virt-v2v.git;a=summary">virt-v2v</a></dt> + <dd> + virt-v2v converts guests from a foreign hypervisor to run on KVM, + managed by libvirt. It can currently convert Red Hat Enterprise + Linux (RHEL) and Fedora guests running on Xen and VMware ESX. It + will enable VirtIO drivers in the converted guest if possible. + </dd> + <dd> + For RHEL customers of Red Hat, conversion of Windows guests is also + possible. This conversion requires some Microsoft signed pieces, + that Red Hat can provide. + </dd> + <dt><a href="http://bazaar.launchpad.net/~ubuntu-virt/virt-goodies/trunk/annotate/head:/…">vmware2libvirt</a></dt> + <dd> + A Python script for migrating a vmware image to libvirt. + </dd> + </dl> + <h2><a name="desktop">Desktop applications</a></h2> <dl> @@ -134,10 +168,11 @@ <dl> <dt><a href="http://et.redhat.com/~rjones/virt-p2v/">virt-p2v</a></dt> <dd> - A tool for converting a physical machine into a virtual machine. It - is a LiveCD which is booted on the machine to be converted. It collects - a little information from the user, then copies the disks over to - a remote machine and defines the XML for a domain to run the guest. + An older tool for converting a physical machine into a virtual + machine. It is a LiveCD which is booted on the machine to be + converted. It collects a little information from the user, then + copies the disks over to a remote machine and defines the XML for a + domain to run the guest. </dd> </dl> -- 1.7.3.5

2 2

[libvirt] [PATCH] Fix startup with VNC password expiry on old QEMU
by Daniel P. Berrange 19 Jan '11

19 Jan '11

The code which set VNC passwords correctly had fallback for the set_password command, but was lacking it for the expire_password command. This made it impossible to start a guest. It also failed to check whether QEMU was still running after the initial 'set_password' command completed * src/qemu/qemu_hotplug.c: Fix error handling when password expiry fails * src/qemu/qemu_monitor_json.c, src/qemu/qemu_monitor_text.c: Fix return code for missing expire_password command --- src/qemu/qemu_hotplug.c | 12 ++++++++++++ src/qemu/qemu_monitor_json.c | 10 +++++++++- src/qemu/qemu_monitor_text.c | 4 ++-- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 7abdd0f..125d9b5 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1869,6 +1869,15 @@ qemuDomainChangeGraphicsPasswords(struct qemud_driver *driver, auth->passwd ? auth->passwd : defaultPasswd); } } + if (ret != 0) + goto cleanup; + + if (!virDomainObjIsActive(vm)) { + ret = -1; + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("guest unexpectedly quit")); + goto cleanup; + } if (auth->expires) { time_t lifetime = auth->validTo - now; @@ -1888,9 +1897,12 @@ qemuDomainChangeGraphicsPasswords(struct qemud_driver *driver, qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Expiry of passwords is not supported")); ret = -1; + } else { + ret = 0; } } +cleanup: qemuDomainObjExitMonitorWithDriver(driver, vm); return ret; diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 7387089..2e159c7 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1298,6 +1298,7 @@ cleanup: return ret; } +/* Returns -1 on error, -2 if not supported */ int qemuMonitorJSONExpirePassword(qemuMonitorPtr mon, const char *protocol, const char *expire_time) @@ -1313,9 +1314,16 @@ int qemuMonitorJSONExpirePassword(qemuMonitorPtr mon, ret = qemuMonitorJSONCommand(mon, cmd, &reply); - if (ret == 0) + if (ret == 0) { + if (qemuMonitorJSONHasError(reply, "CommandNotFound")) { + ret = -2; + goto cleanup; + } + ret = qemuMonitorJSONCheckError(cmd, reply); + } +cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); return ret; diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 291d958..4cf87fe 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -803,6 +803,7 @@ cleanup: return ret; } +/* Returns -1 on error, -2 if not supported */ int qemuMonitorTextExpirePassword(qemuMonitorPtr mon, const char *protocol, const char *expire_time) @@ -824,8 +825,7 @@ int qemuMonitorTextExpirePassword(qemuMonitorPtr mon, } if (strstr(reply, "unknown command:")) { - qemuReportError(VIR_ERR_NO_SUPPORT, - _("expiring password not supported by this qemu: %s"), reply); + ret = -2; goto cleanup; } -- 1.7.3.4

2 1

[libvirt] Libvirt Windows 0.8.7 installer available
by Justin Clift 19 Jan '11

19 Jan '11

Hi all, The Libvirt 0.8.7 installer for Windows is now available online: http://libvirt.org/sources/win32_experimental/Libvirt-0.8.7-2.exe Changes for this release include: + VirtualBox support on Windows, as added to the main Libvirt 0.8.7 release. I haven't personally tested this yet, so if someone has the time to test and report/confirm it's working, that would be really helpful. + There is now an option to update the system PATH with the libvirt binaries location, so they don't have to be copied around if you're using the .dlls elsewhere. + The README text has been tweaked to be less confusing for vSphere ESX users reading about TLS certificates All thoughts and feedback are welcome. :) Regards and best wishes, Justin Clift

1 0

[libvirt] [PATCH] docs: updated windows page for new 0.8.7 installer
by Justin Clift 19 Jan '11

19 Jan '11

--- docs/windows.html.in | 31 +++++++++++++++---------------- 1 files changed, 15 insertions(+), 16 deletions(-) diff --git a/docs/windows.html.in b/docs/windows.html.in index 9acf67d..4850a54 100644 --- a/docs/windows.html.in +++ b/docs/windows.html.in @@ -18,7 +18,7 @@ version is available here: </p> - <a href="http://libvirt.org/sources/win32_experimental/Libvirt-0.8.6-2.exe">http://libvirt.org/sources/win32_experimental/Libvirt-0.8.6-2.exe</a> + <a href="http://libvirt.org/sources/win32_experimental/Libvirt-0.8.7-2.exe">http://libvirt.org/sources/win32_experimental/Libvirt-0.8.7-2.exe</a> <p> <b>It is not production ready.</b> @@ -77,15 +77,6 @@ <br /><br /> </li> - <li> - Libvirt dll files should be added to path - <br /><br /> - At the moment, anything that needs to use the libvirt dll files - (i.e. the C# bindings) won't automatically find them. This can be - worked around by copying the dll files into the same directory as - whatever needs them, but is probably not an optimal approach. - There might be a better way and needs to be investigated. - </li> </ul> <h2><a name="conntypes">Connection types</h2> @@ -119,6 +110,12 @@ </p> <p> + <b>Special note</b> - Support for VirtualBox *on windows* was added in + libvirt 0.8.7, so reports on success and failure if you're using that + would be really helpful and appreciated. + </p> + + <p> <b>WARNING - The qemu+tcp:// connection type passes all traffic without encryption. This is a security hazard, and should <i>not</i> be used in security sensitive environments.</b> @@ -127,8 +124,9 @@ <h2><a name="esx">Connecting to VMware ESX/vSphere</h2> <p> - Details on the capabilities and connection string syntax used for - connecting to VMware ESX and vSphere can be found online here:<br /> + Details on the capabilities, certificates, and connection string + syntax used for connecting to VMware ESX and vSphere can be found + online here:<br /> </p> <a href="http://libvirt.org/drvesx.html">http://libvirt.org/drvesx.html</a> @@ -136,8 +134,9 @@ <h2><a name="tlscerts">TLS Certificates</h2> <p> - TLS certificates are needed prior to connecting to either QEMU - instances with TLS, or connecting to VMware ESX/vSphere. + TLS certificates need to have been created and placed in the correct + locations, before you will be able to connect to QEMU servers over + TLS. </p> <p> @@ -154,8 +153,8 @@ </p> <p> - The locations of the TLS certificates and key file are hard coded, - rather than being configurable. + The locations of the TLS certificates and key file on Windows are hard + coded, rather than being configurable. </p> <p> -- 1.7.3.5

2 2

[libvirt] [PATCH] Fix error reporting when machine type probe fails
by Daniel P. Berrange 19 Jan '11

19 Jan '11

Avoid overwriting the real error message with a generic OOM failure message, when machine type probe fails * src/qemu/qemu_driver.c: Don't overwrite error --- src/qemu/qemu_driver.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a1b9d2a..90429e5 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6322,10 +6322,8 @@ qemudCanonicalizeMachineDirect(virDomainDefPtr def, char **canonical) virCapsGuestMachinePtr *machines = NULL; int i, nmachines = 0; - if (qemuCapsProbeMachineTypes(def->emulator, &machines, &nmachines) < 0) { - virReportOOMError(); + if (qemuCapsProbeMachineTypes(def->emulator, &machines, &nmachines) < 0) return -1; - } for (i = 0; i < nmachines; i++) { if (!machines[i]->canonical) -- 1.7.3.4

2 1

[libvirt] Libvirt 0.8.7 installer ready for testing
by Justin Clift 19 Jan '11

19 Jan '11

Hi guys, Created the windows libvirt 0.8.7 installer using Matthias's updated scripting: http://libvirt.org/sources/win32_experimental/Libvirt-0.8.7-0.exe Does someone have time to test and confirm it's ok, before we point to it from the website? Arnaud, this version of the installer adds the virsh bin directory to the system PATH variable. So I'm thinking don't need to copy the libvirt dll's around, when using your C# bindings. If you've have time to test that, it would be great. Could then update the web page with that info. :) Regards and best wishes, Justin Clift

3 4

[libvirt] [PATCH] Avoid crash in security driver if model is NULL
by Daniel P. Berrange 19 Jan '11

19 Jan '11

If the XML security model is NULL, it is assumed that the current model will be used with dynamic labelling. The verify step is meaningless and potentially crashes if dereferencing NULL * src/security/security_manager.c: Skip NULL model on verify --- src/security/security_manager.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/security/security_manager.c b/src/security/security_manager.c index 66cffb5..1bc0ebb 100644 --- a/src/security/security_manager.c +++ b/src/security/security_manager.c @@ -309,6 +309,13 @@ int virSecurityManagerSetProcessLabel(virSecurityManagerPtr mgr, int virSecurityManagerVerify(virSecurityManagerPtr mgr, virDomainDefPtr def) { + /* NULL model == dynamic labelling, with whatever drive + * is active, so we can short circuit verify check to + * avoid drivers dereferencing NULLs by accident + */ + if (!secdef->model) + return 0; + if (mgr->drv->domainSecurityVerify) return mgr->drv->domainSecurityVerify(mgr, def); -- 1.7.3.4

2 1

[libvirt] [PATCH 0/3] Misc fixes/cleanups to libvirt API entry points
by Daniel P. Berrange 19 Jan '11

19 Jan '11

Just some misc fixes/cleanups i have queued against src/libvirt.c

2 6