From nobody Mon Feb 9 16:19:33 2026 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=1599595782; cv=none; d=zohomail.com; s=zohoarc; b=gAMPupW0lyTuHwdsJXBmviX0VSSsktBtHgejcUpAGk+mbBIVWonwO71ZESjKwDOowkzCe5T8Ao/Fl/ciRcSS8vn9s/+u+P3/p+WcvRcJrpCBadzlY1zddpNFCWp99BB0r2GZiun8pCbP0dCyX9+E/ujfla8gdiyi7R36mykwt78= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599595782; 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=KBBQHKCaZNmcoT8GjRywod67shGKvN15dsv6PCG16Vk=; b=CDVmT9rSHd3r2DJZGhysfCGclJMJf4kXW0uk4GoOCpqF+13x3E1jvuFnLVPWbv7ThIMVVPECHad7tAY66FVHsZLf6UGZbhwf3gTpwA8oRl/or0b0v+Ge9h4JnPKfgvpXUYsIPK9Kk4Xz2aesjstaj6DVvAMp1GTJH9GtaYdkGrA= 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 1599595782260195.74581811903454; Tue, 8 Sep 2020 13:09:42 -0700 (PDT) Received: from localhost ([::1]:43460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kFjvx-0000iH-0p for importer@patchew.org; Tue, 08 Sep 2020 16:09:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43876) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kFjoZ-0001Ng-Mv for qemu-devel@nongnu.org; Tue, 08 Sep 2020 16:02:03 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:49702) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kFjoU-0004MJ-Gg for qemu-devel@nongnu.org; Tue, 08 Sep 2020 16:02:03 -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-536-h3V2ktocNdaQ5GjNpdrwfw-1; Tue, 08 Sep 2020 16:01:55 -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 F21BD80F044; Tue, 8 Sep 2020 20:01:53 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8B813805CF; Tue, 8 Sep 2020 20:01:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599595317; 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=KBBQHKCaZNmcoT8GjRywod67shGKvN15dsv6PCG16Vk=; b=N3BZjpm9fjkspk4na0JehVyagd9TPhVTIuojcv5RY0Y08DNMrGlpXpqDdd/L5wJsQqDoV9 gGvPK3WF77zIGNSQJBNiY/tZ+P/JxcOcQTKAxJo/H/9ehcx8w0m3V3R8ZZvuMcr4OfXurg 7uq2/lcjAXgKRXCKHwze2FZo1mVLL/Q= X-MC-Unique: h3V2ktocNdaQ5GjNpdrwfw-1 From: Eduardo Habkost To: Peter Maydell , qemu-devel@nongnu.org Subject: [PULL 21/34] esp: Rename ESP_STATE to ESP Date: Tue, 8 Sep 2020 16:01:10 -0400 Message-Id: <20200908200123.3402311-22-ehabkost@redhat.com> In-Reply-To: <20200908200123.3402311-1-ehabkost@redhat.com> References: <20200908200123.3402311-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=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/08 12:54:58 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: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Herv=C3=A9=20Poussineau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Make the type checking macro name consistent with the TYPE_* constant. Signed-off-by: Eduardo Habkost Reviewed-by: Herv=C3=A9 Poussineau Message-Id: <20200902224311.1321159-40-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- include/hw/scsi/esp.h | 2 +- hw/dma/sparc32_dma.c | 2 +- hw/m68k/q800.c | 2 +- hw/mips/jazz.c | 2 +- hw/scsi/esp.c | 6 +++--- hw/sparc/sun4m.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/hw/scsi/esp.h b/include/hw/scsi/esp.h index f281625dd5..20800dbf5b 100644 --- a/include/hw/scsi/esp.h +++ b/include/hw/scsi/esp.h @@ -67,7 +67,7 @@ struct ESPState { =20 #define TYPE_ESP "esp" typedef struct SysBusESPState SysBusESPState; -DECLARE_INSTANCE_CHECKER(SysBusESPState, ESP_STATE, +DECLARE_INSTANCE_CHECKER(SysBusESPState, ESP, TYPE_ESP) =20 struct SysBusESPState { diff --git a/hw/dma/sparc32_dma.c b/hw/dma/sparc32_dma.c index bcd1626fbd..d20a5bc065 100644 --- a/hw/dma/sparc32_dma.c +++ b/hw/dma/sparc32_dma.c @@ -303,7 +303,7 @@ static void sparc32_espdma_device_realize(DeviceState *= dev, Error **errp) =20 d =3D qdev_new(TYPE_ESP); object_property_add_child(OBJECT(dev), "esp", OBJECT(d)); - sysbus =3D ESP_STATE(d); + sysbus =3D ESP(d); esp =3D &sysbus->esp; esp->dma_memory_read =3D espdma_memory_read; esp->dma_memory_write =3D espdma_memory_write; diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c index 1ca482ad81..ce4b47c3e3 100644 --- a/hw/m68k/q800.c +++ b/hw/m68k/q800.c @@ -290,7 +290,7 @@ static void q800_init(MachineState *machine) /* SCSI */ =20 dev =3D qdev_new(TYPE_ESP); - sysbus_esp =3D ESP_STATE(dev); + sysbus_esp =3D ESP(dev); esp =3D &sysbus_esp->esp; esp->dma_memory_read =3D NULL; esp->dma_memory_write =3D NULL; diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c index 82a6e3220e..47723093b6 100644 --- a/hw/mips/jazz.c +++ b/hw/mips/jazz.c @@ -309,7 +309,7 @@ static void mips_jazz_init(MachineState *machine, =20 /* SCSI adapter */ dev =3D qdev_new(TYPE_ESP); - sysbus_esp =3D ESP_STATE(dev); + sysbus_esp =3D ESP(dev); esp =3D &sysbus_esp->esp; esp->dma_memory_read =3D rc4030_dma_read; esp->dma_memory_write =3D rc4030_dma_write; diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 405f8b7cbc..b84e0fe33e 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -929,7 +929,7 @@ static const struct SCSIBusInfo esp_scsi_info =3D { =20 static void sysbus_esp_gpio_demux(void *opaque, int irq, int level) { - SysBusESPState *sysbus =3D ESP_STATE(opaque); + SysBusESPState *sysbus =3D ESP(opaque); ESPState *s =3D &sysbus->esp; =20 switch (irq) { @@ -945,7 +945,7 @@ static void sysbus_esp_gpio_demux(void *opaque, int irq= , int level) static void sysbus_esp_realize(DeviceState *dev, Error **errp) { SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); - SysBusESPState *sysbus =3D ESP_STATE(dev); + SysBusESPState *sysbus =3D ESP(dev); ESPState *s =3D &sysbus->esp; =20 sysbus_init_irq(sbd, &s->irq); @@ -967,7 +967,7 @@ static void sysbus_esp_realize(DeviceState *dev, Error = **errp) =20 static void sysbus_esp_hard_reset(DeviceState *dev) { - SysBusESPState *sysbus =3D ESP_STATE(dev); + SysBusESPState *sysbus =3D ESP(dev); esp_hard_reset(&sysbus->esp); } =20 diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 256033b9a0..947b69d159 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -335,7 +335,7 @@ static void *sparc32_dma_init(hwaddr dma_base, OBJECT(dma), "espdma")); sysbus_connect_irq(SYS_BUS_DEVICE(espdma), 0, espdma_irq); =20 - esp =3D ESP_STATE(object_resolve_path_component(OBJECT(espdma), "esp")= ); + esp =3D ESP(object_resolve_path_component(OBJECT(espdma), "esp")); sysbus_mmio_map(SYS_BUS_DEVICE(esp), 0, esp_base); scsi_bus_legacy_handle_cmdline(&esp->esp.bus); =20 --=20 2.26.2