diff options
author | Bernhard Froehlich <decke@FreeBSD.org> | 2012-02-21 12:43:15 +0000 |
---|---|---|
committer | Bernhard Froehlich <decke@FreeBSD.org> | 2012-02-21 12:43:15 +0000 |
commit | f3865a976c842403ea1aedb3c3785a1b01d97f69 (patch) | |
tree | 8a0b4b41e451928d3354db68bd19b5abd9be91cd /emulators/virtualbox-ose-legacy/files | |
parent | c59600683f0ba4ad5afeae4cf73846ee416f65bf (diff) | |
download | ports-f3865a976c842403ea1aedb3c3785a1b01d97f69.tar.gz ports-f3865a976c842403ea1aedb3c3785a1b01d97f69.zip |
Notes
Diffstat (limited to 'emulators/virtualbox-ose-legacy/files')
-rw-r--r-- | emulators/virtualbox-ose-legacy/files/patch-src-VBox-Devices-Makefile.kmk | 22 | ||||
-rw-r--r-- | emulators/virtualbox-ose-legacy/files/patch-src-VBox-Devices-Storage-DrvHostDVD.cpp | 14 | ||||
-rw-r--r-- | emulators/virtualbox-ose-legacy/files/patch-src-VBox-Frontends-VBoxManage-VBoxInternalManage.cpp | 48 | ||||
-rw-r--r-- | emulators/virtualbox-ose-legacy/files/patch-src-VBox-Frontends-VirtualBox-src-settings-vm-VBoxVMSettingsHD.h | 11 | ||||
-rw-r--r-- | emulators/virtualbox-ose-legacy/files/patch-src-VBox-Main-freebsd-NetIf-freebsd.cpp | 30 | ||||
-rw-r--r-- | emulators/virtualbox-ose-legacy/files/patch-src-VBox-Main-src-server-freebsd-HostHardwareFreeBSD.cpp (renamed from emulators/virtualbox-ose-legacy/files/patch-src-VBox-Main-freebsd-HostHardwareFreeBSD.cpp) | 4 | ||||
-rw-r--r-- | emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-r3-freebsd-fileaio-freebsd.c | 16 | ||||
-rw-r--r-- | emulators/virtualbox-ose-legacy/files/patch-src-VBox-VMM-VMMR3-CPUM.cpp | 12 |
8 files changed, 40 insertions, 117 deletions
diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Devices-Makefile.kmk b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Devices-Makefile.kmk index 098410d5ff94..2cdf6521b3db 100644 --- a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Devices-Makefile.kmk +++ b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Devices-Makefile.kmk @@ -1,15 +1,13 @@ ---- src/VBox/Devices/Makefile.kmk.orig 2009-12-17 15:27:43.000000000 +0100 -+++ src/VBox/Devices/Makefile.kmk 2009-12-21 14:29:56.000000000 +0100 -@@ -31,8 +31,10 @@ - include $(PATH_SUB_CURRENT)/PC/VMI/Makefile.kmk - endif - include $(PATH_SUB_CURRENT)/Graphics/BIOS/Makefile.kmk +--- src/VBox/Devices/Makefile.kmk.orig 2010-12-06 22:42:36.000000000 +0100 ++++ src/VBox/Devices/Makefile.kmk 2010-12-06 22:42:59.000000000 +0100 +@@ -22,7 +22,9 @@ + VBOX_PATH_DEVICES_SRC := $(PATH_SUB_CURRENT) + + # Include sub-makefiles. -include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk --include $(PATH_SUB_CURRENT)/Storage/testcase/Makefile.kmk +ifdef VBOX_WITH_TESTCASES -+ include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk -+ include $(PATH_SUB_CURRENT)/Storage/testcase/Makefile.kmk ++ include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk +endif - ifndef VBOX_OSE - include $(PATH_SUB_CURRENT)/Storage/VBoxHDDFormats/Makefile.kmk - endif + if defined(VBOX_WITH_INTEL_PXE) || defined(VBOX_ONLY_EXTPACKS) + include $(PATH_SUB_CURRENT)/PC/PXE/Makefile.kmk + else ifndef VBOX_WITHOUT_ETHERBOOT diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Devices-Storage-DrvHostDVD.cpp b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Devices-Storage-DrvHostDVD.cpp deleted file mode 100644 index 97f764a71d12..000000000000 --- a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Devices-Storage-DrvHostDVD.cpp +++ /dev/null @@ -1,14 +0,0 @@ - ---- src/VBox/Devices/Storage/DrvHostDVD.cpp.orig 2010-05-20 10:28:06.000000000 +0300 -+++ src/VBox/Devices/Storage/DrvHostDVD.cpp 2010-05-20 10:37:47.000000000 +0300 -@@ -224,7 +224,7 @@ - */ - static DECLCALLBACK(int) drvHostDvdDoLock(PDRVHOSTBASE pThis, bool fLock) - { --#ifdef RT_OS_DARWIN -+#if defined(RT_OS_FREEBSD) || defined(RT_OS_DARWIN) - uint8_t abCmd[16] = - { - SCSI_PREVENT_ALLOW_MEDIUM_REMOVAL, 0, 0, 0, fLock, 0, - - diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Frontends-VBoxManage-VBoxInternalManage.cpp b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Frontends-VBoxManage-VBoxInternalManage.cpp deleted file mode 100644 index fdffb0aab896..000000000000 --- a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Frontends-VBoxManage-VBoxInternalManage.cpp +++ /dev/null @@ -1,48 +0,0 @@ ---- src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp.orig 2010-12-01 18:09:24.000000000 +0100 -+++ src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp 2011-03-16 10:58:37.000000000 +0100 -@@ -178,8 +178,9 @@ - " (the partitioning information in the MBR file is ignored).\n" - " The diskname is on Linux e.g. /dev/sda, and on Windows e.g.\n" - " \\\\.\\PhysicalDrive0).\n" -- " On Linux host the parameter -relative causes a VMDK file to be created\n" -- " which refers to individual partitions instead to the entire disk.\n" -+ " On Linux or FreeBSD host the parameter -relative causes a VMDK file to\n" -+ " be created which refers to individual partitions instead to the entire\n" -+ " disk.\n" - " Optionally the created image can be immediately registered.\n" - " The necessary partition numbers can be queried with\n" - " VBoxManage internalcommands listpartitions\n" -@@ -926,12 +927,12 @@ - { - fRegister = true; - } --#ifdef RT_OS_LINUX -+#if defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD) - else if (strcmp(argv[i], "-relative") == 0) - { - fRelative = true; - } --#endif /* RT_OS_LINUX */ -+#endif /* RT_OS_LINUX || RT_OS_FREEBSD */ - else - { - return errorSyntax(USAGE_CREATERAWVMDK, "Invalid parameter '%s'", Utf8Str(argv[i]).raw()); -@@ -1280,10 +1281,16 @@ - { - if (fRelative) - { --#ifdef RT_OS_LINUX -+#if defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD) - /* Refer to the correct partition and use offset 0. */ - char *psz; -- vrc = RTStrAPrintf(&psz, "%s%u", rawdisk.raw(), -+ vrc = RTStrAPrintf(&psz, -+#if defined(RT_OS_LINUX) -+ "%s%u", -+#elif defined(RT_OS_FREEBSD) -+ "%ss%u", -+#endif -+ rawdisk.raw(), - partitions.aPartitions[i].uIndex); - if (RT_FAILURE(vrc)) - { diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Frontends-VirtualBox-src-settings-vm-VBoxVMSettingsHD.h b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Frontends-VirtualBox-src-settings-vm-VBoxVMSettingsHD.h deleted file mode 100644 index 6b347df656ca..000000000000 --- a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Frontends-VirtualBox-src-settings-vm-VBoxVMSettingsHD.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsHD.h.orig 2010-06-04 10:43:02.000000000 +0200 -+++ src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsHD.h 2010-06-04 10:33:40.000000000 +0200 -@@ -20,7 +20,7 @@ - #define __VBoxVMSettingsHD_h__ - - /* Global includes */ --#include <qglobal.h> /* for Q_WS_MAC */ -+#include <QtGlobal> /* for Q_WS_MAC */ - #ifdef Q_WS_MAC - /* Somewhere Carbon.h includes AssertMacros.h which defines the macro "check". - * In QItemDelegate a class method is called "check" also. As we not used the diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Main-freebsd-NetIf-freebsd.cpp b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Main-freebsd-NetIf-freebsd.cpp deleted file mode 100644 index 8e706db41fd3..000000000000 --- a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Main-freebsd-NetIf-freebsd.cpp +++ /dev/null @@ -1,30 +0,0 @@ ---- src/VBox/Main/freebsd/NetIf-freebsd.cpp.orig 2010-06-07 15:34:44.000000000 +0300 -+++ src/VBox/Main/freebsd/NetIf-freebsd.cpp 2010-06-18 16:45:31.000000000 +0300 -@@ -180,11 +180,16 @@ - char *pBuf, *pNext; - int aiMib[6]; - unsigned short u16DefaultIface; -+ int haveDefaultIface; - - /* Get the index of the interface associated with default route. */ - rc = getDefaultIfaceIndex(&u16DefaultIface, PF_INET); -- if (RT_FAILURE(rc)) -- return rc; -+ haveDefaultIface = 1; -+ if (RT_FAILURE(rc)) { -+ Log(("NetIfList: Failed to get default route interface\n")); -+ haveDefaultIface = 0; -+ rc = VINF_SUCCESS; -+ } - - aiMib[0] = CTL_NET; - aiMib[1] = PF_ROUTE; -@@ -286,7 +291,7 @@ - IfObj.createObject(); - if (SUCCEEDED(IfObj->init(Bstr(pNew->szName), enmType, pNew))) - /* Make sure the default interface gets to the beginning. */ -- if (pIfMsg->ifm_index == u16DefaultIface) -+ if (haveDefaultIface == 1 && pIfMsg->ifm_index == u16DefaultIface) - list.push_front(IfObj); - else - list.push_back(IfObj); diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Main-freebsd-HostHardwareFreeBSD.cpp b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Main-src-server-freebsd-HostHardwareFreeBSD.cpp index 673526554ff4..69d6260ac6ff 100644 --- a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Main-freebsd-HostHardwareFreeBSD.cpp +++ b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Main-src-server-freebsd-HostHardwareFreeBSD.cpp @@ -1,5 +1,5 @@ ---- src/VBox/Main/freebsd/HostHardwareFreeBSD.cpp.cpp.orig 2011-05-16 12:33:46.000000000 -0400 -+++ src/VBox/Main/freebsd/HostHardwareFreeBSD.cpp 2011-06-24 16:03:37.000000000 -0400 +--- src/VBox/Main/src-server/freebsd/HostHardwareFreeBSD.cpp.orig 2011-05-16 12:33:46.000000000 -0400 ++++ src/VBox/Main/src-server/freebsd/HostHardwareFreeBSD.cpp 2011-06-24 16:03:37.000000000 -0400 @@ -35,6 +35,7 @@ #include <iprt/string.h> diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-r3-freebsd-fileaio-freebsd.c b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-r3-freebsd-fileaio-freebsd.c new file mode 100644 index 000000000000..671bb5552189 --- /dev/null +++ b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-r3-freebsd-fileaio-freebsd.c @@ -0,0 +1,16 @@ +Runtime/fileaio-freebsd: Fix error check for aio_error + +Obtained-from: https://www.virtualbox.org/changeset/38332 + +--- src/VBox/Runtime/r3/freebsd/fileaio-freebsd.cpp.orig 2011-07-15 17:34:34.000000000 +0200 ++++ src/VBox/Runtime/r3/freebsd/fileaio-freebsd.cpp 2011-11-21 09:33:26.155092865 +0100 +@@ -416,7 +416,8 @@ + { + pReqInt = pahReqs[i]; + rcBSD = aio_error(&pReqInt->AioCB); +- if (rcBSD == EINVAL || rcBSD == EAGAIN) ++ if ( rcBSD == -1 ++ && errno == EINVAL) + { + /* Was not submitted. */ + RTFILEAIOREQ_SET_STATE(pReqInt, PREPARED); diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-VMM-VMMR3-CPUM.cpp b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-VMM-VMMR3-CPUM.cpp new file mode 100644 index 000000000000..5bb1888abe18 --- /dev/null +++ b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-VMM-VMMR3-CPUM.cpp @@ -0,0 +1,12 @@ +--- src/VBox/VMM/VMMR3/CPUM.cpp (Revision 71439) ++++ src/VBox/VMM/VMMR3/CPUM.cpp (Revision 71440) +@@ -999,7 +999,8 @@ + */ + if (!fHWVirtExEnabled) + { +- Assert(pVM->cpum.s.aGuestCpuIdStd[4].eax == 0); ++ Assert( pVM->cpum.s.aGuestCpuIdStd[4].eax == 0 ++ || pVM->cpum.s.aGuestCpuIdStd[0].eax < 0x4); + pVM->cpum.s.aGuestCpuIdStd[4].eax = 0; + } + } |