From nobody Tue Feb 10 11:19:49 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1601423909; cv=none; d=zohomail.com; s=zohoarc; b=ZgTee0RwS2oN4cW/X8NjbeXbhMcwEy/sA6v9Db3KNSOptPz7aFK/8vi3XpkZPtNEj85RLSoQQi0s9C8wVU6ihYR7UFojlR1hibN6l2pR/Hj+PQatd9BxO5Ou3oPH8qrhcGaCn7x+rakFtdSM+kEF6V/ypnkq52QAeek7AI2PBhk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601423909; h=Content-Type:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=KhSGaXrogwd/Fi04sIgiySppfiPQ9ooG3Z4HZ+ITPnI=; b=hm3sfgSQzkmGOTeMj2rIa773lTwhgUyZGBty8rSh7Ft+XmespnL1OFFyBVU2vtn6SZQPvhEaF0iNONe+RlhGwV6jdiTuH0gK9rD04csYco/qlYXynbP3Shv+BQ+szj35V1n1H6E/JrVZ08GTmK0XLpo8/AIYUg91amZWQS4aWko= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1601423909761776.4337504586797; Tue, 29 Sep 2020 16:58:29 -0700 (PDT) Received: from localhost ([::1]:33274 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNPVs-0006hh-GD for importer@patchew.org; Tue, 29 Sep 2020 19:58:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43098) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNPL5-0001dV-7d; Tue, 29 Sep 2020 19:47:19 -0400 Received: from mail-ej1-x642.google.com ([2a00:1450:4864:20::642]:40236) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNPL3-0003Dd-8A; Tue, 29 Sep 2020 19:47:18 -0400 Received: by mail-ej1-x642.google.com with SMTP id p15so68653ejm.7; Tue, 29 Sep 2020 16:47:16 -0700 (PDT) Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Tue, 29 Sep 2020 16:47:14 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:mime-version:date:message-id:subject:to:cc; bh=KhSGaXrogwd/Fi04sIgiySppfiPQ9ooG3Z4HZ+ITPnI=; b=mqBRxmtm67ioXMInTZjemci+6L/dxaP7U/eHHOx4u8PVx45jI2aGXkeTwRcw5L+wTD WrfxicpZFzeu2ojzrL+btYIK23QXrk0gv59lAvoRtOP3Ak51NG8txKqbyUp+4c5K2cvv IGkVksu45z6jSVr4xkFqtrAPb8nZI4WHG8NJPXX1J6KvK6KpnnJCPb9RwF95KgsCI5SU P8LRv/guuX6QYhShVVxqRmGhDZq/OysfiFOw89jvE1PmeiIstHeUEmABCMq2IIYD/fd2 Eo7s+/YrBjNPl+rkM+LzjGpxnGSpZfHNJG1d5je45Qbbzcl6Oi2uViPCAHxwCd7dmWpf N8eA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:mime-version:date:message-id:subject:to:cc; bh=KhSGaXrogwd/Fi04sIgiySppfiPQ9ooG3Z4HZ+ITPnI=; b=h43JXERzyvQEMrvcGp2HrnXKYoTH0w5pSChoIZ34P3vt4/XFOgmBqPb85knO/vtDsH PEPjneW89vx1lOwaeVdOm3q4oorVWhcmdlT6/djsPYLH9uGlhqjnWph3fUpJAUOlIck4 ufx3qzC6OkgwSSypNJiJV42zJcuCvMJtZPidg3RGm1kDn4e8NNQO/MexYDQdbnxDSzsU cithU92ZvLMaaVOKN10pKreGnBHH9K5i3UJy44iOlyLr0jVEd2dzInDC1qeuSsY5FF7V EJWd03sNgGt50sIroyGwHRkvKxRz3lC75l5WSAcCl4p+qlTWLdPx2B6IS/5aR7RVP8an XcBg== X-Gm-Message-State: AOAM531a3KZnU0dxwBdk4z7Wa7ddaGXlZwWdssY2k65b8hsM0Ng822w6 rqsJ3Ru1hb4Xp5PIwPVzihkODDBuDcoi0ngv+1/9BnEL3lkD1Q== X-Google-Smtp-Source: ABdhPJzbtkEQEJ8RtOxDAdrNjzt8PRm+KRaHRT6zE6umW4T9ZFW74esZAFsEH45wVwHuBNasp873LHxbUtoMYB7T4pk= X-Received: by 2002:a17:906:30cf:: with SMTP id b15mr60606ejb.351.1601423235078; Tue, 29 Sep 2020 16:47:15 -0700 (PDT) From: Sergey Nizovtsev X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Date: Tue, 29 Sep 2020 16:47:14 -0700 Message-ID: Subject: [PATCH] qom: fix objects with improper parent type To: qemu-devel@nongnu.org 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=2a00:1450:4864:20::642; envelope-from=snizovtsev@gmail.com; helo=mail-ej1-x642.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: Ben Warren , "Michael S. Tsirkin" , qemu-trivial@nongnu.org, Jason Wang , Markus Armbruster , Sergey Nizovtsev , =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Some objects accidentally inherit ObjectClass instead of Object. They compile silently but may crash after downcasting. In this patch, we introduce a coccinelle script to find broken declarations and fix them manually with proper base type. Signed-off-by: Sergey Nizovtsev Reviewed-by: Igor Mammedov Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Michael S. Tsirkin --- scripts/coccinelle/qobject-parent-type.cocci | 26 ++++++++++++++++++++ include/hw/acpi/vmgenid.h | 2 +- include/hw/misc/vmcoreinfo.h | 2 +- include/net/can_host.h | 2 +- MAINTAINERS | 1 + 5 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 scripts/coccinelle/qobject-parent-type.cocci diff --git a/scripts/coccinelle/qobject-parent-type.cocci b/scripts/coccinelle/qobject-parent-type.cocci new file mode 100644 index 0000000000..9afb3edd97 --- /dev/null +++ b/scripts/coccinelle/qobject-parent-type.cocci @@ -0,0 +1,26 @@ +// Highlight object declarations that don't look like object class but +// accidentally inherit from it. + +@match@ +identifier obj_t, fld; +type parent_t =3D~ ".*Class$"; +@@ +struct obj_t { + parent_t fld; + ... +}; + +@script:python filter depends on match@ +obj_t << match.obj_t; +@@ +is_class_obj =3D obj_t.endswith('Class') +cocci.include_match(not is_class_obj) + +@replacement depends on filter@ +identifier match.obj_t, match.fld; +type match.parent_t; +@@ +struct obj_t { +* parent_t fld; + ... +}; diff --git a/include/hw/acpi/vmgenid.h b/include/hw/acpi/vmgenid.h index d50fbacb8e..cb4ad37fc5 100644 --- a/include/hw/acpi/vmgenid.h +++ b/include/hw/acpi/vmgenid.h @@ -19,7 +19,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(VmGenIdState, VMGENID) struct VmGenIdState { - DeviceClass parent_obj; + DeviceState parent_obj; QemuUUID guid; /* The 128-bit GUID seen by the guest */ uint8_t vmgenid_addr_le[8]; /* Address of the GUID (little-endian) */ }; diff --git a/include/hw/misc/vmcoreinfo.h b/include/hw/misc/vmcoreinfo.h index ebada6617a..0b7b55d400 100644 --- a/include/hw/misc/vmcoreinfo.h +++ b/include/hw/misc/vmcoreinfo.h @@ -24,7 +24,7 @@ DECLARE_INSTANCE_CHECKER(VMCoreInfoState, VMCOREINFO, typedef struct fw_cfg_vmcoreinfo FWCfgVMCoreInfo; struct VMCoreInfoState { - DeviceClass parent_obj; + DeviceState parent_obj; bool has_vmcoreinfo; FWCfgVMCoreInfo vmcoreinfo; diff --git a/include/net/can_host.h b/include/net/can_host.h index 4e3ce3f954..caab71bdda 100644 --- a/include/net/can_host.h +++ b/include/net/can_host.h @@ -35,7 +35,7 @@ OBJECT_DECLARE_TYPE(CanHostState, CanHostClass, CAN_HOST) struct CanHostState { - ObjectClass oc; + Object oc; CanBusState *bus; CanBusClientState bus_client; diff --git a/MAINTAINERS b/MAINTAINERS index 5eed1e692b..2160b8196a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2402,6 +2402,7 @@ F: qobject/ F: include/qapi/qmp/ X: include/qapi/qmp/dispatch.h F: scripts/coccinelle/qobject.cocci +F: scripts/coccinelle/qobject-parent-type.cocci F: tests/check-qdict.c F: tests/check-qjson.c F: tests/check-qlist.c --=20 2.28.0