Commit 6bddfae3 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'sweil/mingw' into staging 



# By Stefan Weil
# Via Stefan Weil
* sweil/mingw:
  linux-user: Fix stat64 syscall for SPARC64
  configure: Add config.status to recreate the current configuration
  nsis: Improved support for parallel installation of 32 and 64 bit code

Message-id: 1383804909-376-1-git-send-email-sw@weilnetz.de
Signed-off-by: default avatarAnthony Liguori <aliguori@amazon.com>
parents 964668b0 20d155bc

Makefile

+8 −1
Original line number Diff line number Diff line
@@ -28,7 +28,14 @@ CONFIG_ALL=y 
include $(SRC_PATH)/rules.mak

config-host.mak: $(SRC_PATH)/configure

	@echo $@ is out-of-date, running configure

	@sed -n "/.*Configured with/s/[^:]*: //p" $@ | sh

	@# TODO: The next lines include code which supports a smooth

	@# transition from old configurations without config.status.

	@# This code can be removed after QEMU 1.7.

	@if test -x config.status; then \

	    ./config.status; \

        else \

	    sed -n "/.*Configured with/s/[^:]*: //p" $@ | sh; \

	fi

else

config-host.mak:

ifneq ($(filter-out %clean,$(MAKECMDGOALS)),$(if $(MAKECMDGOALS),,fail))

configure

+13 −2
Original line number Diff line number Diff line
@@ -27,6 +27,19 @@ printf " '%s'" "$0" "$@" >> config.log 
echo >> config.log

echo "#" >> config.log



# Save the configure command line for later reuse.

cat <<EOD >config.status

#!/bin/sh

# Generated by configure.

# Run this file to recreate the current configuration.

# Compiler output produced by configure, useful for debugging

# configure, is in config.log if it exists.

EOD

printf "exec" >>config.status

printf " '%s'" "$0" "$@" >>config.status

echo >>config.status

chmod +x config.status



error_exit() {

    echo

    echo "ERROR: $1"
@@ -3757,8 +3770,6 @@ config_host_mak="config-host.mak" 
echo "# Automatically generated by configure - do not modify" >config-all-disas.mak



echo "# Automatically generated by configure - do not modify" > $config_host_mak

printf "# Configured with:" >> $config_host_mak

printf " '%s'" "$0" "$@" >> $config_host_mak

echo >> $config_host_mak



echo all: >> $config_host_mak

linux-user/syscall.c

+3 −3
Original line number Diff line number Diff line
@@ -4870,10 +4870,10 @@ static inline abi_long host_to_target_stat64(void *cpu_env, 
    } else

#endif

    {

#if TARGET_ABI_BITS == 64 && !defined(TARGET_ALPHA)

        struct target_stat *target_st;

#else

#if defined(TARGET_HAS_STRUCT_STAT64)

        struct target_stat64 *target_st;

#else

        struct target_stat *target_st;

#endif



        if (!lock_user_struct(VERIFY_WRITE, target_st, target_addr, 0))

linux-user/syscall_defs.h

+14 −0
Original line number Diff line number Diff line
@@ -1178,6 +1178,7 @@ struct target_stat { 
/* This matches struct stat64 in glibc2.1, hence the absolutely

 * insane amounts of padding around dev_t's.

 */

#define TARGET_HAS_STRUCT_STAT64

struct target_stat64 {

	unsigned short	st_dev;

	unsigned char	__pad0[10];
@@ -1213,6 +1214,7 @@ struct target_stat64 { 
} QEMU_PACKED;



#ifdef TARGET_ARM

#define TARGET_HAS_STRUCT_STAT64

struct target_eabi_stat64 {

        unsigned long long st_dev;

        unsigned int    __pad1;
@@ -1262,6 +1264,7 @@ struct target_stat { 
	abi_ulong	__unused4[2];

};



#define TARGET_HAS_STRUCT_STAT64

struct target_stat64 {

	unsigned char	__pad0[6];

	unsigned short	st_dev;
@@ -1317,6 +1320,7 @@ struct target_stat { 
	abi_ulong	__unused4[2];

};



#define TARGET_HAS_STRUCT_STAT64

struct target_stat64 {

	unsigned char	__pad0[6];

	unsigned short	st_dev;
@@ -1384,6 +1388,8 @@ struct target_stat { 
#endif

};



#if !defined(TARGET_PPC64) || defined(TARGET_ABI32)

#define TARGET_HAS_STRUCT_STAT64

struct QEMU_PACKED target_stat64 {

	unsigned long long st_dev;

        unsigned long long st_ino;
@@ -1406,6 +1412,7 @@ struct QEMU_PACKED target_stat64 { 
        unsigned int   __unused4;

        unsigned int   __unused5;

};

#endif



#elif defined(TARGET_MICROBLAZE)
@@ -1431,6 +1438,7 @@ struct target_stat { 
};



/* FIXME: Microblaze no-mmu user-space has a difference stat64 layout...  */

#define TARGET_HAS_STRUCT_STAT64

struct QEMU_PACKED target_stat64 {

	uint64_t st_dev;

#define TARGET_STAT64_HAS_BROKEN_ST_INO 1
@@ -1486,6 +1494,7 @@ struct target_stat { 
/* This matches struct stat64 in glibc2.1, hence the absolutely

 * insane amounts of padding around dev_t's.

 */

#define TARGET_HAS_STRUCT_STAT64

struct target_stat64 {

	unsigned long long	st_dev;

	unsigned char	__pad1[2];
@@ -1594,6 +1603,7 @@ struct target_stat { 
 * struct stat of the 64-bit kernel.

 */



#define TARGET_HAS_STRUCT_STAT64

struct target_stat64 {

	unsigned int	st_dev;

	unsigned int	st_pad0[3];	/* Reserved for st_dev expansion  */
@@ -1665,6 +1675,7 @@ struct target_stat { 
 * struct stat of the 64-bit kernel.

 */



#define TARGET_HAS_STRUCT_STAT64

struct target_stat64 {

	abi_ulong	st_dev;

	abi_ulong	st_pad0[3];	/* Reserved for st_dev expansion  */
@@ -1721,6 +1732,7 @@ struct target_stat { 
       unsigned int    st_gen;

};



#define TARGET_HAS_STRUCT_STAT64

struct target_stat64 {

       abi_ulong    st_dev;

       abi_ulong    st_ino;
@@ -1770,6 +1782,7 @@ struct target_stat { 
/* This matches struct stat64 in glibc2.1, hence the absolutely

 * insane amounts of padding around dev_t's.

 */

#define TARGET_HAS_STRUCT_STAT64

struct QEMU_PACKED target_stat64 {

	unsigned long long	st_dev;

	unsigned char	__pad0[4];
@@ -1897,6 +1910,7 @@ struct target_stat { 
    unsigned int __unused5;

};



#define TARGET_HAS_STRUCT_STAT64

struct target_stat64 {

    uint64_t st_dev;

    uint64_t st_ino;

qemu.nsi

+5 −1
Original line number Diff line number Diff line
@@ -60,7 +60,11 @@ InstallDir $PROGRAMFILES\qemu 


; Registry key to check for directory (so if you install again, it will

; overwrite the old one automatically)

InstallDirRegKey HKLM "Software\qemu" "Install_Dir"

!ifdef W64

InstallDirRegKey HKLM "Software\qemu64" "Install_Dir"

!else

InstallDirRegKey HKLM "Software\qemu32" "Install_Dir"

!endif



; Request administrator privileges for Windows Vista.

RequestExecutionLevel admin