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]

diff --git a/accel/accel.c b/accel/accel.c
index 8ae40e1e1319a6cf743140997ce88132553eaa90..93e2434c873aafef1d2d286e8bdb230bc3f7bd35 100644 (file)
--- a/accel/accel.c
+++ b/accel/accel.c
@@ -26,7 +26,6 @@
 #include "qemu/osdep.h"
 #include "sysemu/accel.h"
 #include "hw/boards.h"
-#include "qemu-common.h"
 #include "sysemu/arch_init.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/kvm.h"
@@ -34,6 +33,7 @@
 #include "hw/xen/xen.h"
 #include "qom/object.h"
 #include "qemu/error-report.h"
+#include "qemu/option.h"
 
 static const TypeInfo accel_type = {
     .name = TYPE_ACCEL,

diff --git a/block.c b/block.c
index fba6b270206e8c1412be488440aebb764a94e7a0..f94585b2304fe96703852b2a37a41b88777d84ba 100644 (file)
--- a/block.c
+++ b/block.c
@@ -38,6 +38,7 @@
 #include "sysemu/block-backend.h"
 #include "sysemu/sysemu.h"
 #include "qemu/notify.h"
+#include "qemu/option.h"
 #include "qemu/coroutine.h"
 #include "block/qapi.h"
 #include "qemu/timer.h"

diff --git a/block/blkdebug.c b/block/blkdebug.c
index 356538482d66421755789d9ca5d51b5606581096..d83f23febd7fad1d588a86af42060408100052d5 100644 (file)
--- a/block/blkdebug.c
+++ b/block/blkdebug.c
@@ -29,6 +29,7 @@
 #include "qemu/config-file.h"
 #include "block/block_int.h"
 #include "qemu/module.h"
+#include "qemu/option.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"
 #include "sysemu/qtest.h"

diff --git a/block/blkverify.c b/block/blkverify.c
index 06369f9eac43791479a9c2c54d102236628c5cb9..331365be3314572821139323b234c4ac68c4a53e 100644 (file)
--- a/block/blkverify.c
+++ b/block/blkverify.c
@@ -14,6 +14,7 @@
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"
 #include "qemu/cutils.h"
+#include "qemu/option.h"
 
 typedef struct {
     BdrvChild *test_file;

diff --git a/block/block-backend.c b/block/block-backend.c
index 532893c3bd5fc16562652f0e803b212a50dd496b..0266ac990b3f0eb9344a9dbfefce72575f72aaa8 100644 (file)
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -20,6 +20,7 @@
 #include "qapi-event.h"
 #include "qapi/error.h"
 #include "qemu/id.h"
+#include "qemu/option.h"
 #include "trace.h"
 #include "migration/misc.h"
 

diff --git a/block/crypto.c b/block/crypto.c
index 2626f8ae3a65ff0d886e714b0c4f4a26783633b2..70e3691cd84fb240f5d745d2e46ad7f5893c3e8f 100644 (file)
--- a/block/crypto.c
+++ b/block/crypto.c
@@ -28,6 +28,7 @@
 #include "qapi/qobject-input-visitor.h"
 #include "qapi-visit.h"
 #include "qapi/error.h"
+#include "qemu/option.h"
 #include "block/crypto.h"
 
 typedef struct BlockCrypto BlockCrypto;

diff --git a/block/curl.c b/block/curl.c
index 439481c8d48bf7e323475504913ba2adf5c22e0c..aa425357834ef345d2459e7854df5cbe4cf96c2f 100644 (file)
--- a/block/curl.c
+++ b/block/curl.c
@@ -24,8 +24,8 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "qemu/error-report.h"
+#include "qemu/option.h"
 #include "block/block_int.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"

diff --git a/block/file-posix.c b/block/file-posix.c
index 9422ad529cc36388aa6c128611a45eee2b75644b..dd8d7cbbd214b0b119766c420114c855dc8162df 100644 (file)
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -21,12 +21,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/cutils.h"
 #include "qemu/error-report.h"
 #include "block/block_int.h"
 #include "qemu/module.h"
+#include "qemu/option.h"
 #include "trace.h"
 #include "block/thread-pool.h"
 #include "qemu/iov.h"

diff --git a/block/file-win32.c b/block/file-win32.c
index 2f1da48e71c5ae8b304a2ab081d1bf444dcfd4c2..f24c7bb92c6434e0db52b469a6f285c588943c7b 100644 (file)
--- a/block/file-win32.c
+++ b/block/file-win32.c
@@ -21,11 +21,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/cutils.h"
 #include "block/block_int.h"
 #include "qemu/module.h"
+#include "qemu/option.h"
 #include "block/raw-aio.h"
 #include "trace.h"
 #include "block/thread-pool.h"

diff --git a/block/gluster.c b/block/gluster.c
index 097b6930a59b7ea09ef5e6a91e43e75d13d8b4dc..d8decc41adad03e372501a0380cf3747bc095449 100644 (file)
--- a/block/gluster.c
+++ b/block/gluster.c
@@ -7,6 +7,7 @@
  * See the COPYING file in the top-level directory.
  *
  */
+
 #include "qemu/osdep.h"
 #include <glusterfs/api/glfs.h>
 #include "block/block_int.h"
@@ -15,6 +16,7 @@
 #include "qapi/qmp/qerror.h"
 #include "qemu/uri.h"
 #include "qemu/error-report.h"
+#include "qemu/option.h"
 #include "qemu/cutils.h"
 
 #define GLUSTER_OPT_FILENAME        "filename"

diff --git a/block/iscsi-opts.c b/block/iscsi-opts.c
index 5335539130cf781b5d2a9dc37a970c1898f4357b..9b19bd2f529c80978a5c227d5618876fecd810a4 100644 (file)
--- a/block/iscsi-opts.c
+++ b/block/iscsi-opts.c
@@ -25,6 +25,7 @@
 #include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/config-file.h"
+#include "qemu/option.h"
 
 static QemuOptsList qemu_iscsi_opts = {
     .name = "iscsi",

diff --git a/block/iscsi.c b/block/iscsi.c
index 8edd480f928a3054fbc9bbd6d06560711d6b8ddf..9f99ae5e07bce5ae08191c900ee0d6e2cc61ec21 100644 (file)
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -28,7 +28,6 @@
 #include <poll.h>
 #include <math.h>
 #include <arpa/inet.h>
-#include "qemu-common.h"
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"
 #include "qemu/bitops.h"
@@ -36,6 +35,7 @@
 #include "block/block_int.h"
 #include "scsi/constants.h"
 #include "qemu/iov.h"
+#include "qemu/option.h"
 #include "qemu/uuid.h"
 #include "qmp-commands.h"
 #include "qapi/error.h"

diff --git a/block/nbd.c b/block/nbd.c
index 8cc4c6f31213dc16f949948f2222f32a2e115361..411eeb42a7d66668e8c2d9523a18d9456bf980e4 100644 (file)
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -32,6 +32,7 @@
 #include "qemu/uri.h"
 #include "block/block_int.h"
 #include "qemu/module.h"
+#include "qemu/option.h"
 #include "qapi-visit.h"
 #include "qapi/qobject-input-visitor.h"
 #include "qapi/qobject-output-visitor.h"

diff --git a/block/nfs.c b/block/nfs.c
index effc8719b5a65ce372132f696e374fce5efe4701..6576a73d6eb9d09cc843fee1f308ca57613c8d78 100644 (file)
--- a/block/nfs.c
+++ b/block/nfs.c
@@ -25,13 +25,13 @@
 #include "qemu/osdep.h"
 
 #include <poll.h>
-#include "qemu-common.h"
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "block/block_int.h"
 #include "trace.h"
 #include "qemu/iov.h"
+#include "qemu/option.h"
 #include "qemu/uri.h"
 #include "qemu/cutils.h"
 #include "sysemu/sysemu.h"

diff --git a/block/null.c b/block/null.c
index 0cdabaa4402c81eab29aa4a9200164c2e5da3bc2..214d394fff42e27909b3bca9cf0fc1b73c0adf78 100644 (file)
--- a/block/null.c
+++ b/block/null.c
@@ -14,6 +14,7 @@
 #include "qapi/error.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"
+#include "qemu/option.h"
 #include "block/block_int.h"
 
 #define NULL_OPT_LATENCY "latency-ns"

diff --git a/block/nvme.c b/block/nvme.c
index e9d0e218fcd3db7ccef99216c5d3d16a79519782..10bffbbf2f4bbcb2ff7405b09be8fa9f4e1342a7 100644 (file)
--- a/block/nvme.c
+++ b/block/nvme.c
@@ -18,6 +18,7 @@
 #include "qapi/qmp/qstring.h"
 #include "qemu/error-report.h"
 #include "qemu/cutils.h"
+#include "qemu/option.h"
 #include "qemu/vfio-helpers.h"
 #include "block/block_int.h"
 #include "trace.h"

diff --git a/block/parallels.c b/block/parallels.c
index d3802085e34f23ee729dbfbb5a49ecc02e9c0744..e1e3d80c8875de17e3e3337c483e7f4f134a70f8 100644 (file)
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -27,12 +27,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "block/block_int.h"
 #include "sysemu/block-backend.h"
 #include "qemu/module.h"
+#include "qemu/option.h"
 #include "qemu/bswap.h"
 #include "qemu/bitmap.h"
 #include "migration/blocker.h"

diff --git a/block/qcow.c b/block/qcow.c
index 0b32c04cd0eb7d3c79eee86b548f2334034adcd4..8631155ac8121b92af0de9424900c5788d84cfb0 100644 (file)
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -24,11 +24,11 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "block/block_int.h"
 #include "sysemu/block-backend.h"
 #include "qemu/module.h"
+#include "qemu/option.h"
 #include "qemu/bswap.h"
 #include <zlib.h>
 #include "qapi/qmp/qdict.h"

diff --git a/block/qed.c b/block/qed.c
index 7e2b34c3a7ed3c32f316a2712a06724400f84ac1..205dbf16e353de7e2ba1e11ebd0f34534042a9aa 100644 (file)
--- a/block/qed.c
+++ b/block/qed.c
@@ -16,6 +16,7 @@
 #include "qapi/error.h"
 #include "qemu/timer.h"
 #include "qemu/bswap.h"
+#include "qemu/option.h"
 #include "trace.h"
 #include "qed.h"
 #include "sysemu/block-backend.h"

diff --git a/block/quorum.c b/block/quorum.c
index 2dc79bf7e2e96451478872f2290638b5612c9ecc..19f1c3442520a193693d4ca5c8926193c65ffc26 100644 (file)
--- a/block/quorum.c
+++ b/block/quorum.c
@@ -15,6 +15,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/cutils.h"
+#include "qemu/option.h"
 #include "block/block_int.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qdict.h"

diff --git a/block/rbd.c b/block/rbd.c
index 42be5ed49d09bb529f23e2e714d41c9c89fc0e47..8474b0ba117ca3701f86086cae0e9cdac02d99db 100644 (file)
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -16,6 +16,7 @@
 #include <rbd/librbd.h>
 #include "qapi/error.h"
 #include "qemu/error-report.h"
+#include "qemu/option.h"
 #include "block/block_int.h"
 #include "crypto/secret.h"
 #include "qemu/cutils.h"

diff --git a/block/replication.c b/block/replication.c
index b1ea3caa4bbe140e4bc0ae0be723189571dffe80..f98ef094b9da59d5c578696ee693a4a45fca2cc3 100644 (file)
--- a/block/replication.c
+++ b/block/replication.c
@@ -13,7 +13,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu/option.h"
 #include "block/nbd.h"
 #include "block/blockjob.h"
 #include "block/block_int.h"

diff --git a/block/sheepdog.c b/block/sheepdog.c
index f684477328a8adf51dda023fec21f3cb5094c6b5..af125a2c8d191f8974d281ef71ffe9626df9c509 100644 (file)
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -19,6 +19,7 @@
 #include "qapi/qobject-input-visitor.h"
 #include "qemu/uri.h"
 #include "qemu/error-report.h"
+#include "qemu/option.h"
 #include "qemu/sockets.h"
 #include "block/block_int.h"
 #include "sysemu/block-backend.h"

diff --git a/block/snapshot.c b/block/snapshot.c
index 9294a9fcc4f9a745eacecb9f8b19fb9b6cbd6ad8..eacc1f19a23135a36b3e11c6019108f5419221ff 100644 (file)
--- a/block/snapshot.c
+++ b/block/snapshot.c
@@ -29,6 +29,7 @@
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/qmp/qstring.h"
+#include "qemu/option.h"
 
 QemuOptsList internal_snapshot_opts = {
     .name = "snapshot",

diff --git a/block/ssh.c b/block/ssh.c
index 91f5f4c3c9355461e1679138a005c7c14c04c390..b63addcf9483c6001b5deee07ada6c10893e9356 100644 (file)
--- a/block/ssh.c
+++ b/block/ssh.c
@@ -30,6 +30,7 @@
 #include "block/block_int.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
+#include "qemu/option.h"
 #include "qemu/cutils.h"
 #include "qemu/sockets.h"
 #include "qemu/uri.h"

diff --git a/block/throttle.c b/block/throttle.c
index 833175ac77e0bed77efe96a0b06e60fa3be87264..495f88c7521dfa5bb826d76ce9f01e1041ef58f5 100644 (file)
--- a/block/throttle.c
+++ b/block/throttle.c
@@ -19,6 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "block/throttle-groups.h"
+#include "qemu/option.h"
 #include "qemu/throttle-options.h"
 #include "qapi/error.h"
 

diff --git a/block/vdi.c b/block/vdi.c
index 8da5dfc8972729cde9b45a99429fc854511694af..fc1c614cb122e7fefff0f1b01d941500fa04acb6 100644 (file)
--- a/block/vdi.c
+++ b/block/vdi.c
@@ -54,6 +54,7 @@
 #include "block/block_int.h"
 #include "sysemu/block-backend.h"
 #include "qemu/module.h"
+#include "qemu/option.h"
 #include "qemu/bswap.h"
 #include "migration/blocker.h"
 #include "qemu/coroutine.h"

diff --git a/block/vhdx.c b/block/vhdx.c
index 9956933da60c6e0c1c2ba5ebd1e09d0bc6096c0a..c449c5dcfd879675582556c3722e301511ffdd83 100644 (file)
--- a/block/vhdx.c
+++ b/block/vhdx.c
@@ -17,10 +17,10 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "block/block_int.h"
 #include "sysemu/block-backend.h"
 #include "qemu/module.h"
+#include "qemu/option.h"
 #include "qemu/crc32c.h"
 #include "qemu/bswap.h"
 #include "block/vhdx.h"

diff --git a/block/vmdk.c b/block/vmdk.c
index d71cec4f31babbb3ba73ec66a2ea424b0c8c8777..ef15ddbfd3d55290022377ac352df355e1696143 100644 (file)
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -30,6 +30,7 @@
 #include "qapi/qmp/qerror.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"
+#include "qemu/option.h"
 #include "qemu/bswap.h"
 #include "migration/blocker.h"
 #include "qemu/cutils.h"

diff --git a/block/vpc.c b/block/vpc.c
index 1576d7b59577224776d65b9818f149477d4fbd22..cfa5144e86786c399cb57f6b0974736927df6d5d 100644 (file)
--- a/block/vpc.c
+++ b/block/vpc.c
@@ -22,12 +22,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "block/block_int.h"
 #include "sysemu/block-backend.h"
 #include "qemu/module.h"
+#include "qemu/option.h"
 #include "migration/blocker.h"
 #include "qemu/bswap.h"
 #include "qemu/uuid.h"

diff --git a/block/vvfat.c b/block/vvfat.c
index 5dca227311d130ddb9408781874dd3a72c8dd462..7e06ebacf6176b660aa07d14f35ec6d68d151268 100644 (file)
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -28,6 +28,7 @@
 #include "qapi/error.h"
 #include "block/block_int.h"
 #include "qemu/module.h"
+#include "qemu/option.h"
 #include "qemu/bswap.h"
 #include "migration/blocker.h"
 #include "qapi/qmp/qdict.h"

diff --git a/chardev/char-file.c b/chardev/char-file.c
index a57b88aaf2bd7eee75705900f920468231cf98f1..87fb61088c65837e4b31cff0efd3dfadf8b7732e 100644 (file)
--- a/chardev/char-file.c
+++ b/chardev/char-file.c
@@ -21,9 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
+#include "qemu/option.h"
 #include "chardev/char.h"
 
 #ifdef _WIN32

diff --git a/chardev/char-mux.c b/chardev/char-mux.c
index 567bf965cd7188dbda1565137f6553a92288ab73..d48e78103a5e4a3bdde7e90e14cfe7595aa36a72 100644 (file)
--- a/chardev/char-mux.c
+++ b/chardev/char-mux.c
@@ -21,9 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
+#include "qemu/option.h"
 #include "chardev/char.h"
 #include "sysemu/block-backend.h"
 #include "chardev/char-mux.h"

diff --git a/chardev/char-parallel.c b/chardev/char-parallel.c
index bce89f8c36180d97e106e7946170c966f7309603..ab82c72ac7470c85c88aaeb5a448618f17772e90 100644 (file)
--- a/chardev/char-parallel.c
+++ b/chardev/char-parallel.c
@@ -21,9 +21,11 @@
  * 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 "qapi/error.h"
+#include "qemu/option.h"
 #include <sys/ioctl.h>
 
 #ifdef CONFIG_BSD

diff --git a/chardev/char-pipe.c b/chardev/char-pipe.c
index 3a95e4c1b2ab6d587a3447c3e799a8bf0250f9b5..8a51872e5e986baf55d5bb29a1f5993eb59bd28b 100644 (file)
--- a/chardev/char-pipe.c
+++ b/chardev/char-pipe.c
@@ -21,8 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/option.h"
 #include "chardev/char.h"
 
 #ifdef _WIN32

diff --git a/chardev/char-ringbuf.c b/chardev/char-ringbuf.c
index c1fa4c3f87ee8b8064de759462d1832caac245c4..679afaa4fd5c3ab3b4ef4aa78a6ab6453f30cfd0 100644 (file)
--- a/chardev/char-ringbuf.c
+++ b/chardev/char-ringbuf.c
@@ -27,6 +27,7 @@
 #include "qmp-commands.h"
 #include "qapi/error.h"
 #include "qemu/base64.h"
+#include "qemu/option.h"
 
 /* Ring buffer chardev */
 

diff --git a/chardev/char-serial.c b/chardev/char-serial.c
index 93392c528c1e9bb5db5a17f561fa293c8d3b2f55..feb52e559dacbf6c72a6d7b10f55d0bc91cf037c 100644 (file)
--- a/chardev/char-serial.c
+++ b/chardev/char-serial.c
@@ -21,7 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
+#include "qemu/option.h"
 #include "qemu/sockets.h"
 #include "io/channel-file.h"
 #include "qapi/error.h"

diff --git a/chardev/char-socket.c b/chardev/char-socket.c
index a340af6cd3a053345fd2e47f58091cf00b4e4ac6..bdd6cff5f648f574f2fe01b37ba55a1fcb1c4f38 100644 (file)
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -21,12 +21,14 @@
  * 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 "io/channel-socket.h"
 #include "io/channel-tls.h"
 #include "io/net-listener.h"
 #include "qemu/error-report.h"
+#include "qemu/option.h"
 #include "qapi/error.h"
 #include "qapi/clone-visitor.h"
 

diff --git a/chardev/char-stdio.c b/chardev/char-stdio.c
index 6f5d798d7b7735c54a88d3418ae0e6cb45b1869a..96375f2ab886c87500d856027a791fa15c0d002d 100644 (file)
--- a/chardev/char-stdio.c
+++ b/chardev/char-stdio.c
@@ -21,10 +21,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
+#include "qemu/option.h"
 #include "qemu/sockets.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "chardev/char.h"
 
 #ifdef _WIN32

diff --git a/chardev/char-udp.c b/chardev/char-udp.c
index d46ff7ab531b8b98d5ffcf5ffdb4b651745d4818..097a2f0f42d0f9c1bf6c56b35a1ddace883e5f8f 100644 (file)
--- a/chardev/char-udp.c
+++ b/chardev/char-udp.c
@@ -21,10 +21,12 @@
  * 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 "io/channel-socket.h"
 #include "qapi/error.h"
+#include "qemu/option.h"
 
 #include "chardev/char-io.h"
 

diff --git a/chardev/char.c b/chardev/char.c
index 51f269796a187d6045ef7ef3fb1db259e181ac7e..01d979a1da5e5605ebad000ccad4b10cbf937522 100644 (file)
--- a/chardev/char.c
+++ b/chardev/char.c
@@ -34,6 +34,7 @@
 #include "qapi/error.h"
 #include "sysemu/replay.h"
 #include "qemu/help_option.h"
+#include "qemu/option.h"
 
 #include "chardev/char-mux.h"
 

diff --git a/chardev/spice.c b/chardev/spice.c
index bbdf64990492fcc04522dfa1776cc958e35dfb3f..e66e3ad568550ce7ecaadb6eaca6511202d0cdf5 100644 (file)
--- a/chardev/spice.c
+++ b/chardev/spice.c
@@ -4,6 +4,7 @@
 #include "chardev/char.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
+#include "qemu/option.h"
 #include <spice.h>
 #include <spice/protocol.h>
 

diff --git a/contrib/ivshmem-server/main.c b/contrib/ivshmem-server/main.c
index 45776d8af4775a6b2eb72d22d93c56e6ac69d776..197c79c57ec2eda492e51cb08896b58a009f0c46 100644 (file)
--- a/contrib/ivshmem-server/main.c
+++ b/contrib/ivshmem-server/main.c
@@ -9,7 +9,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/cutils.h"
-
+#include "qemu/option.h"
 #include "ivshmem-server.h"
 
 #define IVSHMEM_SERVER_DEFAULT_VERBOSE        0

diff --git a/cpus.c b/cpus.c
index da5e3a6aa171217aa7c85f2601ac6594e9835859..f298b659f467dd8a0090f88c90db6ea2c882b2fc 100644 (file)
--- a/cpus.c
+++ b/cpus.c
@@ -23,7 +23,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
 #include "qemu/config-file.h"
 #include "cpu.h"
 #include "monitor/monitor.h"
@@ -46,6 +45,7 @@
 #include "sysemu/cpus.h"
 #include "sysemu/qtest.h"
 #include "qemu/main-loop.h"
+#include "qemu/option.h"
 #include "qemu/bitmap.h"
 #include "qemu/seqlock.h"
 #include "tcg.h"

diff --git a/device-hotplug.c b/device-hotplug.c
index b10e8cc6d4b013d1d835e4b3ef6ca45f39c8cba0..23fd6656f1be2211cab1be2f17f927a465acda47 100644 (file)
--- a/device-hotplug.c
+++ b/device-hotplug.c
@@ -29,6 +29,7 @@
 #include "sysemu/blockdev.h"
 #include "qapi/qmp/qdict.h"
 #include "qemu/config-file.h"
+#include "qemu/option.h"
 #include "sysemu/sysemu.h"
 #include "monitor/monitor.h"
 #include "block/block_int.h"

diff --git a/device_tree.c b/device_tree.c
index a24ddff02bdd857cbbf50477879c07df19d89054..19458b32bf81e55e694dbc8eac4ff8ed9c103eb9 100644 (file)
--- a/device_tree.c
+++ b/device_tree.c
@@ -18,8 +18,8 @@
 #endif
 
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "qemu/error-report.h"
+#include "qemu/option.h"
 #include "qemu/bswap.h"
 #include "sysemu/device_tree.h"
 #include "sysemu/sysemu.h"

diff --git a/fsdev/qemu-fsdev-throttle.c b/fsdev/qemu-fsdev-throttle.c
index 1dc07fbc125aa6ba02a2e410bdf9a8e225481cda..cfd86418aca71138373f97fc1b7e5f6e57539731 100644 (file)
--- a/fsdev/qemu-fsdev-throttle.c
+++ b/fsdev/qemu-fsdev-throttle.c
@@ -16,6 +16,7 @@
 #include "qemu/error-report.h"
 #include "qemu-fsdev-throttle.h"
 #include "qemu/iov.h"
+#include "qemu/option.h"
 
 static void fsdev_throttle_read_timer_cb(void *opaque)
 {

diff --git a/fsdev/qemu-fsdev.c b/fsdev/qemu-fsdev.c
index de819cf7a1b01acb3abfa79dce06b2a6d5ebad68..8a4afbffbd3ff1f4d35b259e2d3a2d592575d914 100644 (file)
--- a/fsdev/qemu-fsdev.c
+++ b/fsdev/qemu-fsdev.c
@@ -14,9 +14,9 @@
 #include "qapi/error.h"
 #include "qemu-fsdev.h"
 #include "qemu/queue.h"
-#include "qemu-common.h"
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"
+#include "qemu/option.h"
 
 static QTAILQ_HEAD(FsDriverEntry_head, FsDriverListEntry) fsdriver_entries =
     QTAILQ_HEAD_INITIALIZER(fsdriver_entries);

diff --git a/fsdev/qemu-fsdev.h b/fsdev/qemu-fsdev.h
index 29c962296d20819cc2625fcefe00ba52f2f363de..65e4b1cfab2123dd453b91bfe801c1ab158da3b1 100644 (file)
--- a/fsdev/qemu-fsdev.h
+++ b/fsdev/qemu-fsdev.h
@@ -12,7 +12,6 @@
  */
 #ifndef QEMU_FSDEV_H
 #define QEMU_FSDEV_H
-#include "qemu/option.h"
 #include "file-op-9p.h"
 
 

diff --git a/hw/9pfs/9p-handle.c b/hw/9pfs/9p-handle.c
index c1681d3c8ac0507de5e0bb1d772354cf68b96e77..4dc0d2bed1c13acd56d3a0beff4c9ad0efa4a548 100644 (file)
--- a/hw/9pfs/9p-handle.c
+++ b/hw/9pfs/9p-handle.c
@@ -22,6 +22,7 @@
 #include "qemu/xattr.h"
 #include "qemu/cutils.h"
 #include "qemu/error-report.h"
+#include "qemu/option.h"
 #include <linux/fs.h>
 #ifdef CONFIG_LINUX_MAGIC_H
 #include <linux/magic.h>

diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c
index fe85726c978b832e4caf39f0ff7641eb5c0246ae..b37b1db453dabcfa89879c1c532e87965368a1a4 100644 (file)
--- a/hw/9pfs/9p-local.c
+++ b/hw/9pfs/9p-local.c
@@ -25,6 +25,7 @@
 #include "qapi/error.h"
 #include "qemu/cutils.h"
 #include "qemu/error-report.h"
+#include "qemu/option.h"
 #include <libgen.h>
 #include <linux/fs.h>
 #ifdef CONFIG_LINUX_MAGIC_H

diff --git a/hw/9pfs/9p-proxy.c b/hw/9pfs/9p-proxy.c
index 0f288b130056497c9af1c6a4bd793a30ba798127..e2e03292de2cf8133d39a061bd379fe7bf85def9 100644 (file)
--- a/hw/9pfs/9p-proxy.c
+++ b/hw/9pfs/9p-proxy.c
@@ -17,6 +17,7 @@
 #include "qapi/error.h"
 #include "qemu/cutils.h"
 #include "qemu/error-report.h"
+#include "qemu/option.h"
 #include "fsdev/qemu-fsdev.h"
 #include "9p-proxy.h"
 

diff --git a/hw/9pfs/xen-9p-backend.c b/hw/9pfs/xen-9p-backend.c
index 14f0d6a50e75e2f37c473c644993d12a9e0d6fbe..95e50c4dfc84579859567b46e45fd9864ca10dcb 100644 (file)
--- a/hw/9pfs/xen-9p-backend.c
+++ b/hw/9pfs/xen-9p-backend.c
@@ -15,6 +15,7 @@
 #include "hw/xen/xen_backend.h"
 #include "hw/9pfs/xen-9pfs.h"
 #include "qemu/config-file.h"
+#include "qemu/option.h"
 #include "fsdev/qemu-fsdev.h"
 
 #define VERSIONS "1"

diff --git a/hw/acpi/core.c b/hw/acpi/core.c
index 5ee55414c1e74aa4013211f8c7a4f2eca082dad4..b50b3ca772c5b71c8059cb40d97703bd663817ed 100644 (file)
--- a/hw/acpi/core.c
+++ b/hw/acpi/core.c
@@ -30,6 +30,7 @@
 #include "qapi-visit.h"
 #include "qapi-event.h"
 #include "qemu/error-report.h"
+#include "qemu/option.h"
 
 struct acpi_table_header {
     uint16_t _length;         /* our length, not actual part of the hdr */

diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index bb244ec35987874ea8a6bc97d1a9c3144b7c24b8..54f8f576b8f050c023a81d72c18f59ead5cc8d1d 100644 (file)
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -22,6 +22,7 @@
 #include "elf.h"
 #include "sysemu/device_tree.h"
 #include "qemu/config-file.h"
+#include "qemu/option.h"
 #include "exec/address-spaces.h"
 
 /* Kernel boot protocol is specified in the kernel docs

diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index 0f70d7e5fb32bf3a962130c489fd9fcdc199a387..7ed1f431f026816358fee65fe03902908fde5fbc 100644 (file)
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -32,6 +32,7 @@
 #include "qapi/qmp/qerror.h"
 #include "qapi/visitor.h"
 #include "qemu/error-report.h"
+#include "qemu/option.h"
 #include "hw/hotplug.h"
 #include "hw/boards.h"
 #include "hw/sysbus.h"

diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c
index c7b70c91d51df58eab67dd804377773abcc2cc04..46d9c68bf5baa912f467c5d89991807c751ed691 100644 (file)
--- a/hw/i386/multiboot.c
+++ b/hw/i386/multiboot.c
@@ -23,7 +23,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu/option.h"
 #include "cpu.h"
 #include "hw/hw.h"
 #include "hw/nvram/fw_cfg.h"

diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index f610253953cb71efcdadb5117d90ec3e8625b933..55e69d66fe6fd2e5c93d450f7a4eeb7b5854e0f2 100644 (file)
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -59,6 +59,7 @@
 #include "qemu/bitmap.h"
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"
+#include "qemu/option.h"
 #include "hw/acpi/acpi.h"
 #include "hw/acpi/cpu_hotplug.h"
 #include "hw/boards.h"

diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c
index 6b183747fcea51facffe8f94117bf2a421522316..4325575e7d8240a71f5da43e971643bb4b785238 100644 (file)
--- a/hw/i386/pc_sysfw.c
+++ b/hw/i386/pc_sysfw.c
@@ -27,6 +27,7 @@
 #include "qapi/error.h"
 #include "sysemu/block-backend.h"
 #include "qemu/error-report.h"
+#include "qemu/option.h"
 #include "hw/sysbus.h"
 #include "hw/hw.h"
 #include "hw/i386/pc.h"

diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index 4313484b21bb60329f3dabba7c607347e6b353d4..2a0739d0e9a102ee226b3a8b401c6060070a63d3 100644 (file)
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "sysemu/sysemu.h"
@@ -31,6 +32,7 @@
 #include "hw/sysbus.h"
 #include "trace.h"
 #include "qemu/error-report.h"
+#include "qemu/option.h"
 #include "qemu/config-file.h"
 #include "qemu/cutils.h"
 #include "qapi/error.h"

diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 343bba93cecaa4f290f0db82401357901c4c3f3d..a40d3ec3e375dbf6e7aa90cbd0724d64dfea7084 100644 (file)
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -16,7 +16,6 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "e500.h"
 #include "e500-ccsr.h"
 #include "net/net.h"
@@ -36,6 +35,7 @@
 #include "hw/sysbus.h"
 #include "exec/address-spaces.h"
 #include "qemu/host-utils.h"
+#include "qemu/option.h"
 #include "hw/pci-host/ppce500.h"
 #include "qemu/error-report.h"
 #include "hw/platform-bus.h"

diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
index 485d9affb2a166b453d7799bad89669be79d0776..77a1778e070be1a30d96cb241381552b078c462c 100644 (file)
--- a/hw/ppc/virtex_ml507.c
+++ b/hw/ppc/virtex_ml507.c
@@ -37,6 +37,7 @@
 #include "elf.h"
 #include "qemu/error-report.h"
 #include "qemu/log.h"
+#include "qemu/option.h"
 #include "exec/address-spaces.h"
 
 #include "hw/ppc/ppc.h"

diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 7d922ad73218ecbee8d1310fe030ce04cfd37ba1..f2db44823371a58659828ef2104397ee94f0e715 100644 (file)
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -12,7 +12,6 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "cpu.h"
 #include "hw/boards.h"
 #include "exec/address-spaces.h"
@@ -24,6 +23,7 @@
 #include "virtio-ccw.h"
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"
+#include "qemu/option.h"
 #include "s390-pci-bus.h"
 #include "hw/s390x/storage-keys.h"
 #include "hw/s390x/storage-attributes.h"

diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
index 05e501efd39aa9c36b76903208af1fd2dc63e0e7..b7bafbed6edb7578c496fff3562862f2b1826b09 100644 (file)
--- a/hw/scsi/scsi-bus.c
+++ b/hw/scsi/scsi-bus.c
@@ -2,6 +2,7 @@
 #include "hw/hw.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
+#include "qemu/option.h"
 #include "hw/scsi/scsi.h"
 #include "scsi/constants.h"
 #include "hw/qdev.h"

diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
index 5d11f01874dd407f1216733a894324d885dfab0a..27a07e96f4343827897eaa27b536cf484e8bdacc 100644 (file)
--- a/hw/smbios/smbios.c
+++ b/hw/smbios/smbios.c
@@ -19,6 +19,7 @@
 #include "qapi/error.h"
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"
+#include "qemu/option.h"
 #include "sysemu/sysemu.h"
 #include "qemu/uuid.h"
 #include "sysemu/cpus.h"

diff --git a/hw/usb/xen-usb.c b/hw/usb/xen-usb.c
index e9eb1e902fe659aae4b17ceea2512fcda5bd96d6..3beeb0d170d76cf0b63fa6e0d704398ce937fec1 100644 (file)
--- a/hw/usb/xen-usb.c
+++ b/hw/usb/xen-usb.c
@@ -23,8 +23,8 @@
 #include <libusb.h>
 #include <sys/user.h>
 
-#include "qemu-common.h"
 #include "qemu/config-file.h"
+#include "qemu/option.h"
 #include "hw/sysbus.h"
 #include "hw/usb.h"
 #include "hw/xen/xen_backend.h"

diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 879510c046cdf8d4fa24c9ee9969527c930d6a20..f02b3aa5410bde24e4032ca2dad33ba627728a9d 100644 (file)
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -26,6 +26,7 @@
 #include "hw/pci/msix.h"
 #include "hw/pci/pci_bridge.h"
 #include "qemu/error-report.h"
+#include "qemu/option.h"
 #include "qemu/range.h"
 #include "sysemu/kvm.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/xen/xen_devconfig.c b/hw/xen/xen_devconfig.c
index a80e78c0dc739cbcfa3764db0edd878d44c55a25..fac9d3fcdcc55741dc77345f94df06944d534a34 100644 (file)
--- a/hw/xen/xen_devconfig.c
+++ b/hw/xen/xen_devconfig.c
@@ -1,5 +1,6 @@
 #include "qemu/osdep.h"
 #include "hw/xen/xen_backend.h"
+#include "qemu/option.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/blockdev.h"
 

diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c
index 76ea9702150b3ef997f6e7539792049c6367c817..70686a2eb101ce4ed706b2cd46df2dbd63690699 100644 (file)
--- a/hw/xtensa/xtfpga.c
+++ b/hw/xtensa/xtfpga.c
@@ -27,7 +27,6 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "cpu.h"
 #include "sysemu/sysemu.h"
 #include "hw/boards.h"
@@ -43,6 +42,7 @@
 #include "chardev/char.h"
 #include "sysemu/device_tree.h"
 #include "qemu/error-report.h"
+#include "qemu/option.h"
 #include "bootparam.h"
 #include "xtensa_memory.h"
 

diff --git a/include/block/block.h b/include/block/block.h
index 47e2910db260d665eebf29d6b8fa2b9063bc2a34..24ef816960e89397c69ec8077ce9dc85ac6c3ee7 100644 (file)
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -4,7 +4,6 @@
 #include "block/aio.h"
 #include "qapi-types.h"
 #include "qemu/iov.h"
-#include "qemu/option.h"
 #include "qemu/coroutine.h"
 #include "block/accounting.h"
 #include "block/dirty-bitmap.h"

diff --git a/include/block/block_int.h b/include/block/block_int.h
index 3e1c90879924a615721f9c61ce0ac16b34b93866..5ea63f8fa8ad4de5add475146e00b7158fd86797 100644 (file)
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -26,7 +26,6 @@
 
 #include "block/accounting.h"
 #include "block/block.h"
-#include "qemu/option.h"
 #include "qemu/queue.h"
 #include "qemu/coroutine.h"
 #include "qemu/stats64.h"

diff --git a/include/block/nbd.h b/include/block/nbd.h
index ee74ec391a8a2cc0b87bc737c61634dd0982d63b..fc500030038d7d9f35a5ca0fc7216f7dcf1b1658 100644 (file)
--- a/include/block/nbd.h
+++ b/include/block/nbd.h
@@ -21,8 +21,6 @@
 #define NBD_H
 
 
-#include "qemu-common.h"
-#include "qemu/option.h"
 #include "io/channel-socket.h"
 #include "crypto/tlscreds.h"
 

diff --git a/include/block/snapshot.h b/include/block/snapshot.h
index 940779994111a39c84744633c4e3033217e4acc8..f73d1094af22034c75800e8f5d10d2ad1cc53815 100644 (file)
--- a/include/block/snapshot.h
+++ b/include/block/snapshot.h
@@ -25,8 +25,6 @@
 #ifndef SNAPSHOT_H
 #define SNAPSHOT_H
 
-#include "qemu-common.h"
-#include "qemu/option.h"
 
 
 #define SNAPSHOT_OPT_BASE       "snapshot."

diff --git a/include/chardev/char.h b/include/chardev/char.h
index d8941fcbb1b5f2367e86b7db65798d0d4a497d38..a381dc3df86b5b7456dc8d2a599b6520548a03e8 100644 (file)
--- a/include/chardev/char.h
+++ b/include/chardev/char.h
@@ -1,8 +1,6 @@
 #ifndef QEMU_CHAR_H
 #define QEMU_CHAR_H
 
-#include "qemu-common.h"
-#include "qemu/option.h"
 #include "qemu/main-loop.h"
 #include "qemu/bitmap.h"
 #include "qom/object.h"

diff --git a/include/hw/acpi/acpi.h b/include/hw/acpi/acpi.h
index 39ff51212995104cc01fccc1bda69d7dfb84ff97..c20ace0d0b1487f1a4aa2e5fb22bb7faea55481e 100644 (file)
--- a/include/hw/acpi/acpi.h
+++ b/include/hw/acpi/acpi.h
@@ -21,7 +21,6 @@
  */
 
 #include "qemu/notify.h"
-#include "qemu/option.h"
 #include "exec/memory.h"
 #include "hw/irq.h"
 #include "hw/acpi/acpi_dev_interface.h"

diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
index 18c0251b40ad2cfdd72f0dc2531f175d74ec004a..fc9d617a7696063ce77299a847e7bf195d8d1137 100644 (file)
--- a/include/hw/qdev-core.h
+++ b/include/hw/qdev-core.h
@@ -2,7 +2,6 @@
 #define QDEV_CORE_H
 
 #include "qemu/queue.h"
-#include "qemu/option.h"
 #include "qemu/bitmap.h"
 #include "qom/object.h"
 #include "hw/irq.h"

diff --git a/include/hw/smbios/smbios.h b/include/hw/smbios/smbios.h
index a83adb93d768e9de37e72dd8fb9ee0e843180dc1..eeb5a4d7b669273b1d6802e605b872715aa2ee1e 100644 (file)
--- a/include/hw/smbios/smbios.h
+++ b/include/hw/smbios/smbios.h
@@ -14,7 +14,6 @@
  *
  */
 
-#include "qemu/option.h"
 
 #define SMBIOS_MAX_TYPE 127
 

diff --git a/include/net/net.h b/include/net/net.h
index 71f1119bc9d9479d6b406d8e403ac1d4dbd6d706..3fc48e4f51a0eb0e7179a7208f106d2b9a2415d9 100644 (file)
--- 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 9a492b84a4b99e139d6382269ac42ad3184869ed..4d63d74da4f1309ce74586794eab33a66e226274 100644 (file)
--- 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
 

diff --git a/include/qapi/opts-visitor.h b/include/qapi/opts-visitor.h
index 6462c96c29ac7945be21e2618a0299b9e2534f7d..9b989e7e0842d87dbe0eb9bed87382a97804b93a 100644 (file)
--- a/include/qapi/opts-visitor.h
+++ b/include/qapi/opts-visitor.h
@@ -14,7 +14,6 @@
 #define OPTS_VISITOR_H
 
 #include "qapi/visitor.h"
-#include "qemu/option.h"
 
 /* Inclusive upper bound on the size of any flattened range. This is a safety
  * (= anti-annoyance) measure; wrong ranges should not cause long startup

diff --git a/include/qemu-common.h b/include/qemu-common.h
index 05319b9ddceffa80d0f1dcb1a2e1749a93682df7..8a4f63c9def2af387aa19398e83a4b387e71ccb1 100644 (file)
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -16,8 +16,6 @@
 
 #define TFR(expr) do { if ((expr) != -1) break; } while (errno == EINTR)
 
-#include "qemu/option.h"
-
 /* Copyright string for -version arguments, About dialogs, etc */
 #define QEMU_COPYRIGHT "Copyright (c) 2003-2017 " \
     "Fabrice Bellard and the QEMU Project developers"

diff --git a/include/qemu/config-file.h b/include/qemu/config-file.h
index 449e631c869a00bdefe7dc85ef3e71ce967abdca..d74f92015297dfe21f9a1f0f3be07e4e152cbea5 100644 (file)
--- a/include/qemu/config-file.h
+++ b/include/qemu/config-file.h
@@ -1,7 +1,6 @@
 #ifndef QEMU_CONFIG_FILE_H
 #define QEMU_CONFIG_FILE_H
 
-#include "qemu/option.h"
 
 QemuOptsList *qemu_find_opts(const char *group);
 QemuOptsList *qemu_find_opts_err(const char *group, Error **errp);

diff --git a/include/sysemu/arch_init.h b/include/sysemu/arch_init.h
index 28f713eae2351ace3548481d35a2edbde863e3cd..d40d882e383cc9f5c5d91a184203efb1b37b1728 100644 (file)
--- a/include/sysemu/arch_init.h
+++ b/include/sysemu/arch_init.h
@@ -2,7 +2,6 @@
 #define QEMU_ARCH_INIT_H
 
 #include "qapi-types.h"
-#include "qemu/option.h"
 
 enum {
     QEMU_ARCH_ALL = -1,

diff --git a/include/sysemu/hostmem.h b/include/sysemu/hostmem.h
index ed6a437f4dea072f47fe3b0a7eb5ee0aec51eed1..621a3f9d42160808f8138f82b848bad1e3a675b8 100644 (file)
--- a/include/sysemu/hostmem.h
+++ b/include/sysemu/hostmem.h
@@ -16,7 +16,6 @@
 #include "sysemu/sysemu.h" /* for MAX_NODES */
 #include "qom/object.h"
 #include "exec/memory.h"
-#include "qemu/option.h"
 #include "qemu/bitmap.h"
 
 #define TYPE_MEMORY_BACKEND "memory-backend"

diff --git a/include/sysemu/numa.h b/include/sysemu/numa.h
index b3545215f694865371ce29ab2bb65ff9429ff122..d99e5474b4f2f56030840100d35ccab5ff3bfddb 100644 (file)
--- a/include/sysemu/numa.h
+++ b/include/sysemu/numa.h
@@ -2,7 +2,6 @@
 #define SYSEMU_NUMA_H
 
 #include "qemu/bitmap.h"
-#include "qemu/option.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/hostmem.h"
 #include "hw/boards.h"

diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index 36fd371c9329fcc83015556c6f9d36a708e7ec5a..77bb3da5828e633ac33e9ba013bebe1b58f246e8 100644 (file)
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -2,7 +2,6 @@
 #define SYSEMU_H
 /* Misc. things related to the system emulator.  */
 
-#include "qemu/option.h"
 #include "qemu/queue.h"
 #include "qemu/timer.h"
 #include "qemu/notify.h"

diff --git a/include/ui/qemu-spice.h b/include/ui/qemu-spice.h
index 52a9f8808b9d4b980419fdf90403a64a39134234..c6d50eb87a7bad4c60d355270cfd94087231efd4 100644 (file)
--- a/include/ui/qemu-spice.h
+++ b/include/ui/qemu-spice.h
@@ -23,7 +23,6 @@
 #ifdef CONFIG_SPICE
 
 #include <spice.h>
-#include "qemu/option.h"
 #include "qemu/config-file.h"
 
 extern int using_spice;

diff --git a/monitor.c b/monitor.c
index 68feb2d12cfd291e55de0be1b8cc040a8d4be7b4..f4992505b14fd56124a82fa6f815c6e8aa37c9ae 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -24,7 +24,6 @@
 
 #include "qemu/osdep.h"
 #include <dirent.h>
-#include "qemu-common.h"
 #include "cpu.h"
 #include "hw/hw.h"
 #include "monitor/qdev.h"
@@ -69,6 +68,7 @@
 #include "exec/memory.h"
 #include "exec/exec-all.h"
 #include "qemu/log.h"
+#include "qemu/option.h"
 #include "qmp-commands.h"
 #include "hmp.h"
 #include "qemu/thread.h"

diff --git a/net/net.c b/net/net.c
index 7a22ca74e2da679285aaef832f02a6625985e73d..7d429252586fef2e9010006cf8b2353311dd66c6 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -32,7 +32,6 @@
 #include "util.h"
 
 #include "monitor/monitor.h"
-#include "qemu-common.h"
 #include "qemu/help_option.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qerror.h"
@@ -44,6 +43,7 @@
 #include "hw/qdev.h"
 #include "qemu/iov.h"
 #include "qemu/main-loop.h"
+#include "qemu/option.h"
 #include "qapi-visit.h"
 #include "qapi/error.h"
 #include "qapi/opts-visitor.h"

diff --git a/net/vhost-user.c b/net/vhost-user.c
index fd766504ab43008eb6afe8eb6b17762ac6a5ea01..cb455125069c4047d0183188dcc791327d6d9f66 100644 (file)
--- a/net/vhost-user.c
+++ b/net/vhost-user.c
@@ -16,6 +16,7 @@
 #include "qapi/error.h"
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"
+#include "qemu/option.h"
 #include "qmp-commands.h"
 #include "trace.h"
 

diff --git a/qdev-monitor.c b/qdev-monitor.c
index a954c2192b01aa36c60be1107ba2e22b4392ec35..846238175f30647f04f84a8f66e1dd2a4be4e0d9 100644 (file)
--- a/qdev-monitor.c
+++ b/qdev-monitor.c
@@ -30,6 +30,7 @@
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"
 #include "qemu/help_option.h"
+#include "qemu/option.h"
 #include "sysemu/block-backend.h"
 #include "migration/misc.h"
 

diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c
index a6a70fc3dc4822a9f8b9f235e81b9f4881a45cf7..9b3cd00af6c6094d7c367797bb1972d0dd47dde6 100644 (file)
--- a/qemu-io-cmds.c
+++ b/qemu-io-cmds.c
@@ -17,6 +17,7 @@
 #include "block/qapi.h"
 #include "qemu/error-report.h"
 #include "qemu/main-loop.h"
+#include "qemu/option.h"
 #include "qemu/timer.h"
 #include "qemu/cutils.h"
 

diff --git a/qemu-nbd.c b/qemu-nbd.c
index 6ff8ef41e94d96b4f32ffc5587367ec1f7612f6a..ed5d9b5062629028a79f879c5ef180507a41a013 100644 (file)
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -22,12 +22,12 @@
 #include <pthread.h>
 
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "qemu/cutils.h"
 #include "sysemu/block-backend.h"
 #include "block/block_int.h"
 #include "block/nbd.h"
 #include "qemu/main-loop.h"
+#include "qemu/option.h"
 #include "qemu/error-report.h"
 #include "qemu/config-file.h"
 #include "qemu/bswap.h"

diff --git a/qmp.c b/qmp.c
index 1b750293e4eaed2e6e3800f4b9c0c113daa02938..793f6f332302ee8aad0d45cc9ece5f9c4a2016cd 100644 (file)
--- a/qmp.c
+++ b/qmp.c
@@ -16,6 +16,7 @@
 #include "qemu/osdep.h"
 #include "qemu-version.h"
 #include "qemu/cutils.h"
+#include "qemu/option.h"
 #include "monitor/monitor.h"
 #include "sysemu/sysemu.h"
 #include "qemu/config-file.h"

diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c
index 2719df3bae849c86db09c3544e213f4ef12d53b0..80d09139be0e753481c8635a61946c412e18915c 100644 (file)
--- a/qom/object_interfaces.c
+++ b/qom/object_interfaces.c
@@ -3,6 +3,7 @@
 #include "qapi/qmp/qdict.h"
 #include "qom/object_interfaces.h"
 #include "qemu/module.h"
+#include "qemu/option.h"
 #include "qapi-visit.h"
 #include "qapi/opts-visitor.h"
 #include "qemu/config-file.h"

diff --git a/replay/replay.c b/replay/replay.c
index ff58a5adf905f9052ceac58507c62b6f98fb42e1..7a23c62d618ea11c8194600fc1a0bfbfa404e49a 100644 (file)
--- a/replay/replay.c
+++ b/replay/replay.c
@@ -11,11 +11,11 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "sysemu/replay.h"
 #include "replay-internal.h"
 #include "qemu/timer.h"
 #include "qemu/main-loop.h"
+#include "qemu/option.h"
 #include "sysemu/cpus.h"
 #include "sysemu/sysemu.h"
 #include "qemu/error-report.h"

diff --git a/tests/test-char.c b/tests/test-char.c
index 54e68a1ad24e11cb0984a229c7532acd4c64aeb1..b358620911336c0b30b123bc79f427ee5dc67718 100644 (file)
--- a/tests/test-char.c
+++ b/tests/test-char.c
@@ -1,8 +1,8 @@
 #include "qemu/osdep.h"
 #include <glib/gstdio.h>
 
-#include "qemu-common.h"
 #include "qemu/config-file.h"
+#include "qemu/option.h"
 #include "qemu/sockets.h"
 #include "chardev/char-fe.h"
 #include "chardev/char-mux.h"

diff --git a/tests/test-qemu-opts.c b/tests/test-qemu-opts.c
index b37d695c28f762b5e851c6ee4748eaf378c2a8a1..5d5a3daa7b6c3d29a0b662cdb6a8f31d7e5e8144 100644 (file)
--- a/tests/test-qemu-opts.c
+++ b/tests/test-qemu-opts.c
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/cutils.h"
+#include "qemu/option.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"

diff --git a/tests/test-replication.c b/tests/test-replication.c
index 31372777aee4647830143586244a4b62188c40e8..68c0d04f2a951dd0feecb2fcb8d7608a7ac2f384 100644 (file)
--- a/tests/test-replication.c
+++ b/tests/test-replication.c
@@ -12,6 +12,7 @@
 
 #include "qapi/error.h"
 #include "qapi/qmp/qdict.h"
+#include "qemu/option.h"
 #include "replication.h"
 #include "block/block_int.h"
 #include "sysemu/block-backend.h"

diff --git a/trace/control.c b/trace/control.c
index 2769934becc1e1987197046f23067982e5f4ac87..e40cfca775ee36e45d31319ad672fd829a833769 100644 (file)
--- a/trace/control.c
+++ b/trace/control.c
@@ -10,6 +10,7 @@
 #include "qemu/osdep.h"
 #include "trace/control.h"
 #include "qemu/help_option.h"
+#include "qemu/option.h"
 #ifdef CONFIG_TRACE_SIMPLE
 #include "trace/simple.h"
 #endif

diff --git a/ui/console.c b/ui/console.c
index f678979f86d623049c1bb37f34b734fa4b4bc9bf..36584d039e3af16d59d89787772af9ea30d6db1b 100644 (file)
--- a/ui/console.c
+++ b/ui/console.c
@@ -23,10 +23,10 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
 #include "ui/console.h"
 #include "hw/qdev-core.h"
 #include "qapi/error.h"
+#include "qemu/option.h"
 #include "qemu/timer.h"
 #include "qmp-commands.h"
 #include "chardev/char-fe.h"

diff --git a/ui/spice-core.c b/ui/spice-core.c
index 64ed759be5007e177584cd49846bcfbdbfb54555..e449172fe905647501236c68b5466dc29ab736bc 100644 (file)
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -21,7 +21,6 @@
 #include <netdb.h>
 #include "sysemu/sysemu.h"
 
-#include "qemu-common.h"
 #include "ui/qemu-spice.h"
 #include "qemu/error-report.h"
 #include "qemu/thread.h"
@@ -32,6 +31,7 @@
 #include "qmp-commands.h"
 #include "qapi/error.h"
 #include "qemu/notify.h"
+#include "qemu/option.h"
 #include "migration/misc.h"
 #include "hw/hw.h"
 #include "ui/spice-display.h"

diff --git a/ui/spice-display.c b/ui/spice-display.c
index efe9c57eb5d09010a768a82627e39bd312217d78..98ccdfb687f683ccc69c21fa6477fef1e1659e67 100644 (file)
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -16,9 +16,9 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
 #include "ui/qemu-spice.h"
 #include "qemu/timer.h"
+#include "qemu/option.h"
 #include "qemu/queue.h"
 #include "ui/console.h"
 #include "sysemu/sysemu.h"

diff --git a/ui/vnc.c b/ui/vnc.c
index a34b1281930d21b8c79680837197b952ffc64ae6..c715bae1cfb25ace1bd61271a66f5a2f7705f603 100644 (file)
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -30,6 +30,7 @@
 #include "trace.h"
 #include "sysemu/sysemu.h"
 #include "qemu/error-report.h"
+#include "qemu/option.h"
 #include "qemu/sockets.h"
 #include "qemu/timer.h"
 #include "qemu/acl.h"