diff options
| author | Olaf Hering <olaf@aepfle.de> | 2018-05-15 08:31:28 +0200 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2018-05-20 08:55:01 +0300 |
| commit | d29eb678bcfbb2fbf4b79423797253ee02f5c6cf (patch) | |
| tree | 14da93e1a2433f7720e6272e7dbe5adf6a4c81e3 /util/vfio-helpers.c | |
| parent | 201376cb9e500f64209444cb95f566679c0f54a2 (diff) | |
| download | qemu-d29eb678bcfbb2fbf4b79423797253ee02f5c6cf.zip qemu-d29eb678bcfbb2fbf4b79423797253ee02f5c6cf.tar.gz qemu-d29eb678bcfbb2fbf4b79423797253ee02f5c6cf.tar.bz2 | |
replace functions which are only available in glib-2.24
Currently the minimal supported version of glib is 2.22.
Since testing is done with a glib that claims to be 2.22, but in fact
has APIs from newer version of glib, this bug was not caught during
submit of the patch referenced below.
Replace g_realloc_n, which is available only since 2.24, with g_renew.
Fixes commit 418026ca43 ("util: Introduce vfio helpers")
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
CC: qemu-stable@nongnu.org
Diffstat (limited to 'util/vfio-helpers.c')
| -rw-r--r-- | util/vfio-helpers.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c index 006674c..1d9272e 100644 --- a/util/vfio-helpers.c +++ b/util/vfio-helpers.c @@ -522,8 +522,7 @@ static IOVAMapping *qemu_vfio_add_mapping(QEMUVFIOState *s, assert(index >= 0); s->nr_mappings++; - s->mappings = g_realloc_n(s->mappings, sizeof(s->mappings[0]), - s->nr_mappings); + s->mappings = g_renew(IOVAMapping, s->mappings, s->nr_mappings); insert = &s->mappings[index]; shift = s->nr_mappings - index - 1; if (shift) { @@ -577,8 +576,7 @@ static void qemu_vfio_undo_mapping(QEMUVFIOState *s, IOVAMapping *mapping, memmove(mapping, &s->mappings[index + 1], sizeof(s->mappings[0]) * (s->nr_mappings - index - 1)); s->nr_mappings--; - s->mappings = g_realloc_n(s->mappings, sizeof(s->mappings[0]), - s->nr_mappings); + s->mappings = g_renew(IOVAMapping, s->mappings, s->nr_mappings); } /* Check if the mapping list is (ascending) ordered. */ |