Attachment 226355 Details for Bug 398932

[patch] Patch to fix divide by zero error in libvirt 0.4.0

nodeinfo.patch (text/plain), 1.50 KB, created by James Fehlig on 2008-07-07 20:41:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: James Fehlig

Created: 2008-07-07 20:41:15 UTC

Size: 1.50 KB

patch

obsolete

>Index: src/xend_internal.c
>===================================================================
>--- src/xend_internal.c.orig
>+++ src/xend_internal.c
>@@ -1907,6 +1907,9 @@ sexpr_to_xend_node_info(struct sexpr *ro
>     info->mhz = sexpr_int(root, "node/cpu_mhz");
>     info->nodes = sexpr_int(root, "node/nr_nodes");
>     info->sockets = sexpr_int(root, "node/sockets_per_node");
>+    info->cores = sexpr_int(root, "node/cores_per_socket");
>+    info->threads = sexpr_int(root, "node/threads_per_core");
>+
>     /* Xen 3.2.0 replaces sockets_per_node with 'nr_cpus'.
>      * Old Xen calculated sockets_per_node using its internal
>      * nr_cpus / (nodes*cores*threads), so fake it ourselves
>@@ -1914,15 +1917,16 @@ sexpr_to_xend_node_info(struct sexpr *ro
>      */
>     if (info->sockets == 0) {
>         int nr_cpus = sexpr_int(root, "node/nr_cpus");
>-        info->sockets = nr_cpus / (info->nodes * info->cores * info->threads);
>-        /* Should already be fine, but for sanity make
>+        int procs = info->nodes * info->cores * info->threads;
>+        if (procs == 0) /* Sanity check in case of Xen bugs in futures..*/
>+            return (-1);
>+        info->sockets = nr_cpus / procs;
>+        /* Should already be fine, but for further sanity make
>          * sure we have at least one socket
>          */
>         if (info->sockets == 0)
>             info->sockets = 1;
>     }
>-    info->cores = sexpr_int(root, "node/cores_per_socket");
>-    info->threads = sexpr_int(root, "node/threads_per_core");
>     return (0);
> }
>

Actions: View | Diff

Attachments on bug 398932: 226355 | 226358 | 226359