- CIM - libvirt List Archives

[PATCH] Make configure check for broken sblim-cmpi-devel version
by Dan Smith 15 Nov '07

15 Nov '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1195078948 28800 # Node ID 9cfd20d3be0e65d695f6b1ea5b4104c695219aab # Parent 6e221b0af2f4a16fee34213bb6d46a0a3eec4227 Make configure check for broken sblim-cmpi-devel version The sblim version of cmpift.h is broken. We can detect this by checking that the size of the structure on 64-bit platforms meets the CMPI standard of 160 bytes. When sblim fixes their version, this test will start to pass. Testing of this would be appreciated, especially if someone with a 32-bit machine could give it a whirl. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 6e221b0af2f4 -r 9cfd20d3be0e acinclude.m4 --- a/acinclude.m4 Wed Nov 14 11:04:52 2007 +0100 +++ b/acinclude.m4 Wed Nov 14 14:22:28 2007 -0800 @@ -71,3 +71,24 @@ AC_DEFUN([CHECK_CMPI], fi ] ) + +AC_DEFUN([CHECK_BROKEN_CMPIFT], + [ + AC_MSG_CHECKING(for a broken cmpift.h) + AC_RUN_IFELSE([ + #include <cmpift.h> + + int main(void) { + if ((sizeof(unsigned long) == 8) && + (sizeof(struct _CMPIBrokerFT) != 160)) + return 1; + else + return 0; + } + ],[ + AC_MSG_RESULT(no) + ],[ + AC_MSG_ERROR(You have a broken cmpift.h header. Is a broken version of sblim-cmpi-devel installed?) + ] +)]) + diff -r 6e221b0af2f4 -r 9cfd20d3be0e configure.ac --- a/configure.ac Wed Nov 14 11:04:52 2007 +0100 +++ b/configure.ac Wed Nov 14 14:22:28 2007 -0800 @@ -57,6 +57,8 @@ CFLAGS_STRICT="-Werror" CFLAGS_STRICT="-Werror" AC_SUBST(CFLAGS_STRICT) +CHECK_BROKEN_CMPIFT + echo "" echo "Build Embedded Object parser: $eoparser" echo ""

2 4

[PATCH 0 of 3] Adding ElementSettingData.
by Kaitlin Rupert 15 Nov '07

15 Nov '07

Cleaned up previous patch - removed buggy InstanceID parsing code from ElementSettingData. Created a new function in libxutil/misc_util.c based on the InstanceID parsing of VSSDComponent. Enhanced parse_id() functionality to return both pfx and name. Added a parse_instanceid() wrapper function.

2 4

[PATCH 0 of 2] ECTP now takes care of Xen and KVM specific requests
by Heidi Eckhart 15 Nov '07

15 Nov '07

Changes to association ElementConformsToProfile mof and sources to take care of Xen and KVM specific requests.

4 6

[PATCH] [RFC] Transition back to connect_by_classname()
by Dan Smith 15 Nov '07

15 Nov '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1195080791 28800 # Node ID cfb48c67f1e611f10003a6c17ba458080f9d76f4 # Parent c9e977e820e99070f0c0c0397061229f7382ac7b [RFC] Transition back to connect_by_classname() Previously, we used the incoming reference for all operations to determine the URI to pass to libvirt during a connect operation. For some reason, we transitioned away from that to a detection-based mechanism, which would not support multiple technologies to be managed from the provider simultaneously. I think that we have enough other infrastructure in place now that this is no longer a problem. As a test, I offer this patch with a few key instances of lv_connect() replaced with connect_by_classname() for discussion. I have tested that enumeration of Xen_ComputerSystem, KVM_ComputerSystem, and CIM_ComputerSystem are exclusive, and do not return any duplicate results. Further, I have confirmed that resolving Xen_SystemDevice against a KVM_ComputerSystem instance does not work, and that no duplicate results are returned in the case of CIM_SystemDevice. If this looks okay to people (and wider testing supports my findings), I propose we start to convert uses of lv_connect() back to per-class connections until we encounter a problem. Comments welcome. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r c9e977e820e9 -r cfb48c67f1e6 libxkutil/misc_util.c --- a/libxkutil/misc_util.c Wed Nov 14 13:06:06 2007 +0100 +++ b/libxkutil/misc_util.c Wed Nov 14 14:53:11 2007 -0800 @@ -64,6 +64,8 @@ virConnectPtr connect_by_classname(const return NULL; } + CU_DEBUG("Connecting to libvirt with uri `%s'", uri); + conn = virConnectOpen(uri); if (!conn) { CMSetStatusWithChars(broker, s, @@ -334,28 +336,21 @@ bool provider_is_responsible(const CMPIB const CMPIObjectPath *reference, CMPIStatus *status) { - const char *dft_pfx; char *pfx; - bool rc = false; + bool rc = true; CMSetStatus(status, CMPI_RC_OK); pfx = class_prefix_name(CLASSNAME(reference)); - if (STREQC(pfx, "CIM")) + if (STREQC(pfx, "CIM")) { cu_statusf(broker, status, CMPI_RC_ERR_FAILED, "Please exactly specify the class (check CIMOM behavior!): %s", CLASSNAME(reference)); - - dft_pfx = default_prefix(); - if (dft_pfx == NULL) - goto out; - - if (STREQC(pfx, dft_pfx)) - rc = true; - - out: + rc = false; + } + free(pfx); return rc; } diff -r c9e977e820e9 -r cfb48c67f1e6 src/Virt_ComputerSystem.c --- a/src/Virt_ComputerSystem.c Wed Nov 14 13:06:06 2007 +0100 +++ b/src/Virt_ComputerSystem.c Wed Nov 14 14:53:11 2007 -0800 @@ -346,7 +346,7 @@ static CMPIStatus return_enum_domains(co if (!provider_is_responsible(_BROKER, reference, &s)) return s; - conn = lv_connect(_BROKER, &s); + conn = connect_by_classname(_BROKER, CLASSNAME(reference), &s); if (conn == NULL) return s; @@ -386,7 +386,7 @@ static CMPIStatus get_domain(const CMPIO return s; } - conn = lv_connect(_BROKER, &s); + conn = connect_by_classname(_BROKER, CLASSNAME(reference), &s); if (conn == NULL) return s; @@ -609,7 +609,7 @@ static CMPIStatus __state_change(char *n virDomainPtr dom = NULL; virDomainInfo info; - conn = lv_connect(_BROKER, &s); + conn = connect_by_classname(_BROKER, CLASSNAME(ref), &s); if (conn == NULL) goto out; diff -r c9e977e820e9 -r cfb48c67f1e6 src/Virt_SystemDevice.c --- a/src/Virt_SystemDevice.c Wed Nov 14 13:06:06 2007 +0100 +++ b/src/Virt_SystemDevice.c Wed Nov 14 14:53:11 2007 -0800 @@ -61,6 +61,7 @@ static int get_dom_devices(const char *n static int get_dom_devices(const char *name, struct inst_list *list, int type, + const char *host_cn, const char *ns) { virConnectPtr conn = NULL; @@ -68,7 +69,7 @@ static int get_dom_devices(const char *n CMPIStatus s; int ret = 0; - conn = lv_connect(_BROKER, &s); + conn = connect_by_classname(_BROKER, host_cn, &s); if (conn == NULL) goto out; @@ -87,17 +88,19 @@ static int get_dom_devices(const char *n static int get_all_devices(const char *name, struct inst_list *list, - char *ns) + const char *host_cn, + const char *ns) { int i; for (i = 0; i < DEV_TYPE_COUNT; i++) - get_dom_devices(name, list, device_types[i], ns); + get_dom_devices(name, list, device_types[i], host_cn, ns); return i; } static CMPIInstance *host_instance(char *name, + const char *host_cn, const char *ns) { CMPIInstance *inst = NULL; @@ -114,7 +117,7 @@ static CMPIInstance *host_instance(char if ((s.rc != CMPI_RC_OK) || CMIsNullObject(op)) goto out; - conn = lv_connect(_BROKER, &s); + conn = connect_by_classname(_BROKER, host_cn, &s); if (conn == NULL) goto out; @@ -173,9 +176,16 @@ static CMPIStatus sys_to_dev(const CMPIO type = device_type_from_classname(info->result_class); - ret = get_dom_devices(host, list, type, NAMESPACE(ref)); + ret = get_dom_devices(host, + list, + type, + CLASSNAME(ref), + NAMESPACE(ref)); } else { - ret = get_all_devices(host, list, NAMESPACE(ref)); + ret = get_all_devices(host, + list, + CLASSNAME(ref), + NAMESPACE(ref)); } if (ret >= 0) { @@ -218,6 +228,7 @@ static CMPIStatus dev_to_sys(const CMPIO } sys = host_instance(host, + CLASSNAME(ref), NAMESPACE(ref)); if (sys == NULL)

2 2

[PATCH 0 of 3] Adding ElementSettingData.
by Kaitlin Rupert 15 Nov '07

15 Nov '07

Cleaned up previous patch - removed buggy InstanceID parsing code from ElementSettingData. Created a new function in libxutil/misc_util.c based on the InstanceID parsing of VSSDComponent. Cleaned up other bugs / style issues as well.

3 7

[PATCH] Make QEMU and Xen NIC limits configure'able
by Dan Smith 15 Nov '07

15 Nov '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1195085880 28800 # Node ID 670294145fcc1a786594f5110e2248cd4ec0b7ed # Parent 7a96c19a305233cccd1075cd96fea207954e4890 Make QEMU and Xen NIC limits configure'able Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 7a96c19a3052 -r 670294145fcc configure.ac --- a/configure.ac Wed Nov 14 15:03:42 2007 -0500 +++ b/configure.ac Wed Nov 14 16:18:00 2007 -0800 @@ -34,6 +34,22 @@ AC_ARG_VAR([LIBVIRTDIR],[the directory w AC_ARG_VAR([LIBVIRTDIR],[the directory where the libvirt package is installed.]) AC_ARG_VAR([TESTSUITEDIR],[the directory where the SBLIM testsuite is installed. ]) + +AC_ARG_WITH([kvm-max-nics], + AC_HELP_STRING([--with-kvm-max-nics=X], + [Maximum NICs to advertise for KVM]), + [test "x$withval" != "x" && KVM_MAX_NICS=$withval], + [KVM_MAX_NICS=8]) +AC_SUBST(KVM_MAX_NICS) +AC_DEFINE_UNQUOTED(KVM_MAX_NICS, $KVM_MAX_NICS, [Maximum NIC limit for KVM]) + +AC_ARG_WITH([xen-max-nics], + AC_HELP_STRING([--with-xen-max-nics=X], + [Maximum NIC limit to advertise for Xen (unless known by the provider)]), + [test "x$withval" != "x" && XEN_MAX_NICS=$withval], + [XEN_MAX_NICS=8]) +AC_SUBST(XEN_MAX_NICS) +AC_DEFINE_UNQUOTED(XEN_MAX_NICS, $XEN_MAX_NICS, [Maximum NIC limit for Xen]) AC_ARG_WITH([namespace], AC_HELP_STRING([--with-namespace=ns], diff -r 7a96c19a3052 -r 670294145fcc src/Virt_SettingsDefineCapabilities.c --- a/src/Virt_SettingsDefineCapabilities.c Wed Nov 14 15:03:42 2007 -0500 +++ b/src/Virt_SettingsDefineCapabilities.c Wed Nov 14 16:18:00 2007 -0800 @@ -336,7 +336,7 @@ static uint16_t net_max_kvm(const CMPIOb CMPIStatus *s) { /* This appears to not require anything dynamic. */ - return 32; + return KVM_MAX_NICS; } static uint16_t net_max_xen(const CMPIObjectPath *ref, CMPIStatus *s) @@ -364,7 +364,7 @@ static uint16_t net_max_xen(const CMPIOb } if (version >= 3001000) - num_nics = 8; + num_nics = XEN_MAX_NICS; else num_nics = 4;

2 1

[PATCH] Make net_max callback smarter
by Jay Gagnon 15 Nov '07

15 Nov '07

# HG changeset patch # User Jay Gagnon <grendel(a)linux.vnet.ibm.com> # Date 1195070622 18000 # Node ID cf3c1b32e71d9a95b3c95ebf3f3622bd39a4a4e3 # Parent 1828b3b30fe476fbae1bf31d99c999ba548911f5 Make net_max callback smarter. Xen 3.0.x supports up to 4 Xen 3.1.x supports up to 8 KVM supports up to 32 Also move a goto that was placed rather poorly. Signed-off-by: Jay Gagnon <grendel(a)linux.vnet.ibm.com> diff -r 1828b3b30fe4 -r cf3c1b32e71d src/Virt_SettingsDefineCapabilities.c --- a/src/Virt_SettingsDefineCapabilities.c Tue Nov 13 11:39:22 2007 -0800 +++ b/src/Virt_SettingsDefineCapabilities.c Wed Nov 14 15:03:42 2007 -0500 @@ -332,27 +332,80 @@ static struct sdc_rasd_prop *net_min(con return rasd; } -static int net_max_xen(const CMPIObjectPath *ref, - CMPIStatus *s) -{ - /* No dynamic lookup for now. */ - return 6; +static uint16_t net_max_kvm(const CMPIObjectPath *ref, + CMPIStatus *s) +{ + /* This appears to not require anything dynamic. */ + return 32; +} +static uint16_t net_max_xen(const CMPIObjectPath *ref, + CMPIStatus *s) +{ + int rc; + virConnectPtr conn; + unsigned long version; + uint16_t num_nics = -1; + + conn = lv_connect(_BROKER, s); + if (s->rc != CMPI_RC_OK) { + cu_statusf(_BROKER, s, + CMPI_RC_ERR_FAILED, + "Could not get connection."); + goto out; + } + + rc = virConnectGetVersion(conn, &version); + CU_DEBUG("libvir : version=%ld, rc=%d", version, rc); + if (rc != 0) { + cu_statusf(_BROKER, s, + CMPI_RC_ERR_FAILED, + "Could not get xen version."); + goto out; + } + + if (version >= 3001000) + num_nics = 8; + else + num_nics = 4; + + out: + virConnectClose(conn); + return num_nics; } static struct sdc_rasd_prop *net_max(const CMPIObjectPath *ref, CMPIStatus *s) { bool ret; + char *prefix; uint16_t num_nics; struct sdc_rasd_prop *rasd = NULL; - /* TODO: relevant functions for KVM etc. and dispatch code. */ - num_nics = net_max_xen(ref, s); + prefix = class_prefix_name(CLASSNAME(ref)); + if (prefix == NULL) { + cu_statusf(_BROKER, s, + CMPI_RC_ERR_FAILED, + "Could not get prefix from reference."); + goto out; + } + + if (STREQC(prefix, "Xen")) { + num_nics = net_max_xen(ref, s); + } else if (STREQC(prefix, "KVM")) { + num_nics = net_max_kvm(ref, s); + } else { + cu_statusf(_BROKER, s, + CMPI_RC_ERR_NOT_SUPPORTED, + "Unsupported hypervisor: '%s'", prefix); + goto out; + } + + if (s->rc != CMPI_RC_OK) { - goto out; cu_statusf(_BROKER, s, CMPI_RC_ERR_FAILED, "Could not get max nic count"); + goto out; } struct sdc_rasd_prop tmp[] = { @@ -368,6 +421,7 @@ static struct sdc_rasd_prop *net_max(con "Could not copy RASD."); } out: + free(prefix); return rasd; }

2 2

[PATCH] Fix crash and/or error when diskpool.conf does not exist
by Dan Smith 14 Nov '07

14 Nov '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1195073495 28800 # Node ID 7798be3698b4a53c1301dc3e3f4a4bfd1bc9e37b # Parent d2bcdde08df6080caa9ae8d152d516d232fb6345 Fix crash and/or error when diskpool.conf does not exist Previously, a missing diskpool configuration file returned an error, which prevented enumeration of all CIM_ResourcePool objects. This changes that behavior to consider a lack of a diskpool.conf file to mean "no disk pools have been defined", equivalent to how a lack of bridges indicates that no network pools have been defined. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r d2bcdde08df6 -r 7798be3698b4 src/Virt_DevicePool.c --- a/src/Virt_DevicePool.c Tue Nov 13 14:18:17 2007 -0800 +++ b/src/Virt_DevicePool.c Wed Nov 14 12:51:35 2007 -0800 @@ -505,18 +505,14 @@ static CMPIStatus diskpool_instance(virC const char *id, const CMPIBroker *broker) { - CMPIStatus s; + CMPIStatus s = {CMPI_RC_OK, NULL}; struct disk_pool *pools = NULL; int count = 0; int i; count = get_diskpool_config(&pools); - if ((id == NULL) && (count == 0)) { - cu_statusf(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "No such pool `%s'", id); - goto out; - } + if ((id == NULL) && (count == 0)) + return s; for (i = 0; i < count; i++) { CMPIInstance *pool; @@ -533,8 +529,6 @@ static CMPIStatus diskpool_instance(virC inst_list_add(list, pool); } - CMSetStatus(&s, CMPI_RC_OK); - out: free_diskpool(pools, count); return s;

2 1

[PATCH 0 of 2] Adding ElementSettingData.
by Kaitlin Rupert 14 Nov '07

14 Nov '07

2 3

[PATCH] compare_ref retrieves key count from internal data
by Heidi Eckhart 14 Nov '07

14 Nov '07

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1195034692 -3600 # Node ID 785993875a6598c153829a3cfcb5e1088da9971a # Parent c3f816e3ab5ff2a17500d8b48ec601ade58da988 compare_ref retrieves key count from internal data The cu_compare_ref retrieves the key count out of the internal data struct now, instead of the client given object path. Fixes the academical case that a client does not submit the correct number of keys. Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r c3f816e3ab5f -r 785993875a65 instance_util.c --- a/instance_util.c Tue Nov 13 15:33:06 2007 -0500 +++ b/instance_util.c Wed Nov 14 11:04:52 2007 +0100 @@ -89,59 +89,59 @@ static bool _compare_data(const CMPIData } static bool _compare_classname(const CMPIObjectPath *ref, - const CMPIInstance *inst) + const CMPIObjectPath *op) { const char *ref_cn; - const char *inst_cn; - CMPIObjectPath *op; - CMPIStatus s; - - op = CMGetObjectPath(inst, &s); - if ((op == NULL) || (s.rc != CMPI_RC_OK)) - return false; - + const char *op_cn; + ref_cn = CLASSNAME(ref); if (ref_cn == NULL) return false; - - inst_cn = CLASSNAME(op); - if (inst_cn == NULL) + + op_cn = CLASSNAME(op); + if (op_cn == NULL) return false; - - return STREQC(inst_cn, ref_cn); + + return STREQC(op_cn, ref_cn); } const char *cu_compare_ref(const CMPIObjectPath *ref, const CMPIInstance *inst) { + CMPIStatus s = {CMPI_RC_OK, NULL}; + CMPIObjectPath *op; + const char *prop = NULL; int i; - CMPIStatus s; int count; - const char *prop = NULL; - count = CMGetKeyCount(ref, &s); + op = CMGetObjectPath(inst, &s); + if ((op == NULL) || (s.rc != CMPI_RC_OK)) + return NULL; + + if (!_compare_classname(ref, op)) + return "CreationClassName"; + + count = CMGetKeyCount(op, &s); if (s.rc != CMPI_RC_OK) { CU_DEBUG("Unable to get key count"); return NULL; } - - if (!_compare_classname(ref, inst)) - return "CreationClassName"; - + CU_DEBUG("Number of keys: %i", count); + for (i = 0; i < count; i++) { CMPIData kd, pd; CMPIString *str; - kd = CMGetKeyAt(ref, i, &str, &s); + kd = CMGetKeyAt(op, i, &str, &s); if (s.rc != CMPI_RC_OK) { CU_DEBUG("Failed to get key %i", i); goto out; } prop = CMGetCharPtr(str); - CU_DEBUG("Comparing key `%s'", prop); + CU_DEBUG("Comparing key %i: `%s'", i, prop); - pd = CMGetProperty(inst, prop, &s); + pd = CMGetKey(ref, prop, &s); if (s.rc != CMPI_RC_OK) { CU_DEBUG("Failed to get property `%s'", prop); goto out;

2 1