Merge commit 'e024e881bb1a8b5085026589360d26ed97acdd64' into upstream-merge

* commit 'e024e881bb1a8b5085026589360d26ed97acdd64': (133 commits)
  target-ppc: Implement correct NaN propagation rules
  target-mips: Implement correct NaN propagation rules
  softfloat: use float{32,64,x80,128}_maybe_silence_nan()
  softfloat: add float{x80,128}_maybe_silence_nan()
  softfloat: fix float{32,64}_maybe_silence_nan() for MIPS
  softfloat: rename *IsNaN variables to *IsQuietNaN
  softfloat: remove HPPA specific code
  target-ppc: use float32_is_any_nan()
  target-ppc: fix default qNaN
  target-ppc: remove PRECISE_EMULATION define
  microblaze: Use more TB chaining
  cirrus_vga: fix division by 0 for color expansion rop
  Fix curses on big endian hosts
  noaudio: correctly account acquired samples
  target-arm: Implement correct NaN propagation rules
  softfloat: abstract out target-specific NaN propagation rules
  softfloat: Rename float*_is_nan() functions to float*_is_quiet_nan()
  TCG: Improve tb_phys_hash_func()
  target-arm: fix UMAAL instruction
  Fix translation of unary PPC/SPE instructions (efdneg etc.).
  ...

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

1 files changed, 20 insertions, 1 deletions

diff --git a/hmp-commands.hx b/hmp-commands.hx
index d8ae9f0be..8eb188b02 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -801,6 +801,25 @@ STEXI
 Set maximum tolerated downtime (in seconds) for migration.
 ETEXI
 
+    {
+        .name       = "snapshot_blkdev",
+        .args_type  = "device:s,snapshot_file:s?,format:s?",
+        .params     = "device [new-image-file] [format]",
+        .help       = "initiates a live snapshot\n\t\t\t"
+                      "of device. If a new image file is specified, the\n\t\t\t"
+                      "new image file will become the new root image.\n\t\t\t"
+                      "If format is specified, the snapshot file will\n\t\t\t"
+                      "be created in that format. Otherwise the\n\t\t\t"
+                      "snapshot will be internal! (currently unsupported)",
+        .mhandler.cmd_new = do_snapshot_blkdev,
+    },
+
+STEXI
+@item snapshot_blkdev
+@findex snapshot_blkdev
+Snapshot device, using snapshot file as target if provided
+ETEXI
+
 #if defined(TARGET_I386)
     {
         .name       = "drive_add",
@@ -1238,7 +1257,7 @@ show i8259 (PIC) state
 @item info pci
 show emulated PCI device info
 @item info tlb
-show virtual to physical memory mappings (i386 only)
+show virtual to physical memory mappings (i386, SH4 and SPARC only)
 @item info mem
 show the active virtual memory mappings (i386 only)
 @item info jit