Commit d29eb678 authored by Olaf Hering's avatar Olaf Hering Committed by Michael Tokarev
Browse files

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 418026ca ("util: Introduce vfio helpers")

Signed-off-by: default avatarOlaf Hering <olaf@aepfle.de>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Signed-off-by: default avatarMichael Tokarev <mjt@tls.msk.ru>
CC: qemu-stable@nongnu.org
parent 201376cb

util/vfio-helpers.c

+2 −4
Original line number Diff line number Diff line
@@ -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. */