From nobody Fri May 17 02:03:08 2024 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598031648; cv=none; d=zohomail.com; s=zohoarc; b=QDxjQIRyMSscrNAvu2S860Kgf2cYx6SJytvLVO3j6lAAYKe/9kh5/lydR8TaWHdWTzLHcSa8iFToXvqH+J//mX7gIJjB6WlF+HoBRRfbXKQaZUzkzyJu7EE4ljRjx6c7riSUuCvYwYY0T3G9T3StNHURPzdwBGvfOblwYuE2SSQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598031648; 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=QQoARLZDJ9kJvgGBNB/TMfNiWwlKNFqv3ZziP5ASBD0=; b=FqNv3RxICAYLwoAWJ7Gd0V0kusIqsWdvKcIQc6VFHqKMenBkCFb4We7A099flOYOwR9yuo/pH54DvcFhtCsuCAROD20oj0iEDq9GDhpidsxPo0OfLx342VwnGM4me+HUEAvbzuLqtcdigOz5GK+za+s78UudsvZhQYxHeMlMgZ0= 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 1598031648611707.9141972891354; Fri, 21 Aug 2020 10:40:48 -0700 (PDT) Received: from localhost ([::1]:60510 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k9B1z-0004lb-9S for importer@patchew.org; Fri, 21 Aug 2020 13:40:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59866) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k9B01-00034K-DX for qemu-devel@nongnu.org; Fri, 21 Aug 2020 13:38:46 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:46917 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 1k9Azy-0002SW-Lo for qemu-devel@nongnu.org; Fri, 21 Aug 2020 13:38:44 -0400 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-378-VllLD-jnM6yWiiSvbFF3yA-1; Fri, 21 Aug 2020 13:38:35 -0400 Received: by mail-wr1-f72.google.com with SMTP id r11so632633wrj.0 for ; Fri, 21 Aug 2020 10:38:35 -0700 (PDT) Received: from localhost.localdomain (121.red-81-40-121.staticip.rima-tde.net. [81.40.121.121]) by smtp.gmail.com with ESMTPSA id c10sm5922687wro.84.2020.08.21.10.38.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Aug 2020 10:38:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598031521; 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=QQoARLZDJ9kJvgGBNB/TMfNiWwlKNFqv3ZziP5ASBD0=; b=dYIUpMEOxUHm3+9VumHFOAh9auBdAXGxPwAdvEmB8zB2eaJqKWYh9oxH65qBG0xYd99WuP vTWnrdAfVb43jt807uNPFn2ftgYK2CjDIjlhNRusCoESkSz19Vzh15L8AwXSWIWOWLeW7L mHjXsAJ8NQN3WAADVgPmevVgCS2/YoA= X-MC-Unique: VllLD-jnM6yWiiSvbFF3yA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=QQoARLZDJ9kJvgGBNB/TMfNiWwlKNFqv3ZziP5ASBD0=; b=XLHsYN5ENibMgiQi84+ZcOYkObd9ibxwhZIjG4zV3Bak0JJA5IIbsoxjpXmGOKwc9Q JI5uXx1B8N0ohBybTOgs1PSW+9tJHN7FQgQn8UR0G1UJXhacuSPtDq+AET2Nj3az+zAr B41yBWk12IjJeIyQef5LIrjdL9HWBe15qFNSl4gyHKTutbqgv5w5/AgUI2KM/iIzU0px +QHcLFbumP7NLlKH6tN9g2K71HKMf92J7kCkd99rbtehhJa0eHhUNdvsnzTkBtkWaj3o MRIEzj3ilKmZBqaabuJrFLE7w4ek1EqUEhG5PNEIHKfOZwt/ecRX/ojXtyrP6B/bt5+b dqZw== X-Gm-Message-State: AOAM531/UKU/h4XCmNigXWxsH+NJhUqRzqr0yY3v+oNNO3Ig2+Za/CV8 yWWGpGgxC928WKDD5wsRtl85SuEXtDfhzUDh0DZVuKq8iMHFJSUs1uPgWF9hxJW/7AlJOy3vNfT TRMj9Pvka82ely+4= X-Received: by 2002:a5d:4d87:: with SMTP id b7mr3948661wru.170.1598031514382; Fri, 21 Aug 2020 10:38:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyyG3EuRNn1WklIbg5C5hbBPkL9HJiaEObcqBUHm2hvxiZ8sP2LqlmHhZTeyC7CY5NnVDRtGw== X-Received: by 2002:a5d:4d87:: with SMTP id b7mr3948630wru.170.1598031514130; Fri, 21 Aug 2020 10:38:34 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH] hw/isa/isa-superio: Set abstract TYPE_ISA_SUPERIO instance size Date: Fri, 21 Aug 2020 19:38:31 +0200 Message-Id: <20200821173831.1262979-1-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" 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=205.139.110.61; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/21 01:00:15 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=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: Eduardo Habkost , "Michael S. Tsirkin" , Jiaxun Yang , Aleksandar Markovic , Paolo Bonzini , Huacai Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Instead of setting the instance size on each implementations, set it on the abstract parent, so we are sure no implementation will forget to set it. Reported-by: Eduardo Habkost Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- See: https://www.mail-archive.com/qemu-devel@nongnu.org/msg731954.html --- hw/isa/isa-superio.c | 2 +- hw/isa/smc37c669-superio.c | 1 - hw/isa/vt82c686.c | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/isa/isa-superio.c b/hw/isa/isa-superio.c index e2e47d8fd99..83eb21ebb2a 100644 --- a/hw/isa/isa-superio.c +++ b/hw/isa/isa-superio.c @@ -182,6 +182,7 @@ static const TypeInfo isa_superio_type_info =3D { .name =3D TYPE_ISA_SUPERIO, .parent =3D TYPE_ISA_DEVICE, .abstract =3D true, + .instance_size =3D sizeof(ISASuperIODevice), .class_size =3D sizeof(ISASuperIOClass), .class_init =3D isa_superio_class_init, }; @@ -200,7 +201,6 @@ static void fdc37m81x_class_init(ObjectClass *klass, vo= id *data) static const TypeInfo fdc37m81x_type_info =3D { .name =3D TYPE_FDC37M81X_SUPERIO, .parent =3D TYPE_ISA_SUPERIO, - .instance_size =3D sizeof(ISASuperIODevice), .class_init =3D fdc37m81x_class_init, }; =20 diff --git a/hw/isa/smc37c669-superio.c b/hw/isa/smc37c669-superio.c index 18287741cb4..9e59dc16039 100644 --- a/hw/isa/smc37c669-superio.c +++ b/hw/isa/smc37c669-superio.c @@ -103,7 +103,6 @@ static void smc37c669_class_init(ObjectClass *klass, vo= id *data) static const TypeInfo smc37c669_type_info =3D { .name =3D TYPE_SMC37C669_SUPERIO, .parent =3D TYPE_ISA_SUPERIO, - .instance_size =3D sizeof(ISASuperIODevice), .class_size =3D sizeof(ISASuperIOClass), .class_init =3D smc37c669_class_init, }; diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 18160ca445d..a4b84d405d0 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -533,7 +533,6 @@ static void vt82c686b_superio_class_init(ObjectClass *k= lass, void *data) static const TypeInfo via_superio_info =3D { .name =3D TYPE_VT82C686B_SUPERIO, .parent =3D TYPE_ISA_SUPERIO, - .instance_size =3D sizeof(ISASuperIODevice), .class_size =3D sizeof(ISASuperIOClass), .class_init =3D vt82c686b_superio_class_init, }; --=20 2.26.2