August 2009 - Devel - libvirt List Archives

[libvirt] [PATCH] Use virGetHostname instead of gethostname.
by Chris Lalancette 02 Aug '09

02 Aug '09

Fix up qemudDomainMigratePrepare2 to use virGetHostname instead of gethostname. Besides the fact that virGetHostname is far more clever, there was a latent bug in the handling that could cause a buffer overflow on a very long hostname. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/qemu_driver.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/qemu_driver.c b/src/qemu_driver.c index cee2164..83cbcf3 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -6270,11 +6270,12 @@ qemudDomainMigratePrepare2 (virConnectPtr dconn, virDomainDefPtr def = NULL; virDomainObjPtr vm = NULL; int this_port; - char hostname [HOST_NAME_MAX+1]; + char *hostname; char migrateFrom [64]; const char *p; virDomainEventPtr event = NULL; int ret = -1;; + int internalret; *uri_out = NULL; @@ -6300,14 +6301,16 @@ qemudDomainMigratePrepare2 (virConnectPtr dconn, if (port == QEMUD_MIGRATION_NUM_PORTS) port = 0; /* Get hostname */ - if (gethostname (hostname, HOST_NAME_MAX+1) == -1) { + if ((hostname = virGetHostname()) == NULL) { virReportSystemError (dconn, errno, "%s", _("failed to determine host name")); goto cleanup; } /* Caller frees */ - if (virAsprintf(uri_out, "tcp:%s:%d", hostname, this_port) < 0) { + internalret = virAsprintf(uri_out, "tcp:%s:%d", hostname, this_port); + VIR_FREE(hostname); + if (internalret < 0) { virReportOOMError (dconn); goto cleanup; } -- 1.6.0.6

2 2

[libvirt] [PATCH] Fix up a minor indentation issue with virDomainMigratePrepare.
by Chris Lalancette 02 Aug '09

02 Aug '09

Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/libvirt.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 7ecf1ec..167359f 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -3078,13 +3078,13 @@ error: */ int virDomainMigratePrepare (virConnectPtr dconn, - char **cookie, - int *cookielen, - const char *uri_in, - char **uri_out, - unsigned long flags, - const char *dname, - unsigned long bandwidth) + char **cookie, + int *cookielen, + const char *uri_in, + char **uri_out, + unsigned long flags, + const char *dname, + unsigned long bandwidth) { VIR_DEBUG("dconn=%p, cookie=%p, cookielen=%p, uri_in=%s, uri_out=%p, " "flags=%lu, dname=%s, bandwidth=%lu", dconn, cookie, cookielen, -- 1.6.0.6

2 2

[libvirt] [PATCH] Fix virCapabilitiesDefaultGuestMachine documentation.
by Chris Lalancette 02 Aug '09

02 Aug '09

Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/capabilities.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/capabilities.c b/src/capabilities.c index d186961..c6766b6 100644 --- a/src/capabilities.c +++ b/src/capabilities.c @@ -567,7 +567,7 @@ virCapabilitiesDefaultGuestMachine(virCapsPtr caps, } /** - * virCapabilitiesDefaultGuestMachine: + * virCapabilitiesDefaultGuestEmulator: * @caps: capabilities to query * @ostype: OS type to search for ('xen', 'hvm') * @arch: architecture to search for -- 1.6.0.6

2 2

[libvirt] [PATCH] Fix up a silly typo in apibuild.py.
by Chris Lalancette 02 Aug '09

02 Aug '09

Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- docs/apibuild.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/apibuild.py b/docs/apibuild.py index 6fec049..84bc1ac 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -39,7 +39,7 @@ ignored_functions = { "virDomainMigratePrepare": "private function for migration", "virDomainMigratePrepare2": "private function for migration", "virDrvSupportsFeature": "private function for remote access", - "DllMain": "specific function fo Win32", + "DllMain": "specific function for Win32", } def escape(raw): -- 1.6.0.6

2 2