mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/mips: Declare all length properties as unsigned

Browse Source 
Some length properties are signed, other unsigned:

  hw/mips/cps.c:183:    DEFINE_PROP_UINT32("num-vp", MIPSCPSState, num_vp, 1),
  hw/mips/cps.c:184:    DEFINE_PROP_UINT32("num-irq", MIPSCPSState, num_irq, 256),
  hw/misc/mips_cmgcr.c:215:    DEFINE_PROP_INT32("num-vp", MIPSGCRState, num_vps, 1),
  hw/misc/mips_cpc.c:167:    DEFINE_PROP_UINT32("num-vp", MIPSCPCState, num_vp, 0x1),
  hw/misc/mips_itu.c:552:    DEFINE_PROP_INT32("num-fifo", MIPSITUState, num_fifo,
  hw/misc/mips_itu.c:554:    DEFINE_PROP_INT32("num-semaphores", MIPSITUState,

Since negative values are not used (the minimum is '0'),
unify by declaring all properties as unsigned.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230203113650.78146-9-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2023-02-02 10:46:45 +01:00
parent dcebb36eb0
commit 10997f2d1d
9 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/intc/mips_gic.c
View File

@ -439,8 +439,8 @@ static void mips_gic_realize(DeviceState *dev, Error **errp)
} }
static Property mips_gic_properties[] = { static Property mips_gic_properties[] = {
DEFINE_PROP_INT32("num-vp", MIPSGICState, num_vps, 1), DEFINE_PROP_UINT32("num-vp", MIPSGICState, num_vps, 1),
DEFINE_PROP_INT32("num-irq", MIPSGICState, num_irq, 256), DEFINE_PROP_UINT32("num-irq", MIPSGICState, num_irq, 256),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };

2
hw/mips/boston.c
View File

@ -702,7 +702,7 @@ static void boston_mach_init(MachineState *machine)
object_initialize_child(OBJECT(machine), "cps", &s->cps, TYPE_MIPS_CPS); object_initialize_child(OBJECT(machine), "cps", &s->cps, TYPE_MIPS_CPS);
object_property_set_str(OBJECT(&s->cps), "cpu-type", machine->cpu_type, object_property_set_str(OBJECT(&s->cps), "cpu-type", machine->cpu_type,
&error_fatal); &error_fatal);
object_property_set_int(OBJECT(&s->cps), "num-vp", machine->smp.cpus, object_property_set_uint(OBJECT(&s->cps), "num-vp", machine->smp.cpus,
&error_fatal); &error_fatal);
qdev_connect_clock_in(DEVICE(&s->cps), "clk-in", qdev_connect_clock_in(DEVICE(&s->cps), "clk-in",
qdev_get_clock_out(dev, "cpu-refclk")); qdev_get_clock_out(dev, "cpu-refclk"));

12
hw/mips/cps.c
View File

@ -114,9 +114,9 @@ static void mips_cps_realize(DeviceState *dev, Error **errp)
/* Inter-Thread Communication Unit */ /* Inter-Thread Communication Unit */
if (itu_present) { if (itu_present) {
object_initialize_child(OBJECT(dev), "itu", &s->itu, TYPE_MIPS_ITU); object_initialize_child(OBJECT(dev), "itu", &s->itu, TYPE_MIPS_ITU);
object_property_set_int(OBJECT(&s->itu), "num-fifo", 16, object_property_set_uint(OBJECT(&s->itu), "num-fifo", 16,
&error_abort); &error_abort);
object_property_set_int(OBJECT(&s->itu), "num-semaphores", 16, object_property_set_uint(OBJECT(&s->itu), "num-semaphores", 16,
&error_abort); &error_abort);
object_property_set_bool(OBJECT(&s->itu), "saar-present", saar_present, object_property_set_bool(OBJECT(&s->itu), "saar-present", saar_present,
&error_abort); &error_abort);
@ -133,7 +133,7 @@ static void mips_cps_realize(DeviceState *dev, Error **errp)
/* Cluster Power Controller */ /* Cluster Power Controller */
object_initialize_child(OBJECT(dev), "cpc", &s->cpc, TYPE_MIPS_CPC); object_initialize_child(OBJECT(dev), "cpc", &s->cpc, TYPE_MIPS_CPC);
object_property_set_int(OBJECT(&s->cpc), "num-vp", s->num_vp, object_property_set_uint(OBJECT(&s->cpc), "num-vp", s->num_vp,
&error_abort); &error_abort);
object_property_set_int(OBJECT(&s->cpc), "vp-start-running", 1, object_property_set_int(OBJECT(&s->cpc), "vp-start-running", 1,
&error_abort); &error_abort);
@ -146,9 +146,9 @@ static void mips_cps_realize(DeviceState *dev, Error **errp)
/* Global Interrupt Controller */ /* Global Interrupt Controller */
object_initialize_child(OBJECT(dev), "gic", &s->gic, TYPE_MIPS_GIC); object_initialize_child(OBJECT(dev), "gic", &s->gic, TYPE_MIPS_GIC);
object_property_set_int(OBJECT(&s->gic), "num-vp", s->num_vp, object_property_set_uint(OBJECT(&s->gic), "num-vp", s->num_vp,
&error_abort); &error_abort);
object_property_set_int(OBJECT(&s->gic), "num-irq", 128, object_property_set_uint(OBJECT(&s->gic), "num-irq", 128,
&error_abort); &error_abort);
if (!sysbus_realize(SYS_BUS_DEVICE(&s->gic), errp)) { if (!sysbus_realize(SYS_BUS_DEVICE(&s->gic), errp)) {
return; return;
@ -161,7 +161,7 @@ static void mips_cps_realize(DeviceState *dev, Error **errp)
gcr_base = env->CP0_CMGCRBase << 4; gcr_base = env->CP0_CMGCRBase << 4;
object_initialize_child(OBJECT(dev), "gcr", &s->gcr, TYPE_MIPS_GCR); object_initialize_child(OBJECT(dev), "gcr", &s->gcr, TYPE_MIPS_GCR);
object_property_set_int(OBJECT(&s->gcr), "num-vp", s->num_vp, object_property_set_uint(OBJECT(&s->gcr), "num-vp", s->num_vp,
&error_abort); &error_abort);
object_property_set_int(OBJECT(&s->gcr), "gcr-rev", 0x800, object_property_set_int(OBJECT(&s->gcr), "gcr-rev", 0x800,
&error_abort); &error_abort);

2
hw/mips/malta.c
View File

@ -1066,7 +1066,7 @@ static void create_cps(MachineState *ms, MaltaState *s,
object_initialize_child(OBJECT(s), "cps", &s->cps, TYPE_MIPS_CPS); object_initialize_child(OBJECT(s), "cps", &s->cps, TYPE_MIPS_CPS);
object_property_set_str(OBJECT(&s->cps), "cpu-type", ms->cpu_type, object_property_set_str(OBJECT(&s->cps), "cpu-type", ms->cpu_type,
&error_fatal); &error_fatal);
object_property_set_int(OBJECT(&s->cps), "num-vp", ms->smp.cpus, object_property_set_uint(OBJECT(&s->cps), "num-vp", ms->smp.cpus,
&error_fatal); &error_fatal);
qdev_connect_clock_in(DEVICE(&s->cps), "clk-in", s->cpuclk); qdev_connect_clock_in(DEVICE(&s->cps), "clk-in", s->cpuclk);
sysbus_realize(SYS_BUS_DEVICE(&s->cps), &error_fatal); sysbus_realize(SYS_BUS_DEVICE(&s->cps), &error_fatal);

2
hw/misc/mips_cmgcr.c
View File

@ -212,7 +212,7 @@ static const VMStateDescription vmstate_mips_gcr = {
}; };
static Property mips_gcr_properties[] = { static Property mips_gcr_properties[] = {
DEFINE_PROP_INT32("num-vp", MIPSGCRState, num_vps, 1), DEFINE_PROP_UINT32("num-vp", MIPSGCRState, num_vps, 1),
DEFINE_PROP_INT32("gcr-rev", MIPSGCRState, gcr_rev, 0x800), DEFINE_PROP_INT32("gcr-rev", MIPSGCRState, gcr_rev, 0x800),
DEFINE_PROP_UINT64("gcr-base", MIPSGCRState, gcr_base, GCR_BASE_ADDR), DEFINE_PROP_UINT64("gcr-base", MIPSGCRState, gcr_base, GCR_BASE_ADDR),
DEFINE_PROP_LINK("gic", MIPSGCRState, gic_mr, TYPE_MEMORY_REGION, DEFINE_PROP_LINK("gic", MIPSGCRState, gic_mr, TYPE_MEMORY_REGION,

4
hw/misc/mips_itu.c
View File

@ -549,9 +549,9 @@ static void mips_itu_reset(DeviceState *dev)
} }
static Property mips_itu_properties[] = { static Property mips_itu_properties[] = {
DEFINE_PROP_INT32("num-fifo", MIPSITUState, num_fifo, DEFINE_PROP_UINT32("num-fifo", MIPSITUState, num_fifo,
ITC_FIFO_NUM_MAX), ITC_FIFO_NUM_MAX),
DEFINE_PROP_INT32("num-semaphores", MIPSITUState, num_semaphores, DEFINE_PROP_UINT32("num-semaphores", MIPSITUState, num_semaphores,
ITC_SEMAPH_NUM_MAX), ITC_SEMAPH_NUM_MAX),
DEFINE_PROP_BOOL("saar-present", MIPSITUState, saar_present, false), DEFINE_PROP_BOOL("saar-present", MIPSITUState, saar_present, false),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),

4
include/hw/intc/mips_gic.h
View File

@ -211,8 +211,8 @@ struct MIPSGICState {
/* GIC VP Timer */ /* GIC VP Timer */
MIPSGICTimerState *gic_timer; MIPSGICTimerState *gic_timer;
int32_t num_vps; uint32_t num_vps;
int32_t num_irq; uint32_t num_irq;
}; };
#endif /* MIPS_GIC_H */ #endif /* MIPS_GIC_H */

2
include/hw/misc/mips_cmgcr.h
View File

@ -75,7 +75,7 @@ struct MIPSGCRState {
SysBusDevice parent_obj; SysBusDevice parent_obj;
int32_t gcr_rev; int32_t gcr_rev;
int32_t num_vps; uint32_t num_vps;
hwaddr gcr_base; hwaddr gcr_base;
MemoryRegion iomem; MemoryRegion iomem;
MemoryRegion *cpc_mr; MemoryRegion *cpc_mr;

4
include/hw/misc/mips_itu.h
View File

@ -57,8 +57,8 @@ struct MIPSITUState {
SysBusDevice parent_obj; SysBusDevice parent_obj;
/*< public >*/ /*< public >*/
int32_t num_fifo; uint32_t num_fifo;
int32_t num_semaphores; uint32_t num_semaphores;
/* ITC Storage */ /* ITC Storage */
ITCStorageCell *cell; ITCStorageCell *cell;