# HG changeset patch
# User Kaitlin Rupert <karupert(a)us.ibm.com>
# Date 1233687128 28800
# Node ID b8851323371c301a6357039b892bb8c1527a6b7d
# Parent 66e981e897ec37e8452c14a253c13db18c7a1952
Add KVM_MigrationJob class. Also fix migration uri.
The trailing slash (/) causes an error with the qemu connection type.
Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com>
diff -r 66e981e897ec -r b8851323371c schema/VSMigrationService.mof
--- a/schema/VSMigrationService.mof Tue Feb 03 10:52:06 2009 -0800
+++ b/schema/VSMigrationService.mof Tue Feb 03 10:52:08 2009 -0800
@@ -68,6 +68,9 @@
class Xen_MigrationJob : CIM_ConcreteJob {
};
+class KVM_MigrationJob : CIM_ConcreteJob {
+};
+
[Provider("cmpi::Virt_VSMigrationService")]
class Xen_VirtualSystemMigrationService : CIM_VirtualSystemMigrationService {
};
diff -r 66e981e897ec -r b8851323371c src/Virt_VSMigrationService.c
--- a/src/Virt_VSMigrationService.c Tue Feb 03 10:52:06 2009 -0800
+++ b/src/Virt_VSMigrationService.c Tue Feb 03 10:52:08 2009 -0800
@@ -185,7 +185,15 @@
goto out;
}
- rc = asprintf(&uri, "%s+%s://%s/system/%s", prefix, tport, dest,
param);
+ rc = asprintf(&uri, "%s+%s://%s/system", prefix, tport, dest);
+ if (rc == -1) {
+ uri = NULL;
+ goto out;
+ }
+
+ if (!STREQC(param, ""))
+ rc = asprintf(&uri, "%s/%s", uri, param);
+
if (rc == -1)
uri = NULL;