Update MARSS for qemu-1.6+.