* escc fix (xiaoqiang) * ESP fix (Prasad) * scsi-disk tweaks/fix (me) * Makefile dependency fixes (me) * PKGVERSION improvement (Fam) * -vnc man improvement (Robert) -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQEcBAABAgAGBQJXVv8OAAoJEL/70l94x66DghsH/0PPdBRPsYiZcCuh6VRZnSRc mEPwmIOjpVzBeqwIafX+nd3EbYQpNk5arVKQ4SBSyPRdRjpiawzC7UVAwO1M+1xT fyVcbzIgkfxwPyV+NP+CIojELowUFydlVksAPmAmBmqslTxzmkepB2cqO7sYdG4o QEt2cRWZwQ4QlbCFin3EV79Y59Fe4aF1TfYD0HjRSaATaRTAR+bXydpv2BFVLlV8 QBw24QsPR3sQl+j7ywPti7WI+ULvR3ONokDv2/hzpxsKQsTieE5pUsSUn6TAOG0u a1Evcag3GCcYA5mRT5SKp5rrQRivLyFEEUbV2LeheoIXtEEI22NBPi6l8g+sy/M= =dVRp -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging * max-ram-below-4g improvement (Gerd) * escc fix (xiaoqiang) * ESP fix (Prasad) * scsi-disk tweaks/fix (me) * Makefile dependency fixes (me) * PKGVERSION improvement (Fam) * -vnc man improvement (Robert) # gpg: Signature made Tue 07 Jun 2016 18:06:22 BST # gpg: using RSA key 0xBFFBD25F78C7AE83 # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" # gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" * remotes/bonzini/tags/for-upstream: vnc: list the 'to' parameter of '-vnc' in the qemu man page scsi-disk: add missing break Makefile: Derive "PKGVERSION" from "git describe" by default Makefile: add dependency on scripts/hxtool Makefile: add dependency on scripts/make_device_config.sh Makefile: add dependency on scripts/create_config Makefile: Add a "FORCE" target scsi: megasas: null terminate bios version buffer scsi: mark TYPE_SCSI_DISK_BASE as abstract scsi: esp: check TI buffer index before read/write hw/char: QOM'ify escc.c (fix) pc: allow raising low memory via max-ram-below-4g option tests: Rename tests/Makefile to tests/Makefile.include Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
		
			
				
	
	
		
			122 lines
		
	
	
		
			2.7 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
			
		
		
	
	
			122 lines
		
	
	
		
			2.7 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
#!/bin/sh
 | 
						|
 | 
						|
echo "/* Automatically generated by create_config - do not modify */"
 | 
						|
 | 
						|
while read line; do
 | 
						|
 | 
						|
case $line in
 | 
						|
 VERSION=*) # configuration
 | 
						|
    version=${line#*=}
 | 
						|
    echo "#define QEMU_VERSION \"$version\""
 | 
						|
    ;;
 | 
						|
 qemu_*dir=*) # qemu-specific directory configuration
 | 
						|
    name=${line%=*}
 | 
						|
    value=${line#*=}
 | 
						|
    define_name=$(echo $name | LC_ALL=C tr '[a-z]' '[A-Z]')
 | 
						|
    eval "define_value=\"$value\""
 | 
						|
    echo "#define CONFIG_$define_name \"$define_value\""
 | 
						|
    # save for the next definitions
 | 
						|
    eval "$name=\$define_value"
 | 
						|
    ;;
 | 
						|
 prefix=*)
 | 
						|
    # save for the next definitions
 | 
						|
    prefix=${line#*=}
 | 
						|
    ;;
 | 
						|
 IASL=*) # iasl executable
 | 
						|
    value=${line#*=}
 | 
						|
    echo "#define CONFIG_IASL $value"
 | 
						|
    ;;
 | 
						|
 CONFIG_AUDIO_DRIVERS=*)
 | 
						|
    drivers=${line#*=}
 | 
						|
    echo "#define CONFIG_AUDIO_DRIVERS \\"
 | 
						|
    for drv in $drivers; do
 | 
						|
      echo "    &${drv}_audio_driver,\\"
 | 
						|
    done
 | 
						|
    echo ""
 | 
						|
    ;;
 | 
						|
 CONFIG_BDRV_RW_WHITELIST=*)
 | 
						|
    echo "#define CONFIG_BDRV_RW_WHITELIST\\"
 | 
						|
    for drv in ${line#*=}; do
 | 
						|
      echo "    \"${drv}\",\\"
 | 
						|
    done
 | 
						|
    echo "    NULL"
 | 
						|
    ;;
 | 
						|
 CONFIG_BDRV_RO_WHITELIST=*)
 | 
						|
    echo "#define CONFIG_BDRV_RO_WHITELIST\\"
 | 
						|
    for drv in ${line#*=}; do
 | 
						|
      echo "    \"${drv}\",\\"
 | 
						|
    done
 | 
						|
    echo "    NULL"
 | 
						|
    ;;
 | 
						|
 CONFIG_*='$(CONFIG_SOFTMMU)'|CONFIG_*=y) # configuration
 | 
						|
    name=${line%=*}
 | 
						|
    echo "#define $name 1"
 | 
						|
    ;;
 | 
						|
 CONFIG_*=*) # configuration
 | 
						|
    name=${line%=*}
 | 
						|
    value=${line#*=}
 | 
						|
    echo "#define $name $value"
 | 
						|
    ;;
 | 
						|
 HAVE_*=y) # configuration
 | 
						|
    name=${line%=*}
 | 
						|
    echo "#define $name 1"
 | 
						|
    ;;
 | 
						|
 HAVE_*=*) # configuration
 | 
						|
    name=${line%=*}
 | 
						|
    value=${line#*=}
 | 
						|
    echo "#define $name $value"
 | 
						|
    ;;
 | 
						|
 ARCH=*) # configuration
 | 
						|
    arch=${line#*=}
 | 
						|
    arch_name=$(echo $arch | LC_ALL=C tr '[a-z]' '[A-Z]')
 | 
						|
    echo "#define HOST_$arch_name 1"
 | 
						|
    ;;
 | 
						|
 HOST_USB=*)
 | 
						|
    # do nothing
 | 
						|
    ;;
 | 
						|
 HOST_CC=*)
 | 
						|
    # do nothing
 | 
						|
    ;;
 | 
						|
 HOST_*=y) # configuration
 | 
						|
    name=${line%=*}
 | 
						|
    echo "#define $name 1"
 | 
						|
    ;;
 | 
						|
 HOST_*=*) # configuration
 | 
						|
    name=${line%=*}
 | 
						|
    value=${line#*=}
 | 
						|
    echo "#define $name $value"
 | 
						|
    ;;
 | 
						|
 TARGET_BASE_ARCH=*) # configuration
 | 
						|
    target_base_arch=${line#*=}
 | 
						|
    base_arch_name=$(echo $target_base_arch | LC_ALL=C tr '[a-z]' '[A-Z]')
 | 
						|
    echo "#define TARGET_$base_arch_name 1"
 | 
						|
    ;;
 | 
						|
 TARGET_XML_FILES=*)
 | 
						|
    # do nothing
 | 
						|
    ;;
 | 
						|
 TARGET_ABI_DIR=*)
 | 
						|
    # do nothing
 | 
						|
    ;;
 | 
						|
 TARGET_NAME=*)
 | 
						|
    target_name=${line#*=}
 | 
						|
    echo "#define TARGET_NAME \"$target_name\""
 | 
						|
    ;;
 | 
						|
 TARGET_DIRS=*)
 | 
						|
    # do nothing
 | 
						|
    ;;
 | 
						|
 TARGET_*=y) # configuration
 | 
						|
    name=${line%=*}
 | 
						|
    echo "#define $name 1"
 | 
						|
    ;;
 | 
						|
 TARGET_*=*) # configuration
 | 
						|
    name=${line%=*}
 | 
						|
    value=${line#*=}
 | 
						|
    echo "#define $name $value"
 | 
						|
    ;;
 | 
						|
 DSOSUF=*)
 | 
						|
    echo "#define HOST_DSOSUF \"${line#*=}\""
 | 
						|
    ;;
 | 
						|
esac
 | 
						|
 | 
						|
done # read
 |