[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 19/19] Drop qemu-objects.h from modules that don't r
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 19/19] Drop qemu-objects.h from modules that don't require it |
Date: |
Mon, 24 Oct 2011 11:27:12 -0200 |
Previous commits dropped most qobjects usage from qemu modules
(now they are a low level interface used by the QAPI). However,
some modules still include the qemu-objects.h header file.
This commit drops qemu-objects.h from some of those modules
and includes qjson.h instead, which is what they actually need.
Signed-off-by: Luiz Capitulino <address@hidden>
---
block.c | 2 +-
error.c | 3 ++-
vl.c | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/block.c b/block.c
index 19024a6..1e5ec78 100644
--- a/block.c
+++ b/block.c
@@ -27,7 +27,7 @@
#include "monitor.h"
#include "block_int.h"
#include "module.h"
-#include "qemu-objects.h"
+#include "qjson.h"
#include "qemu-coroutine.h"
#include "qmp-commands.h"
diff --git a/error.c b/error.c
index 68c0039..990050f 100644
--- a/error.c
+++ b/error.c
@@ -12,8 +12,9 @@
#include "qemu-common.h"
#include "error.h"
+#include "qjson.h"
+#include "qdict.h"
#include "error_int.h"
-#include "qemu-objects.h"
#include "qerror.h"
struct Error
diff --git a/vl.c b/vl.c
index 66f70fb..3292296 100644
--- a/vl.c
+++ b/vl.c
@@ -143,9 +143,9 @@ int main(int argc, char **argv)
#include "audio/audio.h"
#include "migration.h"
#include "kvm.h"
+#include "qjson.h"
#include "qemu-option.h"
#include "qemu-config.h"
-#include "qemu-objects.h"
#include "qemu-options.h"
#include "qmp-commands.h"
#ifdef CONFIG_VIRTFS
--
1.7.7.1.431.g10b2a
- [Qemu-devel] [PATCH 02/19] qapi: Convert query-mice, (continued)
- [Qemu-devel] [PATCH 02/19] qapi: Convert query-mice, Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 01/19] qapi-commands.py: Don't call the output marshal on error, Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 03/19] qapi: Convert query-migrate, Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 07/19] qapi: Convert query-cpus, Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 05/19] Monitor: Introduce monitor_get_cpu_index(), Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 09/19] block: Rename the BlockIOStatus enum values, Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 06/19] qapi: Convert the cpu command, Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 13/19] qapi: Convert query-vnc, Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 10/19] qapi: Convert query-block, Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 11/19] qapi: Convert query-blockstats, Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 19/19] Drop qemu-objects.h from modules that don't require it,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 15/19] qapi: Convert query-balloon, Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 12/19] qerror: Add a user string for QERR_FEATURE_DISABLED, Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 18/19] Monitor: do_info(): Drop QMP command handling code, Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 17/19] QMP: Drop the query commands dispatch table, Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 08/19] block: iostatus: Drop BDRV_IOS_INVAL, Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 14/19] qapi: Convert query-spice, Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 16/19] qapi: Convert query-pci, Luiz Capitulino, 2011/10/24