[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/7] qom: create objects in two phases
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH 3/7] qom: create objects in two phases |
Date: |
Thu, 30 Apr 2015 15:42:20 +0100 |
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>
---
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.1.0
- [Qemu-devel] [PATCH 0/7] qom: misc fixes & enhancements to support TLS work, Daniel P. Berrange, 2015/04/30
- [Qemu-devel] [PATCH 2/7] qom: document user creatable object types in help text, Daniel P. Berrange, 2015/04/30
- [Qemu-devel] [PATCH 1/7] qom: fix typename of 'policy' enum property in hostmem obj, Daniel P. Berrange, 2015/04/30
- [Qemu-devel] [PATCH 5/7] qom: make enum string tables const-correct, Daniel P. Berrange, 2015/04/30
- [Qemu-devel] [PATCH 7/7] qom: don't pass string table to object_get_enum method, Daniel P. Berrange, 2015/04/30
- [Qemu-devel] [PATCH 4/7] qom: add object_new_propv / object_new_proplist constructors, Daniel P. Berrange, 2015/04/30
- [Qemu-devel] [PATCH 3/7] qom: create objects in two phases,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH 6/7] qom: add a object_property_add_enum helper method, Daniel P. Berrange, 2015/04/30