Skip to content

Commit

Permalink
qom: Put name parameter before value / visitor parameter
Browse files Browse the repository at this point in the history 
The object_property_set_FOO() setters take property name and value in
an unusual order:

    void object_property_set_FOO(Object *obj, FOO_TYPE value,
                                 const char *name, Error **errp)

Having to pass value before name feels grating.  Swap them.

Same for object_property_set(), object_property_get(), and
object_property_parse().

Convert callers with this Coccinelle script:

    @@
    identifier fun = {
        object_property_get, object_property_parse, object_property_set_str,
        object_property_set_link, object_property_set_bool,
        object_property_set_int, object_property_set_uint, object_property_set,
        object_property_set_qobject
    };
    expression obj, v, name, errp;
    @@
    -    fun(obj, v, name, errp)
    +    fun(obj, name, v, errp)

Chokes on hw/arm/musicpal.c's lcd_refresh() with the unhelpful error
message "no position information".  Convert that one manually.

Fails to convert hw/arm/armsse.c, because Coccinelle gets confused by
ARMSSE being used both as typedef and function-like macro there.
Convert manually.

Fails to convert hw/rx/rx-gdbsim.c, because Coccinelle gets confused
by RXCPU being used both as typedef and function-like macro there.
Convert manually.  The other files using RXCPU that way don't need
conversion.

Signed-off-by: Markus Armbruster <[email protected]>
Reviewed-by: Eric Blake <[email protected]>
Reviewed-by: Vladimir Sementsov-Ogievskiy <[email protected]>
Message-Id: <[email protected]>
[Straightforwad conflict with commit 2336172 "audio: set default
value for pcspk.iobase property" resolved]
  • Loading branch information
Markus Armbruster committed Jul 10, 2020
1 parent 1c94a35 commit 5325cc3
Show file tree
Hide file tree
Showing 138 changed files with 712 additions and 741 deletions.
2 changes: 1 addition & 1 deletion backends/cryptodev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ static void cryptodev_backend_instance_init(Object *obj)
cryptodev_backend_set_queues,
NULL, NULL);
/* Initialize devices' queues property to 1 */
object_property_set_int(obj, 1, "queues", NULL);
object_property_set_int(obj, "queues", 1, NULL);
}

static void cryptodev_backend_finalize(Object *obj)
Expand Down
2 changes: 1 addition & 1 deletion backends/rng.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ static bool rng_backend_prop_get_opened(Object *obj, Error **errp)

static void rng_backend_complete(UserCreatable *uc, Error **errp)
{
object_property_set_bool(OBJECT(uc), true, "opened", errp);
object_property_set_bool(OBJECT(uc), "opened", true, errp);
}

static void rng_backend_prop_set_opened(Object *obj, bool value, Error **errp)
Expand Down
2 changes: 1 addition & 1 deletion bootdevice.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ void device_add_bootindex_property(Object *obj, int32_t *bootindex,
prop);

/* initialize devices' bootindex property to -1 */
object_property_set_int(obj, -1, name, NULL);
object_property_set_int(obj, name, -1, NULL);
}

typedef struct FWLCHSEntry FWLCHSEntry;
Expand Down
2 changes: 1 addition & 1 deletion crypto/secret.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ qcrypto_secret_prop_get_file(Object *obj,
static void
qcrypto_secret_complete(UserCreatable *uc, Error **errp)
{
object_property_set_bool(OBJECT(uc), true, "loaded", errp);
object_property_set_bool(OBJECT(uc), "loaded", true, errp);
}


Expand Down
2 changes: 1 addition & 1 deletion crypto/secret_keyring.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ qcrypto_secret_prop_get_key(Object *obj, Visitor *v,
static void
qcrypto_secret_keyring_complete(UserCreatable *uc, Error **errp)
{
object_property_set_bool(OBJECT(uc), true, "loaded", errp);
object_property_set_bool(OBJECT(uc), "loaded", true, errp);
}


Expand Down
2 changes: 1 addition & 1 deletion crypto/tlscredsanon.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ qcrypto_tls_creds_anon_prop_get_loaded(Object *obj G_GNUC_UNUSED,
static void
qcrypto_tls_creds_anon_complete(UserCreatable *uc, Error **errp)
{
object_property_set_bool(OBJECT(uc), true, "loaded", errp);
object_property_set_bool(OBJECT(uc), "loaded", true, errp);
}


Expand Down
2 changes: 1 addition & 1 deletion crypto/tlscredspsk.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ qcrypto_tls_creds_psk_prop_get_loaded(Object *obj G_GNUC_UNUSED,
static void
qcrypto_tls_creds_psk_complete(UserCreatable *uc, Error **errp)
{
object_property_set_bool(OBJECT(uc), true, "loaded", errp);
object_property_set_bool(OBJECT(uc), "loaded", true, errp);
}


Expand Down
2 changes: 1 addition & 1 deletion crypto/tlscredsx509.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,7 @@ qcrypto_tls_creds_x509_prop_get_sanity(Object *obj,
static void
qcrypto_tls_creds_x509_complete(UserCreatable *uc, Error **errp)
{
object_property_set_bool(OBJECT(uc), true, "loaded", errp);
object_property_set_bool(OBJECT(uc), "loaded", true, errp);
}


Expand Down
4 changes: 2 additions & 2 deletions hw/acpi/cpu_hotplug.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ static void cpu_status_write(void *opaque, hwaddr addr, uint64_t data,
*/
if (addr == 0 && data == 0) {
AcpiCpuHotplug *cpus = opaque;
object_property_set_bool(cpus->device, false, "cpu-hotplug-legacy",
object_property_set_bool(cpus->device, "cpu-hotplug-legacy", false,
&error_abort);
}
}
Expand All @@ -63,7 +63,7 @@ static void acpi_set_cpu_present_bit(AcpiCpuHotplug *g, CPUState *cpu)

cpu_id = k->get_arch_id(cpu);
if ((cpu_id / 8) >= ACPI_GPE_PROC_LEN) {
object_property_set_bool(g->device, false, "cpu-hotplug-legacy",
object_property_set_bool(g->device, "cpu-hotplug-legacy", false,
&error_abort);
return;
}
Expand Down
2 changes: 1 addition & 1 deletion hw/acpi/ich9.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ static int vmstate_cpuhp_pre_load(void *opaque)
{
ICH9LPCPMRegs *s = opaque;
Object *obj = OBJECT(s->gpe_cpu.device);
object_property_set_bool(obj, false, "cpu-hotplug-legacy", &error_abort);
object_property_set_bool(obj, "cpu-hotplug-legacy", false, &error_abort);
return 0;
}

Expand Down
2 changes: 1 addition & 1 deletion hw/acpi/piix4.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ static bool vmstate_test_use_cpuhp(void *opaque)
static int vmstate_cpuhp_pre_load(void *opaque)
{
Object *obj = OBJECT(opaque);
object_property_set_bool(obj, false, "cpu-hotplug-legacy", &error_abort);
object_property_set_bool(obj, "cpu-hotplug-legacy", false, &error_abort);
return 0;
}

Expand Down
6 changes: 3 additions & 3 deletions hw/arm/allwinner-a10.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,15 +142,15 @@ static void aw_a10_realize(DeviceState *dev, Error **errp)

sprintf(bus, "usb-bus.%d", i);

object_property_set_bool(OBJECT(&s->ehci[i]), true,
"companion-enable", &error_fatal);
object_property_set_bool(OBJECT(&s->ehci[i]), "companion-enable",
true, &error_fatal);
sysbus_realize(SYS_BUS_DEVICE(&s->ehci[i]), &error_fatal);
sysbus_mmio_map(SYS_BUS_DEVICE(&s->ehci[i]), 0,
AW_A10_EHCI_BASE + i * 0x8000);
sysbus_connect_irq(SYS_BUS_DEVICE(&s->ehci[i]), 0,
qdev_get_gpio_in(dev, 39 + i));

object_property_set_str(OBJECT(&s->ohci[i]), bus, "masterbus",
object_property_set_str(OBJECT(&s->ohci[i]), "masterbus", bus,
&error_fatal);
sysbus_realize(SYS_BUS_DEVICE(&s->ohci[i]), &error_fatal);
sysbus_mmio_map(SYS_BUS_DEVICE(&s->ohci[i]), 0,
Expand Down
76 changes: 37 additions & 39 deletions hw/arm/armsse.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -534,21 +534,21 @@ static void armsse_realize(DeviceState *dev, Error **errp)
* later if necessary.
*/
if (extract32(info->cpuwait_rst, i, 1)) {
object_property_set_bool(cpuobj, true, "start-powered-off", &err);
object_property_set_bool(cpuobj, "start-powered-off", true, &err);
if (err) {
error_propagate(errp, err);
return;
}
}
if (!s->cpu_fpu[i]) {
object_property_set_bool(cpuobj, false, "vfp", &err);
object_property_set_bool(cpuobj, "vfp", false, &err);
if (err) {
error_propagate(errp, err);
return;
}
}
if (!s->cpu_dsp[i]) {
object_property_set_bool(cpuobj, false, "dsp", &err);
object_property_set_bool(cpuobj, "dsp", false, &err);
if (err) {
error_propagate(errp, err);
return;
Expand All @@ -562,9 +562,9 @@ static void armsse_realize(DeviceState *dev, Error **errp)
memory_region_add_subregion_overlap(&s->cpu_container[i], 0,
&s->container, -1);
}
object_property_set_link(cpuobj, OBJECT(&s->cpu_container[i]),
"memory", &error_abort);
object_property_set_link(cpuobj, OBJECT(s), "idau", &error_abort);
object_property_set_link(cpuobj, "memory",
OBJECT(&s->cpu_container[i]), &error_abort);
object_property_set_link(cpuobj, "idau", OBJECT(s), &error_abort);
if (!sysbus_realize(SYS_BUS_DEVICE(cpuobj), &err)) {
error_propagate(errp, err);
return;
Expand Down Expand Up @@ -604,8 +604,8 @@ static void armsse_realize(DeviceState *dev, Error **errp)
DeviceState *devs = DEVICE(splitter);
int cpunum;

object_property_set_int(splitter, info->num_cpus,
"num-lines", &err);
object_property_set_int(splitter, "num-lines", info->num_cpus,
&err);
if (err) {
error_propagate(errp, err);
return;
Expand Down Expand Up @@ -658,8 +658,8 @@ static void armsse_realize(DeviceState *dev, Error **errp)
* multiple lines, one for each of the PPCs within the ARMSSE and one
* that will be an output from the ARMSSE to the system.
*/
object_property_set_int(OBJECT(&s->sec_resp_splitter), 3,
"num-lines", &err);
object_property_set_int(OBJECT(&s->sec_resp_splitter), "num-lines", 3,
&err);
if (err) {
error_propagate(errp, err);
return;
Expand All @@ -685,8 +685,8 @@ static void armsse_realize(DeviceState *dev, Error **errp)
error_propagate(errp, err);
return;
}
object_property_set_link(OBJECT(&s->mpc[i]), OBJECT(&s->sram[i]),
"downstream", &error_abort);
object_property_set_link(OBJECT(&s->mpc[i]), "downstream",
OBJECT(&s->sram[i]), &error_abort);
if (!sysbus_realize(SYS_BUS_DEVICE(&s->mpc[i]), &err)) {
error_propagate(errp, err);
return;
Expand All @@ -702,9 +702,8 @@ static void armsse_realize(DeviceState *dev, Error **errp)
}

/* We must OR together lines from the MPC splitters to go to the NVIC */
object_property_set_int(OBJECT(&s->mpc_irq_orgate),
IOTS_NUM_EXP_MPC + info->sram_banks,
"num-lines", &err);
object_property_set_int(OBJECT(&s->mpc_irq_orgate), "num-lines",
IOTS_NUM_EXP_MPC + info->sram_banks, &err);
if (err) {
error_propagate(errp, err);
return;
Expand Down Expand Up @@ -734,7 +733,7 @@ static void armsse_realize(DeviceState *dev, Error **errp)
sysbus_connect_irq(SYS_BUS_DEVICE(&s->timer0), 0,
armsse_get_common_irq_in(s, 3));
mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->timer0), 0);
object_property_set_link(OBJECT(&s->apb_ppc0), OBJECT(mr), "port[0]",
object_property_set_link(OBJECT(&s->apb_ppc0), "port[0]", OBJECT(mr),
&error_abort);

qdev_prop_set_uint32(DEVICE(&s->timer1), "pclk-frq", s->mainclk_frq);
Expand All @@ -745,7 +744,7 @@ static void armsse_realize(DeviceState *dev, Error **errp)
sysbus_connect_irq(SYS_BUS_DEVICE(&s->timer1), 0,
armsse_get_common_irq_in(s, 4));
mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->timer1), 0);
object_property_set_link(OBJECT(&s->apb_ppc0), OBJECT(mr), "port[1]",
object_property_set_link(OBJECT(&s->apb_ppc0), "port[1]", OBJECT(mr),
&error_abort);

qdev_prop_set_uint32(DEVICE(&s->dualtimer), "pclk-frq", s->mainclk_frq);
Expand All @@ -756,7 +755,7 @@ static void armsse_realize(DeviceState *dev, Error **errp)
sysbus_connect_irq(SYS_BUS_DEVICE(&s->dualtimer), 0,
armsse_get_common_irq_in(s, 5));
mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->dualtimer), 0);
object_property_set_link(OBJECT(&s->apb_ppc0), OBJECT(mr), "port[2]",
object_property_set_link(OBJECT(&s->apb_ppc0), "port[2]", OBJECT(mr),
&error_abort);

if (info->has_mhus) {
Expand All @@ -780,8 +779,8 @@ static void armsse_realize(DeviceState *dev, Error **errp)
}
port = g_strdup_printf("port[%d]", i + 3);
mr = sysbus_mmio_get_region(mhu_sbd, 0);
object_property_set_link(OBJECT(&s->apb_ppc0), OBJECT(mr),
port, &error_abort);
object_property_set_link(OBJECT(&s->apb_ppc0), port, OBJECT(mr),
&error_abort);
g_free(port);

/*
Expand Down Expand Up @@ -842,8 +841,8 @@ static void armsse_realize(DeviceState *dev, Error **errp)
* ones) are sent individually to the security controller, and also
* ORed together to give a single combined PPC interrupt to the NVIC.
*/
object_property_set_int(OBJECT(&s->ppc_irq_orgate),
NUM_PPCS, "num-lines", &err);
object_property_set_int(OBJECT(&s->ppc_irq_orgate), "num-lines", NUM_PPCS,
&err);
if (err) {
error_propagate(errp, err);
return;
Expand Down Expand Up @@ -923,7 +922,7 @@ static void armsse_realize(DeviceState *dev, Error **errp)
sysbus_connect_irq(SYS_BUS_DEVICE(&s->s32ktimer), 0,
armsse_get_common_irq_in(s, 2));
mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->s32ktimer), 0);
object_property_set_link(OBJECT(&s->apb_ppc1), OBJECT(mr), "port[0]",
object_property_set_link(OBJECT(&s->apb_ppc1), "port[0]", OBJECT(mr),
&error_abort);

if (!sysbus_realize(SYS_BUS_DEVICE(&s->apb_ppc1), &err)) {
Expand All @@ -950,15 +949,14 @@ static void armsse_realize(DeviceState *dev, Error **errp)
qdev_get_gpio_in_named(dev_apb_ppc1,
"cfg_sec_resp", 0));

object_property_set_int(OBJECT(&s->sysinfo), info->sys_version,
"SYS_VERSION", &err);
object_property_set_int(OBJECT(&s->sysinfo), "SYS_VERSION",
info->sys_version, &err);
if (err) {
error_propagate(errp, err);
return;
}
object_property_set_int(OBJECT(&s->sysinfo),
armsse_sys_config_value(s, info),
"SYS_CONFIG", &err);
object_property_set_int(OBJECT(&s->sysinfo), "SYS_CONFIG",
armsse_sys_config_value(s, info), &err);
if (err) {
error_propagate(errp, err);
return;
Expand All @@ -970,14 +968,14 @@ static void armsse_realize(DeviceState *dev, Error **errp)
/* System information registers */
sysbus_mmio_map(SYS_BUS_DEVICE(&s->sysinfo), 0, 0x40020000);
/* System control registers */
object_property_set_int(OBJECT(&s->sysctl), info->sys_version,
"SYS_VERSION", &error_abort);
object_property_set_int(OBJECT(&s->sysctl), info->cpuwait_rst,
"CPUWAIT_RST", &error_abort);
object_property_set_int(OBJECT(&s->sysctl), s->init_svtor,
"INITSVTOR0_RST", &error_abort);
object_property_set_int(OBJECT(&s->sysctl), s->init_svtor,
"INITSVTOR1_RST", &error_abort);
object_property_set_int(OBJECT(&s->sysctl), "SYS_VERSION",
info->sys_version, &error_abort);
object_property_set_int(OBJECT(&s->sysctl), "CPUWAIT_RST",
info->cpuwait_rst, &error_abort);
object_property_set_int(OBJECT(&s->sysctl), "INITSVTOR0_RST",
s->init_svtor, &error_abort);
object_property_set_int(OBJECT(&s->sysctl), "INITSVTOR1_RST",
s->init_svtor, &error_abort);
if (!sysbus_realize(SYS_BUS_DEVICE(&s->sysctl), &err)) {
error_propagate(errp, err);
return;
Expand Down Expand Up @@ -1007,7 +1005,7 @@ static void armsse_realize(DeviceState *dev, Error **errp)
}

/* This OR gate wires together outputs from the secure watchdogs to NMI */
object_property_set_int(OBJECT(&s->nmi_orgate), 2, "num-lines", &err);
object_property_set_int(OBJECT(&s->nmi_orgate), "num-lines", 2, &err);
if (err) {
error_propagate(errp, err);
return;
Expand Down Expand Up @@ -1051,7 +1049,7 @@ static void armsse_realize(DeviceState *dev, Error **errp)
for (i = 0; i < ARRAY_SIZE(s->ppc_irq_splitter); i++) {
Object *splitter = OBJECT(&s->ppc_irq_splitter[i]);

object_property_set_int(splitter, 2, "num-lines", &err);
object_property_set_int(splitter, "num-lines", 2, &err);
if (err) {
error_propagate(errp, err);
return;
Expand Down Expand Up @@ -1097,7 +1095,7 @@ static void armsse_realize(DeviceState *dev, Error **errp)
SplitIRQ *splitter = &s->mpc_irq_splitter[i];
DeviceState *dev_splitter = DEVICE(splitter);

object_property_set_int(OBJECT(splitter), 2, "num-lines", &err);
object_property_set_int(OBJECT(splitter), "num-lines", 2, &err);
if (err) {
error_propagate(errp, err);
return;
Expand Down
Loading

0 comments on commit 5325cc3

Please sign in to comment.