Skip to content

L
linux
Commit c4ee151d authored by Andy Whitcroft's avatar Andy Whitcroft Committed by Tim Gardner
Browse files
Options

UBUNTU: ubuntu: vbox -- update to 5.0.16-dfsg-2 

BugLink: http://bugs.launchpad.net/bugs/1561492Signed-off-by: default avatarAndy Whitcroft <apw@canonical.com>
parent d24db58e
Hide whitespace changes
Inline Side-by-side
Showing with 117 additions and 218 deletions
ubuntu/vbox/BOM
View file @ c4ee151d
Source: http://ports.ubuntu.com/pool/multiverse/v/virtualbox/virtualbox-guest-dkms_5.0.14-dfsg-2_all.deb
Version: 5.0.14-dfsg-2
Source: http://ports.ubuntu.com/pool/multiverse/v/virtualbox/virtualbox-guest-dkms_5.0.16-dfsg-2_all.deb
Version: 5.0.16-dfsg-2
ubuntu/vbox/dkms.conf
View file @ c4ee151d
PACKAGE_NAME="virtualbox-guest"
PACKAGE_VERSION="5.0.0"
PACKAGE_VERSION="5.0.16"
CLEAN="rm -f *.*o"
BUILT_MODULE_NAME[0]="vboxguest"
BUILT_MODULE_LOCATION[0]="vboxguest"
......
ubuntu/vbox/include/iprt/process.h
View file @ c4ee151d
......@@ -159,7 +159,8 @@ RTR3DECL(int) RTProcCreate(const char *pszExec, const char * const *papszArgs,
* guest.
* @param pszAsUser User to run the process as. Pass NULL to use the same
* user as the current process.
* Windows: Use user\@domain format to specify a domain.
* Windows: Use user\@domain (UPN, User Principal Name)
* format to specify a domain.
* @param pszPassword Password to use to authenticate @a pszAsUser. Must be
* NULL wif pszAsUser is NULL. Whether this is actually
* used or not depends on the platform.
......
ubuntu/vbox/include/iprt/x86.h
View file @ c4ee151d
......@@ -1250,9 +1250,98 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C(0x00040000)) == 0);
#define MSR_IA32_DS_AREA 0x600
/** Running Average Power Limit (RAPL) power units. */
#define MSR_RAPL_POWER_UNIT 0x606
/** X2APIC MSR ranges. */
/** X2APIC MSR range start. */
#define MSR_IA32_X2APIC_START 0x800
/** X2APIC MSR - APIC ID Register. */
#define MSR_IA32_X2APIC_ID 0x802
/** X2APIC MSR - APIC Version Register. */
#define MSR_IA32_X2APIC_VERSION 0x803
/** X2APIC MSR - Task Priority Register. */
#define MSR_IA32_X2APIC_TPR 0x808
/** X2APIC MSR - Processor Priority register. */
#define MSR_IA32_X2APIC_PPR 0x80A
/** X2APIC MSR - End Of Interrupt register. */
#define MSR_IA32_X2APIC_EOI 0x80B
/** X2APIC MSR - Logical Destination Register. */
#define MSR_IA32_X2APIC_LDR 0x80D
/** X2APIC MSR - Spurious Interrupt Vector Register. */
#define MSR_IA32_X2APIC_SVR 0x80F
/** X2APIC MSR - In-service Register (bits 31:0). */
#define MSR_IA32_X2APIC_ISR0 0x810
/** X2APIC MSR - In-service Register (bits 63:32). */
#define MSR_IA32_X2APIC_ISR1 0x811
/** X2APIC MSR - In-service Register (bits 95:64). */
#define MSR_IA32_X2APIC_ISR2 0x812
/** X2APIC MSR - In-service Register (bits 127:96). */
#define MSR_IA32_X2APIC_ISR3 0x813
/** X2APIC MSR - In-service Register (bits 159:128). */
#define MSR_IA32_X2APIC_ISR4 0x814
/** X2APIC MSR - In-service Register (bits 191:160). */
#define MSR_IA32_X2APIC_ISR5 0x815
/** X2APIC MSR - In-service Register (bits 223:192). */
#define MSR_IA32_X2APIC_ISR6 0x816
/** X2APIC MSR - In-service Register (bits 255:224). */
#define MSR_IA32_X2APIC_ISR7 0x817
/** X2APIC MSR - Trigger Mode Register (bits 31:0). */
#define MSR_IA32_X2APIC_TMR0 0x818
/** X2APIC MSR - Trigger Mode Register (bits 63:32). */
#define MSR_IA32_X2APIC_TMR1 0x819
/** X2APIC MSR - Trigger Mode Register (bits 95:64). */
#define MSR_IA32_X2APIC_TMR2 0x81A
/** X2APIC MSR - Trigger Mode Register (bits 127:96). */
#define MSR_IA32_X2APIC_TMR3 0x81B
/** X2APIC MSR - Trigger Mode Register (bits 159:128). */
#define MSR_IA32_X2APIC_TMR4 0x81C
/** X2APIC MSR - Trigger Mode Register (bits 191:160). */
#define MSR_IA32_X2APIC_TMR5 0x81D
/** X2APIC MSR - Trigger Mode Register (bits 223:192). */
#define MSR_IA32_X2APIC_TMR6 0x81E
/** X2APIC MSR - Trigger Mode Register (bits 255:224). */
#define MSR_IA32_X2APIC_TMR7 0x81F
/** X2APIC MSR - Interrupt Request Register (bits 31:0). */
#define MSR_IA32_X2APIC_IRR0 0x820
/** X2APIC MSR - Interrupt Request Register (bits 63:32). */
#define MSR_IA32_X2APIC_IRR1 0x821
/** X2APIC MSR - Interrupt Request Register (bits 95:64). */
#define MSR_IA32_X2APIC_IRR2 0x822
/** X2APIC MSR - Interrupt Request Register (bits 127:96). */
#define MSR_IA32_X2APIC_IRR3 0x823
/** X2APIC MSR - Interrupt Request Register (bits 159:128). */
#define MSR_IA32_X2APIC_IRR4 0x824
/** X2APIC MSR - Interrupt Request Register (bits 191:160). */
#define MSR_IA32_X2APIC_IRR5 0x825
/** X2APIC MSR - Interrupt Request Register (bits 223:192). */
#define MSR_IA32_X2APIC_IRR6 0x826
/** X2APIC MSR - Interrupt Request Register (bits 255:224). */
#define MSR_IA32_X2APIC_IRR7 0x827
/** X2APIC MSR - Error Status Register. */
#define MSR_IA32_X2APIC_ESR 0x828
/** X2APIC MSR - LVT CMCI Register. */
#define MSR_IA32_X2APIC_LVT_CMCI 0x82F
/** X2APIC MSR - Interrupt Command Register. */
#define MSR_IA32_X2APIC_ICR 0x830
/** X2APIC MSR - LVT Timer Register. */
#define MSR_IA32_X2APIC_LVT_TIMER 0x832
/** X2APIC MSR - LVT Thermal Sensor Register. */
#define MSR_IA32_X2APIC_LVT_THERMAL 0x833
/** X2APIC MSR - LVT Performance Counter Register. */
#define MSR_IA32_X2APIC_LVT_PERF 0x834
/** X2APIC MSR - LVT LINT0 Register. */
#define MSR_IA32_X2APIC_LVT_LINT0 0x835
/** X2APIC MSR - LVT LINT1 Register. */
#define MSR_IA32_X2APIC_LVT_LINT1 0x836
/** X2APIC MSR - LVT Error Register . */
#define MSR_IA32_X2APIC_LVT_ERROR 0x837
/** X2APIC MSR - Timer Initial Count Register. */
#define MSR_IA32_X2APIC_TIMER_ICR 0x838
/** X2APIC MSR - Timer Current Count Register. */
#define MSR_IA32_X2APIC_TIMER_CCR 0x839
/** X2APIC MSR - Timer Divide Configuration Register. */
#define MSR_IA32_X2APIC_TIMER_DFR 0x83E
/** X2APIC MSR - Self IPI. */
#define MSR_IA32_X2APIC_SELF_IPI 0x83F
/** X2APIC MSR range end. */
#define MSR_IA32_X2APIC_END 0xBFF
/** K6 EFER - Extended Feature Enable Register. */
......
ubuntu/vbox/vboxguest/Makefile.include.footer
View file @ c4ee151d
......@@ -78,11 +78,14 @@ obj-m += $(MODULE).o
$(MODULE):
$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) CONFIG_MODULE_SIG= -C $(KERN_DIR) SUBDIRS=$(CURDIR) SRCROOT=$(CURDIR) modules
modules_install:
$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) CONFIG_MODULE_SIG= -C $(KERN_DIR) SUBDIRS=$(CURDIR) SRCROOT=$(CURDIR) modules_install
endif
install: $(MODULE)
@mkdir -p $(MODULE_DIR); \
install -m 0664 -o root -g root $(MODULE).$(MODULE_EXT) $(MODULE_DIR); \
install -m 0644 -o root -g root $(MODULE).$(MODULE_EXT) $(MODULE_DIR); \
PATH="$(PATH):/bin:/sbin" depmod -a;
endif # eq($(MAKECMDGOALS),clean)
......
ubuntu/vbox/vboxguest/revision-generated.h
View file @ c4ee151d
#define VBOX_SVN_REV 105127
#define VBOX_SVN_REV 105871
ubuntu/vbox/vboxguest/version-generated.h
View file @ c4ee151d
......@@ -3,9 +3,9 @@
#define VBOX_VERSION_MAJOR 5
#define VBOX_VERSION_MINOR 0
#define VBOX_VERSION_BUILD 14
#define VBOX_VERSION_STRING_RAW "5.0.14"
#define VBOX_VERSION_STRING "5.0.14_Ubuntu"
#define VBOX_VERSION_BUILD 16
#define VBOX_VERSION_STRING_RAW "5.0.16"
#define VBOX_VERSION_STRING "5.0.16_Ubuntu"
#define VBOX_API_VERSION_STRING "5_0"
#define VBOX_PRIVATE_BUILD_DESC "Private build by root"
......
ubuntu/vbox/vboxsf/Makefile.include.footer
View file @ c4ee151d
......@@ -78,11 +78,14 @@ obj-m += $(MODULE).o
$(MODULE):
$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) CONFIG_MODULE_SIG= -C $(KERN_DIR) SUBDIRS=$(CURDIR) SRCROOT=$(CURDIR) modules
modules_install:
$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) CONFIG_MODULE_SIG= -C $(KERN_DIR) SUBDIRS=$(CURDIR) SRCROOT=$(CURDIR) modules_install
endif
install: $(MODULE)
@mkdir -p $(MODULE_DIR); \
install -m 0664 -o root -g root $(MODULE).$(MODULE_EXT) $(MODULE_DIR); \
install -m 0644 -o root -g root $(MODULE).$(MODULE_EXT) $(MODULE_DIR); \
PATH="$(PATH):/bin:/sbin" depmod -a;
endif # eq($(MAKECMDGOALS),clean)
......
ubuntu/vbox/vboxsf/VBoxGuestR0LibSharedFolders.h deleted 100644 → 0
View file @ d24db58e
/* $Id: VBoxGuestR0LibSharedFolders.h $ */
/** @file
* VBoxGuestLib - Central calls header.
*/
/*
* Copyright (C) 2006-2015 Oracle Corporation
*
* This file is part of VirtualBox Open Source Edition (OSE), as
* available from http://www.virtualbox.org. This file is free software;
* you can redistribute it and/or modify it under the terms of the GNU
* General Public License (GPL) as published by the Free Software
* Foundation, in version 2 as it comes in the "COPYING" file of the
* VirtualBox OSE distribution. VirtualBox OSE is distributed in the
* hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
*
* The contents of this file may alternatively be used under the terms
* of the Common Development and Distribution License Version 1.0
* (CDDL) only, as it comes in the "COPYING.CDDL" file of the
* VirtualBox OSE distribution, in which case the provisions of the
* CDDL are applicable instead of those of the GPL.
*
* You may elect to license modified versions of this file under the
* terms and conditions of either the GPL or the CDDL or both.
*/
#ifndef ___VBoxGuestLib_VBoxGuestR0LibSharedFolders_h
#define ___VBoxGuestLib_VBoxGuestR0LibSharedFolders_h
#include <VBox/VBoxGuestLib.h>
#ifndef _NTIFS_
# ifdef RT_OS_WINDOWS
# undef PAGE_SIZE
# undef PAGE_SHIFT
# if (_MSC_VER >= 1400) && !defined(VBOX_WITH_PATCHED_DDK)
# include <iprt/asm.h>
# define _InterlockedExchange _InterlockedExchange_StupidDDKvsCompilerCrap
# define _InterlockedExchangeAdd _InterlockedExchangeAdd_StupidDDKvsCompilerCrap
# define _InterlockedCompareExchange _InterlockedCompareExchange_StupidDDKvsCompilerCrap
# define _InterlockedAddLargeStatistic _InterlockedAddLargeStatistic_StupidDDKvsCompilerCrap
# pragma warning(disable : 4163)
RT_C_DECLS_BEGIN
# include <ntddk.h>
RT_C_DECLS_END
# pragma warning(default : 4163)
# undef _InterlockedExchange
# undef _InterlockedExchangeAdd
# undef _InterlockedCompareExchange
# undef _InterlockedAddLargeStatistic
# else
RT_C_DECLS_BEGIN
# include <ntddk.h>
RT_C_DECLS_END
# endif
# endif
#endif
#if defined(RT_OS_WINDOWS) && 0
/** @todo remove this legacy and use VBox/log.h and/or iprt/log.h. */
/* => Done. The next person who needs logging in Windows guests will have the
* honour of making it work. */
# ifdef DEBUG
# define LOG_ENABLED
# endif
# include "VBoxGuestLog.h"
#endif
#if defined(RT_OS_WINDOWS)
# include <VBox/log.h>
#endif
#include <iprt/assert.h>
#define ASSERTVBSF AssertRelease
#include <VBox/shflsvc.h>
typedef struct _VBSFCLIENT
{
uint32_t ulClientID;
VBGLHGCMHANDLE handle;
} VBSFCLIENT;
typedef VBSFCLIENT *PVBSFCLIENT;
typedef struct _VBSFMAP
{
SHFLROOT root;
} VBSFMAP, *PVBSFMAP;
#define VBSF_DRIVE_LETTER_FIRST L'A'
#define VBSF_DRIVE_LETTER_LAST L'Z'
#define VBSF_MAX_DRIVES (VBSF_DRIVE_LETTER_LAST - VBSF_DRIVE_LETTER_FIRST)
/* Poller thread flags. */
#define VBSF_TF_NONE (0x0000)
#define VBSF_TF_STARTED (0x0001)
#define VBSF_TF_TERMINATE (0x0002)
#define VBSF_TF_START_PROCESSING (0x0004)
#define DRIVE_FLAG_WORKING (0x1)
#define DRIVE_FLAG_LOCKED (0x2)
#define DRIVE_FLAG_WRITE_PROTECTED (0x4)
#ifdef RT_OS_WINDOWS
/** Device extension structure for each drive letter we created. */
typedef struct _VBSFDRIVE
{
/* A pointer to the Driver object we created for the drive. */
PDEVICE_OBJECT pDeviceObject;
/** Root handle to access the drive. */
SHFLROOT root;
/** Informational string - the resource name on host. */
WCHAR awcNameHost[256];
/** Guest drive letter. */
WCHAR wcDriveLetter;
/** DRIVE_FLAG_* */
uint32_t u32DriveFlags;
/** Head of FCB list. */
LIST_ENTRY FCBHead;
/* Synchronise requests directed to the drive. */
ERESOURCE DriveResource;
} VBSFDRIVE;
typedef VBSFDRIVE *PVBSFDRIVE;
#endif /* RT_OS_WINDOWS */
/* forward decl */
struct _MRX_VBOX_DEVICE_EXTENSION;
typedef struct _MRX_VBOX_DEVICE_EXTENSION *PMRX_VBOX_DEVICE_EXTENSION;
DECLVBGL(int) vboxInit (void);
DECLVBGL(void) vboxUninit (void);
DECLVBGL(int) vboxConnect (PVBSFCLIENT pClient);
DECLVBGL(void) vboxDisconnect (PVBSFCLIENT pClient);
DECLVBGL(int) vboxCallQueryMappings (PVBSFCLIENT pClient, SHFLMAPPING paMappings[], uint32_t *pcMappings);
DECLVBGL(int) vboxCallQueryMapName (PVBSFCLIENT pClient, SHFLROOT root, SHFLSTRING *pString, uint32_t size);
/**
* Create a new file or folder or open an existing one in a shared folder. Proxies
* to vbsfCreate in the host shared folder service.
*
* @returns IPRT status code, but see note below
* @param pClient Host-guest communication connection
* @param pMap The mapping for the shared folder in which the file
* or folder is to be created
* @param pParsedPath The path of the file or folder relative to the shared
* folder
* @param pCreateParms Parameters for file/folder creation. See the
* structure description in shflsvc.h
* @retval pCreateParms See the structure description in shflsvc.h
*
* @note This function reports errors as follows. The return value is always
* VINF_SUCCESS unless an exceptional condition occurs - out of
* memory, invalid arguments, etc. If the file or folder could not be
* opened or created, pCreateParms->Handle will be set to
* SHFL_HANDLE_NIL on return. In this case the value in
* pCreateParms->Result provides information as to why (e.g.
* SHFL_FILE_EXISTS). pCreateParms->Result is also set on success
* as additional information.
*/
DECLVBGL(int) vboxCallCreate (PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pParsedPath, PSHFLCREATEPARMS pCreateParms);
DECLVBGL(int) vboxCallClose (PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE Handle);
DECLVBGL(int) vboxCallRemove (PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pParsedPath, uint32_t flags);
DECLVBGL(int) vboxCallRename (PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pSrcPath, PSHFLSTRING pDestPath, uint32_t flags);
DECLVBGL(int) vboxCallFlush (PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile);
DECLVBGL(int) vboxCallRead (PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, uint8_t *pBuffer, bool fLocked);
DECLVBGL(int) VbglR0SharedFolderReadPageList(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile,
uint64_t offset, uint32_t *pcbBuffer,
uint16_t offFirstPage, uint16_t cPages, RTGCPHYS64 *paPages);
DECLVBGL(int) vboxCallWrite (PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, uint8_t *pBuffer, bool fLocked);
DECLVBGL(int) VbglR0SfWritePhysCont(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, RTCCPHYS PhysBuffer);
DECLVBGL(int) VbglR0SharedFolderWritePageList(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile,
uint64_t offset, uint32_t *pcbBuffer,
uint16_t offFirstPage, uint16_t cPages, RTGCPHYS64 *paPages);
DECLVBGL(int) vboxCallLock (PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint64_t cbSize, uint32_t fLock);
DECLVBGL(int) vboxCallDirInfo (PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile,PSHFLSTRING ParsedPath, uint32_t flags,
uint32_t index, uint32_t *pcbBuffer, PSHFLDIRINFO pBuffer, uint32_t *pcFiles);
DECLVBGL(int) vboxCallFSInfo (PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint32_t flags, uint32_t *pcbBuffer, PSHFLDIRINFO pBuffer);
DECLVBGL(int) vboxCallMapFolder (PVBSFCLIENT pClient, PSHFLSTRING szFolderName, PVBSFMAP pMap);
DECLVBGL(int) vboxCallUnmapFolder (PVBSFCLIENT pClient, PVBSFMAP pMap);
DECLVBGL(int) vboxCallSetUtf8 (PVBSFCLIENT pClient);
DECLVBGL(int) vboxReadLink (PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING ParsedPath, uint32_t pcbBuffer, uint8_t *pBuffer);
DECLVBGL(int) vboxCallSymlink (PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pNewPath, PSHFLSTRING pOldPath, PSHFLFSOBJINFO pBuffer);
DECLVBGL(int) vboxCallSetSymlinks (PVBSFCLIENT pClient);
#endif /* !___VBoxGuestLib_VBoxGuestR0LibSharedFolders_h */
ubuntu/vbox/vboxsf/version-generated.h
View file @ c4ee151d
......@@ -3,9 +3,9 @@
#define VBOX_VERSION_MAJOR 5
#define VBOX_VERSION_MINOR 0
#define VBOX_VERSION_BUILD 14
#define VBOX_VERSION_STRING_RAW "5.0.14"
#define VBOX_VERSION_STRING "5.0.14_Ubuntu"
#define VBOX_VERSION_BUILD 16
#define VBOX_VERSION_STRING_RAW "5.0.16"
#define VBOX_VERSION_STRING "5.0.16_Ubuntu"
#define VBOX_API_VERSION_STRING "5_0"
#define VBOX_PRIVATE_BUILD_DESC "Private build by root"
......
ubuntu/vbox/vboxvideo/Makefile.include.footer
View file @ c4ee151d
......@@ -78,11 +78,14 @@ obj-m += $(MODULE).o
$(MODULE):
$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) CONFIG_MODULE_SIG= -C $(KERN_DIR) SUBDIRS=$(CURDIR) SRCROOT=$(CURDIR) modules
modules_install:
$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) CONFIG_MODULE_SIG= -C $(KERN_DIR) SUBDIRS=$(CURDIR) SRCROOT=$(CURDIR) modules_install
endif
install: $(MODULE)
@mkdir -p $(MODULE_DIR); \
install -m 0664 -o root -g root $(MODULE).$(MODULE_EXT) $(MODULE_DIR); \
install -m 0644 -o root -g root $(MODULE).$(MODULE_EXT) $(MODULE_DIR); \
PATH="$(PATH):/bin:/sbin" depmod -a;
endif # eq($(MAKECMDGOALS),clean)
......
ubuntu/vbox/vboxvideo/version-generated.h
View file @ c4ee151d
......@@ -3,9 +3,9 @@
#define VBOX_VERSION_MAJOR 5
#define VBOX_VERSION_MINOR 0
#define VBOX_VERSION_BUILD 14
#define VBOX_VERSION_STRING_RAW "5.0.14"
#define VBOX_VERSION_STRING "5.0.14_Ubuntu"
#define VBOX_VERSION_BUILD 16
#define VBOX_VERSION_STRING_RAW "5.0.16"
#define VBOX_VERSION_STRING "5.0.16_Ubuntu"
#define VBOX_API_VERSION_STRING "5_0"
#define VBOX_PRIVATE_BUILD_DESC "Private build by root"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7