lxcDomainParseBlkioDeviceStr() and qemuDomainParseBlkioDeviceStr()
are the same function. Avoid code repetition by putting the code
in a new helper.
Signed-off-by: Daniel Henrique Barboza <danielhb...@gmail.com>
---
src/conf/domain_conf.c | 111 ++++++++++++++++++++++++++++++++++
src/conf/domain_conf.h | 3 +
src/libvirt_private.syms | 1 +
src/lxc/lxc_driver.c | 111 +---------------------------------
src/qemu/qemu_driver.c | 126 +++------------------------------------
5 files changed, 125 insertions(+), 227 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 88bcf1b64b..df8a71290d 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -1695,6 +1695,117 @@ virDomainMergeBlkioDevice(virBlkioDevicePtr *dest_array,
}
+/* blkioDeviceStr in the form of /device/path,weight,/device/path,weight
+ * for example, /dev/disk/by-path/pci-0000:00:1f.2-scsi-0:0:0:0,800
+ */
+int
+virDomainParseBlkioDeviceStr(char *blkioDeviceStr, const char *type,
+ virBlkioDevicePtr *dev, size_t *size)
+{
+ char *temp;
+ int ndevices = 0;
+ int nsep = 0;
+ size_t i;
+ virBlkioDevicePtr result = NULL;
+
+ *dev = NULL;
+ *size = 0;
+
+ if (STREQ(blkioDeviceStr, ""))
+ return 0;
+
+ temp = blkioDeviceStr;
+ while (temp) {
+ temp = strchr(temp, ',');
+ if (temp) {
+ temp++;
+ nsep++;
+ }
+ }
+
+ /* A valid string must have even number of fields, hence an odd
+ * number of commas. */
+ if (!(nsep & 1))
+ goto parse_error;
+
+ ndevices = (nsep + 1) / 2;
+
+ if (VIR_ALLOC_N(result, ndevices) < 0)
+ return -1;
+
+ i = 0;
+ temp = blkioDeviceStr;
+ while (temp) {
+ char *p = temp;
+
+ /* device path */
+ p = strchr(p, ',');
+ if (!p)
+ goto parse_error;
+
+ result[i].path = g_strndup(temp, p - temp);
+
+ /* value */
+ temp = p + 1;
+
+ if (STREQ(type, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT)) {
+ if (virStrToLong_uip(temp, &p, 10, &result[i].weight) < 0)
+ goto number_error;
+ } else if (STREQ(type, VIR_DOMAIN_BLKIO_DEVICE_READ_IOPS)) {
+ if (virStrToLong_uip(temp, &p, 10, &result[i].riops) < 0)
+ goto number_error;
+ } else if (STREQ(type, VIR_DOMAIN_BLKIO_DEVICE_WRITE_IOPS)) {
+ if (virStrToLong_uip(temp, &p, 10, &result[i].wiops) < 0)
+ goto number_error;
+ } else if (STREQ(type, VIR_DOMAIN_BLKIO_DEVICE_READ_BPS)) {
+ if (virStrToLong_ullp(temp, &p, 10, &result[i].rbps) < 0)
+ goto number_error;
+ } else if (STREQ(type, VIR_DOMAIN_BLKIO_DEVICE_WRITE_BPS)) {
+ if (virStrToLong_ullp(temp, &p, 10, &result[i].wbps) < 0)
+ goto number_error;
+ } else {
+ virReportError(VIR_ERR_INVALID_ARG,
+ _("unknown parameter '%s'"), type);
+ goto cleanup;
+ }
+
+ i++;
+
+ if (*p == '\0')
+ break;
+ else if (*p != ',')
+ goto parse_error;
+ temp = p + 1;
+ }
+
+ if (!i)
+ VIR_FREE(result);
+
+ *dev = result;
+ *size = i;
+
+ return 0;
+
+ parse_error:
+ virReportError(VIR_ERR_INVALID_ARG,
+ _("unable to parse blkio device '%s' '%s'"),
+ type, blkioDeviceStr);
+ goto cleanup;
+
+ number_error:
+ virReportError(VIR_ERR_INVALID_ARG,
+ _("invalid value '%s' for parameter '%s' of device '%s'"),
+ temp, type, result[i].path);
+
+ cleanup:
+ if (result) {
+ virBlkioDeviceArrayClear(result, ndevices);
+ VIR_FREE(result);
+ }
+ return -1;
+}
+
+
/**
* virDomainDefCheckUnsupportedMemoryHotplug:
* @def: domain definition
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 460aad9278..e1daf26e07 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2215,6 +2215,9 @@ int virDomainMergeBlkioDevice(virBlkioDevicePtr
*dest_array,
size_t src_size,
const char *type);
+int virDomainParseBlkioDeviceStr(char *blkioDeviceStr, const char *type,
+ virBlkioDevicePtr *dev, size_t *size);
+
struct _virDomainResourceDef {
char *partition;
};
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 70e45f1e8a..d483b75aeb 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -563,6 +563,7 @@ virDomainOsDefFirmwareTypeFromString;
virDomainOsDefFirmwareTypeToString;
virDomainOSTypeFromString;
virDomainOSTypeToString;
+virDomainParseBlkioDeviceStr;
virDomainParseMemory;
virDomainPausedReasonTypeFromString;
virDomainPausedReasonTypeToString;
diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index e42fd99c72..96e61ff4ca 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -2108,113 +2108,6 @@ lxcDomainGetSchedulerParameters(virDomainPtr domain,
return lxcDomainGetSchedulerParametersFlags(domain, params, nparams, 0);
}
-static int
-lxcDomainParseBlkioDeviceStr(char *blkioDeviceStr, const char *type,
- virBlkioDevicePtr *dev, size_t *size)
-{
- char *temp;
- int ndevices = 0;
- int nsep = 0;
- size_t i;
- virBlkioDevicePtr result = NULL;
-
- *dev = NULL;
- *size = 0;
-
- if (STREQ(blkioDeviceStr, ""))
- return 0;
-
- temp = blkioDeviceStr;
- while (temp) {
- temp = strchr(temp, ',');
- if (temp) {
- temp++;
- nsep++;
- }
- }
-
- /* A valid string must have even number of fields, hence an odd
- * number of commas. */
- if (!(nsep & 1))
- goto parse_error;
-
- ndevices = (nsep + 1) / 2;
-
- if (VIR_ALLOC_N(result, ndevices) < 0)
- return -1;
-
- i = 0;
- temp = blkioDeviceStr;
- while (temp) {
- char *p = temp;
-
- /* device path */
- p = strchr(p, ',');
- if (!p)
- goto parse_error;
-
- result[i].path = g_strndup(temp, p - temp);
-
- /* value */
- temp = p + 1;
-
- if (STREQ(type, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT)) {
- if (virStrToLong_uip(temp, &p, 10, &result[i].weight) < 0)
- goto number_error;
- } else if (STREQ(type, VIR_DOMAIN_BLKIO_DEVICE_READ_IOPS)) {
- if (virStrToLong_uip(temp, &p, 10, &result[i].riops) < 0)
- goto number_error;
- } else if (STREQ(type, VIR_DOMAIN_BLKIO_DEVICE_WRITE_IOPS)) {
- if (virStrToLong_uip(temp, &p, 10, &result[i].wiops) < 0)
- goto number_error;
- } else if (STREQ(type, VIR_DOMAIN_BLKIO_DEVICE_READ_BPS)) {
- if (virStrToLong_ullp(temp, &p, 10, &result[i].rbps) < 0)
- goto number_error;
- } else if (STREQ(type, VIR_DOMAIN_BLKIO_DEVICE_WRITE_BPS)) {
- if (virStrToLong_ullp(temp, &p, 10, &result[i].wbps) < 0)
- goto number_error;
- } else {
- virReportError(VIR_ERR_INVALID_ARG,
- _("unknown parameter '%s'"), type);
- goto cleanup;
- }
-
- i++;
-
- if (*p == '\0')
- break;
- else if (*p != ',')
- goto parse_error;
- temp = p + 1;
- }
-
- if (!i)
- VIR_FREE(result);
-
- *dev = result;
- *size = i;
-
- return 0;
-
- parse_error:
- virReportError(VIR_ERR_INVALID_ARG,
- _("unable to parse blkio device '%s' '%s'"),
- type, blkioDeviceStr);
- goto cleanup;
-
- number_error:
- virReportError(VIR_ERR_INVALID_ARG,
- _("invalid value '%s' for parameter '%s' of device '%s'"),
- temp, type, result[i].path);
-
- cleanup:
- if (result) {
- virBlkioDeviceArrayClear(result, ndevices);
- VIR_FREE(result);
- }
- return -1;
-}
-
static int
lxcDomainBlockStats(virDomainPtr dom,
@@ -2486,7 +2379,7 @@ lxcDomainSetBlkioParameters(virDomainPtr dom,
virBlkioDevicePtr devices = NULL;
size_t j;
- if (lxcDomainParseBlkioDeviceStr(params[i].value.s,
+ if (virDomainParseBlkioDeviceStr(params[i].value.s,
param->field,
&devices,
&ndevices) < 0) {
@@ -2590,7 +2483,7 @@ lxcDomainSetBlkioParameters(virDomainPtr dom,
virBlkioDevicePtr devices = NULL;
size_t ndevices;
- if (lxcDomainParseBlkioDeviceStr(params[i].value.s,
+ if (virDomainParseBlkioDeviceStr(params[i].value.s,
param->field,
&devices,
&ndevices) < 0) {
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 509a57b01c..d458b59b99 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -9309,116 +9309,6 @@ static char *qemuDomainGetSchedulerType(virDomainPtr
dom,
return ret;
}
-/* blkioDeviceStr in the form of /device/path,weight,/device/path,weight
- * for example, /dev/disk/by-path/pci-0000:00:1f.2-scsi-0:0:0:0,800
- */
-static int
-qemuDomainParseBlkioDeviceStr(char *blkioDeviceStr, const char *type,
- virBlkioDevicePtr *dev, size_t *size)
-{
- char *temp;
- int ndevices = 0;
- int nsep = 0;
- size_t i;
- virBlkioDevicePtr result = NULL;
-
- *dev = NULL;
- *size = 0;
-
- if (STREQ(blkioDeviceStr, ""))
- return 0;
-
- temp = blkioDeviceStr;
- while (temp) {
- temp = strchr(temp, ',');
- if (temp) {
- temp++;
- nsep++;
- }
- }
-
- /* A valid string must have even number of fields, hence an odd
- * number of commas. */
- if (!(nsep & 1))
- goto parse_error;
-
- ndevices = (nsep + 1) / 2;
-
- if (VIR_ALLOC_N(result, ndevices) < 0)
- return -1;
-
- i = 0;
- temp = blkioDeviceStr;
- while (temp) {
- char *p = temp;
-
- /* device path */
- p = strchr(p, ',');
- if (!p)
- goto parse_error;
-
- result[i].path = g_strndup(temp, p - temp);
-
- /* value */
- temp = p + 1;
-
- if (STREQ(type, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT)) {
- if (virStrToLong_uip(temp, &p, 10, &result[i].weight) < 0)
- goto number_error;
- } else if (STREQ(type, VIR_DOMAIN_BLKIO_DEVICE_READ_IOPS)) {
- if (virStrToLong_uip(temp, &p, 10, &result[i].riops) < 0)
- goto number_error;
- } else if (STREQ(type, VIR_DOMAIN_BLKIO_DEVICE_WRITE_IOPS)) {
- if (virStrToLong_uip(temp, &p, 10, &result[i].wiops) < 0)
- goto number_error;
- } else if (STREQ(type, VIR_DOMAIN_BLKIO_DEVICE_READ_BPS)) {
- if (virStrToLong_ullp(temp, &p, 10, &result[i].rbps) < 0)
- goto number_error;
- } else if (STREQ(type, VIR_DOMAIN_BLKIO_DEVICE_WRITE_BPS)) {
- if (virStrToLong_ullp(temp, &p, 10, &result[i].wbps) < 0)
- goto number_error;
- } else {
- virReportError(VIR_ERR_INVALID_ARG,
- _("unknown parameter '%s'"), type);
- goto cleanup;
- }
-
- i++;
-
- if (*p == '\0')
- break;
- else if (*p != ',')
- goto parse_error;
- temp = p + 1;
- }
-
- if (!i)
- VIR_FREE(result);
-
- *dev = result;
- *size = i;
-
- return 0;
-
- parse_error:
- virReportError(VIR_ERR_INVALID_ARG,
- _("unable to parse blkio device '%s' '%s'"),
- type, blkioDeviceStr);
- goto cleanup;
-
- number_error:
- virReportError(VIR_ERR_INVALID_ARG,
- _("invalid value '%s' for parameter '%s' of device '%s'"),
- temp, type, result[i].path);
-
- cleanup:
- if (result) {
- virBlkioDeviceArrayClear(result, ndevices);
- VIR_FREE(result);
- }
- return -1;
-}
-
static int
qemuDomainSetBlkioParameters(virDomainPtr dom,
@@ -9500,10 +9390,10 @@ qemuDomainSetBlkioParameters(virDomainPtr dom,
virBlkioDevicePtr devices = NULL;
size_t j;
- if (qemuDomainParseBlkioDeviceStr(param->value.s,
- param->field,
- &devices,
- &ndevices) < 0) {
+ if (virDomainParseBlkioDeviceStr(param->value.s,
+ param->field,
+ &devices,
+ &ndevices) < 0) {
ret = -1;
continue;
}
@@ -9607,10 +9497,10 @@ qemuDomainSetBlkioParameters(virDomainPtr dom,
virBlkioDevicePtr devices = NULL;
size_t ndevices;
- if (qemuDomainParseBlkioDeviceStr(param->value.s,
- param->field,
- &devices,
- &ndevices) < 0) {
+ if (virDomainParseBlkioDeviceStr(param->value.s,
+ param->field,
+ &devices,
+ &ndevices) < 0) {
ret = -1;
continue;
}
--
2.24.1
