motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 00:03:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote branch 'spice/spice.v29.pull' into staging

Browse source 
Conflicts:
	trace-events
This commit is contained in:
Anthony Liguori 2011-02-01 15:22:48 -06:00
commit 9363ee31ab
17 changed files with 391 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

31
monitor.c
View file

@ -1146,9 +1146,9 @@ static int expire_password(Monitor *mon, const QDict *qdict, QObject **ret_data)
time_t when;
int rc;
if (strcmp(whenstr, "now")) {
if (strcmp(whenstr, "now") == 0) {
when = 0;
} else if (strcmp(whenstr, "never")) {
} else if (strcmp(whenstr, "never") == 0) {
when = TIME_MAX;
} else if (whenstr[0] == '+') {
when = time(NULL) + strtoull(whenstr+1, NULL, 10);
@ -1183,6 +1183,33 @@ static int expire_password(Monitor *mon, const QDict *qdict, QObject **ret_data)
return -1;
}
static int client_migrate_info(Monitor *mon, const QDict *qdict, QObject **ret_data)
{
const char *protocol = qdict_get_str(qdict, "protocol");
const char *hostname = qdict_get_str(qdict, "hostname");
const char *subject = qdict_get_try_str(qdict, "cert-subject");
int port = qdict_get_try_int(qdict, "port", -1);
int tls_port = qdict_get_try_int(qdict, "tls-port", -1);
int ret;
if (strcmp(protocol, "spice") == 0) {
if (!using_spice) {
qerror_report(QERR_DEVICE_NOT_ACTIVE, "spice");
return -1;
}
ret = qemu_spice_migrate_info(hostname, port, tls_port, subject);
if (ret != 0) {
qerror_report(QERR_UNDEFINED_ERROR);
return -1;
}
return 0;
}
qerror_report(QERR_INVALID_PARAMETER, "protocol");
return -1;
}
static int do_screen_dump(Monitor *mon, const QDict *qdict, QObject **ret_data)
{
vga_hw_screen_dump(qdict_get_str(qdict, "filename"));