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

[Peter Maydell]

On 4 October 2014 22:24, Stefan Hajnoczi <address@hidden> wrote:
> From: John Snow <address@hidden>
>
> 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 <address@hidden>
> Reviewed-by: Markus Armbruster <address@hidden>
> Reviewed-by: Michael S. Tsirkin <address@hidden>
> Message-id: address@hidden
> Signed-off-by: Stefan Hajnoczi <address@hidden>

> @@ -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.

-- PMM