Re: [Qemu-devel] [PULL 13/23] q35/ahci: Pick up -cdrom and -hda options

[Michael Tokarev <mjt@tls.msk.ru>]

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