cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
0a122b
From 6fa0fc12221718bb405d01683acf635a24c34daf Mon Sep 17 00:00:00 2001
0a122b
Message-Id: <6fa0fc12221718bb405d01683acf635a24c34daf.1387298827.git.minovotn@redhat.com>
0a122b
In-Reply-To: <3ed0fb61a3dc912ef036d7ef450bed192090709e.1387298827.git.minovotn@redhat.com>
0a122b
References: <3ed0fb61a3dc912ef036d7ef450bed192090709e.1387298827.git.minovotn@redhat.com>
0a122b
From: "Michael S. Tsirkin" <mst@redhat.com>
0a122b
Date: Tue, 17 Dec 2013 15:19:24 +0100
0a122b
Subject: [PATCH 54/56] acpi-build: fix support for glib < 2.22
0a122b
0a122b
RH-Author: Michael S. Tsirkin <mst@redhat.com>
0a122b
Message-id: <1387293161-4085-55-git-send-email-mst@redhat.com>
0a122b
Patchwork-id: 56360
0a122b
O-Subject: [PATCH qemu-kvm RHEL7.0 v2 54/57] acpi-build: fix support for glib < 2.22
0a122b
Bugzilla: 1034876
0a122b
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
0a122b
RH-Acked-by: Marcel Apfelbaum <marcel.a@redhat.com>
0a122b
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
0a122b
0a122b
glib < 2.22 does not have g_array_get_element_size,
0a122b
limit it's use (to check all elements are 1 byte
0a122b
in size) to newer glib.
0a122b
0a122b
This fixes build on RHEL 5.3.
0a122b
0a122b
Reported-by: Richard Henderson <rth@redhat.com>
0a122b
Reported-by: Erik Rull <erik.rull@rdsoftware.de>
0a122b
Tested-by: Richard Henderson <rth@redhat.com>
0a122b
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
0a122b
Message-id: 20131125220039.GA16386@redhat.com
0a122b
Signed-off-by: Anthony Liguori <aliguori@amazon.com>
0a122b
(cherry picked from commit 134d42d614768b2803e551621f6654dab1fdc2d2)
0a122b
---
0a122b
 hw/i386/acpi-build.c | 6 ++----
0a122b
 1 file changed, 2 insertions(+), 4 deletions(-)
0a122b
0a122b
Signed-off-by: Michal Novotny <minovotn@redhat.com>
0a122b
---
0a122b
 hw/i386/acpi-build.c | 6 ++----
0a122b
 1 file changed, 2 insertions(+), 4 deletions(-)
0a122b
0a122b
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
0a122b
index 4074350..316d6d3 100644
0a122b
--- a/hw/i386/acpi-build.c
0a122b
+++ b/hw/i386/acpi-build.c
0a122b
@@ -425,7 +425,7 @@ static inline void *acpi_data_push(GArray *table_data, unsigned size)
0a122b
 
0a122b
 static unsigned acpi_data_len(GArray *table)
0a122b
 {
0a122b
-#if GLIB_CHECK_VERSION(2, 14, 0)
0a122b
+#if GLIB_CHECK_VERSION(2, 22, 0)
0a122b
     assert(g_array_get_element_size(table) == 1);
0a122b
 #endif
0a122b
     return table->len;
0a122b
@@ -436,9 +436,7 @@ static void acpi_align_size(GArray *blob, unsigned align)
0a122b
     /* Align size to multiple of given size. This reduces the chance
0a122b
      * we need to change size in the future (breaking cross version migration).
0a122b
      */
0a122b
-    g_array_set_size(blob, (ROUND_UP(acpi_data_len(blob), align) +
0a122b
-                            g_array_get_element_size(blob) - 1) /
0a122b
-                             g_array_get_element_size(blob));
0a122b
+    g_array_set_size(blob, ROUND_UP(acpi_data_len(blob), align));
0a122b
 }
0a122b
 
0a122b
 /* Get pointer within table in a safe manner */
0a122b
-- 
0a122b
1.7.11.7
0a122b