From nobody Sun May 5 15:25:17 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=1599156177; cv=none; d=zohomail.com; s=zohoarc; b=P4IdnGm2rpe7Qs5c6FbRbUjm2S8G0YdUqNmJ2AjC6cKwGLaap5y2scSlo7FgTml0KRXvnir7CPUKEIVRUrKdTrMyy58at41N2m3sz9cPpFCMHxQfmk+dVDDLcU9K9ER5Y034Yo55uMs1zx/hLBr0nH4BckWJ+dY/2441coueiOw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599156177; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QfSa/Pu+cYufPXc3u6jsH7mhzEHWboKSUmufz2Fy7lA=; b=PrpTSsvDVfDQGsFzLe6rLUU63YX64sgCt7cTDYOgasA8hc59VfnIr020n3aa+bBfMj/uhYvBKJTI1gIeVneQTueLUvC1SlIQ1RS2Zf+ETtGaLYESpQ/AEsFzBX5XJaD//xympxtvDDnKQKZRFq5ioJV01t5nnjrwGE0a9fno0Xw= 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 159915617701425.04221199309916; Thu, 3 Sep 2020 11:02:57 -0700 (PDT) Received: from localhost ([::1]:39398 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDtZY-0004Zf-6Z for importer@patchew.org; Thu, 03 Sep 2020 14:02:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36158) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDtYS-0003Jo-7u for qemu-devel@nongnu.org; Thu, 03 Sep 2020 14:01:48 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:27694 helo=us-smtp-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 1kDtYQ-0007OZ-Cc for qemu-devel@nongnu.org; Thu, 03 Sep 2020 14:01:47 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-186-0Efk-prYMquaiRy53j6W5w-1; Thu, 03 Sep 2020 14:01:43 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9EC271075140; Thu, 3 Sep 2020 18:01:42 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7DD1E7EECD; Thu, 3 Sep 2020 18:01:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599156105; 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: in-reply-to:in-reply-to:references:references; bh=QfSa/Pu+cYufPXc3u6jsH7mhzEHWboKSUmufz2Fy7lA=; b=fb1hf9vISPQvXEthiX33ey7IG6n/RSUDMOLBlMZRjud3voTqAsKbAUbh9u8FEOM0iQBnCM 4APusNAqQtmRmg5ozfEjIjZDB/JJ/RqvRs/aWoREzVkrQLJOPh2cR16V6jyWoA5JUgcrXx nwY99h61fEIlwLFytcgqVTVlOoibF/E= X-MC-Unique: 0Efk-prYMquaiRy53j6W5w-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, "Daniel P. Berrange" Subject: [PATCH 1/8] i8254: Rename TYPE_I8254 to TYPE_ISA_PIT Date: Thu, 3 Sep 2020 14:01:21 -0400 Message-Id: <20200903180128.1523959-2-ehabkost@redhat.com> In-Reply-To: <20200903180128.1523959-1-ehabkost@redhat.com> References: <20200903180128.1523959-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: 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.120; envelope-from=ehabkost@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/03 01:58:20 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-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: Fam Zheng , Eduardo Habkost , "Michael S. Tsirkin" , Gerd Hoffmann , Paolo Bonzini , =?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) This will make the type name constant consistent with the name of the QOM type ("isa-pit"). Suggested-by: "Daniel P. Berrang=C3=A9" Signed-off-by: Eduardo Habkost Reviewed-by: Daniel P. Berrang=C3=A9 --- Changes v1 -> v2: * v1 subject was: "i8254: Rename TYPE_I8254 to TYPE_PIT" * Rename it to TYPE_ISA_PIT instead of TYPE_PIT, to be consistent with the existing "isa-pit" type name --- Cc: "Michael S. Tsirkin" Cc: Paolo Bonzini Cc: qemu-devel@nongnu.org --- include/hw/timer/i8254.h | 4 ++-- hw/timer/i8254.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/hw/timer/i8254.h b/include/hw/timer/i8254.h index 1a522a2457..b21e67c124 100644 --- a/include/hw/timer/i8254.h +++ b/include/hw/timer/i8254.h @@ -45,7 +45,7 @@ typedef struct PITCommonClass PITCommonClass; DECLARE_OBJ_CHECKERS(PITCommonState, PITCommonClass, PIT_COMMON, TYPE_PIT_COMMON) =20 -#define TYPE_I8254 "isa-pit" +#define TYPE_ISA_PIT "isa-pit" #define TYPE_KVM_I8254 "kvm-pit" =20 static inline ISADevice *i8254_pit_init(ISABus *bus, int base, int isa_irq, @@ -54,7 +54,7 @@ static inline ISADevice *i8254_pit_init(ISABus *bus, int = base, int isa_irq, DeviceState *dev; ISADevice *d; =20 - d =3D isa_new(TYPE_I8254); + d =3D isa_new(TYPE_ISA_PIT); dev =3D DEVICE(d); qdev_prop_set_uint32(dev, "iobase", base); isa_realize_and_unref(d, bus, &error_fatal); diff --git a/hw/timer/i8254.c b/hw/timer/i8254.c index c01ee2c72a..5666bcb4ef 100644 --- a/hw/timer/i8254.c +++ b/hw/timer/i8254.c @@ -39,7 +39,7 @@ =20 typedef struct PITClass PITClass; DECLARE_CLASS_CHECKERS(PITClass, PIT, - TYPE_I8254) + TYPE_ISA_PIT) =20 struct PITClass { PITCommonClass parent_class; @@ -370,7 +370,7 @@ static void pit_class_initfn(ObjectClass *klass, void *= data) } =20 static const TypeInfo pit_info =3D { - .name =3D TYPE_I8254, + .name =3D TYPE_ISA_PIT, .parent =3D TYPE_PIT_COMMON, .instance_size =3D sizeof(PITCommonState), .class_init =3D pit_class_initfn, --=20 2.26.2 From nobody Sun May 5 15:25:17 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=1599156192; cv=none; d=zohomail.com; s=zohoarc; b=g87pygbOXIIrH5JjuD7mt4H/dOa/kfCiMWGT/bck7x7XPcZnQNGsqmmgKYMmweZZ6ir7SoDOYKtFqM0PedJInWcdR40nPRN6dcz1vIGRhN0nJZWoujjbmWRvlaEGZwmvE/z/P27yeUh+V7k0pe8YPdXglofozNn6NfNgBixfOdQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599156192; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=OztoC9v0fTAzGHm6210N9osEGvTH2M/XSh6+JQmJeOo=; b=fZwAUoY8H+eNcO0sc9syKR1oUYLYDXMyi04f4bkB2j1e+LO58kKU8YSpShwtZwVCHicCARqDYmBCsIxRJpppeEJdqZggG2KxMe8lwTDoYdQLHAw7lYsf4I2TqJALe7HdYvwhBgAed/lyYkWcJfH+OM1zreW8VVblCrt+TuEBC18= 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 1599156192414862.2138282251647; Thu, 3 Sep 2020 11:03:12 -0700 (PDT) Received: from localhost ([::1]:39888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDtZn-0004nA-Mn for importer@patchew.org; Thu, 03 Sep 2020 14:03:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36232) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDtYc-0003Qy-3Q for qemu-devel@nongnu.org; Thu, 03 Sep 2020 14:01:59 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:45315 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 1kDtYZ-0007PF-Co for qemu-devel@nongnu.org; Thu, 03 Sep 2020 14:01:57 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-314-DeCP8G6mOMOVkILyOMQx8w-1; Thu, 03 Sep 2020 14:01:50 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 631378015A4; Thu, 3 Sep 2020 18:01:49 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7878A6198B; Thu, 3 Sep 2020 18:01:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599156114; 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: in-reply-to:in-reply-to:references:references; bh=OztoC9v0fTAzGHm6210N9osEGvTH2M/XSh6+JQmJeOo=; b=KsbWCJFWhtl1VpyTRIxlL6nSMunWCEKadlAbJMrAbq8YPOKkNvvYflgUyjT50l8GYXgaX2 smFUSuTtmgKJth5ci2QztA5n5919jqybatmgiKOUfEJWJ/UPi5mNhI75FbFpQmkBAVx7aB Mhdc3Cl4w3JWmEL5Ckz1se+ocSDvDRY= X-MC-Unique: DeCP8G6mOMOVkILyOMQx8w-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, "Daniel P. Berrange" Subject: [PATCH 2/8] i8254: Rename PIT to ISA_PIT Date: Thu, 3 Sep 2020 14:01:22 -0400 Message-Id: <20200903180128.1523959-3-ehabkost@redhat.com> In-Reply-To: <20200903180128.1523959-1-ehabkost@redhat.com> References: <20200903180128.1523959-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: 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=ehabkost@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/03 01:28:33 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-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: Fam Zheng , Eduardo Habkost , "Michael S. Tsirkin" , Gerd Hoffmann , Paolo Bonzini , =?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) Rename type checking function to be consistent with the type name constant (TYPE_ISA_PIT) and type name string ("isa-pit"). Suggested-by: "Daniel P. Berrang=C3=A9" Signed-off-by: Eduardo Habkost Reviewed-by: Daniel P. Berrang=C3=A9 --- Cc: "Michael S. Tsirkin" Cc: Paolo Bonzini Cc: qemu-devel@nongnu.org --- hw/timer/i8254.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/timer/i8254.c b/hw/timer/i8254.c index 5666bcb4ef..3f63e7b936 100644 --- a/hw/timer/i8254.c +++ b/hw/timer/i8254.c @@ -38,7 +38,7 @@ #define RW_STATE_WORD1 4 =20 typedef struct PITClass PITClass; -DECLARE_CLASS_CHECKERS(PITClass, PIT, +DECLARE_CLASS_CHECKERS(PITClass, ISA_PIT, TYPE_ISA_PIT) =20 struct PITClass { @@ -334,7 +334,7 @@ static void pit_post_load(PITCommonState *s) static void pit_realizefn(DeviceState *dev, Error **errp) { PITCommonState *pit =3D PIT_COMMON(dev); - PITClass *pc =3D PIT_GET_CLASS(dev); + PITClass *pc =3D ISA_PIT_GET_CLASS(dev); PITChannelState *s; =20 s =3D &pit->channels[0]; @@ -357,7 +357,7 @@ static Property pit_properties[] =3D { =20 static void pit_class_initfn(ObjectClass *klass, void *data) { - PITClass *pc =3D PIT_CLASS(klass); + PITClass *pc =3D ISA_PIT_CLASS(klass); PITCommonClass *k =3D PIT_COMMON_CLASS(klass); DeviceClass *dc =3D DEVICE_CLASS(klass); =20 --=20 2.26.2 From nobody Sun May 5 15:25:18 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=1599156289; cv=none; d=zohomail.com; s=zohoarc; b=I8x7Mo04uxEhvyQgdZYHWJAGPWEvzcbC5HPV6pxfMA9UuuzVTy2kM7b4b6LUKs6gvyTQo+miirsK1oSvrg1c4ygT+gTqqEFsUPBu3tq3LxI0FFea/ZoTEo95+vOrMnFAkLmbDNSEXepGVOCuq2c/e0C5WfkqrWX8vGzuAMbDXc8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599156289; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+yYChecXXfVTCuX6u0USpK6l7VFOUYL7LdClOPgVsEU=; b=Wk8EPSyqAkue4HcJca9s/J0U1QnZxrlh6vtCXW5EFrTBTJObq74X1phqgnf0j2l1zw9wYUsH9NpZo/BaWeWl6ggvZcNWKRwAh3X7mSPpmvo0vAg5mRLuz2tM+VyeKf5ZLB18HK+Ps35fFVh9WShYYXVdv5SpU8JLW8ERn2KPyvU= 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 1599156289211765.7973254822041; Thu, 3 Sep 2020 11:04:49 -0700 (PDT) Received: from localhost ([::1]:45212 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDtbM-0006yL-FF for importer@patchew.org; Thu, 03 Sep 2020 14:04:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36288) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDtYj-0003X6-8H for qemu-devel@nongnu.org; Thu, 03 Sep 2020 14:02:05 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:33014 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 1kDtYg-0007Pu-NJ for qemu-devel@nongnu.org; Thu, 03 Sep 2020 14:02:04 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-266-OIJkdQD-P428NRdus78pRQ-1; Thu, 03 Sep 2020 14:01:57 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B58E1185A0C0; Thu, 3 Sep 2020 18:01:56 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8080D1002D46; Thu, 3 Sep 2020 18:01:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599156121; 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: in-reply-to:in-reply-to:references:references; bh=+yYChecXXfVTCuX6u0USpK6l7VFOUYL7LdClOPgVsEU=; b=Sak+nULSfH28TEulgm6qb9KM3Xdu7zD6sjIbxi5U7wSj8pA4QCwlMt0gY4hGya38Fjusfh V4S/3wft+GiObBJq2PX5MUplHuJYkPJiOtOozhyRPFywAvA3xy/izDl80z1GN1xLl3GyT+ 96eArdjaRvSQ6jWps4qluo0KOPBq95s= X-MC-Unique: OIJkdQD-P428NRdus78pRQ-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, "Daniel P. Berrange" Subject: [PATCH 3/8] i8259: Rename TYPE_I8259 to TYPE_ISA_I8259 Date: Thu, 3 Sep 2020 14:01:23 -0400 Message-Id: <20200903180128.1523959-4-ehabkost@redhat.com> In-Reply-To: <20200903180128.1523959-1-ehabkost@redhat.com> References: <20200903180128.1523959-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: 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=ehabkost@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/03 01:28:33 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-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: Fam Zheng , Eduardo Habkost , "Michael S. Tsirkin" , Gerd Hoffmann , Paolo Bonzini , =?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) This will make the type name constant consistent with QOM type name string ("isa-i8259"). Suggested-by: Philippe Mathieu-Daud=C3=A9 Suggested-by: "Daniel P. Berrang=C3=A9" Signed-off-by: Eduardo Habkost Reviewed-by: Daniel P. Berrang=C3=A9 --- Changes v1 ->v2: * v1 subject was "i8259: Rename TYPE_I8259 to TYPE_PIC" * Rename it to TYPE_ISA_I8259 instead, to be consistent with the QOM type name ("isa-i8259") --- Cc: "Michael S. Tsirkin" Cc: Paolo Bonzini Cc: qemu-devel@nongnu.org --- hw/intc/i8259.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/intc/i8259.c b/hw/intc/i8259.c index 344fd04db1..ab55163340 100644 --- a/hw/intc/i8259.c +++ b/hw/intc/i8259.c @@ -37,10 +37,10 @@ =20 //#define DEBUG_IRQ_LATENCY =20 -#define TYPE_I8259 "isa-i8259" +#define TYPE_ISA_I8259 "isa-i8259" typedef struct PICClass PICClass; DECLARE_CLASS_CHECKERS(PICClass, PIC, - TYPE_I8259) + TYPE_ISA_I8259) =20 /** * PICClass: @@ -418,7 +418,7 @@ qemu_irq *i8259_init(ISABus *bus, qemu_irq parent_irq) =20 irq_set =3D g_new0(qemu_irq, ISA_NUM_IRQS); =20 - isadev =3D i8259_init_chip(TYPE_I8259, bus, true); + isadev =3D i8259_init_chip(TYPE_ISA_I8259, bus, true); dev =3D DEVICE(isadev); =20 qdev_connect_gpio_out(dev, 0, parent_irq); @@ -428,7 +428,7 @@ qemu_irq *i8259_init(ISABus *bus, qemu_irq parent_irq) =20 isa_pic =3D dev; =20 - isadev =3D i8259_init_chip(TYPE_I8259, bus, false); + isadev =3D i8259_init_chip(TYPE_ISA_I8259, bus, false); dev =3D DEVICE(isadev); =20 qdev_connect_gpio_out(dev, 0, irq_set[2]); @@ -451,7 +451,7 @@ static void i8259_class_init(ObjectClass *klass, void *= data) } =20 static const TypeInfo i8259_info =3D { - .name =3D TYPE_I8259, + .name =3D TYPE_ISA_I8259, .instance_size =3D sizeof(PICCommonState), .parent =3D TYPE_PIC_COMMON, .class_init =3D i8259_class_init, --=20 2.26.2 From nobody Sun May 5 15:25:18 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=1599156271; cv=none; d=zohomail.com; s=zohoarc; b=iOaf9ex8sjdOKpm6o85SsbG18n9GCcF5taVlvKDdB9VQ5MepjPrd8iasoV5TMZbQMwOfuV4HsXWqBCcnS08ZHRYxo0KaVdXeJtP24B384CA/8PTJzUe70MxTBlwpNKsTMkT+xZOD3LHqKwlGX7/Lr9SFhgc3HSx7Tj/MJYNFZ7c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599156271; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hKgwPgUlma51em3nmlbtaR4HUKEwx/6kfLC5jfNaNJc=; b=En0z6OhDyUyD+0X3NCQTLhnfec5tV+SxbhbVHpZnrm4pDHxMd/pOpTrbUPjelBj/5nOdSoRDkomlNJFWdxGv1PssqbmiHWNANmZyalgOFtYqKoE8g3EO3Brx8ftNKc56IkPWv0Tx9YFIfjvBGXpepiDQnzmsnEJL9vHxMGPog2U= 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 159915627139837.88162913157771; Thu, 3 Sep 2020 11:04:31 -0700 (PDT) Received: from localhost ([::1]:44712 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDtb4-0006mD-EU for importer@patchew.org; Thu, 03 Sep 2020 14:04:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36308) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDtYp-0003iO-44 for qemu-devel@nongnu.org; Thu, 03 Sep 2020 14:02:11 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:34548 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 1kDtYn-0007QJ-9d for qemu-devel@nongnu.org; Thu, 03 Sep 2020 14:02:10 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-573-T518Nt2iOP-hzx9hqZgp5w-1; Thu, 03 Sep 2020 14:02:06 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B437F185A0C0; Thu, 3 Sep 2020 18:02:03 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 68F0281195; Thu, 3 Sep 2020 18:01:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599156128; 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: in-reply-to:in-reply-to:references:references; bh=hKgwPgUlma51em3nmlbtaR4HUKEwx/6kfLC5jfNaNJc=; b=IxDDfjuEhfZH4tgy6PiIIg+znyJ+ScMbcL0mgdFn7I5qeJ0QqT/eZJcjmSreeLX409GA/D OQXt/4vfhGN/d062ZiOvLM7tJ5x2zkVHhaMd7B4q1HnyvG0Ru9ARtIgErtOKn0v/PRIh2U qQbFmRvZMG/Vr4odmsItAv7447TVmUc= X-MC-Unique: T518Nt2iOP-hzx9hqZgp5w-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, "Daniel P. Berrange" Subject: [PATCH 4/8] i8259: Rename PIC to ISA_I8259 Date: Thu, 3 Sep 2020 14:01:24 -0400 Message-Id: <20200903180128.1523959-5-ehabkost@redhat.com> In-Reply-To: <20200903180128.1523959-1-ehabkost@redhat.com> References: <20200903180128.1523959-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: 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=207.211.31.81; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/03 04:23:49 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-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: Fam Zheng , Eduardo Habkost , "Michael S. Tsirkin" , Gerd Hoffmann , Paolo Bonzini , =?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) Rename the type checking function to be consistent with the type name constant (TYPE_ISA_I8259) and the QOM type name string ("isa-i8259"). Suggested-by: Philippe Mathieu-Daud=C3=A9 Suggested-by: "Daniel P. Berrang=C3=A9" Signed-off-by: Eduardo Habkost Reviewed-by: Daniel P. Berrang=C3=A9 --- Cc: "Michael S. Tsirkin" Cc: Paolo Bonzini Cc: qemu-devel@nongnu.org --- hw/intc/i8259.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/intc/i8259.c b/hw/intc/i8259.c index ab55163340..61422e6fef 100644 --- a/hw/intc/i8259.c +++ b/hw/intc/i8259.c @@ -39,7 +39,7 @@ =20 #define TYPE_ISA_I8259 "isa-i8259" typedef struct PICClass PICClass; -DECLARE_CLASS_CHECKERS(PICClass, PIC, +DECLARE_CLASS_CHECKERS(PICClass, ISA_I8259, TYPE_ISA_I8259) =20 /** @@ -396,7 +396,7 @@ static const MemoryRegionOps pic_elcr_ioport_ops =3D { static void pic_realize(DeviceState *dev, Error **errp) { PICCommonState *s =3D PIC_COMMON(dev); - PICClass *pc =3D PIC_GET_CLASS(dev); + PICClass *pc =3D ISA_I8259_GET_CLASS(dev); =20 memory_region_init_io(&s->base_io, OBJECT(s), &pic_base_ioport_ops, s, "pic", 2); @@ -443,7 +443,7 @@ qemu_irq *i8259_init(ISABus *bus, qemu_irq parent_irq) =20 static void i8259_class_init(ObjectClass *klass, void *data) { - PICClass *k =3D PIC_CLASS(klass); + PICClass *k =3D ISA_I8259_CLASS(klass); DeviceClass *dc =3D DEVICE_CLASS(klass); =20 device_class_set_parent_realize(dc, pic_realize, &k->parent_realize); --=20 2.26.2 From nobody Sun May 5 15:25:18 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=1599156372; cv=none; d=zohomail.com; s=zohoarc; b=DQdHLa+mEO+OYNmnfuctN1nwlGf56nJ9KpmM9ai/Kxs1poqns1PlZyKgPjxwMcSWaPYafqgqOiGYQNsrx4M+CHJBpLuRkLsbUdCsSFpaHc04dy/rETzRVkLNITcNSrxM6QM6N170gsLT6PfEheT1PLZGuGGcryJFgAw5g8zRE2c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599156372; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7GpKCQ6vGIW6yKn0SoHlgJ/5a9ELq7zpG+KYZLlRk98=; b=fkcwcVJE8GdC1LNBrMM0NkexPg3RJbiWy9Sf/TaxD1wytCzskH58pVw4RrsapktvgK2ZL+pmqdd90aSQ+9LzGcgIIhyO8dGiFtUO8KaM+FDWEz63jfxAT9S44E8escOAb8VWvdhlLqEl9nuVpW/GA6OHdbuAqQ1MUdALKcw6EJs= 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 1599156372443382.06992110821307; Thu, 3 Sep 2020 11:06:12 -0700 (PDT) Received: from localhost ([::1]:51330 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDtch-00016B-Jq for importer@patchew.org; Thu, 03 Sep 2020 14:06:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36322) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDtYw-0003sj-9O for qemu-devel@nongnu.org; Thu, 03 Sep 2020 14:02:18 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:50282 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 1kDtYu-0007Ql-3X for qemu-devel@nongnu.org; Thu, 03 Sep 2020 14:02:17 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-48-A9TArCoJPzm5BroeJASgCA-1; Thu, 03 Sep 2020 14:02:11 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7516A1006716; Thu, 3 Sep 2020 18:02:10 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 824476198B; Thu, 3 Sep 2020 18:02:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599156135; 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: in-reply-to:in-reply-to:references:references; bh=7GpKCQ6vGIW6yKn0SoHlgJ/5a9ELq7zpG+KYZLlRk98=; b=BwRUJpGqJ4sWSizvIbj2K9teWY3PS16+0oR8O+BLPeN+g5EZCAzo7aOaYxQhSVVKcoGvFj V3PEDw/c+ueK597U/gossLSHqo/nLg4GQuQYXO8d5Qc105St5YJloQaBygKG2RD1rEMVaf Vb7bfr7P1pApHkXb/64s06Qh4Ppm/CQ= X-MC-Unique: A9TArCoJPzm5BroeJASgCA-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, "Daniel P. Berrange" Subject: [PATCH 5/8] i8259: Rename KVM_PIC to KVM_I8259 Date: Thu, 3 Sep 2020 14:01:25 -0400 Message-Id: <20200903180128.1523959-6-ehabkost@redhat.com> In-Reply-To: <20200903180128.1523959-1-ehabkost@redhat.com> References: <20200903180128.1523959-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: 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=ehabkost@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/03 01:28:33 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-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: Fam Zheng , Eduardo Habkost , "Michael S. Tsirkin" , Gerd Hoffmann , Paolo Bonzini , =?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) Rename the type checking function to be consistent with the type name constant (TYPE_KVM_I8259) and type name string ("kvm-i8259"). Suggested-by: Philippe Mathieu-Daud=C3=A9 Suggested-by: "Daniel P. Berrang=C3=A9" Signed-off-by: Eduardo Habkost Reviewed-by: Daniel P. Berrang=C3=A9 --- Cc: "Michael S. Tsirkin" Cc: Marcel Apfelbaum Cc: Paolo Bonzini Cc: Richard Henderson Cc: Eduardo Habkost Cc: qemu-devel@nongnu.org --- hw/i386/kvm/i8259.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/i386/kvm/i8259.c b/hw/i386/kvm/i8259.c index 3f8bf69e9c..46a1d31b1b 100644 --- a/hw/i386/kvm/i8259.c +++ b/hw/i386/kvm/i8259.c @@ -21,7 +21,7 @@ =20 #define TYPE_KVM_I8259 "kvm-i8259" typedef struct KVMPICClass KVMPICClass; -DECLARE_CLASS_CHECKERS(KVMPICClass, KVM_PIC, +DECLARE_CLASS_CHECKERS(KVMPICClass, KVM_I8259, TYPE_KVM_I8259) =20 /** @@ -123,7 +123,7 @@ static void kvm_pic_set_irq(void *opaque, int irq, int = level) static void kvm_pic_realize(DeviceState *dev, Error **errp) { PICCommonState *s =3D PIC_COMMON(dev); - KVMPICClass *kpc =3D KVM_PIC_GET_CLASS(dev); + KVMPICClass *kpc =3D KVM_I8259_GET_CLASS(dev); =20 memory_region_init_io(&s->base_io, OBJECT(dev), NULL, NULL, "kvm-pic",= 2); memory_region_init_io(&s->elcr_io, OBJECT(dev), NULL, NULL, "kvm-elcr"= , 1); @@ -141,7 +141,7 @@ qemu_irq *kvm_i8259_init(ISABus *bus) =20 static void kvm_i8259_class_init(ObjectClass *klass, void *data) { - KVMPICClass *kpc =3D KVM_PIC_CLASS(klass); + KVMPICClass *kpc =3D KVM_I8259_CLASS(klass); PICCommonClass *k =3D PIC_COMMON_CLASS(klass); DeviceClass *dc =3D DEVICE_CLASS(klass); =20 --=20 2.26.2 From nobody Sun May 5 15:25:18 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=1599156448; cv=none; d=zohomail.com; s=zohoarc; b=Bo/LGW94Y1hVoqpcAPGzVxhGt0laSsmp72brys0SRPVoGw6vnFrtsIOxAOqmSK4bheXgIe1B68yihGNenliL4oLTtir4ZOh3n4tzxMkEOBgLJdXGCYkoamFlFH3OmWCATcX7bFseDpomxXG2hpJLsVvjYcZ4lCajsBuDyFBxBQw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599156448; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qzh45HlgbQShaUHQkdID/1mpSxLcqgTNt/3XaxKn/B4=; b=e+pFLSaIU1QNSTI7/BVKUm/KHkk3XtK3irnQcuvJHt2/B6HnzleUY3JaGayPpWGZ2FuZNOZgCoJs63bbvPsBlRzN8g0I5AhKDyvusGcAZtJvZYY8H4o2DR3P3jCJCIjt24QD3/P4QQAZil6iDV0HcQMmQ3p/QFcNSSwlb6KqvXs= 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 1599156448660491.56664173906586; Thu, 3 Sep 2020 11:07:28 -0700 (PDT) Received: from localhost ([::1]:57600 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDtdv-0003Zl-O1 for importer@patchew.org; Thu, 03 Sep 2020 14:07:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36370) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDtZ3-0003yM-Ig for qemu-devel@nongnu.org; Thu, 03 Sep 2020 14:02:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:21542) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDtZ0-0007Rc-L2 for qemu-devel@nongnu.org; Thu, 03 Sep 2020 14:02:25 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-420-vftowrdJNMGwtx23Q7tWLg-1; Thu, 03 Sep 2020 14:02:20 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 37462185A0C2; Thu, 3 Sep 2020 18:02:18 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 310975D9CC; Thu, 3 Sep 2020 18:02:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599156141; 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: in-reply-to:in-reply-to:references:references; bh=qzh45HlgbQShaUHQkdID/1mpSxLcqgTNt/3XaxKn/B4=; b=AFlg02lRDEhvCyubuvnBkhxq0NyDTmEEdCzSfxdWuM3gJ5WeTLao5bLG2BbV/r7kB/Fdqm wphEHIK9GM2l1Qbz6v+0zaazMbJfCkYHx2hMbEVm+jWbIPZlBDPXqSl/aGkUXLdMK126Vh T1E/E+CeFDTODmMBqBZ9pdAWW8ieW/E= X-MC-Unique: vftowrdJNMGwtx23Q7tWLg-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, "Daniel P. Berrange" Subject: [PATCH 6/8] esp-pci: Rename TYPE_AM53C974_DEVICE to TYPE_AM53C974 Date: Thu, 3 Sep 2020 14:01:26 -0400 Message-Id: <20200903180128.1523959-7-ehabkost@redhat.com> In-Reply-To: <20200903180128.1523959-1-ehabkost@redhat.com> References: <20200903180128.1523959-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: 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=63.128.21.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/03 04:23:54 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-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: Fam Zheng , Eduardo Habkost , "Michael S. Tsirkin" , Gerd Hoffmann , Paolo Bonzini , =?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) This will make the type name constant consistent with the QOM type name string ("am53c974"). Suggested-by: Philippe Mathieu-Daud=C3=A9 Suggested-by: "Daniel P. Berrang=C3=A9" Signed-off-by: Eduardo Habkost Reviewed-by: Daniel P. Berrang=C3=A9 --- Changes v1 -> v2: * v1 subject was "scsi: Rename TYPE_AM53C974_DEVICE to TYPE_PCI_ESP" * Rename it to TYPE_AM53C974 instead, to be consistent with QOM type name ("am53c974") --- Cc: Paolo Bonzini Cc: Fam Zheng Cc: qemu-devel@nongnu.org --- hw/scsi/esp-pci.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/scsi/esp-pci.c b/hw/scsi/esp-pci.c index 2ce96dc56e..e30a911b21 100644 --- a/hw/scsi/esp-pci.c +++ b/hw/scsi/esp-pci.c @@ -35,11 +35,11 @@ #include "qemu/module.h" #include "qom/object.h" =20 -#define TYPE_AM53C974_DEVICE "am53c974" +#define TYPE_AM53C974 "am53c974" =20 typedef struct PCIESPState PCIESPState; DECLARE_INSTANCE_CHECKER(PCIESPState, PCI_ESP, - TYPE_AM53C974_DEVICE) + TYPE_AM53C974) =20 #define DMA_CMD 0x0 #define DMA_STC 0x1 @@ -400,7 +400,7 @@ static void esp_pci_class_init(ObjectClass *klass, void= *data) } =20 static const TypeInfo esp_pci_info =3D { - .name =3D TYPE_AM53C974_DEVICE, + .name =3D TYPE_AM53C974, .parent =3D TYPE_PCI_DEVICE, .instance_size =3D sizeof(PCIESPState), .class_init =3D esp_pci_class_init, @@ -525,7 +525,7 @@ static void dc390_class_init(ObjectClass *klass, void *= data) =20 static const TypeInfo dc390_info =3D { .name =3D TYPE_DC390_DEVICE, - .parent =3D TYPE_AM53C974_DEVICE, + .parent =3D TYPE_AM53C974, .instance_size =3D sizeof(DC390State), .class_init =3D dc390_class_init, }; --=20 2.26.2 From nobody Sun May 5 15:25:18 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=1599156377; cv=none; d=zohomail.com; s=zohoarc; b=hDMQuzfe8YunCdECbaUGptLVz/3SVDgxQrCMHMLsdbzQnTPl6wvkPCoSThjrK5ubdE6oDa4N1nO1lzO0YFT+73LMXkMxFMmt8PypXdkfrLKWJqhowX/KcAxumi2HQiVyu/4MWW3nrFtiBicj05VY1G+T1K2zN0oTZJfDMZnJiso= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599156377; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=me9w61ar0TH6gyxD0WzBdEhPBFIHmwvGvRDskpl6aGA=; b=jxGpzPvbqxTM42max7q+7SQ9U/LuKMBH8D/U9tPhJ35Mn+oxtmxR1BqCX3ee0OfZcSTo44kzHpl1lWuYwBpwiJsOW28SfSnSwtfSHYFe2d3sPFoDbzLQtmwDHlHwpj1ToADyy0ZdyXB2I7vk52SHpddwQfRBCNOVj2VbKgjeV/8= 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 1599156377551888.970486565324; Thu, 3 Sep 2020 11:06:17 -0700 (PDT) Received: from localhost ([::1]:51816 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDtcm-0001Hy-KT for importer@patchew.org; Thu, 03 Sep 2020 14:06:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36440) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDtZD-0004Kk-Py for qemu-devel@nongnu.org; Thu, 03 Sep 2020 14:02:35 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:36453 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 1kDtZB-0007TR-U7 for qemu-devel@nongnu.org; Thu, 03 Sep 2020 14:02:35 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-516-dQRa0sMSPNSxVgZ0Fsi0pg-1; Thu, 03 Sep 2020 14:02:26 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0ECDC1074654; Thu, 3 Sep 2020 18:02:25 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id D95C481190; Thu, 3 Sep 2020 18:02:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599156153; 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: in-reply-to:in-reply-to:references:references; bh=me9w61ar0TH6gyxD0WzBdEhPBFIHmwvGvRDskpl6aGA=; b=WlUkTuj+1dQB5le8I0BsY7bXDMKAs1aMTgN3rv/h6Q3zKmx+O/nXE/dmHfAViQLx4XPmGI vRydw6oKpTpP0pXwMm8ki0hPq0wlvgEzIkF2Jz2V+puCmEiQF+fYdr+LazSzLS5WcpuL5K NMnw5P/AdQMZeLnhEx9qmhYuUGnR+Xg= X-MC-Unique: dQRa0sMSPNSxVgZ0Fsi0pg-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, "Daniel P. Berrange" Subject: [PATCH 7/8] esp-pci: Rename PCI_ESP to AM53C974 Date: Thu, 3 Sep 2020 14:01:27 -0400 Message-Id: <20200903180128.1523959-8-ehabkost@redhat.com> In-Reply-To: <20200903180128.1523959-1-ehabkost@redhat.com> References: <20200903180128.1523959-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: 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=ehabkost@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/03 01:28:33 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-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: Fam Zheng , Eduardo Habkost , "Michael S. Tsirkin" , Gerd Hoffmann , Paolo Bonzini , =?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) Rename the type checking function to be consistent with the type name constant (TYPE_AM53C974) and type name string ("am53c974"). Suggested-by: Philippe Mathieu-Daud=C3=A9 Suggested-by: "Daniel P. Berrang=C3=A9" Signed-off-by: Eduardo Habkost Reviewed-by: Daniel P. Berrang=C3=A9 --- Changes v1 -> v2: * New patch added to series v2 --- Cc: Paolo Bonzini Cc: Fam Zheng Cc: qemu-devel@nongnu.org --- hw/scsi/esp-pci.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/scsi/esp-pci.c b/hw/scsi/esp-pci.c index e30a911b21..117383037e 100644 --- a/hw/scsi/esp-pci.c +++ b/hw/scsi/esp-pci.c @@ -38,7 +38,7 @@ #define TYPE_AM53C974 "am53c974" =20 typedef struct PCIESPState PCIESPState; -DECLARE_INSTANCE_CHECKER(PCIESPState, PCI_ESP, +DECLARE_INSTANCE_CHECKER(PCIESPState, AM53C974, TYPE_AM53C974) =20 #define DMA_CMD 0x0 @@ -305,7 +305,7 @@ static const MemoryRegionOps esp_pci_io_ops =3D { =20 static void esp_pci_hard_reset(DeviceState *dev) { - PCIESPState *pci =3D PCI_ESP(dev); + PCIESPState *pci =3D AM53C974(dev); esp_hard_reset(&pci->esp); pci->dma_regs[DMA_CMD] &=3D ~(DMA_CMD_DIR | DMA_CMD_INTE_D | DMA_CMD_I= NTE_P | DMA_CMD_MDL | DMA_CMD_DIAG | DMA_CMD_MASK); @@ -352,7 +352,7 @@ static const struct SCSIBusInfo esp_pci_scsi_info =3D { =20 static void esp_pci_scsi_realize(PCIDevice *dev, Error **errp) { - PCIESPState *pci =3D PCI_ESP(dev); + PCIESPState *pci =3D AM53C974(dev); DeviceState *d =3D DEVICE(dev); ESPState *s =3D &pci->esp; uint8_t *pci_conf; @@ -377,7 +377,7 @@ static void esp_pci_scsi_realize(PCIDevice *dev, Error = **errp) =20 static void esp_pci_scsi_uninit(PCIDevice *d) { - PCIESPState *pci =3D PCI_ESP(d); + PCIESPState *pci =3D AM53C974(d); =20 qemu_free_irq(pci->esp.irq); } --=20 2.26.2 From nobody Sun May 5 15:25:18 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=1599156453; cv=none; d=zohomail.com; s=zohoarc; b=FNRXSjykMBKtXBUHZyU2AZobXBNsKHBtDrLG8/3fkb6j2GgPpmoysVi6XAj4V4ftBzZO4Zs1WVKBKTUUkOI1x4Lq8wYHWjrbk5LXFl5DCym8pDw7SdFzcCIYS5tYWnk153kPS9oyLx2thyVF0vMw9F2fDt1Hvt0/MlUEvimIKOA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599156453; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8bDwQ1+0PtvkQJU9rqHi5MHZzRgMG86kPPTDKFCaVVU=; b=WT8fl7dRm3JxGs2qrr0K+VecFb9PEaq9Y5cHvAxLWL0n4zE7p6vQwJDRI8/637Qk8x9XktziBNHA1pE6XXtiZSoUVRo9AJiLdt+Pjjqogy/ln/WlDc4ohaEk0FS5oyaaCRRylfJuJRgQKMKoMLu3h7d9iLePpCfemLSVHNgs53A= 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 1599156453236293.7181527223987; Thu, 3 Sep 2020 11:07:33 -0700 (PDT) Received: from localhost ([::1]:57974 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDte0-0003io-HQ for importer@patchew.org; Thu, 03 Sep 2020 14:07:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36478) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDtZK-0004Y6-5z for qemu-devel@nongnu.org; Thu, 03 Sep 2020 14:02:42 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:23160) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDtZI-0007Ts-KR for qemu-devel@nongnu.org; Thu, 03 Sep 2020 14:02:41 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-57-LwNYACRcMO2ttizD8Lc0ag-1; Thu, 03 Sep 2020 14:02:33 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AD2FD1DE0A; Thu, 3 Sep 2020 18:02:32 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8E26B19D61; Thu, 3 Sep 2020 18:02:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599156159; 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: in-reply-to:in-reply-to:references:references; bh=8bDwQ1+0PtvkQJU9rqHi5MHZzRgMG86kPPTDKFCaVVU=; b=RHxzhyi73p730ZsCf6d099Yyn8mV8fld7EfOafp09S5ff+YSitXnvrbQm6fCyIKjrYcAGS Hx2Y4dw7DCuSM+ClCrgYc5P/eLUV77QDX5E3lU7attHpdGUzMZoZMzG9O3hiIHMme93CGT HmVCS2rlDUdZLJ8C9m23RGey1FM2uwA= X-MC-Unique: LwNYACRcMO2ttizD8Lc0ag-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, "Daniel P. Berrange" Subject: [PATCH 8/8] tusb6010: Rename TUSB to TUSB6010 Date: Thu, 3 Sep 2020 14:01:28 -0400 Message-Id: <20200903180128.1523959-9-ehabkost@redhat.com> In-Reply-To: <20200903180128.1523959-1-ehabkost@redhat.com> References: <20200903180128.1523959-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: 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=216.205.24.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/03 01:47:17 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-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: Fam Zheng , Eduardo Habkost , "Michael S. Tsirkin" , Gerd Hoffmann , Paolo Bonzini , =?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) Make type checking function name consistent with the TYPE_TUSB6010 constant and QOM type name ("tusb6010"). Suggested-by: Philippe Mathieu-Daud=C3=A9 Suggested-by: "Daniel P. Berrang=C3=A9" Signed-off-by: Eduardo Habkost Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- Changes v1 -> v2: * v1 subject was "tusb6010: Rename TYPE_TUSB6010 to TYPE_TUSB" * Rename TUSB macro to TUSB6010 instead, to keep it consistent with the QOM type name ("tusb6010") --- Cc: Gerd Hoffmann Cc: qemu-devel@nongnu.org --- hw/usb/tusb6010.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/usb/tusb6010.c b/hw/usb/tusb6010.c index 2bee3ae59f..dd20996d13 100644 --- a/hw/usb/tusb6010.c +++ b/hw/usb/tusb6010.c @@ -32,7 +32,7 @@ =20 #define TYPE_TUSB6010 "tusb6010" typedef struct TUSBState TUSBState; -DECLARE_INSTANCE_CHECKER(TUSBState, TUSB, +DECLARE_INSTANCE_CHECKER(TUSBState, TUSB6010, TYPE_TUSB6010) =20 struct TUSBState { @@ -779,7 +779,7 @@ static void tusb6010_irq(void *opaque, int source, int = level) =20 static void tusb6010_reset(DeviceState *dev) { - TUSBState *s =3D TUSB(dev); + TUSBState *s =3D TUSB6010(dev); int i; =20 s->test_reset =3D TUSB_PROD_TEST_RESET_VAL; @@ -815,7 +815,7 @@ static void tusb6010_reset(DeviceState *dev) =20 static void tusb6010_realize(DeviceState *dev, Error **errp) { - TUSBState *s =3D TUSB(dev); + TUSBState *s =3D TUSB6010(dev); SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); =20 s->otg_timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, tusb_otg_tick, s); --=20 2.26.2