mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-20 20:09:11 +00:00
Code Issues Releases Activity

Update to 4.3.28.

Browse Source
This commit is contained in:
Jung-uk Kim 2015-05-13 22:20:43 +00:00
parent 32bc9938e0
commit 3ddd0065cb
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=386272
21 changed files with 201 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
emulators/virtualbox-ose-additions/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= virtualbox-ose
DISTVERSION= 4.3.26
DISTVERSION= 4.3.28
CATEGORIES= emulators
MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
http://tmp.chruetertee.ch/ \
@ -113,6 +113,14 @@ EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-src-VBox-Additions-x11-VBoxClient-Makefil
.endif
.endif
.if ${OSVERSION} < 1001514
EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk.dri
.else
EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-src-VBox-Additions-freebsd-drm-Makefile
EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-src-VBox-Additions-freebsd-drm-Makefile.kmk
EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk.dri2
.endif
SUB_LIST+= KMODDIR=${KMODDIR}
pre-everything::

4
emulators/virtualbox-ose-additions/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (VirtualBox-4.3.26.tar.bz2) = e2949c250a1de30997e658de9e3d8545e71318a9844d80536137d76db4f08961
SIZE (VirtualBox-4.3.26.tar.bz2) = 102676804
SHA256 (VirtualBox-4.3.28.tar.bz2) = e157ab76d1958ae2c56b2a3875194fbff3de82486ad0e30032fd5bd772297c31
SIZE (VirtualBox-4.3.28.tar.bz2) = 100092002

2
emulators/virtualbox-ose-kmod/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= virtualbox-ose
DISTVERSION= 4.3.26
DISTVERSION= 4.3.28
CATEGORIES= emulators
MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
http://tmp.chruetertee.ch/ \

4
emulators/virtualbox-ose-kmod/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (VirtualBox-4.3.26.tar.bz2) = e2949c250a1de30997e658de9e3d8545e71318a9844d80536137d76db4f08961
SIZE (VirtualBox-4.3.26.tar.bz2) = 102676804
SHA256 (VirtualBox-4.3.28.tar.bz2) = e157ab76d1958ae2c56b2a3875194fbff3de82486ad0e30032fd5bd772297c31
SIZE (VirtualBox-4.3.28.tar.bz2) = 100092002

2
emulators/virtualbox-ose/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= virtualbox-ose
DISTVERSION= 4.3.26
DISTVERSION= 4.3.28
CATEGORIES= emulators
MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
http://tmp.chruetertee.ch/ \

8
emulators/virtualbox-ose/distinfo
View File

@ -1,4 +1,4 @@
SHA256 (VirtualBox-4.3.26.tar.bz2) = e2949c250a1de30997e658de9e3d8545e71318a9844d80536137d76db4f08961
SIZE (VirtualBox-4.3.26.tar.bz2) = 102676804
SHA256 (VBoxGuestAdditions_4.3.26.iso) = c5e46533a6ff8df177ed5c9098624f6cec46ca392bab16de2017195580088670
SIZE (VBoxGuestAdditions_4.3.26.iso) = 58120192
SHA256 (VirtualBox-4.3.28.tar.bz2) = e157ab76d1958ae2c56b2a3875194fbff3de82486ad0e30032fd5bd772297c31
SIZE (VirtualBox-4.3.28.tar.bz2) = 100092002
SHA256 (VBoxGuestAdditions_4.3.28.iso) = 9f52e186d6c9407b2676d4b2ed1cdf96940ec129cc2bd92e54b24526271a9733
SIZE (VBoxGuestAdditions_4.3.28.iso) = 58241024

17
emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-freebsd-drm-Makefile Normal file
View File

@ -0,0 +1,17 @@
--- src/VBox/Additions/freebsd/drm/Makefile.orig 2015-03-16 13:00:32.000000000 -0400
+++ src/VBox/Additions/freebsd/drm/Makefile 2015-03-27 18:18:03.432353000 -0400
@@ -18,10 +18,10 @@
KMOD = vboxvideo
-SRCS = \
- vboxvideo_drm.c
+SRCS = vboxvideo_drm.c
+SRCS += device_if.h bus_if.h pci_if.h
+SRCS += opt_compat.h opt_drm.h opt_syscons.h
-SRCS += device_if.h bus_if.h pci_if.h opt_drm.h
+CFLAGS+= -DVBOXVIDEO_DRM2
.include <bsd.kmod.mk>
-

38
emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-freebsd-drm-Makefile.kmk Normal file
View File

@ -0,0 +1,38 @@
--- src/VBox/Additions/freebsd/drm/Makefile.kmk.orig 2015-03-16 13:00:32.000000000 -0400
+++ src/VBox/Additions/freebsd/drm/Makefile.kmk 2015-03-27 22:28:21.000000000 -0400
@@ -46,6 +46,7 @@
vboxvideo_drm_TEMPLATE = VBOXGUESTR0
vboxvideo_drm_NAME = vboxvideo
vboxvideo_drm_DEFS = VBOX_WITH_HGCM VBOX_SVN_REV=$(VBOX_SVN_REV)
+vboxvideo_drm_DEFS += VBOXVIDEO_DRM2
vboxvideo_drm_DEPS += $(VBOX_SVN_REV_KMK)
vboxvideo_drm_INCS.freebsd = \
$(vboxvideo_drm_0_OUTDIR) \
@@ -58,15 +59,24 @@
$(PATH_STAGE)/gen-sys-hdrs/pci_if.h \
$(PATH_STAGE)/gen-sys-hdrs/bus_if.h \
$(PATH_STAGE)/gen-sys-hdrs/device_if.h \
- $(vboxvideo_drm_0_OUTDIR)/opt_drm.h
+ $(vboxvideo_drm_0_OUTDIR)/opt_compat.h \
+ $(vboxvideo_drm_0_OUTDIR)/opt_drm.h \
+ $(vboxvideo_drm_0_OUTDIR)/opt_syscons.h
vboxvideo_drm_CLEAN.freebsd = $(vboxvideo_drm_DEPS)
#
-# Header for DRM not included by us.
+# Headers for DRM not included by us.
#
+$$(vboxvideo_drm_0_OUTDIR)/opt_compat.h:
+ $(QUIET)$(MKDIR) -p $(vboxvideo_drm_0_OUTDIR)
+ $(QUIET)touch $(vboxvideo_drm_0_OUTDIR)/opt_compat.h
+
$$(vboxvideo_drm_0_OUTDIR)/opt_drm.h:
$(QUIET)$(MKDIR) -p $(vboxvideo_drm_0_OUTDIR)
$(QUIET)touch $(vboxvideo_drm_0_OUTDIR)/opt_drm.h
-include $(FILE_KBUILD_SUB_FOOTER)
+$$(vboxvideo_drm_0_OUTDIR)/opt_syscons.h:
+ $(QUIET)$(MKDIR) -p $(vboxvideo_drm_0_OUTDIR)
+ $(QUIET)touch $(vboxvideo_drm_0_OUTDIR)/opt_syscons.h
+include $(FILE_KBUILD_SUB_FOOTER)

6
emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk
View File

@ -1,6 +1,6 @@
--- src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig 2013-11-29 14:20:43.000000000 -0500
+++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2013-12-16 13:47:34.000000000 -0500
@@ -27,6 +27,9 @@
--- src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig 2015-03-16 13:00:34.000000000 -0400
+++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2015-03-30 02:29:37.842678000 -0400
@@ -20,6 +20,9 @@
vboxvideo_70_DEFS := \
IN_MODULE XORG_7X RENDER=1 IN_RT_STATIC

0
emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk → emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk.dri
View File

47
emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk.dri2 Normal file
View File

@ -0,0 +1,47 @@
--- src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig 2015-03-16 13:00:34.000000000 -0400
+++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2015-03-30 02:29:06.707754000 -0400
@@ -26,7 +26,7 @@
vboxvideo_13_DEFS := $(vboxvideo_70_DEFS) VBOXVIDEO_13
vboxvideo_15_DEFS := \
$(vboxvideo_13_DEFS) NO_ANSIC PCIACCESS XSERVER_LIBPCIACCESS _XORG_SERVER_H_ _DIX_CONFIG_H_
-if1of ($(KBUILD_TARGET), linux solaris)
+if1of ($(KBUILD_TARGET), freebsd linux solaris)
vboxvideo_15_DEFS += \
VBOX_DRI
endif
@@ -190,7 +190,7 @@
vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_15_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10503000
-if1of ($(KBUILD_TARGET), linux solaris)
+if1of ($(KBUILD_TARGET), freebsd linux solaris)
vboxvideo_drv_15_DEFS += \
VBOX_DRI_OLD
endif
@@ -199,7 +199,7 @@
$(VBOX_PATH_X11_ROOT)/xorg-server-1.5.3
vboxvideo_drv_15_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
vboxvideo_drv_15_SOURCES = $(vboxvideo_drv_13_SOURCES)
-if1of ($(KBUILD_TARGET), linux solaris)
+if1of ($(KBUILD_TARGET), freebsd linux solaris)
vboxvideo_drv_15_SOURCES += \
vboxvideo_dri.c
endif
@@ -212,7 +212,7 @@
vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_16_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10600000
-if1of ($(KBUILD_TARGET), linux solaris)
+if1of ($(KBUILD_TARGET), freebsd linux solaris)
vboxvideo_drv_16_DEFS += \
VBOX_DRI_OLD
endif
@@ -235,7 +235,7 @@
$(VBOX_PATH_X11_ROOT)/xorg-server-1.7.7
vboxvideo_drv_17_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_13_SOURCES)
-if1of ($(KBUILD_TARGET), linux solaris)
+if1of ($(KBUILD_TARGET), freebsd linux solaris)
vboxvideo_drv_17_SOURCES += \
vboxvideo_dri2.c
endif

77
emulators/virtualbox-ose/files/patch-src-VBox-Additions-freebsd-drm-vboxvideo_drm.c Normal file
View File

@ -0,0 +1,77 @@
--- src/VBox/Additions/freebsd/drm/vboxvideo_drm.c.orig 2015-03-16 13:00:32.000000000 -0400
+++ src/VBox/Additions/freebsd/drm/vboxvideo_drm.c 2015-03-27 17:40:43.686690000 -0400
@@ -54,8 +54,13 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#ifdef VBOXVIDEO_DRM2
+#include "dev/drm2/drmP.h"
+#include "dev/drm2/drm_pciids.h"
+#else
#include "dev/drm/drmP.h"
#include "dev/drm/drm_pciids.h"
+#endif
#define DRIVER_AUTHOR "Oracle Corporation"
#define DRIVER_NAME "vboxvideo"
@@ -74,6 +79,54 @@
vboxvideo_PCI_IDS
};
+#ifdef VBOXVIDEO_DRM2
+
+static struct drm_driver vboxvideo_info = {
+ .buf_priv_size = 1, /* No dev_priv */
+
+ .num_ioctls = 0,
+
+ .name = DRIVER_NAME,
+ .desc = DRIVER_DESC,
+ .date = DRIVER_DATE,
+ .major = DRIVER_MAJOR,
+ .minor = DRIVER_MINOR,
+ .patchlevel = DRIVER_PATCHLEVEL,
+};
+
+static int
+vboxvideo_probe(device_t kdev)
+{
+ return -drm_probe_helper(kdev, vboxvideo_pciidlist);
+}
+
+static int
+vboxvideo_attach(device_t kdev)
+{
+ return -drm_attach_helper(kdev, vboxvideo_pciidlist, &vboxvideo_info);
+}
+
+static device_method_t vboxvideo_methods[] = {
+ /* Device interface */
+ DEVMETHOD(device_probe, vboxvideo_probe),
+ DEVMETHOD(device_attach, vboxvideo_attach),
+ DEVMETHOD(device_detach, drm_generic_detach),
+
+ DEVMETHOD_END
+};
+
+static driver_t vboxvideo_driver = {
+ "drmn",
+ vboxvideo_methods,
+ sizeof(struct drm_device)
+};
+
+extern devclass_t drm_devclass;
+DRIVER_MODULE(vboxvideo, vgapci, vboxvideo_driver, drm_devclass, 0, 0);
+MODULE_DEPEND(vboxvideo, drmn, 1, 1, 1);
+
+#else /* !VBOXVIDEO_DRM2 */
+
static void vboxvideo_configure(struct drm_device *dev)
{
#if __FreeBSD_version >= 702000
@@ -161,3 +214,5 @@
DRIVER_MODULE(vboxvideo, pci, vboxvideo_driver, drm_devclass, 0, 0);
#endif
MODULE_DEPEND(vboxvideo, drm, 1, 1, 1);
+
+#endif /* VBOXVIDEO_DRM2 */

29
emulators/virtualbox-ose/files/patch-src-VBox-Devices-PC-DrvACPI.cpp
View File

@ -1,29 +0,0 @@
--- src/VBox/Devices/PC/DrvACPI.cpp.orig 2013-11-29 14:23:31.000000000 -0500
+++ src/VBox/Devices/PC/DrvACPI.cpp 2013-12-13 17:36:50.000000000 -0500
@@ -204,7 +204,7 @@
int fAcLine = 0;
size_t cbParameter = sizeof(fAcLine);
- int rc = sysctlbyname("hw.acpi.acline", &fAcLine, &cbParameter, NULL, NULL);
+ int rc = sysctlbyname("hw.acpi.acline", &fAcLine, &cbParameter, NULL, 0);
if (!rc)
{
@@ -463,7 +463,7 @@
int fBatteryState = 0;
size_t cbParameter = sizeof(fBatteryState);
- rc = sysctlbyname("hw.acpi.battery.state", &fBatteryState, &cbParameter, NULL, NULL);
+ rc = sysctlbyname("hw.acpi.battery.state", &fBatteryState, &cbParameter, NULL, 0);
if (!rc)
{
if ((fBatteryState & ACPI_BATT_STAT_NOT_PRESENT) == ACPI_BATT_STAT_NOT_PRESENT)
@@ -485,7 +485,7 @@
/* Get battery level. */
int curCapacity = 0;
cbParameter = sizeof(curCapacity);
- rc = sysctlbyname("hw.acpi.battery.life", &curCapacity, &cbParameter, NULL, NULL);
+ rc = sysctlbyname("hw.acpi.battery.life", &curCapacity, &cbParameter, NULL, 0);
if (!rc && curCapacity >= 0)
*penmRemainingCapacity = (PDMACPIBATCAPACITY)curCapacity;

11
emulators/virtualbox-ose/files/patch-src-VBox-Devices-Storage-DevAHCI.cpp
View File

@ -1,11 +0,0 @@
--- src/VBox/Devices/Storage/DevAHCI.cpp.orig 2013-11-29 14:23:47.000000000 -0500
+++ src/VBox/Devices/Storage/DevAHCI.cpp 2013-12-13 20:05:56.000000000 -0500
@@ -3242,7 +3242,7 @@
return 0;
ataH2BE_U16(pbBuf, 0x0); /* feature 0: list of profiles supported */
- pbBuf[2] = (0 << 2) | (1 << 1) | (1 || 0); /* version 0, persistent, current */
+ pbBuf[2] = (0 << 2) | (1 << 1) | (1 << 0); /* version 0, persistent, current */
pbBuf[3] = 8; /* additional bytes for profiles */
/* The MMC-3 spec says that DVD-ROM read capability should be reported
* before CD-ROM read capability. */

11
emulators/virtualbox-ose/files/patch-src-VBox-Devices-Storage-DevATA.cpp
View File

@ -1,11 +0,0 @@
--- src/VBox/Devices/Storage/DevATA.cpp.orig 2014-07-15 13:24:35.000000000 -0400
+++ src/VBox/Devices/Storage/DevATA.cpp 2014-07-16 18:17:03.000000000 -0400
@@ -2479,7 +2479,7 @@
return 0;
ataH2BE_U16(pbBuf, 0x0); /* feature 0: list of profiles supported */
- pbBuf[2] = (0 << 2) | (1 << 1) | (1 || 0); /* version 0, persistent, current */
+ pbBuf[2] = (0 << 2) | (1 << 1) | (1 << 0); /* version 0, persistent, current */
pbBuf[3] = 8; /* additional bytes for profiles */
/* The MMC-3 spec says that DVD-ROM read capability should be reported
* before CD-ROM read capability. */

17
emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-freebsd-NetIf-freebsd.cpp
View File

@ -1,17 +0,0 @@
--- src/VBox/Main/src-server/freebsd/NetIf-freebsd.cpp.orig 2015-03-02 10:09:55.000000000 -0500
+++ src/VBox/Main/src-server/freebsd/NetIf-freebsd.cpp 2015-03-12 19:23:15.950051000 -0400
@@ -290,12 +290,14 @@
ComObjPtr<HostNetworkInterface> IfObj;
IfObj.createObject();
if (SUCCEEDED(IfObj->init(Bstr(pNew->szName), enmType, pNew)))
+ {
/* Make sure the default interface gets to the beginning. */
if ( fDefaultIfaceExistent
&& pIfMsg->ifm_index == u16DefaultIface)
list.push_front(IfObj);
else
list.push_back(IfObj);
+ }
}
RTMemFree(pNew);
}

11
emulators/virtualbox-ose/files/patch-src-VBox-Runtime-common-ldr-ldrELFRelocatable.cpp.h
View File

@ -1,11 +0,0 @@
--- src/VBox/Runtime/common/ldr/ldrELFRelocatable.cpp.h.orig 2015-03-02 10:10:00.000000000 -0500
+++ src/VBox/Runtime/common/ldr/ldrELFRelocatable.cpp.h 2015-03-12 15:59:41.932947000 -0400
@@ -249,7 +249,7 @@
}
else
{
- AssertReturn(pSym->st_shndx < pModElf->cSyms || pSym->st_shndx == SHN_ABS, ("%#x\n", pSym->st_shndx));
+ AssertMsg(pSym->st_shndx < pModElf->cSyms || pSym->st_shndx == SHN_ABS, ("%#x\n", pSym->st_shndx));
#if ELF_MODE == 64
SymValue = pSym->st_value;
#endif

11
emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-freebsd-fileaio-freebsd.cpp
View File

@ -1,11 +0,0 @@
--- src/VBox/Runtime/r3/freebsd/fileaio-freebsd.cpp.orig 2013-11-29 14:24:23.000000000 -0500
+++ src/VBox/Runtime/r3/freebsd/fileaio-freebsd.cpp 2013-12-13 17:32:50.000000000 -0500
@@ -124,7 +124,7 @@
&cReqsOutstandingMax, /* Where to store the old value. */
&cbParameter, /* Size of the memory pointed to. */
NULL, /* Where the new value is located. */
- NULL); /* Where the size of the new value is stored. */
+ 0); /* Where the size of the new value is stored. */
if (rcBSD == -1)
{
/* ENOENT means the value is unknown thus the module is not loaded. */

29
emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-freebsd-mp-freebsd.cpp
View File

@ -1,29 +0,0 @@
--- src/VBox/Runtime/r3/freebsd/mp-freebsd.cpp.orig 2013-11-29 14:24:23.000000000 -0500
+++ src/VBox/Runtime/r3/freebsd/mp-freebsd.cpp 2013-12-13 16:25:44.000000000 -0500
@@ -93,7 +93,7 @@
char szDriver[10];
size_t cbDriver = sizeof(szDriver);
RT_ZERO(szDriver); /* this shouldn't be necessary. */
- int rcBsd = sysctlbyname(szName, szDriver, &cbDriver, NULL, NULL);
+ int rcBsd = sysctlbyname(szName, szDriver, &cbDriver, NULL, 0);
if (rcBsd == 0)
return true;
@@ -154,7 +154,7 @@
return 0;
/* CPU's have a common frequency. */
- int rc = sysctlbyname("dev.cpu.0.freq", &uFreqCurr, &cbParameter, NULL, NULL);
+ int rc = sysctlbyname("dev.cpu.0.freq", &uFreqCurr, &cbParameter, NULL, 0);
if (rc)
return 0;
@@ -176,7 +176,7 @@
* CPU 0 has the freq levels entry. ENOMEM is ok as we don't need all supported
* levels but only the first one.
*/
- int rc = sysctlbyname("dev.cpu.0.freq_levels", szFreqLevels, &cbFreqLevels, NULL, NULL);
+ int rc = sysctlbyname("dev.cpu.0.freq_levels", szFreqLevels, &cbFreqLevels, NULL, 0);
if ( (rc && (errno != ENOMEM))
|| (cbFreqLevels == 0))
return 0;

27
emulators/virtualbox-ose/files/patch-src-VBox-VMM-VMMR3-CPUMR3CpuId.cpp
View File

@ -1,27 +0,0 @@
--- src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp.orig 2015-03-02 10:10:12.000000000 -0500
+++ src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp 2015-03-12 18:58:11.784386000 -0400
@@ -146,15 +146,15 @@
case 0x06:
switch (bModel)
{
- case 0: kCpumMicroarch_AMD_K7_Palomino;
- case 1: kCpumMicroarch_AMD_K7_Palomino;
- case 2: kCpumMicroarch_AMD_K7_Palomino;
- case 3: kCpumMicroarch_AMD_K7_Spitfire;
- case 4: kCpumMicroarch_AMD_K7_Thunderbird;
- case 6: kCpumMicroarch_AMD_K7_Palomino;
- case 7: kCpumMicroarch_AMD_K7_Morgan;
- case 8: kCpumMicroarch_AMD_K7_Thoroughbred;
- case 10: kCpumMicroarch_AMD_K7_Barton; /* Thorton too. */
+ case 0: return kCpumMicroarch_AMD_K7_Palomino;
+ case 1: return kCpumMicroarch_AMD_K7_Palomino;
+ case 2: return kCpumMicroarch_AMD_K7_Palomino;
+ case 3: return kCpumMicroarch_AMD_K7_Spitfire;
+ case 4: return kCpumMicroarch_AMD_K7_Thunderbird;
+ case 6: return kCpumMicroarch_AMD_K7_Palomino;
+ case 7: return kCpumMicroarch_AMD_K7_Morgan;
+ case 8: return kCpumMicroarch_AMD_K7_Thoroughbred;
+ case 10: return kCpumMicroarch_AMD_K7_Barton; /* Thorton too. */
}
return kCpumMicroarch_AMD_K7_Unknown;
case 0x0f:

15
emulators/virtualbox-ose/files/patch-src-VBox-VMM-VMMR3-PDMDriver.cpp
View File

@ -1,15 +0,0 @@
--- src/VBox/VMM/VMMR3/PDMDriver.cpp.orig 2015-03-02 10:10:12.000000000 -0500
+++ src/VBox/VMM/VMMR3/PDMDriver.cpp 2015-03-12 20:01:00.170988000 -0400
@@ -512,11 +512,7 @@
AssertLogRelRCReturn(rc, rc);
rc = CFGMR3ReplaceSubTree(*ppNode, pBelowThisCopy);
- if (RT_FAILURE(rc))
- {
- CFGMR3RemoveNode(pBelowThis);
- AssertLogRelReturn(("rc=%Rrc\n", rc), rc);
- }
+ AssertLogRelRCReturnStmt(rc, CFGMR3RemoveNode(pBelowThis), rc);
}
}
/*