From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 24 Jan 2022 15:30:13 +0000 (+0100)
Subject: qemu: monitor: Make 'id' in 'struct _qemuMonitorFdsetInfo' unsigned
X-Git-Tag: v8.1.0-rc1~82
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b07991c19099a95c9fd3954a6c53cbe5a60cd1a;p=thirdparty%2Flibvirt.git

qemu: monitor: Make 'id' in 'struct _qemuMonitorFdsetInfo' unsigned

Similarly to the 'qemuMonitorRemoveFdset', it doesn't make sense
to store it as signed when only unsigned values are expected.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 27e288c724..4c22394972 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -983,7 +983,7 @@ struct _qemuMonitorFdsetFdInfo {
 };
 typedef struct _qemuMonitorFdsetInfo qemuMonitorFdsetInfo;
 struct _qemuMonitorFdsetInfo {
-    int id;
+    unsigned int id;
     qemuMonitorFdsetFdInfo *fds;
     int nfds;
 };
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index acecdc3943..e5425daf05 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -3704,7 +3704,7 @@ qemuMonitorJSONQueryFdsetsParse(virJSONValue *msg,
             return -1;
         }
 
-        if (virJSONValueObjectGetNumberInt(entry, "fdset-id", &fdsetinfo->id) < 0) {
+        if (virJSONValueObjectGetNumberUint(entry, "fdset-id", &fdsetinfo->id) < 0) {
             virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                            _("query-fdsets reply was missing 'fdset-id'"));
             return -1;