From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:53291)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mjt@tls.msk.ru>) id 1XfAqN-0000A3-EX
	for qemu-devel@nongnu.org; Fri, 17 Oct 2014 12:57:41 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mjt@tls.msk.ru>) id 1XfAqH-0007fO-AJ
	for qemu-devel@nongnu.org; Fri, 17 Oct 2014 12:57:35 -0400
Received: from isrv.corpit.ru ([86.62.121.231]:50687)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mjt@tls.msk.ru>) id 1XfAqH-0007cZ-3d
	for qemu-devel@nongnu.org; Fri, 17 Oct 2014 12:57:29 -0400
Message-ID: <54414A71.9010609@msgid.tls.msk.ru>
Date: Fri, 17 Oct 2014 20:57:21 +0400
From: Michael Tokarev <mjt@tls.msk.ru>
MIME-Version: 1.0
References: <1412454289-1789-1-git-send-email-stefanha@redhat.com>	<1412454289-1789-14-git-send-email-stefanha@redhat.com>
	<CAFEAcA8001Vh42Q_JUY2kmVMFpq9iUYVafu3HgNf7g4q53ZBsQ@mail.gmail.com>
In-Reply-To: <CAFEAcA8001Vh42Q_JUY2kmVMFpq9iUYVafu3HgNf7g4q53ZBsQ@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PULL 13/23] q35/ahci: Pick up -cdrom and -hda
	options
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Peter Maydell <peter.maydell@linaro.org>, Stefan Hajnoczi <stefanha@redhat.com>
Cc: QEMU Developers <qemu-devel@nongnu.org>

On 10/17/2014 08:53 PM, Peter Maydell wrote:
> On 4 October 2014 22:24, Stefan Hajnoczi <stefanha@redhat.com> wrote:
>> From: John Snow <jsnow@redhat.com>
>>
>> This patch implements the backend for the Q35 board
>> for us to be able to pick up and use drives defined
>> by the -cdrom, -hda, or -drive if=ide shorthand options.
>>
>> Signed-off-by: John Snow <jsnow@redhat.com>
>> Reviewed-by: Markus Armbruster <armbru@redhat.com>
>> Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
>> Message-id: 1412187569-23452-7-git-send-email-jsnow@redhat.com
>> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> 
>> @@ -253,6 +254,9 @@ 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_cmpint() was only added in glib 2.16, so this won't
> build on glib 2.12. A compat fudge in glib-compat.h should
> be easy, though.

Or just change this to regular in-line comparison and g_assert().

/mjt