This commit is contained in:
committed by
Git OBS Bridge
parent
be29349429
commit
cf62e5ae4d
@@ -5,27 +5,27 @@ the "sendkey" command, among other useful things), remove all console
|
||||
commands that can read/write dom0's state.
|
||||
|
||||
|
||||
Index: xen-3.1-testing/tools/ioemu/monitor.c
|
||||
Index: xen-3.2-testing/tools/ioemu/monitor.c
|
||||
===================================================================
|
||||
--- xen-3.1-testing.orig/tools/ioemu/monitor.c
|
||||
+++ xen-3.1-testing/tools/ioemu/monitor.c
|
||||
@@ -1158,6 +1158,7 @@ static term_cmd_t term_cmds[] = {
|
||||
"", "commit changes to the disk images (if -snapshot is used)" },
|
||||
--- xen-3.2-testing.orig/tools/ioemu/monitor.c
|
||||
+++ xen-3.2-testing/tools/ioemu/monitor.c
|
||||
@@ -1231,6 +1231,7 @@ static term_cmd_t term_cmds[] = {
|
||||
"device|all", "commit changes to the disk images (if -snapshot is used) or backing files" },
|
||||
{ "info", "s?", do_info,
|
||||
"subcommand", "show various information about the system state" },
|
||||
+#ifdef CONFIG_TRUSTED_CLIENT
|
||||
{ "q|quit", "", do_quit,
|
||||
"", "quit the emulator" },
|
||||
{ "eject", "-fB", do_eject,
|
||||
@@ -1168,6 +1169,7 @@ static term_cmd_t term_cmds[] = {
|
||||
@@ -1241,6 +1242,7 @@ static term_cmd_t term_cmds[] = {
|
||||
"filename", "save screen into PPM image 'filename'" },
|
||||
{ "log", "s", do_log,
|
||||
"item1[,...]", "activate logging of the specified items to '/tmp/qemu.log'" },
|
||||
+#endif
|
||||
#ifndef CONFIG_DM
|
||||
{ "savevm", "F", do_savevm,
|
||||
"filename", "save the whole virtual machine state to 'filename'" },
|
||||
@@ -1199,12 +1201,14 @@ static term_cmd_t term_cmds[] = {
|
||||
{ "savevm", "s?", do_savevm,
|
||||
"tag|id", "save a VM snapshot. If no tag or id are provided, a new snapshot is created" },
|
||||
@@ -1274,12 +1276,14 @@ static term_cmd_t term_cmds[] = {
|
||||
{ "system_powerdown", "", do_system_powerdown,
|
||||
"", "send system power down event" },
|
||||
#endif /* !CONFIG_DM */
|
||||
@@ -40,23 +40,23 @@ Index: xen-3.1-testing/tools/ioemu/monitor.c
|
||||
#ifndef CONFIG_DM
|
||||
{ "cpu", "i", do_cpu_set,
|
||||
"index", "set the default CPU" },
|
||||
@@ -1213,6 +1217,7 @@ static term_cmd_t term_cmds[] = {
|
||||
"dx dy [dz]", "send mouse move events" },
|
||||
{ "mouse_button", "i", do_mouse_button,
|
||||
@@ -1290,6 +1294,7 @@ static term_cmd_t term_cmds[] = {
|
||||
"state", "change mouse button state (1=L, 2=M, 4=R)" },
|
||||
{ "mouse_set", "i", do_mouse_set,
|
||||
"index", "set which mouse device receives events" },
|
||||
+#ifdef CONFIG_TRUSTED_CLIENT
|
||||
#ifdef HAS_AUDIO
|
||||
{ "wavcapture", "si?i?i?", do_wav_capture,
|
||||
"path [frequency bits channels]",
|
||||
@@ -1220,6 +1225,7 @@ static term_cmd_t term_cmds[] = {
|
||||
@@ -1297,6 +1302,7 @@ static term_cmd_t term_cmds[] = {
|
||||
#endif
|
||||
{ "stopcapture", "i", do_stop_capture,
|
||||
"capture index", "stop capture" },
|
||||
+#endif
|
||||
{ NULL, NULL, },
|
||||
};
|
||||
|
||||
@@ -1258,6 +1264,7 @@ static term_cmd_t info_cmds[] = {
|
||||
#ifndef CONFIG_DM
|
||||
{ "memsave", "lis", do_memory_save,
|
||||
"addr size file", "save to disk virtual memory dump starting at 'addr' of size 'size'", },
|
||||
@@ -1339,6 +1345,7 @@ static term_cmd_t info_cmds[] = {
|
||||
#endif /* !CONFIG_DM */
|
||||
{ "usb", "", usb_info,
|
||||
"", "show guest USB devices", },
|
||||
@@ -64,9 +64,9 @@ Index: xen-3.1-testing/tools/ioemu/monitor.c
|
||||
{ "usbhost", "", usb_host_info,
|
||||
"", "show host USB devices", },
|
||||
{ "profile", "", do_info_profile,
|
||||
@@ -1268,6 +1275,7 @@ static term_cmd_t info_cmds[] = {
|
||||
@@ -1355,6 +1362,7 @@ static term_cmd_t info_cmds[] = {
|
||||
{ "hvmiopage", "", sp_info,
|
||||
"", "show HVM device model shared page info", },
|
||||
"", "show HVM device model shared page info" },
|
||||
#endif /* CONFIG_DM */
|
||||
+#endif
|
||||
{ NULL, NULL, },
|
||||
|
Reference in New Issue
Block a user