diff options
| author | Jun Nakajima <jnakajim@gmail.com> | 2011-02-02 23:49:59 -0800 |
|---|---|---|
| committer | Jun Nakajima <jnakajim@gmail.com> | 2011-02-02 23:49:59 -0800 |
| commit | 334ab475d2f27dbf6fbf836c2d4fb86dbb02a15c (patch) | |
| tree | 31739daf9666b860cac11a6af58ec7d0cfb59bd4 /qemu-monitor.hx | |
| parent | 65842c595f20efb0522fe3684716388bc1e87477 (diff) | |
| download | external_qemu-334ab475d2f27dbf6fbf836c2d4fb86dbb02a15c.zip external_qemu-334ab475d2f27dbf6fbf836c2d4fb86dbb02a15c.tar.gz external_qemu-334ab475d2f27dbf6fbf836c2d4fb86dbb02a15c.tar.bz2 | |
x86: Add x86 support. Rebase the change (20906/1) due to a minor conflict.
Change-Id: Ic73cca0fc6c6e5cf74f63daa6080d00aa7c392bb
Signed-off-by: Xiaohui Xin <xiaohui.xin@intel.com>
Signed-off-by: Yunhong Jiang <yunhong.jiang@intel.com>
Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
Diffstat (limited to 'qemu-monitor.hx')
| -rw-r--r-- | qemu-monitor.hx | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/qemu-monitor.hx b/qemu-monitor.hx index fa48527..fd158ea 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -491,7 +491,7 @@ STEXI @item migrate_set_downtime @var{second} Set maximum tolerated downtime (in seconds) for migration. ETEXI - +#ifndef CONFIG_ANDROID #if defined(TARGET_I386) { "drive_add", "ss", drive_hot_add, "pci_addr=[[<domain>:]<bus>:]<slot>\n" "[file=file][,if=type][,bus=n]\n" @@ -500,22 +500,28 @@ ETEXI "[snapshot=on|off][,cache=on|off]", "add drive to PCI storage controller" }, #endif +#endif STEXI @item drive_add Add drive to PCI storage controller. ETEXI +#ifndef CONFIG_ANDROID #if defined(TARGET_I386) { "pci_add", "sss", pci_device_hot_add, "pci_addr=auto|[[<domain>:]<bus>:]<slot> nic|storage [[vlan=n][,macaddr=addr][,model=type]] [file=file][,if=type][,bus=nr]...", "hot-add PCI device" }, #endif +#endif + STEXI @item pci_add Hot-add PCI device. ETEXI +#ifndef CONFIG_ANDROID #if defined(TARGET_I386) { "pci_del", "s", pci_device_hot_remove, "pci_addr=[[<domain>:]<bus>:]<slot>", "hot remove PCI device" }, #endif +#endif STEXI @item pci_del Hot remove PCI device. @@ -611,6 +617,14 @@ policy back to @code{deny}. @end table ETEXI +#if defined(TARGET_I386) + { "mce", "iillll", do_inject_mce, "cpu bank status mcgstatus addr misc", "inject a MCE on the given CPU"}, +#endif +STEXI +@item mce @var{cpu} @var{bank} @var{status} @var{mcgstatus} @var{addr} @var{misc} +Inject an MCE on the given CPU (x86 only). +ETEXI + STEXI @end table ETEXI |