From patchwork Thu Sep 3 18:01:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 274646 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9778EC433E2 for ; Thu, 3 Sep 2020 18:06:09 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5C0F820716 for ; Thu, 3 Sep 2020 18:06:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="BwRUJpGq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5C0F820716 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51330 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDtce-00016B-Gm for qemu-devel@archiver.kernel.org; Thu, 03 Sep 2020 14:06:08 -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 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= 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 X-MC-Unique: A9TArCoJPzm5BroeJASgCA-1 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) 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 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_Mathieu-Daud?= =?utf-8?b?w6k=?= , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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é Suggested-by: "Daniel P. Berrangé" Signed-off-by: Eduardo Habkost --- 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 @@ #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) /** @@ -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 = PIC_COMMON(dev); - KVMPICClass *kpc = KVM_PIC_GET_CLASS(dev); + KVMPICClass *kpc = KVM_I8259_GET_CLASS(dev); 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) static void kvm_i8259_class_init(ObjectClass *klass, void *data) { - KVMPICClass *kpc = KVM_PIC_CLASS(klass); + KVMPICClass *kpc = KVM_I8259_CLASS(klass); PICCommonClass *k = PIC_COMMON_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);