Commit 542da88f authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by Anthony Liguori
Browse files

acpi-build: fix build on glib < 2.22 



g_string_vprintf was only introduced in 2.24 so switch to vsnprintf
instead.  A bit uglier but name size is fixed at 4 bytes here so it's
easy.

Reported-by: default avatarRichard Henderson <rth@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-id: 1385036128-8753-1-git-send-email-mst@redhat.com
Signed-off-by: default avatarAnthony Liguori <aliguori@amazon.com>
parent 0a3c7385

hw/i386/acpi-build.c

+6 −5
Original line number Diff line number Diff line
@@ -287,16 +287,17 @@ static inline void build_append_array(GArray *array, GArray *val) 


static void build_append_nameseg(GArray *array, const char *format, ...)

{

    GString *s = g_string_new("");

    /* It would be nicer to use g_string_vprintf but it's only there in 2.22 */

    char s[] = "XXXX";

    int len;

    va_list args;



    va_start(args, format);

    g_string_vprintf(s, format, args);

    len = vsnprintf(s, sizeof s, format, args);

    va_end(args);



    assert(s->len == 4);

    g_array_append_vals(array, s->str, s->len);

    g_string_free(s, true);

    assert(len == 4);

    g_array_append_vals(array, s, len);

}



/* 5.4 Definition Block Encoding */