NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu_monitor: Declare and use g_autoptr for qemuMonitorEventPanicInfo

Browse Source 
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Tim Wiederhake <twiederh@redhat.com>
This commit is contained in:
Michal Privoznik 2021-10-22 09:31:22 +02:00
parent 4b1b14170a
commit 3dfc47c1fd
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/qemu/qemu_monitor.h
View File

@ -194,6 +194,7 @@ struct _qemuMonitorJobInfo {
char *qemuMonitorGuestPanicEventInfoFormatMsg(qemuMonitorEventPanicInfo *info); char *qemuMonitorGuestPanicEventInfoFormatMsg(qemuMonitorEventPanicInfo *info);
void qemuMonitorEventPanicInfoFree(qemuMonitorEventPanicInfo *info); void qemuMonitorEventPanicInfoFree(qemuMonitorEventPanicInfo *info);
G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuMonitorEventPanicInfo, qemuMonitorEventPanicInfoFree);
void qemuMonitorEventRdmaGidStatusFree(qemuMonitorRdmaGidStatus *info); void qemuMonitorEventRdmaGidStatusFree(qemuMonitorRdmaGidStatus *info);
void qemuMonitorMemoryDeviceSizeChangeFree(qemuMonitorMemoryDeviceSizeChange *info); void qemuMonitorMemoryDeviceSizeChangeFree(qemuMonitorMemoryDeviceSizeChange *info);

22
src/qemu/qemu_monitor_json.c
View File

@ -605,9 +605,7 @@ static void qemuMonitorJSONHandleResume(qemuMonitor *mon, virJSONValue *data G_G
static qemuMonitorEventPanicInfo * static qemuMonitorEventPanicInfo *
qemuMonitorJSONGuestPanicExtractInfoHyperv(virJSONValue *data) qemuMonitorJSONGuestPanicExtractInfoHyperv(virJSONValue *data)
{ {
qemuMonitorEventPanicInfo *ret; g_autoptr(qemuMonitorEventPanicInfo) ret = g_new0(qemuMonitorEventPanicInfo, 1);
ret = g_new0(qemuMonitorEventPanicInfo, 1);
ret->type = QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_HYPERV; ret->type = QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_HYPERV;
@ -618,20 +616,16 @@ qemuMonitorJSONGuestPanicExtractInfoHyperv(virJSONValue *data)
virJSONValueObjectGetNumberUlong(data, "arg5", &ret->data.hyperv.arg5) < 0) { virJSONValueObjectGetNumberUlong(data, "arg5", &ret->data.hyperv.arg5) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("malformed hyperv panic data")); _("malformed hyperv panic data"));
goto error; return NULL;
} }
return ret; return g_steal_pointer(&ret);
error:
qemuMonitorEventPanicInfoFree(ret);
return NULL;
} }
static qemuMonitorEventPanicInfo * static qemuMonitorEventPanicInfo *
qemuMonitorJSONGuestPanicExtractInfoS390(virJSONValue *data) qemuMonitorJSONGuestPanicExtractInfoS390(virJSONValue *data)
{ {
qemuMonitorEventPanicInfo *ret; g_autoptr(qemuMonitorEventPanicInfo) ret = NULL;
int core; int core;
unsigned long long psw_mask, psw_addr; unsigned long long psw_mask, psw_addr;
const char *reason = NULL; const char *reason = NULL;
@ -645,7 +639,7 @@ qemuMonitorJSONGuestPanicExtractInfoS390(virJSONValue *data)
virJSONValueObjectGetNumberUlong(data, "psw-addr", &psw_addr) < 0 || virJSONValueObjectGetNumberUlong(data, "psw-addr", &psw_addr) < 0 ||
!(reason = virJSONValueObjectGetString(data, "reason"))) { !(reason = virJSONValueObjectGetString(data, "reason"))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("malformed s390 panic data")); virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("malformed s390 panic data"));
goto error; return NULL;
} }
ret->data.s390.core = core; ret->data.s390.core = core;
@ -654,11 +648,7 @@ qemuMonitorJSONGuestPanicExtractInfoS390(virJSONValue *data)
ret->data.s390.reason = g_strdup(reason); ret->data.s390.reason = g_strdup(reason);
return ret; return g_steal_pointer(&ret);
error:
qemuMonitorEventPanicInfoFree(ret);
return NULL;
} }
static qemuMonitorEventPanicInfo * static qemuMonitorEventPanicInfo *