From nobody Tue Dec 16 07:06:22 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 15209826016461021.6703357597225; Tue, 13 Mar 2018 16:10:01 -0700 (PDT) Received: from localhost ([::1]:43397 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evt3Q-0007LY-O3 for importer@patchew.org; Tue, 13 Mar 2018 19:10:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58183) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evsiB-0005sW-Oo for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:48:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evsiA-0003X4-LB for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:48:03 -0400 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:45855) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evsiA-0003VO-Dd for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:48:02 -0400 Received: by mail-wr0-x243.google.com with SMTP id h2so2479921wre.12 for ; Tue, 13 Mar 2018 15:48:02 -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.47.59 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Mar 2018 15:47:59 -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=IJjZgkRNgV81BXU22Ub3AU0Ymd/Sp9WKafNXrv5tXZc=; b=qC55iPVbOhIJ8SIuyp2fhQReV8RoWV8xyXqdjMs6huJ1fYQ0AbG52gv/I227hasPOI +eqam5YNkDcrZUarltbWjW2FdHG7ioqfClBLpbykL3de6uMSefjrwFg6Dpfz1DaJC4gH szKzQJDVvuGhfMqVtH3WiprVKh0sMyRswGAs8Dm7TJ+oXoygAbyuiRiBXluOLSQzqvWn xBoVQG5UtcQs9BgHa/IPr7mlJ2IhdcH7x1txvEXt/ECNprHukd2QYDgiX6UL4dQFY9bo u6E6uJXE/Cb4zLXFJVtBXBDx2+QtqlJO3sEoE+96Am5xqyhr5gsqW32x6Dk1HgETAoyN yQHA== 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=IJjZgkRNgV81BXU22Ub3AU0Ymd/Sp9WKafNXrv5tXZc=; b=VqNq4DXfcUsCd6kM+nRlcEJPK2W4o1iDfGgn1Hl7Gp/amnss+9GNNkXyx8aoDmFRfQ 1qML2Evs6pab3imAPynSIbKnE7G67K8OdwC4Ch7JMc3uw7D3LKGeU6B2sRSCZmp4k1d2 p3AK1cVcz63Bo/Q21cY7IoxGkTYI0GvyM8KXX7XtfKUXRJ17iGwulLpj3m9vClI3RoIz CNMFBi9VVShxnvw+BRLgwMZ+q8q7TmIXdHXkIhVkj3JSH2UxGG8yEUk3w8H15cjeqDAC yoOnSS/NGF5fArin9eBTO6DnnetTokoPt18/XWxd6X+dgGLHRmxgbexLrjYcCCQPufuv 1iIA== X-Gm-Message-State: AElRT7Hr8Q2sxOS1PC/R60IjqMbKO2pPr5T+o6S3VZmehJyQhPIYvd/J cfN6CWV4i5IgYflvn52v+5rVYjKP X-Google-Smtp-Source: AG47ELsHJUjOw+zmt8H5qmvR6xHpO+Zq+T2NYOUydGslRMdeFpLUjpNUqTXHVPn/H14k0Y9zl2jRlg== X-Received: by 10.223.142.164 with SMTP id q33mr1950662wrb.72.1520981280606; Tue, 13 Mar 2018 15:48:00 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 23:46:41 +0100 Message-Id: <20180313224719.4954-32-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:c0c::243 Subject: [Qemu-devel] [PULL 31/69] 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: =?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 Acked-by: David Gibson (hw/ppc) Message-Id: <20180308223946.26784-6-f4bug@amsat.org> Reviewed-by: Mark Cave-Ayland Signed-off-by: Paolo Bonzini --- hw/isa/pc87312.c | 2 +- hw/ppc/prep.c | 2 +- include/hw/isa/pc87312.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) 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 85b4fae3c7..df774bd384 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -612,7 +612,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); 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; --=20 2.14.3