* [Qemu-devel] [PATCH for-2.10 0/2] etsec: (TYPE_)ETSEC_COMMON macro cleanup
@ 2017-03-31 19:27 Eduardo Habkost
2017-03-31 19:27 ` [Qemu-devel] [PATCH for-2.10 1/2] etsec: Rename (TYPE_)ETSEC_COMMON to (TYPE_)ETSEC Eduardo Habkost
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Eduardo Habkost @ 2017-03-31 19:27 UTC (permalink / raw)
To: qemu-devel
Cc: Alexander Graf, Scott Wood, qemu-ppc, Fabien Chouteau, Jason Wang
When working on other things, I got confused by the etsec code,
that didn't use the TYPE_ETSEC_COMMON macro in its type
declaration, and had no subclasses despite being named
ETSEC_COMMON.
This is a very simple cleanup to remove the _COMMON suffix from
the macros, and to use the TYPE_ETSEC macro when registering and
creating devices instead of hardcoding the "eTSEC" name.
Cc: Alexander Graf <agraf@suse.de>
Cc: Scott Wood <scottwood@freescale.com>
Cc: Jason Wang <jasowang@redhat.com>
Cc: Fabien Chouteau <chouteau@adacore.com>
Cc: qemu-ppc@nongnu.org
Eduardo Habkost (2):
etsec: Rename (TYPE_)ETSEC_COMMON to (TYPE_)ETSEC
etsec: Use TYPE_ETSEC macro when registering/creating device
hw/net/fsl_etsec/etsec.h | 6 +++---
hw/net/fsl_etsec/etsec.c | 10 +++++-----
hw/ppc/e500.c | 4 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
--
2.11.0.259.g40922b1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Qemu-devel] [PATCH for-2.10 1/2] etsec: Rename (TYPE_)ETSEC_COMMON to (TYPE_)ETSEC
2017-03-31 19:27 [Qemu-devel] [PATCH for-2.10 0/2] etsec: (TYPE_)ETSEC_COMMON macro cleanup Eduardo Habkost
@ 2017-03-31 19:27 ` Eduardo Habkost
2017-03-31 19:27 ` [Qemu-devel] [PATCH for-2.10 2/2] etsec: Use TYPE_ETSEC macro when registering/creating device Eduardo Habkost
2017-04-02 12:42 ` [Qemu-devel] [PATCH for-2.10 0/2] etsec: (TYPE_)ETSEC_COMMON macro cleanup Philippe Mathieu-Daudé
2 siblings, 0 replies; 5+ messages in thread
From: Eduardo Habkost @ 2017-03-31 19:27 UTC (permalink / raw)
To: qemu-devel
Cc: Alexander Graf, Scott Wood, qemu-ppc, Fabien Chouteau, Jason Wang
Types named *_COMMON are normally used when there's a common
parent class for multiple classes. We have only one eTSEC type,
so rename the TYPE_ETSEC_COMMON and ETSEC_COMMON macros to
TYPE_ETSEC and TYPE_ETSEC_COMMON.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
hw/net/fsl_etsec/etsec.h | 6 +++---
hw/net/fsl_etsec/etsec.c | 6 +++---
hw/ppc/e500.c | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/hw/net/fsl_etsec/etsec.h b/hw/net/fsl_etsec/etsec.h
index 30c828e241..3da412e733 100644
--- a/hw/net/fsl_etsec/etsec.h
+++ b/hw/net/fsl_etsec/etsec.h
@@ -149,9 +149,9 @@ typedef struct eTSEC {
bool need_flush;
} eTSEC;
-#define TYPE_ETSEC_COMMON "eTSEC"
-#define ETSEC_COMMON(obj) \
- OBJECT_CHECK(eTSEC, (obj), TYPE_ETSEC_COMMON)
+#define TYPE_ETSEC "eTSEC"
+#define ETSEC(obj) \
+ OBJECT_CHECK(eTSEC, (obj), TYPE_ETSEC)
#define eTSEC_TRANSMIT 1
#define eTSEC_RECEIVE 2
diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c
index aa2b0d5a85..ddefaf560c 100644
--- a/hw/net/fsl_etsec/etsec.c
+++ b/hw/net/fsl_etsec/etsec.c
@@ -303,7 +303,7 @@ static void etsec_timer_hit(void *opaque)
static void etsec_reset(DeviceState *d)
{
- eTSEC *etsec = ETSEC_COMMON(d);
+ eTSEC *etsec = ETSEC(d);
int i = 0;
int reg_index = 0;
@@ -378,7 +378,7 @@ static NetClientInfo net_etsec_info = {
static void etsec_realize(DeviceState *dev, Error **errp)
{
- eTSEC *etsec = ETSEC_COMMON(dev);
+ eTSEC *etsec = ETSEC(dev);
etsec->nic = qemu_new_nic(&net_etsec_info, &etsec->conf,
object_get_typename(OBJECT(dev)), dev->id, etsec);
@@ -392,7 +392,7 @@ static void etsec_realize(DeviceState *dev, Error **errp)
static void etsec_instance_init(Object *obj)
{
- eTSEC *etsec = ETSEC_COMMON(obj);
+ eTSEC *etsec = ETSEC(obj);
SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
memory_region_init_io(&etsec->io_area, OBJECT(etsec), &etsec_ops, etsec,
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index f7df2388c1..f6478b3a68 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -161,7 +161,7 @@ typedef struct PlatformDevtreeData {
static int create_devtree_etsec(SysBusDevice *sbdev, PlatformDevtreeData *data)
{
- eTSEC *etsec = ETSEC_COMMON(sbdev);
+ eTSEC *etsec = ETSEC(sbdev);
PlatformBusDevice *pbus = data->pbus;
hwaddr mmio0 = platform_bus_get_mmio_addr(pbus, sbdev, 0);
int irq0 = platform_bus_get_irqn(pbus, sbdev, 0);
@@ -201,7 +201,7 @@ static void sysbus_device_create_devtree(SysBusDevice *sbdev, void *opaque)
PlatformDevtreeData *data = opaque;
bool matched = false;
- if (object_dynamic_cast(OBJECT(sbdev), TYPE_ETSEC_COMMON)) {
+ if (object_dynamic_cast(OBJECT(sbdev), TYPE_ETSEC)) {
create_devtree_etsec(sbdev, data);
matched = true;
}
--
2.11.0.259.g40922b1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Qemu-devel] [PATCH for-2.10 2/2] etsec: Use TYPE_ETSEC macro when registering/creating device
2017-03-31 19:27 [Qemu-devel] [PATCH for-2.10 0/2] etsec: (TYPE_)ETSEC_COMMON macro cleanup Eduardo Habkost
2017-03-31 19:27 ` [Qemu-devel] [PATCH for-2.10 1/2] etsec: Rename (TYPE_)ETSEC_COMMON to (TYPE_)ETSEC Eduardo Habkost
@ 2017-03-31 19:27 ` Eduardo Habkost
2017-04-02 12:42 ` [Qemu-devel] [PATCH for-2.10 0/2] etsec: (TYPE_)ETSEC_COMMON macro cleanup Philippe Mathieu-Daudé
2 siblings, 0 replies; 5+ messages in thread
From: Eduardo Habkost @ 2017-03-31 19:27 UTC (permalink / raw)
To: qemu-devel
Cc: Alexander Graf, Scott Wood, qemu-ppc, Fabien Chouteau, Jason Wang
Instead of hardcoding the class name, use the TYPE_ETSEC macro
when registering the class and creating devices.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
hw/net/fsl_etsec/etsec.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c
index ddefaf560c..5d2c45de6f 100644
--- a/hw/net/fsl_etsec/etsec.c
+++ b/hw/net/fsl_etsec/etsec.c
@@ -419,7 +419,7 @@ static void etsec_class_init(ObjectClass *klass, void *data)
}
static TypeInfo etsec_info = {
- .name = "eTSEC",
+ .name = TYPE_ETSEC,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(eTSEC),
.class_init = etsec_class_init,
@@ -442,7 +442,7 @@ DeviceState *etsec_create(hwaddr base,
{
DeviceState *dev;
- dev = qdev_create(NULL, "eTSEC");
+ dev = qdev_create(NULL, TYPE_ETSEC);
qdev_set_nic_properties(dev, nd);
qdev_init_nofail(dev);
--
2.11.0.259.g40922b1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.10 0/2] etsec: (TYPE_)ETSEC_COMMON macro cleanup
2017-03-31 19:27 [Qemu-devel] [PATCH for-2.10 0/2] etsec: (TYPE_)ETSEC_COMMON macro cleanup Eduardo Habkost
2017-03-31 19:27 ` [Qemu-devel] [PATCH for-2.10 1/2] etsec: Rename (TYPE_)ETSEC_COMMON to (TYPE_)ETSEC Eduardo Habkost
2017-03-31 19:27 ` [Qemu-devel] [PATCH for-2.10 2/2] etsec: Use TYPE_ETSEC macro when registering/creating device Eduardo Habkost
@ 2017-04-02 12:42 ` Philippe Mathieu-Daudé
2017-04-03 9:48 ` Fabien Chouteau
2 siblings, 1 reply; 5+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-04-02 12:42 UTC (permalink / raw)
To: Eduardo Habkost, qemu-devel
Cc: Scott Wood, Jason Wang, qemu-ppc, Alexander Graf, Fabien Chouteau
On 03/31/2017 04:27 PM, Eduardo Habkost wrote:
> When working on other things, I got confused by the etsec code,
> that didn't use the TYPE_ETSEC_COMMON macro in its type
> declaration, and had no subclasses despite being named
> ETSEC_COMMON.
>
> This is a very simple cleanup to remove the _COMMON suffix from
> the macros, and to use the TYPE_ETSEC macro when registering and
> creating devices instead of hardcoding the "eTSEC" name.
>
> Cc: Alexander Graf <agraf@suse.de>
> Cc: Scott Wood <scottwood@freescale.com>
> Cc: Jason Wang <jasowang@redhat.com>
> Cc: Fabien Chouteau <chouteau@adacore.com>
> Cc: qemu-ppc@nongnu.org
>
> Eduardo Habkost (2):
> etsec: Rename (TYPE_)ETSEC_COMMON to (TYPE_)ETSEC
> etsec: Use TYPE_ETSEC macro when registering/creating device
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>
> hw/net/fsl_etsec/etsec.h | 6 +++---
> hw/net/fsl_etsec/etsec.c | 10 +++++-----
> hw/ppc/e500.c | 4 ++--
> 3 files changed, 10 insertions(+), 10 deletions(-)
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.10 0/2] etsec: (TYPE_)ETSEC_COMMON macro cleanup
2017-04-02 12:42 ` [Qemu-devel] [PATCH for-2.10 0/2] etsec: (TYPE_)ETSEC_COMMON macro cleanup Philippe Mathieu-Daudé
@ 2017-04-03 9:48 ` Fabien Chouteau
0 siblings, 0 replies; 5+ messages in thread
From: Fabien Chouteau @ 2017-04-03 9:48 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, Eduardo Habkost, qemu-devel
Cc: Scott Wood, Jason Wang, qemu-ppc, Alexander Graf
On 02/04/2017 14:42, Philippe Mathieu-Daudé wrote:
> On 03/31/2017 04:27 PM, Eduardo Habkost wrote:
>> When working on other things, I got confused by the etsec code,
>> that didn't use the TYPE_ETSEC_COMMON macro in its type
>> declaration, and had no subclasses despite being named
>> ETSEC_COMMON.
>>
>> This is a very simple cleanup to remove the _COMMON suffix from
>> the macros, and to use the TYPE_ETSEC macro when registering and
>> creating devices instead of hardcoding the "eTSEC" name.
>>
>> Cc: Alexander Graf <agraf@suse.de>
>> Cc: Scott Wood <scottwood@freescale.com>
>> Cc: Jason Wang <jasowang@redhat.com>
>> Cc: Fabien Chouteau <chouteau@adacore.com>
>> Cc: qemu-ppc@nongnu.org
>>
>> Eduardo Habkost (2):
>> etsec: Rename (TYPE_)ETSEC_COMMON to (TYPE_)ETSEC
>> etsec: Use TYPE_ETSEC macro when registering/creating device
>
> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>
Reviewed-by: Fabien Chouteau <chouteau@adacore.com>
Thanks Eduardo,
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-04-03 9:48 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-31 19:27 [Qemu-devel] [PATCH for-2.10 0/2] etsec: (TYPE_)ETSEC_COMMON macro cleanup Eduardo Habkost
2017-03-31 19:27 ` [Qemu-devel] [PATCH for-2.10 1/2] etsec: Rename (TYPE_)ETSEC_COMMON to (TYPE_)ETSEC Eduardo Habkost
2017-03-31 19:27 ` [Qemu-devel] [PATCH for-2.10 2/2] etsec: Use TYPE_ETSEC macro when registering/creating device Eduardo Habkost
2017-04-02 12:42 ` [Qemu-devel] [PATCH for-2.10 0/2] etsec: (TYPE_)ETSEC_COMMON macro cleanup Philippe Mathieu-Daudé
2017-04-03 9:48 ` Fabien Chouteau
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.