Skip to content

Commit 76d0042

Browse files
philmdrth7680
authored andcommitted
user: Remove cpu_get_pic_interrupt() stubs
cpu_get_pic_interrupt() is now unreachable from user-mode, delete the unnecessary stubs. Signed-off-by: Philippe Mathieu-Daudé <[email protected]> Reviewed-by: Warner Losh <[email protected]> Reviewed-by: Richard Henderson <[email protected]> Message-Id: <[email protected]> Signed-off-by: Richard Henderson <[email protected]>
1 parent 77c0fc4 commit 76d0042

File tree

4 files changed

+1
-18
lines changed

4 files changed

+1
-18
lines changed

bsd-user/i386/target_arch_cpu.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@ uint64_t cpu_get_tsc(CPUX86State *env)
3333
return cpu_get_host_ticks();
3434
}
3535

36-
int cpu_get_pic_interrupt(CPUX86State *env)
37-
{
38-
return -1;
39-
}
40-
4136
void bsd_i386_write_dt(void *ptr, unsigned long addr, unsigned long limit,
4237
int flags)
4338
{

bsd-user/x86_64/target_arch_cpu.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@ uint64_t cpu_get_tsc(CPUX86State *env)
3333
return cpu_get_host_ticks();
3434
}
3535

36-
int cpu_get_pic_interrupt(CPUX86State *env)
37-
{
38-
return -1;
39-
}
40-
4136
void bsd_x86_64_write_dt(void *ptr, unsigned long addr,
4237
unsigned long limit, int flags)
4338
{

linux-user/main.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,6 @@ const char *qemu_uname_release;
120120
by remapping the process stack directly at the right place */
121121
unsigned long guest_stack_size = 8 * 1024 * 1024UL;
122122

123-
#if defined(TARGET_I386)
124-
int cpu_get_pic_interrupt(CPUX86State *env)
125-
{
126-
return -1;
127-
}
128-
#endif
129-
130123
/***********************************************************/
131124
/* Helper routines for implementing atomic operations. */
132125

target/i386/cpu.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1836,9 +1836,9 @@ int x86_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);
18361836
void x86_cpu_list(void);
18371837
int cpu_x86_support_mca_broadcast(CPUX86State *env);
18381838

1839+
#ifndef CONFIG_USER_ONLY
18391840
int cpu_get_pic_interrupt(CPUX86State *s);
18401841

1841-
#ifndef CONFIG_USER_ONLY
18421842
/* MSDOS compatibility mode FPU exception support */
18431843
void x86_register_ferr_irq(qemu_irq irq);
18441844
void fpu_check_raise_ferr_irq(CPUX86State *s);

0 commit comments

Comments
 (0)