7:49 a.m.
Ilias Stamatis (2):
test_driver: implement virDomainInterfaceAddresses
test_driver: add a guest interface in the default config
src/test/test_driver.c | 73 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 73 insertions(+)
--
2.21.0
7:50 a.m.
New subject: [libvirt] [PATCH v2 1/2] test_driver: implement virDomainInterfaceAddresses
Ignore @source in the case of the test driver and return fixed private
IPv4 addresses for all the interfaces defined in the domain.
Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com>
---
src/test/test_driver.c | 66 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 66 insertions(+)
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index a4c17ef0df..ac3b3d1e89 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -3220,6 +3220,71 @@ static int testDomainBlockStats(virDomainPtr domain,
return ret;
}
+static int
+testDomainInterfaceAddresses(virDomainPtr dom,
+ virDomainInterfacePtr **ifaces,
+ unsigned int source ATTRIBUTE_UNUSED,
+ unsigned int flags)
+{
+ size_t i;
+ size_t ifaces_count = 0;
+ int ret = -1;
+ char macaddr[VIR_MAC_STRING_BUFLEN];
+ virDomainObjPtr vm = NULL;
+ virDomainInterfacePtr iface = NULL;
+ virDomainInterfacePtr *ifaces_ret = NULL;
+
+ virCheckFlags(0, -1);
+
+ if (!(vm = testDomObjFromDomain(dom)))
+ goto cleanup;
+
+ if (virDomainObjCheckActive(vm) < 0)
+ goto cleanup;
+
+ if (VIR_ALLOC_N(ifaces_ret, vm->def->nnets) < 0)
+ goto cleanup;
+
+ for (i = 0; i < vm->def->nnets; i++) {
+ if (VIR_ALLOC(iface) < 0)
+ goto cleanup;
+
+ if (VIR_STRDUP(iface->name, vm->def->nets[i]->ifname) < 0)
+ goto cleanup;
+
+ virMacAddrFormat(&(vm->def->nets[i]->mac), macaddr);
+ if (VIR_STRDUP(iface->hwaddr, macaddr) < 0)
+ goto cleanup;
+
+ if (VIR_ALLOC(iface->addrs) < 0)
+ goto cleanup;
+
+ iface->addrs[0].type = VIR_IP_ADDR_TYPE_IPV4;
+ iface->addrs[0].prefix = 24;
+ if (virAsprintf(&iface->addrs[0].addr, "192.168.0.%ld", 1 + i)
< 0)
+ goto cleanup;
+
+ iface->naddrs = 1;
+
+ VIR_APPEND_ELEMENT_INPLACE(ifaces_ret, ifaces_count, iface);
+ }
+
+ VIR_STEAL_PTR(*ifaces, ifaces_ret);
+ ret = ifaces_count;
+
+ cleanup:
+ virDomainObjEndAPI(&vm);
+
+ if (ifaces_ret) {
+ for (i = 0; i < ifaces_count; i++)
+ virDomainInterfaceFree(ifaces_ret[i]);
+ }
+ virDomainInterfaceFree(iface);
+
+ VIR_FREE(ifaces_ret);
+ return ret;
+}
+
static int
testDomainInterfaceStats(virDomainPtr domain,
const char *device,
@@ -6876,6 +6941,7 @@ static virHypervisorDriver testHypervisorDriver = {
.domainSetSchedulerParameters = testDomainSetSchedulerParameters, /* 0.3.2 */
.domainSetSchedulerParametersFlags = testDomainSetSchedulerParametersFlags, /* 0.9.2
*/
.domainBlockStats = testDomainBlockStats, /* 0.7.0 */
+ .domainInterfaceAddresses = testDomainInterfaceAddresses, /* 5.4.0 */
.domainInterfaceStats = testDomainInterfaceStats, /* 0.7.0 */
.nodeGetCellsFreeMemory = testNodeGetCellsFreeMemory, /* 0.4.2 */
.connectDomainEventRegister = testConnectDomainEventRegister, /* 0.6.0 */
--
2.21.0
3:06 a.m.
New subject: [libvirt] [PATCH v2 1/2] test_driver: implement virDomainInterfaceAddresses
On Thu, May 23, 2019 at 02:50:00PM +0200, Ilias Stamatis wrote:
Ignore @source in the case of the test driver and return fixed
private
IPv4 addresses for all the interfaces defined in the domain.
Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com>
---
Reviewed-by: Erik Skultety <eskultet(a)redhat.com>
7:50 a.m.
New subject: [libvirt] [PATCH v2 2/2] test_driver: add a guest interface in the default config
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 ac3b3d1e89..b29fd12903 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -436,6 +436,13 @@ static const char *defaultConnXML =
" <os>"
" <type>hvm</type>"
" </os>"
+" <devices>"
+" <interface type='network'>"
+" <mac address='aa:bb:cc:dd:ee:ff'/>"
+" <source network='default' bridge='virbr0'/>"
+" <address type='pci' domain='0x0000' bus='0x00'
slot='0x1' function='0x0'/>"
+" </interface>"
+" </devices>"
"</domain>"
""
"<network>"
--
2.21.0
3:04 a.m.
New subject: [libvirt] [PATCH v2 2/2] test_driver: add a guest interface in the default config
On Thu, May 23, 2019 at 02:50:01PM +0200, Ilias Stamatis wrote:
Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com>
---
I think this patch should come first, because e.g. 'domiflist' virsh command
can already make use of the data.
I'll swap the order before pushing.
Reviewed-by: Erik Skultety <eskultet(a)redhat.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 ac3b3d1e89..b29fd12903 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -436,6 +436,13 @@ static const char *defaultConnXML =
" <os>"
" <type>hvm</type>"
" </os>"
+" <devices>"
+" <interface type='network'>"
+" <mac address='aa:bb:cc:dd:ee:ff'/>"
+" <source network='default' bridge='virbr0'/>"
+" <address type='pci' domain='0x0000' bus='0x00'
slot='0x1' function='0x0'/>"
+" </interface>"
+" </devices>"
"</domain>"
""
"<network>"
--
2.21.0
1996
days inactive
1997
days old
4 comments
2 participants
participants (2)
-
Erik Skultety -
Ilias Stamatis