--- qemu-1.7.0/configure.orig 2013-11-27 23:15:55.000000000 +0100 +++ qemu-1.7.0/configure 2013-12-09 16:36:36.884406900 +0100 @@ -468,7 +468,7 @@ CYGWIN*) mingw32="yes" QEMU_CFLAGS="-mno-cygwin $QEMU_CFLAGS" - audio_possible_drivers="winwave sdl" + audio_possible_drivers="winwave dsound sdl fmod" audio_drv_list="winwave" ;; MINGW32*) --- qemu-1.7.0/i386-softmmu/acpi-dsdt.dsl.i.orig 2013-12-09 19:22:01.295153300 +0100 +++ qemu-1.7.0/i386-softmmu/acpi-dsdt.dsl.i 2013-12-09 19:22:02.155170500 +0100 @@ -1,4 +1,6 @@ -ACPI_EXTRACT_ALL_CODE AcpiDsdtAmlCode + +/* ACPI_EXTRACT_ALL_CODE AcpiDsdtAmlCode */ + DefinitionBlock ( "acpi-dsdt.aml", "DSDT", --- qemu-1.7.0/i386-softmmu/q35-acpi-dsdt.dsl.i.orig 2013-12-09 19:22:12.105369500 +0100 +++ qemu-1.7.0/i386-softmmu/q35-acpi-dsdt.dsl.i 2013-12-09 19:22:12.685381100 +0100 @@ -1,4 +1,6 @@ -ACPI_EXTRACT_ALL_CODE Q35AcpiDsdtAmlCode + +/* ACPI_EXTRACT_ALL_CODE Q35AcpiDsdtAmlCode */ + DefinitionBlock ( "q35-acpi-dsdt.aml", "DSDT", --- qemu-1.7.0/i386-softmmu/ssdt-misc.dsl.i.orig 2013-12-09 19:22:09.515317700 +0100 +++ qemu-1.7.0/i386-softmmu/ssdt-misc.dsl.i 2013-12-09 19:22:10.075328900 +0100 @@ -1,30 +1,50 @@ -ACPI_EXTRACT_ALL_CODE ssdp_misc_aml + +/* ACPI_EXTRACT_ALL_CODE ssdp_misc_aml */ + DefinitionBlock ("ssdt-misc.aml", "SSDT", 0x01, "BXPC", "BXSSDTSUSP", 0x1) { Scope(\) { - ACPI_EXTRACT_NAME_DWORD_CONST acpi_pci32_start + +/* ACPI_EXTRACT_NAME_DWORD_CONST acpi_pci32_start */ + Name(P0S, 0x12345678) - ACPI_EXTRACT_NAME_DWORD_CONST acpi_pci32_end + +/* ACPI_EXTRACT_NAME_DWORD_CONST acpi_pci32_end */ + Name(P0E, 0x12345678) - ACPI_EXTRACT_NAME_BYTE_CONST acpi_pci64_valid + +/* ACPI_EXTRACT_NAME_BYTE_CONST acpi_pci64_valid */ + Name(P1V, 0x12) - ACPI_EXTRACT_NAME_BUFFER8 acpi_pci64_start + +/* ACPI_EXTRACT_NAME_BUFFER8 acpi_pci64_start */ + Name(P1S, Buffer() { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }) - ACPI_EXTRACT_NAME_BUFFER8 acpi_pci64_end + +/* ACPI_EXTRACT_NAME_BUFFER8 acpi_pci64_end */ + Name(P1E, Buffer() { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }) - ACPI_EXTRACT_NAME_BUFFER8 acpi_pci64_length + +/* ACPI_EXTRACT_NAME_BUFFER8 acpi_pci64_length */ + Name(P1L, Buffer() { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }) } Scope(\) { - ACPI_EXTRACT_NAME_STRING acpi_s3_name + +/* ACPI_EXTRACT_NAME_STRING acpi_s3_name */ + Name(_S3, Package(0x04) { One, One, Zero, Zero }) - ACPI_EXTRACT_NAME_STRING acpi_s4_name - ACPI_EXTRACT_PKG_START acpi_s4_pkg + +/* ACPI_EXTRACT_NAME_STRING acpi_s4_name */ + + +/* ACPI_EXTRACT_PKG_START acpi_s4_pkg */ + Name(_S4, Package(0x04) { 0x2, 0x2, @@ -43,7 +63,9 @@ Scope(\_SB.PCI0.ISA) { Device(PEVT) { Name(_HID, "QEMU0001") - ACPI_EXTRACT_NAME_WORD_CONST ssdt_isa_pest + +/* ACPI_EXTRACT_NAME_WORD_CONST ssdt_isa_pest */ + Name(PEST, 0xFFFF) OperationRegion(PEOR, SystemIO, PEST, 0x01) Field(PEOR, ByteAcc, NoLock, Preserve) { --- qemu-1.7.0/i386-softmmu/ssdt-pcihp.dsl.i.orig 2013-12-09 19:22:06.945266300 +0100 +++ qemu-1.7.0/i386-softmmu/ssdt-pcihp.dsl.i 2013-12-09 19:22:07.495277300 +0100 @@ -1,18 +1,32 @@ -ACPI_EXTRACT_ALL_CODE ssdp_pcihp_aml + +/* ACPI_EXTRACT_ALL_CODE ssdp_pcihp_aml */ + DefinitionBlock ("ssdt-pcihp.aml", "SSDT", 0x01, "BXPC", "BXSSDTPCIHP", 0x1) { External(\_SB.PCI0, DeviceObj) External(\_SB.PCI0.PCEJ, MethodObj) Scope(\_SB.PCI0) { - ACPI_EXTRACT_DEVICE_START ssdt_pcihp_start - ACPI_EXTRACT_DEVICE_END ssdt_pcihp_end - ACPI_EXTRACT_DEVICE_STRING ssdt_pcihp_name + +/* ACPI_EXTRACT_DEVICE_START ssdt_pcihp_start */ + + +/* ACPI_EXTRACT_DEVICE_END ssdt_pcihp_end */ + + +/* ACPI_EXTRACT_DEVICE_STRING ssdt_pcihp_name */ + Device(SAA) { - ACPI_EXTRACT_NAME_BYTE_CONST ssdt_pcihp_id + +/* ACPI_EXTRACT_NAME_BYTE_CONST ssdt_pcihp_id */ + Name(_SUN, 0xAA) - ACPI_EXTRACT_NAME_DWORD_CONST ssdt_pcihp_adr + +/* ACPI_EXTRACT_NAME_DWORD_CONST ssdt_pcihp_adr */ + Name(_ADR, 0xAA0000) - ACPI_EXTRACT_METHOD_STRING ssdt_pcihp_ej0 + +/* ACPI_EXTRACT_METHOD_STRING ssdt_pcihp_ej0 */ + Method(_EJ0, 1) { Return (PCEJ(_SUN)) } --- qemu-1.7.0/i386-softmmu/ssdt-proc.dsl.i.orig 2013-12-09 19:22:04.295213300 +0100 +++ qemu-1.7.0/i386-softmmu/ssdt-proc.dsl.i 2013-12-09 19:22:04.895225300 +0100 @@ -1,11 +1,21 @@ -ACPI_EXTRACT_ALL_CODE ssdp_proc_aml + +/* ACPI_EXTRACT_ALL_CODE ssdp_proc_aml */ + DefinitionBlock ("ssdt-proc.aml", "SSDT", 0x01, "BXPC", "BXSSDT", 0x1) { - ACPI_EXTRACT_PROCESSOR_START ssdt_proc_start - ACPI_EXTRACT_PROCESSOR_END ssdt_proc_end - ACPI_EXTRACT_PROCESSOR_STRING ssdt_proc_name + +/* ACPI_EXTRACT_PROCESSOR_START ssdt_proc_start */ + + +/* ACPI_EXTRACT_PROCESSOR_END ssdt_proc_end */ + + +/* ACPI_EXTRACT_PROCESSOR_STRING ssdt_proc_name */ + Processor(CPAA, 0xAA, 0x00000000, 0x0) { - ACPI_EXTRACT_NAME_BYTE_CONST ssdt_proc_id + +/* ACPI_EXTRACT_NAME_BYTE_CONST ssdt_proc_id */ + Name(ID, 0xAA) Name(_HID, "ACPI0007") External(CPMA, MethodObj) --- qemu-1.7.0/Makefile.objs.orig 2013-11-27 23:15:55.000000000 +0100 +++ qemu-1.7.0/Makefile.objs 2013-12-09 16:36:36.931206900 +0100 @@ -19,6 +19,8 @@ block-obj-y += qemu-coroutine-sleep.o block-obj-y += coroutine-$(CONFIG_COROUTINE_BACKEND).o +block-obj-$(CONFIG_WIN32) += version.o + ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy) # Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add. # only pull in the actual virtio-9p device if we also enabled virtio. --- qemu-1.7.0/Makefile.orig 2013-11-27 23:15:55.000000000 +0100 +++ qemu-1.7.0/Makefile 2013-12-09 16:38:46.645206900 +0100 @@ -147,7 +147,7 @@ $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pixman V="$(V)" all,) pixman/Makefile: $(SRC_PATH)/pixman/configure - (cd pixman; CFLAGS="$(CFLAGS) -fPIC $(extra_cflags) $(extra_ldflags)" $(SRC_PATH)/pixman/configure $(AUTOCONF_HOST) --disable-gtk --disable-shared --enable-static) + (cd pixman; CFLAGS="$(CFLAGS) $(extra_cflags) $(extra_ldflags)" $(SRC_PATH)/pixman/configure $(AUTOCONF_HOST) --disable-gtk --disable-shared --enable-static) $(SRC_PATH)/pixman/configure: (cd $(SRC_PATH)/pixman; autoreconf -v --install) @@ -174,11 +174,10 @@ bt-host.o: QEMU_CFLAGS += $(BLUEZ_CFLAGS) -$(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc $(BUILD_DIR)/config-host.h | $(BUILD_DIR)/version.lo +$(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc $(SRC_PATH)/qemu.ico $(BUILD_DIR)/config-host.h | $(BUILD_DIR)/version.lo $(call quiet-command,$(WINDRES) -I$(BUILD_DIR) -o $@ $<," RC version.o") -$(BUILD_DIR)/version.lo: $(SRC_PATH)/version.rc $(BUILD_DIR)/config-host.h +$(BUILD_DIR)/version.lo: $(SRC_PATH)/version.rc $(SRC_PATH)/qemu.ico $(BUILD_DIR)/config-host.h $(call quiet-command,$(WINDRES) -I$(BUILD_DIR) -o $@ $<," RC version.lo") - Makefile: $(version-obj-y) $(version-lobj-y) ###################################################################### @@ -191,9 +190,9 @@ qemu-img.o: qemu-img-cmds.h -qemu-img$(EXESUF): qemu-img.o $(block-obj-y) libqemuutil.a libqemustub.a -qemu-nbd$(EXESUF): qemu-nbd.o $(block-obj-y) libqemuutil.a libqemustub.a -qemu-io$(EXESUF): qemu-io.o $(block-obj-y) libqemuutil.a libqemustub.a +qemu-img$(EXESUF): qemu-img.o $(block-obj-y) $(version-obj-y) libqemuutil.a libqemustub.a +qemu-nbd$(EXESUF): qemu-nbd.o $(block-obj-y) $(version-obj-y) libqemuutil.a libqemustub.a +qemu-io$(EXESUF): qemu-io.o $(block-obj-y) $(version-obj-y) libqemuutil.a libqemustub.a qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o @@ -341,6 +340,7 @@ $(INSTALL_DIR) "$(DESTDIR)$(qemu_confdir)" install-sysconfig: install-datadir install-confdir + $(INSTALL_DATA) $(SRC_PATH)/qemu.ico "$(DESTDIR)$(qemu_confdir)" $(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(qemu_confdir)" install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig \ @@ -489,11 +489,12 @@ makensis $(nsisflags) \ $(if $(BUILD_DOCS),-DCONFIG_DOCUMENTATION="y") \ $(if $(CONFIG_GTK),-DCONFIG_GTK="y") \ - -DBINDIR="${INSTDIR}" \ + -DBINDIR=`cygpath -w "${INSTDIR}"` \ + -DCONFSUFFIX="/Bios" \ $(if $(DLL_PATH),-DDLLDIR="$(DLL_PATH)") \ - -DSRCDIR="$(SRC_PATH)" \ - -DOUTFILE="$(INSTALLER)" \ - $(SRC_PATH)/qemu.nsi + -DSRCDIR=`cygpath -w "$(SRC_PATH)"` \ + -DOUTFILE=`cygpath -w "$(INSTALLER)"` \ + `cygpath -w $(SRC_PATH)/qemu.nsi` rm -r ${INSTDIR} ifdef SIGNCODE $(SIGNCODE) $(INSTALLER) --- qemu-1.7.0/qemu.nsi.orig 2013-11-27 23:15:55.000000000 +0100 +++ qemu-1.7.0/qemu.nsi 2013-12-09 16:36:36.993606900 +0100 @@ -28,6 +28,12 @@ !ifndef BINDIR !define BINDIR nsis.tmp !endif +!ifndef CONFSUFFIX +!define CONFSUFFIX "" +!endif +!ifndef CONFDIR +!define CONFDIR "${BINDIR}${CONFSUFFIX}" +!endif !ifndef SRCDIR !define SRCDIR . !endif @@ -119,13 +125,13 @@ File "${SRCDIR}\README" File "${SRCDIR}\VERSION" - File "${BINDIR}\*.bmp" - File "${BINDIR}\*.bin" - File "${BINDIR}\*.dtb" - File "${BINDIR}\*.rom" - File "${BINDIR}\openbios-*" + File "${CONFDIR}\*.bmp" + File "${CONFDIR}\*.bin" + File "${CONFDIR}\*.dtb" + File "${CONFDIR}\*.rom" + File "${CONFDIR}\openbios-*" - File /r "${BINDIR}\keymaps" + File /r "${CONFDIR}\keymaps" !ifdef CONFIG_GTK File /r "${BINDIR}\share" !endif @@ -167,11 +173,12 @@ !ifdef CONFIG_DOCUMENTATION Section "Documentation" SectionDoc SetOutPath "$INSTDIR" - File "${BINDIR}\qemu-doc.html" - File "${BINDIR}\qemu-tech.html" + File "${BINDIR}\Doc\qemu-doc.html" + File "${BINDIR}\Doc\qemu-tech.html" + ;; File "${BINDIR}\Doc\*.txt" CreateDirectory "$SMPROGRAMS\${PRODUCT}" - CreateShortCut "$SMPROGRAMS\${PRODUCT}\User Documentation.lnk" "$INSTDIR\qemu-doc.html" "" "$INSTDIR\qemu-doc.html" 0 - CreateShortCut "$SMPROGRAMS\${PRODUCT}\Technical Documentation.lnk" "$INSTDIR\qemu-tech.html" "" "$INSTDIR\qemu-tech.html" 0 + CreateShortCut "$SMPROGRAMS\${PRODUCT}\User Documentation.lnk" "$INSTDIR\Doc\qemu-doc.html" "" "$INSTDIR\Doc\qemu-doc.html" 0 + CreateShortCut "$SMPROGRAMS\${PRODUCT}\Technical Documentation.lnk" "$INSTDIR\Doc\qemu-tech.html" "" "$INSTDIR\Doc\qemu-tech.html" 0 SectionEnd !endif @@ -205,19 +212,19 @@ Delete "$INSTDIR\COPYING.LIB" Delete "$INSTDIR\README" Delete "$INSTDIR\VERSION" - Delete "$INSTDIR\*.bmp" - Delete "$INSTDIR\*.bin" - Delete "$INSTDIR\*.dll" - Delete "$INSTDIR\*.dtb" - Delete "$INSTDIR\*.rom" - Delete "$INSTDIR\openbios-*" + Delete "${CONFDIR}\*.bmp" + Delete "${CONFDIR}\*.bin" + Delete "${CONFDIR}\*.dll" + Delete "${CONFDIR}\*.dtb" + Delete "${CONFDIR}\*.rom" + Delete "${CONFDIR}\openbios-*" Delete "$INSTDIR\qemu-img.exe" Delete "$INSTDIR\qemu-io.exe" Delete "$INSTDIR\qemu.exe" Delete "$INSTDIR\qemu-system-*.exe" - Delete "$INSTDIR\qemu-doc.html" - Delete "$INSTDIR\qemu-tech.html" - RMDir /r "$INSTDIR\keymaps" + Delete "$INSTDIR\Doc\qemu-doc.html" + Delete "$INSTDIR\Doc\qemu-tech.html" + RMDir /r "${CONFDIR}\keymaps" RMDir /r "$INSTDIR\share" ; Remove generated files Delete "$INSTDIR\stderr.txt" --- qemu-1.7.0/rules.mak.orig 2013-11-27 23:15:55.000000000 +0100 +++ qemu-1.7.0/rules.mak 2013-12-09 16:36:37.009206900 +0100 @@ -24,7 +24,7 @@ %.o: %.c $(call quiet-command,$(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," CC $(TARGET_DIR)$@") %.o: %.rc - $(call quiet-command,$(WINDRES) -I. -o $@ $<," RC $(TARGET_DIR)$@") + $(call quiet-command,$(WINDRES) -I. -o '$(shell cygpath -w $@)' '$(shell cygpath -w $<)'," RC $(TARGET_DIR)$@") ifeq ($(LIBTOOL),) LINK = $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ \ @@ -35,7 +35,7 @@ %.lo: %.c $(call quiet-command,$(LIBTOOL) --mode=compile --tag=CC $(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," lt CC $@") %.lo: %.rc - $(call quiet-command,$(LIBTOOL) --mode=compile --tag=RC $(WINDRES) -I. -o $@ $<,"lt RC $(TARGET_DIR)$@") + $(call quiet-command,$(LIBTOOL) --mode=compile --tag=RC $(WINDRES) -I. -o '$(shell cygpath -w $@)' '$(shell cygpath -w $<)',"lt RC $(TARGET_DIR)$@") %.lo: %.dtrace $(call quiet-command,$(LIBTOOL) --mode=compile --tag=CC dtrace -o $@ -G -s $<, " lt GEN $(TARGET_DIR)$@") --- qemu-1.7.0/ui/vnc-enc-tight.c.orig 2013-11-27 23:15:55.000000000 +0100 +++ qemu-1.7.0/ui/vnc-enc-tight.c 2013-12-09 16:36:37.024806900 +0100 @@ -50,6 +50,8 @@ #include "vnc-enc-tight.h" #include "vnc-palette.h" +typedef unsigned int uint; + /* Compression level stuff. The following array contains various encoder parameters for each of 10 compression levels (0..9). Last three parameters correspond to JPEG quality levels (0..9). */ --- qemu-1.7.0/version.rc.orig 2013-11-27 23:15:55.000000000 +0100 +++ qemu-1.7.0/version.rc 2013-12-09 16:36:37.040406900 +0100 @@ -1,6 +1,7 @@ #include #include "config-host.h" +500 ICON "qemu.ico" VS_VERSION_INFO VERSIONINFO FILEVERSION CONFIG_FILEVERSION PRODUCTVERSION CONFIG_PRODUCTVERSION --- qemu-1.7.0/x86_64-softmmu/acpi-dsdt.dsl.i.orig 2013-12-09 19:57:59.193280100 +0100 +++ qemu-1.7.0/x86_64-softmmu/acpi-dsdt.dsl.i 2013-12-09 19:57:59.913294500 +0100 @@ -1,4 +1,6 @@ -ACPI_EXTRACT_ALL_CODE AcpiDsdtAmlCode + +/* ACPI_EXTRACT_ALL_CODE AcpiDsdtAmlCode */ + DefinitionBlock ( "acpi-dsdt.aml", "DSDT", --- qemu-1.7.0/x86_64-softmmu/q35-acpi-dsdt.dsl.i.orig 2013-12-09 19:58:12.577553700 +0100 +++ qemu-1.7.0/x86_64-softmmu/q35-acpi-dsdt.dsl.i 2013-12-09 19:58:13.297568100 +0100 @@ -1,4 +1,6 @@ -ACPI_EXTRACT_ALL_CODE Q35AcpiDsdtAmlCode + +/* ACPI_EXTRACT_ALL_CODE Q35AcpiDsdtAmlCode */ + DefinitionBlock ( "q35-acpi-dsdt.aml", "DSDT", --- qemu-1.7.0/x86_64-softmmu/ssdt-misc.dsl.i.orig 2013-12-09 19:58:09.257487300 +0100 +++ qemu-1.7.0/x86_64-softmmu/ssdt-misc.dsl.i 2013-12-09 19:58:09.907500300 +0100 @@ -1,30 +1,50 @@ -ACPI_EXTRACT_ALL_CODE ssdp_misc_aml + +/* ACPI_EXTRACT_ALL_CODE ssdp_misc_aml */ + DefinitionBlock ("ssdt-misc.aml", "SSDT", 0x01, "BXPC", "BXSSDTSUSP", 0x1) { Scope(\) { - ACPI_EXTRACT_NAME_DWORD_CONST acpi_pci32_start + +/* ACPI_EXTRACT_NAME_DWORD_CONST acpi_pci32_start */ + Name(P0S, 0x12345678) - ACPI_EXTRACT_NAME_DWORD_CONST acpi_pci32_end + +/* ACPI_EXTRACT_NAME_DWORD_CONST acpi_pci32_end */ + Name(P0E, 0x12345678) - ACPI_EXTRACT_NAME_BYTE_CONST acpi_pci64_valid + +/* ACPI_EXTRACT_NAME_BYTE_CONST acpi_pci64_valid */ + Name(P1V, 0x12) - ACPI_EXTRACT_NAME_BUFFER8 acpi_pci64_start + +/* ACPI_EXTRACT_NAME_BUFFER8 acpi_pci64_start */ + Name(P1S, Buffer() { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }) - ACPI_EXTRACT_NAME_BUFFER8 acpi_pci64_end + +/* ACPI_EXTRACT_NAME_BUFFER8 acpi_pci64_end */ + Name(P1E, Buffer() { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }) - ACPI_EXTRACT_NAME_BUFFER8 acpi_pci64_length + +/* ACPI_EXTRACT_NAME_BUFFER8 acpi_pci64_length */ + Name(P1L, Buffer() { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }) } Scope(\) { - ACPI_EXTRACT_NAME_STRING acpi_s3_name + +/* ACPI_EXTRACT_NAME_STRING acpi_s3_name */ + Name(_S3, Package(0x04) { One, One, Zero, Zero }) - ACPI_EXTRACT_NAME_STRING acpi_s4_name - ACPI_EXTRACT_PKG_START acpi_s4_pkg + +/* ACPI_EXTRACT_NAME_STRING acpi_s4_name */ + + +/* ACPI_EXTRACT_PKG_START acpi_s4_pkg */ + Name(_S4, Package(0x04) { 0x2, 0x2, @@ -43,7 +63,9 @@ Scope(\_SB.PCI0.ISA) { Device(PEVT) { Name(_HID, "QEMU0001") - ACPI_EXTRACT_NAME_WORD_CONST ssdt_isa_pest + +/* ACPI_EXTRACT_NAME_WORD_CONST ssdt_isa_pest */ + Name(PEST, 0xFFFF) OperationRegion(PEOR, SystemIO, PEST, 0x01) Field(PEOR, ByteAcc, NoLock, Preserve) { --- qemu-1.7.0/x86_64-softmmu/ssdt-pcihp.dsl.i.orig 2013-12-09 19:58:06.027422700 +0100 +++ qemu-1.7.0/x86_64-softmmu/ssdt-pcihp.dsl.i 2013-12-09 19:58:06.747437100 +0100 @@ -1,18 +1,32 @@ -ACPI_EXTRACT_ALL_CODE ssdp_pcihp_aml + +/* ACPI_EXTRACT_ALL_CODE ssdp_pcihp_aml */ + DefinitionBlock ("ssdt-pcihp.aml", "SSDT", 0x01, "BXPC", "BXSSDTPCIHP", 0x1) { External(\_SB.PCI0, DeviceObj) External(\_SB.PCI0.PCEJ, MethodObj) Scope(\_SB.PCI0) { - ACPI_EXTRACT_DEVICE_START ssdt_pcihp_start - ACPI_EXTRACT_DEVICE_END ssdt_pcihp_end - ACPI_EXTRACT_DEVICE_STRING ssdt_pcihp_name + +/* ACPI_EXTRACT_DEVICE_START ssdt_pcihp_start */ + + +/* ACPI_EXTRACT_DEVICE_END ssdt_pcihp_end */ + + +/* ACPI_EXTRACT_DEVICE_STRING ssdt_pcihp_name */ + Device(SAA) { - ACPI_EXTRACT_NAME_BYTE_CONST ssdt_pcihp_id + +/* ACPI_EXTRACT_NAME_BYTE_CONST ssdt_pcihp_id */ + Name(_SUN, 0xAA) - ACPI_EXTRACT_NAME_DWORD_CONST ssdt_pcihp_adr + +/* ACPI_EXTRACT_NAME_DWORD_CONST ssdt_pcihp_adr */ + Name(_ADR, 0xAA0000) - ACPI_EXTRACT_METHOD_STRING ssdt_pcihp_ej0 + +/* ACPI_EXTRACT_METHOD_STRING ssdt_pcihp_ej0 */ + Method(_EJ0, 1) { Return (PCEJ(_SUN)) } --- qemu-1.7.0/x86_64-softmmu/ssdt-proc.dsl.i.orig 2013-12-09 19:58:02.767357500 +0100 +++ qemu-1.7.0/x86_64-softmmu/ssdt-proc.dsl.i 2013-12-09 19:58:03.497372100 +0100 @@ -1,11 +1,21 @@ -ACPI_EXTRACT_ALL_CODE ssdp_proc_aml + +/* ACPI_EXTRACT_ALL_CODE ssdp_proc_aml */ + DefinitionBlock ("ssdt-proc.aml", "SSDT", 0x01, "BXPC", "BXSSDT", 0x1) { - ACPI_EXTRACT_PROCESSOR_START ssdt_proc_start - ACPI_EXTRACT_PROCESSOR_END ssdt_proc_end - ACPI_EXTRACT_PROCESSOR_STRING ssdt_proc_name + +/* ACPI_EXTRACT_PROCESSOR_START ssdt_proc_start */ + + +/* ACPI_EXTRACT_PROCESSOR_END ssdt_proc_end */ + + +/* ACPI_EXTRACT_PROCESSOR_STRING ssdt_proc_name */ + Processor(CPAA, 0xAA, 0x00000000, 0x0) { - ACPI_EXTRACT_NAME_BYTE_CONST ssdt_proc_id + +/* ACPI_EXTRACT_NAME_BYTE_CONST ssdt_proc_id */ + Name(ID, 0xAA) Name(_HID, "ACPI0007") External(CPMA, MethodObj)