From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46713) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XfCcP-0003Oi-St for qemu-devel@nongnu.org; Fri, 17 Oct 2014 14:51:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XfCcO-0001nT-ON for qemu-devel@nongnu.org; Fri, 17 Oct 2014 14:51:17 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:54241) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XfCcO-0001l1-IS for qemu-devel@nongnu.org; Fri, 17 Oct 2014 14:51:16 -0400 From: Peter Maydell Date: Fri, 17 Oct 2014 19:51:08 +0100 Message-Id: <1413571868-9011-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH] hw/i386/pc_q35.c: Avoid g_assert_cmpint() as it is not in glib 2.12 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: John Snow , Stefan Hajnoczi , patches@linaro.org 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 --- hw/i386/pc_q35.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index bb0dc8e..e225c6d 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); -- 1.9.1