[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/8] i8259: Rename PIC to ISA_I8259
From: |
Eduardo Habkost |
Subject: |
[PATCH 4/8] i8259: Rename PIC to ISA_I8259 |
Date: |
Thu, 3 Sep 2020 14:01:24 -0400 |
Rename the type checking function to be consistent with the type
name constant (TYPE_ISA_I8259) and the QOM type name string
("isa-i8259").
Suggested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Suggested-by: "Daniel P. Berrangé" <berrange@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-devel@nongnu.org
---
hw/intc/i8259.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/intc/i8259.c b/hw/intc/i8259.c
index ab55163340..61422e6fef 100644
--- a/hw/intc/i8259.c
+++ b/hw/intc/i8259.c
@@ -39,7 +39,7 @@
#define TYPE_ISA_I8259 "isa-i8259"
typedef struct PICClass PICClass;
-DECLARE_CLASS_CHECKERS(PICClass, PIC,
+DECLARE_CLASS_CHECKERS(PICClass, ISA_I8259,
TYPE_ISA_I8259)
/**
@@ -396,7 +396,7 @@ static const MemoryRegionOps pic_elcr_ioport_ops = {
static void pic_realize(DeviceState *dev, Error **errp)
{
PICCommonState *s = PIC_COMMON(dev);
- PICClass *pc = PIC_GET_CLASS(dev);
+ PICClass *pc = ISA_I8259_GET_CLASS(dev);
memory_region_init_io(&s->base_io, OBJECT(s), &pic_base_ioport_ops, s,
"pic", 2);
@@ -443,7 +443,7 @@ qemu_irq *i8259_init(ISABus *bus, qemu_irq parent_irq)
static void i8259_class_init(ObjectClass *klass, void *data)
{
- PICClass *k = PIC_CLASS(klass);
+ PICClass *k = ISA_I8259_CLASS(klass);
DeviceClass *dc = DEVICE_CLASS(klass);
device_class_set_parent_realize(dc, pic_realize, &k->parent_realize);
--
2.26.2
- [PATCH 0/8] qom: Rename macros for consistency (pass 2), Eduardo Habkost, 2020/09/03
- [PATCH 1/8] i8254: Rename TYPE_I8254 to TYPE_ISA_PIT, Eduardo Habkost, 2020/09/03
- [PATCH 2/8] i8254: Rename PIT to ISA_PIT, Eduardo Habkost, 2020/09/03
- [PATCH 3/8] i8259: Rename TYPE_I8259 to TYPE_ISA_I8259, Eduardo Habkost, 2020/09/03
- [PATCH 4/8] i8259: Rename PIC to ISA_I8259,
Eduardo Habkost <=
- [PATCH 5/8] i8259: Rename KVM_PIC to KVM_I8259, Eduardo Habkost, 2020/09/03
- [PATCH 6/8] esp-pci: Rename TYPE_AM53C974_DEVICE to TYPE_AM53C974, Eduardo Habkost, 2020/09/03
- [PATCH 7/8] esp-pci: Rename PCI_ESP to AM53C974, Eduardo Habkost, 2020/09/03
- [PATCH 8/8] tusb6010: Rename TUSB to TUSB6010, Eduardo Habkost, 2020/09/03