[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/48] nand: Don't use qdev_create() in nand_init()
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 08/48] nand: Don't use qdev_create() in nand_init() |
Date: |
Mon, 10 Feb 2014 19:36:25 +0100 |
Commit 7426aa72c36c908a7d0eae3e38568bb0a70de479 (nand: Don't inherit
from Sysbus) changed the parent type of TYPE_NAND but continued to use
qdev_create(), which handled a NULL BusState as SysBus.
Use object_new() instead, and reuse the TYPE_NAND define while at it.
Reported-by: Markus Armbruster <address@hidden>
Cc: Peter Crosthwaite <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
hw/block/nand.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/block/nand.c b/hw/block/nand.c
index a871ce0..6d7c804 100644
--- a/hw/block/nand.c
+++ b/hw/block/nand.c
@@ -632,7 +632,7 @@ DeviceState *nand_init(BlockDriverState *bdrv, int manf_id,
int chip_id)
if (nand_flash_ids[chip_id].size == 0) {
hw_error("%s: Unsupported NAND chip ID.\n", __FUNCTION__);
}
- dev = qdev_create(NULL, "nand");
+ dev = DEVICE(object_new(TYPE_NAND));
qdev_prop_set_uint8(dev, "manufacturer_id", manf_id);
qdev_prop_set_uint8(dev, "chip_id", chip_id);
if (bdrv) {
--
1.8.4.5
- [Qemu-devel] [PULL 00/48] QOM devices patch queue 2014-02-10, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 11/48] tosa: QOM'ify DAC, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 08/48] nand: Don't use qdev_create() in nand_init(),
Andreas Färber <=
- [Qemu-devel] [PULL 09/48] i2c: Rename i2c_bus to I2CBus, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 01/48] qtest: don't report signals if qtest driver enabled, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 10/48] pxa2xx: QOM'ify I2C slave, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 12/48] z2: QOM'ify AER915, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 07/48] tests: Run qom-test for every architecture, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 16/48] lm832x: QOM'ify, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 14/48] ssd0303: QOM'ify, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 06/48] qom-test: Test shutdown in addition to startup, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 19/48] i2c: Drop FROM_I2C_SLAVE() macro, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 05/48] qom-test: Run for all available machines, Andreas Färber, 2014/02/10