From patchwork Mon Mar 19 18:34:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 132072 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp3050341ljb; Mon, 19 Mar 2018 11:35:00 -0700 (PDT) X-Google-Smtp-Source: AG47ELvimxQdvGeYXMhAi92MBo4TcS5+Iq/E64GrkqmjaGnEOmr+WyenX+Z4yhOJL8cpft1dsoSe X-Received: by 10.55.167.23 with SMTP id q23mr3981117qke.329.1521484500656; Mon, 19 Mar 2018 11:35:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521484500; cv=none; d=google.com; s=arc-20160816; b=0PNW+xXYFYUxjioAABEWQY9gOvx2bmjf9K6op/tIcv7nOaEHm60rzUkxbsV0T2i3UA YjvxRpIP5bXyXn9XWYDL8SAnmE0LWLlRnSR5UN9yd/+8wMsl7n4275VgmtAEyr7zxcgP J5R+JfyQgQvsKEwdAAP0uSfPwP1RNCW7P0hZGkq9z/+W30BsH5WCPn62D8aFYH363uWY SJjIGDrTS3kJKBQLjGMFUK3M4jYXFlViBY+ZEsJ/gpcxeuwNc522hBG3ceTaeWoO5Woj oLM67ngDfMZUGfHVL3sWACYhTFFXs8mvG8ecgQiVV5bmsz+5SnVO4QjW3jNkO6F90eqx gULg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=sh8KN84537w8DehmLZ/Sny3H98zxh5gKgWzQOAMoaro=; b=aYJ7OhwXLshD2PsDX2yRkDgVkhSTJCP8dxYr6lKDwK89Deg+ytA07Kay9W1ttnincE 4jNAXx8YTz4x/HMuFS1vL88UQEPrEoDV/8d/SyaEtKOS4nzg6nXO69p+r44YALCzIGZa uEsIXkvjtzCm/NhYqfrG8AQ9HgsnH11PMoZBbl8dAO7QBb2+gekA81fyF5B1ctGggdsS VL3sP5hU0LDz2kCvxXp3Ql8B2nWbXykXLNr3RR8JtzXqSfL6+2tKgqV9YqCuuqzFev4r PrXPyNU1C2bkHrkI2aTlcqpw4Vh9hwG9tM93ql2L8D8PDEt+m/Hp08hdNGlRPdJe+la8 WEFA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id e51si663233qtf.27.2018.03.19.11.35.00 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 19 Mar 2018 11:35:00 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:43358 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1exzcZ-0002PX-TF for patch@linaro.org; Mon, 19 Mar 2018 14:34:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49754) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1exzc1-0002Mw-HZ for qemu-devel@nongnu.org; Mon, 19 Mar 2018 14:34:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1exzc0-0007iB-MZ for qemu-devel@nongnu.org; Mon, 19 Mar 2018 14:34:25 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:40460) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1exzc0-0007gJ-G5 for qemu-devel@nongnu.org; Mon, 19 Mar 2018 14:34:24 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1exzbz-000325-A6 for qemu-devel@nongnu.org; Mon, 19 Mar 2018 18:34:23 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 19 Mar 2018 18:34:10 +0000 Message-Id: <20180319183415.1976-9-peter.maydell@linaro.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180319183415.1976-1-peter.maydell@linaro.org> References: <20180319183415.1976-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 08/13] hw/arm/bcm2386: Fix parent type of bcm2386 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The TypeInfo and state struct for bcm2386 disagree about what the parent class is -- the TypeInfo says it's TYPE_SYS_BUS_DEVICE, but the BCM2386State struct only defines the parent_obj field as DeviceState. This would have caused problems if anything actually tried to treat the object as a TYPE_SYS_BUS_DEVICE. Fix the TypeInfo to use TYPE_DEVICE as the parent, since we don't need any of the additional functionality TYPE_SYS_BUS_DEVICE provides. Signed-off-by: Peter Maydell Reviewed-by: Andrew Baumann Reviewed-by: Philippe Mathieu-Daudé Message-id: 20180313153458.26822-5-peter.maydell@linaro.org --- hw/arm/bcm2836.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.16.2 diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c index 40e8b25a46..9266f27c14 100644 --- a/hw/arm/bcm2836.c +++ b/hw/arm/bcm2836.c @@ -165,7 +165,7 @@ static void bcm2836_class_init(ObjectClass *oc, void *data) static const TypeInfo bcm2836_type_info = { .name = TYPE_BCM2836, - .parent = TYPE_SYS_BUS_DEVICE, + .parent = TYPE_DEVICE, .instance_size = sizeof(BCM2836State), .instance_init = bcm2836_init, .class_init = bcm2836_class_init,