ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-04-08 11:55:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vbox: factor out/extend common parts of vbox 4 & 5

Browse Source 
Issue #2059
This commit is contained in:
Alexander Boettcher 2016-08-16 17:18:48 +02:00 committed by Christian Helmuth
parent 32bb0e131c
commit 4dbfbdb7c4
8 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repos/ports/ports/virtualbox.hash
View File

@ -1 +1 @@
91cce27022768a9213a803ed6530319cc1228fb0
d2beb20e61ac2fa809c41a656e4b2c3c71ead4f6

4
repos/ports/ports/virtualbox.port
View File

@ -13,8 +13,10 @@ URL(virtualbox_sdk) := http://download.virtualbox.org/virtualbox/$(VERSION)/$(VI
DIR(virtualbox_sdk) := src/app/virtualbox_sdk
SHA(virtualbox_sdk) := 8f95a891a6cb5f712fcb0ed34f2b8bf6b1e59f4c
PATCHES_DIR := src/virtualbox/patches
PATCHES_DIR := src/virtualbox/patches
PATCHES_DIR_VBOX4 := src/virtualbox/patches
PATCHES := $(addprefix $(PATCHES_DIR)/, $(shell cat $(REP_DIR)/$(PATCHES_DIR)/series))
PATCHES += $(addprefix $(PATCHES_DIR_VBOX4)/, $(shell cat $(REP_DIR)/$(PATCHES_DIR_VBOX4)/series_common))
PATCH_OPT := -p1
$(call check_tool,xsltproc)

1
repos/ports/src/virtualbox/include/VBox/com/defs.h
View File

@ -14,6 +14,7 @@
#define BEGIN_COM_MAP(X)
#define COM_INTERFACE_ENTRY(X)
#define COM_INTERFACE_ENTRY2(X,Y)
#define COM_INTERFACE_ENTRY_AGGREGATE(X, Y)
#define END_COM_MAP()
#define HRESULT nsresult

1
repos/ports/src/virtualbox/include/VBox/com/ptr.h
View File

@ -60,6 +60,7 @@ class ComPtr {
}
bool isNull () const { return _obj == nullptr; }
bool isNotNull() const { return _obj != nullptr; }
T ** asOutParam() { return &_obj; }

12
repos/ports/src/virtualbox/include/xpcom/nsISupportsImpl.h
View File

@ -8,7 +8,15 @@
#define NS_DECL_CLASSINFO(x)
#define NS_IMPL_THREADSAFE_ADDREF(x)
#define NS_IMPL_THREADSAFE_RELEASE(x)
#define NS_IMPL_QUERY_INTERFACE1_CI(x, y)
#define NS_IMPL_CI_INTERFACE_GETTER1(x, y)
#define NS_IMPL_QUERY_INTERFACE1_CI(a, b)
#define NS_IMPL_QUERY_INTERFACE2_CI(a, b, c)
#define NS_IMPL_QUERY_INTERFACE3_CI(a, b, c, d)
#define NS_IMPL_QUERY_INTERFACE4_CI(a, b, c, d, e)
#define NS_IMPL_QUERY_INTERFACE5_CI(a, b, c, d, e, f)
#define NS_IMPL_CI_INTERFACE_GETTER1(a, b)
#define NS_IMPL_CI_INTERFACE_GETTER2(a, b, c)
#define NS_IMPL_CI_INTERFACE_GETTER3(a, b, c, d)
#define NS_IMPL_CI_INTERFACE_GETTER4(a, b, c, d, e)
#define NS_IMPL_CI_INTERFACE_GETTER5(a, b, c, d, e, f)
#endif

19
repos/ports/src/virtualbox/patches/series
View File

@ -1,28 +1,11 @@
acpi_drv.patch
audio.patch
dev_e1000.patch
eminternal.patch
iconv.patch
mouse.patch
pdm_driver.patch
poke.patch
sharedfolder_pagelist.patch
time-log-deadlock.patch
tm_retries.patch
ide.patch
vbox_inc.patch
vbox_main.patch
network.patch
vga_fb.patch
vga_vbva.patch
vmdk.patch
vmmdev.patch
avoid_yield.patch
serial.patch
rem_irq.patch
usb.patch
tm_smp.patch
posix.patch
hostservice.patch
vbox_dd.patch
ide.patch
force_ioapic.patch

17
repos/ports/src/virtualbox/patches/series_common Normal file
View File

@ -0,0 +1,17 @@
acpi_drv.patch
avoid_yield.patch
dev_e1000.patch
eminternal.patch
hostservice.patch
iconv.patch
mouse.patch
network.patch
pdm_driver.patch
poke.patch
posix.patch
rem_irq.patch
serial.patch
sharedfolder_pagelist.patch
time-log-deadlock.patch
tm_retries.patch
vmdk.patch

4
repos/ports/src/virtualbox/rt.cc
View File

@ -234,6 +234,10 @@ static void *alloc_mem(size_t cb, const char *pszTag, bool executable = false)
}
}
#ifndef RT_NO_THROW
/* not defined in vbox5, but this code is used by vbox4 and vbox5 */
#define RT_NO_THROW
#endif
/*
* Called by the recompiler to allocate executable RAM