Commit fd8f5e37 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

acpi-build: fix build on glib < 2.14 



g_array_get_element_size was only added in glib 2.14,
there's no way to find element size in with an older glib.

Fortunately we only use a single table (linker) where element size > 1.
Switch element size to 1 everywhere, then we can just look at len field
to get table size in bytes.

Add an assert to make sure we catch any violations of this rule.

Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reported-by: default avatarRichard Henderson <rth@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 8b9c3b89

hw/i386/acpi-build.c

+4 −1
Original line number Diff line number Diff line
@@ -425,7 +425,10 @@ static inline void *acpi_data_push(GArray *table_data, unsigned size) 


static unsigned acpi_data_len(GArray *table)

{

    return table->len * g_array_get_element_size(table);

#if GLIB_CHECK_VERSION(2, 14, 0)

    assert(g_array_get_element_size(table) == 1);

#endif

    return table->len;

}



static void acpi_align_size(GArray *blob, unsigned align)

hw/i386/bios-linker-loader.c

+4 −4
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ enum { 


GArray *bios_linker_loader_init(void)

{

    return g_array_new(false, true /* clear */, sizeof(BiosLinkerLoaderEntry));

    return g_array_new(false, true /* clear */, 1);

}



/* Free linker wrapper and return the linker array. */
@@ -115,7 +115,7 @@ void bios_linker_loader_alloc(GArray *linker, 
                                    BIOS_LINKER_LOADER_ALLOC_ZONE_HIGH);



    /* Alloc entries must come first, so prepend them */

    g_array_prepend_val(linker, entry);

    g_array_prepend_vals(linker, &entry, sizeof entry);

}



void bios_linker_loader_add_checksum(GArray *linker, const char *file,
@@ -132,7 +132,7 @@ void bios_linker_loader_add_checksum(GArray *linker, const char *file, 
    entry.cksum.start = cpu_to_le32((uint8_t *)start - (uint8_t *)table);

    entry.cksum.length = cpu_to_le32(size);



    g_array_append_val(linker, entry);

    g_array_append_vals(linker, &entry, sizeof entry);

}



void bios_linker_loader_add_pointer(GArray *linker,
@@ -154,5 +154,5 @@ void bios_linker_loader_add_pointer(GArray *linker, 
    assert(pointer_size == 1 || pointer_size == 2 ||

           pointer_size == 4 || pointer_size == 8);



    g_array_append_val(linker, entry);

    g_array_append_vals(linker, &entry, sizeof entry);

}