* docs/* libvirt.spec.in configure.in NEWS: preparing release of 0.1.7

Daniel
Really, fixed struct for getdomaininfo to work on both 3.0.2 & 3.0.3 on 32-bit archs this time.
2025-08-17 09:49:59 +03:00 · 2006-09-29 10:25:21 +00:00 · 2006-09-28 23:29:25 +00:00 · 2006-09-28 19:20:52 +00:00
11 changed files with 526 additions and 366 deletions
--- a/23
+++ b/23
@ -1,3 +1,26 @@
+Fri Sep 29 11:27:36 CEST 2006 Daniel Veillard <veillard@redhat.com>
+
+	* docs/* libvirt.spec.in configure.in NEWS: preparing release of 0.1.7
+
+Thu Sep 21 10:19:02 EDT 2006 Daniel Berrange <berrange@redhat.com>
+
+	* src/xen_internal.c: Fork different version of getdomaininfo struct for
+	Xen 3.0.2, and 3.0.3 because the shared_info_frame field is different
+	size on between these versions on 32-bit platforms. Make callers use
+	appropriate struct version matched to hypervisor version, hiding detail
+	in macros to aid readability. Cleanup whitespace to remove tabs. Disable
+	xenHypervisorGetVcpus completely in proxy since its not used.
+
+Thu Sep 21 10:19:02 EDT 2006 Daniel Berrange <berrange@redhat.com>
+
+	* src/xend_internal.c: Check if the physical CPU will fit in the maplen
+	provided by the caller when populating VCPU<->CPU mapping. This is because
+	XenD will return data for 32 physical CPUs, even if the box only has 4
+	CPUs. The caller of course will only have allocated a map big enough for
+	the actual number of physical CPUs. We simply check against maplen param
+	supplied by caller & discard info about CPUs which don't fit. Also santise
+	whitespace.
+
 Fri Sep 22 11:02:48 CEST 2006 Daniel Veillard <veillard@redhat.com>

 	* docs/* libvirt.spec.in configure.in NEWS: preparing release of 0.1.6
--- a/8
+++ b/8
@ -5,7 +5,13 @@
       http://libvirt.org/news.html

 Releases
-0.1.6: Sep 5 2006:
+0.1.7: Sep 29 2006:
+   -  fix a memory bug on getting vcpu informations from xend (Daniel Berrange)
+   -  fix another problem in the hypercalls change in Xen changeset
+       86d26e6ec89b when getting domain informations (Daniel Berrange)
+
+
+0.1.6: Sep 22 2006:
   - Support for localization of strings using gettext (Daniel Berrange)
   - Support for new Xen-3.0.3 cdrom and disk configuration (Daniel Berrange)
   - Support for setting VNC port when creating domains with new
--- a/configure.in
+++ b/configure.in
@ -5,7 +5,7 @@ AC_CANONICAL_HOST

 LIBVIRT_MAJOR_VERSION=0
 LIBVIRT_MINOR_VERSION=1
-LIBVIRT_MICRO_VERSION=6
+LIBVIRT_MICRO_VERSION=7
 LIBVIRT_MICRO_VERSION_SUFFIX=
 LIBVIRT_VERSION=$LIBVIRT_MAJOR_VERSION.$LIBVIRT_MINOR_VERSION.$LIBVIRT_MICRO_VERSION$LIBVIRT_MICRO_VERSION_SUFFIX
 LIBVIRT_VERSION_INFO=`expr $LIBVIRT_MAJOR_VERSION + $LIBVIRT_MINOR_VERSION`:$LIBVIRT_MICRO_VERSION:$LIBVIRT_MINOR_VERSION
--- a/docs/libvir.html
+++ b/docs/libvir.html
@ -33,7 +33,13 @@ development of libvirt, it is preferable when possible to just use the <a
 href="downloads.html">CVS version or snapshot</a>, contact the mailing list
 and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progresses.</p>

-<h3>0.1.6: Sep 5 2006</h3>
+<h3>0.1.7: Sep 29 2006</h3>
+<ul>
+  <li> fix a memory bug on getting vcpu informations from xend (Daniel Berrange)</li>
+  <li> fix another problem in the hypercalls change in Xen changeset
+       86d26e6ec89b when getting domain informations (Daniel Berrange)</li>
+</ul>
+<h3>0.1.6: Sep 22 2006</h3>
 <ul>
  <li>Support for localization of strings using gettext (Daniel Berrange)</li>
  <li>Support for new Xen-3.0.3 cdrom and disk configuration (Daniel Berrange)</li>
--- a/docs/news.html
+++ b/docs/news.html
@ -2,7 +2,10 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /><link rel="stylesheet" type="text/css" href="libvirt.css" /><link rel="SHORTCUT ICON" href="/32favicon.png" /><title>Releases</title></head><body><div id="container"><div id="intro"><div id="adjustments"></div><div id="pageHeader"></div><div id="content2"><h1 class="style1">Releases</h1><p>Here is the list of official releases, however since it is early on in the
 development of libvirt, it is preferable when possible to just use the <a href="downloads.html">CVS version or snapshot</a>, contact the mailing list
-and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progresses.</p><h3>0.1.6: Sep 5 2006</h3><ul><li>Support for localization of strings using gettext (Daniel Berrange)</li>
+and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progresses.</p><h3>0.1.7: Sep 29 2006</h3><ul><li> fix a memory bug on getting vcpu informations from xend (Daniel Berrange)</li>
+  <li> fix another problem in the hypercalls change in Xen changeset
+       86d26e6ec89b when getting domain informations (Daniel Berrange)</li>
+</ul><h3>0.1.6: Sep 22 2006</h3><ul><li>Support for localization of strings using gettext (Daniel Berrange)</li>
  <li>Support for new Xen-3.0.3 cdrom and disk configuration (Daniel Berrange)</li>
  <li>Support for setting VNC port when creating domains with new
      xend config files (Daniel Berrange) </li>
--- a/include/libvirt/libvirt.h
+++ b/include/libvirt/libvirt.h
@ -196,7 +196,7 @@ typedef virNodeInfo *virNodeInfoPtr;
 * version * 1,000,000 + minor * 1000 + micro
 */

-#define LIBVIR_VERSION_NUMBER 1006
+#define LIBVIR_VERSION_NUMBER 1007

 int			virGetVersion		(unsigned long *libVer,
 						 const char *type,
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@ -111,6 +111,10 @@ rm -fr %{buildroot}
 %doc docs/examples/python

 %changelog
+* Fri Sep 22 2007 Daniel Veillard <veillard@redhat.com> 0.1.7-1
+- Fix bug when running against xen-3.0.3 hypercalls
+- Fix memory bug when getting vcpus info from xend
+
 * Fri Sep 22 2006 Daniel Veillard <veillard@redhat.com> 0.1.6-1
 - Support for localization
 - Support for new Xen-3.0.3 cdrom and disk configuration
--- a/po/en_GB.po
+++ b/po/en_GB.po
@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libvirt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-21 17:03+0200\n"
+"POT-Creation-Date: 2006-09-29 11:28+0200\n"
 "PO-Revision-Date: 2006-09-20 10:20-0400\n"
 "Last-Translator: Daniel Berrange <berrange@redhat.com>\n"
 "Language-Team: English <en@li.org>\n"
@ -370,7 +370,7 @@ msgstr ""

 #: src/hash.c:628 src/hash.c:634 src/test.c:725 src/test.c:750 src/test.c:773
 #: src/test.c:797 src/xend_internal.c:1864 src/xend_internal.c:2560
-#: src/xend_internal.c:2768 src/xs_internal.c:592 src/proxy_internal.c:790
+#: src/xend_internal.c:2771 src/xs_internal.c:592 src/proxy_internal.c:790
 #: src/proxy_internal.c:837 src/proxy_internal.c:888
 msgid "allocating domain"
 msgstr ""
@ -543,17 +543,17 @@ msgstr ""
 msgid "failed to parse Xend domain information"
 msgstr ""

-#: src/xend_internal.c:2831
+#: src/xend_internal.c:2834
 #, c-format
 msgid "Failed to create domain %s\n"
 msgstr ""

-#: src/xend_internal.c:2837
+#: src/xend_internal.c:2840
 #, c-format
 msgid "Failed to get devices for domain %s\n"
 msgstr ""

-#: src/xend_internal.c:2848
+#: src/xend_internal.c:2851
 #, c-format
 msgid "Failed to resume new domain %s\n"
 msgstr ""
@ -1407,7 +1407,7 @@ msgstr ""
 msgid "got asynchronous packet number %d\n"
 msgstr ""

-#: src/xen_internal.c:1241
+#: src/xen_internal.c:1351
 #, c-format
 msgid "allocating %d domain info"
 msgstr ""
--- a/po/libvirt.pot
+++ b/po/libvirt.pot
@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-21 17:03+0200\n"
+"POT-Creation-Date: 2006-09-29 11:28+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@ -370,7 +370,7 @@ msgstr ""

 #: src/hash.c:628 src/hash.c:634 src/test.c:725 src/test.c:750 src/test.c:773
 #: src/test.c:797 src/xend_internal.c:1864 src/xend_internal.c:2560
-#: src/xend_internal.c:2768 src/xs_internal.c:592 src/proxy_internal.c:790
+#: src/xend_internal.c:2771 src/xs_internal.c:592 src/proxy_internal.c:790
 #: src/proxy_internal.c:837 src/proxy_internal.c:888
 msgid "allocating domain"
 msgstr ""
@ -543,17 +543,17 @@ msgstr ""
 msgid "failed to parse Xend domain information"
 msgstr ""

-#: src/xend_internal.c:2831
+#: src/xend_internal.c:2834
 #, c-format
 msgid "Failed to create domain %s\n"
 msgstr ""

-#: src/xend_internal.c:2837
+#: src/xend_internal.c:2840
 #, c-format
 msgid "Failed to get devices for domain %s\n"
 msgstr ""

-#: src/xend_internal.c:2848
+#: src/xend_internal.c:2851
 #, c-format
 msgid "Failed to resume new domain %s\n"
 msgstr ""
@ -1407,7 +1407,7 @@ msgstr ""
 msgid "got asynchronous packet number %d\n"
 msgstr ""

-#: src/xen_internal.c:1241
+#: src/xen_internal.c:1351
 #, c-format
 msgid "allocating %d domain info"
 msgstr ""
--- a/src/xen_internal.c
+++ b/src/xen_internal.c
--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@ -2653,7 +2653,7 @@ xenDaemonDomainPinVcpu(virDomainPtr domain, unsigned int vcpu,
 */
 int
 xenDaemonDomainGetVcpus(virDomainPtr domain, virVcpuInfoPtr info, int maxinfo,
-			unsigned char *cpumaps, int maplen)
+                        unsigned char *cpumaps, int maplen)
 {
    struct sexpr *root, *s, *t;
    virVcpuInfoPtr ipt = info;
@ -2662,14 +2662,14 @@ xenDaemonDomainGetVcpus(virDomainPtr domain, virVcpuInfoPtr info, int maxinfo,
    int vcpu, cpu;

    if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)
-     || (info == NULL) || (maxinfo < 1)) {
+        || (info == NULL) || (maxinfo < 1)) {
        virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG,
-	             __FUNCTION__);
+                     __FUNCTION__);
        return (-1);
    }
    if (cpumaps != NULL && maplen < 1) {
        virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG,
-	             __FUNCTION__);
+                     __FUNCTION__);
        return (-1);
    }
    root = sexpr_get(domain->conn, "/xend/domain/%s?op=vcpuinfo", domain->name);
@ -2677,46 +2677,49 @@ xenDaemonDomainGetVcpus(virDomainPtr domain, virVcpuInfoPtr info, int maxinfo,
        return (-1);

    if (cpumaps != NULL)
-	memset(cpumaps, 0, maxinfo * maplen);
+        memset(cpumaps, 0, maxinfo * maplen);

    /* scan the sexprs from "(vcpu (number x)...)" and get parameter values */
-    for (s = root; s->kind == SEXPR_CONS; s = s->cdr)
-     if ((s->car->kind == SEXPR_CONS) &&
-	 (s->car->car->kind == SEXPR_VALUE) &&
-	 !strcmp(s->car->car->value, "vcpu")) {
-        t = s->car;
-        vcpu = ipt->number = sexpr_int(t, "vcpu/number");
-        if ((oln = sexpr_int(t, "vcpu/online")) != 0) {
-            if (sexpr_int(t, "vcpu/running")) ipt->state = VIR_VCPU_RUNNING;
-            if (sexpr_int(t, "vcpu/blocked")) ipt->state = VIR_VCPU_BLOCKED;
-        }
-        else ipt->state = VIR_VCPU_OFFLINE;
-        ipt->cpuTime = sexpr_float(t, "vcpu/cpu_time") * 1000000000;
-        ipt->cpu = oln ? sexpr_int(t, "vcpu/cpu") : -1;
-
-	if (cpumaps != NULL && vcpu >= 0 && vcpu < maxinfo) {
-	    cpumap = (unsigned char *) VIR_GET_CPUMAP(cpumaps, maplen, vcpu);
-            /*
-	     * get sexpr from "(cpumap (x y z...))" and convert values
-	     * to bitmap
-	     */
-            for (t = t->cdr; t->kind == SEXPR_CONS; t = t->cdr)
-             if ((t->car->kind == SEXPR_CONS) &&
-	     	 (t->car->car->kind == SEXPR_VALUE) &&
-		 !strcmp(t->car->car->value, "cpumap") &&
-		 (t->car->cdr->kind == SEXPR_CONS)) {
-        	for (t = t->car->cdr->car; t->kind == SEXPR_CONS; t = t->cdr)
-        	 if (t->car->kind == SEXPR_VALUE) {
-                    cpu = strtol(t->car->value, NULL, 0);
-		    if (cpu >= 0)
-			VIR_USE_CPU(cpumap, cpu);
-        	}
-        	break;
+    for (s = root; s->kind == SEXPR_CONS; s = s->cdr) {
+        if ((s->car->kind == SEXPR_CONS) &&
+            (s->car->car->kind == SEXPR_VALUE) &&
+            !strcmp(s->car->car->value, "vcpu")) {
+            t = s->car;
+            vcpu = ipt->number = sexpr_int(t, "vcpu/number");
+            if ((oln = sexpr_int(t, "vcpu/online")) != 0) {
+                if (sexpr_int(t, "vcpu/running")) ipt->state = VIR_VCPU_RUNNING;
+                if (sexpr_int(t, "vcpu/blocked")) ipt->state = VIR_VCPU_BLOCKED;
            }
-	}
+            else
+                ipt->state = VIR_VCPU_OFFLINE;
+            ipt->cpuTime = sexpr_float(t, "vcpu/cpu_time") * 1000000000;
+            ipt->cpu = oln ? sexpr_int(t, "vcpu/cpu") : -1;

-        if (++nbinfo == maxinfo) break;
-        ipt++;
+            if (cpumaps != NULL && vcpu >= 0 && vcpu < maxinfo) {
+                cpumap = (unsigned char *) VIR_GET_CPUMAP(cpumaps, maplen, vcpu);
+                /*
+                 * get sexpr from "(cpumap (x y z...))" and convert values
+                 * to bitmap
+                 */
+                for (t = t->cdr; t->kind == SEXPR_CONS; t = t->cdr)
+                    if ((t->car->kind == SEXPR_CONS) &&
+                        (t->car->car->kind == SEXPR_VALUE) &&
+                        !strcmp(t->car->car->value, "cpumap") &&
+                        (t->car->cdr->kind == SEXPR_CONS)) {
+                        for (t = t->car->cdr->car; t->kind == SEXPR_CONS; t = t->cdr)
+                            if (t->car->kind == SEXPR_VALUE) {
+                                cpu = strtol(t->car->value, NULL, 0);
+                                if (cpu >= 0 && (VIR_CPU_MAPLEN(cpu+1) <= maplen)) {
+                                    VIR_USE_CPU(cpumap, cpu);
+                                }
+                            }
+                        break;
+                    }
+            }
+
+            if (++nbinfo == maxinfo) break;
+            ipt++;
+        }
    }
    sexpr_free(root);
    return(nbinfo);
Author	SHA1	Message	Date
Daniel Veillard	be13e2f45d	* docs/* libvirt.spec.in configure.in NEWS: preparing release of 0.1.7 Daniel	2006-09-29 10:25:21 +00:00
Daniel P. Berrange	26d1767317	Really, fixed struct for getdomaininfo to work on both 3.0.2 & 3.0.3 on 32-bit archs this time.	2006-09-28 23:29:25 +00:00
Daniel P. Berrange	01ae3678f1	Fixed buffer overflow in populating CPU<->VCPU mapping. Cleanup whitespace	2006-09-28 19:20:52 +00:00