Merge commit 'f07918fdff76ace82b1ca3e53bbcddef069eb314' into upstream-merge

* commit 'f07918fdff76ace82b1ca3e53bbcddef069eb314':
  Add getfd and closefd monitor commands
  Add SCM_RIGHTS support to unix socket character devices
  Make tcp_chr_read() use recvmsg()
  sparc64 really implement itlb/dtlb automatic replacement writes
  sparc64 name mmu registers and general cleanup
  Give the kernel more room
  PPC: Round VGA BIOS size to page boundary
  Fix period initialization
  provide tests for pit in kernel and irqchip in kernel
  qemu-thread: use pthread_equal
  Link bios files when building out of tree
  signrom.sh: portability fix
  notify io_thread at the end of rx handling

Conflicts:
	qemu-monitor.hx

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 18 insertions, 0 deletions

diff --git a/qemu-monitor.hx b/qemu-monitor.hx
index 8e4443de9..0dc2ad7d2 100644
--- a/qemu-monitor.hx
+++ b/qemu-monitor.hx
@@ -628,6 +628,24 @@ STEXI
 Inject an MCE on the given CPU (x86 only).
 ETEXI
 
+    { "getfd", "s", do_getfd, "getfd name",
+      "receive a file descriptor via SCM rights and assign it a name" },
+STEXI
+@item getfd @var{fdname}
+If a file descriptor is passed alongside this command using the SCM_RIGHTS
+mechanism on unix sockets, it is stored using the name @var{fdname} for
+later use by other monitor commands.
+ETEXI
+
+    { "closefd", "s", do_closefd, "closefd name",
+      "close a file descriptor previously passed via SCM rights" },
+STEXI
+@item closefd @var{fdname}
+Close the file descriptor previously assigned to @var{fdname} using the
+@code{getfd} command. This is only needed if the file descriptor was never
+used by another monitor command.
+ETEXI
+
     { "cpu_set", "is", do_cpu_set_nr,
       "cpu [online|offline]", "change cpu state" },
 STEXI