[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/8] hw/misc/pvpanic: Cosmetic renaming
From: |
Mihai Carabas |
Subject: |
[PATCH 2/8] hw/misc/pvpanic: Cosmetic renaming |
Date: |
Thu, 22 Oct 2020 10:42:50 +0300 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
To ease the MMIO device addition in the next patch, rename:
- ISA_PVPANIC_DEVICE -> PVPANIC_ISA_DEVICE.
- PVPanicState -> PVPanicISAState.
- TYPE_PVPANIC -> TYPE_PVPANIC_ISA.
- MemoryRegion io -> mr.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Peng Hao <peng.hao2@zte.com.cn>
Signed-off-by: Mihai Carabas <mihai.carabas@oracle.com>
---
hw/misc/pvpanic.c | 28 ++++++++++++++++------------
include/hw/misc/pvpanic.h | 2 +-
2 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c
index 598d547..2e085f4 100644
--- a/hw/misc/pvpanic.c
+++ b/hw/misc/pvpanic.c
@@ -30,9 +30,9 @@
#define PVPANIC_PANICKED (1 << PVPANIC_F_PANICKED)
#define PVPANIC_CRASHLOADED (1 << PVPANIC_F_CRASHLOADED)
-typedef struct PVPanicState PVPanicState;
-DECLARE_INSTANCE_CHECKER(PVPanicState, ISA_PVPANIC_DEVICE,
- TYPE_PVPANIC)
+typedef struct PVPanicISAState PVPanicISAState;
+DECLARE_INSTANCE_CHECKER(PVPanicISAState, PVPANIC_ISA_DEVICE,
+ TYPE_PVPANIC_ISA)
static void handle_event(int event)
{
@@ -56,10 +56,14 @@ static void handle_event(int event)
#include "hw/isa/isa.h"
-struct PVPanicState {
+/*
+ * PVPanicISAState for ISA device and
+ * use ioport.
+ */
+struct PVPanicISAState {
ISADevice parent_obj;
- MemoryRegion io;
+ MemoryRegion mr;
uint16_t ioport;
};
@@ -86,15 +90,15 @@ static const MemoryRegionOps pvpanic_ops = {
static void pvpanic_isa_initfn(Object *obj)
{
- PVPanicState *s = ISA_PVPANIC_DEVICE(obj);
+ PVPanicISAState *s = PVPANIC_ISA_DEVICE(obj);
- memory_region_init_io(&s->io, OBJECT(s), &pvpanic_ops, s, "pvpanic", 1);
+ memory_region_init_io(&s->mr, OBJECT(s), &pvpanic_ops, s, "pvpanic", 1);
}
static void pvpanic_isa_realizefn(DeviceState *dev, Error **errp)
{
ISADevice *d = ISA_DEVICE(dev);
- PVPanicState *s = ISA_PVPANIC_DEVICE(dev);
+ PVPanicISAState *s = PVPANIC_ISA_DEVICE(dev);
FWCfgState *fw_cfg = fw_cfg_find();
uint16_t *pvpanic_port;
@@ -107,11 +111,11 @@ static void pvpanic_isa_realizefn(DeviceState *dev, Error
**errp)
fw_cfg_add_file(fw_cfg, "etc/pvpanic-port", pvpanic_port,
sizeof(*pvpanic_port));
- isa_register_ioport(d, &s->io, s->ioport);
+ isa_register_ioport(d, &s->mr, s->ioport);
}
static Property pvpanic_isa_properties[] = {
- DEFINE_PROP_UINT16(PVPANIC_IOPORT_PROP, PVPanicState, ioport, 0x505),
+ DEFINE_PROP_UINT16(PVPANIC_IOPORT_PROP, PVPanicISAState, ioport, 0x505),
DEFINE_PROP_END_OF_LIST(),
};
@@ -125,9 +129,9 @@ static void pvpanic_isa_class_init(ObjectClass *klass, void
*data)
}
static TypeInfo pvpanic_isa_info = {
- .name = TYPE_PVPANIC,
+ .name = TYPE_PVPANIC_ISA,
.parent = TYPE_ISA_DEVICE,
- .instance_size = sizeof(PVPanicState),
+ .instance_size = sizeof(PVPanicISAState),
.instance_init = pvpanic_isa_initfn,
.class_init = pvpanic_isa_class_init,
};
diff --git a/include/hw/misc/pvpanic.h b/include/hw/misc/pvpanic.h
index ae0c818..30e9f8f 100644
--- a/include/hw/misc/pvpanic.h
+++ b/include/hw/misc/pvpanic.h
@@ -17,7 +17,7 @@
#include "qom/object.h"
-#define TYPE_PVPANIC "pvpanic"
+#define TYPE_PVPANIC_ISA "pvpanic"
#define PVPANIC_IOPORT_PROP "ioport"
--
1.8.3.1
- [PATCH 0/8] Add support for pvpanic mmio device, Mihai Carabas, 2020/10/22
- Re: [PATCH 0/8] Add support for pvpanic mmio device, Peter Maydell, 2020/10/22
- [PATCH 1/8] hw/misc/pvpanic: Build the pvpanic device for any machine, Mihai Carabas, 2020/10/22
- [PATCH 2/8] hw/misc/pvpanic: Cosmetic renaming,
Mihai Carabas <=
- [PATCH 3/8] hw/misc/pvpanic: Add the MMIO interface, Mihai Carabas, 2020/10/22
- [PATCH 4/8] hw/arm/virt: Use the pvpanic device, Mihai Carabas, 2020/10/22
- [PATCH 5/8] hw/arm/virt: add pvpanic device in virt acpi table, Mihai Carabas, 2020/10/22
- [PATCH 8/8] pvpanic: break dependency on ISA_BUS, Mihai Carabas, 2020/10/22
- [PATCH 7/8] pvpanic : update pvpanic document, Mihai Carabas, 2020/10/22
- [PATCH 6/8] hw/arm/virt: add configure interface for pvpanic-mmio, Mihai Carabas, 2020/10/22