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

qom: Drop parameter @errp of object_property_add() & friends

Browse Source 
The only way object_property_add() can fail is when a property with
the same name already exists.  Since our property names are all
hardcoded, failure is a programming error, and the appropriate way to
handle it is passing &error_abort.

Same for its variants, except for object_property_add_child(), which
additionally fails when the child already has a parent.  Parentage is
also under program control, so this is a programming error, too.

We have a bit over 500 callers.  Almost half of them pass
&error_abort, slightly fewer ignore errors, one test case handles
errors, and the remaining few callers pass them to their own callers.

The previous few commits demonstrated once again that ignoring
programming errors is a bad idea.

Of the few ones that pass on errors, several violate the Error API.
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL.  Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call.  ich9_pm_add_properties(), sparc32_ledma_realize(),
sparc32_dma_realize(), xilinx_axidma_realize(), xilinx_enet_realize()
are wrong that way.

When the one appropriate choice of argument is &error_abort, letting
users pick the argument is a bad idea.

Drop parameter @errp and assert the preconditions instead.

There's one exception to "duplicate property name is a programming
error": the way object_property_add() implements the magic (and
undocumented) "automatic arrayification".  Don't drop @errp there.
Instead, rename object_property_add() to object_property_try_add(),
and add the obvious wrapper object_property_add().

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-15-armbru@redhat.com>
[Two semantic rebase conflicts resolved]
This commit is contained in:
Markus Armbruster 2020-05-05 17:29:22 +02:00
parent 9f742c28f5
commit d2623129a7
192 changed files with 650 additions and 994 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
accel/kvm/kvm-all.c
View File

@ -3111,13 +3111,13 @@ static void kvm_accel_class_init(ObjectClass *oc, void *data)
object_class_property_add(oc, "kernel-irqchip", "on|off|split", object_class_property_add(oc, "kernel-irqchip", "on|off|split",
NULL, kvm_set_kernel_irqchip, NULL, kvm_set_kernel_irqchip,
NULL, NULL, &error_abort); NULL, NULL);
object_class_property_set_description(oc, "kernel-irqchip", object_class_property_set_description(oc, "kernel-irqchip",
"Configure KVM in-kernel irqchip"); "Configure KVM in-kernel irqchip");
object_class_property_add(oc, "kvm-shadow-mem", "int", object_class_property_add(oc, "kvm-shadow-mem", "int",
kvm_get_kvm_shadow_mem, kvm_set_kvm_shadow_mem, kvm_get_kvm_shadow_mem, kvm_set_kvm_shadow_mem,
NULL, NULL, &error_abort); NULL, NULL);
object_class_property_set_description(oc, "kvm-shadow-mem", object_class_property_set_description(oc, "kvm-shadow-mem",
"KVM shadow MMU size"); "KVM shadow MMU size");
} }

5
accel/tcg/tcg-all.c
View File

@ -203,12 +203,11 @@ static void tcg_accel_class_init(ObjectClass *oc, void *data)
object_class_property_add_str(oc, "thread", object_class_property_add_str(oc, "thread",
tcg_get_thread, tcg_get_thread,
tcg_set_thread, tcg_set_thread);
NULL);
object_class_property_add(oc, "tb-size", "int", object_class_property_add(oc, "tb-size", "int",
tcg_get_tb_size, tcg_set_tb_size, tcg_get_tb_size, tcg_set_tb_size,
NULL, NULL, &error_abort); NULL, NULL);
object_class_property_set_description(oc, "tb-size", object_class_property_set_description(oc, "tb-size",
"TCG translation block cache size"); "TCG translation block cache size");

5
authz/list.c
View File

@ -124,13 +124,12 @@ qauthz_list_class_init(ObjectClass *oc, void *data)
"QAuthZListPolicy", "QAuthZListPolicy",
&QAuthZListPolicy_lookup, &QAuthZListPolicy_lookup,
qauthz_list_prop_get_policy, qauthz_list_prop_get_policy,
qauthz_list_prop_set_policy, qauthz_list_prop_set_policy);
NULL);
object_class_property_add(oc, "rules", "QAuthZListRule", object_class_property_add(oc, "rules", "QAuthZListRule",
qauthz_list_prop_get_rules, qauthz_list_prop_get_rules,
qauthz_list_prop_set_rules, qauthz_list_prop_set_rules,
NULL, NULL, NULL); NULL, NULL);
authz->is_allowed = qauthz_list_is_allowed; authz->is_allowed = qauthz_list_is_allowed;
} }

6
authz/listfile.c
View File

@ -221,12 +221,10 @@ qauthz_list_file_class_init(ObjectClass *oc, void *data)
object_class_property_add_str(oc, "filename", object_class_property_add_str(oc, "filename",
qauthz_list_file_prop_get_filename, qauthz_list_file_prop_get_filename,
qauthz_list_file_prop_set_filename, qauthz_list_file_prop_set_filename);
NULL);
object_class_property_add_bool(oc, "refresh", object_class_property_add_bool(oc, "refresh",
qauthz_list_file_prop_get_refresh, qauthz_list_file_prop_get_refresh,
qauthz_list_file_prop_set_refresh, qauthz_list_file_prop_set_refresh);
NULL);
authz->is_allowed = qauthz_list_file_is_allowed; authz->is_allowed = qauthz_list_file_is_allowed;
} }

3
authz/pamacct.c
View File

@ -107,8 +107,7 @@ qauthz_pam_class_init(ObjectClass *oc, void *data)
object_class_property_add_str(oc, "service", object_class_property_add_str(oc, "service",
qauthz_pam_prop_get_service, qauthz_pam_prop_get_service,
qauthz_pam_prop_set_service, qauthz_pam_prop_set_service);
NULL);
} }

3
authz/simple.c
View File

@ -74,8 +74,7 @@ qauthz_simple_class_init(ObjectClass *oc, void *data)
object_class_property_add_str(oc, "identity", object_class_property_add_str(oc, "identity",
qauthz_simple_prop_get_identity, qauthz_simple_prop_get_identity,
qauthz_simple_prop_set_identity, qauthz_simple_prop_set_identity);
NULL);
} }

3
backends/cryptodev-vhost-user.c
View File

@ -340,8 +340,7 @@ static void cryptodev_vhost_user_instance_int(Object *obj)
{ {
object_property_add_str(obj, "chardev", object_property_add_str(obj, "chardev",
cryptodev_vhost_user_get_chardev, cryptodev_vhost_user_get_chardev,
cryptodev_vhost_user_set_chardev, cryptodev_vhost_user_set_chardev);
NULL);
} }
static void cryptodev_vhost_user_finalize(Object *obj) static void cryptodev_vhost_user_finalize(Object *obj)

2
backends/cryptodev.c
View File

@ -213,7 +213,7 @@ static void cryptodev_backend_instance_init(Object *obj)
object_property_add(obj, "queues", "uint32", object_property_add(obj, "queues", "uint32",
cryptodev_backend_get_queues, cryptodev_backend_get_queues,
cryptodev_backend_set_queues, cryptodev_backend_set_queues,
NULL, NULL, NULL); NULL, NULL);
/* Initialize devices' queues property to 1 */ /* Initialize devices' queues property to 1 */
object_property_set_int(obj, 1, "queues", NULL); object_property_set_int(obj, 1, "queues", NULL);
} }

6
backends/dbus-vmstate.c
View File

@ -481,11 +481,9 @@ dbus_vmstate_class_init(ObjectClass *oc, void *data)
vc->get_id = dbus_vmstate_get_id; vc->get_id = dbus_vmstate_get_id;
object_class_property_add_str(oc, "addr", object_class_property_add_str(oc, "addr",
get_dbus_addr, set_dbus_addr, get_dbus_addr, set_dbus_addr);
&error_abort);
object_class_property_add_str(oc, "id-list", object_class_property_add_str(oc, "id-list",
get_id_list, set_id_list, get_id_list, set_id_list);
&error_abort);
} }
static const TypeInfo dbus_vmstate_info = { static const TypeInfo dbus_vmstate_info = {

11
backends/hostmem-file.c
View File

@ -184,18 +184,15 @@ file_backend_class_init(ObjectClass *oc, void *data)
oc->unparent = file_backend_unparent; oc->unparent = file_backend_unparent;
object_class_property_add_bool(oc, "discard-data", object_class_property_add_bool(oc, "discard-data",
file_memory_backend_get_discard_data, file_memory_backend_set_discard_data, file_memory_backend_get_discard_data, file_memory_backend_set_discard_data);
&error_abort);
object_class_property_add_str(oc, "mem-path", object_class_property_add_str(oc, "mem-path",
get_mem_path, set_mem_path, get_mem_path, set_mem_path);
&error_abort);
object_class_property_add(oc, "align", "int", object_class_property_add(oc, "align", "int",
file_memory_backend_get_align, file_memory_backend_get_align,
file_memory_backend_set_align, file_memory_backend_set_align,
NULL, NULL, &error_abort); NULL, NULL);
object_class_property_add_bool(oc, "pmem", object_class_property_add_bool(oc, "pmem",
file_memory_backend_get_pmem, file_memory_backend_set_pmem, file_memory_backend_get_pmem, file_memory_backend_set_pmem);
&error_abort);
} }
static void file_backend_instance_finalize(Object *o) static void file_backend_instance_finalize(Object *o)

8
backends/hostmem-memfd.c
View File

@ -141,21 +141,19 @@ memfd_backend_class_init(ObjectClass *oc, void *data)
if (qemu_memfd_check(MFD_HUGETLB)) { if (qemu_memfd_check(MFD_HUGETLB)) {
object_class_property_add_bool(oc, "hugetlb", object_class_property_add_bool(oc, "hugetlb",
memfd_backend_get_hugetlb, memfd_backend_get_hugetlb,
memfd_backend_set_hugetlb, memfd_backend_set_hugetlb);
&error_abort);
object_class_property_set_description(oc, "hugetlb", object_class_property_set_description(oc, "hugetlb",
"Use huge pages"); "Use huge pages");
object_class_property_add(oc, "hugetlbsize", "int", object_class_property_add(oc, "hugetlbsize", "int",
memfd_backend_get_hugetlbsize, memfd_backend_get_hugetlbsize,
memfd_backend_set_hugetlbsize, memfd_backend_set_hugetlbsize,
NULL, NULL, &error_abort); NULL, NULL);
object_class_property_set_description(oc, "hugetlbsize", object_class_property_set_description(oc, "hugetlbsize",
"Huge pages size (ex: 2M, 1G)"); "Huge pages size (ex: 2M, 1G)");
} }
object_class_property_add_bool(oc, "seal", object_class_property_add_bool(oc, "seal",
memfd_backend_get_seal, memfd_backend_get_seal,
memfd_backend_set_seal, memfd_backend_set_seal);
&error_abort);
object_class_property_set_description(oc, "seal", object_class_property_set_description(oc, "seal",
"Seal growing & shrinking"); "Seal growing & shrinking");
} }

19
backends/hostmem.c
View File

@ -463,51 +463,50 @@ host_memory_backend_class_init(ObjectClass *oc, void *data)
object_class_property_add_bool(oc, "merge", object_class_property_add_bool(oc, "merge",
host_memory_backend_get_merge, host_memory_backend_get_merge,
host_memory_backend_set_merge, &error_abort); host_memory_backend_set_merge);
object_class_property_set_description(oc, "merge", object_class_property_set_description(oc, "merge",
"Mark memory as mergeable"); "Mark memory as mergeable");
object_class_property_add_bool(oc, "dump", object_class_property_add_bool(oc, "dump",
host_memory_backend_get_dump, host_memory_backend_get_dump,
host_memory_backend_set_dump, &error_abort); host_memory_backend_set_dump);
object_class_property_set_description(oc, "dump", object_class_property_set_description(oc, "dump",
"Set to 'off' to exclude from core dump"); "Set to 'off' to exclude from core dump");
object_class_property_add_bool(oc, "prealloc", object_class_property_add_bool(oc, "prealloc",
host_memory_backend_get_prealloc, host_memory_backend_get_prealloc,
host_memory_backend_set_prealloc, &error_abort); host_memory_backend_set_prealloc);
object_class_property_set_description(oc, "prealloc", object_class_property_set_description(oc, "prealloc",
"Preallocate memory"); "Preallocate memory");
object_class_property_add(oc, "prealloc-threads", "int", object_class_property_add(oc, "prealloc-threads", "int",
host_memory_backend_get_prealloc_threads, host_memory_backend_get_prealloc_threads,
host_memory_backend_set_prealloc_threads, host_memory_backend_set_prealloc_threads,
NULL, NULL, &error_abort); NULL, NULL);
object_class_property_set_description(oc, "prealloc-threads", object_class_property_set_description(oc, "prealloc-threads",
"Number of CPU threads to use for prealloc"); "Number of CPU threads to use for prealloc");
object_class_property_add(oc, "size", "int", object_class_property_add(oc, "size", "int",
host_memory_backend_get_size, host_memory_backend_get_size,
host_memory_backend_set_size, host_memory_backend_set_size,
NULL, NULL, &error_abort); NULL, NULL);
object_class_property_set_description(oc, "size", object_class_property_set_description(oc, "size",
"Size of the memory region (ex: 500M)"); "Size of the memory region (ex: 500M)");
object_class_property_add(oc, "host-nodes", "int", object_class_property_add(oc, "host-nodes", "int",
host_memory_backend_get_host_nodes, host_memory_backend_get_host_nodes,
host_memory_backend_set_host_nodes, host_memory_backend_set_host_nodes,
NULL, NULL, &error_abort); NULL, NULL);
object_class_property_set_description(oc, "host-nodes", object_class_property_set_description(oc, "host-nodes",
"Binds memory to the list of NUMA host nodes"); "Binds memory to the list of NUMA host nodes");
object_class_property_add_enum(oc, "policy", "HostMemPolicy", object_class_property_add_enum(oc, "policy", "HostMemPolicy",
&HostMemPolicy_lookup, &HostMemPolicy_lookup,
host_memory_backend_get_policy, host_memory_backend_get_policy,
host_memory_backend_set_policy, &error_abort); host_memory_backend_set_policy);
object_class_property_set_description(oc, "policy", object_class_property_set_description(oc, "policy",
"Set the NUMA policy"); "Set the NUMA policy");
object_class_property_add_bool(oc, "share", object_class_property_add_bool(oc, "share",
host_memory_backend_get_share, host_memory_backend_set_share, host_memory_backend_get_share, host_memory_backend_set_share);
&error_abort);
object_class_property_set_description(oc, "share", object_class_property_set_description(oc, "share",
"Mark the memory as private to QEMU or shared"); "Mark the memory as private to QEMU or shared");
object_class_property_add_bool(oc, "x-use-canonical-path-for-ramblock-id", object_class_property_add_bool(oc, "x-use-canonical-path-for-ramblock-id",
host_memory_backend_get_use_canonical_path, host_memory_backend_get_use_canonical_path,
host_memory_backend_set_use_canonical_path, &error_abort); host_memory_backend_set_use_canonical_path);
} }
static const TypeInfo host_memory_backend_info = { static const TypeInfo host_memory_backend_info = {

3
backends/rng-egd.c
View File

@ -138,8 +138,7 @@ static char *rng_egd_get_chardev(Object *obj, Error **errp)
static void rng_egd_init(Object *obj) static void rng_egd_init(Object *obj)
{ {
object_property_add_str(obj, "chardev", object_property_add_str(obj, "chardev",
rng_egd_get_chardev, rng_egd_set_chardev, rng_egd_get_chardev, rng_egd_set_chardev);
NULL);
} }
static void rng_egd_finalize(Object *obj) static void rng_egd_finalize(Object *obj)

3
backends/rng-random.c
View File

@ -110,8 +110,7 @@ static void rng_random_init(Object *obj)
object_property_add_str(obj, "filename", object_property_add_str(obj, "filename",
rng_random_get_filename, rng_random_get_filename,
rng_random_set_filename, rng_random_set_filename);
NULL);
s->filename = g_strdup("/dev/urandom"); s->filename = g_strdup("/dev/urandom");
s->fd = -1; s->fd = -1;

3
backends/rng.c
View File

@ -108,8 +108,7 @@ static void rng_backend_init(Object *obj)
object_property_add_bool(obj, "opened", object_property_add_bool(obj, "opened",
rng_backend_prop_get_opened, rng_backend_prop_get_opened,
rng_backend_prop_set_opened, rng_backend_prop_set_opened);
NULL);
} }
static void rng_backend_finalize(Object *obj) static void rng_backend_finalize(Object *obj)

2
backends/vhost-user.c
View File

@ -177,7 +177,7 @@ static char *get_chardev(Object *obj, Error **errp)
static void vhost_user_backend_init(Object *obj) static void vhost_user_backend_init(Object *obj)
{ {
object_property_add_str(obj, "chardev", get_chardev, set_chardev, NULL); object_property_add_str(obj, "chardev", get_chardev, set_chardev);
} }
static void vhost_user_backend_finalize(Object *obj) static void vhost_user_backend_finalize(Object *obj)

6
block/throttle-groups.c
View File

@ -954,8 +954,7 @@ static void throttle_group_obj_class_init(ObjectClass *klass, void *class_data)
"int", "int",
throttle_group_get, throttle_group_get,
throttle_group_set, throttle_group_set,
NULL, &properties[i], NULL, &properties[i]);
&error_abort);
} }
/* ThrottleLimits */ /* ThrottleLimits */
@ -963,8 +962,7 @@ static void throttle_group_obj_class_init(ObjectClass *klass, void *class_data)
"limits", "ThrottleLimits", "limits", "ThrottleLimits",
throttle_group_get_limits, throttle_group_get_limits,
throttle_group_set_limits, throttle_group_set_limits,
NULL, NULL, NULL, NULL);
&error_abort);
} }
static const TypeInfo throttle_group_info = { static const TypeInfo throttle_group_info = {

8
bootdevice.c
View File

@ -329,7 +329,6 @@ void device_add_bootindex_property(Object *obj, int32_t *bootindex,
const char *name, const char *suffix, const char *name, const char *suffix,
DeviceState *dev, Error **errp) DeviceState *dev, Error **errp)
{ {
Error *local_err = NULL;
BootIndexProperty *prop = g_malloc0(sizeof(*prop)); BootIndexProperty *prop = g_malloc0(sizeof(*prop));
prop->bootindex = bootindex; prop->bootindex = bootindex;
@ -340,13 +339,8 @@ void device_add_bootindex_property(Object *obj, int32_t *bootindex,
device_get_bootindex, device_get_bootindex,
device_set_bootindex, device_set_bootindex,
property_release_bootindex, property_release_bootindex,
prop, &local_err); prop);
if (local_err) {
error_propagate(errp, local_err);
g_free(prop);
return;
}
/* initialize devices' bootindex property to -1 */ /* initialize devices' bootindex property to -1 */
object_property_set_int(obj, -1, name, NULL); object_property_set_int(obj, -1, name, NULL);
} }

4
chardev/char-socket.c
View File

@ -1489,10 +1489,10 @@ static void char_socket_class_init(ObjectClass *oc, void *data)
object_class_property_add(oc, "addr", "SocketAddress", object_class_property_add(oc, "addr", "SocketAddress",
char_socket_get_addr, NULL, char_socket_get_addr, NULL,
NULL, NULL, &error_abort); NULL, NULL);
object_class_property_add_bool(oc, "connected", char_socket_get_connected, object_class_property_add_bool(oc, "connected", char_socket_get_connected,
NULL, &error_abort); NULL);
} }
static const TypeInfo char_socket_type_info = { static const TypeInfo char_socket_type_info = {

7
chardev/char.c
View File

@ -986,10 +986,7 @@ static Chardev *chardev_new(const char *id, const char *typename,
} }
if (id) { if (id) {
object_property_add_child(get_chardevs_root(), id, obj, &local_err); object_property_add_child(get_chardevs_root(), id, obj);
if (local_err) {
goto end;
}
object_unref(obj); object_unref(obj);
} }
@ -1116,7 +1113,7 @@ ChardevReturn *qmp_chardev_change(const char *id, ChardevBackend *backend,
object_unparent(OBJECT(chr)); object_unparent(OBJECT(chr));
object_property_add_child(get_chardevs_root(), chr_new->label, object_property_add_child(get_chardevs_root(), chr_new->label,
OBJECT(chr_new), &error_abort); OBJECT(chr_new));
object_unref(OBJECT(chr_new)); object_unref(OBJECT(chr_new));
ret = g_new0(ChardevReturn, 1); ret = g_new0(ChardevReturn, 1);

18
crypto/secret.c
View File

@ -369,30 +369,24 @@ qcrypto_secret_class_init(ObjectClass *oc, void *data)
object_class_property_add_bool(oc, "loaded", object_class_property_add_bool(oc, "loaded",
qcrypto_secret_prop_get_loaded, qcrypto_secret_prop_get_loaded,
qcrypto_secret_prop_set_loaded, qcrypto_secret_prop_set_loaded);
NULL);
object_class_property_add_enum(oc, "format", object_class_property_add_enum(oc, "format",
"QCryptoSecretFormat", "QCryptoSecretFormat",
&QCryptoSecretFormat_lookup, &QCryptoSecretFormat_lookup,
qcrypto_secret_prop_get_format, qcrypto_secret_prop_get_format,
qcrypto_secret_prop_set_format, qcrypto_secret_prop_set_format);
NULL);
object_class_property_add_str(oc, "data", object_class_property_add_str(oc, "data",
qcrypto_secret_prop_get_data, qcrypto_secret_prop_get_data,
qcrypto_secret_prop_set_data, qcrypto_secret_prop_set_data);
NULL);
object_class_property_add_str(oc, "file", object_class_property_add_str(oc, "file",
qcrypto_secret_prop_get_file, qcrypto_secret_prop_get_file,
qcrypto_secret_prop_set_file, qcrypto_secret_prop_set_file);
NULL);
object_class_property_add_str(oc, "keyid", object_class_property_add_str(oc, "keyid",
qcrypto_secret_prop_get_keyid, qcrypto_secret_prop_get_keyid,
qcrypto_secret_prop_set_keyid, qcrypto_secret_prop_set_keyid);
NULL);
object_class_property_add_str(oc, "iv", object_class_property_add_str(oc, "iv",
qcrypto_secret_prop_get_iv, qcrypto_secret_prop_get_iv,
qcrypto_secret_prop_set_iv, qcrypto_secret_prop_set_iv);
NULL);
} }

12
crypto/tlscreds.c
View File

@ -226,22 +226,18 @@ qcrypto_tls_creds_class_init(ObjectClass *oc, void *data)
{ {
object_class_property_add_bool(oc, "verify-peer", object_class_property_add_bool(oc, "verify-peer",
qcrypto_tls_creds_prop_get_verify, qcrypto_tls_creds_prop_get_verify,
qcrypto_tls_creds_prop_set_verify, qcrypto_tls_creds_prop_set_verify);
NULL);
object_class_property_add_str(oc, "dir", object_class_property_add_str(oc, "dir",
qcrypto_tls_creds_prop_get_dir, qcrypto_tls_creds_prop_get_dir,
qcrypto_tls_creds_prop_set_dir, qcrypto_tls_creds_prop_set_dir);
NULL);
object_class_property_add_enum(oc, "endpoint", object_class_property_add_enum(oc, "endpoint",
"QCryptoTLSCredsEndpoint", "QCryptoTLSCredsEndpoint",
&QCryptoTLSCredsEndpoint_lookup, &QCryptoTLSCredsEndpoint_lookup,
qcrypto_tls_creds_prop_get_endpoint, qcrypto_tls_creds_prop_get_endpoint,
qcrypto_tls_creds_prop_set_endpoint, qcrypto_tls_creds_prop_set_endpoint);
NULL);
object_class_property_add_str(oc, "priority", object_class_property_add_str(oc, "priority",
qcrypto_tls_creds_prop_get_priority, qcrypto_tls_creds_prop_get_priority,
qcrypto_tls_creds_prop_set_priority, qcrypto_tls_creds_prop_set_priority);
NULL);
} }

3
crypto/tlscredsanon.c
View File

@ -187,8 +187,7 @@ qcrypto_tls_creds_anon_class_init(ObjectClass *oc, void *data)
object_class_property_add_bool(oc, "loaded", object_class_property_add_bool(oc, "loaded",
qcrypto_tls_creds_anon_prop_get_loaded, qcrypto_tls_creds_anon_prop_get_loaded,
qcrypto_tls_creds_anon_prop_set_loaded, qcrypto_tls_creds_anon_prop_set_loaded);
NULL);
} }

6
crypto/tlscredspsk.c
View File

@ -275,12 +275,10 @@ qcrypto_tls_creds_psk_class_init(ObjectClass *oc, void *data)
object_class_property_add_bool(oc, "loaded", object_class_property_add_bool(oc, "loaded",
qcrypto_tls_creds_psk_prop_get_loaded, qcrypto_tls_creds_psk_prop_get_loaded,
qcrypto_tls_creds_psk_prop_set_loaded, qcrypto_tls_creds_psk_prop_set_loaded);
NULL);
object_class_property_add_str(oc, "username", object_class_property_add_str(oc, "username",
qcrypto_tls_creds_psk_prop_get_username, qcrypto_tls_creds_psk_prop_get_username,
qcrypto_tls_creds_psk_prop_set_username, qcrypto_tls_creds_psk_prop_set_username);
NULL);
} }

9
crypto/tlscredsx509.c
View File

@ -806,16 +806,13 @@ qcrypto_tls_creds_x509_class_init(ObjectClass *oc, void *data)
object_class_property_add_bool(oc, "loaded", object_class_property_add_bool(oc, "loaded",
qcrypto_tls_creds_x509_prop_get_loaded, qcrypto_tls_creds_x509_prop_get_loaded,
qcrypto_tls_creds_x509_prop_set_loaded, qcrypto_tls_creds_x509_prop_set_loaded);
NULL);
object_class_property_add_bool(oc, "sanity-check", object_class_property_add_bool(oc, "sanity-check",
qcrypto_tls_creds_x509_prop_get_sanity, qcrypto_tls_creds_x509_prop_get_sanity,
qcrypto_tls_creds_x509_prop_set_sanity, qcrypto_tls_creds_x509_prop_set_sanity);
NULL);
object_class_property_add_str(oc, "passwordid", object_class_property_add_str(oc, "passwordid",
qcrypto_tls_creds_x509_prop_get_passwordid, qcrypto_tls_creds_x509_prop_get_passwordid,
qcrypto_tls_creds_x509_prop_set_passwordid, qcrypto_tls_creds_x509_prop_set_passwordid);
NULL);
} }

23
hw/acpi/ich9.c
View File

@ -379,32 +379,27 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp)
pm->s4_val = 2; pm->s4_val = 2;
object_property_add_uint32_ptr(obj, ACPI_PM_PROP_PM_IO_BASE, object_property_add_uint32_ptr(obj, ACPI_PM_PROP_PM_IO_BASE,
&pm->pm_io_base, OBJ_PROP_FLAG_READ, errp); &pm->pm_io_base, OBJ_PROP_FLAG_READ);
object_property_add(obj, ACPI_PM_PROP_GPE0_BLK, "uint32", object_property_add(obj, ACPI_PM_PROP_GPE0_BLK, "uint32",
ich9_pm_get_gpe0_blk, ich9_pm_get_gpe0_blk,
NULL, NULL, pm, NULL); NULL, NULL, pm);
object_property_add_uint32_ptr(obj, ACPI_PM_PROP_GPE0_BLK_LEN, object_property_add_uint32_ptr(obj, ACPI_PM_PROP_GPE0_BLK_LEN,
&gpe0_len, OBJ_PROP_FLAG_READ, errp); &gpe0_len, OBJ_PROP_FLAG_READ);
object_property_add_bool(obj, "memory-hotplug-support", object_property_add_bool(obj, "memory-hotplug-support",
ich9_pm_get_memory_hotplug_support, ich9_pm_get_memory_hotplug_support,
ich9_pm_set_memory_hotplug_support, ich9_pm_set_memory_hotplug_support);
NULL);
object_property_add_bool(obj, "cpu-hotplug-legacy", object_property_add_bool(obj, "cpu-hotplug-legacy",
ich9_pm_get_cpu_hotplug_legacy, ich9_pm_get_cpu_hotplug_legacy,
ich9_pm_set_cpu_hotplug_legacy, ich9_pm_set_cpu_hotplug_legacy);
NULL);
object_property_add_uint8_ptr(obj, ACPI_PM_PROP_S3_DISABLED, object_property_add_uint8_ptr(obj, ACPI_PM_PROP_S3_DISABLED,
&pm->disable_s3, OBJ_PROP_FLAG_READWRITE, &pm->disable_s3, OBJ_PROP_FLAG_READWRITE);
NULL);
object_property_add_uint8_ptr(obj, ACPI_PM_PROP_S4_DISABLED, object_property_add_uint8_ptr(obj, ACPI_PM_PROP_S4_DISABLED,
&pm->disable_s4, OBJ_PROP_FLAG_READWRITE, &pm->disable_s4, OBJ_PROP_FLAG_READWRITE);
NULL);
object_property_add_uint8_ptr(obj, ACPI_PM_PROP_S4_VAL, object_property_add_uint8_ptr(obj, ACPI_PM_PROP_S4_VAL,
&pm->s4_val, OBJ_PROP_FLAG_READWRITE, NULL); &pm->s4_val, OBJ_PROP_FLAG_READWRITE);
object_property_add_bool(obj, ACPI_PM_PROP_TCO_ENABLED, object_property_add_bool(obj, ACPI_PM_PROP_TCO_ENABLED,
ich9_pm_get_enable_tco, ich9_pm_get_enable_tco,
ich9_pm_set_enable_tco, ich9_pm_set_enable_tco);
NULL);
} }
void ich9_pm_device_pre_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, void ich9_pm_device_pre_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,

7
hw/acpi/pcihp.c
View File

@ -80,8 +80,7 @@ static void *acpi_set_bsel(PCIBus *bus, void *opaque)
*bus_bsel = (*bsel_alloc)++; *bus_bsel = (*bsel_alloc)++;
object_property_add_uint32_ptr(OBJECT(bus), ACPI_PCIHP_PROP_BSEL, object_property_add_uint32_ptr(OBJECT(bus), ACPI_PCIHP_PROP_BSEL,
bus_bsel, OBJ_PROP_FLAG_READ, bus_bsel, OBJ_PROP_FLAG_READ);
&error_abort);
} }
return bsel_alloc; return bsel_alloc;
@ -374,9 +373,9 @@ void acpi_pcihp_init(Object *owner, AcpiPciHpState *s, PCIBus *root_bus,
memory_region_add_subregion(address_space_io, s->io_base, &s->io); memory_region_add_subregion(address_space_io, s->io_base, &s->io);
object_property_add_uint16_ptr(owner, ACPI_PCIHP_IO_BASE_PROP, &s->io_base, object_property_add_uint16_ptr(owner, ACPI_PCIHP_IO_BASE_PROP, &s->io_base,
OBJ_PROP_FLAG_READ, &error_abort); OBJ_PROP_FLAG_READ);
object_property_add_uint16_ptr(owner, ACPI_PCIHP_IO_LEN_PROP, &s->io_len, object_property_add_uint16_ptr(owner, ACPI_PCIHP_IO_LEN_PROP, &s->io_len,
OBJ_PROP_FLAG_READ, &error_abort); OBJ_PROP_FLAG_READ);
} }
const VMStateDescription vmstate_acpi_pcihp_pci_status = { const VMStateDescription vmstate_acpi_pcihp_pci_status = {

15
hw/acpi/piix4.c
View File

@ -444,17 +444,17 @@ static void piix4_pm_add_propeties(PIIX4PMState *s)
static const uint16_t sci_int = 9; static const uint16_t sci_int = 9;
object_property_add_uint8_ptr(OBJECT(s), ACPI_PM_PROP_ACPI_ENABLE_CMD, object_property_add_uint8_ptr(OBJECT(s), ACPI_PM_PROP_ACPI_ENABLE_CMD,
&acpi_enable_cmd, OBJ_PROP_FLAG_READ, NULL); &acpi_enable_cmd, OBJ_PROP_FLAG_READ);
object_property_add_uint8_ptr(OBJECT(s), ACPI_PM_PROP_ACPI_DISABLE_CMD, object_property_add_uint8_ptr(OBJECT(s), ACPI_PM_PROP_ACPI_DISABLE_CMD,
&acpi_disable_cmd, OBJ_PROP_FLAG_READ, NULL); &acpi_disable_cmd, OBJ_PROP_FLAG_READ);
object_property_add_uint32_ptr(OBJECT(s), ACPI_PM_PROP_GPE0_BLK, object_property_add_uint32_ptr(OBJECT(s), ACPI_PM_PROP_GPE0_BLK,
&gpe0_blk, OBJ_PROP_FLAG_READ, NULL); &gpe0_blk, OBJ_PROP_FLAG_READ);
object_property_add_uint32_ptr(OBJECT(s), ACPI_PM_PROP_GPE0_BLK_LEN, object_property_add_uint32_ptr(OBJECT(s), ACPI_PM_PROP_GPE0_BLK_LEN,
&gpe0_blk_len, OBJ_PROP_FLAG_READ, NULL); &gpe0_blk_len, OBJ_PROP_FLAG_READ);
object_property_add_uint16_ptr(OBJECT(s), ACPI_PM_PROP_SCI_INT, object_property_add_uint16_ptr(OBJECT(s), ACPI_PM_PROP_SCI_INT,
&sci_int, OBJ_PROP_FLAG_READ, NULL); &sci_int, OBJ_PROP_FLAG_READ);
object_property_add_uint32_ptr(OBJECT(s), ACPI_PM_PROP_PM_IO_BASE, object_property_add_uint32_ptr(OBJECT(s), ACPI_PM_PROP_PM_IO_BASE,
&s->io_base, OBJ_PROP_FLAG_READ, NULL); &s->io_base, OBJ_PROP_FLAG_READ);
} }
static void piix4_pm_realize(PCIDevice *dev, Error **errp) static void piix4_pm_realize(PCIDevice *dev, Error **errp)
@ -598,8 +598,7 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion *parent,
s->cpu_hotplug_legacy = true; s->cpu_hotplug_legacy = true;
object_property_add_bool(OBJECT(s), "cpu-hotplug-legacy", object_property_add_bool(OBJECT(s), "cpu-hotplug-legacy",
piix4_get_cpu_hotplug_legacy, piix4_get_cpu_hotplug_legacy,
piix4_set_cpu_hotplug_legacy, piix4_set_cpu_hotplug_legacy);
NULL);
legacy_acpi_cpu_hotplug_init(parent, OBJECT(s), &s->gpe_cpu, legacy_acpi_cpu_hotplug_init(parent, OBJECT(s), &s->gpe_cpu,
PIIX4_CPU_HOTPLUG_IO_BASE); PIIX4_CPU_HOTPLUG_IO_BASE);

2
hw/arm/allwinner-a10.c
View File

@ -178,7 +178,7 @@ static void aw_a10_realize(DeviceState *dev, Error **errp)
sysbus_mmio_map(SYS_BUS_DEVICE(&s->mmc0), 0, AW_A10_MMC0_BASE); sysbus_mmio_map(SYS_BUS_DEVICE(&s->mmc0), 0, AW_A10_MMC0_BASE);
sysbus_connect_irq(SYS_BUS_DEVICE(&s->mmc0), 0, qdev_get_gpio_in(dev, 32)); sysbus_connect_irq(SYS_BUS_DEVICE(&s->mmc0), 0, qdev_get_gpio_in(dev, 32));
object_property_add_alias(OBJECT(s), "sd-bus", OBJECT(&s->mmc0), object_property_add_alias(OBJECT(s), "sd-bus", OBJECT(&s->mmc0),
"sd-bus", &error_abort); "sd-bus");
/* RTC */ /* RTC */
qdev_init_nofail(DEVICE(&s->rtc)); qdev_init_nofail(DEVICE(&s->rtc));

12
hw/arm/allwinner-h3.c
View File

@ -205,9 +205,9 @@ static void allwinner_h3_init(Object *obj)
sysbus_init_child_obj(obj, "timer", &s->timer, sizeof(s->timer), sysbus_init_child_obj(obj, "timer", &s->timer, sizeof(s->timer),
TYPE_AW_A10_PIT); TYPE_AW_A10_PIT);
object_property_add_alias(obj, "clk0-freq", OBJECT(&s->timer), object_property_add_alias(obj, "clk0-freq", OBJECT(&s->timer),
"clk0-freq", &error_abort); "clk0-freq");
object_property_add_alias(obj, "clk1-freq", OBJECT(&s->timer), object_property_add_alias(obj, "clk1-freq", OBJECT(&s->timer),
"clk1-freq", &error_abort); "clk1-freq");
sysbus_init_child_obj(obj, "ccu", &s->ccu, sizeof(s->ccu), sysbus_init_child_obj(obj, "ccu", &s->ccu, sizeof(s->ccu),
TYPE_AW_H3_CCU); TYPE_AW_H3_CCU);
@ -221,7 +221,7 @@ static void allwinner_h3_init(Object *obj)
sysbus_init_child_obj(obj, "sid", &s->sid, sizeof(s->sid), sysbus_init_child_obj(obj, "sid", &s->sid, sizeof(s->sid),
TYPE_AW_SID); TYPE_AW_SID);
object_property_add_alias(obj, "identifier", OBJECT(&s->sid), object_property_add_alias(obj, "identifier", OBJECT(&s->sid),
"identifier", &error_abort); "identifier");
sysbus_init_child_obj(obj, "mmc0", &s->mmc0, sizeof(s->mmc0), sysbus_init_child_obj(obj, "mmc0", &s->mmc0, sizeof(s->mmc0),
TYPE_AW_SDHOST_SUN5I); TYPE_AW_SDHOST_SUN5I);
@ -232,9 +232,9 @@ static void allwinner_h3_init(Object *obj)
sysbus_init_child_obj(obj, "dramc", &s->dramc, sizeof(s->dramc), sysbus_init_child_obj(obj, "dramc", &s->dramc, sizeof(s->dramc),
TYPE_AW_H3_DRAMC); TYPE_AW_H3_DRAMC);
object_property_add_alias(obj, "ram-addr", OBJECT(&s->dramc), object_property_add_alias(obj, "ram-addr", OBJECT(&s->dramc),
"ram-addr", &error_abort); "ram-addr");
object_property_add_alias(obj, "ram-size", OBJECT(&s->dramc), object_property_add_alias(obj, "ram-size", OBJECT(&s->dramc),
"ram-size", &error_abort); "ram-size");
sysbus_init_child_obj(obj, "rtc", &s->rtc, sizeof(s->rtc), sysbus_init_child_obj(obj, "rtc", &s->rtc, sizeof(s->rtc),
TYPE_AW_RTC_SUN6I); TYPE_AW_RTC_SUN6I);
@ -366,7 +366,7 @@ static void allwinner_h3_realize(DeviceState *dev, Error **errp)
qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_MMC0)); qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_MMC0));
object_property_add_alias(OBJECT(s), "sd-bus", OBJECT(&s->mmc0), object_property_add_alias(OBJECT(s), "sd-bus", OBJECT(&s->mmc0),
"sd-bus", &error_abort); "sd-bus");
/* EMAC */ /* EMAC */
if (nd_table[0].used) { if (nd_table[0].used) {

2
hw/arm/armv7m.c
View File

@ -138,7 +138,7 @@ static void armv7m_instance_init(Object *obj)
sysbus_init_child_obj(obj, "nvnic", &s->nvic, sizeof(s->nvic), TYPE_NVIC); sysbus_init_child_obj(obj, "nvnic", &s->nvic, sizeof(s->nvic), TYPE_NVIC);
object_property_add_alias(obj, "num-irq", object_property_add_alias(obj, "num-irq",
OBJECT(&s->nvic), "num-irq", &error_abort); OBJECT(&s->nvic), "num-irq");
for (i = 0; i < ARRAY_SIZE(s->bitband); i++) { for (i = 0; i < ARRAY_SIZE(s->bitband); i++) {
sysbus_init_child_obj(obj, "bitband[*]", &s->bitband[i], sysbus_init_child_obj(obj, "bitband[*]", &s->bitband[i],

2
hw/arm/aspeed.c
View File

@ -544,7 +544,7 @@ static void aspeed_machine_class_props_init(ObjectClass *oc)
{ {
object_class_property_add_bool(oc, "execute-in-place", object_class_property_add_bool(oc, "execute-in-place",
aspeed_get_mmio_exec, aspeed_get_mmio_exec,
aspeed_set_mmio_exec, &error_abort); aspeed_set_mmio_exec);
object_class_property_set_description(oc, "execute-in-place", object_class_property_set_description(oc, "execute-in-place",
"boot directly from CE0 flash device"); "boot directly from CE0 flash device");
} }

13
hw/arm/aspeed_ast2600.c
View File

@ -138,11 +138,11 @@ static void aspeed_soc_ast2600_init(Object *obj)
qdev_prop_set_uint32(DEVICE(&s->scu), "silicon-rev", qdev_prop_set_uint32(DEVICE(&s->scu), "silicon-rev",
sc->silicon_rev); sc->silicon_rev);
object_property_add_alias(obj, "hw-strap1", OBJECT(&s->scu), object_property_add_alias(obj, "hw-strap1", OBJECT(&s->scu),
"hw-strap1", &error_abort); "hw-strap1");
object_property_add_alias(obj, "hw-strap2", OBJECT(&s->scu), object_property_add_alias(obj, "hw-strap2", OBJECT(&s->scu),
"hw-strap2", &error_abort); "hw-strap2");
object_property_add_alias(obj, "hw-prot-key", OBJECT(&s->scu), object_property_add_alias(obj, "hw-prot-key", OBJECT(&s->scu),
"hw-prot-key", &error_abort); "hw-prot-key");
sysbus_init_child_obj(obj, "a7mpcore", &s->a7mpcore, sysbus_init_child_obj(obj, "a7mpcore", &s->a7mpcore,
sizeof(s->a7mpcore), TYPE_A15MPCORE_PRIV); sizeof(s->a7mpcore), TYPE_A15MPCORE_PRIV);
@ -161,8 +161,7 @@ static void aspeed_soc_ast2600_init(Object *obj)
snprintf(typename, sizeof(typename), "aspeed.fmc-%s", socname); snprintf(typename, sizeof(typename), "aspeed.fmc-%s", socname);
sysbus_init_child_obj(obj, "fmc", OBJECT(&s->fmc), sizeof(s->fmc), sysbus_init_child_obj(obj, "fmc", OBJECT(&s->fmc), sizeof(s->fmc),
typename); typename);
object_property_add_alias(obj, "num-cs", OBJECT(&s->fmc), "num-cs", object_property_add_alias(obj, "num-cs", OBJECT(&s->fmc), "num-cs");
&error_abort);
for (i = 0; i < sc->spis_num; i++) { for (i = 0; i < sc->spis_num; i++) {
snprintf(typename, sizeof(typename), "aspeed.spi%d-%s", i + 1, socname); snprintf(typename, sizeof(typename), "aspeed.spi%d-%s", i + 1, socname);
@ -179,9 +178,9 @@ static void aspeed_soc_ast2600_init(Object *obj)
sysbus_init_child_obj(obj, "sdmc", OBJECT(&s->sdmc), sizeof(s->sdmc), sysbus_init_child_obj(obj, "sdmc", OBJECT(&s->sdmc), sizeof(s->sdmc),
typename); typename);
object_property_add_alias(obj, "ram-size", OBJECT(&s->sdmc), object_property_add_alias(obj, "ram-size", OBJECT(&s->sdmc),
"ram-size", &error_abort); "ram-size");
object_property_add_alias(obj, "max-ram-size", OBJECT(&s->sdmc), object_property_add_alias(obj, "max-ram-size", OBJECT(&s->sdmc),
"max-ram-size", &error_abort); "max-ram-size");
for (i = 0; i < sc->wdts_num; i++) { for (i = 0; i < sc->wdts_num; i++) {
snprintf(typename, sizeof(typename), "aspeed.wdt-%s", socname); snprintf(typename, sizeof(typename), "aspeed.wdt-%s", socname);

13
hw/arm/aspeed_soc.c
View File

@ -153,11 +153,11 @@ static void aspeed_soc_init(Object *obj)
qdev_prop_set_uint32(DEVICE(&s->scu), "silicon-rev", qdev_prop_set_uint32(DEVICE(&s->scu), "silicon-rev",
sc->silicon_rev); sc->silicon_rev);
object_property_add_alias(obj, "hw-strap1", OBJECT(&s->scu), object_property_add_alias(obj, "hw-strap1", OBJECT(&s->scu),
"hw-strap1", &error_abort); "hw-strap1");
object_property_add_alias(obj, "hw-strap2", OBJECT(&s->scu), object_property_add_alias(obj, "hw-strap2", OBJECT(&s->scu),
"hw-strap2", &error_abort); "hw-strap2");
object_property_add_alias(obj, "hw-prot-key", OBJECT(&s->scu), object_property_add_alias(obj, "hw-prot-key", OBJECT(&s->scu),
"hw-prot-key", &error_abort); "hw-prot-key");
sysbus_init_child_obj(obj, "vic", OBJECT(&s->vic), sizeof(s->vic), sysbus_init_child_obj(obj, "vic", OBJECT(&s->vic), sizeof(s->vic),
TYPE_ASPEED_VIC); TYPE_ASPEED_VIC);
@ -176,8 +176,7 @@ static void aspeed_soc_init(Object *obj)
snprintf(typename, sizeof(typename), "aspeed.fmc-%s", socname); snprintf(typename, sizeof(typename), "aspeed.fmc-%s", socname);
sysbus_init_child_obj(obj, "fmc", OBJECT(&s->fmc), sizeof(s->fmc), sysbus_init_child_obj(obj, "fmc", OBJECT(&s->fmc), sizeof(s->fmc),
typename); typename);
object_property_add_alias(obj, "num-cs", OBJECT(&s->fmc), "num-cs", object_property_add_alias(obj, "num-cs", OBJECT(&s->fmc), "num-cs");
&error_abort);
for (i = 0; i < sc->spis_num; i++) { for (i = 0; i < sc->spis_num; i++) {
snprintf(typename, sizeof(typename), "aspeed.spi%d-%s", i + 1, socname); snprintf(typename, sizeof(typename), "aspeed.spi%d-%s", i + 1, socname);
@ -194,9 +193,9 @@ static void aspeed_soc_init(Object *obj)
sysbus_init_child_obj(obj, "sdmc", OBJECT(&s->sdmc), sizeof(s->sdmc), sysbus_init_child_obj(obj, "sdmc", OBJECT(&s->sdmc), sizeof(s->sdmc),
typename); typename);
object_property_add_alias(obj, "ram-size", OBJECT(&s->sdmc), object_property_add_alias(obj, "ram-size", OBJECT(&s->sdmc),
"ram-size", &error_abort); "ram-size");
object_property_add_alias(obj, "max-ram-size", OBJECT(&s->sdmc), object_property_add_alias(obj, "max-ram-size", OBJECT(&s->sdmc),
"max-ram-size", &error_abort); "max-ram-size");
for (i = 0; i < sc->wdts_num; i++) { for (i = 0; i < sc->wdts_num; i++) {
snprintf(typename, sizeof(typename), "aspeed.wdt-%s", socname); snprintf(typename, sizeof(typename), "aspeed.wdt-%s", socname);

26
hw/arm/bcm2835_peripherals.c
View File

@ -74,26 +74,25 @@ static void bcm2835_peripherals_init(Object *obj)
TYPE_BCM2835_MBOX); TYPE_BCM2835_MBOX);
object_property_add_const_link(OBJECT(&s->mboxes), "mbox-mr", object_property_add_const_link(OBJECT(&s->mboxes), "mbox-mr",
OBJECT(&s->mbox_mr), &error_abort); OBJECT(&s->mbox_mr));
/* Framebuffer */ /* Framebuffer */
sysbus_init_child_obj(obj, "fb", &s->fb, sizeof(s->fb), TYPE_BCM2835_FB); sysbus_init_child_obj(obj, "fb", &s->fb, sizeof(s->fb), TYPE_BCM2835_FB);
object_property_add_alias(obj, "vcram-size", OBJECT(&s->fb), "vcram-size", object_property_add_alias(obj, "vcram-size", OBJECT(&s->fb), "vcram-size");
&error_abort);
object_property_add_const_link(OBJECT(&s->fb), "dma-mr", object_property_add_const_link(OBJECT(&s->fb), "dma-mr",
OBJECT(&s->gpu_bus_mr), &error_abort); OBJECT(&s->gpu_bus_mr));
/* Property channel */ /* Property channel */
sysbus_init_child_obj(obj, "property", &s->property, sizeof(s->property), sysbus_init_child_obj(obj, "property", &s->property, sizeof(s->property),
TYPE_BCM2835_PROPERTY); TYPE_BCM2835_PROPERTY);
object_property_add_alias(obj, "board-rev", OBJECT(&s->property), object_property_add_alias(obj, "board-rev", OBJECT(&s->property),
"board-rev", &error_abort); "board-rev");
object_property_add_const_link(OBJECT(&s->property), "fb", object_property_add_const_link(OBJECT(&s->property), "fb",
OBJECT(&s->fb), &error_abort); OBJECT(&s->fb));
object_property_add_const_link(OBJECT(&s->property), "dma-mr", object_property_add_const_link(OBJECT(&s->property), "dma-mr",
OBJECT(&s->gpu_bus_mr), &error_abort); OBJECT(&s->gpu_bus_mr));
/* Random Number Generator */ /* Random Number Generator */
sysbus_init_child_obj(obj, "rng", &s->rng, sizeof(s->rng), sysbus_init_child_obj(obj, "rng", &s->rng, sizeof(s->rng),
@ -112,7 +111,7 @@ static void bcm2835_peripherals_init(Object *obj)
TYPE_BCM2835_DMA); TYPE_BCM2835_DMA);
object_property_add_const_link(OBJECT(&s->dma), "dma-mr", object_property_add_const_link(OBJECT(&s->dma), "dma-mr",
OBJECT(&s->gpu_bus_mr), &error_abort); OBJECT(&s->gpu_bus_mr));
/* Thermal */ /* Thermal */
sysbus_init_child_obj(obj, "thermal", &s->thermal, sizeof(s->thermal), sysbus_init_child_obj(obj, "thermal", &s->thermal, sizeof(s->thermal),
@ -123,9 +122,9 @@ static void bcm2835_peripherals_init(Object *obj)
TYPE_BCM2835_GPIO); TYPE_BCM2835_GPIO);
object_property_add_const_link(OBJECT(&s->gpio), "sdbus-sdhci", object_property_add_const_link(OBJECT(&s->gpio), "sdbus-sdhci",
OBJECT(&s->sdhci.sdbus), &error_abort); OBJECT(&s->sdhci.sdbus));
object_property_add_const_link(OBJECT(&s->gpio), "sdbus-sdhost", object_property_add_const_link(OBJECT(&s->gpio), "sdbus-sdhost",
OBJECT(&s->sdhost.sdbus), &error_abort); OBJECT(&s->sdhost.sdbus));
} }
static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp) static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp)
@ -359,12 +358,7 @@ static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp)
memory_region_add_subregion(&s->peri_mr, GPIO_OFFSET, memory_region_add_subregion(&s->peri_mr, GPIO_OFFSET,
sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->gpio), 0)); sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->gpio), 0));
object_property_add_alias(OBJECT(s), "sd-bus", OBJECT(&s->gpio), "sd-bus", object_property_add_alias(OBJECT(s), "sd-bus", OBJECT(&s->gpio), "sd-bus");
&err);
if (err) {
error_propagate(errp, err);
return;
}
create_unimp(s, &s->armtmr, "bcm2835-sp804", ARMCTRL_TIMER0_1_OFFSET, 0x40); create_unimp(s, &s->armtmr, "bcm2835-sp804", ARMCTRL_TIMER0_1_OFFSET, 0x40);
create_unimp(s, &s->cprman, "bcm2835-cprman", CPRMAN_OFFSET, 0x1000); create_unimp(s, &s->cprman, "bcm2835-cprman", CPRMAN_OFFSET, 0x1000);

16
hw/arm/bcm2836.c
View File

@ -63,9 +63,9 @@ static void bcm2836_init(Object *obj)
sysbus_init_child_obj(obj, "peripherals", &s->peripherals, sysbus_init_child_obj(obj, "peripherals", &s->peripherals,
sizeof(s->peripherals), TYPE_BCM2835_PERIPHERALS); sizeof(s->peripherals), TYPE_BCM2835_PERIPHERALS);
object_property_add_alias(obj, "board-rev", OBJECT(&s->peripherals), object_property_add_alias(obj, "board-rev", OBJECT(&s->peripherals),
"board-rev", &error_abort); "board-rev");
object_property_add_alias(obj, "vcram-size", OBJECT(&s->peripherals), object_property_add_alias(obj, "vcram-size", OBJECT(&s->peripherals),
"vcram-size", &error_abort); "vcram-size");
} }
static void bcm2836_realize(DeviceState *dev, Error **errp) static void bcm2836_realize(DeviceState *dev, Error **errp)
@ -86,11 +86,7 @@ static void bcm2836_realize(DeviceState *dev, Error **errp)
return; return;
} }
object_property_add_const_link(OBJECT(&s->peripherals), "ram", obj, &err); object_property_add_const_link(OBJECT(&s->peripherals), "ram", obj);
if (err) {
error_propagate(errp, err);
return;
}
object_property_set_bool(OBJECT(&s->peripherals), true, "realized", &err); object_property_set_bool(OBJECT(&s->peripherals), true, "realized", &err);
if (err) { if (err) {
@ -99,11 +95,7 @@ static void bcm2836_realize(DeviceState *dev, Error **errp)
} }
object_property_add_alias(OBJECT(s), "sd-bus", OBJECT(&s->peripherals), object_property_add_alias(OBJECT(s), "sd-bus", OBJECT(&s->peripherals),
"sd-bus", &err); "sd-bus");
if (err) {
error_propagate(errp, err);
return;
}
sysbus_mmio_map_overlap(SYS_BUS_DEVICE(&s->peripherals), 0, sysbus_mmio_map_overlap(SYS_BUS_DEVICE(&s->peripherals), 0,
info->peri_base, 1); info->peri_base, 1);

3
hw/arm/cubieboard.c
View File

@ -59,8 +59,7 @@ static void cubieboard_init(MachineState *machine)
} }
a10 = AW_A10(object_new(TYPE_AW_A10)); a10 = AW_A10(object_new(TYPE_AW_A10));
object_property_add_child(OBJECT(machine), "soc", OBJECT(a10), object_property_add_child(OBJECT(machine), "soc", OBJECT(a10));
&error_abort);
object_unref(OBJECT(a10)); object_unref(OBJECT(a10));
object_property_set_int(OBJECT(&a10->emac), 1, "phy-addr", &err); object_property_set_int(OBJECT(&a10->emac), 1, "phy-addr", &err);

2
hw/arm/mcimx6ul-evk.c
View File

@ -39,7 +39,7 @@ static void mcimx6ul_evk_init(MachineState *machine)
}; };
s = FSL_IMX6UL(object_new(TYPE_FSL_IMX6UL)); s = FSL_IMX6UL(object_new(TYPE_FSL_IMX6UL));
object_property_add_child(OBJECT(machine), "soc", OBJECT(s), &error_fatal); object_property_add_child(OBJECT(machine), "soc", OBJECT(s));
object_property_set_bool(OBJECT(s), true, "realized", &error_fatal); object_property_set_bool(OBJECT(s), true, "realized", &error_fatal);
memory_region_add_subregion(get_system_memory(), FSL_IMX6UL_MMDC_ADDR, memory_region_add_subregion(get_system_memory(), FSL_IMX6UL_MMDC_ADDR,

2
hw/arm/mcimx7d-sabre.c
View File

@ -41,7 +41,7 @@ static void mcimx7d_sabre_init(MachineState *machine)
}; };
s = FSL_IMX7(object_new(TYPE_FSL_IMX7)); s = FSL_IMX7(object_new(TYPE_FSL_IMX7));
object_property_add_child(OBJECT(machine), "soc", OBJECT(s), &error_fatal); object_property_add_child(OBJECT(machine), "soc", OBJECT(s));
object_property_set_bool(OBJECT(s), true, "realized", &error_fatal); object_property_set_bool(OBJECT(s), true, "realized", &error_fatal);
memory_region_add_subregion(get_system_memory(), FSL_IMX7_MMDC_ADDR, memory_region_add_subregion(get_system_memory(), FSL_IMX7_MMDC_ADDR,

3
hw/arm/msf2-soc.c
View File

@ -197,8 +197,7 @@ static void m2sxxx_soc_realize(DeviceState *dev_soc, Error **errp)
/* Alias controller SPI bus to the SoC itself */ /* Alias controller SPI bus to the SoC itself */
bus_name = g_strdup_printf("spi%d", i); bus_name = g_strdup_printf("spi%d", i);
object_property_add_alias(OBJECT(s), bus_name, object_property_add_alias(OBJECT(s), bus_name,
OBJECT(&s->spi[i]), "spi", OBJECT(&s->spi[i]), "spi");
&error_abort);
g_free(bus_name); g_free(bus_name);
} }

3
hw/arm/nrf51_soc.c
View File

@ -197,8 +197,7 @@ static void nrf51_soc_init(Object *obj)
sysbus_init_child_obj(obj, "uart", &s->uart, sizeof(s->uart), sysbus_init_child_obj(obj, "uart", &s->uart, sizeof(s->uart),
TYPE_NRF51_UART); TYPE_NRF51_UART);
object_property_add_alias(obj, "serial0", OBJECT(&s->uart), "chardev", object_property_add_alias(obj, "serial0", OBJECT(&s->uart), "chardev");
&error_abort);
sysbus_init_child_obj(obj, "rng", &s->rng, sizeof(s->rng), sysbus_init_child_obj(obj, "rng", &s->rng, sizeof(s->rng),
TYPE_NRF51_RNG); TYPE_NRF51_RNG);

3
hw/arm/orangepi.c
View File

@ -59,8 +59,7 @@ static void orangepi_init(MachineState *machine)
} }
h3 = AW_H3(object_new(TYPE_AW_H3)); h3 = AW_H3(object_new(TYPE_AW_H3));
object_property_add_child(OBJECT(machine), "soc", OBJECT(h3), object_property_add_child(OBJECT(machine), "soc", OBJECT(h3));
&error_abort);
object_unref(OBJECT(h3)); object_unref(OBJECT(h3));
/* Setup timer properties */ /* Setup timer properties */

3
hw/arm/raspi.c
View File

@ -284,8 +284,7 @@ static void raspi_machine_init(MachineState *machine)
/* Setup the SOC */ /* Setup the SOC */
object_initialize_child(OBJECT(machine), "soc", &s->soc, sizeof(s->soc), object_initialize_child(OBJECT(machine), "soc", &s->soc, sizeof(s->soc),
board_soc_type(board_rev), &error_abort, NULL); board_soc_type(board_rev), &error_abort, NULL);
object_property_add_const_link(OBJECT(&s->soc), "ram", OBJECT(machine->ram), object_property_add_const_link(OBJECT(&s->soc), "ram", OBJECT(machine->ram));
&error_abort);
object_property_set_int(OBJECT(&s->soc), board_rev, "board-rev", object_property_set_int(OBJECT(&s->soc), board_rev, "board-rev",
&error_abort); &error_abort);
object_property_set_bool(OBJECT(&s->soc), true, "realized", &error_abort); object_property_set_bool(OBJECT(&s->soc), true, "realized", &error_abort);

2
hw/arm/sabrelite.c
View File

@ -51,7 +51,7 @@ static void sabrelite_init(MachineState *machine)
} }
s = FSL_IMX6(object_new(TYPE_FSL_IMX6)); s = FSL_IMX6(object_new(TYPE_FSL_IMX6));
object_property_add_child(OBJECT(machine), "soc", OBJECT(s), &error_fatal); object_property_add_child(OBJECT(machine), "soc", OBJECT(s));
object_property_set_bool(OBJECT(s), true, "realized", &err); object_property_set_bool(OBJECT(s), true, "realized", &err);
if (err != NULL) { if (err != NULL) {
error_report("%s", error_get_pretty(err)); error_report("%s", error_get_pretty(err));

5
hw/arm/sbsa-ref.c
View File

@ -222,10 +222,9 @@ static PFlashCFI01 *sbsa_flash_create1(SBSAMachineState *sms,
qdev_prop_set_uint16(dev, "id2", 0x00); qdev_prop_set_uint16(dev, "id2", 0x00);
qdev_prop_set_uint16(dev, "id3", 0x00); qdev_prop_set_uint16(dev, "id3", 0x00);
qdev_prop_set_string(dev, "name", name); qdev_prop_set_string(dev, "name", name);
object_property_add_child(OBJECT(sms), name, OBJECT(dev), object_property_add_child(OBJECT(sms), name, OBJECT(dev));
&error_abort);
object_property_add_alias(OBJECT(sms), alias_prop_name, object_property_add_alias(OBJECT(sms), alias_prop_name,
OBJECT(dev), "drive", &error_abort); OBJECT(dev), "drive");
return PFLASH_CFI01(dev); return PFLASH_CFI01(dev);
} }

4
hw/arm/vexpress.c
View File

@ -749,7 +749,7 @@ static void vexpress_instance_init(Object *obj)
/* EL3 is enabled by default on vexpress */ /* EL3 is enabled by default on vexpress */
vms->secure = true; vms->secure = true;
object_property_add_bool(obj, "secure", vexpress_get_secure, object_property_add_bool(obj, "secure", vexpress_get_secure,
vexpress_set_secure, NULL); vexpress_set_secure);
object_property_set_description(obj, "secure", object_property_set_description(obj, "secure",
"Set on/off to enable/disable the ARM " "Set on/off to enable/disable the ARM "
"Security Extensions (TrustZone)"); "Security Extensions (TrustZone)");
@ -765,7 +765,7 @@ static void vexpress_a15_instance_init(Object *obj)
*/ */
vms->virt = true; vms->virt = true;
object_property_add_bool(obj, "virtualization", vexpress_get_virt, object_property_add_bool(obj, "virtualization", vexpress_get_virt,
vexpress_set_virt, NULL); vexpress_set_virt);
object_property_set_description(obj, "virtualization", object_property_set_description(obj, "virtualization",
"Set on/off to enable/disable the ARM " "Set on/off to enable/disable the ARM "
"Virtualization Extensions " "Virtualization Extensions "

21
hw/arm/virt.c
View File

@ -959,10 +959,9 @@ static PFlashCFI01 *virt_flash_create1(VirtMachineState *vms,
qdev_prop_set_uint16(dev, "id2", 0x00); qdev_prop_set_uint16(dev, "id2", 0x00);
qdev_prop_set_uint16(dev, "id3", 0x00); qdev_prop_set_uint16(dev, "id3", 0x00);
qdev_prop_set_string(dev, "name", name); qdev_prop_set_string(dev, "name", name);
object_property_add_child(OBJECT(vms), name, OBJECT(dev), object_property_add_child(OBJECT(vms), name, OBJECT(dev));
&error_abort);
object_property_add_alias(OBJECT(vms), alias_prop_name, object_property_add_alias(OBJECT(vms), alias_prop_name,
OBJECT(dev), "drive", &error_abort); OBJECT(dev), "drive");
return PFLASH_CFI01(dev); return PFLASH_CFI01(dev);
} }
@ -2270,7 +2269,7 @@ static void virt_machine_class_init(ObjectClass *oc, void *data)
object_class_property_add(oc, "acpi", "OnOffAuto", object_class_property_add(oc, "acpi", "OnOffAuto",
virt_get_acpi, virt_set_acpi, virt_get_acpi, virt_set_acpi,
NULL, NULL, &error_abort); NULL, NULL);
object_class_property_set_description(oc, "acpi", object_class_property_set_description(oc, "acpi",
"Enable ACPI"); "Enable ACPI");
} }
@ -2286,7 +2285,7 @@ static void virt_instance_init(Object *obj)
*/ */
vms->secure = false; vms->secure = false;
object_property_add_bool(obj, "secure", virt_get_secure, object_property_add_bool(obj, "secure", virt_get_secure,
virt_set_secure, NULL); virt_set_secure);
object_property_set_description(obj, "secure", object_property_set_description(obj, "secure",
"Set on/off to enable/disable the ARM " "Set on/off to enable/disable the ARM "
"Security Extensions (TrustZone)"); "Security Extensions (TrustZone)");
@ -2294,7 +2293,7 @@ static void virt_instance_init(Object *obj)
/* EL2 is also disabled by default, for similar reasons */ /* EL2 is also disabled by default, for similar reasons */
vms->virt = false; vms->virt = false;
object_property_add_bool(obj, "virtualization", virt_get_virt, object_property_add_bool(obj, "virtualization", virt_get_virt,
virt_set_virt, NULL); virt_set_virt);
object_property_set_description(obj, "virtualization", object_property_set_description(obj, "virtualization",
"Set on/off to enable/disable emulating a " "Set on/off to enable/disable emulating a "
"guest CPU which implements the ARM " "guest CPU which implements the ARM "
@ -2303,13 +2302,13 @@ static void virt_instance_init(Object *obj)
/* High memory is enabled by default */ /* High memory is enabled by default */
vms->highmem = true; vms->highmem = true;
object_property_add_bool(obj, "highmem", virt_get_highmem, object_property_add_bool(obj, "highmem", virt_get_highmem,
virt_set_highmem, NULL); virt_set_highmem);
object_property_set_description(obj, "highmem", object_property_set_description(obj, "highmem",
"Set on/off to enable/disable using " "Set on/off to enable/disable using "
"physical address space above 32 bits"); "physical address space above 32 bits");
vms->gic_version = VIRT_GIC_VERSION_NOSEL; vms->gic_version = VIRT_GIC_VERSION_NOSEL;
object_property_add_str(obj, "gic-version", virt_get_gic_version, object_property_add_str(obj, "gic-version", virt_get_gic_version,
virt_set_gic_version, NULL); virt_set_gic_version);
object_property_set_description(obj, "gic-version", object_property_set_description(obj, "gic-version",
"Set GIC version. " "Set GIC version. "
"Valid values are 2, 3, host and max"); "Valid values are 2, 3, host and max");
@ -2322,7 +2321,7 @@ static void virt_instance_init(Object *obj)
/* Default allows ITS instantiation */ /* Default allows ITS instantiation */
vms->its = true; vms->its = true;
object_property_add_bool(obj, "its", virt_get_its, object_property_add_bool(obj, "its", virt_get_its,
virt_set_its, NULL); virt_set_its);
object_property_set_description(obj, "its", object_property_set_description(obj, "its",
"Set on/off to enable/disable " "Set on/off to enable/disable "
"ITS instantiation"); "ITS instantiation");
@ -2330,7 +2329,7 @@ static void virt_instance_init(Object *obj)
/* Default disallows iommu instantiation */ /* Default disallows iommu instantiation */
vms->iommu = VIRT_IOMMU_NONE; vms->iommu = VIRT_IOMMU_NONE;
object_property_add_str(obj, "iommu", virt_get_iommu, virt_set_iommu, NULL); object_property_add_str(obj, "iommu", virt_get_iommu, virt_set_iommu);
object_property_set_description(obj, "iommu", object_property_set_description(obj, "iommu",
"Set the IOMMU type. " "Set the IOMMU type. "
"Valid values are none and smmuv3"); "Valid values are none and smmuv3");
@ -2338,7 +2337,7 @@ static void virt_instance_init(Object *obj)
/* Default disallows RAS instantiation */ /* Default disallows RAS instantiation */
vms->ras = false; vms->ras = false;
object_property_add_bool(obj, "ras", virt_get_ras, object_property_add_bool(obj, "ras", virt_get_ras,
virt_set_ras, NULL); virt_set_ras);
object_property_set_description(obj, "ras", object_property_set_description(obj, "ras",
"Set on/off to enable/disable reporting host memory errors " "Set on/off to enable/disable reporting host memory errors "
"to a KVM guest using ACPI and guest external abort exceptions"); "to a KVM guest using ACPI and guest external abort exceptions");

2
hw/arm/xilinx_zynq.c
View File

@ -229,7 +229,7 @@ static void zynq_init(MachineState *machine)
/* Create the main clock source, and feed slcr with it */ /* Create the main clock source, and feed slcr with it */
zynq_machine->ps_clk = CLOCK(object_new(TYPE_CLOCK)); zynq_machine->ps_clk = CLOCK(object_new(TYPE_CLOCK));
object_property_add_child(OBJECT(zynq_machine), "ps_clk", object_property_add_child(OBJECT(zynq_machine), "ps_clk",
OBJECT(zynq_machine->ps_clk), &error_abort); OBJECT(zynq_machine->ps_clk));
object_unref(OBJECT(zynq_machine->ps_clk)); object_unref(OBJECT(zynq_machine->ps_clk));
clock_set_hz(zynq_machine->ps_clk, PS_CLK_FREQUENCY); clock_set_hz(zynq_machine->ps_clk, PS_CLK_FREQUENCY);
qdev_connect_clock_in(slcr, "ps_clk", zynq_machine->ps_clk); qdev_connect_clock_in(slcr, "ps_clk", zynq_machine->ps_clk);

6
hw/arm/xlnx-versal-virt.c
View File

@ -433,8 +433,7 @@ static void create_virtio_regions(VersalVirt *s)
pic_irq = qdev_get_gpio_in(DEVICE(&s->soc.fpd.apu.gic), irq); pic_irq = qdev_get_gpio_in(DEVICE(&s->soc.fpd.apu.gic), irq);
dev = qdev_create(NULL, "virtio-mmio"); dev = qdev_create(NULL, "virtio-mmio");
object_property_add_child(OBJECT(&s->soc), name, OBJECT(dev), object_property_add_child(OBJECT(&s->soc), name, OBJECT(dev));
&error_fatal);
qdev_init_nofail(dev); qdev_init_nofail(dev);
sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic_irq); sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic_irq);
mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0); mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0);
@ -465,8 +464,7 @@ static void sd_plugin_card(SDHCIState *sd, DriveInfo *di)
DeviceState *card; DeviceState *card;
card = qdev_create(qdev_get_child_bus(DEVICE(sd), "sd-bus"), TYPE_SD_CARD); card = qdev_create(qdev_get_child_bus(DEVICE(sd), "sd-bus"), TYPE_SD_CARD);
object_property_add_child(OBJECT(sd), "card[*]", OBJECT(card), object_property_add_child(OBJECT(sd), "card[*]", OBJECT(card));
&error_fatal);
qdev_prop_set_drive(card, "drive", blk, &error_fatal); qdev_prop_set_drive(card, "drive", blk, &error_fatal);
object_property_set_bool(OBJECT(card), true, "realized", &error_fatal); object_property_set_bool(OBJECT(card), true, "realized", &error_fatal);
} }

2
hw/arm/xlnx-versal.c
View File

@ -309,7 +309,7 @@ static void versal_unimp_area(Versal *s, const char *name,
qdev_prop_set_string(dev, "name", name); qdev_prop_set_string(dev, "name", name);
qdev_prop_set_uint64(dev, "size", size); qdev_prop_set_uint64(dev, "size", size);
object_property_add_child(OBJECT(s), name, OBJECT(dev), &error_fatal); object_property_add_child(OBJECT(s), name, OBJECT(dev));
qdev_init_nofail(dev); qdev_init_nofail(dev);
mr_dev = sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0); mr_dev = sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0);

4
hw/arm/xlnx-zcu102.c
View File

@ -209,7 +209,7 @@ static void xlnx_zcu102_machine_instance_init(Object *obj)
/* Default to secure mode being disabled */ /* Default to secure mode being disabled */
s->secure = false; s->secure = false;
object_property_add_bool(obj, "secure", zcu102_get_secure, object_property_add_bool(obj, "secure", zcu102_get_secure,
zcu102_set_secure, NULL); zcu102_set_secure);
object_property_set_description(obj, "secure", object_property_set_description(obj, "secure",
"Set on/off to enable/disable the ARM " "Set on/off to enable/disable the ARM "
"Security Extensions (TrustZone)"); "Security Extensions (TrustZone)");
@ -217,7 +217,7 @@ static void xlnx_zcu102_machine_instance_init(Object *obj)
/* Default to virt (EL2) being disabled */ /* Default to virt (EL2) being disabled */
s->virt = false; s->virt = false;
object_property_add_bool(obj, "virtualization", zcu102_get_virt, object_property_add_bool(obj, "virtualization", zcu102_get_virt,
zcu102_set_virt, NULL); zcu102_set_virt);
object_property_set_description(obj, "virtualization", object_property_set_description(obj, "virtualization",
"Set on/off to enable/disable emulating a " "Set on/off to enable/disable emulating a "
"guest CPU which implements the ARM " "guest CPU which implements the ARM "

9
hw/arm/xlnx-zynqmp.c
View File

@ -554,8 +554,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)
/* Alias controller SD bus to the SoC itself */ /* Alias controller SD bus to the SoC itself */
bus_name = g_strdup_printf("sd-bus%d", i); bus_name = g_strdup_printf("sd-bus%d", i);
object_property_add_alias(OBJECT(s), bus_name, sdhci, "sd-bus", object_property_add_alias(OBJECT(s), bus_name, sdhci, "sd-bus");
&error_abort);
g_free(bus_name); g_free(bus_name);
} }
@ -575,8 +574,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)
/* Alias controller SPI bus to the SoC itself */ /* Alias controller SPI bus to the SoC itself */
bus_name = g_strdup_printf("spi%d", i); bus_name = g_strdup_printf("spi%d", i);
object_property_add_alias(OBJECT(s), bus_name, object_property_add_alias(OBJECT(s), bus_name,
OBJECT(&s->spi[i]), "spi0", OBJECT(&s->spi[i]), "spi0");
&error_abort);
g_free(bus_name); g_free(bus_name);
} }
@ -597,8 +595,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)
bus_name = g_strdup_printf("qspi%d", i); bus_name = g_strdup_printf("qspi%d", i);
target_bus = g_strdup_printf("spi%d", i); target_bus = g_strdup_printf("spi%d", i);
object_property_add_alias(OBJECT(s), bus_name, object_property_add_alias(OBJECT(s), bus_name,
OBJECT(&s->qspi), target_bus, OBJECT(&s->qspi), target_bus);
&error_abort);
g_free(bus_name); g_free(bus_name);
g_free(target_bus); g_free(target_bus);
} }

2
hw/audio/marvell_88w8618.c
View File

@ -259,7 +259,7 @@ static void mv88w8618_audio_init(Object *obj)
object_property_add_link(OBJECT(dev), "wm8750", TYPE_WM8750, object_property_add_link(OBJECT(dev), "wm8750", TYPE_WM8750,
(Object **) &s->wm, (Object **) &s->wm,
qdev_prop_allow_set_link_before_realize, qdev_prop_allow_set_link_before_realize,
0, &error_abort); 0);
} }
static void mv88w8618_audio_realize(DeviceState *dev, Error **errp) static void mv88w8618_audio_realize(DeviceState *dev, Error **errp)

2
hw/audio/pcspk.c
View File

@ -175,7 +175,7 @@ static void pcspk_initfn(Object *obj)
object_property_add_link(obj, "pit", TYPE_PIT_COMMON, object_property_add_link(obj, "pit", TYPE_PIT_COMMON,
(Object **)&s->pit, (Object **)&s->pit,
qdev_prop_allow_set_link_before_realize, qdev_prop_allow_set_link_before_realize,
0, &error_abort); 0);
} }
static void pcspk_realizefn(DeviceState *dev, Error **errp) static void pcspk_realizefn(DeviceState *dev, Error **errp)

7
hw/core/bus.c
View File

@ -122,7 +122,7 @@ static void qbus_realize(BusState *bus, DeviceState *parent, const char *name)
if (bus->parent) { if (bus->parent) {
QLIST_INSERT_HEAD(&bus->parent->child_bus, bus, sibling); QLIST_INSERT_HEAD(&bus->parent->child_bus, bus, sibling);
bus->parent->num_child_bus++; bus->parent->num_child_bus++;
object_property_add_child(OBJECT(bus->parent), bus->name, OBJECT(bus), NULL); object_property_add_child(OBJECT(bus->parent), bus->name, OBJECT(bus));
object_unref(OBJECT(bus)); object_unref(OBJECT(bus));
} else { } else {
/* The only bus without a parent is the main system bus */ /* The only bus without a parent is the main system bus */
@ -215,10 +215,9 @@ static void qbus_initfn(Object *obj)
TYPE_HOTPLUG_HANDLER, TYPE_HOTPLUG_HANDLER,
(Object **)&bus->hotplug_handler, (Object **)&bus->hotplug_handler,
object_property_allow_set_link, object_property_allow_set_link,
0, 0);
NULL);
object_property_add_bool(obj, "realized", object_property_add_bool(obj, "realized",
bus_get_realized, bus_set_realized, NULL); bus_get_realized, bus_set_realized);
} }
static char *default_bus_get_fw_dev_path(DeviceState *dev) static char *default_bus_get_fw_dev_path(DeviceState *dev)

46
hw/core/machine.c
View File

@ -787,82 +787,78 @@ static void machine_class_init(ObjectClass *oc, void *data)
mc->numa_auto_assign_ram = numa_default_auto_assign_ram; mc->numa_auto_assign_ram = numa_default_auto_assign_ram;
object_class_property_add_str(oc, "kernel", object_class_property_add_str(oc, "kernel",
machine_get_kernel, machine_set_kernel, &error_abort); machine_get_kernel, machine_set_kernel);
object_class_property_set_description(oc, "kernel", object_class_property_set_description(oc, "kernel",
"Linux kernel image file"); "Linux kernel image file");
object_class_property_add_str(oc, "initrd", object_class_property_add_str(oc, "initrd",
machine_get_initrd, machine_set_initrd, &error_abort); machine_get_initrd, machine_set_initrd);
object_class_property_set_description(oc, "initrd", object_class_property_set_description(oc, "initrd",
"Linux initial ramdisk file"); "Linux initial ramdisk file");
object_class_property_add_str(oc, "append", object_class_property_add_str(oc, "append",
machine_get_append, machine_set_append, &error_abort); machine_get_append, machine_set_append);
object_class_property_set_description(oc, "append", object_class_property_set_description(oc, "append",
"Linux kernel command line"); "Linux kernel command line");
object_class_property_add_str(oc, "dtb", object_class_property_add_str(oc, "dtb",
machine_get_dtb, machine_set_dtb, &error_abort); machine_get_dtb, machine_set_dtb);
object_class_property_set_description(oc, "dtb", object_class_property_set_description(oc, "dtb",
"Linux kernel device tree file"); "Linux kernel device tree file");
object_class_property_add_str(oc, "dumpdtb", object_class_property_add_str(oc, "dumpdtb",
machine_get_dumpdtb, machine_set_dumpdtb, &error_abort); machine_get_dumpdtb, machine_set_dumpdtb);
object_class_property_set_description(oc, "dumpdtb", object_class_property_set_description(oc, "dumpdtb",
"Dump current dtb to a file and quit"); "Dump current dtb to a file and quit");
object_class_property_add(oc, "phandle-start", "int", object_class_property_add(oc, "phandle-start", "int",
machine_get_phandle_start, machine_set_phandle_start, machine_get_phandle_start, machine_set_phandle_start,
NULL, NULL, &error_abort); NULL, NULL);
object_class_property_set_description(oc, "phandle-start", object_class_property_set_description(oc, "phandle-start",
"The first phandle ID we may generate dynamically"); "The first phandle ID we may generate dynamically");
object_class_property_add_str(oc, "dt-compatible", object_class_property_add_str(oc, "dt-compatible",
machine_get_dt_compatible, machine_set_dt_compatible, &error_abort); machine_get_dt_compatible, machine_set_dt_compatible);
object_class_property_set_description(oc, "dt-compatible", object_class_property_set_description(oc, "dt-compatible",
"Overrides the \"compatible\" property of the dt root node"); "Overrides the \"compatible\" property of the dt root node");
object_class_property_add_bool(oc, "dump-guest-core", object_class_property_add_bool(oc, "dump-guest-core",
machine_get_dump_guest_core, machine_set_dump_guest_core, &error_abort); machine_get_dump_guest_core, machine_set_dump_guest_core);
object_class_property_set_description(oc, "dump-guest-core", object_class_property_set_description(oc, "dump-guest-core",
"Include guest memory in a core dump"); "Include guest memory in a core dump");
object_class_property_add_bool(oc, "mem-merge", object_class_property_add_bool(oc, "mem-merge",
machine_get_mem_merge, machine_set_mem_merge, &error_abort); machine_get_mem_merge, machine_set_mem_merge);
object_class_property_set_description(oc, "mem-merge", object_class_property_set_description(oc, "mem-merge",
"Enable/disable memory merge support"); "Enable/disable memory merge support");
object_class_property_add_bool(oc, "usb", object_class_property_add_bool(oc, "usb",
machine_get_usb, machine_set_usb, &error_abort); machine_get_usb, machine_set_usb);
object_class_property_set_description(oc, "usb", object_class_property_set_description(oc, "usb",
"Set on/off to enable/disable usb"); "Set on/off to enable/disable usb");
object_class_property_add_bool(oc, "graphics", object_class_property_add_bool(oc, "graphics",
machine_get_graphics, machine_set_graphics, &error_abort); machine_get_graphics, machine_set_graphics);
object_class_property_set_description(oc, "graphics", object_class_property_set_description(oc, "graphics",
"Set on/off to enable/disable graphics emulation"); "Set on/off to enable/disable graphics emulation");
object_class_property_add_str(oc, "firmware", object_class_property_add_str(oc, "firmware",
machine_get_firmware, machine_set_firmware, machine_get_firmware, machine_set_firmware);
&error_abort);
object_class_property_set_description(oc, "firmware", object_class_property_set_description(oc, "firmware",
"Firmware image"); "Firmware image");
object_class_property_add_bool(oc, "suppress-vmdesc", object_class_property_add_bool(oc, "suppress-vmdesc",
machine_get_suppress_vmdesc, machine_set_suppress_vmdesc, machine_get_suppress_vmdesc, machine_set_suppress_vmdesc);
&error_abort);
object_class_property_set_description(oc, "suppress-vmdesc", object_class_property_set_description(oc, "suppress-vmdesc",
"Set on to disable self-describing migration"); "Set on to disable self-describing migration");
object_class_property_add_bool(oc, "enforce-config-section", object_class_property_add_bool(oc, "enforce-config-section",
machine_get_enforce_config_section, machine_set_enforce_config_section, machine_get_enforce_config_section, machine_set_enforce_config_section);
&error_abort);
object_class_property_set_description(oc, "enforce-config-section", object_class_property_set_description(oc, "enforce-config-section",
"Set on to enforce configuration section migration"); "Set on to enforce configuration section migration");
object_class_property_add_str(oc, "memory-encryption", object_class_property_add_str(oc, "memory-encryption",
machine_get_memory_encryption, machine_set_memory_encryption, machine_get_memory_encryption, machine_set_memory_encryption);
&error_abort);
object_class_property_set_description(oc, "memory-encryption", object_class_property_set_description(oc, "memory-encryption",
"Set memory encryption object to use"); "Set memory encryption object to use");
} }
@ -893,16 +889,14 @@ static void machine_initfn(Object *obj)
ms->nvdimms_state = g_new0(NVDIMMState, 1); ms->nvdimms_state = g_new0(NVDIMMState, 1);
object_property_add_bool(obj, "nvdimm", object_property_add_bool(obj, "nvdimm",
machine_get_nvdimm, machine_set_nvdimm, machine_get_nvdimm, machine_set_nvdimm);
&error_abort);
object_property_set_description(obj, "nvdimm", object_property_set_description(obj, "nvdimm",
"Set on/off to enable/disable " "Set on/off to enable/disable "
"NVDIMM instantiation"); "NVDIMM instantiation");
object_property_add_str(obj, "nvdimm-persistence", object_property_add_str(obj, "nvdimm-persistence",
machine_get_nvdimm_persistence, machine_get_nvdimm_persistence,
machine_set_nvdimm_persistence, machine_set_nvdimm_persistence);
&error_abort);
object_property_set_description(obj, "nvdimm-persistence", object_property_set_description(obj, "nvdimm-persistence",
"Set NVDIMM persistence" "Set NVDIMM persistence"
"Valid values are cpu, mem-ctrl"); "Valid values are cpu, mem-ctrl");
@ -911,8 +905,7 @@ static void machine_initfn(Object *obj)
if (mc->cpu_index_to_instance_props && mc->get_default_cpu_node_id) { if (mc->cpu_index_to_instance_props && mc->get_default_cpu_node_id) {
ms->numa_state = g_new0(NumaState, 1); ms->numa_state = g_new0(NumaState, 1);
object_property_add_bool(obj, "hmat", object_property_add_bool(obj, "hmat",
machine_get_hmat, machine_set_hmat, machine_get_hmat, machine_set_hmat);
&error_abort);
object_property_set_description(obj, "hmat", object_property_set_description(obj, "hmat",
"Set on/off to enable/disable " "Set on/off to enable/disable "
"ACPI Heterogeneous Memory Attribute " "ACPI Heterogeneous Memory Attribute "
@ -920,8 +913,7 @@ static void machine_initfn(Object *obj)
} }
object_property_add_str(obj, "memory-backend", object_property_add_str(obj, "memory-backend",
machine_get_memdev, machine_set_memdev, machine_get_memdev, machine_set_memdev);
&error_abort);
object_property_set_description(obj, "memory-backend", object_property_set_description(obj, "memory-backend",
"Set RAM backend" "Set RAM backend"
"Valid value is ID of hostmem based backend"); "Valid value is ID of hostmem based backend");

4
hw/core/qdev-clock.c
View File

@ -46,7 +46,7 @@ static NamedClockList *qdev_init_clocklist(DeviceState *dev, const char *name,
*/ */
if (clk == NULL) { if (clk == NULL) {
clk = CLOCK(object_new(TYPE_CLOCK)); clk = CLOCK(object_new(TYPE_CLOCK));
object_property_add_child(OBJECT(dev), name, OBJECT(clk), &error_abort); object_property_add_child(OBJECT(dev), name, OBJECT(clk));
if (output) { if (output) {
/* /*
* Remove object_new()'s initial reference. * Remove object_new()'s initial reference.
@ -59,7 +59,7 @@ static NamedClockList *qdev_init_clocklist(DeviceState *dev, const char *name,
object_property_add_link(OBJECT(dev), name, object_property_add_link(OBJECT(dev), name,
object_get_typename(OBJECT(clk)), object_get_typename(OBJECT(clk)),
(Object **) &ncl->clock, (Object **) &ncl->clock,
NULL, OBJ_PROP_LINK_STRONG, &error_abort); NULL, OBJ_PROP_LINK_STRONG);
} }
ncl->clock = clk; ncl->clock = clk;

9
hw/core/qdev-properties.c
View File

@ -1043,11 +1043,7 @@ static void set_prop_arraylen(Object *obj, Visitor *v, const char *name,
arrayprop->prop.info->get, arrayprop->prop.info->get,
arrayprop->prop.info->set, arrayprop->prop.info->set,
array_element_release, array_element_release,
arrayprop, &local_err); arrayprop);
if (local_err) {
error_propagate(errp, local_err);
return;
}
} }
} }
@ -1259,8 +1255,7 @@ static void create_link_property(ObjectClass *oc, Property *prop, Error **errp)
object_class_property_add_link(oc, prop->name, prop->link_type, object_class_property_add_link(oc, prop->name, prop->link_type,
prop->offset, prop->offset,
qdev_prop_allow_set_link_before_realize, qdev_prop_allow_set_link_before_realize,
OBJ_PROP_LINK_STRONG, OBJ_PROP_LINK_STRONG);
errp);
} }
const PropertyInfo qdev_prop_link = { const PropertyInfo qdev_prop_link = {

40
hw/core/qdev.c
View File

@ -91,8 +91,7 @@ static void bus_add_child(BusState *bus, DeviceState *child)
object_get_typename(OBJECT(child)), object_get_typename(OBJECT(child)),
(Object **)&kid->child, (Object **)&kid->child,
NULL, /* read-only property */ NULL, /* read-only property */
0, /* return ownership on prop deletion */ 0);
NULL);
} }
void qdev_set_parent_bus(DeviceState *dev, BusState *bus) void qdev_set_parent_bus(DeviceState *dev, BusState *bus)
@ -481,7 +480,7 @@ void qdev_init_gpio_in_named_with_opaque(DeviceState *dev,
gchar *propname = g_strdup_printf("%s[%u]", name, i); gchar *propname = g_strdup_printf("%s[%u]", name, i);
object_property_add_child(OBJECT(dev), propname, object_property_add_child(OBJECT(dev), propname,
OBJECT(gpio_list->in[i]), &error_abort); OBJECT(gpio_list->in[i]));
g_free(propname); g_free(propname);
} }
@ -512,8 +511,7 @@ void qdev_init_gpio_out_named(DeviceState *dev, qemu_irq *pins,
object_property_add_link(OBJECT(dev), propname, TYPE_IRQ, object_property_add_link(OBJECT(dev), propname, TYPE_IRQ,
(Object **)&pins[i], (Object **)&pins[i],
object_property_allow_set_link, object_property_allow_set_link,
OBJ_PROP_LINK_STRONG, OBJ_PROP_LINK_STRONG);
&error_abort);
g_free(propname); g_free(propname);
} }
gpio_list->num_out += n; gpio_list->num_out += n;
@ -546,8 +544,7 @@ void qdev_connect_gpio_out_named(DeviceState *dev, const char *name, int n,
/* We need a name for object_property_set_link to work */ /* We need a name for object_property_set_link to work */
object_property_add_child(container_get(qdev_get_machine(), object_property_add_child(container_get(qdev_get_machine(),
"/unattached"), "/unattached"),
"non-qdev-gpio[*]", OBJECT(pin), "non-qdev-gpio[*]", OBJECT(pin));
&error_abort);
} }
object_property_set_link(OBJECT(dev), OBJECT(pin), propname, &error_abort); object_property_set_link(OBJECT(dev), OBJECT(pin), propname, &error_abort);
g_free(propname); g_free(propname);
@ -605,8 +602,7 @@ void qdev_pass_gpios(DeviceState *dev, DeviceState *container,
char *propname = g_strdup_printf("%s[%d]", nm, i); char *propname = g_strdup_printf("%s[%d]", nm, i);
object_property_add_alias(OBJECT(container), propname, object_property_add_alias(OBJECT(container), propname,
OBJECT(dev), propname, OBJECT(dev), propname);
&error_abort);
g_free(propname); g_free(propname);
} }
for (i = 0; i < ngl->num_out; i++) { for (i = 0; i < ngl->num_out; i++) {
@ -614,8 +610,7 @@ void qdev_pass_gpios(DeviceState *dev, DeviceState *container,
char *propname = g_strdup_printf("%s[%d]", nm, i); char *propname = g_strdup_printf("%s[%d]", nm, i);
object_property_add_alias(OBJECT(container), propname, object_property_add_alias(OBJECT(container), propname,
OBJECT(dev), propname, OBJECT(dev), propname);
&error_abort);
g_free(propname); g_free(propname);
} }
QLIST_REMOVE(ngl, node); QLIST_REMOVE(ngl, node);
@ -756,7 +751,7 @@ static void qdev_class_add_legacy_property(DeviceClass *dc, Property *prop)
name = g_strdup_printf("legacy-%s", prop->name); name = g_strdup_printf("legacy-%s", prop->name);
object_class_property_add(OBJECT_CLASS(dc), name, "str", object_class_property_add(OBJECT_CLASS(dc), name, "str",
prop->info->print ? qdev_get_legacy_property : prop->info->get, prop->info->print ? qdev_get_legacy_property : prop->info->get,
NULL, NULL, prop, &error_abort); NULL, NULL, prop);
} }
void qdev_property_add_static(DeviceState *dev, Property *prop) void qdev_property_add_static(DeviceState *dev, Property *prop)
@ -769,7 +764,7 @@ void qdev_property_add_static(DeviceState *dev, Property *prop)
op = object_property_add(obj, prop->name, prop->info->name, op = object_property_add(obj, prop->name, prop->info->name,
prop->info->get, prop->info->set, prop->info->get, prop->info->set,
prop->info->release, prop->info->release,
prop, &error_abort); prop);
object_property_set_description(obj, prop->name, object_property_set_description(obj, prop->name,
prop->info->description); prop->info->description);
@ -795,7 +790,7 @@ static void qdev_class_add_property(DeviceClass *klass, Property *prop)
prop->name, prop->info->name, prop->name, prop->info->name,
prop->info->get, prop->info->set, prop->info->get, prop->info->set,
prop->info->release, prop->info->release,
prop, &error_abort); prop);
if (prop->set_default) { if (prop->set_default) {
prop->info->set_default_value(op, prop); prop->info->set_default_value(op, prop);
} }
@ -818,8 +813,7 @@ void qdev_alias_all_properties(DeviceState *target, Object *source)
for (prop = dc->props_; prop && prop->name; prop++) { for (prop = dc->props_; prop && prop->name; prop++) {
object_property_add_alias(source, prop->name, object_property_add_alias(source, prop->name,
OBJECT(target), prop->name, OBJECT(target), prop->name);
&error_abort);
} }
class = object_class_get_parent(class); class = object_class_get_parent(class);
} while (class != object_class_by_name(TYPE_DEVICE)); } while (class != object_class_by_name(TYPE_DEVICE));
@ -871,7 +865,7 @@ static void device_set_realized(Object *obj, bool value, Error **errp)
object_property_add_child(container_get(qdev_get_machine(), object_property_add_child(container_get(qdev_get_machine(),
"/unattached"), "/unattached"),
name, obj, &error_abort); name, obj);
unattached_parent = true; unattached_parent = true;
g_free(name); g_free(name);
} }
@ -1198,17 +1192,13 @@ static void device_class_init(ObjectClass *class, void *data)
rc->get_transitional_function = device_get_transitional_reset; rc->get_transitional_function = device_get_transitional_reset;
object_class_property_add_bool(class, "realized", object_class_property_add_bool(class, "realized",
device_get_realized, device_set_realized, device_get_realized, device_set_realized);
&error_abort);
object_class_property_add_bool(class, "hotpluggable", object_class_property_add_bool(class, "hotpluggable",
device_get_hotpluggable, NULL, device_get_hotpluggable, NULL);
&error_abort);
object_class_property_add_bool(class, "hotplugged", object_class_property_add_bool(class, "hotplugged",
device_get_hotplugged, NULL, device_get_hotplugged, NULL);
&error_abort);
object_class_property_add_link(class, "parent_bus", TYPE_BUS, object_class_property_add_link(class, "parent_bus", TYPE_BUS,
offsetof(DeviceState, parent_bus), NULL, 0, offsetof(DeviceState, parent_bus), NULL, 0);
&error_abort);
} }
void device_class_set_props(DeviceClass *dc, Property *props) void device_class_set_props(DeviceClass *dc, Property *props)

4
hw/cpu/core.c
View File

@ -76,9 +76,9 @@ static void cpu_core_instance_init(Object *obj)
CPUCore *core = CPU_CORE(obj); CPUCore *core = CPU_CORE(obj);
object_property_add(obj, "core-id", "int", core_prop_get_core_id, object_property_add(obj, "core-id", "int", core_prop_get_core_id,
core_prop_set_core_id, NULL, NULL, NULL); core_prop_set_core_id, NULL, NULL);
object_property_add(obj, "nr-threads", "int", core_prop_get_nr_threads, object_property_add(obj, "nr-threads", "int", core_prop_get_nr_threads,
core_prop_set_nr_threads, NULL, NULL, NULL); core_prop_set_nr_threads, NULL, NULL);
core->nr_threads = ms->smp.threads; core->nr_threads = ms->smp.threads;
} }

3
hw/display/bochs-display.c
View File

@ -333,8 +333,7 @@ static void bochs_display_init(Object *obj)
/* Expose framebuffer byteorder via QOM */ /* Expose framebuffer byteorder via QOM */
object_property_add_bool(obj, "big-endian-framebuffer", object_property_add_bool(obj, "big-endian-framebuffer",
bochs_display_get_big_endian_fb, bochs_display_get_big_endian_fb,
bochs_display_set_big_endian_fb, bochs_display_set_big_endian_fb);
NULL);
dev->cap_present |= QEMU_PCI_CAP_EXPRESS; dev->cap_present |= QEMU_PCI_CAP_EXPRESS;
} }

2
hw/display/sm501.c
View File

@ -2011,7 +2011,7 @@ static void sm501_sysbus_init(Object *o)
qdev_prop_set_uint8(DEVICE(smm), "endianness", DEVICE_LITTLE_ENDIAN); qdev_prop_set_uint8(DEVICE(smm), "endianness", DEVICE_LITTLE_ENDIAN);
object_property_add_alias(o, "chardev", object_property_add_alias(o, "chardev",
OBJECT(smm), "chardev", &error_abort); OBJECT(smm), "chardev");
} }
static const TypeInfo sm501_sysbus_info = { static const TypeInfo sm501_sysbus_info = {

4
hw/display/vga-pci.c
View File

@ -270,7 +270,7 @@ static void pci_std_vga_init(Object *obj)
{ {
/* Expose framebuffer byteorder via QOM */ /* Expose framebuffer byteorder via QOM */
object_property_add_bool(obj, "big-endian-framebuffer", object_property_add_bool(obj, "big-endian-framebuffer",
vga_get_big_endian_fb, vga_set_big_endian_fb, NULL); vga_get_big_endian_fb, vga_set_big_endian_fb);
} }
static void pci_secondary_vga_realize(PCIDevice *dev, Error **errp) static void pci_secondary_vga_realize(PCIDevice *dev, Error **errp)
@ -321,7 +321,7 @@ static void pci_secondary_vga_init(Object *obj)
{ {
/* Expose framebuffer byteorder via QOM */ /* Expose framebuffer byteorder via QOM */
object_property_add_bool(obj, "big-endian-framebuffer", object_property_add_bool(obj, "big-endian-framebuffer",
vga_get_big_endian_fb, vga_set_big_endian_fb, NULL); vga_get_big_endian_fb, vga_set_big_endian_fb);
} }
static void pci_secondary_vga_reset(DeviceState *dev) static void pci_secondary_vga_reset(DeviceState *dev)

3
hw/display/vhost-user-gpu-pci.c
View File

@ -32,8 +32,7 @@ static void vhost_user_gpu_pci_initfn(Object *obj)
VIRTIO_GPU_PCI_BASE(obj)->vgpu = VIRTIO_GPU_BASE(&dev->vdev); VIRTIO_GPU_PCI_BASE(obj)->vgpu = VIRTIO_GPU_BASE(&dev->vdev);
object_property_add_alias(obj, "chardev", object_property_add_alias(obj, "chardev",
OBJECT(&dev->vdev), "chardev", OBJECT(&dev->vdev), "chardev");
&error_abort);
} }
static const VirtioPCIDeviceTypeInfo vhost_user_gpu_pci_info = { static const VirtioPCIDeviceTypeInfo vhost_user_gpu_pci_info = {

2
hw/display/vhost-user-gpu.c
View File

@ -512,7 +512,7 @@ vhost_user_gpu_instance_init(Object *obj)
g->vhost = VHOST_USER_BACKEND(object_new(TYPE_VHOST_USER_BACKEND)); g->vhost = VHOST_USER_BACKEND(object_new(TYPE_VHOST_USER_BACKEND));
object_property_add_alias(obj, "chardev", object_property_add_alias(obj, "chardev",
OBJECT(g->vhost), "chardev", &error_abort); OBJECT(g->vhost), "chardev");
} }
static void static void

3
hw/display/vhost-user-vga.c
View File

@ -33,8 +33,7 @@ static void vhost_user_vga_inst_initfn(Object *obj)
VIRTIO_VGA_BASE(dev)->vgpu = VIRTIO_GPU_BASE(&dev->vdev); VIRTIO_VGA_BASE(dev)->vgpu = VIRTIO_GPU_BASE(&dev->vdev);
object_property_add_alias(obj, "chardev", object_property_add_alias(obj, "chardev",
OBJECT(&dev->vdev), "chardev", OBJECT(&dev->vdev), "chardev");
&error_abort);
} }
static const VirtioPCIDeviceTypeInfo vhost_user_vga_info = { static const VirtioPCIDeviceTypeInfo vhost_user_vga_info = {

7
hw/display/xlnx_dp.c
View File

@ -1237,8 +1237,7 @@ static void xlnx_dp_init(Object *obj)
object_property_add_link(obj, "dpdma", TYPE_XLNX_DPDMA, object_property_add_link(obj, "dpdma", TYPE_XLNX_DPDMA,
(Object **) &s->dpdma, (Object **) &s->dpdma,
xlnx_dp_set_dpdma, xlnx_dp_set_dpdma,
OBJ_PROP_LINK_STRONG, OBJ_PROP_LINK_STRONG);
&error_abort);
/* /*
* Initialize AUX Bus. * Initialize AUX Bus.
@ -1249,11 +1248,11 @@ static void xlnx_dp_init(Object *obj)
* Initialize DPCD and EDID.. * Initialize DPCD and EDID..
*/ */
s->dpcd = DPCD(aux_create_slave(s->aux_bus, "dpcd")); s->dpcd = DPCD(aux_create_slave(s->aux_bus, "dpcd"));
object_property_add_child(OBJECT(s), "dpcd", OBJECT(s->dpcd), NULL); object_property_add_child(OBJECT(s), "dpcd", OBJECT(s->dpcd));
s->edid = I2CDDC(qdev_create(BUS(aux_get_i2c_bus(s->aux_bus)), "i2c-ddc")); s->edid = I2CDDC(qdev_create(BUS(aux_get_i2c_bus(s->aux_bus)), "i2c-ddc"));
i2c_set_slave_address(I2C_SLAVE(s->edid), 0x50); i2c_set_slave_address(I2C_SLAVE(s->edid), 0x50);
object_property_add_child(OBJECT(s), "edid", OBJECT(s->edid), NULL); object_property_add_child(OBJECT(s), "edid", OBJECT(s->edid));
fifo8_create(&s->rx_fifo, 16); fifo8_create(&s->rx_fifo, 16);
fifo8_create(&s->tx_fifo, 16); fifo8_create(&s->tx_fifo, 16);

10
hw/dma/sparc32_dma.c
View File

@ -264,7 +264,7 @@ static void sparc32_dma_device_init(Object *obj)
object_property_add_link(OBJECT(dev), "iommu", TYPE_SUN4M_IOMMU, object_property_add_link(OBJECT(dev), "iommu", TYPE_SUN4M_IOMMU,
(Object **) &s->iommu, (Object **) &s->iommu,
qdev_prop_allow_set_link_before_realize, qdev_prop_allow_set_link_before_realize,
0, NULL); 0);
qdev_init_gpio_in(dev, dma_set_irq, 1); qdev_init_gpio_in(dev, dma_set_irq, 1);
qdev_init_gpio_out(dev, s->gpio, 2); qdev_init_gpio_out(dev, s->gpio, 2);
@ -302,7 +302,7 @@ static void sparc32_espdma_device_realize(DeviceState *dev, Error **errp)
ESPState *esp; ESPState *esp;
d = qdev_create(NULL, TYPE_ESP); d = qdev_create(NULL, TYPE_ESP);
object_property_add_child(OBJECT(dev), "esp", OBJECT(d), errp); object_property_add_child(OBJECT(dev), "esp", OBJECT(d));
sysbus = ESP_STATE(d); sysbus = ESP_STATE(d);
esp = &sysbus->esp; esp = &sysbus->esp;
esp->dma_memory_read = espdma_memory_read; esp->dma_memory_read = espdma_memory_read;
@ -344,7 +344,7 @@ static void sparc32_ledma_device_realize(DeviceState *dev, Error **errp)
qemu_check_nic_model(nd, TYPE_LANCE); qemu_check_nic_model(nd, TYPE_LANCE);
d = qdev_create(NULL, TYPE_LANCE); d = qdev_create(NULL, TYPE_LANCE);
object_property_add_child(OBJECT(dev), "lance", OBJECT(d), errp); object_property_add_child(OBJECT(dev), "lance", OBJECT(d));
qdev_set_nic_properties(d, nd); qdev_set_nic_properties(d, nd);
object_property_set_link(OBJECT(d), OBJECT(dev), "dma", errp); object_property_set_link(OBJECT(d), OBJECT(dev), "dma", errp);
qdev_init_nofail(d); qdev_init_nofail(d);
@ -380,7 +380,7 @@ static void sparc32_dma_realize(DeviceState *dev, Error **errp)
espdma = qdev_create(NULL, TYPE_SPARC32_ESPDMA_DEVICE); espdma = qdev_create(NULL, TYPE_SPARC32_ESPDMA_DEVICE);
object_property_set_link(OBJECT(espdma), iommu, "iommu", errp); object_property_set_link(OBJECT(espdma), iommu, "iommu", errp);
object_property_add_child(OBJECT(s), "espdma", OBJECT(espdma), errp); object_property_add_child(OBJECT(s), "espdma", OBJECT(espdma));
qdev_init_nofail(espdma); qdev_init_nofail(espdma);
esp = DEVICE(object_resolve_path_component(OBJECT(espdma), "esp")); esp = DEVICE(object_resolve_path_component(OBJECT(espdma), "esp"));
@ -395,7 +395,7 @@ static void sparc32_dma_realize(DeviceState *dev, Error **errp)
ledma = qdev_create(NULL, TYPE_SPARC32_LEDMA_DEVICE); ledma = qdev_create(NULL, TYPE_SPARC32_LEDMA_DEVICE);
object_property_set_link(OBJECT(ledma), iommu, "iommu", errp); object_property_set_link(OBJECT(ledma), iommu, "iommu", errp);
object_property_add_child(OBJECT(s), "ledma", OBJECT(ledma), errp); object_property_add_child(OBJECT(s), "ledma", OBJECT(ledma));
qdev_init_nofail(ledma); qdev_init_nofail(ledma);
lance = DEVICE(object_resolve_path_component(OBJECT(ledma), "lance")); lance = DEVICE(object_resolve_path_component(OBJECT(ledma), "lance"));

12
hw/dma/xilinx_axidma.c
View File

@ -543,16 +543,11 @@ static void xilinx_axidma_realize(DeviceState *dev, Error **errp)
object_property_add_link(OBJECT(ds), "dma", TYPE_XILINX_AXI_DMA, object_property_add_link(OBJECT(ds), "dma", TYPE_XILINX_AXI_DMA,
(Object **)&ds->dma, (Object **)&ds->dma,
object_property_allow_set_link, object_property_allow_set_link,
OBJ_PROP_LINK_STRONG, OBJ_PROP_LINK_STRONG);
&local_err);
object_property_add_link(OBJECT(cs), "dma", TYPE_XILINX_AXI_DMA, object_property_add_link(OBJECT(cs), "dma", TYPE_XILINX_AXI_DMA,
(Object **)&cs->dma, (Object **)&cs->dma,
object_property_allow_set_link, object_property_allow_set_link,
OBJ_PROP_LINK_STRONG, OBJ_PROP_LINK_STRONG);
&local_err);
if (local_err) {
goto xilinx_axidma_realize_fail;
}
object_property_set_link(OBJECT(ds), OBJECT(s), "dma", &local_err); object_property_set_link(OBJECT(ds), OBJECT(s), "dma", &local_err);
object_property_set_link(OBJECT(cs), OBJECT(s), "dma", &local_err); object_property_set_link(OBJECT(cs), OBJECT(s), "dma", &local_err);
if (local_err) { if (local_err) {
@ -594,8 +589,7 @@ static void xilinx_axidma_init(Object *obj)
object_property_add_link(obj, "dma", TYPE_MEMORY_REGION, object_property_add_link(obj, "dma", TYPE_MEMORY_REGION,
(Object **)&s->dma_mr, (Object **)&s->dma_mr,
qdev_prop_allow_set_link_before_realize, qdev_prop_allow_set_link_before_realize,
OBJ_PROP_LINK_STRONG, OBJ_PROP_LINK_STRONG);
&error_abort);
sysbus_init_irq(sbd, &s->streams[0].irq); sysbus_init_irq(sbd, &s->streams[0].irq);
sysbus_init_irq(sbd, &s->streams[1].irq); sysbus_init_irq(sbd, &s->streams[1].irq);

3
hw/dma/xlnx-zdma.c
View File

@ -799,8 +799,7 @@ static void zdma_init(Object *obj)
object_property_add_link(obj, "dma", TYPE_MEMORY_REGION, object_property_add_link(obj, "dma", TYPE_MEMORY_REGION,
(Object **)&s->dma_mr, (Object **)&s->dma_mr,
qdev_prop_allow_set_link_before_realize, qdev_prop_allow_set_link_before_realize,
OBJ_PROP_LINK_STRONG, OBJ_PROP_LINK_STRONG);
&error_abort);
} }
static const VMStateDescription vmstate_zdma = { static const VMStateDescription vmstate_zdma = {

2
hw/gpio/aspeed_gpio.c
View File

@ -873,7 +873,7 @@ static void aspeed_gpio_init(Object *obj)
name = g_strdup_printf("gpio%s%d", props->group_label[group_idx], name = g_strdup_printf("gpio%s%d", props->group_label[group_idx],
pin_idx % GPIOS_PER_GROUP); pin_idx % GPIOS_PER_GROUP);
object_property_add(obj, name, "bool", aspeed_gpio_get_pin, object_property_add(obj, name, "bool", aspeed_gpio_get_pin,
aspeed_gpio_set_pin, NULL, NULL, NULL); aspeed_gpio_set_pin, NULL, NULL);
g_free(name); g_free(name);
} }
} }

2
hw/hyperv/hyperv.c
View File

@ -131,7 +131,7 @@ void hyperv_synic_add(CPUState *cs)
obj = object_new(TYPE_SYNIC); obj = object_new(TYPE_SYNIC);
synic = SYNIC(obj); synic = SYNIC(obj);
synic->cs = cs; synic->cs = cs;
object_property_add_child(OBJECT(cs), "synic", obj, &error_abort); object_property_add_child(OBJECT(cs), "synic", obj);
object_unref(obj); object_unref(obj);
object_property_set_bool(obj, true, "realized", &error_abort); object_property_set_bool(obj, true, "realized", &error_abort);
} }

15
hw/i386/microvm.c
View File

@ -510,42 +510,39 @@ static void microvm_class_init(ObjectClass *oc, void *data)
object_class_property_add(oc, MICROVM_MACHINE_PIC, "OnOffAuto", object_class_property_add(oc, MICROVM_MACHINE_PIC, "OnOffAuto",
microvm_machine_get_pic, microvm_machine_get_pic,
microvm_machine_set_pic, microvm_machine_set_pic,
NULL, NULL, &error_abort); NULL, NULL);
object_class_property_set_description(oc, MICROVM_MACHINE_PIC, object_class_property_set_description(oc, MICROVM_MACHINE_PIC,
"Enable i8259 PIC"); "Enable i8259 PIC");
object_class_property_add(oc, MICROVM_MACHINE_PIT, "OnOffAuto", object_class_property_add(oc, MICROVM_MACHINE_PIT, "OnOffAuto",
microvm_machine_get_pit, microvm_machine_get_pit,
microvm_machine_set_pit, microvm_machine_set_pit,
NULL, NULL, &error_abort); NULL, NULL);
object_class_property_set_description(oc, MICROVM_MACHINE_PIT, object_class_property_set_description(oc, MICROVM_MACHINE_PIT,
"Enable i8254 PIT"); "Enable i8254 PIT");
object_class_property_add(oc, MICROVM_MACHINE_RTC, "OnOffAuto", object_class_property_add(oc, MICROVM_MACHINE_RTC, "OnOffAuto",
microvm_machine_get_rtc, microvm_machine_get_rtc,
microvm_machine_set_rtc, microvm_machine_set_rtc,
NULL, NULL, &error_abort); NULL, NULL);
object_class_property_set_description(oc, MICROVM_MACHINE_RTC, object_class_property_set_description(oc, MICROVM_MACHINE_RTC,
"Enable MC146818 RTC"); "Enable MC146818 RTC");
object_class_property_add_bool(oc, MICROVM_MACHINE_ISA_SERIAL, object_class_property_add_bool(oc, MICROVM_MACHINE_ISA_SERIAL,
microvm_machine_get_isa_serial, microvm_machine_get_isa_serial,
microvm_machine_set_isa_serial, microvm_machine_set_isa_serial);
&error_abort);
object_class_property_set_description(oc, MICROVM_MACHINE_ISA_SERIAL, object_class_property_set_description(oc, MICROVM_MACHINE_ISA_SERIAL,
"Set off to disable the instantiation an ISA serial port"); "Set off to disable the instantiation an ISA serial port");
object_class_property_add_bool(oc, MICROVM_MACHINE_OPTION_ROMS, object_class_property_add_bool(oc, MICROVM_MACHINE_OPTION_ROMS,
microvm_machine_get_option_roms, microvm_machine_get_option_roms,
microvm_machine_set_option_roms, microvm_machine_set_option_roms);
&error_abort);
object_class_property_set_description(oc, MICROVM_MACHINE_OPTION_ROMS, object_class_property_set_description(oc, MICROVM_MACHINE_OPTION_ROMS,
"Set off to disable loading option ROMs"); "Set off to disable loading option ROMs");
object_class_property_add_bool(oc, MICROVM_MACHINE_AUTO_KERNEL_CMDLINE, object_class_property_add_bool(oc, MICROVM_MACHINE_AUTO_KERNEL_CMDLINE,
microvm_machine_get_auto_kernel_cmdline, microvm_machine_get_auto_kernel_cmdline,
microvm_machine_set_auto_kernel_cmdline, microvm_machine_set_auto_kernel_cmdline);
&error_abort);
object_class_property_set_description(oc, object_class_property_set_description(oc,
MICROVM_MACHINE_AUTO_KERNEL_CMDLINE, MICROVM_MACHINE_AUTO_KERNEL_CMDLINE,
"Set off to disable adding virtio-mmio devices to the kernel cmdline"); "Set off to disable adding virtio-mmio devices to the kernel cmdline");

12
hw/i386/pc.c
View File

@ -662,7 +662,7 @@ void pc_cmos_init(PCMachineState *pcms,
TYPE_ISA_DEVICE, TYPE_ISA_DEVICE,
(Object **)&x86ms->rtc, (Object **)&x86ms->rtc,
object_property_allow_set_link, object_property_allow_set_link,
OBJ_PROP_LINK_STRONG, &error_abort); OBJ_PROP_LINK_STRONG);
object_property_set_link(OBJECT(pcms), OBJECT(s), object_property_set_link(OBJECT(pcms), OBJECT(s),
"rtc_state", &error_abort); "rtc_state", &error_abort);
@ -1965,22 +1965,22 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
object_class_property_add(oc, PC_MACHINE_DEVMEM_REGION_SIZE, "int", object_class_property_add(oc, PC_MACHINE_DEVMEM_REGION_SIZE, "int",
pc_machine_get_device_memory_region_size, NULL, pc_machine_get_device_memory_region_size, NULL,
NULL, NULL, &error_abort); NULL, NULL);
object_class_property_add(oc, PC_MACHINE_VMPORT, "OnOffAuto", object_class_property_add(oc, PC_MACHINE_VMPORT, "OnOffAuto",
pc_machine_get_vmport, pc_machine_set_vmport, pc_machine_get_vmport, pc_machine_set_vmport,
NULL, NULL, &error_abort); NULL, NULL);
object_class_property_set_description(oc, PC_MACHINE_VMPORT, object_class_property_set_description(oc, PC_MACHINE_VMPORT,
"Enable vmport (pc & q35)"); "Enable vmport (pc & q35)");
object_class_property_add_bool(oc, PC_MACHINE_SMBUS, object_class_property_add_bool(oc, PC_MACHINE_SMBUS,
pc_machine_get_smbus, pc_machine_set_smbus, &error_abort); pc_machine_get_smbus, pc_machine_set_smbus);
object_class_property_add_bool(oc, PC_MACHINE_SATA, object_class_property_add_bool(oc, PC_MACHINE_SATA,
pc_machine_get_sata, pc_machine_set_sata, &error_abort); pc_machine_get_sata, pc_machine_set_sata);
object_class_property_add_bool(oc, PC_MACHINE_PIT, object_class_property_add_bool(oc, PC_MACHINE_PIT,
pc_machine_get_pit, pc_machine_set_pit, &error_abort); pc_machine_get_pit, pc_machine_set_pit);
} }
static const TypeInfo pc_machine_info = { static const TypeInfo pc_machine_info = {

2
hw/i386/pc_piix.c
View File

@ -291,7 +291,7 @@ static void pc_init1(MachineState *machine,
TYPE_HOTPLUG_HANDLER, TYPE_HOTPLUG_HANDLER,
(Object **)&pcms->acpi_dev, (Object **)&pcms->acpi_dev,
object_property_allow_set_link, object_property_allow_set_link,
OBJ_PROP_LINK_STRONG, &error_abort); OBJ_PROP_LINK_STRONG);
object_property_set_link(OBJECT(machine), OBJECT(piix4_pm), object_property_set_link(OBJECT(machine), OBJECT(piix4_pm),
PC_MACHINE_ACPI_DEVICE_PROP, &error_abort); PC_MACHINE_ACPI_DEVICE_PROP, &error_abort);
} }

4
hw/i386/pc_q35.c
View File

@ -214,7 +214,7 @@ static void pc_q35_init(MachineState *machine)
/* create pci host bus */ /* create pci host bus */
q35_host = Q35_HOST_DEVICE(qdev_create(NULL, TYPE_Q35_HOST_DEVICE)); q35_host = Q35_HOST_DEVICE(qdev_create(NULL, TYPE_Q35_HOST_DEVICE));
object_property_add_child(qdev_get_machine(), "q35", OBJECT(q35_host), NULL); object_property_add_child(qdev_get_machine(), "q35", OBJECT(q35_host));
object_property_set_link(OBJECT(q35_host), OBJECT(ram_memory), object_property_set_link(OBJECT(q35_host), OBJECT(ram_memory),
MCH_HOST_PROP_RAM_MEM, NULL); MCH_HOST_PROP_RAM_MEM, NULL);
object_property_set_link(OBJECT(q35_host), OBJECT(pci_memory), object_property_set_link(OBJECT(q35_host), OBJECT(pci_memory),
@ -240,7 +240,7 @@ static void pc_q35_init(MachineState *machine)
TYPE_HOTPLUG_HANDLER, TYPE_HOTPLUG_HANDLER,
(Object **)&pcms->acpi_dev, (Object **)&pcms->acpi_dev,
object_property_allow_set_link, object_property_allow_set_link,
OBJ_PROP_LINK_STRONG, &error_abort); OBJ_PROP_LINK_STRONG);
object_property_set_link(OBJECT(machine), OBJECT(lpc), object_property_set_link(OBJECT(machine), OBJECT(lpc),
PC_MACHINE_ACPI_DEVICE_PROP, &error_abort); PC_MACHINE_ACPI_DEVICE_PROP, &error_abort);

5
hw/i386/pc_sysfw.c
View File

@ -90,10 +90,9 @@ static PFlashCFI01 *pc_pflash_create(PCMachineState *pcms,
qdev_prop_set_uint64(dev, "sector-length", FLASH_SECTOR_SIZE); qdev_prop_set_uint64(dev, "sector-length", FLASH_SECTOR_SIZE);
qdev_prop_set_uint8(dev, "width", 1); qdev_prop_set_uint8(dev, "width", 1);
qdev_prop_set_string(dev, "name", name); qdev_prop_set_string(dev, "name", name);
object_property_add_child(OBJECT(pcms), name, OBJECT(dev), object_property_add_child(OBJECT(pcms), name, OBJECT(dev));
&error_abort);
object_property_add_alias(OBJECT(pcms), alias_prop_name, object_property_add_alias(OBJECT(pcms), alias_prop_name,
OBJECT(dev), "drive", &error_abort); OBJECT(dev), "drive");
return PFLASH_CFI01(dev); return PFLASH_CFI01(dev);
} }

8
hw/i386/x86.c
View File

@ -350,7 +350,7 @@ void ioapic_init_gsi(GSIState *gsi_state, const char *parent_name)
dev = qdev_create(NULL, TYPE_IOAPIC); dev = qdev_create(NULL, TYPE_IOAPIC);
} }
object_property_add_child(object_resolve_path(parent_name, NULL), object_property_add_child(object_resolve_path(parent_name, NULL),
"ioapic", OBJECT(dev), NULL); "ioapic", OBJECT(dev));
qdev_init_nofail(dev); qdev_init_nofail(dev);
d = SYS_BUS_DEVICE(dev); d = SYS_BUS_DEVICE(dev);
sysbus_mmio_map(d, 0, IO_APIC_DEFAULT_ADDRESS); sysbus_mmio_map(d, 0, IO_APIC_DEFAULT_ADDRESS);
@ -982,19 +982,19 @@ static void x86_machine_class_init(ObjectClass *oc, void *data)
object_class_property_add(oc, X86_MACHINE_MAX_RAM_BELOW_4G, "size", object_class_property_add(oc, X86_MACHINE_MAX_RAM_BELOW_4G, "size",
x86_machine_get_max_ram_below_4g, x86_machine_set_max_ram_below_4g, x86_machine_get_max_ram_below_4g, x86_machine_set_max_ram_below_4g,
NULL, NULL, &error_abort); NULL, NULL);
object_class_property_set_description(oc, X86_MACHINE_MAX_RAM_BELOW_4G, object_class_property_set_description(oc, X86_MACHINE_MAX_RAM_BELOW_4G,
"Maximum ram below the 4G boundary (32bit boundary)"); "Maximum ram below the 4G boundary (32bit boundary)");
object_class_property_add(oc, X86_MACHINE_SMM, "OnOffAuto", object_class_property_add(oc, X86_MACHINE_SMM, "OnOffAuto",
x86_machine_get_smm, x86_machine_set_smm, x86_machine_get_smm, x86_machine_set_smm,
NULL, NULL, &error_abort); NULL, NULL);
object_class_property_set_description(oc, X86_MACHINE_SMM, object_class_property_set_description(oc, X86_MACHINE_SMM,
"Enable SMM"); "Enable SMM");
object_class_property_add(oc, X86_MACHINE_ACPI, "OnOffAuto", object_class_property_add(oc, X86_MACHINE_ACPI, "OnOffAuto",
x86_machine_get_acpi, x86_machine_set_acpi, x86_machine_get_acpi, x86_machine_set_acpi,
NULL, NULL, &error_abort); NULL, NULL);
object_class_property_set_description(oc, X86_MACHINE_ACPI, object_class_property_set_description(oc, X86_MACHINE_ACPI,
"Enable ACPI"); "Enable ACPI");
} }

2
hw/ide/macio.c
View File

@ -459,7 +459,7 @@ static void macio_ide_initfn(Object *obj)
object_property_add_link(obj, "dbdma", TYPE_MAC_DBDMA, object_property_add_link(obj, "dbdma", TYPE_MAC_DBDMA,
(Object **) &s->dbdma, (Object **) &s->dbdma,
qdev_prop_allow_set_link_before_realize, 0, NULL); qdev_prop_allow_set_link_before_realize, 0);
} }
static Property macio_ide_properties[] = { static Property macio_ide_properties[] = {

2
hw/ide/qdev.c
View File

@ -266,7 +266,7 @@ static void ide_dev_instance_init(Object *obj)
{ {
object_property_add(obj, "bootindex", "int32", object_property_add(obj, "bootindex", "int32",
ide_dev_get_bootindex, ide_dev_get_bootindex,
ide_dev_set_bootindex, NULL, NULL, NULL); ide_dev_set_bootindex, NULL, NULL);
object_property_set_int(obj, -1, "bootindex", NULL); object_property_set_int(obj, -1, "bootindex", NULL);
} }

2
hw/input/vhost-user-input.c
View File

@ -101,7 +101,7 @@ static void vhost_input_init(Object *obj)
vhi->vhost = VHOST_USER_BACKEND(object_new(TYPE_VHOST_USER_BACKEND)); vhi->vhost = VHOST_USER_BACKEND(object_new(TYPE_VHOST_USER_BACKEND));
object_property_add_alias(obj, "chardev", object_property_add_alias(obj, "chardev",
OBJECT(vhi->vhost), "chardev", &error_abort); OBJECT(vhi->vhost), "chardev");
} }
static void vhost_input_finalize(Object *obj) static void vhost_input_finalize(Object *obj)

2
hw/intc/apic_common.c
View File

@ -445,7 +445,7 @@ static void apic_common_initfn(Object *obj)
s->id = s->initial_apic_id = -1; s->id = s->initial_apic_id = -1;
object_property_add(obj, "id", "uint32", object_property_add(obj, "id", "uint32",
apic_common_get_id, apic_common_get_id,
apic_common_set_id, NULL, NULL, NULL); apic_common_set_id, NULL, NULL);
} }
static void apic_common_class_init(ObjectClass *klass, void *data) static void apic_common_class_init(ObjectClass *klass, void *data)

4
hw/intc/s390_flic.c
View File

@ -65,11 +65,11 @@ void s390_flic_init(void)
if (kvm_enabled()) { if (kvm_enabled()) {
dev = qdev_create(NULL, TYPE_KVM_S390_FLIC); dev = qdev_create(NULL, TYPE_KVM_S390_FLIC);
object_property_add_child(qdev_get_machine(), TYPE_KVM_S390_FLIC, object_property_add_child(qdev_get_machine(), TYPE_KVM_S390_FLIC,
OBJECT(dev), NULL); OBJECT(dev));
} else { } else {
dev = qdev_create(NULL, TYPE_QEMU_S390_FLIC); dev = qdev_create(NULL, TYPE_QEMU_S390_FLIC);
object_property_add_child(qdev_get_machine(), TYPE_QEMU_S390_FLIC, object_property_add_child(qdev_get_machine(), TYPE_QEMU_S390_FLIC,
OBJECT(dev), NULL); OBJECT(dev));
} }
qdev_init_nofail(dev); qdev_init_nofail(dev);
} }

2
hw/intc/xics.c
View File

@ -380,7 +380,7 @@ Object *icp_create(Object *cpu, const char *type, XICSFabric *xi, Error **errp)
Object *obj; Object *obj;
obj = object_new(type); obj = object_new(type);
object_property_add_child(cpu, type, obj, &error_abort); object_property_add_child(cpu, type, obj);
object_unref(obj); object_unref(obj);
object_property_set_link(obj, OBJECT(xi), ICP_PROP_XICS, &error_abort); object_property_set_link(obj, OBJECT(xi), ICP_PROP_XICS, &error_abort);
object_property_set_link(obj, cpu, ICP_PROP_CPU, &error_abort); object_property_set_link(obj, cpu, ICP_PROP_CPU, &error_abort);

2
hw/intc/xive.c
View File

@ -761,7 +761,7 @@ Object *xive_tctx_create(Object *cpu, XivePresenter *xptr, Error **errp)
Object *obj; Object *obj;
obj = object_new(TYPE_XIVE_TCTX); obj = object_new(TYPE_XIVE_TCTX);
object_property_add_child(cpu, TYPE_XIVE_TCTX, obj, &error_abort); object_property_add_child(cpu, TYPE_XIVE_TCTX, obj);
object_unref(obj); object_unref(obj);
object_property_set_link(obj, cpu, "cpu", &error_abort); object_property_set_link(obj, cpu, "cpu", &error_abort);
object_property_set_link(obj, OBJECT(xptr), "presenter", &error_abort); object_property_set_link(obj, OBJECT(xptr), "presenter", &error_abort);

3
hw/ipmi/ipmi.c
View File

@ -105,8 +105,7 @@ void ipmi_bmc_find_and_link(Object *obj, Object **bmc)
{ {
object_property_add_link(obj, "bmc", TYPE_IPMI_BMC, bmc, object_property_add_link(obj, "bmc", TYPE_IPMI_BMC, bmc,
isa_ipmi_bmc_check, isa_ipmi_bmc_check,
OBJ_PROP_LINK_STRONG, OBJ_PROP_LINK_STRONG);
&error_abort);
} }
static Property ipmi_bmc_properties[] = { static Property ipmi_bmc_properties[] = {

15
hw/isa/isa-superio.c
View File

@ -62,8 +62,7 @@ static void isa_superio_realize(DeviceState *dev, Error **errp)
qdev_prop_set_uint32(d, "irq", k->parallel.get_irq(sio, i)); qdev_prop_set_uint32(d, "irq", k->parallel.get_irq(sio, i));
} }
qdev_prop_set_chr(d, "chardev", chr); qdev_prop_set_chr(d, "chardev", chr);
object_property_add_child(OBJECT(sio), name, OBJECT(isa), object_property_add_child(OBJECT(dev), name, OBJECT(isa));
&error_abort);
qdev_init_nofail(d); qdev_init_nofail(d);
sio->parallel[i] = isa; sio->parallel[i] = isa;
trace_superio_create_parallel(i, trace_superio_create_parallel(i,
@ -102,8 +101,7 @@ static void isa_superio_realize(DeviceState *dev, Error **errp)
qdev_prop_set_uint32(d, "irq", k->serial.get_irq(sio, i)); qdev_prop_set_uint32(d, "irq", k->serial.get_irq(sio, i));
} }
qdev_prop_set_chr(d, "chardev", chr); qdev_prop_set_chr(d, "chardev", chr);
object_property_add_child(OBJECT(sio), name, OBJECT(isa), object_property_add_child(OBJECT(dev), name, OBJECT(isa));
&error_abort);
qdev_init_nofail(d); qdev_init_nofail(d);
sio->serial[i] = isa; sio->serial[i] = isa;
trace_superio_create_serial(i, trace_superio_create_serial(i,
@ -137,8 +135,7 @@ static void isa_superio_realize(DeviceState *dev, Error **errp)
qdev_prop_set_drive(d, "driveB", blk_by_legacy_dinfo(drive), qdev_prop_set_drive(d, "driveB", blk_by_legacy_dinfo(drive),
&error_fatal); &error_fatal);
} }
object_property_add_child(OBJECT(sio), "isa-fdc", OBJECT(isa), object_property_add_child(OBJECT(sio), "isa-fdc", OBJECT(isa));
&error_abort);
qdev_init_nofail(d); qdev_init_nofail(d);
sio->floppy = isa; sio->floppy = isa;
trace_superio_create_floppy(0, trace_superio_create_floppy(0,
@ -150,8 +147,7 @@ static void isa_superio_realize(DeviceState *dev, Error **errp)
/* Keyboard, mouse */ /* Keyboard, mouse */
isa = isa_create(bus, TYPE_I8042); isa = isa_create(bus, TYPE_I8042);
object_property_add_child(OBJECT(sio), TYPE_I8042, OBJECT(isa), object_property_add_child(OBJECT(sio), TYPE_I8042, OBJECT(isa));
&error_abort);
qdev_init_nofail(DEVICE(isa)); qdev_init_nofail(DEVICE(isa));
sio->kbc = isa; sio->kbc = isa;
@ -169,8 +165,7 @@ static void isa_superio_realize(DeviceState *dev, Error **errp)
qdev_prop_set_uint32(d, "irq", k->ide.get_irq(sio, 0)); qdev_prop_set_uint32(d, "irq", k->ide.get_irq(sio, 0));
} }
qdev_init_nofail(d); qdev_init_nofail(d);
object_property_add_child(OBJECT(sio), "isa-ide", OBJECT(isa), object_property_add_child(OBJECT(sio), "isa-ide", OBJECT(isa));
&error_abort);
sio->ide = isa; sio->ide = isa;
trace_superio_create_ide(0, trace_superio_create_ide(0,
k->ide.get_iobase ? k->ide.get_iobase ?

6
hw/isa/lpc_ich9.c
View File

@ -633,11 +633,11 @@ static void ich9_lpc_initfn(Object *obj)
static const uint8_t acpi_disable_cmd = ICH9_APM_ACPI_DISABLE; static const uint8_t acpi_disable_cmd = ICH9_APM_ACPI_DISABLE;
object_property_add_uint8_ptr(obj, ACPI_PM_PROP_SCI_INT, object_property_add_uint8_ptr(obj, ACPI_PM_PROP_SCI_INT,
&lpc->sci_gsi, OBJ_PROP_FLAG_READ, NULL); &lpc->sci_gsi, OBJ_PROP_FLAG_READ);
object_property_add_uint8_ptr(OBJECT(lpc), ACPI_PM_PROP_ACPI_ENABLE_CMD, object_property_add_uint8_ptr(OBJECT(lpc), ACPI_PM_PROP_ACPI_ENABLE_CMD,
&acpi_enable_cmd, OBJ_PROP_FLAG_READ, NULL); &acpi_enable_cmd, OBJ_PROP_FLAG_READ);
object_property_add_uint8_ptr(OBJECT(lpc), ACPI_PM_PROP_ACPI_DISABLE_CMD, object_property_add_uint8_ptr(OBJECT(lpc), ACPI_PM_PROP_ACPI_DISABLE_CMD,
&acpi_disable_cmd, OBJ_PROP_FLAG_READ, NULL); &acpi_disable_cmd, OBJ_PROP_FLAG_READ);
ich9_pm_add_properties(obj, &lpc->pm, NULL); ich9_pm_add_properties(obj, &lpc->pm, NULL);
} }

4
hw/mem/nvdimm.c
View File

@ -110,10 +110,10 @@ static void nvdimm_init(Object *obj)
{ {
object_property_add(obj, NVDIMM_LABEL_SIZE_PROP, "int", object_property_add(obj, NVDIMM_LABEL_SIZE_PROP, "int",
nvdimm_get_label_size, nvdimm_set_label_size, NULL, nvdimm_get_label_size, nvdimm_set_label_size, NULL,
NULL, NULL); NULL);
object_property_add(obj, NVDIMM_UUID_PROP, "QemuUUID", nvdimm_get_uuid, object_property_add(obj, NVDIMM_UUID_PROP, "QemuUUID", nvdimm_get_uuid,
nvdimm_set_uuid, NULL, NULL, NULL); nvdimm_set_uuid, NULL, NULL);
} }
static void nvdimm_finalize(Object *obj) static void nvdimm_finalize(Object *obj)

2
hw/mem/pc-dimm.c
View File

@ -165,7 +165,7 @@ static void pc_dimm_get_size(Object *obj, Visitor *v, const char *name,
static void pc_dimm_init(Object *obj) static void pc_dimm_init(Object *obj)
{ {
object_property_add(obj, PC_DIMM_SIZE_PROP, "uint64", pc_dimm_get_size, object_property_add(obj, PC_DIMM_SIZE_PROP, "uint64", pc_dimm_get_size,
NULL, NULL, NULL, &error_abort); NULL, NULL, NULL);
} }
static void pc_dimm_realize(DeviceState *dev, Error **errp) static void pc_dimm_realize(DeviceState *dev, Error **errp)

6
hw/microblaze/petalogix_ml605_mmu.c
View File

@ -138,10 +138,8 @@ petalogix_ml605_init(MachineState *machine)
dma = qdev_create(NULL, "xlnx.axi-dma"); dma = qdev_create(NULL, "xlnx.axi-dma");
/* FIXME: attach to the sysbus instead */ /* FIXME: attach to the sysbus instead */
object_property_add_child(qdev_get_machine(), "xilinx-eth", OBJECT(eth0), object_property_add_child(qdev_get_machine(), "xilinx-eth", OBJECT(eth0));
NULL); object_property_add_child(qdev_get_machine(), "xilinx-dma", OBJECT(dma));
object_property_add_child(qdev_get_machine(), "xilinx-dma", OBJECT(dma),
NULL);
ds = object_property_get_link(OBJECT(dma), ds = object_property_get_link(OBJECT(dma),
"axistream-connected-target", NULL); "axistream-connected-target", NULL);

2
hw/misc/aspeed_sdmc.c
View File

@ -250,7 +250,7 @@ static void aspeed_sdmc_initfn(Object *obj)
{ {
object_property_add(obj, "ram-size", "int", object_property_add(obj, "ram-size", "int",
aspeed_sdmc_get_ram_size, aspeed_sdmc_set_ram_size, aspeed_sdmc_get_ram_size, aspeed_sdmc_set_ram_size,
NULL, NULL, NULL); NULL, NULL);
} }
static void aspeed_sdmc_realize(DeviceState *dev, Error **errp) static void aspeed_sdmc_realize(DeviceState *dev, Error **errp)

3
hw/misc/edu.c
View File

@ -402,8 +402,7 @@ static void edu_instance_init(Object *obj)
edu->dma_mask = (1UL << 28) - 1; edu->dma_mask = (1UL << 28) - 1;
object_property_add_uint64_ptr(obj, "dma_mask", object_property_add_uint64_ptr(obj, "dma_mask",
&edu->dma_mask, OBJ_PROP_FLAG_READWRITE, &edu->dma_mask, OBJ_PROP_FLAG_READWRITE);
NULL);
} }
static void edu_class_init(ObjectClass *class, void *data) static void edu_class_init(ObjectClass *class, void *data)

4
hw/misc/mac_via.c
View File

@ -885,10 +885,10 @@ static void mac_via_realize(DeviceState *dev, Error **errp)
/* Pass through mos6522 output IRQs */ /* Pass through mos6522 output IRQs */
ms = MOS6522(&m->mos6522_via1); ms = MOS6522(&m->mos6522_via1);
object_property_add_alias(OBJECT(dev), "irq[0]", OBJECT(ms), object_property_add_alias(OBJECT(dev), "irq[0]", OBJECT(ms),
SYSBUS_DEVICE_GPIO_IRQ "[0]", &error_abort); SYSBUS_DEVICE_GPIO_IRQ "[0]");
ms = MOS6522(&m->mos6522_via2); ms = MOS6522(&m->mos6522_via2);
object_property_add_alias(OBJECT(dev), "irq[1]", OBJECT(ms), object_property_add_alias(OBJECT(dev), "irq[1]", OBJECT(ms),
SYSBUS_DEVICE_GPIO_IRQ "[0]", &error_abort); SYSBUS_DEVICE_GPIO_IRQ "[0]");
/* Pass through mos6522 input IRQs */ /* Pass through mos6522 input IRQs */
qdev_pass_gpios(DEVICE(&m->mos6522_via1), dev, "via1-irq"); qdev_pass_gpios(DEVICE(&m->mos6522_via1), dev, "via1-irq");

2
hw/misc/macio/gpio.c
View File

@ -170,7 +170,7 @@ static void macio_gpio_init(Object *obj)
object_property_add_link(obj, "pic", TYPE_OPENPIC, object_property_add_link(obj, "pic", TYPE_OPENPIC,
(Object **) &s->pic, (Object **) &s->pic,
qdev_prop_allow_set_link_before_realize, qdev_prop_allow_set_link_before_realize,
0, NULL); 0);
memory_region_init_io(&s->gpiomem, OBJECT(s), &macio_gpio_ops, obj, memory_region_init_io(&s->gpiomem, OBJECT(s), &macio_gpio_ops, obj,
"gpio", 0x30); "gpio", 0x30);

4
hw/misc/macio/macio.c
View File

@ -241,7 +241,7 @@ static void macio_oldworld_init(Object *obj)
object_property_add_link(obj, "pic", TYPE_HEATHROW, object_property_add_link(obj, "pic", TYPE_HEATHROW,
(Object **) &os->pic, (Object **) &os->pic,
qdev_prop_allow_set_link_before_realize, qdev_prop_allow_set_link_before_realize,
0, NULL); 0);
macio_init_child_obj(s, "cuda", &s->cuda, sizeof(s->cuda), TYPE_CUDA); macio_init_child_obj(s, "cuda", &s->cuda, sizeof(s->cuda), TYPE_CUDA);
@ -397,7 +397,7 @@ static void macio_newworld_init(Object *obj)
object_property_add_link(obj, "pic", TYPE_OPENPIC, object_property_add_link(obj, "pic", TYPE_OPENPIC,
(Object **) &ns->pic, (Object **) &ns->pic,
qdev_prop_allow_set_link_before_realize, qdev_prop_allow_set_link_before_realize,
0, NULL); 0);
macio_init_child_obj(s, "gpio", &ns->gpio, sizeof(ns->gpio), macio_init_child_obj(s, "gpio", &ns->gpio, sizeof(ns->gpio),
TYPE_MACIO_GPIO); TYPE_MACIO_GPIO);

2
hw/misc/macio/pmu.c
View File

@ -773,7 +773,7 @@ static void pmu_init(Object *obj)
object_property_add_link(obj, "gpio", TYPE_MACIO_GPIO, object_property_add_link(obj, "gpio", TYPE_MACIO_GPIO,
(Object **) &s->gpio, (Object **) &s->gpio,
qdev_prop_allow_set_link_before_realize, qdev_prop_allow_set_link_before_realize,
0, NULL); 0);
sysbus_init_child_obj(obj, "mos6522-pmu", &s->mos6522_pmu, sysbus_init_child_obj(obj, "mos6522-pmu", &s->mos6522_pmu,
sizeof(s->mos6522_pmu), TYPE_MOS6522_PMU); sizeof(s->mos6522_pmu), TYPE_MOS6522_PMU);

2
hw/misc/pca9552.c
View File

@ -298,7 +298,7 @@ static void pca9552_initfn(Object *obj)
name = g_strdup_printf("led%d", led); name = g_strdup_printf("led%d", led);
object_property_add(obj, name, "bool", pca9552_get_led, pca9552_set_led, object_property_add(obj, name, "bool", pca9552_get_led, pca9552_set_led,
NULL, NULL, NULL); NULL, NULL);
g_free(name); g_free(name);
} }
} }

2
hw/misc/tmp105.c
View File

@ -245,7 +245,7 @@ static void tmp105_initfn(Object *obj)
{ {
object_property_add(obj, "temperature", "int", object_property_add(obj, "temperature", "int",
tmp105_get_temperature, tmp105_get_temperature,
tmp105_set_temperature, NULL, NULL, NULL); tmp105_set_temperature, NULL, NULL);
} }
static void tmp105_class_init(ObjectClass *klass, void *data) static void tmp105_class_init(ObjectClass *klass, void *data)

8
hw/misc/tmp421.c
View File

@ -347,16 +347,16 @@ static void tmp421_initfn(Object *obj)
{ {
object_property_add(obj, "temperature0", "int", object_property_add(obj, "temperature0", "int",
tmp421_get_temperature, tmp421_get_temperature,
tmp421_set_temperature, NULL, NULL, NULL); tmp421_set_temperature, NULL, NULL);
object_property_add(obj, "temperature1", "int", object_property_add(obj, "temperature1", "int",
tmp421_get_temperature, tmp421_get_temperature,
tmp421_set_temperature, NULL, NULL, NULL); tmp421_set_temperature, NULL, NULL);
object_property_add(obj, "temperature2", "int", object_property_add(obj, "temperature2", "int",
tmp421_get_temperature, tmp421_get_temperature,
tmp421_set_temperature, NULL, NULL, NULL); tmp421_set_temperature, NULL, NULL);
object_property_add(obj, "temperature3", "int", object_property_add(obj, "temperature3", "int",
tmp421_get_temperature, tmp421_get_temperature,
tmp421_set_temperature, NULL, NULL, NULL); tmp421_set_temperature, NULL, NULL);
} }
static void tmp421_class_init(ObjectClass *klass, void *data) static void tmp421_class_init(ObjectClass *klass, void *data)

Some files were not shown because too many files have changed in this diff Show More