semihosting: Clean up common_semi_open_cb
Use common_semi_cb to return results instead of calling set_swi_errno and common_semi_set_ret directly. Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
		@@ -364,15 +364,13 @@ static int common_semi_open_guestfd;
 | 
				
			|||||||
static void
 | 
					static void
 | 
				
			||||||
common_semi_open_cb(CPUState *cs, target_ulong ret, target_ulong err)
 | 
					common_semi_open_cb(CPUState *cs, target_ulong ret, target_ulong err)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    if (ret == (target_ulong)-1) {
 | 
					    if (err) {
 | 
				
			||||||
        errno = err;
 | 
					 | 
				
			||||||
        set_swi_errno(cs, -1);
 | 
					 | 
				
			||||||
        dealloc_guestfd(common_semi_open_guestfd);
 | 
					        dealloc_guestfd(common_semi_open_guestfd);
 | 
				
			||||||
    } else {
 | 
					    } else {
 | 
				
			||||||
        associate_guestfd(common_semi_open_guestfd, ret);
 | 
					        associate_guestfd(common_semi_open_guestfd, ret);
 | 
				
			||||||
        ret = common_semi_open_guestfd;
 | 
					        ret = common_semi_open_guestfd;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    common_semi_set_ret(cs, ret);
 | 
					    common_semi_cb(cs, ret, err);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static target_ulong
 | 
					static target_ulong
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user