mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'stefanha/trivial-patches' into staging

Browse Source 
* stefanha/trivial-patches:
  iohandler: Use bool for boolean struct member and remove holes
  async: Use bool for boolean struct members and remove a hole
  configure: Fix creation of symbolic links for MinGW toolchain
This commit is contained in:
Anthony Liguori 2012-05-01 18:46:19 -05:00
commit 725cbc68d0
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
async.c
View File

@ -35,10 +35,10 @@ static struct QEMUBH *first_bh;
struct QEMUBH { struct QEMUBH {
QEMUBHFunc *cb; QEMUBHFunc *cb;
void *opaque; void *opaque;
int scheduled;
int idle;
int deleted;
QEMUBH *next; QEMUBH *next;
bool scheduled;
bool idle;
bool deleted;
}; };
QEMUBH *qemu_bh_new(QEMUBHFunc *cb, void *opaque) QEMUBH *qemu_bh_new(QEMUBHFunc *cb, void *opaque)

21
configure vendored
View File

@ -41,8 +41,8 @@ compile_prog() {
# symbolically link $1 to $2. Portable version of "ln -sf". # symbolically link $1 to $2. Portable version of "ln -sf".
symlink() { symlink() {
rm -f $2 rm -rf "$2"
ln -s $1 $2 ln -s "$1" "$2"
} }
# check whether a command is available to this shell (may be either an # check whether a command is available to this shell (may be either an
@ -3427,7 +3427,7 @@ fi
for d in libdis libdis-user; do for d in libdis libdis-user; do
mkdir -p $d mkdir -p $d
symlink $source_path/Makefile.dis $d/Makefile symlink "$source_path/Makefile.dis" "$d/Makefile"
echo > $d/config.mak echo > $d/config.mak
done done
@ -3436,13 +3436,13 @@ if test "$linux" = "yes" ; then
mkdir -p linux-headers mkdir -p linux-headers
case "$cpu" in case "$cpu" in
i386|x86_64) i386|x86_64)
symlink $source_path/linux-headers/asm-x86 linux-headers/asm symlink "$source_path/linux-headers/asm-x86" linux-headers/asm
;; ;;
ppcemb|ppc|ppc64) ppcemb|ppc|ppc64)
symlink $source_path/linux-headers/asm-powerpc linux-headers/asm symlink "$source_path/linux-headers/asm-powerpc" linux-headers/asm
;; ;;
s390x) s390x)
symlink $source_path/linux-headers/asm-s390 linux-headers/asm symlink "$source_path/linux-headers/asm-s390" linux-headers/asm
;; ;;
esac esac
fi fi
@ -3498,7 +3498,7 @@ mkdir -p $target_dir/kvm
if test "$target" = "arm-linux-user" -o "$target" = "armeb-linux-user" -o "$target" = "arm-bsd-user" -o "$target" = "armeb-bsd-user" ; then if test "$target" = "arm-linux-user" -o "$target" = "armeb-linux-user" -o "$target" = "arm-bsd-user" -o "$target" = "armeb-bsd-user" ; then
mkdir -p $target_dir/nwfpe mkdir -p $target_dir/nwfpe
fi fi
symlink $source_path/Makefile.target $target_dir/Makefile symlink "$source_path/Makefile.target" "$target_dir/Makefile"
echo "# Automatically generated by configure - do not modify" > $config_target_mak echo "# Automatically generated by configure - do not modify" > $config_target_mak
@ -3938,7 +3938,7 @@ do
done done
mkdir -p $DIRS mkdir -p $DIRS
for f in $FILES ; do for f in $FILES ; do
if [ -e "$source_path/$f" ] && ! [ -e "$f" ]; then if [ -e "$source_path/$f" ] && [ "$source_path" != `pwd` ]; then
symlink "$source_path/$f" "$f" symlink "$source_path/$f" "$f"
fi fi
done done
@ -3961,7 +3961,7 @@ for hwlib in 32 64; do
mkdir -p $d mkdir -p $d
mkdir -p $d/ide mkdir -p $d/ide
mkdir -p $d/usb mkdir -p $d/usb
symlink $source_path/Makefile.hw $d/Makefile symlink "$source_path/Makefile.hw" "$d/Makefile"
mkdir -p $d/9pfs mkdir -p $d/9pfs
echo "QEMU_CFLAGS+=-DTARGET_PHYS_ADDR_BITS=$hwlib" > $d/config.mak echo "QEMU_CFLAGS+=-DTARGET_PHYS_ADDR_BITS=$hwlib" > $d/config.mak
done done
@ -3969,7 +3969,6 @@ done
if [ "$source_path" != `pwd` ]; then if [ "$source_path" != `pwd` ]; then
# out of tree build # out of tree build
mkdir -p libcacard mkdir -p libcacard
rm -f libcacard/Makefile
symlink "$source_path/libcacard/Makefile" libcacard/Makefile symlink "$source_path/libcacard/Makefile" libcacard/Makefile
fi fi
@ -3977,7 +3976,7 @@ d=libuser
mkdir -p $d mkdir -p $d
mkdir -p $d/trace mkdir -p $d/trace
mkdir -p $d/qom mkdir -p $d/qom
symlink $source_path/Makefile.user $d/Makefile symlink "$source_path/Makefile.user" "$d/Makefile"
if test "$docs" = "yes" ; then if test "$docs" = "yes" ; then
mkdir -p QMP mkdir -p QMP

4
iohandler.c
View File

@ -33,13 +33,13 @@
#endif #endif
typedef struct IOHandlerRecord { typedef struct IOHandlerRecord {
int fd;
IOCanReadHandler *fd_read_poll; IOCanReadHandler *fd_read_poll;
IOHandler *fd_read; IOHandler *fd_read;
IOHandler *fd_write; IOHandler *fd_write;
int deleted;
void *opaque; void *opaque;
QLIST_ENTRY(IOHandlerRecord) next; QLIST_ENTRY(IOHandlerRecord) next;
int fd;
bool deleted;
} IOHandlerRecord; } IOHandlerRecord;
static QLIST_HEAD(, IOHandlerRecord) io_handlers = static QLIST_HEAD(, IOHandlerRecord) io_handlers =