7:28 a.m.
Ilias Stamatis (4):
test_driver: introduce TEST_SET_PARAM macro
test_driver: implement virDomainGetMemoryParameters
test_driver: implement virDomainGetNumaParameters
test_driver: implement testDomainGetInterfaceParameters
src/test/test_driver.c | 157 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 157 insertions(+)
--
2.22.0
7:28 a.m.
New subject: [libvirt] [PATCH 1/4] test_driver: introduce TEST_SET_PARAM macro
This macro can be used by most or all of the DomainGetXXXParameters APIs.
Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com>
---
src/test/test_driver.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 4b1f2724a0..29b388e2d3 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -2844,6 +2844,13 @@ static char *testDomainGetXMLDesc(virDomainPtr domain, unsigned int
flags)
return ret;
}
+
+#define TEST_SET_PARAM(index, name, type, value) \
+ if (index < *nparams && \
+ virTypedParameterAssign(¶ms[index], name, type, value) < 0) \
+ goto cleanup
+
+
static int testConnectNumOfDefinedDomains(virConnectPtr conn)
{
testDriverPtr privconn = conn->privateData;
--
2.22.0
7:51 a.m.
New subject: [libvirt] [PATCH 1/4] test_driver: introduce TEST_SET_PARAM macro
On Tue, Jul 02, 2019 at 14:28:59 +0200, Ilias Stamatis wrote:
This macro can be used by most or all of the DomainGetXXXParameters
APIs.
Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com>
---
src/test/test_driver.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 4b1f2724a0..29b388e2d3 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -2844,6 +2844,13 @@ static char *testDomainGetXMLDesc(virDomainPtr domain, unsigned
int flags)
return ret;
}
+
+#define TEST_SET_PARAM(index, name, type, value) \
The macro name is too generic and this patch is not undefing it. You
should do it to prevent some accidental use in other parts of the code.
7:29 a.m.
New subject: [libvirt] [PATCH 2/4] test_driver: implement virDomainGetMemoryParameters
Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com>
---
src/test/test_driver.c | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 29b388e2d3..3c60d8dd0a 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -2851,6 +2851,45 @@ static char *testDomainGetXMLDesc(virDomainPtr domain, unsigned int
flags)
goto cleanup
+static int
+testDomainGetMemoryParameters(virDomainPtr dom,
+ virTypedParameterPtr params,
+ int *nparams,
+ unsigned int flags)
+{
+ int ret = -1;
+ virDomainObjPtr vm = NULL;
+ virDomainDefPtr def = NULL;
+
+ virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
+ VIR_DOMAIN_AFFECT_CONFIG |
+ VIR_TYPED_PARAM_STRING_OKAY, -1);
+
+ if ((*nparams) == 0) {
+ *nparams = 3;
+ return 0;
+ }
+
+ if (!(vm = testDomObjFromDomain(dom)))
+ goto cleanup;
+
+ if (!(def = virDomainObjGetOneDef(vm, flags)))
+ goto cleanup;
+
+ TEST_SET_PARAM(0, VIR_DOMAIN_MEMORY_HARD_LIMIT, VIR_TYPED_PARAM_ULLONG,
def->mem.hard_limit);
+ TEST_SET_PARAM(1, VIR_DOMAIN_MEMORY_SOFT_LIMIT, VIR_TYPED_PARAM_ULLONG,
def->mem.soft_limit);
+ TEST_SET_PARAM(2, VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT, VIR_TYPED_PARAM_ULLONG,
def->mem.swap_hard_limit);
+
+ if (*nparams > 3)
+ *nparams = 3;
+
+ ret = 0;
+ cleanup:
+ virDomainObjEndAPI(&vm);
+ return ret;
+}
+
+
static int testConnectNumOfDefinedDomains(virConnectPtr conn)
{
testDriverPtr privconn = conn->privateData;
@@ -7283,6 +7322,7 @@ static virHypervisorDriver testHypervisorDriver = {
.domainGetVcpuPinInfo = testDomainGetVcpuPinInfo, /* 1.2.18 */
.domainGetMaxVcpus = testDomainGetMaxVcpus, /* 0.7.3 */
.domainGetXMLDesc = testDomainGetXMLDesc, /* 0.1.4 */
+ .domainGetMemoryParameters = testDomainGetMemoryParameters, /* 5.6.0 */
.connectListDefinedDomains = testConnectListDefinedDomains, /* 0.1.11 */
.connectNumOfDefinedDomains = testConnectNumOfDefinedDomains, /* 0.1.11 */
.domainCreate = testDomainCreate, /* 0.1.11 */
--
2.22.0
7:29 a.m.
New subject: [libvirt] [PATCH 3/4] test_driver: implement virDomainGetNumaParameters
Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com>
---
src/test/test_driver.c | 46 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 3c60d8dd0a..8c3a41b34b 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -2890,6 +2890,51 @@ testDomainGetMemoryParameters(virDomainPtr dom,
}
+static int
+testDomainGetNumaParameters(virDomainPtr dom,
+ virTypedParameterPtr params,
+ int *nparams,
+ unsigned int flags)
+{
+ virDomainObjPtr vm = NULL;
+ virDomainDefPtr def = NULL;
+ virDomainNumatuneMemMode mode = VIR_DOMAIN_NUMATUNE_MEM_STRICT;
+ VIR_AUTOFREE(char *) nodeset = NULL;
+ int ret = -1;
+
+ virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
+ VIR_DOMAIN_AFFECT_CONFIG |
+ VIR_TYPED_PARAM_STRING_OKAY, -1);
+
+ if ((*nparams) == 0) {
+ *nparams = 2;
+ return 0;
+ }
+
+ if (!(vm = testDomObjFromDomain(dom)))
+ goto cleanup;
+
+ if (!(def = virDomainObjGetOneDef(vm, flags)))
+ goto cleanup;
+
+ ignore_value(virDomainNumatuneGetMode(def->numa, -1, &mode));
+ nodeset = virDomainNumatuneFormatNodeset(def->numa, NULL, -1);
+
+ TEST_SET_PARAM(0, VIR_DOMAIN_NUMA_MODE, VIR_TYPED_PARAM_INT, mode);
+ TEST_SET_PARAM(1, VIR_DOMAIN_NUMA_NODESET, VIR_TYPED_PARAM_STRING, nodeset);
+
+ nodeset = NULL;
+
+ if (*nparams > 2)
+ *nparams = 2;
+
+ ret = 0;
+ cleanup:
+ virDomainObjEndAPI(&vm);
+ return ret;
+}
+
+
static int testConnectNumOfDefinedDomains(virConnectPtr conn)
{
testDriverPtr privconn = conn->privateData;
@@ -7323,6 +7368,7 @@ static virHypervisorDriver testHypervisorDriver = {
.domainGetMaxVcpus = testDomainGetMaxVcpus, /* 0.7.3 */
.domainGetXMLDesc = testDomainGetXMLDesc, /* 0.1.4 */
.domainGetMemoryParameters = testDomainGetMemoryParameters, /* 5.6.0 */
+ .domainGetNumaParameters = testDomainGetNumaParameters, /* 5.6.0 */
.connectListDefinedDomains = testConnectListDefinedDomains, /* 0.1.11 */
.connectNumOfDefinedDomains = testConnectNumOfDefinedDomains, /* 0.1.11 */
.domainCreate = testDomainCreate, /* 0.1.11 */
--
2.22.0
7:29 a.m.
New subject: [libvirt] [PATCH 4/4] test_driver: implement testDomainGetInterfaceParameters
Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com>
---
src/test/test_driver.c | 64 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 64 insertions(+)
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 8c3a41b34b..59937ea968 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -2935,6 +2935,69 @@ testDomainGetNumaParameters(virDomainPtr dom,
}
+static int
+testDomainGetInterfaceParameters(virDomainPtr dom,
+ const char *device,
+ virTypedParameterPtr params,
+ int *nparams,
+ unsigned int flags)
+{
+ unsigned int in_average = 0, in_peak = 0, in_burst = 0, in_floor = 0;
+ unsigned int out_average = 0, out_peak = 0, out_burst = 0;
+ virDomainObjPtr vm = NULL;
+ virDomainDefPtr def = NULL;
+ virDomainNetDefPtr net = NULL;
+ int ret = -1;
+
+ virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
+ VIR_DOMAIN_AFFECT_CONFIG |
+ VIR_TYPED_PARAM_STRING_OKAY, -1);
+
+ if ((*nparams) == 0) {
+ *nparams = 7;
+ return 0;
+ }
+
+ if (!(vm = testDomObjFromDomain(dom)))
+ return -1;
+
+ if (!(def = virDomainObjGetOneDef(vm, flags)))
+ goto cleanup;
+
+ if (!(net = virDomainNetFind(def, device)))
+ goto cleanup;
+
+ if (net->bandwidth && net->bandwidth->in) {
+ in_average = net->bandwidth->in->average;
+ in_peak = net->bandwidth->in->peak;
+ in_burst = net->bandwidth->in->burst;
+ in_floor = net->bandwidth->in->floor;
+ }
+
+ if (net->bandwidth && net->bandwidth->out) {
+ out_average = net->bandwidth->out->average;
+ out_peak = net->bandwidth->out->peak;
+ out_burst = net->bandwidth->out->burst;
+ }
+
+ TEST_SET_PARAM(0, VIR_DOMAIN_BANDWIDTH_IN_AVERAGE, VIR_TYPED_PARAM_UINT,
in_average);
+ TEST_SET_PARAM(1, VIR_DOMAIN_BANDWIDTH_IN_PEAK, VIR_TYPED_PARAM_UINT, in_peak);
+ TEST_SET_PARAM(2, VIR_DOMAIN_BANDWIDTH_IN_BURST, VIR_TYPED_PARAM_UINT, in_burst);
+ TEST_SET_PARAM(3, VIR_DOMAIN_BANDWIDTH_IN_FLOOR, VIR_TYPED_PARAM_UINT, in_floor);
+ TEST_SET_PARAM(4, VIR_DOMAIN_BANDWIDTH_OUT_AVERAGE, VIR_TYPED_PARAM_UINT,
out_average);
+ TEST_SET_PARAM(5, VIR_DOMAIN_BANDWIDTH_OUT_PEAK, VIR_TYPED_PARAM_UINT, out_peak);
+ TEST_SET_PARAM(6, VIR_DOMAIN_BANDWIDTH_OUT_BURST, VIR_TYPED_PARAM_UINT, out_burst);
+
+ if (*nparams > 7)
+ *nparams = 7;
+
+ ret = 0;
+ cleanup:
+ virDomainObjEndAPI(&vm);
+ return ret;
+}
+
+
static int testConnectNumOfDefinedDomains(virConnectPtr conn)
{
testDriverPtr privconn = conn->privateData;
@@ -7369,6 +7432,7 @@ static virHypervisorDriver testHypervisorDriver = {
.domainGetXMLDesc = testDomainGetXMLDesc, /* 0.1.4 */
.domainGetMemoryParameters = testDomainGetMemoryParameters, /* 5.6.0 */
.domainGetNumaParameters = testDomainGetNumaParameters, /* 5.6.0 */
+ .domainGetInterfaceParameters = testDomainGetInterfaceParameters, /* 5.6.0 */
.connectListDefinedDomains = testConnectListDefinedDomains, /* 0.1.11 */
.connectNumOfDefinedDomains = testConnectNumOfDefinedDomains, /* 0.1.11 */
.domainCreate = testDomainCreate, /* 0.1.11 */
--
2.22.0
7:50 a.m.
New subject: [libvirt] [PATCH 4/4] test_driver: implement testDomainGetInterfaceParameters
On Tue, Jul 02, 2019 at 02:29:02PM +0200, Ilias Stamatis wrote:
Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com>
---
src/test/test_driver.c | 64 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 64 insertions(+)
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 8c3a41b34b..59937ea968 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -2935,6 +2935,69 @@ testDomainGetNumaParameters(virDomainPtr dom,
}
+static int
+testDomainGetInterfaceParameters(virDomainPtr dom,
+ const char *device,
+ virTypedParameterPtr params,
+ int *nparams,
+ unsigned int flags)
+{
+ unsigned int in_average = 0, in_peak = 0, in_burst = 0, in_floor = 0;
+ unsigned int out_average = 0, out_peak = 0, out_burst = 0;
^This is against the coding style, keep it 1 variable definition per line.
+ virDomainObjPtr vm = NULL;
+ virDomainDefPtr def = NULL;
+ virDomainNetDefPtr net = NULL;
+ int ret = -1;
+
+ virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
+ VIR_DOMAIN_AFFECT_CONFIG |
+ VIR_TYPED_PARAM_STRING_OKAY, -1);
+
+ if ((*nparams) == 0) {
+ *nparams = 7;
+ return 0;
+ }
+
+ if (!(vm = testDomObjFromDomain(dom)))
+ return -1;
+
+ if (!(def = virDomainObjGetOneDef(vm, flags)))
+ goto cleanup;
+
+ if (!(net = virDomainNetFind(def, device)))
+ goto cleanup;
+
+ if (net->bandwidth && net->bandwidth->in) {
+ in_average = net->bandwidth->in->average;
+ in_peak = net->bandwidth->in->peak;
+ in_burst = net->bandwidth->in->burst;
+ in_floor = net->bandwidth->in->floor;
+ }
+
+ if (net->bandwidth && net->bandwidth->out) {
+ out_average = net->bandwidth->out->average;
+ out_peak = net->bandwidth->out->peak;
+ out_burst = net->bandwidth->out->burst;
+ }
We could also save 1 comparison with
'if (net->bandwidth) {
if (in){}
if (out){}
}'
...alternatively, you could introduce a structure with all the attributes
packed and introduce a helper like testDomainFillInterfaceParameters and then
you'd do
if (net->bandwidth)
testDomainFillInterfaceParameters(net->bandwidth, ¶ms);
Otherwise looking good.
Erik
+
+ TEST_SET_PARAM(0, VIR_DOMAIN_BANDWIDTH_IN_AVERAGE, VIR_TYPED_PARAM_UINT,
in_average);
+ TEST_SET_PARAM(1, VIR_DOMAIN_BANDWIDTH_IN_PEAK, VIR_TYPED_PARAM_UINT, in_peak);
+ TEST_SET_PARAM(2, VIR_DOMAIN_BANDWIDTH_IN_BURST, VIR_TYPED_PARAM_UINT, in_burst);
+ TEST_SET_PARAM(3, VIR_DOMAIN_BANDWIDTH_IN_FLOOR, VIR_TYPED_PARAM_UINT, in_floor);
+ TEST_SET_PARAM(4, VIR_DOMAIN_BANDWIDTH_OUT_AVERAGE, VIR_TYPED_PARAM_UINT,
out_average);
+ TEST_SET_PARAM(5, VIR_DOMAIN_BANDWIDTH_OUT_PEAK, VIR_TYPED_PARAM_UINT, out_peak);
+ TEST_SET_PARAM(6, VIR_DOMAIN_BANDWIDTH_OUT_BURST, VIR_TYPED_PARAM_UINT, out_burst);
+
+ if (*nparams > 7)
+ *nparams = 7;
+
+ ret = 0;
+ cleanup:
+ virDomainObjEndAPI(&vm);
+ return ret;
+}
+
+
static int testConnectNumOfDefinedDomains(virConnectPtr conn)
{
testDriverPtr privconn = conn->privateData;
@@ -7369,6 +7432,7 @@ static virHypervisorDriver testHypervisorDriver = {
.domainGetXMLDesc = testDomainGetXMLDesc, /* 0.1.4 */
.domainGetMemoryParameters = testDomainGetMemoryParameters, /* 5.6.0 */
.domainGetNumaParameters = testDomainGetNumaParameters, /* 5.6.0 */
+ .domainGetInterfaceParameters = testDomainGetInterfaceParameters, /* 5.6.0 */
.connectListDefinedDomains = testConnectListDefinedDomains, /* 0.1.11 */
.connectNumOfDefinedDomains = testConnectNumOfDefinedDomains, /* 0.1.11 */
.domainCreate = testDomainCreate, /* 0.1.11 */
--
2.22.0
--
libvir-list mailing list
libvir-list(a)redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
8:36 a.m.
New subject: [libvirt] [PATCH 4/4] test_driver: implement testDomainGetInterfaceParameters
On Tue, Jul 2, 2019 at 2:50 PM Erik Skultety <eskultet(a)redhat.com> wrote:
On Tue, Jul 02, 2019 at 02:29:02PM +0200, Ilias Stamatis wrote:
> Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com>
> ---
> src/test/test_driver.c | 64 ++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 64 insertions(+)
>
> diff --git a/src/test/test_driver.c b/src/test/test_driver.c
> index 8c3a41b34b..59937ea968 100644
> --- a/src/test/test_driver.c
> +++ b/src/test/test_driver.c
> @@ -2935,6 +2935,69 @@ testDomainGetNumaParameters(virDomainPtr dom,
> }
>
>
> +static int
> +testDomainGetInterfaceParameters(virDomainPtr dom,
> + const char *device,
> + virTypedParameterPtr params,
> + int *nparams,
> + unsigned int flags)
> +{
> + unsigned int in_average = 0, in_peak = 0, in_burst = 0, in_floor = 0;
> + unsigned int out_average = 0, out_peak = 0, out_burst = 0;
^This is against the coding style, keep it 1 variable definition per line.
> + virDomainObjPtr vm = NULL;
> + virDomainDefPtr def = NULL;
> + virDomainNetDefPtr net = NULL;
> + int ret = -1;
> +
> + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
> + VIR_DOMAIN_AFFECT_CONFIG |
> + VIR_TYPED_PARAM_STRING_OKAY, -1);
> +
> + if ((*nparams) == 0) {
> + *nparams = 7;
> + return 0;
> + }
> +
> + if (!(vm = testDomObjFromDomain(dom)))
> + return -1;
> +
> + if (!(def = virDomainObjGetOneDef(vm, flags)))
> + goto cleanup;
> +
> + if (!(net = virDomainNetFind(def, device)))
> + goto cleanup;
> +
> + if (net->bandwidth && net->bandwidth->in) {
> + in_average = net->bandwidth->in->average;
> + in_peak = net->bandwidth->in->peak;
> + in_burst = net->bandwidth->in->burst;
> + in_floor = net->bandwidth->in->floor;
> + }
> +
> + if (net->bandwidth && net->bandwidth->out) {
> + out_average = net->bandwidth->out->average;
> + out_peak = net->bandwidth->out->peak;
> + out_burst = net->bandwidth->out->burst;
> + }
We could also save 1 comparison with
'if (net->bandwidth) {
if (in){}
if (out){}
}'
...alternatively, you could introduce a structure with all the attributes
packed and introduce a helper like testDomainFillInterfaceParameters and then
you'd do
if (net->bandwidth)
testDomainFillInterfaceParameters(net->bandwidth, ¶ms);
Now that you're saying that, I can actually use virNetDevBandwidthRate
which is already defined.
And if net->bandwidth->in and net->bandwidth->out exist I can just
copy the whole structs as they are.
I think that's what's simplest so I'll go with it.
Thanks,
Ilias
Otherwise looking good.
Erik
> +
> + TEST_SET_PARAM(0, VIR_DOMAIN_BANDWIDTH_IN_AVERAGE, VIR_TYPED_PARAM_UINT,
in_average);
> + TEST_SET_PARAM(1, VIR_DOMAIN_BANDWIDTH_IN_PEAK, VIR_TYPED_PARAM_UINT,
in_peak);
> + TEST_SET_PARAM(2, VIR_DOMAIN_BANDWIDTH_IN_BURST, VIR_TYPED_PARAM_UINT,
in_burst);
> + TEST_SET_PARAM(3, VIR_DOMAIN_BANDWIDTH_IN_FLOOR, VIR_TYPED_PARAM_UINT,
in_floor);
> + TEST_SET_PARAM(4, VIR_DOMAIN_BANDWIDTH_OUT_AVERAGE, VIR_TYPED_PARAM_UINT,
out_average);
> + TEST_SET_PARAM(5, VIR_DOMAIN_BANDWIDTH_OUT_PEAK, VIR_TYPED_PARAM_UINT,
out_peak);
> + TEST_SET_PARAM(6, VIR_DOMAIN_BANDWIDTH_OUT_BURST, VIR_TYPED_PARAM_UINT,
out_burst);
> +
> + if (*nparams > 7)
> + *nparams = 7;
> +
> + ret = 0;
> + cleanup:
> + virDomainObjEndAPI(&vm);
> + return ret;
> +}
> +
> +
> static int testConnectNumOfDefinedDomains(virConnectPtr conn)
> {
> testDriverPtr privconn = conn->privateData;
> @@ -7369,6 +7432,7 @@ static virHypervisorDriver testHypervisorDriver = {
> .domainGetXMLDesc = testDomainGetXMLDesc, /* 0.1.4 */
> .domainGetMemoryParameters = testDomainGetMemoryParameters, /* 5.6.0 */
> .domainGetNumaParameters = testDomainGetNumaParameters, /* 5.6.0 */
> + .domainGetInterfaceParameters = testDomainGetInterfaceParameters, /* 5.6.0 */
> .connectListDefinedDomains = testConnectListDefinedDomains, /* 0.1.11 */
> .connectNumOfDefinedDomains = testConnectNumOfDefinedDomains, /* 0.1.11 */
> .domainCreate = testDomainCreate, /* 0.1.11 */
> --
> 2.22.0
>
> --
> libvir-list mailing list
> libvir-list(a)redhat.com
> https://www.redhat.com/mailman/listinfo/libvir-list
1970
days inactive
1970
days old
7 comments
3 participants
participants (3)
-
Erik Skultety -
Ilias Stamatis -
Peter Krempa