From nobody Sat Oct 25 08:57:49 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520285227654695.7938706267563; Mon, 5 Mar 2018 13:27:07 -0800 (PST) Received: from localhost ([::1]:51632 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1esxdS-0002Hf-Po for importer@patchew.org; Mon, 05 Mar 2018 16:27:06 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49232) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1esxWL-0004FZ-4v for qemu-devel@nongnu.org; Mon, 05 Mar 2018 16:19:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1esxWK-0001Ux-7P for qemu-devel@nongnu.org; Mon, 05 Mar 2018 16:19:45 -0500 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]:40373) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1esxWK-0001UU-0l; Mon, 05 Mar 2018 16:19:44 -0500 Received: by mail-wr0-x244.google.com with SMTP id o76so18792672wrb.7; Mon, 05 Mar 2018 13:19:43 -0800 (PST) Received: from x1.local (ABayonne-654-1-79-224.w86-222.abo.wanadoo.fr. [86.222.222.224]) by smtp.gmail.com with ESMTPSA id g96sm12904808wrd.73.2018.03.05.13.19.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Mar 2018 13:19:42 -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=4Lfa+6A8WxRJYq2hEeK1UhJhMqsu1kQoRG3gp3uTQkQ=; b=otPFCYucyEe5S9ZZ8q7kwOglxyXmEST+R0OGqFfFUMw6DyGvaWbPzrSAsg3n5BKlub Y4C7orkp0FsUYfF7i0QavNrcba5Yfj/TBWeKmVzig5ZLienGobBZ2EN3zKbCXDFMdnOY vlpn1x5fa0ihXeCX49VZovYpBkdksxkqodCSGLeclyqHt2X8HBN8n8wWF3jss86R/Zn9 s1flL95IpwsMmquxwbTdNnO1D2oJVLfD0wna9bjA6PzufdYRW+3REUaZPBoEL43jNDu8 kjerAHKP0MHRY1bowu85ZSZ+2S83l4cnGlEeQ4TBKL1CjF8SJ2hqBx8XPBl2Au/YMRFt TtTw== 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=4Lfa+6A8WxRJYq2hEeK1UhJhMqsu1kQoRG3gp3uTQkQ=; b=VSpA7CAWRNKHhkgZgtXS/6NcgNyu4DgiE7zmY8ZVwENmGgfbu4FRLtoaAdEODF3HY/ SpYHgNj38GESP/EICTMI/C6fnh6E5NMVNx9az3XVAqQUnVzBexsifqemIXNNaXwOCQZ7 8bXCzwd008+B+YnOBTP+Rbx/jZ4cRem9DEqlSPvmHiymuj142SskiH0wokN8+kyaErws jVlWfb801GJU03dethNFa9lyY4wTH0KjtNjyt3kLo6s1bYXZYFcW0l6S0ZXHpuN80Zcw y29quRuMXVEjdW7rYK/7TggC6Om7tzG+5Sxf38JMp1KB45szLtfVmcUIkk3Olcyvoobq RnnQ== X-Gm-Message-State: APf1xPCV4E4Y8SkIdTiRCOAcuzTUSyxH9AQIwIaQiCiTVwJeCMimMjTD +u6nhE+i4r3iUhaW4dZTFhE= X-Google-Smtp-Source: AG47ELtyzr+iJc+xFPWC9Z+Gn4jaX32itEnzMG0cWxBT5fQg6iqlIXQtiR6+BszLSqvhX5BqutRlXw== X-Received: by 10.223.208.141 with SMTP id y13mr13764670wrh.13.1520284783135; Mon, 05 Mar 2018 13:19:43 -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: Mon, 5 Mar 2018 18:19:10 -0300 Message-Id: <20180305211928.466-5-f4bug@amsat.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180305211928.466-1-f4bug@amsat.org> References: <20180305211928.466-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::244 Subject: [Qemu-devel] [RFC PATCH v2 04/22] hw/isa/pc87312: Rename the device type as TYPE_PC87312_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: Alexander Graf , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, "open list:PReP" , David Gibson , 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 Acked-by: David Gibson --- include/hw/isa/pc87312.h | 4 ++-- hw/isa/pc87312.c | 2 +- hw/ppc/prep.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/hw/isa/pc87312.h b/include/hw/isa/pc87312.h index bf74470d40..710eb1c807 100644 --- a/include/hw/isa/pc87312.h +++ b/include/hw/isa/pc87312.h @@ -28,8 +28,8 @@ #include "hw/isa/isa.h" =20 =20 -#define TYPE_PC87312 "pc87312" -#define PC87312(obj) OBJECT_CHECK(PC87312State, (obj), TYPE_PC87312) +#define TYPE_PC87312_SUPERIO "pc87312" +#define PC87312(obj) OBJECT_CHECK(PC87312State, (obj), TYPE_PC87312_SUPERI= O) =20 typedef struct PC87312State { ISADevice dev; diff --git a/hw/isa/pc87312.c b/hw/isa/pc87312.c index 48b29e3c3c..e9edbc6c50 100644 --- a/hw/isa/pc87312.c +++ b/hw/isa/pc87312.c @@ -391,7 +391,7 @@ static void pc87312_class_init(ObjectClass *klass, void= *data) } =20 static const TypeInfo pc87312_type_info =3D { - .name =3D TYPE_PC87312, + .name =3D TYPE_PC87312_SUPERIO, .parent =3D TYPE_ISA_DEVICE, .instance_size =3D sizeof(PC87312State), .instance_init =3D pc87312_initfn, diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index ae724b0613..610ec7ec32 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -613,7 +613,7 @@ static void ppc_prep_init(MachineState *machine) isa_bus =3D ISA_BUS(qdev_get_child_bus(DEVICE(pci), "isa.0")); =20 /* Super I/O (parallel + serial ports) */ - isa =3D isa_create(isa_bus, TYPE_PC87312); + isa =3D isa_create(isa_bus, TYPE_PC87312_SUPERIO); dev =3D DEVICE(isa); qdev_prop_set_uint8(dev, "config", 13); /* fdc, ser0, ser1, par0 */ qdev_init_nofail(dev); --=20 2.16.2