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

Merge remote-tracking branch 'spice/spice.v39' into staging

This commit is contained in:
Anthony Liguori 2011-07-22 09:24:07 -05:00
parent 44129530dd 8927cfbba2
commit e07fc405dc
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/qxl.c
View File

@ -656,8 +656,8 @@ static void qxl_reset_state(PCIQXLDevice *d)
QXLRam *ram = d->ram; QXLRam *ram = d->ram;
QXLRom *rom = d->rom; QXLRom *rom = d->rom;
assert(SPICE_RING_IS_EMPTY(&ram->cmd_ring)); assert(!d->ssd.running || SPICE_RING_IS_EMPTY(&ram->cmd_ring));
assert(SPICE_RING_IS_EMPTY(&ram->cursor_ring)); assert(!d->ssd.running || SPICE_RING_IS_EMPTY(&ram->cursor_ring));
d->shadow_rom.update_id = cpu_to_le32(0); d->shadow_rom.update_id = cpu_to_le32(0);
*rom = d->shadow_rom; *rom = d->shadow_rom;
qxl_rom_set_dirty(d); qxl_rom_set_dirty(d);

11
ui/spice-core.c
View File

@ -480,7 +480,16 @@ void qemu_spice_init(void)
port = qemu_opt_get_number(opts, "port", 0); port = qemu_opt_get_number(opts, "port", 0);
tls_port = qemu_opt_get_number(opts, "tls-port", 0); tls_port = qemu_opt_get_number(opts, "tls-port", 0);
if (!port && !tls_port) { if (!port && !tls_port) {
return; fprintf(stderr, "neither port nor tls-port specified for spice.");
exit(1);
}
if (port < 0 || port > 65535) {
fprintf(stderr, "spice port is out of range");
exit(1);
}
if (tls_port < 0 || tls_port > 65535) {
fprintf(stderr, "spice tls-port is out of range");
exit(1);
} }
password = qemu_opt_get(opts, "password"); password = qemu_opt_get(opts, "password");