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>

diff --cc .gitignore
Simple merge

diff --cc configure
Simple merge

diff --cc hw/pflash_cfi01.c
Simple merge

diff --cc hw/pflash_cfi02.c
Simple merge

diff --cc hw/virtio-serial-bus.c
Simple merge

diff --cc hw/vmmouse.c
Simple merge

diff --cc hw/xen_console.c
Simple merge

diff --cc hw/xen_pt.c
Simple merge

diff --cc hw/zynq_slcr.c
Simple merge

diff --cc include/ui/qemu-spice.h
index 0000000000000000000000000000000000000000,73422adeee85eedfd9b1e0da2f3c23d8fa946cd1..5a78fd764d7e359c27d0ac549130ed92ac8fcbb0
mode 000000,100644..100644
--- /dev/null
--- 2/include/ui/qemu-spice.h
+++ b/include/ui/qemu-spice.h
@@@ -1,0 -1,79 +1,83 @@@
+ /*
+  * Copyright (C) 2010 Red Hat, Inc.
+  *
+  * This program is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU General Public License as
+  * published by the Free Software Foundation; either version 2 or
+  * (at your option) version 3 of the License.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+ #ifndef QEMU_SPICE_H
+ #define QEMU_SPICE_H
+ 
+ #ifdef CONFIG_SPICE
+ 
+ #include <spice.h>
+ 
+ #include "qemu/option.h"
+ #include "qemu/config-file.h"
+ #include "monitor/monitor.h"
+ 
+ extern int using_spice;
+ 
+ void qemu_spice_init(void);
+ void qemu_spice_input_init(void);
+ void qemu_spice_audio_init(void);
+ void qemu_spice_display_init(DisplayState *ds);
+ int qemu_spice_display_add_client(int csock, int skipauth, int tls);
+ int qemu_spice_add_interface(SpiceBaseInstance *sin);
+ int qemu_spice_set_passwd(const char *passwd,
+                           bool fail_if_connected, bool disconnect_if_connected);
+ int qemu_spice_set_pw_expire(time_t expires);
+ int qemu_spice_migrate_info(const char *hostname, int port, int tls_port,
+                             const char *subject,
+                             MonitorCompletion cb, void *opaque);
+ 
+ void do_info_spice_print(Monitor *mon, const QObject *data);
+ 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/monitor.h"
+ 
+ #define using_spice 0
+ static inline int qemu_spice_set_passwd(const char *passwd,
+                                         bool fail_if_connected,
+                                         bool disconnect_if_connected)
+ {
+     return -1;
+ }
+ static inline int qemu_spice_set_pw_expire(time_t expires)
+ {
+     return -1;
+ }
+ static inline int qemu_spice_migrate_info(const char *h, int p, int t,
+                                           const char *s,
+                                           MonitorCompletion cb, void *opaque)
+ {
+     cb(opaque, NULL);
+     return -1;
+ }
+ 
+ static inline int qemu_spice_display_add_client(int csock, int skipauth,
+                                                 int tls)
+ {
+     return -1;
+ }
+ 
+ #endif /* CONFIG_SPICE */
+ 
+ #endif /* QEMU_SPICE_H */

diff --cc linux-user/syscall.c
Simple merge

diff --cc net/hub.c
Simple merge

diff --cc qemu-char.c
Simple merge

diff --cc spice-qemu-char.c
index b2586c263d97bcde231564607e22b5d882501892,4b03143f68e7466f0a8e26beab8a3214ba99e3f0..a4d7de8c4f0328054f373a01a930bf4b335dc2f1
--- 1/spice-qemu-char.c
--- 2/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 {                                                                \

diff --cc ui/spice-core.c
Simple merge

diff --cc user-exec.c
Simple merge

diff --cc xen-all.c
Simple merge