Commit d71b22bb authored by Markus Armbruster's avatar Markus Armbruster
Browse files

hw: Mark devices picking up char backends actively FIXME 



Character devices defined with -serial and -parallel are for board
initialization to wire up.  Board code examines serial_hds[] and
parallel_hds[] to find them, and creates devices with their qdev
chardev properties set accordingly.

Except a few devices go on a fishing expedition for a suitable backend
instead of exposing a chardev property for board code to set: they use
serial_hds[] (often via qemu_char_get_next_serial()) or parallel_hds[]
in their realize() or init() method to connect to a backend.

Picking up backends that way works when the devices are created by
board code.  But it's inappropriate for -device or device_add.  Not
only is it inconsistent with how the other characrer device models
work (they connect to a backend explicitly identified by a "chardev"
property), it breaks when the backend has been picked up by the board
or a previous -device / device_add already.

Example:

    $ qemu-system-ppc64 -M bamboo -S -device i82378 -device pc87312 -device pc87312
    qemu-system-ppc64: -device pc87312: Property 'isa-parallel.chardev' can't take value 'parallel0', it's in use

Mark them with suitable FIXME comments.

Cc: Li Guang <lig.fnst@cn.fujitsu.com>
Cc: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Cc: Antony Pavlov <antonynpavlov@gmail.com>
Cc: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
Cc: Michael Walle <michael@walle.cc>
Cc: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Cc: "Andreas Färber" <andreas.faerber@web.de>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent af9e40aa

hw/arm/allwinner-a10.c

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ static void aw_a10_realize(DeviceState *dev, Error **errp) 
    sysbus_mmio_map(sysbusdev, 0, AW_A10_EMAC_BASE);

    sysbus_connect_irq(sysbusdev, 0, s->irq[55]);



    /* FIXME use a qdev chardev prop instead of serial_hds[] */

    serial_mm_init(get_system_memory(), AW_A10_UART0_REG_BASE, 2, s->irq[1],

                   115200, serial_hds[0], DEVICE_NATIVE_ENDIAN);

}

hw/char/cadence_uart.c

+1 −0
Original line number Diff line number Diff line
@@ -483,6 +483,7 @@ static void cadence_uart_realize(DeviceState *dev, Error **errp) 
    s->fifo_trigger_handle = timer_new_ns(QEMU_CLOCK_VIRTUAL,

                                          fifo_trigger_update, s);



    /* FIXME use a qdev chardev prop instead of qemu_char_get_next_serial() */

    s->chr = qemu_char_get_next_serial();



    if (s->chr) {

hw/char/digic-uart.c

+1 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ static void digic_uart_realize(DeviceState *dev, Error **errp) 
{

    DigicUartState *s = DIGIC_UART(dev);



    /* FIXME use a qdev chardev prop instead of qemu_char_get_next_serial() */

    s->chr = qemu_char_get_next_serial();

    if (s->chr) {

        qemu_chr_add_handlers(s->chr, uart_can_rx, uart_rx, uart_event, s);

hw/char/etraxfs_ser.c

+1 −0
Original line number Diff line number Diff line
@@ -219,6 +219,7 @@ static int etraxfs_ser_init(SysBusDevice *dev) 
                          "etraxfs-serial", R_MAX * 4);

    sysbus_init_mmio(dev, &s->mmio);



    /* FIXME use a qdev chardev prop instead of qemu_char_get_next_serial() */

    s->chr = qemu_char_get_next_serial();

    if (s->chr) {

        qemu_chr_add_handlers(s->chr,

hw/char/lm32_juart.c

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ static int lm32_juart_init(SysBusDevice *dev) 
{

    LM32JuartState *s = LM32_JUART(dev);



    /* FIXME use a qdev chardev prop instead of qemu_char_get_next_serial() */

    s->chr = qemu_char_get_next_serial();

    if (s->chr) {

        qemu_chr_add_handlers(s->chr, juart_can_rx, juart_rx, juart_event, s);