[PATCH 05/37] qemu: monitor: Don't parse actual fd's from query-fdsets/add-fd replies

Libvirt doesn't use the returned value and in fact there's nothing we could even do with them. Avoid parsing and storing them. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/qemu/qemu_monitor.h | 2 -- src/qemu/qemu_monitor_json.c | 12 ------------ 2 files changed, 14 deletions(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 5c2a749282..e6a50e73f7 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -943,7 +943,6 @@ int qemuMonitorGraphicsRelocate(qemuMonitor *mon, typedef struct _qemuMonitorAddFdInfo qemuMonitorAddFdInfo; struct _qemuMonitorAddFdInfo { - int fd; int fdset; }; int @@ -959,7 +958,6 @@ qemuMonitorRemoveFdset(qemuMonitor *mon, typedef struct _qemuMonitorFdsetFdInfo qemuMonitorFdsetFdInfo; struct _qemuMonitorFdsetFdInfo { - int fd; char *opaque; }; typedef struct _qemuMonitorFdsetInfo qemuMonitorFdsetInfo; diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 9e611e93e8..659d957b04 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -3606,12 +3606,6 @@ qemuAddfdInfoParse(virJSONValue *msg, return -1; } - if (virJSONValueObjectGetNumberInt(returnObj, "fd", &fdinfo->fd) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Missing or invalid fd in add-fd response")); - return -1; - } - if (virJSONValueObjectGetNumberInt(returnObj, "fdset-id", &fdinfo->fdset) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing or invalid fdset-id in add-fd response")); @@ -3706,12 +3700,6 @@ qemuMonitorJSONQueryFdsetsParse(virJSONValue *msg, return -1; } - if (virJSONValueObjectGetNumberInt(fdentry, "fd", &fdinfo->fd) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-fdsets return data missing 'fd'")); - return -1; - } - /* opaque is optional and may be missing */ fdinfo->opaque = g_strdup(virJSONValueObjectGetString(fdentry, "opaque")); } -- 2.35.1