ehmry/genode
ehmry/genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vbox: config option for the virtual XHCI controller

Browse Source 
This commit adds the VirtualBox configuration option

<config xhci="yes">

to enable the virtual XHCI controller.

Fixes #2028
This commit is contained in:
Christian Prochaska 2016-06-27 17:04:34 +02:00 committed by Christian Helmuth
parent 09d43c0708
commit 761db4bc73
6 changed files with 92 additions and 49 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 @@
434544e3fb1278c4984c9b21e1b9b517ba7c3ab2
780be1d09ef36e1c287721473830c327cf2276a4

2
repos/ports/run/vbox_win.inc
View File

@ -148,7 +148,7 @@ append config_of_app {
<binary name="virtualbox" />
<resource name="RAM" quantum="1280M"/>}
append config_of_app "
<config ld_verbose=\"yes\" vbox_file=\"${vbox_file}\" vm_name=\"${flavor}\">"
<config ld_verbose=\"yes\" vbox_file=\"${vbox_file}\" vm_name=\"${flavor}\" xhci=\"yes\">"
append config_of_app {
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc">
<vfs>

31
repos/ports/run/virtualbox.run
View File

@ -7,7 +7,6 @@ set build_components {
core init virtualbox
drivers/framebuffer
drivers/timer
server/report_rom
}
source ${genode_dir}/repos/base/run/platform_drv.inc
@ -59,15 +58,9 @@ append_if [expr $use_ps2] config {
append_if [expr $use_usb] config {
<start name="usb_drv" priority="-1">
<resource name="RAM" quantum="7M"/>
<provides>
<service name="Input"/>
<service name="Usb"/>
</provides>
<provides><service name="Input"/></provides>
<config uhci="yes" ehci="yes" xhci="yes">
<hid/>
<raw>
<report devices="yes"/>
</raw>
</config>
</start>}
@ -111,19 +104,6 @@ append_if [expr $use_serial] config {
}
append config {
<start name="report_rom" priority="-1">
<resource name="RAM" quantum="1M"/>
<provides>
<service name="Report"/>
<service name="ROM"/>
</provides>
<config>
<rom>
<policy label="virtualbox -> usb_devices" report="foobar"/>
</rom>
</config>
</start>
<start name="virtualbox" priority="-2">
<resource name="RAM" quantum="448M"/>
<config vbox_file="test.vbox" vm_name="TestVM">
@ -140,13 +120,6 @@ append config {
</vfs>
</libc>
</config>
<route>
<service name="Report"><child name="report_rom" /></service>
<service name="ROM">
<if-arg key="label" value="usb_devices"/> <child name="report_rom"/>
</service>
<any-service> <parent/> <any-child /> </any-service>
</route>
</start>
</config>
}
@ -155,7 +128,7 @@ install_config $config
exec cp ${genode_dir}/repos/ports/run/test.vbox bin/.
set boot_modules { core init timer virtualbox test.iso test.vbox report_rom }
set boot_modules { core init timer virtualbox test.iso test.vbox }
# platform-specific modules
lappend_if [expr $use_usb] boot_modules usb_drv

10
repos/ports/src/virtualbox/README Normal file
View File

@ -0,0 +1,10 @@
VirtualBox configuration options
################################
XHCI controller
===============
The virtual XHCI controller can be enabled with the following
configuration option:
<config xhci="yes">

12
repos/ports/src/virtualbox/devxhci.cc
View File

@ -15,6 +15,7 @@
/* Genode includes */
#include <base/env.h>
#include <base/printf.h>
#include <os/attached_rom_dataspace.h>
#include <util/list.h>
/* qemu-usb includes */
@ -569,3 +570,14 @@ const PDMDEVREG g_DeviceXHCI =
/* u32VersionEnd */
PDM_DEVREG_VERSION
};
bool use_xhci_controller()
{
try {
Genode::Attached_rom_dataspace config("config");
return config.xml().attribute_value("xhci", false);
} catch (Genode::Rom_connection::Rom_connection_failed) {
return false;
}
}

84
repos/ports/src/virtualbox/patches/vbox_main.patch
View File

@ -1,5 +1,42 @@
vbox_main.patch
From: Christian Prochaska <christian.prochaska@genode-labs.com>
---
.../virtualbox/src/VBox/Main/include/ConsoleImpl.h | 18 ++-
.../virtualbox/src/VBox/Main/include/DisplayImpl.h | 8 +
.../src/VBox/Main/include/FramebufferImpl.h | 1
.../virtualbox/src/VBox/Main/include/MachineImpl.h | 2
.../src/VBox/Main/include/NetworkServiceRunner.h | 5 +
.../src/VBox/Main/include/ProgressProxyImpl.h | 2
.../virtualbox/src/VBox/Main/include/SessionImpl.h | 4 +
.../virtualbox/src/VBox/Main/src-all/EventImpl.cpp | 13 ++
.../VBox/Main/src-all/PCIDeviceAttachmentImpl.cpp | 4 -
.../src/VBox/Main/src-all/ProgressImpl.cpp | 13 +-
.../src/VBox/Main/src-all/VirtualBoxBase.cpp | 4 +
.../VBox/Main/src-client/BusAssignmentManager.cpp | 2
.../src/VBox/Main/src-client/ConsoleImpl.cpp | 116 +++++++++++++++++++-
.../src/VBox/Main/src-client/ConsoleImpl2.cpp | 51 +++++++--
.../src/VBox/Main/src-client/DisplayImpl.cpp | 19 +++
.../src/VBox/Main/src-client/GuestImpl.cpp | 8 +
.../src/VBox/Main/src-client/MouseImpl.cpp | 6 +
.../src/VBox/Main/src-client/SessionImpl.cpp | 11 ++
.../VBox/Main/src-client/VBoxDriversRegister.cpp | 6 +
.../src/VBox/Main/src-client/VMMDevInterface.cpp | 2
.../src/VBox/Main/src-server/ClientToken.cpp | 6 -
.../src/VBox/Main/src-server/DHCPServerImpl.cpp | 1
.../src/VBox/Main/src-server/MachineImpl.cpp | 35 ++++--
.../VBox/Main/src-server/MachineImplCloneVM.cpp | 2
.../src/VBox/Main/src-server/MediumImpl.cpp | 15 ++-
.../src/VBox/Main/src-server/MediumLock.cpp | 2
.../VBox/Main/src-server/NetworkAdapterImpl.cpp | 2
.../src/VBox/Main/src-server/SnapshotImpl.cpp | 3 -
.../src/VBox/Main/src-server/VRDEServerImpl.cpp | 11 +-
.../src/VBox/Main/src-server/VirtualBoxImpl.cpp | 8 +
src/app/virtualbox/src/VBox/Main/xml/Settings.cpp | 4 +
31 files changed, 311 insertions(+), 73 deletions(-)
diff --git a/src/app/virtualbox/src/VBox/Main/include/ConsoleImpl.h b/src/app/virtualbox/src/VBox/Main/include/ConsoleImpl.h
index 030a601..7fce453 100644
--- a/src/app/virtualbox/src/VBox/Main/include/ConsoleImpl.h
@ -324,9 +361,11 @@ index b43f5a6..6aef9df 100644
////////////////////////////////////////////////////////////////////////////////
//
diff --git a/src/app/virtualbox/src/VBox/Main/src-client/BusAssignmentManager.cpp b/src/app/virtualbox/src/VBox/Main/src-client/BusAssignmentManager.cpp
index 068bb79..3b6adb3 100644
--- a/src/app/virtualbox/src/VBox/Main/src-client/BusAssignmentManager.cpp
+++ b/src/app/virtualbox/src/VBox/Main/src-client/BusAssignmentManager.cpp
@@ -72,6 +72,8 @@
@@ -72,6 +72,8 @@ static const DeviceAssignmentRule aGenericRules[] =
{"usb-ohci", 0, 6, 0, 0},
{"usb-ehci", 0, 11, 0, 0},
@ -903,7 +942,7 @@ index 69e3109..3c534df 100644
alock.acquire();
if (pNewMediumAtt != pMediumAtt)
diff --git a/src/app/virtualbox/src/VBox/Main/src-client/ConsoleImpl2.cpp b/src/app/virtualbox/src/VBox/Main/src-client/ConsoleImpl2.cpp
index caed4be..6d02496 100644
index caed4be..19c3dc0 100644
--- a/src/app/virtualbox/src/VBox/Main/src-client/ConsoleImpl2.cpp
+++ b/src/app/virtualbox/src/VBox/Main/src-client/ConsoleImpl2.cpp
@@ -27,6 +27,7 @@
@ -999,7 +1038,7 @@ index caed4be..6d02496 100644
InsertConfigNode(pDevices, "AudioSniffer", &pDev);
InsertConfigNode(pDev, "0", &pInst);
InsertConfigNode(pInst, "Config", &pCfg);
@@ -2300,9 +2311,10 @@ int Console::configConstructorInner(PUVM pUVM, PVM pVM, AutoWriteLock *pAlock)
@@ -2300,6 +2311,7 @@ int Console::configConstructorInner(PUVM pUVM, PVM pVM, AutoWriteLock *pAlock)
/*
* AC'97 ICH / SoundBlaster16 audio / Intel HD Audio
*/
@ -1007,10 +1046,7 @@ index caed4be..6d02496 100644
BOOL fAudioEnabled = FALSE;
ComPtr<IAudioAdapter> audioAdapter;
hrc = pMachine->COMGETTER(AudioAdapter)(audioAdapter.asOutParam()); H();
if (audioAdapter)
hrc = audioAdapter->COMGETTER(Enabled)(&fAudioEnabled); H();
@@ -2421,6 +2435,8 @@ int Console::configConstructorInner(PUVM pUVM, PVM pVM, AutoWriteLock *pAlock)
@@ -2421,6 +2433,8 @@ int Console::configConstructorInner(PUVM pUVM, PVM pVM, AutoWriteLock *pAlock)
break;
}
#endif
@ -1019,10 +1055,20 @@ index caed4be..6d02496 100644
}
hrc = pMachine->COMGETTER(Name)(bstr.asOutParam()); H();
InsertConfigString(pCfg, "StreamName", bstr);
@@ -2537,6 +2537,14 @@
@@ -2523,7 +2537,6 @@ int Console::configConstructorInner(PUVM pUVM, PVM pVM, AutoWriteLock *pAlock)
#endif
} /* for every USB controller. */
-
/*
* Virtual USB Devices.
*/
@@ -2652,6 +2665,18 @@ int Console::configConstructorInner(PUVM pUVM, PVM pVM, AutoWriteLock *pAlock)
}
}
+ extern bool use_xhci_controller();
+ if (use_xhci_controller()) {
+ /*
+ * NEC XHCI Device
+ */
@ -1031,10 +1077,12 @@ index caed4be..6d02496 100644
+ InsertConfigNode(pInst, "Config", &pCfg);
+ InsertConfigInteger(pInst, "Trusted", 1);
+ hrc = pBusMgr->assignPCIDevice("nec-xhci", pInst); H();
/*
* Virtual USB Devices.
@@ -3533,6 +3549,8 @@ int Console::configMediumAttachment(PCFGMNODE pCtlInst,
+ }
+
/*
* Clipboard
*/
@@ -3533,6 +3558,8 @@ int Console::configMediumAttachment(PCFGMNODE pCtlInst,
ComPtr<IMedium> pMedium;
hrc = pMediumAtt->COMGETTER(Medium)(pMedium.asOutParam()); H();
@ -1043,7 +1091,7 @@ index caed4be..6d02496 100644
/*
* 1. Only check this for hard disk images.
* 2. Only check during VM creation and not later, especially not during
@@ -3717,6 +3735,8 @@ int Console::configMediumAttachment(PCFGMNODE pCtlInst,
@@ -3717,6 +3744,8 @@ int Console::configMediumAttachment(PCFGMNODE pCtlInst,
}
}
@ -1052,7 +1100,7 @@ index caed4be..6d02496 100644
if (pMedium)
{
BOOL fHostDrive;
@@ -3810,7 +3830,7 @@ int Console::configMedium(PCFGMNODE pLunL0,
@@ -3810,7 +3839,7 @@ int Console::configMedium(PCFGMNODE pLunL0,
// InsertConfig* throws
try
{
@ -1061,7 +1109,7 @@ index caed4be..6d02496 100644
HRESULT hrc;
Bstr bstr;
PCFGMNODE pLunL1 = NULL;
@@ -4414,7 +4434,7 @@ int Console::configNetwork(const char *pszDevice,
@@ -4414,7 +4443,7 @@ int Console::configNetwork(const char *pszDevice,
{
switch (hrc)
{
@ -1070,7 +1118,7 @@ index caed4be..6d02496 100644
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 "
@@ -4428,12 +4448,12 @@ int Console::configNetwork(const char *pszDevice,
@@ -4428,12 +4457,12 @@ int Console::configNetwork(const char *pszDevice,
}
}
@ -1086,7 +1134,7 @@ index caed4be..6d02496 100644
}
#elif defined(VBOX_WITH_NETFLT)
@@ -5206,6 +5206,10 @@
@@ -5180,6 +5209,10 @@ int Console::configNetwork(const char *pszDevice,
#undef H
@ -1096,7 +1144,7 @@ index caed4be..6d02496 100644
+
return VINF_SUCCESS;
}
diff --git a/src/app/virtualbox/src/VBox/Main/src-client/DisplayImpl.cpp b/src/app/virtualbox/src/VBox/Main/src-client/DisplayImpl.cpp
index fed0ac3..bc3c334 100644
--- a/src/app/virtualbox/src/VBox/Main/src-client/DisplayImpl.cpp