[PATCH] Changes to install bits to support IBM Systems Director's CIMOM
by Dan Smith
# HG changeset patch
# User Dan Smith <danms(a)us.ibm.com>
# Date 1201291292 28800
# Node ID 923cd4127ac176a0c8db644774327fde4cd00749
# Parent a962a1290d72394d22810f83e4189b27d5b14cbc
Changes to install bits to support IBM Systems Director's CIMOM
Signed-off-by: Dan Smith <danms(a)us.ibm.com>
diff -r a962a1290d72 -r 923cd4127ac1 base_schema/install_base_schema.sh.in
--- a/base_schema/install_base_schema.sh.in Fri Jan 25 12:43:47 2008 -0500
+++ b/base_schema/install_base_schema.sh.in Fri Jan 25 12:01:32 2008 -0800
@@ -24,7 +24,7 @@ fix_schema() {
}
detect_peg_repo() {
- dirs="$PEGASUS_HOME /var/lib/Pegasus /var/lib/pegasus /usr/local/var/lib/pegasus /var/local/lib/pegasus /var/opt/tog-pegasus"
+ dirs="$PEGASUS_HOME /var/lib/Pegasus /var/lib/pegasus /usr/local/var/lib/pegasus /var/local/lib/pegasus /var/opt/tog-pegasus /opt/ibm/icc/cimom"
for d in $dirs; do
if [ -d "$d" ]; then
@@ -135,4 +135,4 @@ if [ -f "$DEBUG" ]; then
echo "-- base schema install log begin --"
cat $DEBUG
echo "-- base schema install log end --"
-fi
\ No newline at end of file
+fi
diff -r a962a1290d72 -r 923cd4127ac1 provider-register.sh
--- a/provider-register.sh Fri Jan 25 12:43:47 2008 -0500
+++ b/provider-register.sh Fri Jan 25 12:01:32 2008 -0800
@@ -7,7 +7,7 @@ pegasus_repository()
pegasus_repository()
{
for p in $PEGASUS_HOME /var/lib/Pegasus /var/lib/pegasus /usr/local/var/lib/pegasus \
- /var/local/lib/pegasus /var/opt/tog-pegasus
+ /var/local/lib/pegasus /var/opt/tog-pegasus /opt/ibm/icc/cimom
do
if test -d $p/repository
then
@@ -21,7 +21,7 @@ pegasus_path()
pegasus_path()
{
for p in $PEGASUS_HOME/bin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin \
- /opt/tog-pegasus/bin /opt/tog-pegasus/sbin
+ /opt/tog-pegasus/bin /opt/tog-pegasus/sbin /opt/ibm/icc/cimom/bin
do
if test -x $p/$1
then
16 years, 7 months
[PATCH] (#2ish) Fix for libvirt-0.4.0
by Jay Gagnon
# HG changeset patch
# User Jay Gagnon <grendel(a)linux.vnet.ibm.com>
# Date 1201283027 18000
# Node ID 26461f17fbb4b37d14bf74c82064383753dcedd9
# Parent adf18661f7948a0287a4586d97572793e8e03826
(#2ish) Fix for libvirt-0.4.0
Little tough for Dan to test that one since the #define doesn't even happen on his system, but the patch was light one semicolon. :)
Signed-off-by: Jay Gagnon <grendel(a)linux.vnet.ibm.com>
diff -r adf18661f794 -r 26461f17fbb4 libxkutil/device_parsing.c
--- a/libxkutil/device_parsing.c Thu Jan 24 12:56:45 2008 +0100
+++ b/libxkutil/device_parsing.c Fri Jan 25 12:43:47 2008 -0500
@@ -856,7 +856,11 @@ static int _change_device(virDomainPtr d
{
char *xml = NULL;
int ret = 0;
+#if LIBVIR_VERSION_NUMBER >= 4000
+ int (*func)(virDomainPtr, const char *);
+#else
int (*func)(virDomainPtr, char *);
+#endif
if (attach)
func = virDomainAttachDevice;
16 years, 7 months
[PATCH] Fix build error due to API change in libvirt-0.4.0
by Dan Smith
# HG changeset patch
# User Dan Smith <danms(a)us.ibm.com>
# Date 1201281767 28800
# Node ID 8b00e1a3a4965a7aaefa44804a285ec9866c60a9
# Parent 5b0ceff57c8a4c9e1095da57267e2362df8f3c2d
Fix build error due to API change in libvirt-0.4.0
I don't have a libvirt-0.4.0 installation handy, so if someone could test
this out, I'd appreciate it.
Signed-off-by: Dan Smith <danms(a)us.ibm.com>
diff -r 5b0ceff57c8a -r 8b00e1a3a496 libxkutil/device_parsing.c
--- a/libxkutil/device_parsing.c Fri Jan 25 08:41:47 2008 -0800
+++ b/libxkutil/device_parsing.c Fri Jan 25 09:22:47 2008 -0800
@@ -856,7 +856,11 @@ static int _change_device(virDomainPtr d
{
char *xml = NULL;
int ret = 0;
+#if LIBVIR_VERSION_NUMBER >= 4000
+ int (*func)(virDomainPtr, const char *)
+#else
int (*func)(virDomainPtr, char *);
+#endif
if (attach)
func = virDomainAttachDevice;
16 years, 7 months
[PATCH 0 of 2] Finish up ComputerSystemIndication
by Jay Gagnon
These two patches should be what we need to put the check mark next to ComputerSystemIndication. The first deals with a potential disaster that is essentially a race condition somewhere in the libvirt/xend region. The second adds the Modified trigger to VSMS and, since our usage model relies much more on the trigger than the polling loop, increases the event loop wait time to three minutes (feel free to throw out any other suggestions for that number).
Comments are welcome on the first patch; I think it's a pretty good solution but if anyone thinks it can be improved we can certainly talk about it.
16 years, 7 months
[PATCH 0 of 2] Enable ECTP's multiple namespace capability
by Heidi Eckhart
To enable the multiple namespace capability of the ElementConformsToProfile association it was necessary to
1) enable provider_register script for multiple namespace registration
2) register ECTP to root/virt
3) fix minor namespace bug in ECTP
16 years, 7 months
[PATCH] Fix VSMS.RemoveResources()
by Dan Smith
# HG changeset patch
# User Dan Smith <danms(a)us.ibm.com>
# Date 1201028159 28800
# Node ID 47438edf32be70e65bdb814ab609a70304fad2f4
# Parent c92db5f8d2b108163d75b32f906c7b55fa4f2854
Fix VSMS.RemoveResources()
My previous work on the xmlgen code caused us to stop skipping VIRT_DEV_UNKNOWN
devices in the full-system XML generation case. Since a delete operation just
marks devices as such, we should skip them.
Signed-off-by: Dan Smith <danms(a)us.ibm.com>
diff -r c92db5f8d2b1 -r 47438edf32be libxkutil/xmlgen.c
--- a/libxkutil/xmlgen.c Tue Jan 22 10:20:51 2008 -0800
+++ b/libxkutil/xmlgen.c Tue Jan 22 10:55:59 2008 -0800
@@ -322,7 +322,11 @@ static bool concat_devxml(char **xml,
int i;
for (i = 0; i < count; i++) {
- func(&_xml, &list[i]);
+ /* Deleted devices are marked as VIRT_DEV_UNKNOWN
+ * and should be skipped
+ */
+ if (list[i].type != VIRT_DEV_UNKNOWN)
+ func(&_xml, &list[i]);
}
astrcat(xml, _xml);
16 years, 7 months
