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

* qmp/queue/qmp:
  block: live snapshot documentation tweaks
  input: index_from_key(): drop unused code
  qmp: qmp_send_key(): accept key codes in hex
  input: qmp_send_key(): simplify
  hmp: dump-guest-memory: hardcode protocol argument to "file:"
  qmp: dump-guest-memory: don't spin if non-blocking fd would block
  qmp: dump-guest-memory: improve schema doc (again)
  qapi: convert add_client
  monitor: add Error * argument to monitor_get_fd
  pci-assign: use monitor_handle_fd_param
  qapi: add "unix" to the set of reserved words
  qapi: do not protect enum values from namespace pollution
  Add qemu-ga-client script
  Support settimeout in QEMUMonitorProtocol
  Make negotiation optional in QEMUMonitorProtocol

diff --combined monitor.c
index 7beac9a,c9f460a..cd735bb
--- 1/monitor.c
--- 2/monitor.c
+++ b/monitor.c
@@@ -944,45 -944,6 +944,6 @@@ static void do_trace_print_events(Monit
      trace_print_events((FILE *)mon, &monitor_fprintf);
  }
  
- static int add_graphics_client(Monitor *mon, const QDict *qdict, QObject **ret_data)
- {
-     const char *protocol  = qdict_get_str(qdict, "protocol");
-     const char *fdname = qdict_get_str(qdict, "fdname");
-     CharDriverState *s;
- 
-     if (strcmp(protocol, "spice") == 0) {
-         int fd = monitor_get_fd(mon, fdname);
-         int skipauth = qdict_get_try_bool(qdict, "skipauth", 0);
-         int tls = qdict_get_try_bool(qdict, "tls", 0);
-         if (!using_spice) {
-             /* correct one? spice isn't a device ,,, */
-             qerror_report(QERR_DEVICE_NOT_ACTIVE, "spice");
-             return -1;
-         }
-         if (qemu_spice_display_add_client(fd, skipauth, tls) < 0) {
-             close(fd);
-         }
-         return 0;
- #ifdef CONFIG_VNC
-     } else if (strcmp(protocol, "vnc") == 0) {
-       int fd = monitor_get_fd(mon, fdname);
-         int skipauth = qdict_get_try_bool(qdict, "skipauth", 0);
-       vnc_display_add_client(NULL, fd, skipauth);
-       return 0;
- #endif
-     } else if ((s = qemu_chr_find(protocol)) != NULL) {
-       int fd = monitor_get_fd(mon, fdname);
-       if (qemu_chr_add_client(s, fd) < 0) {
-           qerror_report(QERR_ADD_CLIENT_FAILED);
-           return -1;
-       }
-       return 0;
-     }
- 
-     qerror_report(QERR_INVALID_PARAMETER, "protocol");
-     return -1;
- }
- 
  static int client_migrate_info(Monitor *mon, const QDict *qdict,
                                 MonitorCompletion cb, void *opaque)
  {
@@@ -2118,7 -2079,7 +2079,7 @@@ static void do_loadvm(Monitor *mon, con
      }
  }
  
- int monitor_get_fd(Monitor *mon, const char *fdname)
+ int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp)
  {
      mon_fd_t *monfd;
  
@@@ -2139,6 -2100,7 +2100,7 @@@
          return fd;
      }
  
+     error_setg(errp, "File descriptor named '%s' has not been found", fdname);
      return -1;
  }
  
@@@ -2410,12 -2372,14 +2372,14 @@@ int monitor_fdset_dup_fd_remove(int dup
  int monitor_handle_fd_param(Monitor *mon, const char *fdname)
  {
      int fd;
+     Error *local_err = NULL;
  
      if (!qemu_isdigit(fdname[0]) && mon) {
  
-         fd = monitor_get_fd(mon, fdname);
+         fd = monitor_get_fd(mon, fdname, &local_err);
          if (fd == -1) {
-             error_report("No file descriptor named %s found", fdname);
+             qerror_report_err(local_err);
+             error_free(local_err);
              return -1;
          }
      } else {
@@@ -3259,7 -3223,11 +3223,7 @@@ static int64_t expr_unary(Monitor *mon
          break;
      default:
          errno = 0;
 -#if TARGET_PHYS_ADDR_BITS > 32
          n = strtoull(pch, &p, 0);
 -#else
 -        n = strtoul(pch, &p, 0);
 -#endif
          if (errno == ERANGE) {
              expr_error(mon, "number too large");
          }