4:23 p.m.
Ilias Stamatis (2):
test_driver: use addr_offset for non-network infs too
test_driver: use virDomainNetDefPtr instead of virDomainNetDef *
src/test/test_driver.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
--
2.22.0
4:23 p.m.
New subject: [libvirt] [PATCH 1/2] test_driver: use addr_offset for non-network infs too
The addr_offset can be used even for the hard-coded addresses in an
attempt to always return unique ips.
Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com>
---
src/test/test_driver.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 4b1f2724a0..d3bc6e7bce 100755
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -3508,6 +3508,8 @@ testDomainInterfaceAddresses(virDomainPtr dom,
goto cleanup;
for (i = 0; i < vm->def->nnets; i++) {
+ /* try using different addresses per different inf and domain */
+ const size_t addr_offset = 20 * (vm->def->id - 1) + i + 1;
const virDomainNetDef *net = vm->def->nets[i];
if (VIR_ALLOC(iface) < 0)
@@ -3525,18 +3527,14 @@ testDomainInterfaceAddresses(virDomainPtr dom,
iface->naddrs = 1;
if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) {
- /* try using different addresses per different inf and domain */
- const size_t addr_offset = 20 * (vm->def->id - 1) + i + 1;
-
if (testDomainInterfaceAddressFromNet(dom->conn->privateData,
net, addr_offset, iface) < 0)
goto cleanup;
} else {
iface->addrs[0].type = VIR_IP_ADDR_TYPE_IPV4;
iface->addrs[0].prefix = 24;
- if (virAsprintf(&iface->addrs[0].addr, "192.168.0.%zu", 1 +
i) < 0)
+ if (virAsprintf(&iface->addrs[0].addr, "192.168.0.%zu",
addr_offset) < 0)
goto cleanup;
-
}
VIR_APPEND_ELEMENT_INPLACE(ifaces_ret, ifaces_count, iface);
--
2.22.0
4:23 p.m.
New subject: [libvirt] [PATCH 2/2] test_driver: use virDomainNetDefPtr instead of virDomainNetDef *
Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com>
---
src/test/test_driver.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index d3bc6e7bce..868dadd682 100755
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -3433,7 +3433,7 @@ static int testDomainBlockStats(virDomainPtr domain,
static int
testDomainInterfaceAddressFromNet(testDriverPtr driver,
- const virDomainNetDef *net,
+ virDomainNetDefPtr const net,
size_t addr_offset,
virDomainInterfacePtr iface)
{
@@ -3510,7 +3510,7 @@ testDomainInterfaceAddresses(virDomainPtr dom,
for (i = 0; i < vm->def->nnets; i++) {
/* try using different addresses per different inf and domain */
const size_t addr_offset = 20 * (vm->def->id - 1) + i + 1;
- const virDomainNetDef *net = vm->def->nets[i];
+ virDomainNetDefPtr const net = vm->def->nets[i];
if (VIR_ALLOC(iface) < 0)
goto cleanup;
--
2.22.0
1947
days inactive
1947
days old
2 comments
1 participants
participants (1)
-
Ilias Stamatis