diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2013-11-21 11:22:51 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2013-11-21 16:28:27 +0200 |
| commit | fd8f5e37557596e14a859d8edf3dc24523bd4400 (patch) | |
| tree | 9ccb7cdb9b24b508c164a2a759d71e6c5fa15096 | |
| parent | 8b9c3b897c682cd9739c6aef73b3220c7204c243 (diff) | |
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: Paolo Bonzini <pbonzini@redhat.com>
Reported-by: Richard Henderson <rth@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rw-r--r-- | hw/i386/acpi-build.c | 5 | ||||
| -rw-r--r-- | hw/i386/bios-linker-loader.c | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 59a17dfbd3..5f36e7ec02 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -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) diff --git a/hw/i386/bios-linker-loader.c b/hw/i386/bios-linker-loader.c index 083385332e..fd23611008 100644 --- a/hw/i386/bios-linker-loader.c +++ b/hw/i386/bios-linker-loader.c @@ -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); } |