- Devel - libvirt List Archives

[libvirt] [PATCH] spelling fix
by Aron Griffis 04 Aug '09

04 Aug '09

--- src/qemu_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu_conf.c b/src/qemu_conf.c index 4fe4e39..6b0b404 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -1970,7 +1970,7 @@ int qemudBuildCommandLine(virConnectPtr conn, if (def->nvideos) { if (def->nvideos > 1) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("only one video card is currentely supported")); + "%s", _("only one video card is currently supported")); goto error; }

1 0

[libvirt] PATCH: Fix escaping for 8-bit high characters
by Daniel P. Berrange 04 Aug '09

04 Aug '09

The virBufferEscapeString method has a broken test *cur > 0x20 which causes all 8-bit high characters to be lost as 'cur' is a signed char. This obviously dooms anyone using UTF-8 characters outside the boring old ASCII-7 range, like this guy https://bugzilla.redhat.com/show_bug.cgi?id=479517 Daniel diff --git a/src/buf.c b/src/buf.c index 259175d..c802aa2 100644 --- a/src/buf.c +++ b/src/buf.c @@ -304,7 +304,7 @@ virBufferEscapeString(const virBufferPtr buf, const char *format, const char *st *out++ = 'o'; *out++ = 's'; *out++ = ';'; - } else if ((*cur >= 0x20) || (*cur == '\n') || (*cur == '\t') || + } else if (((unsigned char)*cur >= 0x20) || (*cur == '\n') || (*cur == '\t') || (*cur == '\r')) { /* * default case, just copy ! -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 1

[libvirt] [PATCH] Remove ATTRIBUTE_UNUSED from flags to qemudDomainMigratePerform.
by Chris Lalancette 02 Aug '09

02 Aug '09

Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu_driver.c b/src/qemu_driver.c index eadb53f..9fcc07a 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -6424,7 +6424,7 @@ qemudDomainMigratePerform (virDomainPtr dom, const char *cookie ATTRIBUTE_UNUSED, int cookielen ATTRIBUTE_UNUSED, const char *uri, - unsigned long flags ATTRIBUTE_UNUSED, + unsigned long flags, const char *dname ATTRIBUTE_UNUSED, unsigned long resource) { -- 1.6.0.6

2 2

[libvirt] [PATCH] Add a comment about setting errors after qemudStartVMDaemon().
by Chris Lalancette 02 Aug '09

02 Aug '09

Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/qemu_driver.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/qemu_driver.c b/src/qemu_driver.c index fcfbfbc..eadb53f 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -6390,6 +6390,9 @@ qemudDomainMigratePrepare2 (virConnectPtr dconn, */ snprintf (migrateFrom, sizeof (migrateFrom), "tcp:0.0.0.0:%d", this_port); if (qemudStartVMDaemon (dconn, driver, vm, migrateFrom, -1) < 0) { + /* Note that we don't set an error here because qemudStartVMDaemon + * should have already done that. + */ if (!vm->persistent) { virDomainRemoveInactive(&driver->domains, vm); vm = NULL; -- 1.6.0.6

2 2

[libvirt] [PATCH] Fix an erroneous debug error to KVM; it should read QEMU/KVM.
by Chris Lalancette 02 Aug '09

02 Aug '09

Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 5f4b28b..fcfbfbc 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -6321,7 +6321,7 @@ qemudDomainMigratePrepare2 (virConnectPtr dconn, */ if (!STRPREFIX (uri_in, "tcp:")) { qemudReportError (dconn, NULL, NULL, VIR_ERR_INVALID_ARG, - "%s", _("only tcp URIs are supported for KVM migrations")); + "%s", _("only tcp URIs are supported for KVM/QEMU migrations")); goto cleanup; } -- 1.6.0.6

2 2

[libvirt] [PATCH] Convert a few stray users of free() in libvirt.c to VIR_FREE().
by Chris Lalancette 02 Aug '09

02 Aug '09

Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/libvirt.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 167359f..9fd864d 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -3020,7 +3020,7 @@ virDomainMigrate (virDomainPtr domain, ret = dconn->driver->domainMigratePrepare2 (dconn, &cookie, &cookielen, uri, &uri_out, flags, dname, bandwidth, dom_xml); - free (dom_xml); + VIR_FREE (dom_xml); if (ret == -1) goto done; if (uri == NULL && uri_out == NULL) { virLibConnError (conn, VIR_ERR_INTERNAL_ERROR, @@ -3062,8 +3062,8 @@ virDomainMigrate (virDomainPtr domain, } done: - free (uri_out); - free (cookie); + VIR_FREE (uri_out); + VIR_FREE (cookie); return ddomain; error: -- 1.6.0.6

2 2

[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