|
[-]
[+]
|
Deleted |
virtualbox.changes
|
| @@ -1,27 +0,0 @@
-* Wed Mar 13 2013 David Greaves <david@dgreaves.com> - 4.2.4
-- Add the systemd vboxservice.service to enable time-sync in guests
-
-* Thu Feb 14 2013 David Greaves <david@dgreaves.com> - 4.2.4
-- Do depmod -a for required kernel
-
-* Fri Feb 01 2013 Richard Braakman <richard.braakman@jollamobile.com> - 4.2.4
-- Ensure build failure if guest modules do not compile
-- [vboxsf]
- Bugfixes to shared folders module
- Enable writable mmap (needed by zypper, building kernel, probably more)
- Performance improvements, it is now about 40% slower than guest-native
- Use page cache when reading
-
-* Mon Nov 05 2012 Maciej Blomberg <maciej.blomberg@jollamobile.com> - 4.2.4
-- Upgraded to upstream 4.2.4
-- All previous patches broken
-
-* Sat Oct 06 2012 David Greaves <david@dgreaves.com> - 4.1.18
-- Move mount.vboxsf to /sbin so it's picked up by mount -t
-- Create vboxsf group in preparation for support of automount
-
-* Wed Oct 03 2012 David Greaves <david@dgreaves.com> - 4.1.18
-- Guest only packaging to provide vboxfs, mount.vboxsf,
- VBoxControl and VBoxService
-- Most suse packaging removed
-- Requires precise kernel version match.
|
|
[-]
[+]
|
Deleted |
virtualbox.spec
^
|
| @@ -1,326 +0,0 @@
-#
-# spec file for package virtualbox
-#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
-Name: virtualbox
-#BuildRequires: acpica
-#BuildRequires: dmidecode
-BuildRequires: fdupes
-BuildRequires: sed
-#BuildRequires: glibc-devel-static
-#gsoap,libopenssl and java needed for building webservice
-#BuildRequires: gsoap-devel
-#BuildRequires: java-devel >= 1.6.0
-#BuildRequires: libgsoap-devel
-#BuildRequires: libopenssl-devel
-##
-#BuildRequires: LibVNCServer-devel
-#BuildRequires: SDL-devel
-#BuildRequires: bin86
-BuildRequires: boost-devel
-#BuildRequires: dev86
-BuildRequires: e2fsprogs-devel
-BuildRequires: gcc
-BuildRequires: gcc-c++
-BuildRequires: kernel-adaptation-pc >= 3.6.1
-BuildRequires: kernel-adaptation-pc-devel >= 3.6.1
-%define kernel_version %{expand:%(rpm -q --qf '[%%{version}-%%{release}]' kernel-adaptation-pc-devel)}
-BuildRequires: kbuild
-#BuildRequires: kernel-syms
-BuildRequires: libcap-devel
-BuildRequires: libcurl-devel
-#BuildRequires: libidl-devel
-#BuildRequires: libqt4-devel
-BuildRequires: libxslt-devel
-BuildRequires: module-init-tools
-#BuildRequires: pam-devel
-BuildRequires: pulseaudio-devel
-BuildRequires: python-devel
-BuildRequires: quilt
-BuildRequires: udev
-#BuildRequires: update-desktop-files
-#BuildRequires: xorg-x11
-#BuildRequires: xorg-x11-devel
-#BuildRequires: xorg-x11-server
-#BuildRequires: xorg-x11-server-sdk
-#BuildRequires: yasm
-#BuildRequires: zlib-devel-static
-# and just for the macro:
-BuildRequires: systemd
-
-Version: 4.2.4
-Release: 1
-Summary: VirtualBox is an Emulator
-License: GPL-2.0+
-Group: System/Emulators/PC
-Url: http://www.virtualbox.org/
-#
-# so you don't need to repack virtualbox by hand, just add new release of VirtualBox-x.x.x.tar.bz2 and line below with
-# script virtualbox-patch-source.sh will do the job :)
-# WARNING: This is not a comment, but the real command to repack souce
-#%(bash %{_sourcedir}/virtualbox-patch-source.sh VirtualBox-%{version}.tar.bz2)
-Source0: VirtualBox-%{version}.tar.bz2
-Source1: %{name}-%{version}-UserManual.pdf
-Source2: %{name}-60-vboxdrv.rules
-Source3: %{name}-60-vboxguest.rules
-Source4: %{name}-default.virtualbox
-Source5: %{name}-host-kmp-files
-Source6: %{name}-guest-kmp-files
-Source7: %{name}-host-preamble
-Source8: %{name}-guest-preamble
-Source9: %{name}-wrapper.sh
-Source10: %{name}-LocalConfig.kmk
-# init script to start virtual boxes during boot, to be configured via /etc/sysconfig/vbox bnc#582398
-Source12: %{name}-vboxes
-Source13: %{name}-sysconfig.vbox
-# added by lbt as the Mer systemd service
-Source14: vboxservice.service
-# added by lbt to provide yasm from curl -O https://www.virtualbox.org/export/43504/vbox/trunk/tools/linux.x86/bin/yasm
-Source50: yasm
-Source98: %{name}-%{version}-rpmlintrc
-Source99: %{name}-patch-source.sh
-#rework init scripts to fit suse needs
-Patch1: vbox-vboxdrv-init-script.diff
-Patch2: vbox-vboxadd-init-script.diff
-Patch3: vbox-vboxweb-init-script.diff
-#fix return values which trigger post build checks and coused build error - should goes to upstream
-Patch4: vbox-ret-in-nonvoid-fnc.diff
-#fix build : "Error 4001 - String must be entirely alphanumeric"
-#with renaming we probably break some macosx functionality however ths is just quick fix
-#file :http://www.virtualbox.org/browser/trunk/src/VBox/Devices/PC/vbox.ds
-#see thread : http://lists.freebsd.org/pipermail/freebsd-acpi/2010-October/006795.html
-Patch6: vbox-smc-napa.diff
-#fix build of Python and dev package on openSUSE 11.3
-Patch8: vbox-python-detection.diff
-#PATCH-FIX-OPENSUSE implement messagebox (VBoxPermissionMessage app), which is displayed, when user
-#try to start VirtualBox and is not memeber of vboxusers group
-#PATCH-FIX-OPENSUSE Do not include build dates on binaries, makes build-compare happier
-#YPatch101: vbox-default-os-type.diff
-#disable update in vbox gui
-Patch103: vbox-disable-updates.diff
-#use pie/fPIE for setuid binaries (bnc#743143)
-Patch104: vbox-fpie.diff
-Patch201: vbox-less-restat.diff
-Patch202: vbox-handles.diff
-Patch203: vbox-physread.diff
-Patch204: vbox-mmap.diff
-Patch205: vbox-mmap-02.diff
-Patch206: vbox-pagecache.diff
-Patch207: vbox-readpages.diff
-Patch249: vbox-slow-logging.diff
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-#PreReq: pwdutils permissions
-Requires: %{name}-host-kmp = %version
-#Recommends: %{name}-gui = %version
-#rename from ose version:
-Provides: %{name}-ose = %version
-Obsoletes: %{name}-ose < %version
-#PreReq: sysvinit(syslog)
-
-%description
-VirtualBox is an extremely feature rich, high performance product
-for enterprise customers, it is also the only professional solution
-that is freely available as Open Source Software under the terms of the
-GNU Public License (GPL).
-##########################################
-%package guest-modules
-Summary: Guest kernel modules for VirtualBox
-Group: System/Emulators/PC
-Requires: kernel-adaptation-pc == %{kernel_version}
-#SUSE specify macro to define guest kmp package
-#%{?suse_kernel_module_package:%suse_kernel_module_package -p %{S:8} -n %{name}-guest -f %{S:6} kdump um xen xenpae}
-
-%description guest-modules
-This package contains the kernel-module for VirtualBox.
-##########################################
-%package guest-x11
-Summary: VirtualBox X11 drivers for mouse and video
-Group: System/X11/Servers/XF86_4
-Requires: %{name}-guest-modules = %version
-#Supplements: modalias(pci:v000080EEd0000BEEFsv*sd*bc*sc*i*)
-#rename from xorg-x11-driver-virtualbox-ose:
-#Provides: xorg-x11-driver-virtualbox-ose = %version
-#Obsoletes: xorg-x11-driver-virtualbox-ose < %version
-
-%description guest-x11
-VirtualBox
-This package contains X11 guest utilities and X11 guest mouse and video drivers
-###########################################
-%package guest-tools
-Summary: VirtualBox guest tools
-Group: System/Emulators/PC
-Requires: %{name}-guest-modules = %version
-#Supplements: modalias(pci:v000080EEd0000BEEFsv*sd*bc*sc*i*)
-#rename from "ose" version:
-#Provides: %{name}-ose-guest-tools = %version
-#Obsoletes: %{name}-ose-guest-tools < %version
-
-%description guest-tools
-VirtualBox guest addition tools.
-###########################################
-%prep
-%setup -q -n VirtualBox-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch6 -p1
-%patch8 -p1
-#Y%patch100
-#Y%patch101
-%patch103
-%patch104 -p1
-%patch201 -p1
-%patch202 -p1
-%patch203 -p1
-%patch204 -p1
-%patch205 -p1
-%patch206 -p1
-%patch207 -p1
-# patch 249 not enabled, it's only included for people who want to debug
-#copy user manual
-%__cp %{S:1} UserManual.pdf
-#copy kbuild config
-%__cp %{S:10} LocalConfig.kmk
-# lbt's yasm
-mkdir -p tools/linux.x86/bin
|
|
[-]
[+]
|
Deleted |
vbox-disable-updates.diff
^
|
| @@ -1,49 +0,0 @@
---- src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
-+++ src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
-@@ -63,7 +63,7 @@ void UIGlobalSettingsUpdate::loadToCache
- void UIGlobalSettingsUpdate::getFromCache()
- {
- /* Apply internal variables data to QWidget(s): */
-- m_pEnableUpdateCheckbox->setChecked(m_cache.m_fCheckEnabled);
-+ m_pEnableUpdateCheckbox->setChecked(false);
- if (m_pEnableUpdateCheckbox->isChecked())
- {
- m_pUpdatePeriodCombo->setCurrentIndex(m_cache.m_periodIndex);
---- src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h
-+++ src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h
-@@ -39,7 +39,6 @@
- {
- GLSettingsPage_General = 0,
- GLSettingsPage_Input,
-- GLSettingsPage_Update,
- GLSettingsPage_Language,
- GLSettingsPage_Display,
- GLSettingsPage_USB,
---- src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
-+++ src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
-@@ -340,15 +340,6 @@ UISettingsDialogGlobal::UISettingsDialog
- iPageIndex, "#input", pSettingsPage);
- break;
- }
-- /* Update page: */
-- case GLSettingsPage_Update:
-- {
-- pSettingsPage = new UIGlobalSettingsUpdate;
-- addItem(":/refresh_32px.png", ":/refresh_disabled_32px.png",
-- ":/refresh_16px.png", ":/refresh_disabled_16px.png",
-- iPageIndex, "#update", pSettingsPage);
-- break;
-- }
- /* Language page: */
- case GLSettingsPage_Language:
- {
-@@ -481,9 +472,6 @@ void UISettingsDialogGlobal::retranslate
- /* Input page: */
- m_pSelector->setItemText(GLSettingsPage_Input, tr("Input"));
-
-- /* Update page: */
-- m_pSelector->setItemText(GLSettingsPage_Update, tr("Update"));
--
- /* Language page: */
- m_pSelector->setItemText(GLSettingsPage_Language, tr("Language"));
-
|
|
[-]
[+]
|
Deleted |
vbox-fpie.diff
^
|
| @@ -1,20 +0,0 @@
-Index: VirtualBox-4.1.8_OSE/Config.kmk
-===================================================================
---- VirtualBox-4.1.8_OSE.orig/Config.kmk
-+++ VirtualBox-4.1.8_OSE/Config.kmk
-@@ -3368,10 +3368,13 @@ TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.darwi
- ifeq ($(KBUILD_TARGET),linux)
- # not necessary except USE_LIB_PCAP is defined in SUPR3HardenedMain.cpp
- # TEMPLATE_VBOXR3HARDENEDEXE_LIBS += cap
-+ TEMPLATE_VBOXR3HARDENEDEXE_CXXFLAGS.linux = $(TEMPLATE_VBOXR3EXE_CXXFLAGS.linux) -fPIE
-+ TEMPLATE_VBOXR3HARDENEDEXE_CFLAGS.linux = $(TEMPLATE_VBOXR3EXE_CFLAGS.linux) -fPIE
-+ TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux = $(TEMPLATE_VBOXR3EXE_LDFLAGS.linux) -pie
- endif
- ifn1of ($(KBUILD_TARGET), win os2)
-- TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS))
-- TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux))
-+ TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS)) -pie
-+ TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux)) -pie
- endif
-
- #
|
|
[-]
[+]
|
Deleted |
vbox-handles.diff
^
|
| @@ -1,215 +0,0 @@
-commit 3fbf480c55f1a6e7049d333c48fdb0ecb550e99b
-Author: Richard Braakman <richard.braakman@jollamobile.com>
-Date: Thu Jan 31 01:15:25 2013 +0200
-
- vboxsf: make sure writepage still works after concurrent open/close
-
-diff --git a/src/VBox/Additions/linux/sharedfolders/dirops.c b/src/VBox/Additions/linux/sharedfolders/dirops.c
-index d0d7b85..5e32135 100644
---- a/src/VBox/Additions/linux/sharedfolders/dirops.c
-+++ b/src/VBox/Additions/linux/sharedfolders/dirops.c
-@@ -358,8 +358,10 @@ static struct dentry *sf_lookup(struct inode *parent, struct dentry *dentry
- err = -ENOMEM;
- goto fail1;
- }
-+ INIT_LIST_HEAD(&sf_new_i->handles);
- sf_new_i->handle = SHFL_HANDLE_NIL;
- sf_new_i->force_reread = 0;
-+ sf_new_i->force_restat = 0;
-
- ino = iunique(parent->i_sb, 1);
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 25)
-@@ -458,6 +460,7 @@ static int sf_instantiate(struct inode *parent, struct dentry *dentry,
- #else
- dentry->d_op = &sf_dentry_ops;
- #endif
-+ INIT_LIST_HEAD(&sf_new_i->handles);
- sf_new_i->force_restat = 0;
- sf_new_i->force_reread = 0;
-
-diff --git a/src/VBox/Additions/linux/sharedfolders/regops.c b/src/VBox/Additions/linux/sharedfolders/regops.c
-index 1ba03e3..db1641b 100644
---- a/src/VBox/Additions/linux/sharedfolders/regops.c
-+++ b/src/VBox/Additions/linux/sharedfolders/regops.c
-@@ -294,21 +294,6 @@ static int sf_reg_open(struct inode *inode, struct file *file)
- return -ENOMEM;
- }
-
-- /* Already open? */
-- if (sf_i->handle != SHFL_HANDLE_NIL)
-- {
-- /*
-- * This inode was created with sf_create_aux(). Check the CreateFlags:
-- * O_CREAT, O_TRUNC: inherent true (file was just created). Not sure
-- * about the access flags (SHFL_CF_ACCESS_*).
-- */
-- sf_r->handle = sf_i->handle;
-- sf_i->handle = SHFL_HANDLE_NIL;
-- sf_i->file = file;
-- file->private_data = sf_r;
-- return 0;
-- }
--
- RT_ZERO(params);
- params.Handle = SHFL_HANDLE_NIL;
- /* We check the value of params.Handle afterwards to find out if
-@@ -371,6 +356,19 @@ static int sf_reg_open(struct inode *inode, struct file *file)
- params.CreateFlags |= SHFL_CF_ACCESS_APPEND;
- }
-
-+ /* Already open? */
-+ if (sf_i->handle != SHFL_HANDLE_NIL)
-+ {
-+ /*
-+ * This inode was created with sf_create_aux(). Check the CreateFlags:
-+ * O_CREAT, O_TRUNC: inherent true (file was just created). Not sure
-+ * about the access flags (SHFL_CF_ACCESS_*).
-+ */
-+ sf_r->handle = sf_i->handle;
-+ sf_i->handle = SHFL_HANDLE_NIL;
-+ goto out;
-+ }
-+
- params.Info.Attr.fMode = inode->i_mode;
- LogFunc(("sf_reg_open: calling vboxCallCreate, file %s, flags=%#x, %#x\n",
- sf_i->path->String.utf8 , file->f_flags, params.CreateFlags));
-@@ -404,7 +402,10 @@ static int sf_reg_open(struct inode *inode, struct file *file)
- sf_init_inode(sf_g, inode, ¶ms.Info);
-
- sf_r->handle = params.Handle;
-- sf_i->file = file;
-+ out:
-+ sf_r->createflags = params.CreateFlags;
-+ INIT_LIST_HEAD(&sf_r->head);
-+ list_add(&sf_r->head, &sf_i->handles);
- file->private_data = sf_r;
- return rc_linux;
- }
-@@ -440,14 +441,16 @@ static int sf_reg_release(struct inode *inode, struct file *file)
- && filemap_fdatawrite(inode->i_mapping) != -EIO)
- filemap_fdatawait(inode->i_mapping);
- #endif
-+
-+ list_del(&sf_r->head);
-+
- rc = vboxCallClose(&client_handle, &sf_g->map, sf_r->handle);
- if (RT_FAILURE(rc))
- LogFunc(("vboxCallClose failed rc=%Rrc\n", rc));
-
-- kfree(sf_r);
-- sf_i->file = NULL;
- sf_i->handle = SHFL_HANDLE_NIL;
- file->private_data = NULL;
-+ kfree(sf_r);
- return 0;
- }
-
-@@ -600,6 +603,26 @@ struct inode_operations sf_reg_iops =
-
-
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
-+/* Helper function to pick a suitable handle for pagecache operations.
-+ * It picks the most recently opened handle for this inode that has the
-+ * requested flags (SHFL_CF_ACCESS_READ or SHFL_CF_ACCESS_WRITE).
-+ * Handles with SHFL_CF_ACCESS_APPEND are not suitable for paged use
-+ * so they are always skipped.
-+ */
-+static struct sf_reg_info *sf_select_handle(struct inode *inode, u32 flags)
-+{
-+ struct sf_inode_info *sf_i = GET_INODE_INFO(inode);
-+ struct sf_reg_info *sf_r;
-+
-+ list_for_each_entry(sf_r, &sf_i->handles, head)
-+ {
-+ if ( sf_r->handle != SHFL_HANDLE_NIL
-+ && (sf_r->createflags & (flags | SHFL_CF_ACCESS_APPEND)) == flags)
-+ return sf_r;
-+ }
-+ return NULL;
-+}
-+
- static int sf_readpage(struct file *file, struct page *page)
- {
- struct inode *inode = file->f_dentry->d_inode;
-@@ -636,9 +659,7 @@ sf_writepage(struct page *page, struct writeback_control *wbc)
- struct address_space *mapping = page->mapping;
- struct inode *inode = mapping->host;
- struct sf_glob_info *sf_g = GET_GLOB_INFO(inode->i_sb);
-- struct sf_inode_info *sf_i = GET_INODE_INFO(inode);
-- struct file *file = sf_i->file;
-- struct sf_reg_info *sf_r = file->private_data;
-+ struct sf_reg_info *sf_r;
- char *buf;
- uint32_t nwritten = PAGE_SIZE;
- int end_index = inode->i_size >> PAGE_SHIFT;
-@@ -647,6 +668,15 @@ sf_writepage(struct page *page, struct writeback_control *wbc)
-
- TRACE();
-
-+ sf_r = sf_select_handle(inode, SHFL_CF_ACCESS_WRITE);
-+ if (unlikely(!sf_r))
-+ {
-+ /* At least the handle of whoever wrote to the page should
-+ * still be available; see the wait in sf_reg_release() */
-+ WARN_ONCE(1, "vboxsf: could not find handle for writepage");
-+ return -EBADF;
-+ }
-+
- if (page->index >= end_index)
- nwritten = inode->i_size & (PAGE_SIZE-1);
-
-diff --git a/src/VBox/Additions/linux/sharedfolders/vfsmod.c b/src/VBox/Additions/linux/sharedfolders/vfsmod.c
-index 3c55136..79097c5 100644
---- a/src/VBox/Additions/linux/sharedfolders/vfsmod.c
-+++ b/src/VBox/Additions/linux/sharedfolders/vfsmod.c
-@@ -237,6 +237,7 @@ static int sf_read_super_aux(struct super_block *sb, void *data, int flags)
- goto fail1;
- }
-
-+ INIT_LIST_HEAD(&sf_i->handles);
- sf_i->handle = SHFL_HANDLE_NIL;
- sf_i->path = kmalloc(sizeof(SHFLSTRING) + 1, GFP_KERNEL);
- if (!sf_i->path)
-@@ -372,6 +373,7 @@ static void sf_clear_inode(struct inode *inode)
- if (!sf_i)
- return;
-
-+ WARN_ON(!list_empty(&sf_i->handles));
- BUG_ON(!sf_i->path);
- kfree(sf_i->path);
- kfree(sf_i);
-@@ -394,6 +396,7 @@ static void sf_evict_inode(struct inode *inode)
- if (!sf_i)
- return;
-
-+ WARN_ON(!list_empty(&sf_i->handles));
- BUG_ON(!sf_i->path);
- kfree(sf_i->path);
- kfree(sf_i);
-diff --git a/src/VBox/Additions/linux/sharedfolders/vfsmod.h b/src/VBox/Additions/linux/sharedfolders/vfsmod.h
-index 6a20eb7..c7df740 100644
---- a/src/VBox/Additions/linux/sharedfolders/vfsmod.h
-+++ b/src/VBox/Additions/linux/sharedfolders/vfsmod.h
-@@ -58,11 +58,11 @@ struct sf_inode_info
- int force_restat;
- /* directory content changed, update the whole directory on next sf_getdent */
- int force_reread;
-- /* file structure, only valid between open() and release() */
-- struct file *file;
- /* handle valid if a file was created with sf_create_aux until it will
|
|
[-]
[+]
|
Deleted |
vbox-less-restat.diff
^
|
| @@ -1,71 +0,0 @@
-commit bce05d945b143926548b8f8d289dfa3ec02f3788
-Author: Richard Braakman <richard.braakman@jollamobile.com>
-Date: Fri Jan 25 11:33:47 2013 +0200
-
- linux sharedfolders: remove redundant statting
-
- There's no need to force a restat right after filling a new inode with stat
- information. Also, open() can use the stat info it gets with the handle
- instead of statting again.
-
- In addition, sf_inode_revalidate should actually set force_restat back to 0
- when statting.
-
-diff --git a/src/VBox/Additions/linux/sharedfolders/dirops.c b/src/VBox/Additions/linux/sharedfolders/dirops.c
-index f7f558a..d0d7b85 100644
---- a/src/VBox/Additions/linux/sharedfolders/dirops.c
-+++ b/src/VBox/Additions/linux/sharedfolders/dirops.c
-@@ -458,7 +458,7 @@ static int sf_instantiate(struct inode *parent, struct dentry *dentry,
- #else
- dentry->d_op = &sf_dentry_ops;
- #endif
-- sf_new_i->force_restat = 1;
-+ sf_new_i->force_restat = 0;
- sf_new_i->force_reread = 0;
-
- d_instantiate(dentry, inode);
-diff --git a/src/VBox/Additions/linux/sharedfolders/regops.c b/src/VBox/Additions/linux/sharedfolders/regops.c
-index 37adbcb..1ba03e3 100644
---- a/src/VBox/Additions/linux/sharedfolders/regops.c
-+++ b/src/VBox/Additions/linux/sharedfolders/regops.c
-@@ -302,7 +302,6 @@ static int sf_reg_open(struct inode *inode, struct file *file)
- * O_CREAT, O_TRUNC: inherent true (file was just created). Not sure
- * about the access flags (SHFL_CF_ACCESS_*).
- */
-- sf_i->force_restat = 1;
- sf_r->handle = sf_i->handle;
- sf_i->handle = SHFL_HANDLE_NIL;
- sf_i->file = file;
-@@ -378,6 +377,7 @@ static int sf_reg_open(struct inode *inode, struct file *file)
- rc = vboxCallCreate(&client_handle, &sf_g->map, sf_i->path, ¶ms);
- if (RT_FAILURE(rc))
- {
-+ sf_i->force_restat = 1;
- LogFunc(("vboxCallCreate failed flags=%d,%#x rc=%Rrc\n",
- file->f_flags, params.CreateFlags, rc));
- kfree(sf_r);
-@@ -398,9 +398,11 @@ static int sf_reg_open(struct inode *inode, struct file *file)
- default:
- break;
- }
-+ sf_i->force_restat = 1;
- }
-+ else
-+ sf_init_inode(sf_g, inode, ¶ms.Info);
-
-- sf_i->force_restat = 1;
- sf_r->handle = params.Handle;
- sf_i->file = file;
- file->private_data = sf_r;
-diff --git a/src/VBox/Additions/linux/sharedfolders/utils.c b/src/VBox/Additions/linux/sharedfolders/utils.c
-index aa9c396..7ba8276 100644
---- a/src/VBox/Additions/linux/sharedfolders/utils.c
-+++ b/src/VBox/Additions/linux/sharedfolders/utils.c
-@@ -238,6 +238,7 @@ int sf_inode_revalidate(struct dentry *dentry)
- return 0;
- }
-
-+ sf_i->force_restat = 0;
- err = sf_stat(__func__, sf_g, sf_i->path, &info, 1);
- if (err)
- return err;
|
|
[-]
[+]
|
Deleted |
vbox-mmap-02.diff
^
|
| @@ -1,53 +0,0 @@
-commit 7d8a6d68c286e3544645a54d5fcc14f1de7b16f4
-Author: Richard Braakman <richard.braakman@jollamobile.com>
-Date: Fri Feb 1 00:18:24 2013 +0200
-
- sharedfolders bugfix: set access read/write even if some bits already set
-
- In sf_reg_open(), a file opened with O_TRUNC|O_RDWR wouldn't get the
- SHFL_CF_ACCESS_READ flag because of the logic that skipped processing
- the O_RDWR after seeing O_TRUNC. This is wrong, and it shows up with
- the new pagecache code because the handle is not flagged as readable.
-
-diff --git a/src/VBox/Additions/linux/sharedfolders/regops.c b/src/VBox/Additions/linux/sharedfolders/regops.c
-index c3b314e..c39fc97 100644
---- a/src/VBox/Additions/linux/sharedfolders/regops.c
-+++ b/src/VBox/Additions/linux/sharedfolders/regops.c
-@@ -341,25 +341,22 @@ static int sf_reg_open(struct inode *inode, struct file *file)
- }
- }
-
-- if (!(params.CreateFlags & SHFL_CF_ACCESS_READWRITE))
-+ switch (file->f_flags & O_ACCMODE)
- {
-- switch (file->f_flags & O_ACCMODE)
-- {
-- case O_RDONLY:
-- params.CreateFlags |= SHFL_CF_ACCESS_READ;
-- break;
-+ case O_RDONLY:
-+ params.CreateFlags |= SHFL_CF_ACCESS_READ;
-+ break;
-
-- case O_WRONLY:
-- params.CreateFlags |= SHFL_CF_ACCESS_WRITE;
-- break;
-+ case O_WRONLY:
-+ params.CreateFlags |= SHFL_CF_ACCESS_WRITE;
-+ break;
-
-- case O_RDWR:
-- params.CreateFlags |= SHFL_CF_ACCESS_READWRITE;
-- break;
-+ case O_RDWR:
-+ params.CreateFlags |= SHFL_CF_ACCESS_READWRITE;
-+ break;
-
-- default:
-- BUG ();
-- }
-+ default:
-+ BUG ();
- }
-
- if (file->f_flags & O_APPEND)
|
|
[-]
[+]
|
Deleted |
vbox-mmap.diff
^
|
| @@ -1,123 +0,0 @@
-commit c1e45e725b91bc4e03d7e3acc94673ea7b16d762
-Author: Richard Braakman <richard.braakman@jollamobile.com>
-Date: Tue Jan 29 21:48:13 2013 +0200
-
- [vboxsf] support writable mmap
-
- This is mainly so that guest processes can use the shared folder as a backing
- for database files and such. Don't expect coherence if a file is simultaneously
- mmapped on the host and guest sides.
-
-diff --git a/src/VBox/Additions/linux/sharedfolders/regops.c b/src/VBox/Additions/linux/sharedfolders/regops.c
-index a0586bd..c3b314e 100644
---- a/src/VBox/Additions/linux/sharedfolders/regops.c
-+++ b/src/VBox/Additions/linux/sharedfolders/regops.c
-@@ -16,7 +16,7 @@
- */
-
- /*
-- * Limitations: only COW memory mapping is supported
-+ * Limitations: MAP_SHARED mmap does not notice changes made on the host.
- */
-
- #include "vfsmod.h"
-@@ -501,7 +501,7 @@ static struct page *sf_reg_nopage(struct vm_area_struct *vma, unsigned long vadd
- /* Don't use GFP_HIGHUSER as long as sf_reg_read_aux() calls vboxCallRead()
- * which works on virtual addresses. On Linux cannot reliably determine the
- * physical address for high memory, see rtR0MemObjNativeLockKernel(). */
-- page = alloc_page(GFP_USER);
-+ page = find_or_create_page(inode->i_mapping, vmf->pgoff, GFP_USER);
- if (!page) {
- LogRelFunc(("failed to allocate page\n"));
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 25)
-@@ -522,7 +522,8 @@ static struct page *sf_reg_nopage(struct vm_area_struct *vma, unsigned long vadd
- if (err)
- {
- kunmap(page);
-- put_page(page);
-+ unlock_page(page);
-+ page_cache_release(page);
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 25)
- return VM_FAULT_SIGBUS;
- #else
-@@ -546,7 +547,9 @@ static struct page *sf_reg_nopage(struct vm_area_struct *vma, unsigned long vadd
- memset(buf + nread, 0, PAGE_SIZE - nread);
-
- flush_dcache_page(page);
-+ SetPageUptodate(page);
- kunmap(page);
-+ unlock_page(page);
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 25)
- vmf->page = page;
- return 0;
-@@ -556,24 +559,51 @@ static struct page *sf_reg_nopage(struct vm_area_struct *vma, unsigned long vadd
- #endif
- }
-
-+/**
-+ * Prepare for a mmap page to be made writable.
-+ * Check that the page is still there, and lock it if necessary to keep it there.
-+ * Part of MAP_SHARED support.
-+ *
-+ * @returns VM_FAULT_LOCKED if the page is ready, otherwise VM_FAULT_NOPAGE.
-+ */
-+static int sf_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
-+{
-+ struct page *page = vmf->page;
-+ struct inode *inode = vma->vm_file->f_path.dentry->d_inode;
-+ loff_t size;
-+
-+ TRACE();
-+
-+ lock_page(page);
-+ size = i_size_read(inode);
-+ if (page->mapping != inode->i_mapping || page_offset(page) > size)
-+ {
-+ /* file was truncated */
-+ unlock_page(page);
-+ return VM_FAULT_NOPAGE;
-+ }
-+
-+ wait_on_page_writeback(page);
-+ return VM_FAULT_LOCKED;
-+}
-+
- static struct vm_operations_struct sf_vma_ops =
- {
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 25)
-- .fault = sf_reg_fault
-+ .fault = sf_reg_fault,
- #else
-- .nopage = sf_reg_nopage
-+ .nopage = sf_reg_nopage,
- #endif
-+ .page_mkwrite = sf_page_mkwrite
- };
-
- static int sf_reg_mmap(struct file *file, struct vm_area_struct *vma)
- {
-- TRACE();
-- if (vma->vm_flags & VM_SHARED)
-- {
-- LogFunc(("shared mmapping not available\n"));
-- return -EINVAL;
-- }
-+ struct sf_reg_info *sf_r = file->private_data;
-
-+ TRACE();
-+ if (sf_r->createflags & SHFL_CF_ACCESS_APPEND)
-+ return -EINVAL; /* can't simulate page operations */
- vma->vm_ops = &sf_vma_ops;
- return 0;
- }
-@@ -701,8 +731,8 @@ sf_writepage(struct page *page, struct writeback_control *wbc)
- goto out;
- }
-
-- if (off > inode->i_size)
-- inode->i_size = off;
-+ if (off + nwritten > inode->i_size)
-+ inode->i_size = off + nwritten;
-
- if (PageError(page))
- ClearPageError(page);
|
|
[-]
[+]
|
Deleted |
vbox-pagecache.diff
^
|
| @@ -1,205 +0,0 @@
-commit ee6ca84b247485b40c375ebb7e29a046446374df
-Author: Richard Braakman <richard.braakman@jollamobile.com>
-Date: Thu Jan 31 19:19:22 2013 +0200
-
- sharedfolders: read() from page cache
-
-diff --git a/src/VBox/Additions/linux/sharedfolders/dirops.c b/src/VBox/Additions/linux/sharedfolders/dirops.c
-index 5e32135..1ed25dc 100644
---- a/src/VBox/Additions/linux/sharedfolders/dirops.c
-+++ b/src/VBox/Additions/linux/sharedfolders/dirops.c
-@@ -450,9 +450,9 @@ static int sf_instantiate(struct inode *parent, struct dentry *dentry,
- goto fail1;
- }
-
-+ SET_INODE_INFO(inode, sf_new_i);
- sf_init_inode(sf_g, inode, info);
- sf_new_i->path = path;
-- SET_INODE_INFO(inode, sf_new_i);
-
- dentry->d_time = jiffies;
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
-diff --git a/src/VBox/Additions/linux/sharedfolders/regops.c b/src/VBox/Additions/linux/sharedfolders/regops.c
-index c39fc97..37849cf 100644
---- a/src/VBox/Additions/linux/sharedfolders/regops.c
-+++ b/src/VBox/Additions/linux/sharedfolders/regops.c
-@@ -147,6 +147,13 @@ static ssize_t sf_reg_read(struct file *file, char *buf, size_t size, loff_t *of
- if (!size)
- return 0;
-
-+ /* Try reading from the page cache */
-+ if (sf_r->generation == inode->i_generation)
-+ return do_sync_read(file, buf, size, off);
-+ else
-+ printk("vboxsf: doing direct read, generation %u != %u\n",
-+ sf_r->generation, inode->i_generation);
-+
- tmp = alloc_bounce_buffer(&tmp_size, size, __PRETTY_FUNCTION__);
- if (!tmp)
- return -ENOMEM;
-@@ -265,6 +272,18 @@ static ssize_t sf_reg_write(struct file *file, const char *buf, size_t size, lof
- break;
- }
-
-+ /* force-invalidate the corresponding part of the page cache */
-+ err = invalidate_inode_pages2_range(inode->i_mapping,
-+ *off >> PAGE_CACHE_SHIFT,
-+ (*off + total_bytes_written - 1) >> PAGE_CACHE_SHIFT);
-+ if (err)
-+ {
-+ printk("vboxsf: could not invalidate inode page cache for %s\n",
-+ sf_i->path->String.utf8);
-+ /** @todo fall back on pagecache write here? */
-+ inode->i_generation++; /* disable pagecache reads for current fds */
-+ }
-+
- *off += total_bytes_written;
- if (*off > inode->i_size)
- inode->i_size = *off;
-@@ -408,11 +427,15 @@ static int sf_reg_open(struct inode *inode, struct file *file)
- sf_i->force_restat = 1;
- }
- else
-+ {
-+ sf_revalidate_mapping(inode, ¶ms.Info);
- sf_init_inode(sf_g, inode, ¶ms.Info);
-+ }
-
- sf_r->handle = params.Handle;
- out:
- sf_r->createflags = params.CreateFlags;
-+ sf_r->generation = inode->i_generation;
- INIT_LIST_HEAD(&sf_r->head);
- list_add(&sf_r->head, &sf_i->handles);
- file->private_data = sf_r;
-@@ -674,6 +697,15 @@ static int sf_readpage(struct file *file, struct page *page)
-
- TRACE();
-
-+ sf_r = sf_select_handle(inode, SHFL_CF_ACCESS_READ);
-+ if (unlikely(!sf_r))
-+ {
-+ struct sf_inode_info *sf_i = GET_INODE_INFO(inode);
-+ WARN(1, "vboxsf: could not find handle for readpage for %s",
-+ sf_i->path->String.utf8);
-+ sf_r = file->private_data;
-+ }
-+
- buf = kmap(page);
- ret = sf_reg_read_aux(__func__, sf_g, sf_r, buf, &nread, off);
- if (ret)
-diff --git a/src/VBox/Additions/linux/sharedfolders/utils.c b/src/VBox/Additions/linux/sharedfolders/utils.c
-index 7ba8276..d2be0c5 100644
---- a/src/VBox/Additions/linux/sharedfolders/utils.c
-+++ b/src/VBox/Additions/linux/sharedfolders/utils.c
-@@ -71,6 +71,7 @@ static void sf_timespec_from_ftime(RTTIMESPEC *ts, struct timespec *tv)
- void sf_init_inode(struct sf_glob_info *sf_g, struct inode *inode,
- PSHFLFSOBJINFO info)
- {
-+ struct sf_inode_info *sf_i = GET_INODE_INFO(inode);
- PSHFLFSOBJATTR attr;
- int mode;
-
-@@ -159,6 +160,49 @@ void sf_init_inode(struct sf_glob_info *sf_g, struct inode *inode,
- sf_ftime_from_timespec(&inode->i_atime, &info->AccessTime);
- sf_ftime_from_timespec(&inode->i_ctime, &info->ChangeTime);
- sf_ftime_from_timespec(&inode->i_mtime, &info->ModificationTime);
-+
-+ if (attr->enmAdditional == SHFLFSOBJATTRADD_UNIX)
-+ {
-+ sf_i->host_dev = attr->u.Unix.INodeIdDevice;
-+ sf_i->host_ino = attr->u.Unix.INodeId;
-+ }
-+}
-+
-+/* Check if the host-side inode is likely to have had content changes,
-+ * so that we should throw away the cached pages. */
-+void sf_revalidate_mapping(struct inode *inode, PSHFLFSOBJINFO info)
-+{
-+ struct timespec mtime;
-+ PSHFLFSOBJATTR attr = &info->Attr;
-+
-+ TRACE();
-+
-+ if (i_size_read(inode) != info->cbObject)
-+ {
-+ spin_lock(&inode->i_lock);
-+ truncate_setsize(inode, info->cbObject);
-+ spin_unlock(&inode->i_lock);
-+ goto out_invalid;
-+ }
-+
-+ sf_ftime_from_timespec(&mtime, &info->ModificationTime);
-+ if (timespec_compare(&inode->i_mtime, &mtime))
-+ goto out_invalid;
-+
-+ if (attr->enmAdditional == SHFLFSOBJATTRADD_UNIX)
-+ {
-+ struct sf_inode_info *sf_i = GET_INODE_INFO(inode);
-+ if ( (sf_i->host_dev && sf_i->host_dev != attr->u.Unix.INodeIdDevice)
-+ || (sf_i->host_ino && sf_i->host_ino != attr->u.Unix.INodeId))
-+ goto out_invalid;
-+ }
-+
-+ return;
-+
-+ out_invalid:
-+ invalidate_inode_pages2(inode->i_mapping);
-+ inode->i_generation++;
-+ return;
- }
-
- int sf_stat(const char *caller, struct sf_glob_info *sf_g,
-@@ -244,6 +288,7 @@ int sf_inode_revalidate(struct dentry *dentry)
- return err;
-
- dentry->d_time = jiffies;
-+ sf_revalidate_mapping(dentry->d_inode, &info);
- sf_init_inode(sf_g, dentry->d_inode, &info);
- return 0;
- }
-diff --git a/src/VBox/Additions/linux/sharedfolders/vfsmod.c b/src/VBox/Additions/linux/sharedfolders/vfsmod.c
-index 79097c5..ef4daa9 100644
---- a/src/VBox/Additions/linux/sharedfolders/vfsmod.c
-+++ b/src/VBox/Additions/linux/sharedfolders/vfsmod.c
-@@ -300,8 +300,8 @@ static int sf_read_super_aux(struct super_block *sb, void *data, int flags)
- goto fail4;
- }
-
-- sf_init_inode(sf_g, iroot, &fsinfo);
- SET_INODE_INFO(iroot, sf_i);
-+ sf_init_inode(sf_g, iroot, &fsinfo);
-
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 25)
- unlock_new_inode(iroot);
-diff --git a/src/VBox/Additions/linux/sharedfolders/vfsmod.h b/src/VBox/Additions/linux/sharedfolders/vfsmod.h
-index c7df740..62fb489 100644
---- a/src/VBox/Additions/linux/sharedfolders/vfsmod.h
-+++ b/src/VBox/Additions/linux/sharedfolders/vfsmod.h
-@@ -63,6 +63,10 @@ struct sf_inode_info
- SHFLHANDLE handle;
- /* list of sf_reg_info for open files, most recent first */
- struct list_head handles;
-+ /* identification of host-side inode, to detect if it changed */
-+ /* these can be 0 if not known yet */
-+ RTINODE host_ino;
-+ RTDEV host_dev;
- };
-
- struct sf_dir_info
-@@ -84,6 +88,7 @@ struct sf_reg_info
- SHFLHANDLE handle;
- u32 createflags; /* SHFL_CF_ flags for this handle */
- struct list_head head; /* starts at sf_i->handles */
-+ u32 generation;
- };
-
- /* globals */
-@@ -103,6 +108,7 @@ extern void sf_init_inode(struct sf_glob_info *sf_g, struct inode *inode,
- extern int sf_stat(const char *caller, struct sf_glob_info *sf_g,
|
|
[-]
[+]
|
Deleted |
vbox-physread.diff
^
|
| @@ -1,230 +0,0 @@
-commit 1d3a5cd2f8d4d061e7aa82f08a3470a074f1f66b
-Author: Richard Braakman <richard.braakman@jollamobile.com>
-Date: Sun Feb 3 11:30:43 2013 +0200
-
- vboxsf: speed up reads by using multipage transfers
-
-diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.c b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.c
-index 03af236..b49e217 100644
---- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.c
-+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.c
-@@ -524,6 +524,53 @@ DECLVBGL(int) VbglR0SfWritePhysCont(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHAND
-
- }
-
-+DECLVBGL(int) VbglR0SfReadPhysCont(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, RTCCPHYS PhysBuffer)
-+{
-+ uint32_t cbToRead = *pcbBuffer;
-+ uint32_t cPages = RT_ALIGN_32((PhysBuffer & PAGE_OFFSET_MASK) + cbToRead, PAGE_SIZE) >> PAGE_SHIFT;
-+ uint32_t cbData = sizeof(VBoxSFRead) + RT_UOFFSETOF(HGCMPageListInfo, aPages[cPages]);
-+ VBoxSFRead *pData = (VBoxSFRead *)RTMemTmpAlloc(cbData);
-+ HGCMPageListInfo *pPgLst = (HGCMPageListInfo *)(pData + 1);
-+ uint32_t iPage;
-+ int rc;
-+
-+ if (RT_UNLIKELY(!pData))
-+ return VERR_NO_TMP_MEMORY;
-+
-+ VBOX_INIT_CALL(&pData->callInfo, READ, pClient);
-+
-+ pData->root.type = VMMDevHGCMParmType_32bit;
-+ pData->root.u.value32 = pMap->root;
-+
-+ pData->handle.type = VMMDevHGCMParmType_64bit;
-+ pData->handle.u.value64 = hFile;
-+ pData->offset.type = VMMDevHGCMParmType_64bit;
-+ pData->offset.u.value64 = offset;
-+ pData->cb.type = VMMDevHGCMParmType_32bit;
-+ pData->cb.u.value32 = cbToRead;
-+ pData->buffer.type = VMMDevHGCMParmType_PageList;
-+ pData->buffer.u.PageList.size = cbToRead;
-+ pData->buffer.u.PageList.offset = sizeof(VBoxSFRead);
-+
-+ pPgLst->flags = VBOX_HGCM_F_PARM_DIRECTION_FROM_HOST;
-+ pPgLst->offFirstPage = (uint16_t)(PhysBuffer & PAGE_OFFSET_MASK);
-+ pPgLst->cPages = cPages;
-+ PhysBuffer &= ~(RTCCPHYS)PAGE_OFFSET_MASK;
-+ for (iPage = 0; iPage < cPages; iPage++, PhysBuffer += PAGE_SIZE)
-+ pPgLst->aPages[iPage] = PhysBuffer;
-+
-+ rc = VbglHGCMCall (pClient->handle, &pData->callInfo, cbData);
-+ if (RT_SUCCESS (rc))
-+ {
-+ rc = pData->callInfo.result;
-+ *pcbBuffer = pData->cb.u.value32;
-+ }
-+
-+ RTMemTmpFree(pData);
-+ return rc;
-+
-+}
-+
- DECLVBGL(int) vboxCallFlush(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile)
- {
- int rc = VINF_SUCCESS;
-diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.h b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.h
-index 3947a13..4d7e4a9 100644
---- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.h
-+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.h
-@@ -174,6 +174,7 @@ DECLVBGL(int) vboxCallFlush (PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFil
- DECLVBGL(int) vboxCallRead (PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, uint8_t *pBuffer, bool fLocked);
- 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) VbglR0SfReadPhysCont(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, RTCCPHYS PhysBuffer);
-
- DECLVBGL(int) vboxCallLock (PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint64_t cbSize, uint32_t fLock);
-
-diff --git a/src/VBox/Additions/linux/sharedfolders/regops.c b/src/VBox/Additions/linux/sharedfolders/regops.c
-index db1641b..a0586bd 100644
---- a/src/VBox/Additions/linux/sharedfolders/regops.c
-+++ b/src/VBox/Additions/linux/sharedfolders/regops.c
-@@ -21,8 +21,8 @@
-
- #include "vfsmod.h"
-
--static void *alloc_bounce_buffer(size_t *tmp_sizep, PRTCCPHYS physp, size_t
-- xfer_size, const char *caller)
-+static void *
-+alloc_bounce_buffer(size_t *tmp_sizep, size_t xfer_size, const char *caller)
- {
- size_t tmp_size;
- void *tmp;
-@@ -45,7 +45,6 @@ static void *alloc_bounce_buffer(size_t *tmp_sizep, PRTCCPHYS physp, size_t
- }
-
- *tmp_sizep = tmp_size;
-- *physp = virt_to_phys(tmp);
- return tmp;
- }
-
-@@ -56,37 +55,61 @@ static void free_bounce_buffer(void *tmp)
-
-
- /* fops */
-+
-+/* Input buf must be physically contiguous memory */
- static int sf_reg_read_aux(const char *caller, struct sf_glob_info *sf_g,
- struct sf_reg_info *sf_r, void *buf,
- uint32_t *nread, uint64_t pos)
- {
-- /** @todo bird: yes, kmap() and kmalloc() input only. Since the buffer is
-- * contiguous in physical memory (kmalloc or single page), we should
-- * use a physical address here to speed things up. */
-- int rc = vboxCallRead(&client_handle, &sf_g->map, sf_r->handle,
-- pos, nread, buf, false /* already locked? */);
-- if (RT_FAILURE(rc))
-+ if (VbglR0CanUsePhysPageList())
-+ {
-+ int rc = VbglR0SfReadPhysCont(&client_handle, &sf_g->map, sf_r->handle,
-+ pos, nread, virt_to_phys(buf));
-+ if (RT_FAILURE(rc))
-+ {
-+ LogFunc(("VbglR0SfReadPhysCont failed. caller=%s, rc=%Rrc\n",
-+ caller, rc));
-+ return -EPROTO;
-+ }
-+ }
-+ else
- {
-- LogFunc(("vboxCallRead failed. caller=%s, rc=%Rrc\n", caller, rc));
-- return -EPROTO;
-+ int rc = vboxCallRead(&client_handle, &sf_g->map, sf_r->handle,
-+ pos, nread, buf, false /* already locked? */);
-+ if (RT_FAILURE(rc))
-+ {
-+ LogFunc(("vboxCallRead failed. caller=%s, rc=%Rrc\n", caller, rc));
-+ return -EPROTO;
-+ }
- }
- return 0;
- }
-
-+/* Input buf must be physically contiguous memory */
- static int sf_reg_write_aux(const char *caller, struct sf_glob_info *sf_g,
- struct sf_reg_info *sf_r, void *buf,
- uint32_t *nwritten, uint64_t pos)
- {
-- /** @todo bird: yes, kmap() and kmalloc() input only. Since the buffer is
-- * contiguous in physical memory (kmalloc or single page), we should
-- * use a physical address here to speed things up. */
-- int rc = vboxCallWrite(&client_handle, &sf_g->map, sf_r->handle,
-- pos, nwritten, buf, false /* already locked? */);
-- if (RT_FAILURE(rc))
-+ if (VbglR0CanUsePhysPageList())
- {
-- LogFunc(("vboxCallWrite failed. caller=%s, rc=%Rrc\n",
-- caller, rc));
-- return -EPROTO;
-+ int rc = VbglR0SfWritePhysCont(&client_handle, &sf_g->map, sf_r->handle,
-+ pos, nwritten, virt_to_phys(buf));
-+ if (RT_FAILURE(rc))
-+ {
-+ LogFunc(("VbglR0SfWritePhysCont failed. caller=%s, rc=%Rrc\n",
-+ caller, rc));
-+ return -EPROTO;
-+ }
-+ }
-+ else
-+ {
-+ int rc = vboxCallWrite(&client_handle, &sf_g->map, sf_r->handle,
-+ pos, nwritten, buf, false /* already locked? */);
-+ if (RT_FAILURE(rc))
-+ {
-+ LogFunc(("vboxCallWrite failed. caller=%s, rc=%Rrc\n", caller, rc));
-+ return -EPROTO;
-+ }
- }
- return 0;
- }
-@@ -104,7 +127,6 @@ static ssize_t sf_reg_read(struct file *file, char *buf, size_t size, loff_t *of
- {
- int err;
- void *tmp;
-- RTCCPHYS tmp_phys;
- size_t tmp_size;
- size_t left = size;
- ssize_t total_bytes_read = 0;
-@@ -125,7 +147,7 @@ static ssize_t sf_reg_read(struct file *file, char *buf, size_t size, loff_t *of
- if (!size)
- return 0;
-
-- tmp = alloc_bounce_buffer(&tmp_size, &tmp_phys, size, __PRETTY_FUNCTION__);
-+ tmp = alloc_bounce_buffer(&tmp_size, size, __PRETTY_FUNCTION__);
- if (!tmp)
- return -ENOMEM;
-
-@@ -179,7 +201,6 @@ static ssize_t sf_reg_write(struct file *file, const char *buf, size_t size, lof
- {
- int err;
- void *tmp;
|
|
[-]
[+]
|
Deleted |
vbox-python-detection.diff
^
|
| @@ -1,47 +0,0 @@
---- VirtualBox-4.0.2_OSE.orig/src/libs/xpcom18a4/python/gen_python_deps.py 2011-01-14 20:15:09.000000000 +0000
-+++ VirtualBox-4.0.2_OSE/src/libs/xpcom18a4/python/gen_python_deps.py 2011-02-07 05:36:42.427567000 +0000
-@@ -68,7 +68,7 @@
- else:
- multi = 1
-
-- if multi == 0:
-+ if not multi:
- prefixes = ["/usr"]
- versions = [str(sys.version_info[0])+'.'+str(sys.version_info[1])]
-
-@@ -86,22 +86,23 @@
- for v in versions:
- for p in prefixes:
- c = checkPair(p, v, dllpre, dllsuff, bitness_magic)
-- if c is not None:
-+ if c:
- known[v] = c
- break
-- keys = known.keys()
-- # we want default to be the lowest versioned Python
-- keys.sort()
-- d = None
- # We need separator other than newline, to sneak through $(shell)
- sep = "|"
-- for k in keys:
-- if d is None:
-- d = k
-- vers = k.replace('.', '')
-- print_vars(vers, known[k], sep, bitness_magic)
-- if d is not None:
-- print_vars("DEF", known[d], sep, bitness_magic)
-+
-+ if not known:
-+ # this type of problem should be detected in configure
-+ # print_vars("DEF", defaultpaths, sep, bitness_magic)
-+ pass
-+ if multi:
-+ for ver, paths in known.items():
-+ print_vars(ver.replace('.', ''), paths, sep, bitness_magic)
-+ else:
-+ ver = versions[0]
-+ paths = known[ver]
-+ print_vars(ver.replace('.', ''), paths, sep, bitness_magic)
-
- if __name__ == '__main__':
- main(sys.argv)
|
|
[-]
[+]
|
Deleted |
vbox-readpages.diff
^
|
| @@ -1,114 +0,0 @@
-commit 2e991b96673cb5f6f2093a7ccbc94e403aad46d7
-Author: Richard Braakman <richard.braakman@jollamobile.com>
-Date: Sun Feb 3 02:38:15 2013 +0200
-
- vboxsf: implement readpages() for efficiency
-
-diff --git a/src/VBox/Additions/linux/sharedfolders/regops.c b/src/VBox/Additions/linux/sharedfolders/regops.c
-index 37849cf..e9b2ace 100644
---- a/src/VBox/Additions/linux/sharedfolders/regops.c
-+++ b/src/VBox/Additions/linux/sharedfolders/regops.c
-@@ -689,7 +689,7 @@ static int sf_readpage(struct file *file, struct page *page)
- {
- struct inode *inode = file->f_dentry->d_inode;
- struct sf_glob_info *sf_g = GET_GLOB_INFO(inode->i_sb);
-- struct sf_reg_info *sf_r = file->private_data;
-+ struct sf_reg_info *sf_r;
- uint32_t nread = PAGE_SIZE;
- char *buf;
- loff_t off = ((loff_t)page->index) << PAGE_SHIFT;
-@@ -724,6 +724,87 @@ static int sf_readpage(struct file *file, struct page *page)
- return 0;
- }
-
-+/*
-+ * Read a list of pages into the page cache.
-+ * This is only used for readahead, so it's ok to give up.
-+ * The caller will fall back on readpage() for the important pages.
-+ */
-+static int sf_readpages(struct file *file, struct address_space *mapping,
-+ struct list_head *pages, unsigned nr_pages)
-+{
-+ struct inode *inode = file->f_dentry->d_inode;
-+ struct sf_glob_info *sf_g = GET_GLOB_INFO(inode->i_sb);
-+ struct sf_reg_info *sf_r;
-+ struct page *physbuf = 0;
-+ int bufsize;
-+ pgoff_t buf_startindex = 0;
-+ pgoff_t pages_in_buf = 0;
-+ int err = 0;
-+
-+ TRACE();
-+
-+ if (nr_pages <= 1)
-+ return 0; /* either nothing to do or not worth batching */
-+
-+ sf_r = sf_select_handle(inode, SHFL_CF_ACCESS_READ);
-+ if (unlikely(!sf_r))
-+ {
-+ struct sf_inode_info *sf_i = GET_INODE_INFO(inode);
-+ WARN(1, "vboxsf: could not find handle for readpages for %s",
-+ sf_i->path->String.utf8);
-+ sf_r = file->private_data;
-+ }
-+
-+ /*
-+ * Performance really depends on the number of calls we make to the host, so
-+ * allocate a physically contiguous buffer to read multiple pages per call.
-+ */
-+ /* first try to get everything in one read */
-+ bufsize = PAGE_SIZE * (list_entry(pages->next, struct page, lru)->index
-+ - list_entry(pages->prev, struct page, lru)->index);
-+ if (bufsize > 32 * PAGE_SIZE)
-+ bufsize = 32 * PAGE_SIZE; /* don't go crazy though */
-+
-+ physbuf = alloc_pages_exact(bufsize, GFP_KERNEL);
-+ if (!physbuf)
-+ return -ENOMEM; /* Memory pressure - best not to readahead at all */
-+
-+ while (!list_empty(pages))
-+ {
-+ struct page *page = list_first_entry(pages, struct page, lru);
-+ loff_t off = (loff_t) page->index << PAGE_SHIFT;
-+ list_del(&page->lru);
-+ if (add_to_page_cache_lru(page, mapping, page->index, GFP_KERNEL))
-+ {
-+ page_cache_release(page);
-+ continue;
-+ }
-+ page_cache_release(page);
-+
-+ /* read the next chunk if needed */
-+ if (page->index >= buf_startindex + pages_in_buf)
-+ {
-+ uint32_t nread = bufsize;
-+ err = sf_reg_read_aux(__func__, sf_g, sf_r, physbuf, &nread, off);
-+ if (err || nread == 0)
-+ break;
-+ buf_startindex = page->index;
-+ pages_in_buf = nread >> PAGE_SHIFT;
-+ /* fix up possible partial page at end */
-+ if (nread != PAGE_ALIGN(nread))
-+ {
-+ pages_in_buf++;
-+ memset(physbuf + nread, 0, (pages_in_buf << PAGE_SHIFT) - nread);
-+ }
-+ }
-+ copy_page(page_address(page),
-+ physbuf + ((page->index - buf_startindex) << PAGE_SHIFT));
-+ }
-+
-+ free_pages_exact(physbuf, bufsize);
-+ return err;
-+}
-+
- static int
- sf_writepage(struct page *page, struct writeback_control *wbc)
- {
-@@ -828,5 +909,6 @@ struct address_space_operations sf_reg_aops =
- .prepare_write = simple_prepare_write,
- .commit_write = simple_commit_write,
- # endif
-+ .readpages = sf_readpages,
- };
- #endif
|
|
[-]
[+]
|
Deleted |
vbox-ret-in-nonvoid-fnc.diff
^
|
| @@ -1,24 +0,0 @@
-Index: VirtualBox-3.1.4_OSE/src/VBox/Devices/PC/Etherboot-src/core/nic.c
-===================================================================
---- VirtualBox-3.1.4_OSE.orig/src/VBox/Devices/PC/Etherboot-src/core/nic.c
-+++ VirtualBox-3.1.4_OSE/src/VBox/Devices/PC/Etherboot-src/core/nic.c
-@@ -478,6 +478,7 @@ int eth_load(struct dev *dev __unused)
- }
- interruptible_sleep(2); /* lay off the server for a while */
- longjmp(restart_etherboot, -1);
-+ return 0;
- }
-
-
-Index: VirtualBox-3.1.4_OSE/src/VBox/Devices/PC/Etherboot-src/core/osloader.c
-===================================================================
---- VirtualBox-3.1.4_OSE.orig/src/VBox/Devices/PC/Etherboot-src/core/osloader.c
-+++ VirtualBox-3.1.4_OSE/src/VBox/Devices/PC/Etherboot-src/core/osloader.c
-@@ -81,6 +81,7 @@ dead_download - Restart etherboot if pro
- **************************************************************************/
- static sector_t dead_download ( unsigned char *data __unused, unsigned int len __unused, int eof __unused) {
- longjmp(restart_etherboot, -2);
-+ return 0;
- }
-
- #ifdef IMAGE_MULTIBOOT
|
|
[-]
[+]
|
Deleted |
vbox-slow-logging.diff
^
|
| @@ -1,47 +0,0 @@
-diff --git a/src/VBox/Additions/linux/sharedfolders/regops.c b/src/VBox/Additions/linux/sharedfolders/regops.c
-index c39fc97..7f73a67 100644
---- a/src/VBox/Additions/linux/sharedfolders/regops.c
-+++ b/src/VBox/Additions/linux/sharedfolders/regops.c
-@@ -63,6 +63,8 @@ static int sf_reg_read_aux(const char *caller, struct sf_glob_info *sf_g,
- {
- if (VbglR0CanUsePhysPageList())
- {
-+ TRACE();
-+ printk("vboxsf starting phys read\n");
- int rc = VbglR0SfReadPhysCont(&client_handle, &sf_g->map, sf_r->handle,
- pos, nread, virt_to_phys(buf));
- if (RT_FAILURE(rc))
-@@ -71,6 +73,7 @@ static int sf_reg_read_aux(const char *caller, struct sf_glob_info *sf_g,
- caller, rc));
- return -EPROTO;
- }
-+ printk("vboxsf ended phys read\n");
- }
- else
- {
-diff --git a/src/VBox/Additions/linux/sharedfolders/vfsmod.h b/src/VBox/Additions/linux/sharedfolders/vfsmod.h
-index c7df740..043c478 100644
---- a/src/VBox/Additions/linux/sharedfolders/vfsmod.h
-+++ b/src/VBox/Additions/linux/sharedfolders/vfsmod.h
-@@ -157,5 +157,21 @@ int sf_get_volume_info(struct super_block *sb,STRUCT_STATFS *stat);
- # define SET_INODE_INFO(i, sf_i) (i)->u.generic_ip = sf_i
- #endif
-
-+#undef LogFunc
-+#define LogFunc__(format, args...) do { \
-+ if (strstr(format, "%Rrc")) { \
-+ char *printkformat = kstrdup("%s: " format, GFP_KERNEL); \
-+ char *p = printkformat; \
-+ while ((p = strstr(p, "%Rrc"))) \
-+ p[1] = 'd'; \
-+ printk(printkformat, __func__, ##args); \
-+ kfree(printkformat); \
-+ } else { \
-+ printk("%s: " format, __func__, ##args); \
-+ } \
-+} while (0)
-+/* This strips the extra parentheses that are used with the real LogFunc */
-+#define LogFunc(...) LogFunc__ __VA_ARGS__
-+
- #endif
-
|
|
[-]
[+]
|
Deleted |
vbox-smc-napa.diff
^
|
| @@ -1,13 +0,0 @@
-Index: VirtualBox-4.0.0_OSE/src/VBox/Devices/PC/vbox.dsl
-===================================================================
---- VirtualBox-4.0.0_OSE.orig/src/VBox/Devices/PC/vbox.dsl
-+++ VirtualBox-4.0.0_OSE/src/VBox/Devices/PC/vbox.dsl
-@@ -778,7 +778,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 1,
- Device (SMC)
- {
- Name (_HID, EisaId ("APP0001"))
-- Name (_CID, "smc-napa")
-+ Name (_CID, "smcnapa")
-
- Method (_STA, 0, NotSerialized)
- {
|
|
[-]
[+]
|
Deleted |
vbox-vboxadd-init-script.diff
^
|
| @@ -1,87 +0,0 @@
-diff -Naur VirtualBox-4.2.4-orig/src/VBox/Additions/linux/installer/vboxadd.sh VirtualBox-4.2.4/src/VBox/Additions/linux/installer/vboxadd.sh
---- VirtualBox-4.2.4-orig/src/VBox/Additions/linux/installer/vboxadd.sh 2012-10-26 19:23:34.000000000 +0300
-+++ VirtualBox-4.2.4/src/VBox/Additions/linux/installer/vboxadd.sh 2012-10-29 22:23:54.384329027 +0200
-@@ -21,11 +21,12 @@
- #
- ### BEGIN INIT INFO
- # Provides: vboxadd
--# Required-Start:
--# Required-Stop:
--# Default-Start: 2 3 4 5
-+# Required-Start: $remote_fs
-+# Required-Stop: $remote_fs
-+# Default-Start: 2 3 5
- # Default-Stop: 0 1 6
- # Description: VirtualBox Linux Additions kernel modules
-+# Short-Description: VirtualBox Linux Additions kernel modules
- ### END INIT INFO
-
- PATH=$PATH:/bin:/sbin:/usr/sbin
-@@ -178,8 +179,6 @@
- dev=/dev/vboxguest
- userdev=/dev/vboxuser
- config=/var/lib/VBoxGuestAdditions/config
--owner=vboxadd
--group=1
-
- test_for_gcc_and_make()
- {
-@@ -250,12 +249,6 @@
- fail "Cannot create device $dev with major $maj and minor $min"
- }
- fi
-- chown $owner:$group $dev 2>/dev/null || {
-- rm -f $dev 2>/dev/null
-- rm -f $userdev 2>/dev/null
-- rmmod vboxguest 2>/dev/null
-- fail "Cannot change owner $owner:$group for device $dev"
-- }
-
- if [ ! -c $userdev ]; then
- maj=10
-@@ -266,12 +259,6 @@
- rmmod vboxguest 2>/dev/null
- fail "Cannot create device $userdev with major $maj and minor $min"
- }
-- chown $owner:$group $userdev 2>/dev/null || {
-- rm -f $dev 2>/dev/null
-- rm -f $userdev 2>/dev/null
-- rmmod vboxguest 2>/dev/null
-- fail "Cannot change owner $owner:$group for device $userdev"
-- }
- fi
- fi
- }
-@@ -483,32 +470,6 @@
- # setup_script
- setup()
- {
-- if test -r $config; then
-- . $config
-- else
-- fail "Configuration file $config not found"
-- fi
-- test -n "$INSTALL_DIR" -a -n "$INSTALL_VER" ||
-- fail "Configuration file $config not complete"
-- export BUILD_TYPE
-- export USERNAME
--
-- MODULE_SRC="$INSTALL_DIR/src/vboxguest-$INSTALL_VER"
-- BUILDINTMP="$MODULE_SRC/build_in_tmp"
-- DODKMS="$MODULE_SRC/do_dkms"
-- chcon -t bin_t "$BUILDINTMP" > /dev/null 2>&1
-- chcon -t bin_t "$DODKMS" > /dev/null 2>&1
--
-- setup_modules
-- mod_succ="$?"
-- extra_setup
-- if [ "$mod_succ" -eq "0" ]; then
-- if running_vboxguest || running_vboxadd; then
-- printf "You should restart your guest to make sure the new modules are actually used\n\n"
-- else
-- start
-- fi
-- fi
- }
-
- # cleanup_script
|
|
[-]
[+]
|
Deleted |
vbox-vboxdrv-init-script.diff
^
|
| @@ -1,89 +0,0 @@
-diff -Naur VirtualBox-4.2.4-orig/src/VBox/Installer/linux/vboxdrv.sh.in VirtualBox-4.2.4/src/VBox/Installer/linux/vboxdrv.sh.in
---- VirtualBox-4.2.4-orig/src/VBox/Installer/linux/vboxdrv.sh.in 2012-10-29 21:58:09.000000000 +0200
-+++ VirtualBox-4.2.4/src/VBox/Installer/linux/vboxdrv.sh.in 2012-10-29 21:59:31.337352017 +0200
-@@ -193,13 +193,6 @@
- fi
- fi
- # ensure permissions
-- if ! chown :%GROUP% $DEVICE 2>/dev/null; then
-- rmmod vboxpci 2>/dev/null
-- rmmod vboxnetadp 2>/dev/null
-- rmmod vboxnetflt 2>/dev/null
-- rmmod vboxdrv 2>/dev/null
-- failure "Cannot change group %GROUP% for device $DEVICE"
-- fi
- if ! $MODPROBE vboxnetflt > /dev/null 2>&1; then
- failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out why"
- fi
-@@ -297,70 +290,8 @@
- # setup_script
- setup()
- {
-- stop
-- DKMS=`which dkms 2>/dev/null`
-- if [ -n "$DKMS" ]; then
-- begin_msg "Uninstalling old VirtualBox DKMS kernel modules"
-- $DODKMS uninstall vboxhost vboxdrv vboxnetflt vboxnetadp > $LOG
-- succ_msg
-- fi
-- if find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|grep -q vboxpci; then
-- begin_msg "Removing old VirtualBox pci kernel module"
-- find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|xargs rm -f 2>/dev/null
-- succ_msg
-- fi
-- if find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|grep -q vboxnetadp; then
-- begin_msg "Removing old VirtualBox netadp kernel module"
-- find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|xargs rm -f 2>/dev/null
-- succ_msg
-- fi
-- if find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|grep -q vboxnetflt; then
-- begin_msg "Removing old VirtualBox netflt kernel module"
-- find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|xargs rm -f 2>/dev/null
-- succ_msg
-- fi
-- if find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|grep -q vboxdrv; then
-- begin_msg "Removing old VirtualBox kernel module"
-- find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|xargs rm -f 2>/dev/null
-- succ_msg
-- fi
-- if [ -n "$DKMS" ]; then
-- begin_msg "Trying to register the VirtualBox kernel modules using DKMS"
-- if ! $DODKMS install vboxhost $VERSION >> $LOG; then
-- fail_msg "Failed, trying without DKMS"
-- DKMS=""
-- fi
-- fi
-- if [ -z "$DKMS" ]; then
-- begin_msg "Recompiling VirtualBox kernel modules"
-- if ! $BUILDINTMP \
-- --save-module-symvers /tmp/vboxdrv-Module.symvers \
-- --module-source "$MODULE_SRC/vboxdrv" \
-- --no-print-directory install >> $LOG 2>&1; then
-- failure "Look at $LOG to find out what went wrong"
-- fi
-- if ! $BUILDINTMP \
-- --use-module-symvers /tmp/vboxdrv-Module.symvers \
-- --module-source "$MODULE_SRC/vboxnetflt" \
-- --no-print-directory install >> $LOG 2>&1; then
-- failure "Look at $LOG to find out what went wrong"
-- fi
-- if ! $BUILDINTMP \
-- --use-module-symvers /tmp/vboxdrv-Module.symvers \
-- --module-source "$MODULE_SRC/vboxnetadp" \
-- --no-print-directory install >> $LOG 2>&1; then
-- failure "Look at $LOG to find out what went wrong"
-- fi
-- if ! $BUILDINTMP \
-- --use-module-symvers /tmp/vboxdrv-Module.symvers \
-- --module-source "$MODULE_SRC/vboxpci" \
-- --no-print-directory install >> $LOG 2>&1; then
-- failure "Look at $LOG to find out what went wrong"
-- fi
-- fi
-- rm -f /etc/vbox/module_not_compiled
-+ begin_msg "Recompiling VirtualBox vboxadd kernel module, NOT. It has been packaged."
- succ_msg
-- start
- }
-
- dmnstatus()
|
|
[-]
[+]
|
Deleted |
vbox-vboxweb-init-script.diff
^
|
| @@ -1,22 +0,0 @@
-Index: VirtualBox-4.1.8_OSE/src/VBox/Installer/linux/vboxweb-service.sh.in
-===================================================================
---- VirtualBox-4.1.8_OSE.orig/src/VBox/Installer/linux/vboxweb-service.sh.in
-+++ VirtualBox-4.1.8_OSE/src/VBox/Installer/linux/vboxweb-service.sh.in
-@@ -20,7 +20,7 @@
- # Provides: vboxweb-service
- # Required-Start: vboxdrv
- # Required-Stop: vboxdrv
--# Default-Start: 2 3 4 5
-+# Default-Start: 2 3 5
- # Default-Stop: 0 1 6
- # Description: VirtualBox web service API
- ### END INIT INFO
-@@ -50,7 +50,7 @@ if [ -f /etc/redhat-release ]; then
- PIDFILE="/var/lock/subsys/vboxweb-service"
- elif [ -f /etc/SuSE-release ]; then
- system=suse
-- PIDFILE="/var/lock/subsys/vboxweb-service"
-+ PIDFILE="/var/run/vboxweb-service"
- elif [ -f /etc/debian_version ]; then
- system=debian
- PIDFILE="/var/run/vboxweb-service"
|
|
[-]
[+]
|
Deleted |
virtualbox-patch-source.sh
^
|
| @@ -1,54 +0,0 @@
-#!/bin/bash
-
-REMOVE_DIRS=(
-src/VBox/Additions/WINNT
-src/VBox/Additions/os2
-kBuild/bin
-kBuild/msgstyles
-kBuild/tools
-kBuild/sdks
-tools/darwin.x86
-tools/darwin.amd64
-tools/freebsd.x86
-tools/os2.x86
-tools/solaris.x86
-tools/solaris.amd64
-tools/win.amd64
-tools/win.x86
-tools/linux.x86
-tools/linux.amd64
-)
-
-set -o errexit
-
-CMDNAME=${0##*/}
-SOURCEDIR=${0%$CMDNAME}
-
-BASENAME=${1%.tar.bz2}
-
-trap "rm -rf \"$BASENAME-patched.tar\" \"$BASENAME-patched.tar.bz2\"" ERR
-
-for (( N=0 ; N<${#REMOVE_DIRS[@]} ; N++ )) ; do
- #REMOVE_DIRS[N]="$BASENAME/${REMOVE_DIRS[N]}"
- # use a wildcard because VirtualBox-1.6.0-OSE != VirtualBox-1.6.0_OSE
- REMOVE_DIRS[N]="*/${REMOVE_DIRS[N]}"
-done
-
-cd "$SOURCEDIR" >/dev/null
-
-if ! test -f "$BASENAME.tar.bz2" ; then
- exit 0
-fi
-
-if test -f "$BASENAME-patched.tar.bz2" ; then
- if test "$BASENAME.tar.bz2" -ot "$BASENAME-patched.tar.bz2" ; then
- if test $CMDNAME -ot "$BASENAME-patched.tar.bz2" ; then
- exit 0
- fi
- fi
-fi
-
-cp -a "$BASENAME.tar.bz2" "$BASENAME-patched.tar.bz2"
-bunzip2 "$BASENAME-patched.tar.bz2"
-tar --wildcards --delete -f "$BASENAME-patched.tar" "${REMOVE_DIRS[@]}"
-bzip2 "$BASENAME-patched.tar"
|
|
|
Deleted |
VirtualBox-4.2.4.tar.bz2
^
|
|
[-]
[+]
|
Added |
_service
^
|
| @@ -0,0 +1,8 @@
+
+<services>
+ <service name="tar_git">
+ <param name="url">https://github.com/nemomobile-packages/virtualbox.git</param>
+ <param name="branch">master</param>
+ <param name="revision">f815b68ece8dcfffaa195985bd39417233b4fcd1</param>
+ </service>
+</services>
|
|
[-]
[+]
|
Deleted |
boss.conf
^
|
| @@ -1,3 +0,0 @@
-[checks]
-# This package includes the old suse changelog for historical purposes.
-check_package_is_complete_sources = warn
|
|
[-]
[+]
|
Deleted |
vboxservice.service
^
|
| @@ -1,9 +0,0 @@
-[Unit]
-Description=VBoxService daemon for various aspects of guest control and time sync
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/VBoxService -f
-
-[Install]
-WantedBy=basic.target
|
|
[-]
[+]
|
Deleted |
virtualbox-4.2.4-UserManual.pdf
^
|
| @@ -1,52686 +0,0 @@
-%PDF-1.4
-%ÐÔÅØ
-1 0 obj
-<< /S /GoTo /D (chapter.1) >>
-endobj
-4 0 obj
-(1 First steps)
-endobj
-5 0 obj
-<< /S /GoTo /D (section.1.1) >>
-endobj
-8 0 obj
-(1.1 Why is virtualization useful?)
-endobj
-9 0 obj
-<< /S /GoTo /D (section.1.2) >>
-endobj
-12 0 obj
-(1.2 Some terminology)
-endobj
-13 0 obj
-<< /S /GoTo /D (section.1.3) >>
-endobj
-16 0 obj
-(1.3 Features overview)
-endobj
-17 0 obj
-<< /S /GoTo /D (section.1.4) >>
-endobj
-20 0 obj
-(1.4 Supported host operating systems)
-endobj
-21 0 obj
-<< /S /GoTo /D (section.1.5) >>
-endobj
-24 0 obj
-(1.5 Installing VirtualBox and extension packs)
-endobj
-25 0 obj
-<< /S /GoTo /D (section.1.6) >>
-endobj
-28 0 obj
-(1.6 Starting VirtualBox)
-endobj
-29 0 obj
-<< /S /GoTo /D (section.1.7) >>
-endobj
-32 0 obj
-(1.7 Creating your first virtual machine)
-endobj
-33 0 obj
-<< /S /GoTo /D (section.1.8) >>
-endobj
-36 0 obj
-(1.8 Running your virtual machine)
-endobj
-37 0 obj
-<< /S /GoTo /D (subsection.1.8.1) >>
-endobj
-40 0 obj
-(1.8.1 Starting a new VM for the first time)
-endobj
-41 0 obj
-<< /S /GoTo /D (subsection.1.8.2) >>
-endobj
-44 0 obj
-(1.8.2 Capturing and releasing keyboard and mouse)
-endobj
-45 0 obj
-<< /S /GoTo /D (subsection.1.8.3) >>
-endobj
-48 0 obj
-(1.8.3 Typing special characters)
-endobj
-49 0 obj
-<< /S /GoTo /D (subsection.1.8.4) >>
-endobj
-52 0 obj
-(1.8.4 Changing removable media)
-endobj
-53 0 obj
-<< /S /GoTo /D (subsection.1.8.5) >>
-endobj
-56 0 obj
-(1.8.5 Resizing the machine's window)
-endobj
-57 0 obj
-<< /S /GoTo /D (subsection.1.8.6) >>
-endobj
-60 0 obj
-(1.8.6 Saving the state of the machine)
-endobj
-61 0 obj
-<< /S /GoTo /D (section.1.9) >>
-endobj
-64 0 obj
-(1.9 Snapshots)
-endobj
-65 0 obj
-<< /S /GoTo /D (subsection.1.9.1) >>
-endobj
-68 0 obj
-(1.9.1 Taking, restoring and deleting snapshots)
-endobj
-69 0 obj
-<< /S /GoTo /D (subsection.1.9.2) >>
-endobj
-72 0 obj
-(1.9.2 Snapshot contents)
-endobj
-73 0 obj
-<< /S /GoTo /D (section.1.10) >>
-endobj
-76 0 obj
-(1.10 Virtual machine configuration)
-endobj
-77 0 obj
-<< /S /GoTo /D (section.1.11) >>
-endobj
-80 0 obj
-(1.11 Removing virtual machines)
-endobj
-81 0 obj
-<< /S /GoTo /D (section.1.12) >>
-endobj
-84 0 obj
-(1.12 Cloning virtual machines)
-endobj
-85 0 obj
-<< /S /GoTo /D (section.1.13) >>
-endobj
-88 0 obj
-(1.13 Importing and exporting virtual machines)
-endobj
-89 0 obj
-<< /S /GoTo /D (section.1.14) >>
-endobj
-92 0 obj
-(1.14 Alternative front-ends)
-endobj
-93 0 obj
-<< /S /GoTo /D (chapter.2) >>
-endobj
-96 0 obj
-(2 Installation details)
-endobj
-97 0 obj
-<< /S /GoTo /D (section.2.1) >>
-endobj
-100 0 obj
-(2.1 Installing on Windows hosts)
-endobj
-101 0 obj
-<< /S /GoTo /D (subsection.2.1.1) >>
-endobj
-104 0 obj
-(2.1.1 Prerequisites)
-endobj
-105 0 obj
-<< /S /GoTo /D (subsection.2.1.2) >>
-endobj
-108 0 obj
-(2.1.2 Performing the installation)
-endobj
-109 0 obj
-<< /S /GoTo /D (subsection.2.1.3) >>
-endobj
-112 0 obj
-(2.1.3 Uninstallation)
-endobj
-113 0 obj
-<< /S /GoTo /D (subsection.2.1.4) >>
-endobj
-116 0 obj
-(2.1.4 Unattended installation)
-endobj
-117 0 obj
-<< /S /GoTo /D (section.2.2) >>
-endobj
-120 0 obj
-(2.2 Installing on Mac OS X hosts)
-endobj
-121 0 obj
-<< /S /GoTo /D (subsection.2.2.1) >>
-endobj
-124 0 obj
-(2.2.1 Performing the installation)
-endobj
-125 0 obj
-<< /S /GoTo /D (subsection.2.2.2) >>
-endobj
-128 0 obj
-(2.2.2 Uninstallation)
-endobj
-129 0 obj
-<< /S /GoTo /D (subsection.2.2.3) >>
-endobj
-132 0 obj
-(2.2.3 Unattended installation)
|
|
[-]
[+]
|
Deleted |
virtualbox-4.2.4-rpmlintrc
^
|
| @@ -1,3 +0,0 @@
-addFilter("incoherent-init-script-name vboxdrv")
-addFilter("incoherent-init-script-name vboxadd")
-addFilter("xorg-x11-driver-virtualbox-ose.* shlib-policy-missing-suffix")
|
|
[-]
[+]
|
Deleted |
virtualbox-60-vboxdrv.rules
^
|
| @@ -1,5 +0,0 @@
-KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600"
-#these two lines give access permission to vboxusers to properly work with usb nodes, this could be security risk (bnc#664520) !!
-#
-#SUBSYSTEM=="usb_device",ATTR{devnum}=="?*",ATTR{busnum}=="?*",SYMLINK+="vboxusb/$attr{busnum}/$attr{devnum}",RUN+="/usr/bin/setfacl -m g:vboxusers:6 /dev/vboxusb/$attr{busnum}/$attr{devnum}"
-#SUBSYSTEM=="usb",ENV{DEVTYPE}=="usb_device",ATTR{devnum}=="?*",ATTR{busnum}=="?*",SYMLINK+="vboxusb/$attr{busnum}/$attr{devnum}",RUN+="/usr/bin/setfacl -m g:vboxusers:6 /dev/vboxusb/$attr{busnum}/$attr{devnum}"
|
|
[-]
[+]
|
Deleted |
virtualbox-60-vboxguest.rules
^
|
| @@ -1,2 +0,0 @@
-KERNEL=="vboxguest", NAME="vboxguest", OWNER="root", MODE="0660" ENV{ID_INPUT}="1", ENV{ID_INPUT_MOUSE}="1"
-KERNEL=="vboxuser", NAME="vboxuser", OWNER="root", GROUP="users", MODE="0660"
|
|
[-]
[+]
|
Deleted |
virtualbox-LocalConfig.kmk
^
|
| @@ -1,11 +0,0 @@
-VBOX_WITH_TESTCASES =
-VBOX_WITH_TESTSUITE =
-VBOX_WITH_ORIGIN :=
-VBOX_WITH_REGISTRATION_REQUEST =
-VBOX_WITH_UPDATE_REQUEST =
-VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox
-VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH)
-VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH)
-VBOX_PATH_APP_PRIVATE = /usr/share/virtualbox
-VBOX_PATH_APP_DOCS := /usr/share/doc/packages/virtualbox
-VBOX_WITH_REGISTRATION_REQUEST =
|
|
[-]
[+]
|
Deleted |
virtualbox-default.virtualbox
^
|
| @@ -1,16 +0,0 @@
-# /etc/default/virtualbox
-#
-# -------------------------------------------------------------------------------------------------
-# In the "SHUTDOWN_USERS" list all users for which a check for runnings VMs should be done during
-# shutdown of "vboxdrv" resp. the server:
-# SHUTDOWN_USERS="foo bar"
-#
-# Set "SHUTDOWN" to one of "poweroff", "acpibutton" or "savestate" depending on which of the
-# shutdown methods for running VMs are wanted:
-# SHUTDOWN="poweroff"
-# SHUTDOWN="acpibutton"
-# SHUTDOWN="savestate"
-# -------------------------------------------------------------------------------------------------
-#
-#SHUTDOWN_USERS="foo bar"
-#SHUTDOWN="savestate"
|
|
[-]
[+]
|
Deleted |
virtualbox-guest-kmp-files
^
|
| @@ -1,6 +0,0 @@
-%defattr (-,root,root)
-%dir /lib/modules/%2-%1/
-%dir /lib/modules/%2-%1/updates
-/lib/modules/%2-%1/updates/vboxsf.ko
-/lib/modules/%2-%1/updates/vboxvideo.ko
-/lib/modules/%2-%1/updates/vboxguest.ko
|
|
[-]
[+]
|
Deleted |
virtualbox-guest-preamble
^
|
| @@ -1,8 +0,0 @@
-Requires: kernel-%1
-Provides: virtualbox-guest-kmp = %version
-#rename from ose version:
-Provides: virtualbox-ose-guest-kmp-%1 = %version
-Obsoletes: virtualbox-ose-guest-kmp-%1 < %version
-#host (vboxdrv) and guest (vboxguest) kmp exports the same symbol (RTMemFreeEx)
-#which break loading modules using modprobe (bnc#661740)
-Conflicts: virtualbox-ose-host-kmp
|
|
[-]
[+]
|
Deleted |
virtualbox-host-kmp-files
^
|
| @@ -1,7 +0,0 @@
-%defattr (-,root,root)
-%dir /lib/modules/%2-%1/
-%dir /lib/modules/%2-%1/updates
-/lib/modules/%2-%1/updates/vboxdrv.ko
-/lib/modules/%2-%1/updates/vboxnetadp.ko
-/lib/modules/%2-%1/updates/vboxnetflt.ko
-/lib/modules/%2-%1/updates/vboxpci.ko
|
|
[-]
[+]
|
Deleted |
virtualbox-host-preamble
^
|
| @@ -1,8 +0,0 @@
-Requires: kernel-%1
-Provides: virtualbox-host-kmp = %version
-#rename from ose version:
-Provides: virtualbox-ose-host-kmp-%1 = %version
-Obsoletes: virtualbox-ose-host-kmp-%1 < %version
-#host (vboxdrv) and guest (vboxguest) kmp exports the same symbol (RTMemFreeEx)
-#which break loading modules using modprobe (bnc#661740)
-Conflicts: virtualbox-ose-guest-kmp
|
|
[-]
[+]
|
Deleted |
virtualbox-sysconfig.vbox
^
|
| @@ -1,23 +0,0 @@
-## Path: System/Virtual Machines/VBox
-## Description: Virtual box machines to autostart during boot
-## Type: string
-## Default: ""
-#
-# Configuration file for the script /etc/init.d/vboxes
-#
-# The variable VBOX_AUTOSTART holds the virtual machines to be started during
-# boot time. One entry must contain the virtual machine name and the
-# virtual machine owner. They are separated with a ";". Multiple entries
-# (virtual machines) are separated with a space.
-#
-# Examples:
-# MachineName1;user1
-#
-# One virtual machine:
-# openSUSE_Factory;vbox
-#
-# Multiple virtual machines:
-# openSUSE_Factory;vbox openSUSE_stable;suse
-#
-VBOX_AUTOSTART=""
-
|
|
[-]
[+]
|
Deleted |
virtualbox-vboxes
^
|
| @@ -1,307 +0,0 @@
-#!/bin/sh
-#
-# chkconfig: - 91 35
-# description: Starts and stops vbox autostart VMs.
-# Based on
-# http://www.amiryan.org/2009/11/04/virtualbox-init-d-service-autostart-scriptu
-#
-# By Richard Bos <rbos at opensuse dot org> - May 2010
-
-### BEGIN INIT INFO
-# Provides: vboxes
-# Required-Start: $network vboxdrv
-# Required-Stop: $network $named
-# Default-Start: 3 5
-# Default-Stop: 0 1 2 3 4 5 6
-# Short-Description: Autostart Virtual Box VMs
-# Description: Autostart Virtual Box VMs that are mentioned in /etc/sysconfig/vbox file
-### END INIT INFO
-
-# Shell functions sourced from /etc/rc.status:
-# rc_check check and set local and overall rc status
-# rc_status check and set local and overall rc status
-# rc_status -v be verbose in local rc status and clear it afterwards
-# rc_status -v -r ditto and clear both the local and overall rc status
-# rc_status -s display "skipped" and exit with status 3
-# rc_status -u display "unused" and exit with status 3
-# rc_failed set local and overall rc status to failed
-# rc_failed <num> set local and overall rc status to <num>
-# rc_reset clear both the local and overall rc status
-# rc_exit exit appropriate to overall rc status
-# rc_active checks whether a service is activated by symlinks
-. /etc/rc.status
-
-# Reset status of this service
-rc_reset
-
-# Return values acc. to LSB for all commands but status:
-# 0 - success
-# 1 - generic or unspecified error
-# 2 - invalid or excess argument(s)
-# 3 - unimplemented feature (e.g. "reload")
-# 4 - user had insufficient privileges
-# 5 - program is not installed
-# 6 - program is not configured
-# 7 - program is not running
-# 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl)
-#
-# Note that starting an already running service, stopping
-# or restarting a not-running service as well as the restart
-# with force-reload (in case signaling is not supported) are
-# considered a success.
-
-VBOXMGR_BIN=/usr/lib/virtualbox/VBoxManage
-if [[ ! -x $VBOXMGR_BIN ]]; then
- echo "$VBOXMGR_BIN does not exist"
- if [ "$1" = "stop" ]; then
- exit 0;
- else
- exit 6
- fi;
-fi
-
-VBOXHeadLess_BIN=/usr/lib/virtualbox/VBoxHeadless
-if [[ ! -x $VBOXHeadLess_BIN ]]; then
- echo "$VBOXHeadLess_BIN does not exist"
- if [ "$1" = "start" ]; then
- exit 6;
- else
- exit 0
- fi;
-fi
-
-PRG=$(basename $0)
-SERVICE="Virtualbox machines"
-
-[ -r /etc/sysconfig/vbox ] && . /etc/sysconfig/vbox
-
-start() {
-
- N=1
- for VBOX in $VBOX_AUTOSTART; do
-
- if grep -q \; <<< "$VBOX"; then
- VBOX_NAME[$N]=$(cut -d\; -f1 <<< "$VBOX")
- VBOX_USER[$N]=$(cut -d\; -f2 <<< "$VBOX")
- else
- VBOX_NAME[$N]="$VBOX"
- VBOX_USER[$N]=""
- fi
- N=$(($N+1))
- done
-
- VBOXES=${#VBOX_NAME[*]}
-
- if [ $VBOXES -eq 0 ]; then
- # The virtual machines have to be configured in /etc/sysconfig/vbox
- echo -n "Starting $SERVICE: no virtual machines configured"
- rc_status -u
- else
-
- N=1
- echo -n "Starting $SERVICE: "
- while [[ $N -le $VBOXES ]]; do
- if [[ $N -lt $VBOXES ]]; then
- echo -n "${VBOX_NAME[$N]} (user: ${VBOX_USER[$N]}), "
- else
- echo "${VBOX_NAME[$N]} (user: ${VBOX_USER[$N]})"
- fi
- N=$(($N+1))
- done
-
- N=1
- while [[ $N -le $VBOXES ]]; do
-
- if [[ -n "${VBOX_USER[$N]}" ]]; then
-
- if grep --quiet --word-regexp ${VBOX_USER[$N]} /etc/passwd; then
-
- # The tag "Name:" occurs in multiple sections. Require at least 7 blanks
- # with an additional flexible amount of spaces. At the moment of writing
- # 13 spaces are needed.
- VBOX_RUNNING=$(su ${VBOX_USER[$N]} -c "VBoxManage list --long runningvms" |
- sed -n 's/^Name:[[:blank:]]\{7\} *//p' | grep -w "${VBOX_NAME[$N]}")
-
- if [[ -z "$VBOX_RUNNING" ]]; then
-
- VBOX_PRESENT=$(su ${VBOX_USER[$N]} -c "$VBOXMGR_BIN list --long vms" |
- sed -n 's/^Name:[[:blank:]]\{7\} *//p' | grep -w "${VBOX_NAME[$N]}")
-
- if [[ -n "$VBOX_PRESENT" ]]; then
-
- # VBoxManage startvm does not result in a VM with working networking
- # su ${VBOX_USER[$N]} -c "$VBOXMGR_BIN -q startvm "${VBOX_NAME[$N]}" -type headless" > /tmp/$PRG.$$ 2>&1
- # Start virtualbox in Headless mode
- su ${VBOX_USER[$N]} -c "$VBOXHeadLess_BIN --startvm "${VBOX_NAME[$N]}"" > /tmp/$PRG.$$ 2>&1 &
- RETVAL=$?
-
- if [[ $RETVAL == 0 ]]; then
- echo -n " Starting virtual machine: ${VBOX_NAME[$N]} (user: ${VBOX_USER[$N]})"
- rc_status -v -r
- else
- echo -n " Starting virtual machine: ${VBOX_NAME[$N]} (user: ${VBOX_USER[$N]}) failed with the following output: "
- rc_failed; rc_status -v -r
- # Give the VBOXHeadLess_BIN some time to write the output file
- sleep 2
- cat /tmp/$PRG.$$
- fi
-
- rm /tmp/$PRG.$$
-
- else
- echo -n " Virtual machine: ${VBOX_NAME[$N]} (user: ${VBOX_USER[$N]}) does not exist"
- rc_status -s -r
- fi
-
- else
- echo -n " Virtual machine: ${VBOX_NAME[$N]} (user: ${VBOX_USER[$N]}) is already running"
- rc_status -v -r
- fi
-
- else
- echo -n " Virtual machine: ${VBOX_NAME[$N]}, VBOX_USER: ${VBOX_USER[$N]} does not exist"
- rc_status -s -r
- fi
-
- else
- echo -n " Virtual machine: ${VBOX_NAME[$N]}: VBOX_USER not configured"
- rc_status -s -r
- fi
-
- N=$(($N+1))
- done
- fi
-}
-
-stop() {
-
- for VBOX in $VBOX_AUTOSTART; do
-
- if grep -q \; <<< "$VBOX"; then
- VBOX_USER=$(cut -d\; -f2 <<< "$VBOX")
-
- # Only add the user to the list, if not present yet
- if ! grep -qw "$VBOX_USER" <<< "$VBOX_USERS"; then
- VBOX_USERS="$VBOX_USERS $VBOX_USER"
- fi
- fi
- done
-
- N=1
- for VBOX_USER in $VBOX_USERS; do
- VBOX_RUNNING=$(su $VBOX_USER -c "$VBOXMGR_BIN list --long runningvms" |
- sed -n 's/^Name:[[:blank:]]\{7\} *//p')
- for VBOX in $VBOX_RUNNING; do
- VBOX_NAME[$N]="$VBOX"
- VBOX_USER[$N]="$VBOX_USER"
- N=$(($N+1))
- done
- done
|
|
[-]
[+]
|
Deleted |
virtualbox-wrapper.sh
^
|
| @@ -1,4 +0,0 @@
-#!/bin/bash
-export QT_NO_KDE_INTEGRATION=1
-/usr/bin/id -nG | grep -v -e "root" -e "vboxusers" >/dev/null && /usr/lib/virtualbox/VBoxPermissionMessage && exit
-LD_LIBRARY_PATH="/usr/lib/virtualbox${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" /usr/lib/virtualbox/VirtualBox $@
|
|
[-]
[+]
|
Deleted |
virtualbox.changes_suse
^
|
| @@ -1,2798 +0,0 @@
--------------------------------------------------------------------
-Thu Sep 27 07:47:14 UTC 2012 - idonmez@suse.com
-
-- Add virtualbox-kernel-3.6.patch to fix compilation with 3.6 kernel
-
--------------------------------------------------------------------
-Tue Jun 26 14:02:32 UTC 2012 - mvyskocil@suse.cz
-
-- let it build with all versions of openjdk
-
--------------------------------------------------------------------
-Thu Jun 21 20:01:20 UTC 2012 - mseben@gmail.com
-
-- update to virtualbox 4.1.18 (This is a maintenance release)
-* VMM: fixed VERR_REM_VIRTUAL_CPU_ERROR under rare conditions after the guest has been reset (bug #5164 and others)
-* VMM: fixed host freezes with 64-bit guests on 32-bit Linux hosts (bug #10528)
-* VRDP: added a workaround for rdesktop clients not properly updating the screen size when minimized
-* AHCI: fixed a rare bug which can cause a guest memory corruption after the guest storage controler has been reset
-* NAT: another attempt to fix crashes under rare conditions (Windows hosts only; bug #10513)
-* Mac OS X hosts: addressed issues running Leopard / Snow Leopard (bug #10631)
-* Linux hosts / Bridged Networking: fixed the problem with device driver unloading on kernels 3.2.18 and newer due to an invalid reference counter (bug #10624)
-* Linux hosts / guests: Linux 3.5-rc1 fixes
-* Linux Additions: the guest content was sometimes not properly updated (bug #9887)
-* Solaris Additions: installer fix for X.org Server 1.11 and 1.12
-
--------------------------------------------------------------------
-Fri Jun 1 20:00:15 UTC 2012 - mseben@gmail.com
-
-- use proper version of vboxvideo xorg driver (vboxvideo_drv_112)
- for 12.2 release
-- adjust udev rules for vboxuser device on guest machine (file virtualbox-60-vboxguest.rules)
-
--------------------------------------------------------------------
-Thu May 24 08:37:37 UTC 2012 - mseben@gmail.com
-
-- update to virtualbox 4.1.16 (This is a maintenance release)
-* VMM: fixed a Guru Meditation VERR_ACCESS_DENIED with certain guests (bugs #7589, #8247)
-* VMM: fixed a Guru Meditation VERR_PAGE_TABLE_NOT_PRESENT with Ubuntu 32-bit guests with nested paging enabled on AMD CPUs (bug #10183)
-* VMM: preserve segment limits and attributes when switching to unreal mode required for some legacy guests to work properly (VT-x without unrestricted guest execution only; bug #9941)
-* VMM: fixed a VM hang after a resume from pause / savestate with SMP guests in rare cases
-* 3D Support: several fixes for the Windows WDDM video driver crash
-* NAT: fixed a crash on attempt to process ICMP datagram under some circumstances (bug #10527)
-* Host-only Networking: lifted the maximal number of interfaces to 128 on Linux and Mac OS X hosts (there is no such limitation for Solaris and Windows hosts)
-* EFI: fixed wrong SEC/PEI Core entry point calculation (bug #10531)
-* VRDP: fixed a display update problem (bug #10503)
-* Main: set the proper VM state if savestate failed for some reason (bug #6189)
-* Main: more useful error message if a medium is inaccessible
-* VBoxManage: fixed controlvm savestate if the VM is already paused
-* Mac OS X hosts: addressed issues running on Mountain Lion Preview 3 (bug #10267)
-* Linux hosts: Linux 3.4 compile fixes
-* Linux hosts: fixed wrong help path in some rpm-based packages (bug #10418)
-* Guest Additions: fixed handling of custom environment variables during VBoxManage guestcontrol execute (bug #10581)
-* Windows Additions: fixed guest driver crash of VBoxSF in certain cases (4.1.10 regression, bug #10408)
-* Windows Additions: don't load the WDDM driver if 3D support is not available for Windows 8 guests to keep the guest maintainable in that case (still better to miss some features than providing a blank screen)
-* Solaris Additions: added support for X.org Server 1.11 and 1.12
-
--------------------------------------------------------------------
-Tue May 15 12:16:30 UTC 2012 - mseben@gmail.com
-
-- modify vboxadd-init-script.diff to fix issues with missing
- config file on guest [bnc#761923]
-
--------------------------------------------------------------------
-Sun Apr 29 16:02:54 UTC 2012 - mseben@gmail.com
-
-- use workaround for issue with kmk_sed and gcc4.7 http://svn.netlabs.org/kbuild/ticket/112,
- which breaks build, instead of kmk_sed use /usr/bin/sed
-
--------------------------------------------------------------------
-Sat Apr 28 19:38:57 UTC 2012 - mseben@gmail.com
-
-- update to virtualbox 4.1.14 (This is a maintenance release):
- * Network: fixed the problem with packets larger than MTU-4 when PCnet or PRO/1000 was bridged to certain types of adapters on OS X hosts (bug #3783)
- * NAT: fixed a segfault under rare circumstances
- * 3D Support: fixed Windows WDDM video driver crash for SMP guests (bugs #10200, #10331)
- * Windows Guest Additions, VRDP: fixed occasional text corruption (bug #3001)
-
--------------------------------------------------------------------
-Sat Apr 21 10:25:41 UTC 2012 - mseben@gmail.com
-
-- drop vbox-config.diff and use LocalConfig.kmk to properly define
- lib,app and doc paths (bnc#737525)
-
--------------------------------------------------------------------
-Wed Apr 4 09:21:39 UTC 2012 - mseben@gmail.com
-
-- deprecated vbox-visibility.diff and vbox-gsoap_ssl.diff
-- update to virtualbox 4.1.12 (This is a maintenance release):
- * VMM: fixed VERR_NOT_SUPPORTED and VERR_RAW_MODE_INVALID_SMP guru meditation due to an invalid reschedule to raw mode (bug #10370)
- * VMM: fixed PDMCritSectLeave guru meditation under rare circumstances with SMP guests
- * VMM: proper Math Fault handling with certain legacy guests (bug #9042)
- * NAT: fixed a socket leak under certain conditions
- * Storage: better sanity check against reading beyond end-of-file
- * Audio: fixed a crash in the NUL audio backend (bug #10374; 4.1.10 regression)
- * HGCM: fixed a crash during savestate under rare circumstances
- * VBoxSVC: several locking fixes
- * VBoxManage: return the correct error code if controlvm savestate failed (bug #10134)
- * Guest Additions: VBoxService should not crash on exit (bug #10326; 4.1.10 regression)
- * Windows Additions: set the correct time stamp when a file is closed (bug #6473)
- * Windows Additions: better help if the DirectX backups are not properly installed
- * Linux Additions: Linux 3.4-rc1 compile fixes
-
--------------------------------------------------------------------
-Sun Apr 1 05:48:40 UTC 2012 - mseben@gmail.com
-
-- added vbox-gsoap_ssl.diff to fix building websrv with ssl support
-- drop deprecated kernel-3.3.patch
-- update to virtualbox 4.1.10 (This is a maintenance release):
- * GUI: if 3D support on the host is not available for some reason, do not only disable this VM setting but also uncheck the checkbox
- * VMM: fixed a potential problem causing to schedule interrupts during SYSEXIT right after STI
- * VMM: fixed a potential guest memory corruption issue with page fusion
- * VMM: adjusted the module matching algorithm for page fusion a little, generally resulting in slightly more shared pages
- * Main: host interfaces no longer have "defaults" for IP address and network mask attributes
- * Main: don't depend on a password for certain guest control operations (bug #10030)
- * 3D Support: fixed Windows XP hosts support (4.1.8 regression; bugs #10071 and #10088)
- * 3D Support: rendering fixes for Linux hosts with NVIDIA graphics
- * 3D Support: fixed saved state issues (4.1.8 regression; bug #10126)
- * 3D Support: WDDM driver: fixed powershell_ise crashes (bug #10167), make WPF-based apps work with Aero enabled, fixed additional possible WinSAT crashes
- * VRDP: fixed remote clipboard compatibility issues with some clients
- * Storage: fixed a possible data corruption when compacting VDI or VHD images with snapshots (32-bit hosts only)
- * iSCSI: fixed crash when using incorrect credentials when authenticating with a LIO target (bug #10173)
- * Serial: don't abort in host mode under rare error conditions (non-Windows hosts only)
- * SDK: actually ship current C bindings
- * SDK: fixed the Java glue code for JDK 1.7.0 (bug #9848)
- * SDK: added Python example
- * Metrics: make metrics collection more robust regarding blocked VMs
- * Web service: added SSL/TLS support
- * VBoxShell: fixed Guest Additions information lookup
- * Solaris installer: fixed dependency checking while installing VirtualBox in a zone
- * Linux hosts/guests: Linux 3.3-rc1 compile fixes
- * Solaris hosts: fixed debug kernel panics while opening module CTF data (bug #9651)
- * Mac OS X hosts: fixed Python support on Lion
- * Linux Additions: make 3D passthrough work on OL/RHEL 6.2 (bug #10010)
- * Linux Additions: fixed missing implementation when copying shared folder data through kernel high memory (bug #9878)
- * Linux Additions: make sure all data is written when closing a memory mapped file on a shared folder
- * Linux Additions: added support for X.Org Server 1.12
- * Solaris Additions: fixed guest kernel driver to load properly on guest reboot (4.1.8 regression; bug #10113)
- * Solaris Additions: fixed missing 64-bit OpenGL library VBoxOGL.so (bug #10151)
- * Solaris Additions: fixed VBoxService import and start for Solaris 11 guests.
- * Windows Additions: some Windows 8 adaptions
- * Windows Additions: several fixes for shared folders (bug #9753)
- * Guest control: miscellaneous bugfixes
-
--------------------------------------------------------------------
-Sun Mar 18 08:18:34 UTC 2012 - mseben@gmail.com
-
-- use pie/fPIE for setuid binaries (vbox-fpie.diff) (bnc#743143)
-- clean up virtualbox-60-vboxdrv.rules and use fillup_only for vbox sysconfig file
-- added vbox-vboxweb-init-script.diff to use proper pid file and runlevels in vboxweb initscript
-
--------------------------------------------------------------------
-Wed Mar 14 20:45:06 UTC 2012 - mseben@gmail.com
-
-- enabled websrv feature, this feature is now provided by new subpackage virtualbox-websrv
-- added vbox-visibility.diff to fix websrv build (ommit -fvisibility=hidden gcc flag for gsoap related builds)
-
--------------------------------------------------------------------
-Thu Mar 8 15:16:01 UTC 2012 - idonmez@suse.com
-
-- Drop unnecessary xorg-x11-libs-32bit buildrequires
-- Fix build with linux kernel 3.3
-
--------------------------------------------------------------------
-Tue Feb 21 07:49:52 UTC 2012 - seife+obs@b1-systems.com
-
-- remove build date from VBoxSVC
-
--------------------------------------------------------------------
-Wed Dec 28 11:01:04 UTC 2011 - mseben@gmail.com
-
-- update to virtualbox 4.1.8
- * VMM: fixed VERR_MAP_FAILED during savestate under certain circumstances (bug #7929)
- * GUI: stop updating the VM status icons when the VM is paused (bug #8368)
- * VBoxManage: fixed wrong return code after startvm (bug #9642)
- * BIOS: fixed hang at launch of DOS applications generated by Clipper 5.3 (note that hardware virtualization may be required)
- * USB: fixed OS/2 boot hang when using recent USB drivers
- * NAT: increase maximum number of parallel connections making connections with port forwarding more robust (#8471)
- * Metrics: fixed potential problem with invalid access in guest metrics collection upon VM destruction
- * Main: don't crash if a medium is ejected twice (bug #9922)
- * VBoxSVC: fixed crash under rare circumstances (e.g. client crash)
- * VRDP: fixed screen freeze (bug #9620)
- * OVF/OVA: fixed broken disk images on import under rare circumstances
- * OVF/OVA: better error message when importing corrupted appliances
- * VMDK/VHD: fixed a possible corruption with host cache disabled when using snapshots under rare circumstances (bug #9749)
- * 3D Support: Fixed fullscreen mode issues for ATI graphics (bug #9775),
- * 3D Support: Windows Media Player rendering for XPDM-based Direct3D support (bug #8341).
- * 3D Support: Multiple fixes to XPDM and WDDM - based 3D support for Windows Guests and for 3D support in general
- * Linux hosts: fixes for Fedoras Linux 2.6.41 (bug #9948)
- * Linux hosts/guests: fixes for Linux 3.2 (bug #9743)
- * Solaris Additions: various shared folder fixes (bugs #9856, #9862, #9917)
- * Windows Additions: various fixes for Direct3D support (un)installation, added detection of missing or wrong Direct3D system files
-
-
--------------------------------------------------------------------
-Wed Dec 7 10:39:02 UTC 2011 - coolo@suse.com
-
-- fix license to be in spdx.org format
-
--------------------------------------------------------------------
|
|
|
Deleted |
yasm
^
|
