[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/16] qom: create objects in two phases
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 10/16] qom: create objects in two phases |
Date: |
Fri, 8 May 2015 14:07:55 +0200 |
From: "Daniel P. Berrange" <address@hidden>
Some types of object must be created before chardevs, other types of
object must be created after chardevs. As such there is no option but
to create objects in two phases.
This takes the decision to create as many object types as possible
in the first phase, and only delay those which have a dependency on
the chardevs. Hopefully the set which need delaying will remain
small.
Signed-off-by: Daniel P. Berrange <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
vl.c | 40 +++++++++++++++++++++++++++++++++++++++-
1 file changed, 39 insertions(+), 1 deletion(-)
diff --git a/vl.c b/vl.c
index 74c2681..ee2f70a 100644
--- a/vl.c
+++ b/vl.c
@@ -2591,6 +2591,33 @@ static int machine_set_property(const char *name, const
char *value,
return 0;
}
+
+/**
+ * Initial object creation happens before all other
+ * QEMU data types are created. The majority of objects
+ * can be created at this point. The rng-egd object
+ * cannot be created here, as it depends on the chardev
+ * already existing.
+ */
+static bool object_create_initial(const char *type)
+{
+ if (g_str_equal(type, "rng-egd")) {
+ return false;
+ }
+ return true;
+}
+
+
+/**
+ * The remainder of object creation happens after the
+ * creation of chardev, fsdev and device data types.
+ */
+static bool object_create_delayed(const char *type)
+{
+ return !object_create_initial(type);
+}
+
+
static int object_create(QemuOpts *opts, void *opaque)
{
Error *err = NULL;
@@ -2599,6 +2626,7 @@ static int object_create(QemuOpts *opts, void *opaque)
void *dummy = NULL;
OptsVisitor *ov;
QDict *pdict;
+ bool (*type_predicate)(const char *) = opaque;
ov = opts_visitor_new(opts);
pdict = qemu_opts_to_qdict(opts, NULL);
@@ -2613,6 +2641,9 @@ static int object_create(QemuOpts *opts, void *opaque)
if (err) {
goto out;
}
+ if (!type_predicate(type)) {
+ goto out;
+ }
qdict_del(pdict, "id");
visit_type_str(opts_get_visitor(ov), &id, "id", &err);
@@ -4008,6 +4039,12 @@ int main(int argc, char **argv, char **envp)
socket_init();
+ if (qemu_opts_foreach(qemu_find_opts("object"),
+ object_create,
+ object_create_initial, 0) != 0) {
+ exit(1);
+ }
+
if (qemu_opts_foreach(qemu_find_opts("chardev"), chardev_init_func, NULL,
1) != 0)
exit(1);
#ifdef CONFIG_VIRTFS
@@ -4027,7 +4064,8 @@ int main(int argc, char **argv, char **envp)
}
if (qemu_opts_foreach(qemu_find_opts("object"),
- object_create, NULL, 0) != 0) {
+ object_create,
+ object_create_delayed, 0) != 0) {
exit(1);
}
--
2.3.5
- [Qemu-devel] [PULL 01/16] kvm: Silence warning from valgrind, (continued)
- [Qemu-devel] [PULL 01/16] kvm: Silence warning from valgrind, Paolo Bonzini, 2015/05/08
- [Qemu-devel] [PULL 02/16] apic_common: improve readability of apic_reset_common, Paolo Bonzini, 2015/05/08
- [Qemu-devel] [PULL 03/16] mtree: tag & indent a bit better, Paolo Bonzini, 2015/05/08
- [Qemu-devel] [PULL 04/16] mtree: also print disabled regions, Paolo Bonzini, 2015/05/08
- [Qemu-devel] [PULL 05/16] kvm: add support for memory transaction attributes, Paolo Bonzini, 2015/05/08
- [Qemu-devel] [PULL 06/16] exec: move rcu_read_lock/unlock to address_space_translate callers, Paolo Bonzini, 2015/05/08
- [Qemu-devel] [PULL 07/16] configure: require __thread support, Paolo Bonzini, 2015/05/08
- [Qemu-devel] [PULL 09/16] qom: document user creatable object types in help text, Paolo Bonzini, 2015/05/08
- [Qemu-devel] [PULL 08/16] qom: fix typename of 'policy' enum property in hostmem obj, Paolo Bonzini, 2015/05/08
- [Qemu-devel] [PULL 10/16] qom: create objects in two phases,
Paolo Bonzini <=
- [Qemu-devel] [PULL 12/16] qom: make enum string tables const-correct, Paolo Bonzini, 2015/05/08
- [Qemu-devel] [PULL 11/16] qom: add object_new_propv / object_new_proplist constructors, Paolo Bonzini, 2015/05/08
- [Qemu-devel] [PULL 13/16] qom: add a object_property_add_enum helper method, Paolo Bonzini, 2015/05/08
- [Qemu-devel] [PULL 14/16] qom: don't pass string table to object_get_enum method, Paolo Bonzini, 2015/05/08
- [Qemu-devel] [PULL 16/16] qemu-nbd: only send a limited number of errno codes on the wire, Paolo Bonzini, 2015/05/08
- Re: [Qemu-devel] [PULL 00/16] KVM, QOM, NBD, build fixes for 2015-05-08, Andreas Färber, 2015/05/08
- Re: [Qemu-devel] [PULL 00/16] KVM, QOM, NBD, build fixes for 2015-05-08, Daniel P. Berrange, 2015/05/08
- Re: [Qemu-devel] [PULL 00/16] KVM, QOM, NBD, build fixes for 2015-05-08, Andreas Färber, 2015/05/08
- Re: [Qemu-devel] [PULL 00/16] KVM, QOM, NBD, build fixes for 2015-05-08, Daniel P. Berrange, 2015/05/08
- Re: [Qemu-devel] [PULL 00/16] KVM, QOM, NBD, build fixes for 2015-05-08, Daniel P. Berrange, 2015/05/12