]> xenbits.xensource.com Git - libvirt.git/commitdiff
parallels: don't give null pointers to virBitmapEqual
authorDmitry Guryanov <dguryanov@parallels.com>
Wed, 26 Sep 2012 12:30:02 +0000 (16:30 +0400)
committerEric Blake <eblake@redhat.com>
Wed, 26 Sep 2012 14:49:41 +0000 (08:49 -0600)
Signed-off-by: Dmitry Guryanov <dguryanov@parallels.com>
src/parallels/parallels_driver.c

index 87e8cf52472d1765ba9277f2bbbfdd74af773b84..f4799f3976aeaaaa855eca3f4f70bd07520eddc6 100644 (file)
@@ -1445,7 +1445,9 @@ parallelsApplyChanges(virDomainObjPtr dom, virDomainDefPtr new)
         return -1;
     }
 
-    if (!virBitmapEqual(old->cpumask, new->cpumask)) {
+    if ((old->cpumask != NULL || new->cpumask != NULL) &&
+        (old->cpumask == NULL || new->cpumask == NULL ||
+        !virBitmapEqual(old->cpumask, new->cpumask))) {
 
         virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
                        _("changing cpu mask is not supported "
@@ -1465,7 +1467,9 @@ parallelsApplyChanges(virDomainObjPtr dom, virDomainDefPtr new)
 
     if (old->numatune.memory.mode != new->numatune.memory.mode ||
         old->numatune.memory.placement_mode != new->numatune.memory.placement_mode ||
-        !virBitmapEqual(old->numatune.memory.nodemask, new->numatune.memory.nodemask)) {
+        ((old->numatune.memory.nodemask != NULL || new->numatune.memory.nodemask != NULL) &&
+         (old->numatune.memory.nodemask == NULL || new->numatune.memory.nodemask == NULL ||
+        !virBitmapEqual(old->numatune.memory.nodemask, new->numatune.memory.nodemask)))){
 
         virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
                         _("numa parameters are not supported "