[Libvirt-cim] [PATCH 2 of 2] (#3) Have get_console_sap_by_name() use Name attribute to determine session

[Kaitlin Rupert]

# HG changeset patch
# User kaitlin at elm3b43.beaverton.ibm.com
# Date 1224552270 25200
# Node ID 739113a661c7a342e67bd7f19ce8c744e283bbff
# Parent  5a55c724920bbe6c3df77c9465a150ac6423f946
(#3) Have get_console_sap_by_name() use Name attribute to determine session

Updates from 2 to 3:
  -Check malloc() and strdup() returns
  -Remove unneeded NULL initialization

Updates from 1 to 2:
 -Removed function that parses the Name attribute

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 5a55c724920b -r 739113a661c7 src/Virt_KVMRedirectionSAP.c
--- a/src/Virt_KVMRedirectionSAP.c	Mon Oct 20 18:24:30 2008 -0700
+++ b/src/Virt_KVMRedirectionSAP.c	Mon Oct 20 18:24:30 2008 -0700
@@ -350,7 +350,7 @@
 
 CMPIStatus get_console_sap_by_name(const CMPIBroker *broker,
                                    const CMPIObjectPath *ref,
-                                   const char *name,
+                                   const char *sys,
                                    CMPIInstance **_inst)
 {
         virConnectPtr conn;
@@ -358,6 +358,10 @@
         CMPIStatus s = {CMPI_RC_OK, NULL};
         CMPIInstance *inst = NULL;
         struct domain *dominfo = NULL;
+        struct vnc_port *port = NULL;
+        const char *name = NULL;
+        int lport;
+        int rport;
 
         conn = connect_by_classname(broker, CLASSNAME(ref), &s);
         if (conn == NULL) {
@@ -367,12 +371,12 @@
                 goto out;
         }
 
-        dom = virDomainLookupByName(conn, name);
+        dom = virDomainLookupByName(conn, sys);
         if (dom == NULL) {
                 cu_statusf(broker, &s,
                            CMPI_RC_ERR_NOT_FOUND,
                            "No such instance (%s)",
-                           name);
+                           sys);
                 goto out;
         }
 
@@ -380,9 +384,43 @@
                 cu_statusf(broker, &s,
                            CMPI_RC_ERR_FAILED,
                            "No console device for this guest");
+                goto out;
         }
 
-        inst = get_console_sap(_BROKER, ref, conn, dominfo, &s);
+        if (cu_get_str_path(ref, "Name", &name) != CMPI_RC_OK) {
+                cu_statusf(broker, &s,
+                           CMPI_RC_ERR_NOT_FOUND,
+                           "No such instance (System)");
+                goto out;
+        }
+
+        if (sscanf(name, "%d:%d", &lport, &rport) != 2) {
+                cu_statusf(_BROKER, &s,
+                           CMPI_RC_ERR_FAILED,
+                           "Unable to guest's console port");
+                goto out;
+        }
+
+        port = malloc(sizeof(struct vnc_port));
+        if (port == NULL) {
+                cu_statusf(_BROKER, &s,
+                           CMPI_RC_ERR_FAILED,
+                           "Unable to allocate guest port struct");
+                goto out;
+        }
+
+        port->name = strdup(dominfo->name);
+        if (port->name == NULL) {
+                cu_statusf(_BROKER, &s,
+                           CMPI_RC_ERR_FAILED,
+                           "Unable to allocate string");
+                goto out;
+        }
+
+        port->port = lport;
+        port->remote_port = rport;
+
+        inst = get_console_sap(_BROKER, ref, conn, port, &s);
 
         virDomainFree(dom);
 
@@ -393,6 +431,8 @@
 
  out:
         virConnectClose(conn);
+        free(port->name);
+        free(port);
 
         return s;
 }
@@ -405,10 +445,10 @@
         CMPIInstance *inst = NULL;
         const char *sys = NULL;
 
-        if (cu_get_str_path(reference, "System", &sys) != CMPI_RC_OK) {
+        if (cu_get_str_path(reference, "SystemName", &sys) != CMPI_RC_OK) {
                 cu_statusf(broker, &s,
                            CMPI_RC_ERR_NOT_FOUND,
-                           "No such instance (System)");
+                           "No such instance (SystemName)");
                 goto out;
         }