aboutsummaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2018-02-01 12:18:46 +0100
committerMarkus Armbruster <armbru@redhat.com>2018-02-09 13:52:16 +0100
commit922a01a013d2270682a188258cbccacfecf8129c (patch)
treeff4647b023fc4eac730341ec581c46ca4ac58c87 /include/net
parentbbcad965bf7b3afac13d7bbc90d3eeca1a5b66bf (diff)
downloadqemu-922a01a013d2270682a188258cbccacfecf8129c.zip
qemu-922a01a013d2270682a188258cbccacfecf8129c.tar.gz
qemu-922a01a013d2270682a188258cbccacfecf8129c.tar.bz2
Move include qemu/option.h from qemu-common.h to actual users
qemu-common.h includes qemu/option.h, but most places that include the former don't actually need the latter. Drop the include, and add it to the places that actually need it. While there, drop superfluous includes of both headers, and separate #include from file comment with a blank line. This cleanup makes the number of objects depending on qemu/option.h drop from 4545 (out of 4743) to 284 in my "build everything" tree. Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20180201111846.21846-20-armbru@redhat.com> [Semantic conflict with commit bdd6a90a9e in block/nvme.c resolved]
Diffstat (limited to 'include/net')
-rw-r--r--include/net/net.h2
-rw-r--r--include/net/slirp.h2
2 files changed, 0 insertions, 4 deletions
diff --git a/include/net/net.h b/include/net/net.h
index 71f1119..3fc48e4 100644
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -2,9 +2,7 @@
#define QEMU_NET_H
#include "qemu/queue.h"
-#include "qemu-common.h"
#include "qapi-types.h"
-#include "qemu/option.h"
#include "net/queue.h"
#include "migration/vmstate.h"
diff --git a/include/net/slirp.h b/include/net/slirp.h
index 9a492b8..4d63d74 100644
--- a/include/net/slirp.h
+++ b/include/net/slirp.h
@@ -24,8 +24,6 @@
#ifndef QEMU_NET_SLIRP_H
#define QEMU_NET_SLIRP_H
-#include "qemu-common.h"
-#include "qemu/option.h"
#ifdef CONFIG_SLIRP