From 9b5c540096700367aaff2643e72b4f57f9ba1cdc Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Wed, 22 Aug 2012 11:56:11 +0100
Subject: [PATCH] Fix data types used for list sizes in QEMU capabilities

The QEMU capabilities APIs used a misc of 'int' and
'unsigned int' for variables relating to array sizes.
Change all these to use 'size_t'

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
 src/qemu/qemu_capabilities.c | 22 +++++++++++-----------
 src/qemu/qemu_capabilities.h |  4 ++--
 src/qemu/qemu_command.c      |  2 +-
 src/qemu/qemu_driver.c       |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index c0082fb49..af3b0b2d9 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -292,7 +292,7 @@ qemuCapsProbeCommand(const char *qemu,
 static int
 qemuCapsParseMachineTypesStr(const char *output,
                              virCapsGuestMachinePtr **machines,
-                             int *nmachines)
+                             size_t *nmachines)
 {
     const char *p = output;
     const char *next;
@@ -361,7 +361,7 @@ int
 qemuCapsProbeMachineTypes(const char *binary,
                           qemuCapsPtr caps,
                           virCapsGuestMachinePtr **machines,
-                          int *nmachines)
+                          size_t *nmachines)
 {
     char *output;
     int ret = -1;
@@ -402,7 +402,7 @@ qemuCapsGetOldMachinesFromInfo(virCapsGuestDomainInfoPtr info,
                                const char *emulator,
                                time_t emulator_mtime,
                                virCapsGuestMachinePtr **machines,
-                               int *nmachines)
+                               size_t *nmachines)
 {
     virCapsGuestMachinePtr *list;
     int i;
@@ -457,7 +457,7 @@ qemuCapsGetOldMachines(const char *ostype,
                        time_t emulator_mtime,
                        virCapsPtr old_caps,
                        virCapsGuestMachinePtr **machines,
-                       int *nmachines)
+                       size_t *nmachines)
 {
     int i;
 
@@ -491,8 +491,8 @@ qemuCapsGetOldMachines(const char *ostype,
 
 typedef int
 (*qemuCapsParseCPUModels)(const char *output,
-                       unsigned int *retcount,
-                       const char ***retcpus);
+                          size_t *retcount,
+                          const char ***retcpus);
 
 /* Format:
  *      <arch> <model>
@@ -501,7 +501,7 @@ typedef int
  */
 static int
 qemuCapsParseX86Models(const char *output,
-                       unsigned int *retcount,
+                       size_t *retcount,
                        const char ***retcpus)
 {
     const char *p = output;
@@ -577,7 +577,7 @@ error:
  */
 static int
 qemuCapsParsePPCModels(const char *output,
-                       unsigned int *retcount,
+                       size_t *retcount,
                        const char ***retcpus)
 {
     const char *p = output;
@@ -647,7 +647,7 @@ int
 qemuCapsProbeCPUModels(const char *qemu,
                        qemuCapsPtr caps,
                        const char *arch,
-                       unsigned int *count,
+                       size_t *count,
                        const char ***cpus)
 {
     char *output = NULL;
@@ -704,9 +704,9 @@ qemuCapsInitGuest(virCapsPtr caps,
     char *binary = NULL;
     time_t binary_mtime;
     virCapsGuestMachinePtr *machines = NULL;
-    int nmachines = 0;
+    size_t nmachines = 0;
     struct stat st;
-    unsigned int ncpus;
+    size_t ncpus;
     qemuCapsPtr qemubinCaps = NULL;
     qemuCapsPtr kvmbinCaps = NULL;
     int ret = -1;
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 8f145a7d0..bbb07c904 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -180,12 +180,12 @@ virCapsPtr qemuCapsInit(virCapsPtr old_caps);
 int qemuCapsProbeMachineTypes(const char *binary,
                               qemuCapsPtr caps,
                               virCapsGuestMachinePtr **machines,
-                              int *nmachines);
+                              size_t *nmachines);
 
 int qemuCapsProbeCPUModels(const char *qemu,
                            qemuCapsPtr caps,
                            const char *arch,
-                           unsigned int *count,
+                           size_t *count,
                            const char ***cpus);
 
 int qemuCapsExtractVersion(virCapsPtr caps,
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 0547a4fad..0582d2949 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -4082,7 +4082,7 @@ qemuBuildCpuArgStr(const struct qemud_driver *driver,
     const virCPUDefPtr host = driver->caps->host.cpu;
     virCPUDefPtr guest = NULL;
     virCPUDefPtr cpu = NULL;
-    unsigned int ncpus = 0;
+    size_t ncpus = 0;
     const char **cpus = NULL;
     const char *default_model;
     union cpuData *data = NULL;
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 511120744..d952c9cf6 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -5440,7 +5440,7 @@ static int
 qemudCanonicalizeMachineDirect(virDomainDefPtr def, char **canonical)
 {
     virCapsGuestMachinePtr *machines = NULL;
-    int i, nmachines = 0;
+    size_t i, nmachines = 0;
 
     /* XXX we should be checking emulator capabilities and pass them instead
      * of NULL so that -nodefconfig or -no-user-config is properly added when
-- 
2.39.5