These were prompted by the review on the original series. Both
will be pushed as trivial once the release is out.
Peter Krempa (2):
qemu: Remove ATTRIBUTE_UNUSED from 'qemuCaps' of
virQEMUCapsInitQMPMonitorTCG
qemu: Remove cleanup section of virQEMUCapsInitQMPMonitorTCG
src/qemu/qemu_capabilities.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
--
2.20.1
Show replies by date
It's actually used.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index eb91295f93..67cdb8ab96 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -4389,7 +4389,7 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
int
-virQEMUCapsInitQMPMonitorTCG(virQEMUCapsPtr qemuCaps ATTRIBUTE_UNUSED,
+virQEMUCapsInitQMPMonitorTCG(virQEMUCapsPtr qemuCaps,
qemuMonitorPtr mon)
{
int ret = -1;
--
2.20.1
There's nothing to clean up.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 67cdb8ab96..b55274955e 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -4392,17 +4392,13 @@ int
virQEMUCapsInitQMPMonitorTCG(virQEMUCapsPtr qemuCaps,
qemuMonitorPtr mon)
{
- int ret = -1;
-
if (virQEMUCapsProbeQMPCPUDefinitions(qemuCaps, mon, true) < 0)
- goto cleanup;
+ return -1;
if (virQEMUCapsProbeQMPHostCPU(qemuCaps, mon, true) < 0)
- goto cleanup;
+ return -1;
- ret = 0;
- cleanup:
- return ret;
+ return 0;
}
--
2.20.1