From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 17 Oct 2014 18:04:35 +0000 (+0100)
Subject: hw/i386/pc_q35.c: Avoid g_assert_cmpint() as it is not in glib 2.12
X-Git-Tag: qemu-xen-4.6.0-rc1~128
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=01a2050fa5fb3d290134b67ee82eb3ebbd91d95b;p=qemu-upstream-4.6-testing.git

hw/i386/pc_q35.c: Avoid g_assert_cmpint() as it is not in glib 2.12

The function g_assert_cmpint() is not in glib 2.12, which is our current
minimum requirement. Rephrase the recently added assertion to avoid it.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Gonglei <arei.gonglei@huawei.com>
---

diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index bb0dc8e08..e225c6d11 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -254,7 +254,7 @@ static void pc_q35_init(MachineState *machine)
                                            true, "ich9-ahci");
     idebus[0] = qdev_get_child_bus(&ahci->qdev, "ide.0");
     idebus[1] = qdev_get_child_bus(&ahci->qdev, "ide.1");
-    g_assert_cmpint(MAX_SATA_PORTS, ==, ICH_AHCI(ahci)->ahci.ports);
+    g_assert(MAX_SATA_PORTS == ICH_AHCI(ahci)->ahci.ports);
     ide_drive_get(hd, ICH_AHCI(ahci)->ahci.ports);
     ahci_ide_create_devs(ahci, hd);