From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 32145C4363A for ; Mon, 5 Oct 2020 16:48:31 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A78DF20774 for ; Mon, 5 Oct 2020 16:48:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="DIUzjOVf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A78DF20774 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52750 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kPTf3-0001PX-N7 for qemu-devel@archiver.kernel.org; Mon, 05 Oct 2020 12:48:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45532) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kPTe9-0000Gd-80 for qemu-devel@nongnu.org; Mon, 05 Oct 2020 12:47:33 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:31201) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kPTe7-00016i-CG for qemu-devel@nongnu.org; Mon, 05 Oct 2020 12:47:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601916450; 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: in-reply-to:in-reply-to:references:references; bh=l9IHBO/SRM/ahWl+f8VXGfHTH+UfiWgovpULCsvn/ww=; b=DIUzjOVf5VunPLePi5Vr1zgtbO/WwQlIZQjQDXryqP0wPwqd4PWqHaZ2qNi1yqKWBRYsJ9 AquFa+OgAMcyycDeSrw1bklDjapP6qBfHBl3UCUZ9CYWHKwDCLSEqy1jAYgyvDPj+GvI0g i6HA4/H/aYixNOcC8Y6GTnb0yPuQlZg= 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-470-rtasaBg7PyiXKN5gog1LBA-1; Mon, 05 Oct 2020 12:47:29 -0400 X-MC-Unique: rtasaBg7PyiXKN5gog1LBA-1 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 BFCD1801AE2; Mon, 5 Oct 2020 16:47:27 +0000 (UTC) Received: from localhost (unknown [10.40.208.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8071B5C1BD; Mon, 5 Oct 2020 16:47:19 +0000 (UTC) Date: Mon, 5 Oct 2020 18:47:17 +0200 From: Igor Mammedov To: Sergey Nizovtsev Subject: Re: [PATCH] qom: fix objects with improper parent type Message-ID: <20201005184717.5f7dc3f5@redhat.com> In-Reply-To: References: 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=imammedo@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=63.128.21.124; envelope-from=imammedo@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/05 01:25:11 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.733, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, 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 , qemu-devel@nongnu.org, =?UTF-8?B?TWFyYy1BbmRyw6k=?= Lureau Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, 29 Sep 2020 16:47:14 -0700 Sergey Nizovtsev wrote: > 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 nice catch, Reviewed-by: Igor Mammedov > --- > 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 =~ ".*Class$"; > +@@ > +struct obj_t { > + parent_t fld; > + ... > +}; > + > +@script:python filter depends on match@ > +obj_t << match.obj_t; > +@@ > +is_class_obj = 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