intel_iommu: Correct caching-mode error message

[mirror_qemu.git] / hmp-commands.hx

diff --git a/hmp-commands.hx b/hmp-commands.hx
index 91dfe51c37927599ce6832652b1e5a363f08bdb2..9b4035965cddcdb78a78d2dd45c48a901571f647 100644 (file)
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -350,49 +350,57 @@ ETEXI
     {
         .name       = "savevm",
         .args_type  = "name:s?",
     {
         .name       = "savevm",
         .args_type  = "name:s?",

-        .params     = "[tag|id]",
-        .help       = "save a VM snapshot. If no tag or id are provided, a new snapshot is created",
+        .params     = "tag",
+        .help       = "save a VM snapshot. If no tag is provided, a new snapshot is created",

         .cmd        = hmp_savevm,
     },
 
 STEXI
         .cmd        = hmp_savevm,
     },
 
 STEXI

-@item savevm [@var{tag}|@var{id}]
+@item savevm @var{tag}

 @findex savevm
 Create a snapshot of the whole virtual machine. If @var{tag} is
 provided, it is used as human readable identifier. If there is already
 @findex savevm
 Create a snapshot of the whole virtual machine. If @var{tag} is
 provided, it is used as human readable identifier. If there is already

-a snapshot with the same tag or ID, it is replaced. More info at
+a snapshot with the same tag, it is replaced. More info at

 @ref{vm_snapshots}.
 @ref{vm_snapshots}.

+
+Since 4.0, savevm stopped allowing the snapshot id to be set, accepting
+only @var{tag} as parameter.

 ETEXI
 
     {
         .name       = "loadvm",
         .args_type  = "name:s",
 ETEXI
 
     {
         .name       = "loadvm",
         .args_type  = "name:s",

-        .params     = "tag|id",
-        .help       = "restore a VM snapshot from its tag or id",
+        .params     = "tag",
+        .help       = "restore a VM snapshot from its tag",

         .cmd        = hmp_loadvm,
         .command_completion = loadvm_completion,
     },
 
 STEXI
         .cmd        = hmp_loadvm,
         .command_completion = loadvm_completion,
     },
 
 STEXI

-@item loadvm @var{tag}|@var{id}
+@item loadvm @var{tag}

 @findex loadvm
 Set the whole virtual machine to the snapshot identified by the tag
 @findex loadvm
 Set the whole virtual machine to the snapshot identified by the tag

-@var{tag} or the unique snapshot ID @var{id}.
+@var{tag}.
+
+Since 4.0, loadvm stopped accepting snapshot id as parameter.

 ETEXI
 
     {
         .name       = "delvm",
         .args_type  = "name:s",
 ETEXI
 
     {
         .name       = "delvm",
         .args_type  = "name:s",

-        .params     = "tag|id",
-        .help       = "delete a VM snapshot from its tag or id",
+        .params     = "tag",
+        .help       = "delete a VM snapshot from its tag",

         .cmd        = hmp_delvm,
         .command_completion = delvm_completion,
     },
 
 STEXI
         .cmd        = hmp_delvm,
         .command_completion = delvm_completion,
     },
 
 STEXI

-@item delvm @var{tag}|@var{id}
+@item delvm @var{tag}

 @findex delvm
 @findex delvm

-Delete the snapshot identified by @var{tag} or @var{id}.
+Delete the snapshot identified by @var{tag}.
+
+Since 4.0, delvm stopped deleting snapshots by snapshot id, accepting
+only @var{tag} as parameter.

 ETEXI
 
     {
 ETEXI
 
     {


@@ -643,6 +651,21 @@ sendkey ctrl-alt-f1
 
 This command is useful to send keys that your graphical user interface
 intercepts at low level, such as @code{ctrl-alt-f1} in X Window.
 
 This command is useful to send keys that your graphical user interface
 intercepts at low level, such as @code{ctrl-alt-f1} in X Window.

+ETEXI
+    {
+        .name       = "sync-profile",
+        .args_type  = "op:s?",
+        .params     = "[on|off|reset]",
+        .help       = "enable, disable or reset synchronization profiling. "
+                      "With no arguments, prints whether profiling is on or off.",
+        .cmd        = hmp_sync_profile,
+    },
+
+STEXI
+@item sync-profile [on|off|reset]
+@findex sync-profile
+Enable, disable or reset synchronization profiling. With no arguments, prints
+whether profiling is on or off.

 ETEXI
 
     {
 ETEXI
 
     {


@@ -913,6 +936,22 @@ Bug: can screw up when the buffer contains invalid UTF-8 sequences,
 NUL characters, after the ring buffer lost data, and when reading
 stops because the size limit is reached.
 
 NUL characters, after the ring buffer lost data, and when reading
 stops because the size limit is reached.
 

+ETEXI
+
+    {
+        .name       = "announce_self",
+        .args_type  = "",
+        .params     = "",
+        .help       = "Trigger GARP/RARP announcements",
+        .cmd        = hmp_announce_self,
+    },
+
+STEXI
+@item announce_self
+@findex announce_self
+Trigger a round of GARP/RARP broadcasts; this is useful for explicitly updating the
+network infrastructure after a reconfiguration or some forms of migration.
+The timings of the round are set by the migration announce parameters.

 ETEXI
 
     {
 ETEXI
 
     {


@@ -1306,7 +1345,6 @@ ETEXI
         .params     = "[-n] [[<domain>:]<bus>:]<slot>\n"
                       "[file=file][,if=type][,bus=n]\n"
                       "[,unit=m][,media=d][,index=i]\n"
         .params     = "[-n] [[<domain>:]<bus>:]<slot>\n"
                       "[file=file][,if=type][,bus=n]\n"
                       "[,unit=m][,media=d][,index=i]\n"

-                      "[,cyls=c,heads=h,secs=s[,trans=t]]\n"

                       "[,snapshot=on|off][,cache=on|off]\n"
                       "[,readonly=on|off][,copy-on-read=on|off]",
         .help       = "add drive to PCI storage controller",
                       "[,snapshot=on|off][,cache=on|off]\n"
                       "[,readonly=on|off][,copy-on-read=on|off]",
         .help       = "add drive to PCI storage controller",


@@ -1835,14 +1873,16 @@ ETEXI
         .name       = "cpu-add",
         .args_type  = "id:i",
         .params     = "id",
         .name       = "cpu-add",
         .args_type  = "id:i",
         .params     = "id",

-        .help       = "add cpu",
+        .help       = "add cpu (deprecated, use device_add instead)",

         .cmd        = hmp_cpu_add,
     },
 
 STEXI
 @item cpu-add @var{id}
 @findex cpu-add
         .cmd        = hmp_cpu_add,
     },
 
 STEXI
 @item cpu-add @var{id}
 @findex cpu-add

-Add CPU with id @var{id}
+Add CPU with id @var{id}.  This command is deprecated, please
++use @code{device_add} instead. For details, refer to
+'docs/cpu-hotplug.rst'.

 ETEXI
 
     {
 ETEXI
 
     {