Commit 913fbe9a authored Apr 02, 2015 by Peter Maydell

Merge remote-tracking branch 'remotes/armbru/tags/pull-hw-2015-04-02' into staging



hw: Contain drive, serial, parallel, net misuse

# gpg: Signature made Thu Apr  2 14:32:00 2015 BST using RSA key ID EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"

* remotes/armbru/tags/pull-hw-2015-04-02:
  sysbus: Make devices picking up backends unavailable with -device
  sdhci: Make device "sdhci-pci" unavailable with -device
  hw: Mark device misusing nd_table[] FIXME
  hw: Mark devices picking up char backends actively FIXME
  hw: Mark devices picking up block backends actively FIXME

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

parents 11f10cf8 9f9bdf43

hw/arm/allwinner-a10.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ static void aw_a10_init(Object *obj)

		object_initialize(&s->emac, sizeof(s->emac), TYPE_AW_EMAC);
		qdev_set_parent_bus(DEVICE(&s->emac), sysbus_get_default());
		/* FIXME use qdev NIC properties instead of nd_table[] */
		if (nd_table[0].used) {
		qemu_check_nic_model(&nd_table[0], TYPE_AW_EMAC);
		qdev_set_nic_properties(DEVICE(&s->emac), &nd_table[0]);
		@@ -92,6 +93,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/arm/spitz.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -168,6 +168,7 @@ static int sl_nand_init(SysBusDevice *dev)
		DriveInfo *nand;

		s->ctl = 0;
		/* FIXME use a qdev drive property instead of drive_get() */
		nand = drive_get(IF_MTD, 0, 0);
		s->nand = nand_init(nand ? blk_by_legacy_dinfo(nand) : NULL,
		s->manf_id, s->chip_id);
		@@ -1035,6 +1036,8 @@ static void sl_nand_class_init(ObjectClass klass, void data)
		k->init = sl_nand_init;
		dc->vmsd = &vmstate_sl_nand_info;
		dc->props = sl_nand_properties;
		/* Reason: init() method uses drive_get() */
		dc->cannot_instantiate_with_device_add_yet = true;
		}

		static const TypeInfo sl_nand_info = {

hw/block/m25p80.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -623,6 +623,7 @@ static int m25p80_init(SSISlave *ss)
		s->dirty_page = -1;
		s->storage = blk_blockalign(s->blk, s->size);

		/* FIXME use a qdev drive property instead of drive_get_next() */
		dinfo = drive_get_next(IF_MTD);

		if (dinfo) {

hw/char/cadence_uart.c

+3 −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) {
		@@ -536,6 +537,8 @@ static void cadence_uart_class_init(ObjectClass klass, void data)
		dc->realize = cadence_uart_realize;
		dc->vmsd = &vmstate_cadence_uart;
		dc->reset = cadence_uart_reset;
		/* Reason: realize() method uses qemu_char_get_next_serial() */
		dc->cannot_instantiate_with_device_add_yet = true;
		}

		static const TypeInfo cadence_uart_info = {

hw/char/digic-uart.c

+3 −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);
		@@ -176,6 +177,8 @@ static void digic_uart_class_init(ObjectClass klass, void data)
		dc->realize = digic_uart_realize;
		dc->reset = digic_uart_reset;
		dc->vmsd = &vmstate_digic_uart;
		/* Reason: realize() method uses qemu_char_get_next_serial() */
		dc->cannot_instantiate_with_device_add_yet = true;
		}

		static const TypeInfo digic_uart_info = {