From nobody Fri Sep 20 22:16:17 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598465462; cv=none; d=zohomail.com; s=zohoarc; b=m5Yge7DU4LjVgqtm3XOH8ErjeCECfJpOzvL9nBfhMixia3jIBx72mEN7AjU3XPh/pDQJjUUNQvRymTiatE40aJP/csY0wbeRD6mw6Ri6Zqu64P++DNcnidFbG44Uzv9h0DB+KhLRK7i6cm6JISt32J4nGLR7kYcDuLB+c17hzSc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598465462; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=PiApvT1sTiwwUhR3nn4DVseSe1rzlHNor0YuHEpkx1A=; b=FLZivw1y5eBIaPiQNg70O0etWTRafjrT/Y6a+cfp4Z5aRPfaCpP/ORsTSC+D30ExUqVDJ2+V1d4/QYfg9UESVJy/pjRBYlq3n4RuwpdmzBcpASHDUPwaDbzp133i63EsIIuJGQEtULkpTbJjf6MLaW5nvw6/fEjfNlHQfG5fxac= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159846546205632.99591917147757; Wed, 26 Aug 2020 11:11:02 -0700 (PDT) Received: from localhost ([::1]:40102 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAzsy-0004CM-M4 for importer@patchew.org; Wed, 26 Aug 2020 14:11:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51174) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAzsI-0003cB-1K for qemu-devel@nongnu.org; Wed, 26 Aug 2020 14:10:18 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:56412 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kAzsF-0005HH-Ot for qemu-devel@nongnu.org; Wed, 26 Aug 2020 14:10:17 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-435-wWgFRKcxNuaxoPWIhxloQQ-1; Wed, 26 Aug 2020 14:10:09 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 659C210ABDDC; Wed, 26 Aug 2020 18:10:08 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 25C535C1DA; Wed, 26 Aug 2020 18:10:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598465414; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PiApvT1sTiwwUhR3nn4DVseSe1rzlHNor0YuHEpkx1A=; b=UsphT6Pclaj0ybo7g7RP3k1vFNIp0TUBAKqVj0BOrF3f7jUKHicDwN7PxHbQgPV3q0jnUK 1o0fDFhTodPVeeyCs3cpUdxDc4Uigb/FvUUVXCA9n1iZrr3UwsdknPVkW7QViTybxFTlAf EoCxi5qfHM9Wc2qHf2XWOQsfdi7GjJs= X-MC-Unique: wWgFRKcxNuaxoPWIhxloQQ-1 From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH] armsse: Define ARMSSEClass correctly Date: Wed, 26 Aug 2020 14:10:06 -0400 Message-Id: <20200826181006.4097163-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.81; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/26 14:10:14 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" TYPE_ARM_SSE is a TYPE_SYS_BUS_DEVICE subclass, but ARMSSEClass::parent_class is declared as DeviceClass. It never caused any problems by pure luck: We were not setting class_size for TYPE_ARM_SSE, so class_size of TYPE_SYS_BUS_DEVICE was being used (sizeof(SysBusDeviceClass)). This made the system allocate enough memory for TYPE_ARM_SSE devices even though ARMSSEClass was too small for a sysbus device. Additionally, the ARMSSEClass::info field ended up at the same offset as SysBusDeviceClass::explicit_ofw_unit_address. This would make sysbus_get_fw_dev_path() crash for the device. Luckily, sysbus_get_fw_dev_path() never gets called for TYPE_ARM_SSE devices, because qdev_get_fw_dev_path() is only used by the boot device code, and TYPE_ARM_SSE devices don't appear at the fw_boot_order list. Signed-off-by: Eduardo Habkost --- Cc: Peter Maydell Cc: qemu-arm@nongnu.org Cc: qemu-devel@nongnu.org --- include/hw/arm/armsse.h | 2 +- hw/arm/armsse.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/hw/arm/armsse.h b/include/hw/arm/armsse.h index 84080c2299..b10173beab 100644 --- a/include/hw/arm/armsse.h +++ b/include/hw/arm/armsse.h @@ -220,7 +220,7 @@ typedef struct ARMSSE { typedef struct ARMSSEInfo ARMSSEInfo; =20 typedef struct ARMSSEClass { - DeviceClass parent_class; + SysBusDeviceClass parent_class; const ARMSSEInfo *info; } ARMSSEClass; =20 diff --git a/hw/arm/armsse.c b/hw/arm/armsse.c index dcbff9bd8f..6381bbd94d 100644 --- a/hw/arm/armsse.c +++ b/hw/arm/armsse.c @@ -1160,6 +1160,7 @@ static const TypeInfo armsse_info =3D { .name =3D TYPE_ARMSSE, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(ARMSSE), + .class_size =3D sizeof(ARMSSEClass), .instance_init =3D armsse_init, .abstract =3D true, .interfaces =3D (InterfaceInfo[]) { --=20 2.26.2