Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qemu display harness should use ttyS1

Browse Source
This commit is contained in:
K. Lange 2018-08-12 17:55:23 +09:00
parent eff64a3fc0
commit e8246673b9
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/qemu-display-hack.c
View File

@ -25,7 +25,7 @@ int main(int argc, char * argv[]) {
struct vid_size s;
FILE * f = fopen("/dev/ttyS0","r+");
FILE * f = fopen("/dev/ttyS1","r+");
if (!f) {
fprintf(stderr, "%s: failed to open serial: %s\n", argv[0], strerror(errno));
return 1;

5
util/qemu-harness.py
View File

@ -25,7 +25,9 @@ qemu = subprocess.Popen([
'-soundhw','ac97,pcspk',
# The GTK interface does not play well, force SDL
'-display', 'sdl',
# Redirect serial to TCP server we can connect to
# /dev/ttyS0 is stdio multiplexed with monitor
'-serial', 'mon:stdio',
# /dev/ttyS1 is TCP connection to the harness
'-serial','tcp::4444,server,nowait',
# Add a VGA card with 32mb of video RAM
'-device', 'VGA,id=video0,vgamem_mb=32',
@ -103,7 +105,6 @@ async def heartbeat(transport):
asyncio.get_event_loop().call_soon(sys.exit, 0)
return
if g.width != w or g.height != h:
print("Changed:",g.width,g.height)
transport.write(("geometry-changed %d %d\n" % (g.width,g.height)).encode('utf-8'))
w = g.width
h = g.height