These all bubbled to the top of a series that adds support for an nftables backend to the network driver, but are valid patches by themselves, so I'm sending them separately to make the other series look shorter. Laine Stump (16): conf: replace explicit virNetworkDefFree() with g_autoptr(virNetworkDef) esx: replace explicit virNetworkDefFree() with g_autoptr(virNetworkDef) network: replace explicit virNetworkDefFree() with g_autoptr(virNetworkDef) qemu: replace explicit virNetworkDefFree() with g_autoptr(virNetworkDef) test driver: replace explicit virNetworkDefFree() with g_autoptr(virNetworkDef) vbox: replace explicit virNetworkDefFree() with g_autoptr(virNetworkDef) tests: replace explicit virNetworkDefFree() with g_autoptr(virNetworkDef) conf: remove superfluous cleanup: labels and ret return variables qemu: remove superfluous cleanup: labels and ret return variables tests: remove superfluous cleanup: labels and ret return variables network: move driver state struct into bridge_driver_conf.h network: create separate config object for virNetworkDriverState util: replace g_snprintf with g_autofreed g_strdup_printf in viriptables.c util: remove unused function virFirewallApplyRuleFirewallD() util: make virFirewallRuleToString() global util: don't use virFirewallRuleToString() to log the rule being applied po/POTFILES | 1 + src/conf/domain_conf.c | 26 +-- src/conf/virnetworkobj.c | 72 ++++----- src/esx/esx_network_driver.c | 6 +- src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 233 ++++++++++++--------------- src/network/bridge_driver_conf.c | 165 +++++++++++++++++++ src/network/bridge_driver_conf.h | 82 ++++++++++ src/network/bridge_driver_platform.h | 43 +---- src/network/meson.build | 1 + src/qemu/qemu_process.c | 24 ++- src/test/test_driver.c | 6 +- src/util/virfirewall.c | 28 ++-- src/util/virfirewall.h | 3 + src/util/viriptables.c | 15 +- src/vbox/vbox_network.c | 6 +- tests/networkxml2firewalltest.c | 15 +- tests/networkxml2xmltest.c | 3 +- tests/networkxml2xmlupdatetest.c | 8 +- 19 files changed, 443 insertions(+), 295 deletions(-) create mode 100644 src/network/bridge_driver_conf.c create mode 100644 src/network/bridge_driver_conf.h -- 2.37.1