[Libvirt-cim] [PATCH] Add in default scheduler parameters for Xen domains
# HG changeset patch
# User Dan Smith <danms(a)us.ibm.com>
# Date 1214582349 25200
# Node ID b123b6b1fb08c3ab956f1c33801e743e082192b9
# Parent edf96787c23dc7a91a008916b4b00b22fc22703a
Add in default scheduler parameters for Xen domains
This fixes the case where you don't specify them and they're assumed to
be zero (which is an invalid value for Xen's weight parameter).
diff -r edf96787c23d -r b123b6b1fb08 src/Virt_VirtualSystemManagementService.c
--- a/src/Virt_VirtualSystemManagementService.c Wed Jun 25 12:34:09 2008 -0700
+++ b/src/Virt_VirtualSystemManagementService.c Fri Jun 27 08:59:09 2008 -0700
@@ -55,6 +55,7 @@
#include "config.h"
#define DEFAULT_MAC_PREFIX "00:16:3e"
+#define DEFAULT_XEN_WEIGHT 1024
const static CMPIBroker *_BROKER;
@@ -471,9 +472,29 @@ static const char *proc_rasd_to_vdev(CMP
static const char *proc_rasd_to_vdev(CMPIInstance *inst,
struct virt_device *dev)
{
+ CMPIObjectPath *op = NULL;
+ CMPIrc rc;
+ uint32_t def_weight = 0;
+ uint64_t def_limit = 0;
+
cu_get_u64_prop(inst, "VirtualQuantity",
&dev->dev.vcpu.quantity);
- cu_get_u64_prop(inst, "Limit", &dev->dev.vcpu.limit);
- cu_get_u32_prop(inst, "Weight", &dev->dev.vcpu.weight);
+
+ op = CMGetObjectPath(inst, NULL);
+ if (op == NULL) {
+ CU_DEBUG("Unable to determine class of ProcRASD");
+ return NULL;
+ }
+
+ if (STARTS_WITH(CLASSNAME(op), "Xen"))
+ def_weight = DEFAULT_XEN_WEIGHT;
+
+ rc = cu_get_u64_prop(inst, "Limit", &dev->dev.vcpu.limit);
+ if (rc != CMPI_RC_OK)
+ dev->dev.vcpu.limit = def_limit;
+
+ rc = cu_get_u32_prop(inst, "Weight", &dev->dev.vcpu.weight);
+ if (rc != CMPI_RC_OK)
+ dev->dev.vcpu.weight = def_weight;
return NULL;
}