Date: Fri, 29 Apr 2016 20:15:37 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r414292 - head/emulators/virtualbox-ose/files Message-ID: <201604292015.u3TKFbbw006876@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Fri Apr 29 20:15:36 2016 New Revision: 414292 URL: https://svnweb.freebsd.org/changeset/ports/414292 Log: Add upstream patches to build with recent iASL on head. https://www.virtualbox.org/changeset/58415 https://www.virtualbox.org/changeset/60582 https://www.virtualbox.org/changeset/60616 Added: head/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Makefile.kmk (contents, props changed) head/emulators/virtualbox-ose/files/patch-src_VBox_Devices_PC_vbox-cpuhotplug.dsl (contents, props changed) Added: head/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Makefile.kmk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Makefile.kmk Fri Apr 29 20:15:36 2016 (r414292) @@ -0,0 +1,18 @@ +--- src/VBox/Devices/Makefile.kmk.orig 2016-04-20 10:01:06 UTC ++++ src/VBox/Devices/Makefile.kmk +@@ -801,11 +801,13 @@ if !defined(VBOX_ONLY_EXTPACKS) + $(call MSG_TOOL,iasl,VBoxDD,$<,$@) + $(QUIET)$(RM) -f $@ $@.tmp $@.pre + $(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -E -P -x c -o $@.pre $< +- $(QUIET)$(VBOX_IASLCMD) -tc -vs -p $@ $@.pre ++ $(QUIET)$(SED) "s/<NL>/\n/g" \ ++ --output $@.pre1 $@.pre ++ $(QUIET)$(VBOX_IASLCMD) -tc -vs -p $@ $@.pre1 + $(QUIET)$(MV) -f $@ $@.tmp + $(QUIET)$(SED) "s/AmlCode/AmlCodeSsdtCpuHotPlug/g" \ + --output $@ $@.tmp +- $(QUIET)$(RM) -f $@.tmp $@.pre ++ $(QUIET)$(RM) -f $@.tmp $@.pre $@.pre1 + + + vboxssdt-cpuhotplug.hex:: $$(VBoxDD_0_OUTDIR)/vboxssdt-cpuhotplug.hex Added: head/emulators/virtualbox-ose/files/patch-src_VBox_Devices_PC_vbox-cpuhotplug.dsl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/virtualbox-ose/files/patch-src_VBox_Devices_PC_vbox-cpuhotplug.dsl Fri Apr 29 20:15:36 2016 (r414292) @@ -0,0 +1,64 @@ +--- src/VBox/Devices/PC/vbox-cpuhotplug.dsl.orig 2016-04-20 10:01:38 UTC ++++ src/VBox/Devices/PC/vbox-cpuhotplug.dsl +@@ -27,16 +27,28 @@ DefinitionBlock ("SSDT-cpuhotplug.aml", + Return(LEqual(CPUL, 0x01)) + } + ++ // Method to notify the VMM that a CPU is not ++ // in use anymore and can be safely removed. ++ // Using the extra method here because the CPUL ++ // register identifer clashes with the CPUL object defined ++ // below making iasl starting with version 20150930 fail. ++ // ++ // Think of CPLO as "CPU Lock Open" ++ Method(CPLO, 1) ++ { ++ Store(Arg0, CPUL) ++ } ++ + Scope (\_SB) + { + +-#define GENERATE_CPU_OBJECT(id, sck, sckuid, cpu, cpuuid) \ ++#define GENERATE_CPU_OBJECT(id, sck, sckuid, cpu, cpuuid)<NL> \ + Device (sck) \ + { \ + Name (_HID, "ACPI0004") \ + Name (_UID, sckuid) \ + \ +- \ ++ <NL> \ + Processor (cpu, /* Name */ \ + id, /* Id */ \ + 0x0, /* Processor IO ports range start */ \ +@@ -46,8 +58,8 @@ DefinitionBlock ("SSDT-cpuhotplug.aml", + Name (_HID, "ACPI0007") \ + Name (_UID, cpuuid) \ + Name (_PXM, 0x00) \ +- \ +- Method(_MAT, 0) \ ++ <NL> \ ++ Method(_MAT, 0, Serialized) \ + { \ + Name (APIC, Buffer (8) {0x00, 0x08, id, id}) \ + IF (CPCK(id)) \ +@@ -60,6 +72,7 @@ DefinitionBlock ("SSDT-cpuhotplug.aml", + } \ + Return (APIC) \ + } \ ++ <NL> \ + Method(_STA) /* Used for device presence detection */ \ + { \ + IF (CPCK(id)) \ +@@ -71,9 +84,10 @@ DefinitionBlock ("SSDT-cpuhotplug.aml", + Return (0x0) \ + } \ + } \ ++ <NL> \ + Method(_EJ0, 1) \ + { \ +- Store(id, CPUL) /* Unlock the CPU */ \ ++ CPLO(id) /* Unlock the CPU */ \ + Return \ + } \ + } \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604292015.u3TKFbbw006876>