On 4/10/25 16:48, Roman Bogorodskiy wrote:
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@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(-)
To make life of a downstream maintainer easier, I'd split this into two separate commits: one that modifies src/conf/* and the other that modifies src/bhyve/*.
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);
There's another function that could be changed too: virDomainNetNotifyActualDevice(). It's very similar to virDomainNetAllocateActualDevice() in a sense that it's also a thin wrapper over virDomainNetCreatePort(). Michal