[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 18/27] vmgenid: Rename VMGENID_DEVICE to TYPE_VMGENID
From: |
Eduardo Habkost |
Subject: |
[PULL 18/27] vmgenid: Rename VMGENID_DEVICE to TYPE_VMGENID |
Date: |
Thu, 3 Sep 2020 16:52:38 -0400 |
This will make the type name constant consistent with the name of
the type checking macro.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200902224311.1321159-11-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
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"
-#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 @@
typedef struct VmGenIdState VmGenIdState;
DECLARE_INSTANCE_CHECKER(VmGenIdState, VMGENID,
- VMGENID_DEVICE)
+ TYPE_VMGENID)
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);
}
void vmgenid_build_acpi(VmGenIdState *vms, GArray *table_data, GArray *guid,
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 **errp)
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_DEVICE);
+ "which this machine type does not provide", TYPE_VMGENID);
return;
}
@@ -206,7 +206,7 @@ static void vmgenid_realize(DeviceState *dev, Error **errp)
* device. Check if there are several.
*/
if (!find_vmgenid_dev()) {
- error_setg(errp, "at most one %s device is permitted", VMGENID_DEVICE);
+ error_setg(errp, "at most one %s device is permitted", TYPE_VMGENID);
return;
}
@@ -232,7 +232,7 @@ static void vmgenid_device_class_init(ObjectClass *klass,
void *data)
}
static const TypeInfo vmgenid_device_info = {
- .name = VMGENID_DEVICE,
+ .name = TYPE_VMGENID,
.parent = TYPE_DEVICE,
.instance_size = sizeof(VmGenIdState),
.class_init = vmgenid_device_class_init,
--
2.26.2
- [PULL 05/27] qom: Make type checker functions accept const pointers, (continued)
- [PULL 05/27] qom: Make type checker functions accept const pointers, Eduardo Habkost, 2020/09/03
- [PULL 07/27] Delete duplicate QOM typedefs, Eduardo Habkost, 2020/09/03
- [PULL 06/27] codeconverter: script for automating QOM code cleanups, Eduardo Habkost, 2020/09/03
- [PULL 10/27] Use DECLARE_*CHECKER* when possible (--force mode), Eduardo Habkost, 2020/09/03
- [PULL 12/27] Use OBJECT_DECLARE_SIMPLE_TYPE when possible, Eduardo Habkost, 2020/09/03
- [PULL 13/27] gpex: Fix type checking function name, Eduardo Habkost, 2020/09/03
- [PULL 09/27] Use DECLARE_*CHECKER* macros, Eduardo Habkost, 2020/09/03
- [PULL 16/27] dev-smartcard-reader: Rename CCID_DEV_NAME to TYPE_USB_CCID_DEV, Eduardo Habkost, 2020/09/03
- [PULL 14/27] chardev: Rename TYPE_CHARDEV_* to TYPE_*_CHARDEV, Eduardo Habkost, 2020/09/03
- [PULL 11/27] Use OBJECT_DECLARE_TYPE where possible, Eduardo Habkost, 2020/09/03
- [PULL 18/27] vmgenid: Rename VMGENID_DEVICE to TYPE_VMGENID,
Eduardo Habkost <=
- [PULL 21/27] filter-rewriter: Rename FILTER_COLO_REWRITER to FILTER_REWRITER, Eduardo Habkost, 2020/09/03
- [PULL 24/27] usb: Rename USB_SERIAL_DEV to USB_SERIAL, Eduardo Habkost, 2020/09/03
- [PULL 26/27] pc87312: Rename TYPE_PC87312_SUPERIO to TYPE_PC87312, Eduardo Habkost, 2020/09/03
- [PULL 19/27] ahci: Rename ICH_AHCI to ICH9_AHCI, Eduardo Habkost, 2020/09/03
- [PULL 15/27] ap-device: Rename AP_DEVICE_TYPE to TYPE_AP_DEVICE, Eduardo Habkost, 2020/09/03
- [PULL 17/27] vfio: Rename VFIO_AP_DEVICE_TYPE to TYPE_VFIO_AP_DEVICE, Eduardo Habkost, 2020/09/03
- [PULL 20/27] esp: Rename ESP_STATE to ESP, Eduardo Habkost, 2020/09/03
- [PULL 22/27] rs6000_mc: Rename RS6000MC_DEVICE to RS6000MC, Eduardo Habkost, 2020/09/03
- [PULL 27/27] tusb6010: Rename TUSB to TUSB6010, Eduardo Habkost, 2020/09/03
- [PULL 23/27] sabre: Rename SABRE_DEVICE to SABRE, Eduardo Habkost, 2020/09/03