diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-31 11:02:29 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-31 11:02:29 -0500 |
| commit | 96b3d73f5ad5838690d42666c566a48be9d173dc (patch) | |
| tree | ff8308c6bb8494acc5f698308fded86cc5cd4e67 /vl.c | |
| parent | 549f808b577c7709aeaa0244972d3ae28fad97d2 (diff) | |
| parent | f795e743bd026471bcf7952d272424f1fd32e83b (diff) | |
| download | hqemu-96b3d73f5ad5838690d42666c566a48be9d173dc.zip hqemu-96b3d73f5ad5838690d42666c566a48be9d173dc.tar.gz | |
Merge remote-tracking branch 'qmp/queue/qmp' into staging
Conflicts:
ui/spice-core.c
Diffstat (limited to 'vl.c')
| -rw-r--r-- | vl.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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" #include "main-loop.h" |
