[Libvirt-cim] [PATCH] Revert VirtualSystemType change from ComputerSystem

Dan Smith danms at us.ibm.com
Wed Mar 19 19:10:11 UTC 2008


# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1205953799 25200
# Node ID bca26ef36f5c53123f43113c4f0564dc06f715fe
# Parent  7c94914c7796139bb6afd9a64acde9558216affe
Revert VirtualSystemType change from ComputerSystem

I misread the profile while writing the previous patch up.  This is
already done correctly in our VSSD.  My bad.

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r 7c94914c7796 -r bca26ef36f5c src/Virt_ComputerSystem.c
--- a/src/Virt_ComputerSystem.c	Tue Mar 18 13:29:54 2008 -0700
+++ b/src/Virt_ComputerSystem.c	Wed Mar 19 12:09:59 2008 -0700
@@ -301,35 +301,6 @@ static int set_other_id_info(const CMPIB
         return 1;
 }
 
-static bool set_type(CMPIInstance *instance)
-{
-        CMPIObjectPath *op;
-        CMPIStatus s;
-        char *prefix = NULL;
-        bool rc = false;
-
-        op = CMGetObjectPath(instance, &s);
-        if ((s.rc != CMPI_RC_OK) || (op == NULL)) {
-                CU_DEBUG("Failed to get OP from CS instance to set type");
-                goto out;
-        }
-
-        prefix = class_prefix_name(CLASSNAME(op));
-        if (prefix == NULL) {
-                CU_DEBUG("Unknown prefix for class: %s", CLASSNAME(op));
-                goto out;
-        }
-
-        CMSetProperty(instance, "VirtualSystemType",
-                      prefix, CMPI_chars);
-
-        rc = true;
- out:
-        free(prefix);
-
-        return rc;
-}
-
 /* Populate an instance with information from a domain */
 static CMPIStatus set_properties(const CMPIBroker *broker,
                                  virDomainPtr dom,
@@ -366,10 +337,6 @@ static CMPIStatus set_properties(const C
 
         if (!set_other_id_info(broker, uuid, prefix, instance)) {
                 /* Print trace error */
-                goto out;
-        }
-
-        if (!set_type(instance)) {
                 goto out;
         }
 




More information about the Libvirt-cim mailing list