[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/14] vl.c: init delayed object after net_init_clien
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL 05/14] vl.c: init delayed object after net_init_clients |
Date: |
Mon, 12 Oct 2015 16:17:07 +0800 |
From: Yang Hongyang <address@hidden>
Init delayed object after net_init_clients, because netfilters need
to be initialized after net clients initialized.
Signed-off-by: Yang Hongyang <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
vl.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/vl.c b/vl.c
index f2bd8d2..17ae26c 100644
--- a/vl.c
+++ b/vl.c
@@ -2767,13 +2767,14 @@ static bool object_create_initial(const char *type)
if (g_str_equal(type, "rng-egd")) {
return false;
}
+ /* TODO: implement netfilters */
return true;
}
/*
* The remainder of object creation happens after the
- * creation of chardev, fsdev and device data types.
+ * creation of chardev, fsdev, net clients and device data types.
*/
static bool object_create_delayed(const char *type)
{
@@ -4286,12 +4287,6 @@ int main(int argc, char **argv, char **envp)
exit(0);
}
- if (qemu_opts_foreach(qemu_find_opts("object"),
- object_create,
- object_create_delayed, NULL)) {
- exit(1);
- }
-
machine_opts = qemu_get_machine_opts();
if (qemu_opt_foreach(machine_opts, machine_set_property, current_machine,
NULL)) {
@@ -4397,6 +4392,12 @@ int main(int argc, char **argv, char **envp)
exit(1);
}
+ if (qemu_opts_foreach(qemu_find_opts("object"),
+ object_create,
+ object_create_delayed, NULL)) {
+ exit(1);
+ }
+
#ifdef CONFIG_TPM
if (tpm_init() < 0) {
exit(1);
--
2.1.4
- [Qemu-devel] [PULL 09/14] net/queue: introduce NetQueueDeliverFunc, (continued)
- [Qemu-devel] [PULL 09/14] net/queue: introduce NetQueueDeliverFunc, Jason Wang, 2015/10/12
- [Qemu-devel] [PULL 10/14] netfilter: add an API to pass the packet to next filter, Jason Wang, 2015/10/12
- [Qemu-devel] [PULL 13/14] netfilter: add a netbuffer filter, Jason Wang, 2015/10/12
- [Qemu-devel] [PULL 14/14] tests: add test cases for netfilter object, Jason Wang, 2015/10/12
- Re: [Qemu-devel] [PULL 00/14] Net patches, Peter Maydell, 2015/10/12
- [Qemu-devel] [PULL 02/14] vmxnet3: Support reading IMR registers on bar0, Jason Wang, 2015/10/15
- [Qemu-devel] [PULL 04/14] vmxnet3: Add support for VMXNET3_CMD_GET_ADAPTIVE_RING_INFO command, Jason Wang, 2015/10/15
- [Qemu-devel] [PULL 06/14] init/cleanup of netfilter object, Jason Wang, 2015/10/15
- [Qemu-devel] [PULL 08/14] net: merge qemu_deliver_packet and qemu_deliver_packet_iov, Jason Wang, 2015/10/15
- [Qemu-devel] [PULL 05/14] vl.c: init delayed object after net_init_clients,
Jason Wang <=
- [Qemu-devel] [PULL 12/14] net/queue: export qemu_net_queue_append_iov, Jason Wang, 2015/10/15
- [Qemu-devel] [PULL 11/14] netfilter: print filter info associate with the netdev, Jason Wang, 2015/10/15