From: Anthony Liguori <aliguori@us.ibm.com>
Date: Wed, 19 Dec 2012 23:15:39 +0000 (-0600)
Subject: Merge remote-tracking branch 'bonzini/header-dirs' into staging
X-Git-Tag: v1.4.0-rc0~251^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=27dd7730582be85c7d4f680f5f71146629809c86;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'bonzini/header-dirs' into staging

* bonzini/header-dirs: (45 commits)
  janitor: move remaining public headers to include/
  hw: move executable format header files to hw/
  fpu: move public header file to include/fpu
  softmmu: move remaining include files to include/ subdirectories
  softmmu: move include files to include/sysemu/
  misc: move include files to include/qemu/
  qom: move include files to include/qom/
  migration: move include files to include/migration/
  monitor: move include files to include/monitor/
  exec: move include files to include/exec/
  block: move include files to include/block/
  qapi: move include files to include/qobject/
  janitor: add guards to headers
  qapi: make struct Visitor opaque
  qapi: remove qapi/qapi-types-core.h
  qapi: move inclusions of qemu-common.h from headers to .c files
  ui: move files to ui/ and include/ui/
  qemu-ga: move qemu-ga files to qga/
  net: reorganize headers
  net: move net.c to net/
  ...

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

27dd7730582be85c7d4f680f5f71146629809c86
diff --cc include/ui/qemu-spice.h
index 642f0126906,73422adeee8..5a78fd764d7
--- a/include/ui/qemu-spice.h
+++ b/include/ui/qemu-spice.h
@@@ -46,13 -45,9 +45,13 @@@ void do_info_spice_print(Monitor *mon, 
  void do_info_spice(Monitor *mon, QObject **ret_data);
  
  CharDriverState *qemu_chr_open_spice(QemuOpts *opts);
 +#if SPICE_SERVER_VERSION >= 0x000c02
 +CharDriverState *qemu_chr_open_spice_port(QemuOpts *opts);
 +void qemu_spice_register_ports(void);
 +#endif
  
  #else  /* CONFIG_SPICE */
- #include "monitor.h"
+ #include "monitor/monitor.h"
  
  #define using_spice 0
  static inline int qemu_spice_set_passwd(const char *passwd,
diff --cc spice-qemu-char.c
index b2586c263d9,4b03143f68e..a4d7de8c4f0
--- a/spice-qemu-char.c
+++ b/spice-qemu-char.c
@@@ -1,11 -1,11 +1,12 @@@
  #include "config-host.h"
  #include "trace.h"
  #include "ui/qemu-spice.h"
+ #include "char/char.h"
  #include <spice.h>
  #include <spice-experimental.h>
 +#include <spice/protocol.h>
  
- #include "osdep.h"
+ #include "qemu/osdep.h"
  
  #define dprintf(_scd, _level, _fmt, ...)                                \
      do {                                                                \