From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52947) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFWcm-00027n-J3 for qemu-devel@nongnu.org; Mon, 17 Feb 2014 17:25:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WFWcc-0005yw-Oc for qemu-devel@nongnu.org; Mon, 17 Feb 2014 17:25:16 -0500 Received: from cantor2.suse.de ([195.135.220.15]:41625 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFWcc-0005xY-IL for qemu-devel@nongnu.org; Mon, 17 Feb 2014 17:25:06 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 17 Feb 2014 23:24:18 +0100 Message-Id: <1392675899-21210-9-git-send-email-afaerber@suse.de> In-Reply-To: <1392675899-21210-1-git-send-email-afaerber@suse.de> References: <1392675899-21210-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL v2 08/49] nand: Don't use qdev_create() in nand_init() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Peter Crosthwaite , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Stefan Hajnoczi 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 Cc: Peter Crosthwaite Reviewed-by: Igor Mammedov Signed-off-by: Andreas F=C3=A4rber --- 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 ma= nf_id, int chip_id) if (nand_flash_ids[chip_id].size =3D=3D 0) { hw_error("%s: Unsupported NAND chip ID.\n", __FUNCTION__); } - dev =3D qdev_create(NULL, "nand"); + dev =3D 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) { --=20 1.8.4.5