From nobody Mon Feb 9 21:21:34 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=1599595931; cv=none; d=zohomail.com; s=zohoarc; b=NT9VhixfYbovho2RNu/Gp/5ceODFW1BcPANf9L3aCLho0MScVfJ2DCxfaBlgj4hKhr2nefo1ZLvGGe+k2CsVUtYEaBR5xbc5qktBWHGXUnDHMoKRuB/du7Xv7xTV1cpfeuqYCN5KLG3hMRvK8d7URDOlq5WexKpt0OiWqdauSWY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599595931; 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=STycltGk/N79qHEc2F8EjCKOe0jyH7lhTX7lgq0Xm6w=; b=XXlK14/UrqmChiP8OeWM3usC1Y746uqS53WZE9Zo6DABsiSy9nu7MdWZiBHsdXOhzpKdDoiwjRdkYuhjjzu++5ChqNct1Yw09hntGsRHUNGQ58ogNQnUZ7omzOqOy1rXqVN1PCjfH9IuNUWZtfcqbRffuRHa7vetoxLeMByhXHU= 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 1599595931392137.8043782945806; Tue, 8 Sep 2020 13:12:11 -0700 (PDT) Received: from localhost ([::1]:51490 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kFjyM-00046U-2N for importer@patchew.org; Tue, 08 Sep 2020 16:12:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43834) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kFjoT-0001Jk-Ul for qemu-devel@nongnu.org; Tue, 08 Sep 2020 16:01:57 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:45474 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 1kFjoS-0004M2-1w for qemu-devel@nongnu.org; Tue, 08 Sep 2020 16: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-149-Wnm8hPrYNcCiXJ-rfWlv_w-1; Tue, 08 Sep 2020 16:01:52 -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 DD0A11005E5C; Tue, 8 Sep 2020 20:01:51 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id E60831002D50; Tue, 8 Sep 2020 20:01:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599595315; 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=STycltGk/N79qHEc2F8EjCKOe0jyH7lhTX7lgq0Xm6w=; b=GvzAbngDaa1Q5XSbEDLs08gQpevKoVtC6MwjJ5TtVl9E5/t/KJFd2WX0rf7JDrL8Wkdnjo IH/wpzW0RR6YZ6FDa5YkiVJtWJoGp/9lj52e0ZD+2w2VCHrpQeKedb58ncrjpNlkb7Fw4I JseHImAigWSJ0UsC8L38/8b+suAhZSw= X-MC-Unique: Wnm8hPrYNcCiXJ-rfWlv_w-1 From: Eduardo Habkost To: Peter Maydell , qemu-devel@nongnu.org Subject: [PULL 19/34] vmgenid: Rename VMGENID_DEVICE to TYPE_VMGENID Date: Tue, 8 Sep 2020 16:01:08 -0400 Message-Id: <20200908200123.3402311-20-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.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=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/08 03:00:34 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: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 type checking macro. Signed-off-by: Eduardo Habkost Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20200902224311.1321159-11-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- include/hw/acpi/vmgenid.h | 6 +++--- hw/acpi/vmgenid.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/hw/acpi/vmgenid.h b/include/hw/acpi/vmgenid.h index 86cd1da605..aff574df5f 100644 --- a/include/hw/acpi/vmgenid.h +++ b/include/hw/acpi/vmgenid.h @@ -6,7 +6,7 @@ #include "qemu/uuid.h" #include "qom/object.h" =20 -#define VMGENID_DEVICE "vmgenid" +#define TYPE_VMGENID "vmgenid" #define VMGENID_GUID "guid" #define VMGENID_GUID_FW_CFG_FILE "etc/vmgenid_guid" #define VMGENID_ADDR_FW_CFG_FILE "etc/vmgenid_addr" @@ -18,7 +18,7 @@ =20 typedef struct VmGenIdState VmGenIdState; DECLARE_INSTANCE_CHECKER(VmGenIdState, VMGENID, - VMGENID_DEVICE) + TYPE_VMGENID) =20 struct VmGenIdState { DeviceClass parent_obj; @@ -29,7 +29,7 @@ struct VmGenIdState { /* returns NULL unless there is exactly one device */ static inline Object *find_vmgenid_dev(void) { - return object_resolve_path_type("", VMGENID_DEVICE, NULL); + return object_resolve_path_type("", TYPE_VMGENID, NULL); } =20 void vmgenid_build_acpi(VmGenIdState *vms, GArray *table_data, GArray *gui= d, diff --git a/hw/acpi/vmgenid.c b/hw/acpi/vmgenid.c index 2df7623d74..53db6af75d 100644 --- a/hw/acpi/vmgenid.c +++ b/hw/acpi/vmgenid.c @@ -198,7 +198,7 @@ static void vmgenid_realize(DeviceState *dev, Error **e= rrp) =20 if (!bios_linker_loader_can_write_pointer()) { error_setg(errp, "%s requires DMA write support in fw_cfg, " - "which this machine type does not provide", VMGENID_DEV= ICE); + "which this machine type does not provide", TYPE_VMGENI= D); return; } =20 @@ -206,7 +206,7 @@ static void vmgenid_realize(DeviceState *dev, Error **e= rrp) * device. Check if there are several. */ if (!find_vmgenid_dev()) { - error_setg(errp, "at most one %s device is permitted", VMGENID_DEV= ICE); + error_setg(errp, "at most one %s device is permitted", TYPE_VMGENI= D); return; } =20 @@ -232,7 +232,7 @@ static void vmgenid_device_class_init(ObjectClass *klas= s, void *data) } =20 static const TypeInfo vmgenid_device_info =3D { - .name =3D VMGENID_DEVICE, + .name =3D TYPE_VMGENID, .parent =3D TYPE_DEVICE, .instance_size =3D sizeof(VmGenIdState), .class_init =3D vmgenid_device_class_init, --=20 2.26.2