[PATCH v2 0/2] conf: use const virDomainDef pointers
Changes since v1: - Split domain_conf and bhyve changes into separate commits - Convert virDomainNetNotifyActualDevice() as well Roman Bogorodskiy (2): conf: use const virDomainDef pointers bhyve: use const virDomainDef pointer in bhyveBuildNetArgStr() src/bhyve/bhyve_command.c | 2 +- src/conf/domain_conf.c | 10 +++++----- src/conf/domain_conf.h | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) -- 2.49.0
Some virDomainNet* functions use virDomainDef pointers even though they don't modify the domain config, so switch to const pointers there. Signed-off-by: Roman Bogorodskiy <bogorodskiy@gmail.com> --- src/conf/domain_conf.c | 10 +++++----- src/conf/domain_conf.h | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c724638180..542d6ade91 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); @@ -31313,7 +31313,7 @@ virDomainNetAllocateActualDevice(virConnectPtr conn, void virDomainNetNotifyActualDevice(virConnectPtr conn, - virDomainDef *dom, + const virDomainDef *dom, virDomainNetDef *iface) { virDomainNetType actualType = virDomainNetGetActualType(iface); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 8dfadbb98d..58b97a2b54 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,18 +4539,18 @@ 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); void virDomainNetNotifyActualDevice(virConnectPtr conn, - virDomainDef *dom, + const virDomainDef *dom, virDomainNetDef *iface) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); -- 2.49.0
As virDomainNet* functions were converted to use const virDomainDef pointers, update bhyveBuildNetArgStr() as well, like it was before it was changed in e1e40b5035. Signed-off-by: Roman Bogorodskiy <bogorodskiy@gmail.com> --- src/bhyve/bhyve_command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, -- 2.49.0
On a Sunday in 2025, Roman Bogorodskiy wrote:
Changes since v1:
- Split domain_conf and bhyve changes into separate commits - Convert virDomainNetNotifyActualDevice() as well
Roman Bogorodskiy (2): conf: use const virDomainDef pointers bhyve: use const virDomainDef pointer in bhyveBuildNetArgStr()
src/bhyve/bhyve_command.c | 2 +- src/conf/domain_conf.c | 10 +++++----- src/conf/domain_conf.h | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
participants (2)
-
Ján Tomko -
Roman Bogorodskiy