From patchwork Thu Sep 3 18:01:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 274648 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 676DBC433E9 for ; Thu, 3 Sep 2020 18:03:04 +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 27D0D20716 for ; Thu, 3 Sep 2020 18:03:04 +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="KsbWCJFW" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 27D0D20716 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]:39888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDtZf-0004nA-An for qemu-devel@archiver.kernel.org; Thu, 03 Sep 2020 14:03:03 -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 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= 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 X-MC-Unique: DeCP8G6mOMOVkILyOMQx8w-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 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) 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 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 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é" Signed-off-by: Eduardo Habkost Reviewed-by: Daniel P. Berrangé --- 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 typedef struct PITClass PITClass; -DECLARE_CLASS_CHECKERS(PITClass, PIT, +DECLARE_CLASS_CHECKERS(PITClass, ISA_PIT, TYPE_ISA_PIT) struct PITClass { @@ -334,7 +334,7 @@ static void pit_post_load(PITCommonState *s) static void pit_realizefn(DeviceState *dev, Error **errp) { PITCommonState *pit = PIT_COMMON(dev); - PITClass *pc = PIT_GET_CLASS(dev); + PITClass *pc = ISA_PIT_GET_CLASS(dev); PITChannelState *s; s = &pit->channels[0]; @@ -357,7 +357,7 @@ static Property pit_properties[] = { static void pit_class_initfn(ObjectClass *klass, void *data) { - PITClass *pc = PIT_CLASS(klass); + PITClass *pc = ISA_PIT_CLASS(klass); PITCommonClass *k = PIT_COMMON_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass); From patchwork Thu Sep 3 18:01:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 274647 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 95DB8C433E2 for ; Thu, 3 Sep 2020 18:04:41 +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 64CEC20716 for ; Thu, 3 Sep 2020 18:04:41 +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="Sak+nULS" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 64CEC20716 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]:45212 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDtbD-0006yL-GQ for qemu-devel@archiver.kernel.org; Thu, 03 Sep 2020 14:04:39 -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 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= 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 X-MC-Unique: OIJkdQD-P428NRdus78pRQ-1 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) 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 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" This will make the type name constant consistent with QOM type name string ("isa-i8259"). Suggested-by: Philippe Mathieu-Daudé Suggested-by: "Daniel P. Berrangé" Signed-off-by: Eduardo Habkost --- 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 @@ //#define DEBUG_IRQ_LATENCY -#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) /** * PICClass: @@ -418,7 +418,7 @@ qemu_irq *i8259_init(ISABus *bus, qemu_irq parent_irq) irq_set = g_new0(qemu_irq, ISA_NUM_IRQS); - isadev = i8259_init_chip(TYPE_I8259, bus, true); + isadev = i8259_init_chip(TYPE_ISA_I8259, bus, true); dev = DEVICE(isadev); qdev_connect_gpio_out(dev, 0, parent_irq); @@ -428,7 +428,7 @@ qemu_irq *i8259_init(ISABus *bus, qemu_irq parent_irq) isa_pic = dev; - isadev = i8259_init_chip(TYPE_I8259, bus, false); + isadev = i8259_init_chip(TYPE_ISA_I8259, bus, false); dev = DEVICE(isadev); qdev_connect_gpio_out(dev, 0, irq_set[2]); @@ -451,7 +451,7 @@ static void i8259_class_init(ObjectClass *klass, void *data) } static const TypeInfo i8259_info = { - .name = TYPE_I8259, + .name = TYPE_ISA_I8259, .instance_size = sizeof(PICCommonState), .parent = TYPE_PIC_COMMON, .class_init = i8259_class_init, 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); From patchwork Thu Sep 3 18:01:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 274645 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 2347FC433E2 for ; Thu, 3 Sep 2020 18:07:26 +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 C77A420716 for ; Thu, 3 Sep 2020 18:07:25 +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="AFlg02lR" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C77A420716 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]:57600 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDtds-0003Zl-R9 for qemu-devel@archiver.kernel.org; Thu, 03 Sep 2020 14:07:24 -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 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= 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 X-MC-Unique: vftowrdJNMGwtx23Q7tWLg-1 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) 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 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_Mathieu-Daud?= =?utf-8?b?w6k=?= , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This will make the type name constant consistent with the QOM type name string ("am53c974"). Suggested-by: Philippe Mathieu-Daudé Suggested-by: "Daniel P. Berrangé" Signed-off-by: Eduardo Habkost --- 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" -#define TYPE_AM53C974_DEVICE "am53c974" +#define TYPE_AM53C974 "am53c974" typedef struct PCIESPState PCIESPState; DECLARE_INSTANCE_CHECKER(PCIESPState, PCI_ESP, - TYPE_AM53C974_DEVICE) + TYPE_AM53C974) #define DMA_CMD 0x0 #define DMA_STC 0x1 @@ -400,7 +400,7 @@ static void esp_pci_class_init(ObjectClass *klass, void *data) } static const TypeInfo esp_pci_info = { - .name = TYPE_AM53C974_DEVICE, + .name = TYPE_AM53C974, .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(PCIESPState), .class_init = esp_pci_class_init, @@ -525,7 +525,7 @@ static void dc390_class_init(ObjectClass *klass, void *data) static const TypeInfo dc390_info = { .name = TYPE_DC390_DEVICE, - .parent = TYPE_AM53C974_DEVICE, + .parent = TYPE_AM53C974, .instance_size = sizeof(DC390State), .class_init = dc390_class_init, };