Add the optional `responsibleProps` (char ***) parameter to qemuMonitorGetCPUModelComparison() in the public monitor API and wire it through to the JSON implementation. The parameter is optional — callers that pass NULL preserve existing behaviour. The existing caller in qemu_driver.c is updated to pass NULL so the build continues to work until the caller is refactored in the next patch. Signed-off-by: Rorie Reyes <rreyes@linux.ibm.com> --- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_monitor.c | 8 +++++--- src/qemu/qemu_monitor.h | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ebf19d7c0f..7332ec0256 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12137,7 +12137,7 @@ qemuConnectCPUModelComparison(virQEMUCaps *qemuCaps, if (qemuProcessQMPStart(proc) < 0) return VIR_CPU_COMPARE_ERROR; - if (qemuMonitorGetCPUModelComparison(proc->mon, cpu_a, cpu_b, &result) < 0) + if (qemuMonitorGetCPUModelComparison(proc->mon, cpu_a, cpu_b, &result, NULL) < 0) return VIR_CPU_COMPARE_ERROR; if (STREQ(result, "identical")) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index e3edc88814..88127ca27d 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -3329,13 +3329,15 @@ int qemuMonitorGetCPUModelComparison(qemuMonitor *mon, virCPUDef *cpu_a, virCPUDef *cpu_b, - char **result) + char **result, + char ***responsibleProps) { - VIR_DEBUG("cpu_a=%p cpu_b=%p", cpu_a, cpu_b); + VIR_DEBUG("cpu_a=%p cpu_b=%p responsibleProps=%p", cpu_a, cpu_b, responsibleProps); QEMU_CHECK_MONITOR(mon); - return qemuMonitorJSONGetCPUModelComparison(mon, cpu_a, cpu_b, result, NULL); + return qemuMonitorJSONGetCPUModelComparison(mon, cpu_a, cpu_b, result, + responsibleProps); } diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index e9b6a25f0c..ddea8796c4 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -1485,7 +1485,8 @@ int qemuMonitorGetCPUModelComparison(qemuMonitor *mon, virCPUDef *cpu_a, virCPUDef *cpu_b, - char **result); + char **result, + char ***responsibleProps); qemuMonitorCPUModelInfo * qemuMonitorCPUModelInfoCopy(const qemuMonitorCPUModelInfo *orig); -- 2.48.1