[PATCH] conf: use const virDomainDef pointers
Some virDomainNet* functions use virDomainDef pointers even though they
don't modify the domain config, so switch to const pointers there.
This also allows to use the const pointer again in
bhyveBuildNetArgStr() after it was changed in e1e40b5035.
Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com>
---
src/bhyve/bhyve_command.c | 2 +-
src/conf/domain_conf.c | 8 ++++----
src/conf/domain_conf.h | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c
index b9f4a15200..6578a4326c 100644
--- a/src/bhyve/bhyve_command.c
+++ b/src/bhyve/bhyve_command.c
@@ -42,7 +42,7 @@
VIR_LOG_INIT("bhyve.bhyve_command");
static int
-bhyveBuildNetArgStr(virDomainDef *def,
+bhyveBuildNetArgStr(const virDomainDef *def,
virDomainNetDef *net,
struct _bhyveConn *driver,
virCommand *cmd,
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index c724638180..c1793334a9 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -31002,7 +31002,7 @@ virDomainNetTypeSharesHostView(const virDomainNetDef *net)
}
virNetworkPortDef *
-virDomainNetDefToNetworkPort(virDomainDef *dom,
+virDomainNetDefToNetworkPort(const virDomainDef *dom,
virDomainNetDef *iface)
{
g_autoptr(virNetworkPortDef) port = NULL;
@@ -31128,7 +31128,7 @@ virDomainNetDefActualFromNetworkPort(virDomainNetDef *iface,
}
virNetworkPortDef *
-virDomainNetDefActualToNetworkPort(virDomainDef *dom,
+virDomainNetDefActualToNetworkPort(const virDomainDef *dom,
virDomainNetDef *iface)
{
virDomainActualNetDef *actual;
@@ -31240,7 +31240,7 @@ virDomainNetDefActualToNetworkPort(virDomainDef *dom,
static int
virDomainNetCreatePort(virConnectPtr conn,
- virDomainDef *dom,
+ const virDomainDef *dom,
virDomainNetDef *iface,
unsigned int flags)
{
@@ -31305,7 +31305,7 @@ virDomainNetCreatePort(virConnectPtr conn,
int
virDomainNetAllocateActualDevice(virConnectPtr conn,
- virDomainDef *dom,
+ const virDomainDef *dom,
virDomainNetDef *iface)
{
return virDomainNetCreatePort(conn, dom, iface, 0);
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 8dfadbb98d..ff8c6abdd0 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -4531,7 +4531,7 @@ virDomainDefLifecycleActionAllowed(virDomainLifecycle type,
virDomainLifecycleAction action);
virNetworkPortDef *
-virDomainNetDefToNetworkPort(virDomainDef *dom,
+virDomainNetDefToNetworkPort(const virDomainDef *dom,
virDomainNetDef *iface);
int
@@ -4539,12 +4539,12 @@ virDomainNetDefActualFromNetworkPort(virDomainNetDef *iface,
virNetworkPortDef *port);
virNetworkPortDef *
-virDomainNetDefActualToNetworkPort(virDomainDef *dom,
+virDomainNetDefActualToNetworkPort(const virDomainDef *dom,
virDomainNetDef *iface);
int
virDomainNetAllocateActualDevice(virConnectPtr conn,
- virDomainDef *dom,
+ const virDomainDef *dom,
virDomainNetDef *iface)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
--
2.49.0