From nobody Sun Nov 16 07:20:09 2025 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=1599087243; cv=none; d=zohomail.com; s=zohoarc; b=TIMr9IQHEpJOUzO4HDx7Fd+Xl2HSzJ5rNfF5h1VS2x1kP9iRENLPScVQQCFcjCjL8GwdCI1YYp4MYaNKk6wVizmu+lXidFjjK8etTzwQkNwLOoGF7m2oFSW72J7ZddWTcPFxQOFeWKj+TIrxrbhvjoJuvQQAHQqHww4+TW+Zjn0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599087243; 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=2timywTLyViFpE3A6e1YsrsQIxAx0L1qUWJsoBnIaW4=; b=HMz1DOGlJVh+xNwsBp87J6Oq76ULlDrt0yLSZo+81ibw/1rNuXxMYnkVpE0Rs87TGWxLcvzgxASFJexiUIwhQgr3br1gWVXi5AbuQJKDJYHzP3PalNVgHYUDdH25xoyAR399bpMPLcQKNTiruYexAVm7Rd0tfnaozB4aHvdLECE= 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 159908724389986.49396214536341; Wed, 2 Sep 2020 15:54:03 -0700 (PDT) Received: from localhost ([::1]:60352 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDbdi-0005ES-LQ for importer@patchew.org; Wed, 02 Sep 2020 18:54:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35198) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDbUb-0003HC-En for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:44:37 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:56962 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 1kDbUY-0008P2-AJ for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:44:37 -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-495-yDu-LXBmMOGuLv4FfxIJ2g-1; Wed, 02 Sep 2020 18:44:32 -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 BBD5F1DE00; Wed, 2 Sep 2020 22:44:30 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id F37751002D40; Wed, 2 Sep 2020 22:44:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599086673; 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=2timywTLyViFpE3A6e1YsrsQIxAx0L1qUWJsoBnIaW4=; b=fiprUwfViqekaHPDkyhx7vGqIV+he/xsz8wXUDBMykAMxmLjoR8EH2NKARWvUnD3yCy0d/ K8OEne69g3auQQwceUt7sDd6fkpM0IhNCUn5lzuHuS3XhOFM/Eue1Z87vvNhTNzoDYWKp8 R8JSkQGSaNP19lGLdNPYDqDrPmiZQSc= X-MC-Unique: yDu-LXBmMOGuLv4FfxIJ2g-1 From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 23/63] ramfb: Rename TYPE_RAMFB_DEVICE to TYPE_RAMFB Date: Wed, 2 Sep 2020 18:42:31 -0400 Message-Id: <20200902224311.1321159-24-ehabkost@redhat.com> In-Reply-To: <20200902224311.1321159-1-ehabkost@redhat.com> References: <20200902224311.1321159-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.001 X-Mimecast-Originator: redhat.com 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.120; envelope-from=ehabkost@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 16:25: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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: Peter Maydell , berrange@redhat.com, "Michael S. Tsirkin" , qemu-arm@nongnu.org, Gerd Hoffmann , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This will make the type name constant consistent with the name of the type checking macro. Signed-off-by: Eduardo Habkost --- Cc: Peter Maydell Cc: Gerd Hoffmann Cc: Paolo Bonzini Cc: Richard Henderson Cc: Eduardo Habkost Cc: "Michael S. Tsirkin" Cc: Marcel Apfelbaum Cc: qemu-arm@nongnu.org Cc: qemu-devel@nongnu.org --- include/hw/display/ramfb.h | 2 +- hw/arm/sysbus-fdt.c | 2 +- hw/arm/virt.c | 2 +- hw/display/ramfb-standalone.c | 4 ++-- hw/i386/pc_piix.c | 2 +- hw/i386/pc_q35.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/hw/display/ramfb.h b/include/hw/display/ramfb.h index b33a2c467b..c4b0150c88 100644 --- a/include/hw/display/ramfb.h +++ b/include/hw/display/ramfb.h @@ -7,6 +7,6 @@ void ramfb_display_update(QemuConsole *con, RAMFBState *s); RAMFBState *ramfb_setup(Error **errp); =20 /* ramfb-standalone.c */ -#define TYPE_RAMFB_DEVICE "ramfb" +#define TYPE_RAMFB "ramfb" =20 #endif /* RAMFB_H */ diff --git a/hw/arm/sysbus-fdt.c b/hw/arm/sysbus-fdt.c index 6b6906f4cf..e8baa118a6 100644 --- a/hw/arm/sysbus-fdt.c +++ b/hw/arm/sysbus-fdt.c @@ -489,7 +489,7 @@ static const BindingEntry bindings[] =3D { VFIO_PLATFORM_BINDING("amd,xgbe-seattle-v1a", add_amd_xgbe_fdt_node), #endif TYPE_BINDING(TYPE_TPM_TIS_SYSBUS, add_tpm_tis_fdt_node), - TYPE_BINDING(TYPE_RAMFB_DEVICE, no_fdt_node), + TYPE_BINDING(TYPE_RAMFB, no_fdt_node), TYPE_BINDING("", NULL), /* last element */ }; =20 diff --git a/hw/arm/virt.c b/hw/arm/virt.c index acf9bfbece..bf81b5a373 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2414,7 +2414,7 @@ static void virt_machine_class_init(ObjectClass *oc, = void *data) mc->max_cpus =3D 512; machine_class_allow_dynamic_sysbus_dev(mc, TYPE_VFIO_CALXEDA_XGMAC); machine_class_allow_dynamic_sysbus_dev(mc, TYPE_VFIO_AMD_XGBE); - machine_class_allow_dynamic_sysbus_dev(mc, TYPE_RAMFB_DEVICE); + machine_class_allow_dynamic_sysbus_dev(mc, TYPE_RAMFB); machine_class_allow_dynamic_sysbus_dev(mc, TYPE_VFIO_PLATFORM); machine_class_allow_dynamic_sysbus_dev(mc, TYPE_TPM_TIS_SYSBUS); mc->block_default_type =3D IF_VIRTIO; diff --git a/hw/display/ramfb-standalone.c b/hw/display/ramfb-standalone.c index 8c0094397f..a86730393b 100644 --- a/hw/display/ramfb-standalone.c +++ b/hw/display/ramfb-standalone.c @@ -9,7 +9,7 @@ =20 typedef struct RAMFBStandaloneState RAMFBStandaloneState; DECLARE_INSTANCE_CHECKER(RAMFBStandaloneState, RAMFB, - TYPE_RAMFB_DEVICE) + TYPE_RAMFB) =20 struct RAMFBStandaloneState { SysBusDevice parent_obj; @@ -51,7 +51,7 @@ static void ramfb_class_initfn(ObjectClass *klass, void *= data) } =20 static const TypeInfo ramfb_info =3D { - .name =3D TYPE_RAMFB_DEVICE, + .name =3D TYPE_RAMFB, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(RAMFBStandaloneState), .class_init =3D ramfb_class_initfn, diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 32b1453e6a..7ac4e65820 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -422,7 +422,7 @@ static void pc_i440fx_machine_options(MachineClass *m) m->desc =3D "Standard PC (i440FX + PIIX, 1996)"; m->default_machine_opts =3D "firmware=3Dbios-256k.bin"; m->default_display =3D "std"; - machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE); + machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB); machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); } =20 diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 0cb9c18cd4..dd2223b659 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -348,7 +348,7 @@ static void pc_q35_machine_options(MachineClass *m) m->no_floppy =3D 1; machine_class_allow_dynamic_sysbus_dev(m, TYPE_AMD_IOMMU_DEVICE); machine_class_allow_dynamic_sysbus_dev(m, TYPE_INTEL_IOMMU_DEVICE); - machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE); + machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB); machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); m->max_cpus =3D 288; } --=20 2.26.2