Export virDomainGetBlkioParametersAssignFromDef

Move qemuDomainGetBlkioParametersAssignFromDef into domain_conf
and export it, to allow reuse in the LXC driver.

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index cec361f9e99b87b854d276d238fdbaf69eb0ec86..e8942f19fafd4d3f2c72a65c15037d6e2245aec4 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -24702,3 +24702,54 @@ virDomainObjGetShortName(virDomainObjPtr vm)
 
     return ret;
 }
+
+
+int
+virDomainGetBlkioParametersAssignFromDef(virDomainDefPtr def,
+                                         virTypedParameterPtr params,
+                                         int *nparams,
+                                         int maxparams)
+{
+    virBuffer buf = VIR_BUFFER_INITIALIZER;
+    char *data = NULL;
+    size_t i;
+
+#define VIR_BLKIO_ASSIGN(param, format, name)                                  \
+    if (*nparams < maxparams) {                                                \
+        for (i = 0; i < def->blkio.ndevices; i++) {                            \
+            if (!def->blkio.devices[i].param)                                  \
+                continue;                                                      \
+            virBufferAsprintf(&buf, "%s," format ",",                          \
+                              def->blkio.devices[i].path,                      \
+                              def->blkio.devices[i].param);                    \
+        }                                                                      \
+        virBufferTrim(&buf, ",", -1);                                          \
+        if (virBufferCheckError(&buf) < 0)                                     \
+            goto error;                                                        \
+        data = virBufferContentAndReset(&buf);                                 \
+        if (virTypedParameterAssign(&(params[(*nparams)++]), name,             \
+                                    VIR_TYPED_PARAM_STRING, data) < 0)         \
+            goto error;                                                        \
+        VIR_FREE(data);                                                        \
+    }
+
+    /* blkiotune.device_weight */
+    VIR_BLKIO_ASSIGN(weight, "%u", VIR_DOMAIN_BLKIO_DEVICE_WEIGHT);
+    /* blkiotune.device_read_iops */
+    VIR_BLKIO_ASSIGN(riops, "%u", VIR_DOMAIN_BLKIO_DEVICE_READ_IOPS);
+    /* blkiotune.device_write_iops */
+    VIR_BLKIO_ASSIGN(wiops, "%u", VIR_DOMAIN_BLKIO_DEVICE_WRITE_IOPS);
+    /* blkiotune.device_read_bps */
+    VIR_BLKIO_ASSIGN(rbps, "%llu", VIR_DOMAIN_BLKIO_DEVICE_READ_BPS);
+    /* blkiotune.device_write_bps */
+    VIR_BLKIO_ASSIGN(wbps, "%llu", VIR_DOMAIN_BLKIO_DEVICE_WRITE_BPS);
+
+#undef VIR_BLKIO_ASSIGN
+
+    return 0;
+
+ error:
+    VIR_FREE(data);
+    virBufferFreeAndReset(&buf);
+    return -1;
+}

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 8938ceef9ff6c3f26027be82ed3d5089e1aa1511..c032c5143374e08bf79a58461f1c6d9d6dd806eb 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -52,6 +52,7 @@
 # include "virprocess.h"
 # include "virgic.h"
 # include "virperf.h"
+# include "virtypedparam.h"
 
 /* forward declarations of all device types, required by
  * virDomainDeviceDef
@@ -3083,4 +3084,9 @@ bool virDomainDefHasMemballoon(const virDomainDef *def) ATTRIBUTE_NONNULL(1);
 
 char *virDomainObjGetShortName(virDomainObjPtr vm);
 
+int
+virDomainGetBlkioParametersAssignFromDef(virDomainDefPtr def,
+                                         virTypedParameterPtr params,
+                                         int *nparams,
+                                         int maxparams);
 #endif /* __DOMAIN_CONF_H */

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 4d56d1f0af9b141c6c0bd6d95153d8a87c4d647a..27ad7ff1c6068e9a3057d74e638fb5218f44120d 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -93,6 +93,7 @@ virDomainCCWAddressReleaseAddr;
 virDomainCCWAddressSetCreate;
 virDomainCCWAddressSetFree;
 virDomainCCWAddressValidate;
+virDomainGetBlkioParametersAssignFromDef;
 virDomainPCIAddressAsString;
 virDomainPCIAddressBusSetModel;
 virDomainPCIAddressEnsureAddr;

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 8b3f5381fbaf9f3b2ff0f61bc6b86265d13235d8..e70d3cec65edc2b351ec153d2358880e9ba3db82 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -9102,57 +9102,6 @@ qemuDomainSetBlkioParameters(virDomainPtr dom,
 }
 
 
-static int
-qemuDomainGetBlkioParametersAssignFromDef(virDomainDefPtr def,
-                                          virTypedParameterPtr params,
-                                          int *nparams,
-                                          int maxparams)
-{
-    virBuffer buf = VIR_BUFFER_INITIALIZER;
-    char *data = NULL;
-    size_t i;
-
-#define QEMU_BLKIO_ASSIGN(param, format, name)                                 \
-    if (*nparams < maxparams) {                                                \
-        for (i = 0; i < def->blkio.ndevices; i++) {                            \
-            if (!def->blkio.devices[i].param)                                  \
-                continue;                                                      \
-            virBufferAsprintf(&buf, "%s," format ",",                          \
-                              def->blkio.devices[i].path,                      \
-                              def->blkio.devices[i].param);                    \
-        }                                                                      \
-        virBufferTrim(&buf, ",", -1);                                          \
-        if (virBufferCheckError(&buf) < 0)                                     \
-            goto error;                                                        \
-        data = virBufferContentAndReset(&buf);                                 \
-        if (virTypedParameterAssign(&(params[(*nparams)++]), name,             \
-                                    VIR_TYPED_PARAM_STRING, data) < 0)         \
-            goto error;                                                        \
-        VIR_FREE(data);                                                        \
-    }
-
-    /* blkiotune.device_weight */
-    QEMU_BLKIO_ASSIGN(weight, "%u", VIR_DOMAIN_BLKIO_DEVICE_WEIGHT);
-    /* blkiotune.device_read_iops */
-    QEMU_BLKIO_ASSIGN(riops, "%u", VIR_DOMAIN_BLKIO_DEVICE_READ_IOPS);
-    /* blkiotune.device_write_iops */
-    QEMU_BLKIO_ASSIGN(wiops, "%u", VIR_DOMAIN_BLKIO_DEVICE_WRITE_IOPS);
-    /* blkiotune.device_read_bps */
-    QEMU_BLKIO_ASSIGN(rbps, "%llu", VIR_DOMAIN_BLKIO_DEVICE_READ_BPS);
-    /* blkiotune.device_write_bps */
-    QEMU_BLKIO_ASSIGN(wbps, "%llu", VIR_DOMAIN_BLKIO_DEVICE_WRITE_BPS);
-
-#undef QEMU_BLKIO_ASSIGN
-
-    return 0;
-
- error:
-    VIR_FREE(data);
-    virBufferFreeAndReset(&buf);
-    return -1;
-}
-
-
 static int
 qemuDomainGetBlkioParameters(virDomainPtr dom,
                              virTypedParameterPtr params,
@@ -9220,8 +9169,8 @@ qemuDomainGetBlkioParameters(virDomainPtr dom,
                                     VIR_TYPED_PARAM_UINT, val) < 0)
             goto cleanup;
 
-        if (qemuDomainGetBlkioParametersAssignFromDef(def, params, nparams,
-                                                      maxparams) < 0)
+        if (virDomainGetBlkioParametersAssignFromDef(def, params, nparams,
+                                                     maxparams) < 0)
             goto cleanup;
 
     } else if (persistentDef) {
@@ -9232,8 +9181,8 @@ qemuDomainGetBlkioParameters(virDomainPtr dom,
                                     persistentDef->blkio.weight) < 0)
             goto cleanup;
 
-        if (qemuDomainGetBlkioParametersAssignFromDef(persistentDef, params,
-                                                      nparams, maxparams) < 0)
+        if (virDomainGetBlkioParametersAssignFromDef(persistentDef, params,
+                                                     nparams, maxparams) < 0)
             goto cleanup;
     }