diff options
author | Markus Armbruster <armbru@redhat.com> | 2019-05-23 16:35:07 +0200 |
---|---|---|
committer | Markus Armbruster <armbru@redhat.com> | 2019-06-12 13:18:33 +0200 |
commit | 0b8fa32f551e863bb548a11394239239270dd3dc (patch) | |
tree | 5407f5eb794045d03eb5f817a4d2fc611524d057 /net | |
parent | 856dfd8a035e42cd96ca823f1cbbd18d332e2f84 (diff) |
Include qemu/module.h where needed, drop it from qemu-common.h
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20190523143508.25387-4-armbru@redhat.com>
[Rebased with conflicts resolved automatically, except for
hw/usb/dev-hub.c hw/misc/exynos4210_rng.c hw/misc/bcm2835_rng.c
hw/misc/aspeed_scu.c hw/display/virtio-vga.c hw/arm/stm32f205_soc.c;
ui/cocoa.m fixed up]
Diffstat (limited to 'net')
-rw-r--r-- | net/can/can_core.c | 2 | ||||
-rw-r--r-- | net/can/can_host.c | 2 | ||||
-rw-r--r-- | net/can/can_socketcan.c | 2 | ||||
-rw-r--r-- | net/dump.c | 2 | ||||
-rw-r--r-- | net/filter-replay.c | 2 | ||||
-rw-r--r-- | net/filter.c | 2 |
6 files changed, 9 insertions, 3 deletions
diff --git a/net/can/can_core.c b/net/can/can_core.c index 2a83cadfc5..90f4d8576a 100644 --- a/net/can/can_core.c +++ b/net/can/can_core.c @@ -24,8 +24,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "chardev/char.h" +#include "qemu/module.h" #include "qemu/sockets.h" #include "qapi/error.h" #include "net/can_emu.h" diff --git a/net/can/can_host.c b/net/can/can_host.c index c79347abab..1dfaf0ced0 100644 --- a/net/can/can_host.c +++ b/net/can/can_host.c @@ -24,8 +24,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "chardev/char.h" +#include "qemu/module.h" #include "qemu/sockets.h" #include "qapi/error.h" #include "qom/object_interfaces.h" diff --git a/net/can/can_socketcan.c b/net/can/can_socketcan.c index 39865e28e0..3dec108684 100644 --- a/net/can/can_socketcan.c +++ b/net/can/can_socketcan.c @@ -24,8 +24,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qapi/error.h" #include "chardev/char.h" #include "qemu/sockets.h" diff --git a/net/dump.c b/net/dump.c index f16c3545e9..cd34f51759 100644 --- a/net/dump.c +++ b/net/dump.c @@ -25,10 +25,10 @@ #include "qemu/osdep.h" #include "clients.h" #include "qapi/error.h" -#include "qemu-common.h" #include "qemu/error-report.h" #include "qemu/iov.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qemu/timer.h" #include "qapi/visitor.h" #include "net/filter.h" diff --git a/net/filter-replay.c b/net/filter-replay.c index 09e68fd8f5..9dda193928 100644 --- a/net/filter-replay.c +++ b/net/filter-replay.c @@ -11,10 +11,10 @@ #include "qemu/osdep.h" #include "clients.h" -#include "qemu-common.h" #include "qemu/error-report.h" #include "qemu/iov.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qemu/timer.h" #include "qapi/visitor.h" #include "net/filter.h" diff --git a/net/filter.c b/net/filter.c index 28d1930db7..4b932e79f9 100644 --- a/net/filter.c +++ b/net/filter.c @@ -8,7 +8,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "qapi/qmp/qerror.h" #include "qemu/error-report.h" @@ -17,6 +16,7 @@ #include "net/vhost_net.h" #include "qom/object_interfaces.h" #include "qemu/iov.h" +#include "qemu/module.h" #include "net/colo.h" #include "migration/colo.h" |