OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

vmgenid: Rename VMGENID_DEVICE to TYPE_VMGENID

Browse Source 
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>
This commit is contained in:
Eduardo Habkost 2020-09-02 18:42:18 -04:00
parent 8b3a1ee5f2
commit 8d34cfd8c8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/acpi/vmgenid.c
View File

@ -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,

6
include/hw/acpi/vmgenid.h
View File

@ -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,