From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59136) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vl3CO-0006gP-Cy for qemu-devel@nongnu.org; Mon, 25 Nov 2013 15:56:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vl3CI-0006CT-Dv for qemu-devel@nongnu.org; Mon, 25 Nov 2013 15:56:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52363) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vl3CI-0006CO-5l for qemu-devel@nongnu.org; Mon, 25 Nov 2013 15:55:58 -0500 Date: Mon, 25 Nov 2013 22:59:12 +0200 From: "Michael S. Tsirkin" Message-ID: <20131125205912.GI12689@redhat.com> References: <1385379990-32093-1-git-send-email-mst@redhat.com> <1385379990-32093-5-git-send-email-mst@redhat.com> <5293AF9B.8030903@rdsoftware.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <5293AF9B.8030903@rdsoftware.de> Subject: Re: [Qemu-devel] [PULL for-1.7 v2 4/6] acpi-build: fix build on glib < 2.14 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Erik Rull Cc: Paolo Bonzini , qemu-devel@nongnu.org, Richard Henderson On Mon, Nov 25, 2013 at 09:14:19PM +0100, Erik Rull wrote: > Michael S. Tsirkin wrote: > >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 > >Reported-by: Richard Henderson > >Signed-off-by: Michael S. Tsirkin > >--- > > hw/i386/acpi-build.c | 5 ++++- > > 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 59a17df..5f36e7e 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 0833853..fd23611 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); > > } > > > > Hi all, > > acpi-build.c has another occurence of g_array_get_element_size in > acpi_align_size. Please put another ifdef for the older glib here, > too. > > Thanks. > > Best regards, > > Erik > Do you have a system where this fails then?