Convert Xen domain scheduler driver methods to use virDomainDefPtr

Introduce use of a virDomainDefPtr in the domain scheduler
APIs to simplify introduction of ACL security checks.
The virDomainPtr cannot be safely used, since the app
may have supplied mis-matching name/uuid/id fields. eg
the name points to domain X, while the uuid points to
domain Y. Resolving the virDomainPtr to a virDomainDefPtr
ensures a consistent name/uuid/id set.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index b1d57fd18392144c8de249e07e3aa6f797b73a4c..7d06b95b9f7295da0c6907619614de9f2497eb11 100644 (file)
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -1849,17 +1849,26 @@ static char *
 xenUnifiedDomainGetSchedulerType(virDomainPtr dom, int *nparams)
 {
     xenUnifiedPrivatePtr priv = dom->conn->privateData;
+    virDomainDefPtr def = NULL;
+    char *ret = NULL;
+
+    if (!(def = xenGetDomainDefForDom(dom)))
+        goto cleanup;
 
     if (dom->id < 0) {
         if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) {
             virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                            _("Cannot change scheduler parameters"));
-            return NULL;
+            goto cleanup;
         }
-        return xenDaemonGetSchedulerType(dom, nparams);
+        ret = xenDaemonGetSchedulerType(dom->conn, nparams);
     } else {
-        return xenHypervisorGetSchedulerType(dom, nparams);
+        ret = xenHypervisorGetSchedulerType(dom->conn, nparams);
     }
+
+cleanup:
+    virDomainDefFree(def);
+    return ret;
 }
 
 static int
@@ -1869,19 +1878,28 @@ xenUnifiedDomainGetSchedulerParametersFlags(virDomainPtr dom,
                                             unsigned int flags)
 {
     xenUnifiedPrivatePtr priv = dom->conn->privateData;
+    virDomainDefPtr def = NULL;
+    int ret = -1;
 
     virCheckFlags(0, -1);
 
+    if (!(def = xenGetDomainDefForDom(dom)))
+        goto cleanup;
+
     if (dom->id < 0) {
         if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) {
             virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                            _("Cannot change scheduler parameters"));
-            return -1;
+            goto cleanup;
         }
-        return xenDaemonGetSchedulerParameters(dom, params, nparams);
+        ret = xenDaemonGetSchedulerParameters(dom->conn, def, params, nparams);
     } else {
-        return xenHypervisorGetSchedulerParameters(dom, params, nparams);
+        ret = xenHypervisorGetSchedulerParameters(dom->conn, def, params, nparams);
     }
+
+cleanup:
+    virDomainDefFree(def);
+    return ret;
 }
 
 static int
@@ -1900,19 +1918,28 @@ xenUnifiedDomainSetSchedulerParametersFlags(virDomainPtr dom,
                                             unsigned int flags)
 {
     xenUnifiedPrivatePtr priv = dom->conn->privateData;
+    virDomainDefPtr def = NULL;
+    int ret = -1;
 
     virCheckFlags(0, -1);
 
+    if (!(def = xenGetDomainDefForDom(dom)))
+        goto cleanup;
+
     if (dom->id < 0) {
         if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) {
             virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                            _("Cannot change scheduler parameters"));
-            return -1;
+            goto cleanup;
         }
-        return xenDaemonSetSchedulerParameters(dom, params, nparams);
+        ret = xenDaemonSetSchedulerParameters(dom->conn, def, params, nparams);
     } else {
-        return xenHypervisorSetSchedulerParameters(dom, params, nparams);
+        ret = xenHypervisorSetSchedulerParameters(dom->conn, def, params, nparams);
     }
+
+cleanup:
+    virDomainDefFree(def);
+    return ret;
 }
 
 static int

diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
index b97b32917bbb4bfbd78d60229af3c55ab8e17a4d..9e8e593f6e7f127bfa5999e013e2ec18beb0a29e 100644 (file)
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
@@ -1105,7 +1105,7 @@ virXen_getdomaininfo(int handle, int first_domain, xen_getdomaininfo *dominfo)
 
 /**
  * xenHypervisorGetSchedulerType:
- * @domain: pointer to the Xen Hypervisor block
+ * @conn: the hypervisor connection
  * @nparams:give a number of scheduler parameters.
  *
  * Do a low level hypercall to get scheduler type
@@ -1113,10 +1113,11 @@ virXen_getdomaininfo(int handle, int first_domain, xen_getdomaininfo *dominfo)
  * Returns scheduler name or NULL in case of failure
  */
 char *
-xenHypervisorGetSchedulerType(virDomainPtr domain, int *nparams)
+xenHypervisorGetSchedulerType(virConnectPtr conn,
+                              int *nparams)
 {
     char *schedulertype = NULL;
-    xenUnifiedPrivatePtr priv = domain->conn->privateData;
+    xenUnifiedPrivatePtr priv = conn->privateData;
 
     /*
      * Support only hv_versions.dom_interface >=5
@@ -1164,7 +1165,8 @@ xenHypervisorGetSchedulerType(virDomainPtr domain, int *nparams)
 
 /**
  * xenHypervisorGetSchedulerParameters:
- * @domain: pointer to the Xen Hypervisor block
+ * @conn: the hypervisor connection
+ * @def: domain configuration
  * @params: pointer to scheduler parameters.
  *     This memory area should be allocated before calling.
  * @nparams: this parameter must be at least as large as
@@ -1176,11 +1178,12 @@ xenHypervisorGetSchedulerType(virDomainPtr domain, int *nparams)
  * Returns 0 or -1 in case of failure
  */
 int
-xenHypervisorGetSchedulerParameters(virDomainPtr domain,
+xenHypervisorGetSchedulerParameters(virConnectPtr conn,
+                                    virDomainDefPtr def,
                                     virTypedParameterPtr params,
                                     int *nparams)
 {
-    xenUnifiedPrivatePtr priv = domain->conn->privateData;
+    xenUnifiedPrivatePtr priv = conn->privateData;
 
     /*
      * Support only hv_versions.dom_interface >=5
@@ -1218,7 +1221,7 @@ xenHypervisorGetSchedulerParameters(virDomainPtr domain,
             case XEN_SCHEDULER_CREDIT:
                 memset(&op_dom, 0, sizeof(op_dom));
                 op_dom.cmd = XEN_V2_OP_SCHEDULER;
-                op_dom.domain = (domid_t) domain->id;
+                op_dom.domain = (domid_t) def->id;
                 op_dom.u.getschedinfo.sched_id = XEN_SCHEDULER_CREDIT;
                 op_dom.u.getschedinfo.cmd = XEN_DOMCTL_SCHEDOP_getinfo;
                 ret = xenHypervisorDoV2Dom(priv->handle, &op_dom);
@@ -1254,7 +1257,8 @@ xenHypervisorGetSchedulerParameters(virDomainPtr domain,
 
 /**
  * xenHypervisorSetSchedulerParameters:
- * @domain: pointer to the Xen Hypervisor block
+ * @conn: the hypervisor connection
+ * @def: domain configuration
  * @nparams:give a number of scheduler setting parameters .
  *
  * Do a low level hypercall to set scheduler parameters
@@ -1262,13 +1266,14 @@ xenHypervisorGetSchedulerParameters(virDomainPtr domain,
  * Returns 0 or -1 in case of failure
  */
 int
-xenHypervisorSetSchedulerParameters(virDomainPtr domain,
+xenHypervisorSetSchedulerParameters(virConnectPtr conn,
+                                    virDomainDefPtr def,
                                     virTypedParameterPtr params,
                                     int nparams)
 {
     int i;
     unsigned int val;
-    xenUnifiedPrivatePtr priv = domain->conn->privateData;
+    xenUnifiedPrivatePtr priv = conn->privateData;
     char buf[256];
 
     if (nparams == 0) {
@@ -1313,7 +1318,7 @@ xenHypervisorSetSchedulerParameters(virDomainPtr domain,
         case XEN_SCHEDULER_CREDIT: {
             memset(&op_dom, 0, sizeof(op_dom));
             op_dom.cmd = XEN_V2_OP_SCHEDULER;
-            op_dom.domain = (domid_t) domain->id;
+            op_dom.domain = (domid_t) def->id;
             op_dom.u.getschedinfo.sched_id = XEN_SCHEDULER_CREDIT;
             op_dom.u.getschedinfo.cmd = XEN_DOMCTL_SCHEDOP_putinfo;
 

diff --git a/src/xen/xen_hypervisor.h b/src/xen/xen_hypervisor.h
index 1cf1e144ba19b4b71a0b758e02130fea5901467e..1e5bb6763f6d397731859bc26c26d66406cee5fc 100644 (file)
--- a/src/xen/xen_hypervisor.h
+++ b/src/xen/xen_hypervisor.h
@@ -106,18 +106,20 @@ int     xenHypervisorGetVcpuMax         (virConnectPtr conn,
                                          virDomainDefPtr def)
           ATTRIBUTE_NONNULL (1);
 
-char *  xenHypervisorGetSchedulerType   (virDomainPtr domain,
+char *  xenHypervisorGetSchedulerType   (virConnectPtr conn,
                                          int *nparams)
           ATTRIBUTE_NONNULL (1);
 
-int     xenHypervisorGetSchedulerParameters(virDomainPtr domain,
-                                         virTypedParameterPtr params,
-                                         int *nparams)
+int     xenHypervisorGetSchedulerParameters(virConnectPtr conn,
+                                            virDomainDefPtr def,
+                                            virTypedParameterPtr params,
+                                            int *nparams)
           ATTRIBUTE_NONNULL (1);
 
-int     xenHypervisorSetSchedulerParameters(virDomainPtr domain,
-                                         virTypedParameterPtr params,
-                                         int nparams)
+int     xenHypervisorSetSchedulerParameters(virConnectPtr conn,
+                                            virDomainDefPtr def,
+                                            virTypedParameterPtr params,
+                                            int nparams)
           ATTRIBUTE_NONNULL (1);
 
 int     xenHypervisorDomainBlockStats   (virDomainPtr domain,

diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
index 967350992ab36d4e05240506672bfcddd8239b6a..34bacad1ca86fa7a13c77840ae0005031fb4504a 100644 (file)
--- a/src/xen/xend_internal.c
+++ b/src/xen/xend_internal.c
@@ -2979,7 +2979,7 @@ error:
 
 /**
  * xenDaemonGetSchedulerType:
- * @domain: pointer to the Domain block
+ * @conn: the hypervisor connection
  * @nparams: give a number of scheduler parameters
  *
  * Get the scheduler type of Xen
@@ -2988,9 +2988,10 @@ error:
  * caller or NULL in case of failure
  */
 char *
-xenDaemonGetSchedulerType(virDomainPtr domain, int *nparams)
+xenDaemonGetSchedulerType(virConnectPtr conn,
+                          int *nparams)
 {
-    xenUnifiedPrivatePtr priv = domain->conn->privateData;
+    xenUnifiedPrivatePtr priv = conn->privateData;
     struct sexpr *root;
     const char *ret = NULL;
     char *schedulertype = NULL;
@@ -3002,7 +3003,7 @@ xenDaemonGetSchedulerType(virDomainPtr domain, int *nparams)
         return NULL;
     }
 
-    root = sexpr_get(domain->conn, "/xend/node/");
+    root = sexpr_get(conn, "/xend/node/");
     if (root == NULL)
         return NULL;
 
@@ -3042,7 +3043,8 @@ error:
 
 /**
  * xenDaemonGetSchedulerParameters:
- * @domain: pointer to the Domain block
+ * @conn: the hypervisor connection
+ * @def: domain configuration
  * @params: pointer to scheduler parameters
  *          This memory area must be allocated by the caller
  * @nparams: a number of scheduler parameters which should be same as a
@@ -3053,11 +3055,12 @@ error:
  * Returns 0 or -1 in case of failure
  */
 int
-xenDaemonGetSchedulerParameters(virDomainPtr domain,
+xenDaemonGetSchedulerParameters(virConnectPtr conn,
+                                virDomainDefPtr def,
                                 virTypedParameterPtr params,
                                 int *nparams)
 {
-    xenUnifiedPrivatePtr priv = domain->conn->privateData;
+    xenUnifiedPrivatePtr priv = conn->privateData;
     struct sexpr *root;
     char *sched_type = NULL;
     int sched_nparam = 0;
@@ -3071,12 +3074,12 @@ xenDaemonGetSchedulerParameters(virDomainPtr domain,
     }
 
     /* look up the information by domain name */
-    root = sexpr_get(domain->conn, "/xend/domain/%s?detail=1", domain->name);
+    root = sexpr_get(conn, "/xend/domain/%s?detail=1", def->name);
     if (root == NULL)
         return -1;
 
     /* get the scheduler type */
-    sched_type = xenDaemonGetSchedulerType(domain, &sched_nparam);
+    sched_type = xenDaemonGetSchedulerType(conn, &sched_nparam);
     if (sched_type == NULL) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        "%s", _("Failed to get a scheduler name"));
@@ -3146,7 +3149,8 @@ error:
 
 /**
  * xenDaemonSetSchedulerParameters:
- * @domain: pointer to the Domain block
+ * @conn: the hypervisor connection
+ * @def: domain configuration
  * @params: pointer to scheduler parameters
  * @nparams: a number of scheduler setting parameters
  *
@@ -3155,11 +3159,12 @@ error:
  * Returns 0 or -1 in case of failure
  */
 int
-xenDaemonSetSchedulerParameters(virDomainPtr domain,
+xenDaemonSetSchedulerParameters(virConnectPtr conn,
+                                virDomainDefPtr def,
                                 virTypedParameterPtr params,
                                 int nparams)
 {
-    xenUnifiedPrivatePtr priv = domain->conn->privateData;
+    xenUnifiedPrivatePtr priv = conn->privateData;
     struct sexpr *root;
     char *sched_type = NULL;
     int i;
@@ -3174,12 +3179,12 @@ xenDaemonSetSchedulerParameters(virDomainPtr domain,
     }
 
     /* look up the information by domain name */
-    root = sexpr_get(domain->conn, "/xend/domain/%s?detail=1", domain->name);
+    root = sexpr_get(conn, "/xend/domain/%s?detail=1", def->name);
     if (root == NULL)
         return -1;
 
     /* get the scheduler type */
-    sched_type = xenDaemonGetSchedulerType(domain, &sched_nparam);
+    sched_type = xenDaemonGetSchedulerType(conn, &sched_nparam);
     if (sched_type == NULL) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        "%s", _("Failed to get a scheduler name"));
@@ -3233,7 +3238,7 @@ xenDaemonSetSchedulerParameters(virDomainPtr domain,
                 snprintf(buf_cap, sizeof(buf_cap), "%s", cap);
             }
 
-            ret = xend_op(domain->conn, domain->name, "op",
+            ret = xend_op(conn, def->name, "op",
                           "domain_sched_credit_set", "weight", buf_weight,
                           "cap", buf_cap, NULL);
             break;

diff --git a/src/xen/xend_internal.h b/src/xen/xend_internal.h
index 25edc618663e4d5c9a4433b190c262eec9513b74..9ab184b939154c44aca83bfc0052862f8d312669 100644 (file)
--- a/src/xen/xend_internal.h
+++ b/src/xen/xend_internal.h
@@ -196,11 +196,14 @@ int xenDaemonDomainMigratePerform (virConnectPtr conn,
 
 int xenDaemonDomainBlockPeek (virDomainPtr domain, const char *path, unsigned long long offset, size_t size, void *buffer);
 
-char * xenDaemonGetSchedulerType(virDomainPtr domain, int *nparams);
-int xenDaemonGetSchedulerParameters(virDomainPtr domain,
+char * xenDaemonGetSchedulerType(virConnectPtr conn,
+                                 int *nparams);
+int xenDaemonGetSchedulerParameters(virConnectPtr conn,
+                                    virDomainDefPtr def,
                                     virTypedParameterPtr params,
                                     int *nparams);
-int xenDaemonSetSchedulerParameters(virDomainPtr domain,
+int xenDaemonSetSchedulerParameters(virConnectPtr conn,
+                                    virDomainDefPtr def,
                                     virTypedParameterPtr params,
                                     int nparams);