@@ -35,11 +35,11 @@
#include "qemu/module.h"
#include "qom/object.h"
-#define TYPE_AM53C974_DEVICE "am53c974"
+#define TYPE_AM53C974 "am53c974"
typedef struct PCIESPState PCIESPState;
DECLARE_INSTANCE_CHECKER(PCIESPState, PCI_ESP,
- TYPE_AM53C974_DEVICE)
+ TYPE_AM53C974)
#define DMA_CMD 0x0
#define DMA_STC 0x1
@@ -400,7 +400,7 @@ static void esp_pci_class_init(ObjectClass *klass, void *data)
}
static const TypeInfo esp_pci_info = {
- .name = TYPE_AM53C974_DEVICE,
+ .name = TYPE_AM53C974,
.parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(PCIESPState),
.class_init = esp_pci_class_init,
@@ -525,7 +525,7 @@ static void dc390_class_init(ObjectClass *klass, void *data)
static const TypeInfo dc390_info = {
.name = TYPE_DC390_DEVICE,
- .parent = TYPE_AM53C974_DEVICE,
+ .parent = TYPE_AM53C974,
.instance_size = sizeof(DC390State),
.class_init = dc390_class_init,
};
This will make the type name constant consistent with the QOM type name string ("am53c974"). Suggested-by: Philippe Mathieu-Daudé <philmd@redhat.com> Suggested-by: "Daniel P. Berrangé" <berrange@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- Changes v1 -> v2: * v1 subject was "scsi: Rename TYPE_AM53C974_DEVICE to TYPE_PCI_ESP" * Rename it to TYPE_AM53C974 instead, to be consistent with QOM type name ("am53c974") --- Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Fam Zheng <fam@euphon.net> Cc: qemu-devel@nongnu.org --- hw/scsi/esp-pci.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)