Merge remote-tracking branch 'qmp/queue/qmp' into staging

* qmp/queue/qmp: (29 commits)
  Add 'query-events' command to QMP to query async events
  qapi: convert netdev_del
  qapi: convert netdev_add
  net: net_client_init(): use error_set()
  net: purge the monitor object from all init functions
  qemu-config: introduce qemu_find_opts_err()
  qemu-config: find_list(): use error_set()
  qerror: introduce QERR_INVALID_OPTION_GROUP
  qemu-option: qemu_opts_from_qdict(): use error_set()
  qemu-option: introduce qemu_opt_set_err()
  qemu-option: opt_set(): use error_set()
  qemu-option: qemu_opts_validate(): use error_set()
  qemu-option: qemu_opt_parse(): use error_set()
  qemu-option: parse_option_size(): use error_set()
  qemu-option: parse_option_bool(): use error_set()
  qemu-option: parse_option_number(): use error_set()
  qemu-option: qemu_opts_create(): use error_set()
  introduce a new monitor command 'dump-guest-memory' to dump guest's memory
  make gdb_id() generally avialable and rename it to cpu_index()
  target-i386: Add API to get note's size
  ...

diff --combined cpu-all.h
index 3a93c0c98ad46749c92b708b5870411ba6fe4ee9,2b77f66b35c9707bff29dbad2375f41af071017e..e8749de2b9b3f46a06b93b238676d637f6d9acde
--- 1/cpu-all.h
--- 2/cpu-all.h
+++ b/cpu-all.h
@@@ -22,6 -22,8 +22,8 @@@
  #include "qemu-common.h"
  #include "qemu-tls.h"
  #include "cpu-common.h"
+ #include "memory_mapping.h"
+ #include "dump.h"
  
  /* some important defines:
   *
@@@ -443,6 -445,7 +445,6 @@@ void cpu_watchpoint_remove_all(CPUArchS
  #define SSTEP_NOTIMER 0x4  /* Do not Timers while single stepping */
  
  void cpu_single_step(CPUArchState *env, int enabled);
 -void cpu_state_reset(CPUArchState *s);
  int cpu_is_stopped(CPUArchState *env);
  void run_on_cpu(CPUArchState *env, void (*func)(void *data), void *data);
  
@@@ -523,4 -526,72 +525,72 @@@ void dump_exec_info(FILE *f, fprintf_fu
  int cpu_memory_rw_debug(CPUArchState *env, target_ulong addr,
                          uint8_t *buf, int len, int is_write);
  
+ #if defined(CONFIG_HAVE_GET_MEMORY_MAPPING)
+ int cpu_get_memory_mapping(MemoryMappingList *list, CPUArchState *env);
+ bool cpu_paging_enabled(CPUArchState *env);
+ #else
+ static inline int cpu_get_memory_mapping(MemoryMappingList *list,
+                                          CPUArchState *env)
+ {
+     return -1;
+ }
+ 
+ static inline bool cpu_paging_enabled(CPUArchState *env)
+ {
+     return true;
+ }
+ #endif
+ 
+ typedef int (*write_core_dump_function)(void *buf, size_t size, void *opaque);
+ #if defined(CONFIG_HAVE_CORE_DUMP)
+ int cpu_write_elf64_note(write_core_dump_function f, CPUArchState *env,
+                          int cpuid, void *opaque);
+ int cpu_write_elf32_note(write_core_dump_function f, CPUArchState *env,
+                          int cpuid, void *opaque);
+ int cpu_write_elf64_qemunote(write_core_dump_function f, CPUArchState *env,
+                              void *opaque);
+ int cpu_write_elf32_qemunote(write_core_dump_function f, CPUArchState *env,
+                              void *opaque);
+ int cpu_get_dump_info(ArchDumpInfo *info);
+ size_t cpu_get_note_size(int class, int machine, int nr_cpus);
+ #else
+ static inline int cpu_write_elf64_note(write_core_dump_function f,
+                                        CPUArchState *env, int cpuid,
+                                        void *opaque)
+ {
+     return -1;
+ }
+ 
+ static inline int cpu_write_elf32_note(write_core_dump_function f,
+                                        CPUArchState *env, int cpuid,
+                                        void *opaque)
+ {
+     return -1;
+ }
+ 
+ static inline int cpu_write_elf64_qemunote(write_core_dump_function f,
+                                            CPUArchState *env,
+                                            void *opaque)
+ {
+     return -1;
+ }
+ 
+ static inline int cpu_write_elf32_qemunote(write_core_dump_function f,
+                                            CPUArchState *env,
+                                            void *opaque)
+ {
+     return -1;
+ }
+ 
+ static inline int cpu_get_dump_info(ArchDumpInfo *info)
+ {
+     return -1;
+ }
+ 
+ static inline int cpu_get_note_size(int class, int machine, int nr_cpus)
+ {
+     return -1;
+ }
+ #endif
+ 
  #endif /* CPU_ALL_H */