All of lore.kernel.org
 help / color / mirror / Atom feed
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Cc: patches@linaro.org
Subject: [Qemu-devel] [PATCH 14/37] virtio: Clean up includes
Date: Tue, 26 Jan 2016 18:17:07 +0000	[thread overview]
Message-ID: <1453832250-766-15-git-send-email-peter.maydell@linaro.org> (raw)
In-Reply-To: <1453832250-766-1-git-send-email-peter.maydell@linaro.org>

Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.

This commit was created with scripts/clean-includes.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 hw/9pfs/virtio-9p-device.c      | 1 +
 hw/char/virtio-console.c        | 1 +
 hw/char/virtio-serial-bus.c     | 1 +
 hw/display/virtio-gpu-3d.c      | 1 +
 hw/display/virtio-gpu-pci.c     | 1 +
 hw/display/virtio-gpu.c         | 1 +
 hw/display/virtio-vga.c         | 1 +
 hw/input/virtio-input-hid.c     | 1 +
 hw/input/virtio-input-host.c    | 1 +
 hw/input/virtio-input.c         | 1 +
 hw/net/virtio-net.c             | 1 +
 hw/scsi/virtio-scsi-dataplane.c | 1 +
 hw/scsi/virtio-scsi.c           | 1 +
 hw/virtio/dataplane/vring.c     | 1 +
 hw/virtio/vhost-backend.c       | 1 +
 hw/virtio/vhost-user.c          | 3 +--
 hw/virtio/vhost.c               | 1 +
 hw/virtio/virtio-balloon.c      | 1 +
 hw/virtio/virtio-bus.c          | 1 +
 hw/virtio/virtio-mmio.c         | 1 +
 hw/virtio/virtio-pci.c          | 2 +-
 hw/virtio/virtio-rng.c          | 1 +
 hw/virtio/virtio.c              | 2 +-
 23 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c
index 5643fd5..c5f7b92 100644
--- a/hw/9pfs/virtio-9p-device.c
+++ b/hw/9pfs/virtio-9p-device.c
@@ -11,6 +11,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "hw/virtio/virtio.h"
 #include "hw/i386/pc.h"
 #include "qemu/sockets.h"
diff --git a/hw/char/virtio-console.c b/hw/char/virtio-console.c
index 2a867cb..2e36481 100644
--- a/hw/char/virtio-console.c
+++ b/hw/char/virtio-console.c
@@ -10,6 +10,7 @@
  * the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "sysemu/char.h"
 #include "qemu/error-report.h"
 #include "trace.h"
diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c
index 2d2a659..8d5c740 100644
--- a/hw/char/virtio-serial-bus.c
+++ b/hw/char/virtio-serial-bus.c
@@ -18,6 +18,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include "qemu/iov.h"
 #include "monitor/monitor.h"
 #include "qemu/error-report.h"
diff --git a/hw/display/virtio-gpu-3d.c b/hw/display/virtio-gpu-3d.c
index 28dccfd..59581a4 100644
--- a/hw/display/virtio-gpu-3d.c
+++ b/hw/display/virtio-gpu-3d.c
@@ -11,6 +11,7 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/iov.h"
 #include "trace.h"
diff --git a/hw/display/virtio-gpu-pci.c b/hw/display/virtio-gpu-pci.c
index eef137f..a71b230 100644
--- a/hw/display/virtio-gpu-pci.c
+++ b/hw/display/virtio-gpu-pci.c
@@ -10,6 +10,7 @@
  * See the COPYING file in the top-level directory.
  *
  */
+#include "qemu/osdep.h"
 #include "hw/pci/pci.h"
 #include "hw/virtio/virtio.h"
 #include "hw/virtio/virtio-bus.h"
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
index 7e79a9c..3c96f8e 100644
--- a/hw/display/virtio-gpu.c
+++ b/hw/display/virtio-gpu.c
@@ -11,6 +11,7 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/iov.h"
 #include "ui/console.h"
diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c
index f7e539f..249dbc0 100644
--- a/hw/display/virtio-vga.c
+++ b/hw/display/virtio-vga.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "ui/console.h"
diff --git a/hw/input/virtio-input-hid.c b/hw/input/virtio-input-hid.c
index a78d11c..c4af0be 100644
--- a/hw/input/virtio-input-hid.c
+++ b/hw/input/virtio-input-hid.c
@@ -4,6 +4,7 @@
  * top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qemu/iov.h"
 
 #include "hw/qdev.h"
diff --git a/hw/input/virtio-input-host.c b/hw/input/virtio-input-host.c
index 8978f16..ddee54c 100644
--- a/hw/input/virtio-input-host.c
+++ b/hw/input/virtio-input-host.c
@@ -4,6 +4,7 @@
  * top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/sockets.h"
 
diff --git a/hw/input/virtio-input.c b/hw/input/virtio-input.c
index 1f5a40d..f12ed8a 100644
--- a/hw/input/virtio-input.c
+++ b/hw/input/virtio-input.c
@@ -4,6 +4,7 @@
  * top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qemu/iov.h"
 
 #include "hw/qdev.h"
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index a877614..fde8dd3 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -11,6 +11,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qemu/iov.h"
 #include "hw/virtio/virtio.h"
 #include "net/net.h"
diff --git a/hw/scsi/virtio-scsi-dataplane.c b/hw/scsi/virtio-scsi-dataplane.c
index 0d8d71e..c77b3a1 100644
--- a/hw/scsi/virtio-scsi-dataplane.c
+++ b/hw/scsi/virtio-scsi-dataplane.c
@@ -11,6 +11,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "hw/virtio/virtio-scsi.h"
 #include "qemu/error-report.h"
 #include "sysemu/block-backend.h"
diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
index 607593c..5f23ab2 100644
--- a/hw/scsi/virtio-scsi.c
+++ b/hw/scsi/virtio-scsi.c
@@ -13,6 +13,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "standard-headers/linux/virtio_ids.h"
 #include "hw/virtio/virtio-scsi.h"
 #include "qemu/error-report.h"
diff --git a/hw/virtio/dataplane/vring.c b/hw/virtio/dataplane/vring.c
index 23f667e..1a78df1 100644
--- a/hw/virtio/dataplane/vring.c
+++ b/hw/virtio/dataplane/vring.c
@@ -14,6 +14,7 @@
  * This work is licensed under the terms of the GNU GPL, version 2.
  */
 
+#include "qemu/osdep.h"
 #include "trace.h"
 #include "hw/hw.h"
 #include "exec/memory.h"
diff --git a/hw/virtio/vhost-backend.c b/hw/virtio/vhost-backend.c
index b734a60..b358902 100644
--- a/hw/virtio/vhost-backend.c
+++ b/hw/virtio/vhost-backend.c
@@ -8,6 +8,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "hw/virtio/vhost.h"
 #include "hw/virtio/vhost-backend.h"
 #include "qemu/error-report.h"
diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
index 1b6c5ac..7fde137 100644
--- a/hw/virtio/vhost-user.c
+++ b/hw/virtio/vhost-user.c
@@ -8,6 +8,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "hw/virtio/vhost.h"
 #include "hw/virtio/vhost-backend.h"
 #include "hw/virtio/virtio-net.h"
@@ -18,8 +19,6 @@
 #include "exec/ram_addr.h"
 #include "migration/migration.h"
 
-#include <fcntl.h>
-#include <unistd.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/un.h>
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index de29968..7dff755 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -13,6 +13,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include "hw/virtio/vhost.h"
 #include "hw/hw.h"
 #include "qemu/atomic.h"
diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
index 9671635..f5f25a9 100644
--- a/hw/virtio/virtio-balloon.c
+++ b/hw/virtio/virtio-balloon.c
@@ -13,6 +13,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qemu/iov.h"
 #include "qemu/timer.h"
 #include "qemu-common.h"
diff --git a/hw/virtio/virtio-bus.c b/hw/virtio/virtio-bus.c
index 81c7cdd..574f0e2 100644
--- a/hw/virtio/virtio-bus.c
+++ b/hw/virtio/virtio-bus.c
@@ -22,6 +22,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "qemu/error-report.h"
 #include "hw/qdev.h"
diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c
index 18660b0..d4cd91f 100644
--- a/hw/virtio/virtio-mmio.c
+++ b/hw/virtio/virtio-mmio.c
@@ -19,6 +19,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/virtio/virtio.h"
 #include "qemu/host-utils.h"
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 94667e6..5494ff4 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -15,7 +15,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
-#include <inttypes.h>
+#include "qemu/osdep.h"
 
 #include "standard-headers/linux/virtio_pci.h"
 #include "hw/virtio/virtio.h"
diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c
index 97d1541..a80fb89 100644
--- a/hw/virtio/virtio-rng.c
+++ b/hw/virtio/virtio-rng.c
@@ -9,6 +9,7 @@
  * top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qemu/iov.h"
 #include "hw/qdev.h"
 #include "hw/virtio/virtio.h"
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index bd6b4df..63a7b6d 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -11,7 +11,7 @@
  *
  */
 
-#include <inttypes.h>
+#include "qemu/osdep.h"
 
 #include "trace.h"
 #include "exec/address-spaces.h"
-- 
1.9.1

  parent reply	other threads:[~2016-01-26 18:17 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
2016-01-26 18:16 ` [Qemu-devel] [PATCH 01/37] migration: Clean up includes Peter Maydell
2016-01-26 18:16 ` [Qemu-devel] [PATCH 02/37] crypto: " Peter Maydell
2016-01-26 18:16 ` [Qemu-devel] [PATCH 03/37] exec: " Peter Maydell
2016-01-26 18:16 ` [Qemu-devel] [PATCH 04/37] lm32: " Peter Maydell
2016-01-26 18:16 ` [Qemu-devel] [PATCH 05/37] ppc: " Peter Maydell
2016-01-26 18:16 ` [Qemu-devel] [PATCH 06/37] sparc: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 07/37] s390: " Peter Maydell
2016-01-27  8:41   ` Cornelia Huck
2016-01-26 18:17 ` [Qemu-devel] [PATCH 08/37] unicore: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 09/37] linux-user: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 10/37] x86: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 11/37] alpha: " Peter Maydell
2016-02-06  0:48   ` Richard Henderson
2016-01-26 18:17 ` [Qemu-devel] [PATCH 12/37] arm: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 13/37] xen: " Peter Maydell
2016-01-26 18:17 ` Peter Maydell [this message]
2016-01-26 18:17 ` [Qemu-devel] [PATCH 15/37] tcg: " Peter Maydell
2016-02-06  0:51   ` Richard Henderson
2016-02-06 13:43     ` Peter Maydell
2016-02-06 23:49       ` Richard Henderson
2016-02-19 18:24       ` Peter Maydell
2016-02-22 19:11         ` Richard Henderson
2016-02-22 19:24           ` Peter Maydell
2016-02-22 20:07             ` Richard Henderson
2016-01-26 18:17 ` [Qemu-devel] [PATCH 16/37] ide: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 17/37] 9pfs: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 18/37] hw/net: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 19/37] usb: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 20/37] hw/display: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 21/37] hw/vfio: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 22/37] pci: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 23/37] hw/scsi: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 24/37] hw/misc: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 25/37] hw/timer: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 26/37] hw/intc: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 27/37] sh4: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 28/37] xtensa: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 29/37] openrisc: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 30/37] m68k: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 31/37] cris: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 32/37] moxie: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 33/37] tricore: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 34/37] tilegx: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 35/37] arm devices: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 36/37] hw/core: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 37/37] hw: " Peter Maydell
2016-01-27  8:03 ` [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Paolo Bonzini
2016-01-29 16:12   ` Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1453832250-766-15-git-send-email-peter.maydell@linaro.org \
    --to=peter.maydell@linaro.org \
    --cc=patches@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.