From nobody Tue Dec 16 05:37:33 2025 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520983192487885.615355720132; Tue, 13 Mar 2018 16:19:52 -0700 (PDT) Received: from localhost ([::1]:43450 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evtCx-0006VQ-K6 for importer@patchew.org; Tue, 13 Mar 2018 19:19:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58253) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evsiJ-0005wi-Cq for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:48:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evsiE-0003ci-CN for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:48:11 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:51056) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evsiE-0003bh-4j for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:48:06 -0400 Received: by mail-wm0-x242.google.com with SMTP id w128so868819wmw.0 for ; Tue, 13 Mar 2018 15:48:05 -0700 (PDT) Received: from donizetti.lan (94-36-191-219.adsl-ull.clienti.tiscali.it. [94.36.191.219]) by smtp.gmail.com with ESMTPSA id x107sm1557951wrb.97.2018.03.13.15.48.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Mar 2018 15:48:04 -0700 (PDT) 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=dZwMdyo1gCWlnO6qDcmJAHo4l3W7aS0cxnVo6aJHnyc=; b=eDIwUAiBBGBIS3+U9vNAvn0UhTpM5bwdVHUNe4CSKK50JtCimqmiGdKwVJpkyLb/7R Bd5EfqjeLztJdBBSiW/Raqvm+fplEs7eY7m9NJNpmihFHVoryZBbNNkOE8E7bbn/HPAm 68nJBPKg/1g/oK14WFdMNSls81EXnF0mIMzR8rcZnBPO5qavHkji+YAmzQVPocbZkaub cikSWC1vCP3iuwzUQgg9FxC6Ir407jQH5fye5X6Oi3o1rQeG1DJqUKnCMtZ29wuo2eMO gllDY/LDGpaz6cS70UdISR4KwMxU+8aiUQeQCYEGV1NBHev3pPvX6PkGevL6kMQiu2tO r7Kw== 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=dZwMdyo1gCWlnO6qDcmJAHo4l3W7aS0cxnVo6aJHnyc=; b=ma/bnD/PEDtOzPrrSEEtFKtasCvfT3J+UyufnoZtM8ws/tDUiZ0/cGBRlCA7NXE5kH dBz9LUnsgo5aSckFtgh6Hd6HnrOsGgmG+YjTaSG/23dTkcnrw8ptOCTR7v8cQs+/3GI+ dit3RN47cATP1tiEZVp/N1sCd+2vHunjqfKlZdEEtRVd5aCspvK6pQ9Nl4Vj/Lb1FPma vknMt04uixjF77fhN7UqPQ+oDmqooW/hEaObyG/5RBb/UKXd53fp+4n4gDdHmeRNw6HK tu68ij9UK0BLnYYIARZcW3F2KpDIuKe6YH1dTHuah2wFAOvzODujtn8LIRk7W60DlWmu 38cw== X-Gm-Message-State: AElRT7Eef+iIO8sqBoMptNELqfiy0AW8+u7ujBBGgKB79kBktQX2a1Dr YFq+9FFJwO5sEN2qo9MEwMVhzf5K X-Google-Smtp-Source: AG47ELtKdPQ1nFSacYDL004Mlm4HKiXv3MU+o/99S7paMDsAg6Jv0Utyff/eMFc5DZVmKCJImDYkTA== X-Received: by 10.28.180.132 with SMTP id d126mr2114372wmf.93.1520981284682; Tue, 13 Mar 2018 15:48:04 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 23:46:45 +0100 Message-Id: <20180313224719.4954-36-pbonzini@redhat.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313224719.4954-1-pbonzini@redhat.com> References: <20180313224719.4954-1-pbonzini@redhat.com> 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:c09::242 Subject: [Qemu-devel] [PULL 35/69] 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 From: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20180308223946.26784-10-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/isa/pc87312.c | 11 ++++++++++- include/hw/isa/pc87312.h | 6 ++++-- 2 files changed, 14 insertions(+), 3 deletions(-) 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, 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 */ --=20 2.14.3