ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-02-06 19:20:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

virtualbox6: fix build errors with gcc 10

Browse Source 
Fixes #4105
This commit is contained in:
Christian Prochaska 2021-04-29 08:26:03 +02:00 committed by Norman Feske
parent 49392dfa44
commit fad85c3fd5
5 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1 +1 @@
aac8fe9dc30f5bc1488916af29e03d62199ac4ff 0cabc6a3f8e2884326dabeb1768916704dfdd115

1
repos/ports/src/virtualbox6/dummies.cc
View File

@ -210,6 +210,7 @@ RTDECL(int) RTSystemQueryTotalRam(uint64_t *pcb) STOP
/* HostDnsServiceResolvConf.cpp */ /* HostDnsServiceResolvConf.cpp */
#include <string>
#include "HostDnsService.h" #include "HostDnsService.h"
HostDnsServiceResolvConf::~HostDnsServiceResolvConf() { } HostDnsServiceResolvConf::~HostDnsServiceResolvConf() { }

6
repos/ports/src/virtualbox6/nem.cc
View File

@ -472,9 +472,9 @@ void nemHCNativeNotifyPhysPageProtChanged(PVMCC pVM, RTGCPHYS GCPhys, RTHCPHYS H
::uint8_t *pu2State) ::uint8_t *pu2State)
{ {
Sup::Nem::Protection const prot { Sup::Nem::Protection const prot {
.readable = fPageProt & NEM_PAGE_PROT_READ, .readable = (fPageProt & NEM_PAGE_PROT_READ) != 0,
.writeable = fPageProt & NEM_PAGE_PROT_WRITE, .writeable = (fPageProt & NEM_PAGE_PROT_WRITE) != 0,
.executable = fPageProt & NEM_PAGE_PROT_EXECUTE, .executable = (fPageProt & NEM_PAGE_PROT_EXECUTE) != 0,
}; };
/* /*

15
repos/ports/src/virtualbox6/patches/narrowing.patch Normal file
View File

@ -0,0 +1,15 @@
Fix 'narrowing conversion' error
diff --git a/src/virtualbox6/src/VBox/Main/src-client/ConsoleImpl2.cpp b/src/virtualbox6/src/VBox/Main/src-client/ConsoleImpl2.cpp
index 3693927..6975ed2 100644
--- a/src/virtualbox6/src/VBox/Main/src-client/ConsoleImpl2.cpp
+++ b/src/virtualbox6/src/VBox/Main/src-client/ConsoleImpl2.cpp
@@ -5262,7 +5262,7 @@ int Console::i_configNetwork(const char *pszDevice,
{
switch (hrc)
{
- case VERR_ACCESS_DENIED:
+ case E_ACCESSDENIED:
return VMSetError(VMR3GetVM(mpUVM), VERR_HOSTIF_INIT_FAILED, RT_SRC_POS, N_(
"Failed to open '/dev/net/tun' for read/write access. Please check the "
"permissions of that node. Either run 'chmod 0666 /dev/net/tun' or "

1
repos/ports/src/virtualbox6/patches/series
View File

@ -1,3 +1,4 @@
serial.patch serial.patch
drvtap.patch drvtap.patch
qemu-xhci.patch qemu-xhci.patch
narrowing.patch