Merge remote-tracking branch 'stefanha/trivial-patches' into staging
* stefanha/trivial-patches: configure: Insist on a Python 2, not Python 3 bsd-user: fix compile failure ps2: avoid repeated header file includes make: Always set LC_ALL=C for makeinfo configure: Fix wrong preprocessor statement configure: Remove useless uses of ARCH_CFLAGS
This commit is contained in:
commit
7672725d41
2
Makefile
2
Makefile
@ -328,7 +328,7 @@ TEXIFLAG=$(if $(V),,--quiet)
|
|||||||
$(call quiet-command,texi2dvi $(TEXIFLAG) -I . $<," GEN $@")
|
$(call quiet-command,texi2dvi $(TEXIFLAG) -I . $<," GEN $@")
|
||||||
|
|
||||||
%.html: %.texi
|
%.html: %.texi
|
||||||
$(call quiet-command,$(MAKEINFO) $(MAKEINFOFLAGS) --html $< -o $@, \
|
$(call quiet-command,LC_ALL=C $(MAKEINFO) $(MAKEINFOFLAGS) --html $< -o $@, \
|
||||||
" GEN $@")
|
" GEN $@")
|
||||||
|
|
||||||
%.info: %.texi
|
%.info: %.texi
|
||||||
|
@ -41,6 +41,7 @@ int singlestep;
|
|||||||
unsigned long mmap_min_addr;
|
unsigned long mmap_min_addr;
|
||||||
unsigned long guest_base;
|
unsigned long guest_base;
|
||||||
int have_guest_base;
|
int have_guest_base;
|
||||||
|
unsigned long reserved_va;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static const char *interp_prefix = CONFIG_QEMU_INTERP_PREFIX;
|
static const char *interp_prefix = CONFIG_QEMU_INTERP_PREFIX;
|
||||||
|
22
configure
vendored
22
configure
vendored
@ -1242,6 +1242,14 @@ if ! has $python; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Note that if the Python conditional here evaluates True we will exit
|
||||||
|
# with status 1 which is a shell 'false' value.
|
||||||
|
if ! "$python" -c 'import sys; sys.exit(sys.version_info[0] >= 3)'; then
|
||||||
|
echo "Python 2 required but '$python' is version 3 or better."
|
||||||
|
echo "Use --python=/path/to/python to specify a Python 2."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
if test -z "$target_list" ; then
|
if test -z "$target_list" ; then
|
||||||
target_list="$default_target_list"
|
target_list="$default_target_list"
|
||||||
else
|
else
|
||||||
@ -2369,7 +2377,7 @@ int main(void)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
if compile_prog "$ARCH_CFLAGS" "" ; then
|
if compile_prog "" "" ; then
|
||||||
fallocate=yes
|
fallocate=yes
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -2384,7 +2392,7 @@ int main(void)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
if compile_prog "$ARCH_CFLAGS" "" ; then
|
if compile_prog "" "" ; then
|
||||||
sync_file_range=yes
|
sync_file_range=yes
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -2401,7 +2409,7 @@ int main(void)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
if compile_prog "$ARCH_CFLAGS" "" ; then
|
if compile_prog "" "" ; then
|
||||||
fiemap=yes
|
fiemap=yes
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -2431,7 +2439,7 @@ int main(void)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
if compile_prog "$ARCH_CFLAGS" "" ; then
|
if compile_prog "" "" ; then
|
||||||
epoll=yes
|
epoll=yes
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -2454,7 +2462,7 @@ int main(void)
|
|||||||
return epoll_create1 == epoll_create1;
|
return epoll_create1 == epoll_create1;
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
if compile_prog "$ARCH_CFLAGS" "" ; then
|
if compile_prog "" "" ; then
|
||||||
epoll_create1=yes
|
epoll_create1=yes
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -2468,7 +2476,7 @@ int main(void)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
if compile_prog "$ARCH_CFLAGS" "" ; then
|
if compile_prog "" "" ; then
|
||||||
epoll_pwait=yes
|
epoll_pwait=yes
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -2624,7 +2632,7 @@ int main(void) {
|
|||||||
#if defined(_POSIX_SYNCHRONIZED_IO) && _POSIX_SYNCHRONIZED_IO > 0
|
#if defined(_POSIX_SYNCHRONIZED_IO) && _POSIX_SYNCHRONIZED_IO > 0
|
||||||
return fdatasync(0);
|
return fdatasync(0);
|
||||||
#else
|
#else
|
||||||
#abort Not supported
|
#error Not supported
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
|
29
hw/ps2.h
29
hw/ps2.h
@ -1,3 +1,30 @@
|
|||||||
|
/*
|
||||||
|
* QEMU PS/2 keyboard/mouse emulation
|
||||||
|
*
|
||||||
|
* Copyright (C) 2003 Fabrice Bellard
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in
|
||||||
|
* all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||||
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
* THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef HW_PS2_H
|
||||||
|
#define HW_PS2_H
|
||||||
|
|
||||||
/* ps2.c */
|
/* ps2.c */
|
||||||
void *ps2_kbd_init(void (*update_irq)(void *, int), void *update_arg);
|
void *ps2_kbd_init(void (*update_irq)(void *, int), void *update_arg);
|
||||||
void *ps2_mouse_init(void (*update_irq)(void *, int), void *update_arg);
|
void *ps2_mouse_init(void (*update_irq)(void *, int), void *update_arg);
|
||||||
@ -7,3 +34,5 @@ uint32_t ps2_read_data(void *);
|
|||||||
void ps2_queue(void *, int b);
|
void ps2_queue(void *, int b);
|
||||||
void ps2_keyboard_set_translation(void *opaque, int mode);
|
void ps2_keyboard_set_translation(void *opaque, int mode);
|
||||||
void ps2_mouse_fake_event(void *opaque);
|
void ps2_mouse_fake_event(void *opaque);
|
||||||
|
|
||||||
|
#endif /* !HW_PS2_H */
|
||||||
|
Loading…
Reference in New Issue
Block a user