Few patches from old branches. Peter Krempa (4): util: virdevmapper: Sanitize use of macros for buffer size virDevMapperGetTargets: Use a linked list as return type util: virstring: Remove unused 'virStringListMerge' qemuMonitorJSONGetStatus: Refactor cleanup src/libvirt_private.syms | 1 - src/qemu/qemu_cgroup.c | 11 ++++---- src/qemu/qemu_monitor_json.c | 18 +++++-------- src/qemu/qemu_namespace.c | 9 +++---- src/util/virdevmapper.c | 49 +++++++++++++++++------------------- src/util/virdevmapper.h | 2 +- src/util/virstring.c | 35 -------------------------- src/util/virstring.h | 3 --- tests/qemuhotplugmock.c | 10 +++----- 9 files changed, 43 insertions(+), 95 deletions(-) -- 2.31.1