diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2013-11-26 00:00:39 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@amazon.com> | 2013-11-25 20:35:08 -0800 |
| commit | 134d42d614768b2803e551621f6654dab1fdc2d2 (patch) | |
| tree | 098fead975ac186ddfb129b43a686b55ee0680e1 /hw/i386/acpi-build.c | |
| parent | c0caec178eadbbac4c672110c3914313091e0588 (diff) | |
| download | focaccia-qemu-134d42d614768b2803e551621f6654dab1fdc2d2.tar.gz focaccia-qemu-134d42d614768b2803e551621f6654dab1fdc2d2.zip | |
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 <rth@redhat.com> Reported-by: Erik Rull <erik.rull@rdsoftware.de> Tested-by: Richard Henderson <rth@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Message-id: 20131125220039.GA16386@redhat.com Signed-off-by: Anthony Liguori <aliguori@amazon.com>
Diffstat (limited to 'hw/i386/acpi-build.c')
| -rw-r--r-- | hw/i386/acpi-build.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 5f36e7ec02..1f22fb60a4 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 */ |