From: Michael S. Tsirkin Date: Mon, 25 Nov 2013 22:00:39 +0000 (+0200) Subject: acpi-build: fix support for glib < 2.22 X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~1194 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=134d42d614768b2803e551621f6654dab1fdc2d2;p=sdk%2Femulator%2Fqemu.git acpi-build: fix support for glib < 2.22 glib < 2.22 does not have g_array_get_element_size, limit it's use (to check all elements are 1 byte in size) to newer glib. This fixes build on RHEL 5.3. Reported-by: Richard Henderson Reported-by: Erik Rull Tested-by: Richard Henderson Signed-off-by: Michael S. Tsirkin Message-id: 20131125220039.GA16386@redhat.com Signed-off-by: Anthony Liguori --- diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 5f36e7e..1f22fb6 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -425,7 +425,7 @@ static inline void *acpi_data_push(GArray *table_data, unsigned size) static unsigned acpi_data_len(GArray *table) { -#if GLIB_CHECK_VERSION(2, 14, 0) +#if GLIB_CHECK_VERSION(2, 22, 0) assert(g_array_get_element_size(table) == 1); #endif return table->len; @@ -436,9 +436,7 @@ static void acpi_align_size(GArray *blob, unsigned align) /* Align size to multiple of given size. This reduces the chance * we need to change size in the future (breaking cross version migration). */ - g_array_set_size(blob, (ROUND_UP(acpi_data_len(blob), align) + - g_array_get_element_size(blob) - 1) / - g_array_get_element_size(blob)); + g_array_set_size(blob, ROUND_UP(acpi_data_len(blob), align)); } /* Get pointer within table in a safe manner */