diff mbox

[1/3] hw/acpi/aml-build: remove useless glib version check

Message ID 1444647299-28642-2-git-send-email-marcandre.lureau@redhat.com
State New
Headers show

Commit Message

Marc-André Lureau Oct. 12, 2015, 10:54 a.m. UTC 
From: Marc-André Lureau <marcandre.lureau@redhat.com>

2.22 is the minimum version required

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 hw/acpi/aml-build.c | 2 --
 1 file changed, 2 deletions(-)

Comments

Marc-André Lureau Oct. 12, 2015, 1:31 p.m. UTC | #1 
to qemu-trivial

On Mon, Oct 12, 2015 at 12:54 PM,  <marcandre.lureau@redhat.com> wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> 2.22 is the minimum version required
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>  hw/acpi/aml-build.c | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
> index 0d4b324..a00a0ab 100644
> --- a/hw/acpi/aml-build.c
> +++ b/hw/acpi/aml-build.c
> @@ -1163,9 +1163,7 @@ void *acpi_data_push(GArray *table_data, unsigned size)
>
>  unsigned acpi_data_len(GArray *table)
>  {
> -#if GLIB_CHECK_VERSION(2, 22, 0)
>      assert(g_array_get_element_size(table) == 1);
> -#endif
>      return table->len;
>  }
>
> --
> 2.4.3
>
Michael Tokarev Oct. 29, 2015, 7:28 a.m. UTC | #2 
12.10.2015 16:31, Marc-André Lureau wrote:
> to qemu-trivial
> 
> On Mon, Oct 12, 2015 at 12:54 PM,  <marcandre.lureau@redhat.com> wrote:
>> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>>
>> 2.22 is the minimum version required

Applied to -trivial, thank you!

/mjt
diff mbox

Patch

diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
index 0d4b324..a00a0ab 100644
--- a/hw/acpi/aml-build.c
+++ b/hw/acpi/aml-build.c
@@ -1163,9 +1163,7 @@  void *acpi_data_push(GArray *table_data, unsigned size)
 
 unsigned acpi_data_len(GArray *table)
 {
-#if GLIB_CHECK_VERSION(2, 22, 0)
     assert(g_array_get_element_size(table) == 1);
-#endif
     return table->len;
 }