ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Monitor: Rename cmd_new_ret() 

Now that all handlers are converted to cmd_new_ret(), we can rename
it back to cmd_new(). But now it returns a value.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Luiz Capitulino 2010-02-10 23:50:02 -02:00 committed by Anthony Liguori
parent 0bbc47bb21
commit 261394dbff
2 changed files with 23 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
monitor.c
View File

@ -98,13 +98,12 @@ typedef struct mon_cmd_t {
const char *params; const char *params;
const char *help; const char *help;
void (*user_print)(Monitor *mon, const QObject *data); void (*user_print)(Monitor *mon, const QObject *data);
int (*cmd_new_ret)(Monitor *mon, const QDict *params, QObject **ret_data);
union { union {
void (*info)(Monitor *mon); void (*info)(Monitor *mon);
void (*info_new)(Monitor *mon, QObject **ret_data); void (*info_new)(Monitor *mon, QObject **ret_data);
int (*info_async)(Monitor *mon, MonitorCompletion *cb, void *opaque); int (*info_async)(Monitor *mon, MonitorCompletion *cb, void *opaque);
void (*cmd)(Monitor *mon, const QDict *qdict); void (*cmd)(Monitor *mon, const QDict *qdict);
void (*cmd_new)(Monitor *mon, const QDict *params, QObject **ret_data); int (*cmd_new)(Monitor *mon, const QDict *params, QObject **ret_data);
int (*cmd_async)(Monitor *mon, const QDict *params, int (*cmd_async)(Monitor *mon, const QDict *params,
MonitorCompletion *cb, void *opaque); MonitorCompletion *cb, void *opaque);
} mhandler; } mhandler;
@ -3846,11 +3845,7 @@ static void monitor_call_handler(Monitor *mon, const mon_cmd_t *cmd,
{ {
QObject *data = NULL; QObject *data = NULL;
if (cmd->cmd_new_ret) { cmd->mhandler.cmd_new(mon, params, &data);
cmd->cmd_new_ret(mon, params, &data);
} else {
cmd->mhandler.cmd_new(mon, params, &data);
}
if (is_async_return(data)) { if (is_async_return(data)) {
/* /*

42
qemu-monitor.hx
View File

@ -43,7 +43,7 @@ ETEXI
.params = "[subcommand]", .params = "[subcommand]",
.help = "show various information about the system state", .help = "show various information about the system state",
.user_print = monitor_user_noop, .user_print = monitor_user_noop,
.cmd_new_ret = do_info, .mhandler.cmd_new = do_info,
}, },
STEXI STEXI
@ -123,7 +123,7 @@ ETEXI
.params = "", .params = "",
.help = "quit the emulator", .help = "quit the emulator",
.user_print = monitor_user_noop, .user_print = monitor_user_noop,
.cmd_new_ret = do_quit, .mhandler.cmd_new = do_quit,
}, },
STEXI STEXI
@ -138,7 +138,7 @@ ETEXI
.params = "[-f] device", .params = "[-f] device",
.help = "eject a removable medium (use -f to force it)", .help = "eject a removable medium (use -f to force it)",
.user_print = monitor_user_noop, .user_print = monitor_user_noop,
.cmd_new_ret = do_eject, .mhandler.cmd_new = do_eject,
}, },
STEXI STEXI
@ -153,7 +153,7 @@ ETEXI
.params = "device filename [format]", .params = "device filename [format]",
.help = "change a removable medium, optional format", .help = "change a removable medium, optional format",
.user_print = monitor_user_noop, .user_print = monitor_user_noop,
.cmd_new_ret = do_change, .mhandler.cmd_new = do_change,
}, },
STEXI STEXI
@ -303,7 +303,7 @@ ETEXI
.params = "", .params = "",
.help = "stop emulation", .help = "stop emulation",
.user_print = monitor_user_noop, .user_print = monitor_user_noop,
.cmd_new_ret = do_stop, .mhandler.cmd_new = do_stop,
}, },
STEXI STEXI
@ -318,7 +318,7 @@ ETEXI
.params = "", .params = "",
.help = "resume emulation", .help = "resume emulation",
.user_print = monitor_user_noop, .user_print = monitor_user_noop,
.cmd_new_ret = do_cont, .mhandler.cmd_new = do_cont,
}, },
STEXI STEXI
@ -494,7 +494,7 @@ ETEXI
.params = "", .params = "",
.help = "reset the system", .help = "reset the system",
.user_print = monitor_user_noop, .user_print = monitor_user_noop,
.cmd_new_ret = do_system_reset, .mhandler.cmd_new = do_system_reset,
}, },
STEXI STEXI
@ -510,7 +510,7 @@ ETEXI
.params = "", .params = "",
.help = "send system power down event", .help = "send system power down event",
.user_print = monitor_user_noop, .user_print = monitor_user_noop,
.cmd_new_ret = do_system_powerdown, .mhandler.cmd_new = do_system_powerdown,
}, },
STEXI STEXI
@ -604,7 +604,7 @@ ETEXI
.params = "index", .params = "index",
.help = "set the default CPU", .help = "set the default CPU",
.user_print = monitor_user_noop, .user_print = monitor_user_noop,
.cmd_new_ret = do_cpu_set, .mhandler.cmd_new = do_cpu_set,
}, },
STEXI STEXI
@ -705,7 +705,7 @@ ETEXI
.params = "addr size file", .params = "addr size file",
.help = "save to disk virtual memory dump starting at 'addr' of size 'size'", .help = "save to disk virtual memory dump starting at 'addr' of size 'size'",
.user_print = monitor_user_noop, .user_print = monitor_user_noop,
.cmd_new_ret = do_memory_save, .mhandler.cmd_new = do_memory_save,
}, },
STEXI STEXI
@ -720,7 +720,7 @@ ETEXI
.params = "addr size file", .params = "addr size file",
.help = "save to disk physical memory dump starting at 'addr' of size 'size'", .help = "save to disk physical memory dump starting at 'addr' of size 'size'",
.user_print = monitor_user_noop, .user_print = monitor_user_noop,
.cmd_new_ret = do_physical_memory_save, .mhandler.cmd_new = do_physical_memory_save,
}, },
STEXI STEXI
@ -773,7 +773,7 @@ ETEXI
"shared storage with incremental copy of disk " "shared storage with incremental copy of disk "
"(base image shared between src and destination)", "(base image shared between src and destination)",
.user_print = monitor_user_noop, .user_print = monitor_user_noop,
.cmd_new_ret = do_migrate, .mhandler.cmd_new = do_migrate,
}, },
@ -791,7 +791,7 @@ ETEXI
.params = "", .params = "",
.help = "cancel the current VM migration", .help = "cancel the current VM migration",
.user_print = monitor_user_noop, .user_print = monitor_user_noop,
.cmd_new_ret = do_migrate_cancel, .mhandler.cmd_new = do_migrate_cancel,
}, },
STEXI STEXI
@ -806,7 +806,7 @@ ETEXI
.params = "value", .params = "value",
.help = "set maximum speed (in bytes) for migrations", .help = "set maximum speed (in bytes) for migrations",
.user_print = monitor_user_noop, .user_print = monitor_user_noop,
.cmd_new_ret = do_migrate_set_speed, .mhandler.cmd_new = do_migrate_set_speed,
}, },
STEXI STEXI
@ -821,7 +821,7 @@ ETEXI
.params = "value", .params = "value",
.help = "set maximum tolerated downtime (in seconds) for migrations", .help = "set maximum tolerated downtime (in seconds) for migrations",
.user_print = monitor_user_noop, .user_print = monitor_user_noop,
.cmd_new_ret = do_migrate_set_downtime, .mhandler.cmd_new = do_migrate_set_downtime,
}, },
STEXI STEXI
@ -857,7 +857,7 @@ ETEXI
.params = "auto|[[<domain>:]<bus>:]<slot> nic|storage [[vlan=n][,macaddr=addr][,model=type]] [file=file][,if=type][,bus=nr]...", .params = "auto|[[<domain>:]<bus>:]<slot> nic|storage [[vlan=n][,macaddr=addr][,model=type]] [file=file][,if=type][,bus=nr]...",
.help = "hot-add PCI device", .help = "hot-add PCI device",
.user_print = pci_device_hot_add_print, .user_print = pci_device_hot_add_print,
.cmd_new_ret = pci_device_hot_add, .mhandler.cmd_new = pci_device_hot_add,
}, },
#endif #endif
@ -874,7 +874,7 @@ ETEXI
.params = "[[<domain>:]<bus>:]<slot>", .params = "[[<domain>:]<bus>:]<slot>",
.help = "hot remove PCI device", .help = "hot remove PCI device",
.user_print = monitor_user_noop, .user_print = monitor_user_noop,
.cmd_new_ret = do_pci_device_hot_remove, .mhandler.cmd_new = do_pci_device_hot_remove,
}, },
#endif #endif
@ -1083,7 +1083,7 @@ ETEXI
.params = "getfd name", .params = "getfd name",
.help = "receive a file descriptor via SCM rights and assign it a name", .help = "receive a file descriptor via SCM rights and assign it a name",
.user_print = monitor_user_noop, .user_print = monitor_user_noop,
.cmd_new_ret = do_getfd, .mhandler.cmd_new = do_getfd,
}, },
STEXI STEXI
@ -1100,7 +1100,7 @@ ETEXI
.params = "closefd name", .params = "closefd name",
.help = "close a file descriptor previously passed via SCM rights", .help = "close a file descriptor previously passed via SCM rights",
.user_print = monitor_user_noop, .user_print = monitor_user_noop,
.cmd_new_ret = do_closefd, .mhandler.cmd_new = do_closefd,
}, },
STEXI STEXI
@ -1117,7 +1117,7 @@ ETEXI
.params = "block_passwd device password", .params = "block_passwd device password",
.help = "set the password of encrypted block devices", .help = "set the password of encrypted block devices",
.user_print = monitor_user_noop, .user_print = monitor_user_noop,
.cmd_new_ret = do_block_set_passwd, .mhandler.cmd_new = do_block_set_passwd,
}, },
STEXI STEXI
@ -1132,7 +1132,7 @@ ETEXI
.params = "", .params = "",
.help = "enable QMP capabilities", .help = "enable QMP capabilities",
.user_print = monitor_user_noop, .user_print = monitor_user_noop,
.cmd_new_ret = do_qmp_capabilities, .mhandler.cmd_new = do_qmp_capabilities,
}, },
STEXI STEXI