From nobody Tue Feb 10 13:16:29 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520549340825726.0516496272903; Thu, 8 Mar 2018 14:49:00 -0800 (PST) Received: from localhost ([::1]:42263 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eu4LM-0005Hr-1Y for importer@patchew.org; Thu, 08 Mar 2018 17:49:00 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56434) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eu4Cq-0006sv-Pj for qemu-devel@nongnu.org; Thu, 08 Mar 2018 17:40:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eu4Cp-0003xi-TD for qemu-devel@nongnu.org; Thu, 08 Mar 2018 17:40:12 -0500 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:46445) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eu4Cp-0003xA-Lw; Thu, 08 Mar 2018 17:40:11 -0500 Received: by mail-wr0-x243.google.com with SMTP id m12so7234526wrm.13; Thu, 08 Mar 2018 14:40:11 -0800 (PST) Received: from x1.local (ABayonne-654-1-76-150.w86-222.abo.wanadoo.fr. [86.222.219.150]) by smtp.gmail.com with ESMTPSA id x190sm19315070wme.27.2018.03.08.14.40.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Mar 2018 14:40:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IDISHE/WXhKazKS9RqpzgTEj/9/+RmtPBdEpXusdzis=; b=lygIq6UxZM53kJqwnngerswDcyZMXhPqgtsk3LQ0BEjvqnPcicgmW1aqMUyuKOY389 Xs6UezH2l2P93eOkyin/SpgSMXxFVYz3/ZP+D46O9QvOyUMSoD0s1T3/snfJ141Gzbs/ MrbpOmTYuYdfrShhZVtbvUCFzqE2cKkNoGuCX1rco9G/6Uvf2VEIJkr3j9pN29SCwMKo 0OqCmwCNu52SoJUPFIzxdNGeWDNWS2dFQLmbzRLQc2BDYwyrGCZMJ4IfS8TqaetAztXa URUz7LJv+1lQts76nrbuPPCLuIOXiZQy9olzFht9N2ONPPMRFuN9/tQk5gMe3VLzoGlg KTtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=IDISHE/WXhKazKS9RqpzgTEj/9/+RmtPBdEpXusdzis=; b=cXeVzDbBvZg20GLxHzAB6cAKiaxBGdqShyBUFM31qT54BA327EN1u44AIsuH/xgVil LxqPmPwzYcLgWip4QQHhIUQhXDEZvdn8kBa8GmuG/qtZVQGPn2CU4jCh8aEgt2DfgVmb UfJ6XsRI/g5hQQ82mUkI1OcNgW1wo+65gHDaGbC3+nJq9hOntAzlVg+Zb+vFs5LN5QlG VTNJqlgK487D4piNPhiGf3lJh1gVkwJ7RgHs7zM1SeH/Smug6TQpKUPUskOpfBql29oC UeLOjybMkFxEWkNayCHcb8qbB1N2seWSv4f1QLWMX6ywu9IMFPWwzhv4io5GgB1xnATV B7jg== X-Gm-Message-State: APf1xPDe19HrZDzqdzJQWrNuvMuIwmZXXQUtM+xSLy6JwRzIT1vxZzxn 3oh4rPcJ+4aUBZ3wFnhPwnI= X-Google-Smtp-Source: AG47ELvhT6vN84uSh6eoOjZ+gODmIvF7NoUXKrswRnLglhQabDyeER+hk3aGu1jGOXNKzbnIHrmx+A== X-Received: by 10.223.135.232 with SMTP id c37mr22668907wrc.168.1520548810625; Thu, 08 Mar 2018 14:40:10 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: "Michael S . Tsirkin" , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Marcel Apfelbaum , Aurelien Jarno , Mark Cave-Ayland , Alexey Kardashevskiy , Thomas Huth Date: Thu, 8 Mar 2018 23:39:30 +0100 Message-Id: <20180308223946.26784-10-f4bug@amsat.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180308223946.26784-1-f4bug@amsat.org> References: <20180308223946.26784-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::243 Subject: [Qemu-devel] [PATCH 09/25] hw/isa/pc87312: Inherit from the abstract TYPE_ISA_SUPERIO 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: , Cc: Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, "open list:PReP" , Guan Xuetao , Yongbok Kim , Artyom Tarasenko , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/isa/pc87312.h | 6 ++++-- hw/isa/pc87312.c | 11 ++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/include/hw/isa/pc87312.h b/include/hw/isa/pc87312.h index b65b219a8a..f3761d6fe1 100644 --- a/include/hw/isa/pc87312.h +++ b/include/hw/isa/pc87312.h @@ -25,14 +25,16 @@ #ifndef QEMU_PC87312_H #define QEMU_PC87312_H =20 -#include "hw/isa/isa.h" +#include "hw/isa/superio.h" =20 =20 #define TYPE_PC87312_SUPERIO "pc87312" #define PC87312(obj) OBJECT_CHECK(PC87312State, (obj), TYPE_PC87312_SUPERI= O) =20 typedef struct PC87312State { - ISADevice dev; + /*< private >*/ + ISASuperIODevice parent_dev; + /*< public >*/ =20 uint16_t iobase; uint8_t config; /* initial configuration */ diff --git a/hw/isa/pc87312.c b/hw/isa/pc87312.c index fda91fed21..6b8100ff56 100644 --- a/hw/isa/pc87312.c +++ b/hw/isa/pc87312.c @@ -270,6 +270,7 @@ static void pc87312_realize(DeviceState *dev, Error **e= rrp) ISABus *bus; Chardev *chr; DriveInfo *drive; + Error *local_err =3D NULL; char name[5]; int i; =20 @@ -279,6 +280,12 @@ static void pc87312_realize(DeviceState *dev, Error **= errp) isa_register_ioport(isa, &s->io, s->iobase); pc87312_hard_reset(s); =20 + ISA_SUPERIO_GET_CLASS(dev)->parent_realize(dev, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } + if (is_parallel_enabled(s)) { /* FIXME use a qdev chardev prop instead of parallel_hds[] */ chr =3D parallel_hds[0]; @@ -381,7 +388,9 @@ static Property pc87312_properties[] =3D { static void pc87312_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); + ISASuperIOClass *sc =3D ISA_SUPERIO_CLASS(klass); =20 + sc->parent_realize =3D dc->realize; dc->realize =3D pc87312_realize; dc->reset =3D pc87312_reset; dc->vmsd =3D &vmstate_pc87312; @@ -392,7 +401,7 @@ static void pc87312_class_init(ObjectClass *klass, void= *data) =20 static const TypeInfo pc87312_type_info =3D { .name =3D TYPE_PC87312_SUPERIO, - .parent =3D TYPE_ISA_DEVICE, + .parent =3D TYPE_ISA_SUPERIO, .instance_size =3D sizeof(PC87312State), .instance_init =3D pc87312_initfn, .class_init =3D pc87312_class_init, --=20 2.16.2