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

monitor: convert do_change() to QObject, QError 

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Markus Armbruster 2009-12-07 21:37:09 +01:00 committed by Anthony Liguori
parent a6906e31a8
commit ec3b82afaa
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
monitor.c
View File

@ -800,13 +800,13 @@ static void do_change_block(Monitor *mon, const char *device,
bs = bdrv_find(device); bs = bdrv_find(device);
if (!bs) { if (!bs) {
monitor_printf(mon, "device not found\n"); qemu_error_new(QERR_DEVICE_NOT_FOUND, device);
return; return;
} }
if (fmt) { if (fmt) {
drv = bdrv_find_whitelisted_format(fmt); drv = bdrv_find_whitelisted_format(fmt);
if (!drv) { if (!drv) {
monitor_printf(mon, "invalid format %s\n", fmt); qemu_error_new(QERR_INVALID_BLOCK_FORMAT, fmt);
return; return;
} }
} }
@ -816,17 +816,17 @@ static void do_change_block(Monitor *mon, const char *device,
monitor_read_bdrv_key_start(mon, bs, NULL, NULL); monitor_read_bdrv_key_start(mon, bs, NULL, NULL);
} }
static void change_vnc_password(Monitor *mon, const char *password) static void change_vnc_password(const char *password)
{ {
if (vnc_display_password(NULL, password) < 0) if (vnc_display_password(NULL, password) < 0)
monitor_printf(mon, "could not set VNC server password\n"); qemu_error_new(QERR_SET_PASSWD_FAILED);
} }
static void change_vnc_password_cb(Monitor *mon, const char *password, static void change_vnc_password_cb(Monitor *mon, const char *password,
void *opaque) void *opaque)
{ {
change_vnc_password(mon, password); change_vnc_password(password);
monitor_read_command(mon, 1); monitor_read_command(mon, 1);
} }
@ -838,17 +838,20 @@ static void do_change_vnc(Monitor *mon, const char *target, const char *arg)
char password[9]; char password[9];
strncpy(password, arg, sizeof(password)); strncpy(password, arg, sizeof(password));
password[sizeof(password) - 1] = '\0'; password[sizeof(password) - 1] = '\0';
change_vnc_password(mon, password); change_vnc_password(password);
} else { } else {
monitor_read_password(mon, change_vnc_password_cb, NULL); monitor_read_password(mon, change_vnc_password_cb, NULL);
} }
} else { } else {
if (vnc_display_open(NULL, target) < 0) if (vnc_display_open(NULL, target) < 0)
monitor_printf(mon, "could not start VNC server on %s\n", target); qemu_error_new(QERR_VNC_SERVER_FAILED, target);
} }
} }
static void do_change(Monitor *mon, const QDict *qdict) /**
* do_change(): Change a removable medium, or VNC configuration
*/
static void do_change(Monitor *mon, const QDict *qdict, QObject **ret_data)
{ {
const char *device = qdict_get_str(qdict, "device"); const char *device = qdict_get_str(qdict, "device");
const char *target = qdict_get_str(qdict, "target"); const char *target = qdict_get_str(qdict, "target");

3
qemu-monitor.hx
View File

@ -147,7 +147,8 @@ ETEXI
.args_type = "device:B,target:F,arg:s?", .args_type = "device:B,target:F,arg:s?",
.params = "device filename [format]", .params = "device filename [format]",
.help = "change a removable medium, optional format", .help = "change a removable medium, optional format",
.mhandler.cmd = do_change, .user_print = monitor_user_noop,
.mhandler.cmd_new = do_change,
}, },
STEXI STEXI