[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH qom-next v1 1/6] ssi: Convert legacy casts from
From: |
Andreas Färber |
Subject: |
Re: [Qemu-devel] [PATCH qom-next v1 1/6] ssi: Convert legacy casts from SSI_SLAVE->DEVICE |
Date: |
Tue, 04 Mar 2014 23:07:38 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 |
Am 12.02.2014 01:27, schrieb Peter Crosthwaite:
> Convert legacy ->qdev style casts from TYPE_SSI_SLAVE to TYPE_DEVICE.
>
> Signed-off-by: Peter Crosthwaite <address@hidden>
> ---
>
> hw/arm/spitz.c | 9 +++++----
> hw/display/ads7846.c | 2 +-
> hw/display/ssd0323.c | 4 ++--
> hw/misc/max111x.c | 4 ++--
> hw/sd/ssi-sd.c | 2 +-
> 5 files changed, 11 insertions(+), 10 deletions(-)
>
> diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c
> index ba17283..c7b3a94 100644
> --- a/hw/arm/spitz.c
> +++ b/hw/arm/spitz.c
> @@ -660,12 +660,13 @@ static void spitz_adc_temp_on(void *opaque, int line,
> int level)
>
> static int corgi_ssp_init(SSISlave *dev)
> {
> + DeviceState *d = DEVICE(dev);
> CorgiSSPState *s = FROM_SSI_SLAVE(CorgiSSPState, dev);
>
> - qdev_init_gpio_in(&dev->qdev, corgi_ssp_gpio_cs, 3);
> - s->bus[0] = ssi_create_bus(&dev->qdev, "ssi0");
> - s->bus[1] = ssi_create_bus(&dev->qdev, "ssi1");
> - s->bus[2] = ssi_create_bus(&dev->qdev, "ssi2");
> + qdev_init_gpio_in(d, corgi_ssp_gpio_cs, 3);
> + s->bus[0] = ssi_create_bus(d, "ssi0");
> + s->bus[1] = ssi_create_bus(d, "ssi1");
> + s->bus[2] = ssi_create_bus(d, "ssi2");
>
> return 0;
> }
Here with only two additional patch lines we can swap the names as
preparation for QOM realize.
> diff --git a/hw/display/ads7846.c b/hw/display/ads7846.c
> index 5da3dc5..87beefe 100644
> --- a/hw/display/ads7846.c
> +++ b/hw/display/ads7846.c
> @@ -137,7 +137,7 @@ static int ads7846_init(SSISlave *dev)
> {
> ADS7846State *s = FROM_SSI_SLAVE(ADS7846State, dev);
>
> - qdev_init_gpio_out(&dev->qdev, &s->interrupt, 1);
> + qdev_init_gpio_out(DEVICE(dev), &s->interrupt, 1);
>
> s->input[0] = ADS_TEMP0; /* TEMP0 */
> s->input[2] = ADS_VBAT; /* VBAT */
Ditto here.
> diff --git a/hw/display/ssd0323.c b/hw/display/ssd0323.c
> index c3231c6..c463bd8 100644
> --- a/hw/display/ssd0323.c
> +++ b/hw/display/ssd0323.c
> @@ -345,9 +345,9 @@ static int ssd0323_init(SSISlave *dev)
> s->con = graphic_console_init(DEVICE(dev), &ssd0323_ops, s);
> qemu_console_resize(s->con, 128 * MAGNIFY, 64 * MAGNIFY);
>
> - qdev_init_gpio_in(&dev->qdev, ssd0323_cd, 1);
> + qdev_init_gpio_in(DEVICE(dev), ssd0323_cd, 1);
>
> - register_savevm(&dev->qdev, "ssd0323_oled", -1, 1,
> + register_savevm(DEVICE(dev), "ssd0323_oled", -1, 1,
> ssd0323_save, ssd0323_load, s);
> return 0;
> }
Duplicate DEVICE() cast can be avoided here.
> diff --git a/hw/misc/max111x.c b/hw/misc/max111x.c
> index d477ecd..fcf2a4d 100644
> --- a/hw/misc/max111x.c
> +++ b/hw/misc/max111x.c
> @@ -119,7 +119,7 @@ static int max111x_init(SSISlave *dev, int inputs)
> {
> MAX111xState *s = FROM_SSI_SLAVE(MAX111xState, dev);
>
> - qdev_init_gpio_out(&dev->qdev, &s->interrupt, 1);
> + qdev_init_gpio_out(DEVICE(dev), &s->interrupt, 1);
>
> s->inputs = inputs;
> /* TODO: add a user interface for setting these */
> @@ -133,7 +133,7 @@ static int max111x_init(SSISlave *dev, int inputs)
> s->input[7] = 0x80;
> s->com = 0;
>
> - vmstate_register(&dev->qdev, -1, &vmstate_max111x, s);
> + vmstate_register(DEVICE(dev), -1, &vmstate_max111x, s);
> return 0;
> }
>
Dito.
> diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c
> index 1bb56c4..2f34dc6 100644
> --- a/hw/sd/ssi-sd.c
> +++ b/hw/sd/ssi-sd.c
> @@ -249,7 +249,7 @@ static int ssi_sd_init(SSISlave *dev)
> if (s->sd == NULL) {
> return -1;
> }
> - register_savevm(&dev->qdev, "ssi_sd", -1, 1, ssi_sd_save, ssi_sd_load,
> s);
> + register_savevm(DEVICE(dev), "ssi_sd", -1, 1, ssi_sd_save, ssi_sd_load,
> s);
> return 0;
> }
>
Here's my changes, requiring to adjust 4/6:
diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c
index 9020879..392ca84 100644
--- a/hw/arm/spitz.c
+++ b/hw/arm/spitz.c
@@ -658,15 +658,15 @@ static void spitz_adc_temp_on(void *opaque, int
line, int level)
max111x_set_input(max1111, MAX1111_BATT_TEMP, 0);
}
-static int corgi_ssp_init(SSISlave *dev)
+static int corgi_ssp_init(SSISlave *d)
{
- DeviceState *d = DEVICE(dev);
- CorgiSSPState *s = FROM_SSI_SLAVE(CorgiSSPState, dev);
+ DeviceState *dev = DEVICE(d);
+ CorgiSSPState *s = FROM_SSI_SLAVE(CorgiSSPState, d);
- qdev_init_gpio_in(d, corgi_ssp_gpio_cs, 3);
- s->bus[0] = ssi_create_bus(d, "ssi0");
- s->bus[1] = ssi_create_bus(d, "ssi1");
- s->bus[2] = ssi_create_bus(d, "ssi2");
+ qdev_init_gpio_in(dev, corgi_ssp_gpio_cs, 3);
+ s->bus[0] = ssi_create_bus(dev, "ssi0");
+ s->bus[1] = ssi_create_bus(dev, "ssi1");
+ s->bus[2] = ssi_create_bus(dev, "ssi2");
return 0;
}
diff --git a/hw/display/ads7846.c b/hw/display/ads7846.c
index 87beefe..85252a2 100644
--- a/hw/display/ads7846.c
+++ b/hw/display/ads7846.c
@@ -133,11 +133,12 @@ static const VMStateDescription vmstate_ads7846 = {
}
};
-static int ads7846_init(SSISlave *dev)
+static int ads7846_init(SSISlave *d)
{
- ADS7846State *s = FROM_SSI_SLAVE(ADS7846State, dev);
+ DeviceState *dev = DEVICE(d);
+ ADS7846State *s = FROM_SSI_SLAVE(ADS7846State, d);
- qdev_init_gpio_out(DEVICE(dev), &s->interrupt, 1);
+ qdev_init_gpio_out(dev, &s->interrupt, 1);
s->input[0] = ADS_TEMP0; /* TEMP0 */
s->input[2] = ADS_VBAT; /* VBAT */
diff --git a/hw/display/ssd0323.c b/hw/display/ssd0323.c
index c463bd8..4f55f57 100644
--- a/hw/display/ssd0323.c
+++ b/hw/display/ssd0323.c
@@ -336,18 +336,19 @@ static const GraphicHwOps ssd0323_ops = {
.gfx_update = ssd0323_update_display,
};
-static int ssd0323_init(SSISlave *dev)
+static int ssd0323_init(SSISlave *d)
{
- ssd0323_state *s = FROM_SSI_SLAVE(ssd0323_state, dev);
+ DeviceState *dev = DEVICE(d);
+ ssd0323_state *s = FROM_SSI_SLAVE(ssd0323_state, d);
s->col_end = 63;
s->row_end = 79;
- s->con = graphic_console_init(DEVICE(dev), &ssd0323_ops, s);
+ s->con = graphic_console_init(dev, &ssd0323_ops, s);
qemu_console_resize(s->con, 128 * MAGNIFY, 64 * MAGNIFY);
- qdev_init_gpio_in(DEVICE(dev), ssd0323_cd, 1);
+ qdev_init_gpio_in(dev, ssd0323_cd, 1);
- register_savevm(DEVICE(dev), "ssd0323_oled", -1, 1,
+ register_savevm(dev, "ssd0323_oled", -1, 1,
ssd0323_save, ssd0323_load, s);
return 0;
}
diff --git a/hw/misc/max111x.c b/hw/misc/max111x.c
index fcf2a4d..28dfa0b 100644
--- a/hw/misc/max111x.c
+++ b/hw/misc/max111x.c
@@ -115,11 +115,12 @@ static const VMStateDescription vmstate_max111x = {
}
};
-static int max111x_init(SSISlave *dev, int inputs)
+static int max111x_init(SSISlave *d, int inputs)
{
- MAX111xState *s = FROM_SSI_SLAVE(MAX111xState, dev);
+ DeviceState *dev = DEVICE(d);
+ MAX111xState *s = FROM_SSI_SLAVE(MAX111xState, d);
- qdev_init_gpio_out(DEVICE(dev), &s->interrupt, 1);
+ qdev_init_gpio_out(dev, &s->interrupt, 1);
s->inputs = inputs;
/* TODO: add a user interface for setting these */
@@ -133,7 +134,7 @@ static int max111x_init(SSISlave *dev, int inputs)
s->input[7] = 0x80;
s->com = 0;
- vmstate_register(DEVICE(dev), -1, &vmstate_max111x, s);
+ vmstate_register(dev, -1, &vmstate_max111x, s);
return 0;
}
diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c
index 2f34dc6..3273c8a 100644
--- a/hw/sd/ssi-sd.c
+++ b/hw/sd/ssi-sd.c
@@ -238,9 +238,10 @@ static int ssi_sd_load(QEMUFile *f, void *opaque,
int version_id)
return 0;
}
-static int ssi_sd_init(SSISlave *dev)
+static int ssi_sd_init(SSISlave *d)
{
- ssi_sd_state *s = FROM_SSI_SLAVE(ssi_sd_state, dev);
+ DeviceState *dev = DEVICE(d);
+ ssi_sd_state *s = FROM_SSI_SLAVE(ssi_sd_state, d);
DriveInfo *dinfo;
s->mode = SSI_SD_CMD;
@@ -249,7 +250,7 @@ static int ssi_sd_init(SSISlave *dev)
if (s->sd == NULL) {
return -1;
}
- register_savevm(DEVICE(dev), "ssi_sd", -1, 1, ssi_sd_save,
ssi_sd_load, s);
+ register_savevm(dev, "ssi_sd", -1, 1, ssi_sd_save, ssi_sd_load, s);
return 0;
}
Andreas
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
- Re: [Qemu-devel] [PATCH qom-next v1 1/6] ssi: Convert legacy casts from SSI_SLAVE->DEVICE,
Andreas Färber <=