ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-01-03 04:26:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vbox: adjust to 'pthread_attr' removal in pthread

Browse Source 
issue #2791
This commit is contained in:
Sebastian Sumpf 2018-04-26 14:58:57 +02:00 committed by Christian Helmuth
parent b4209cb3bb
commit df3e4edd76
13 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
repos/ports/src/virtualbox/accloff/sup.cc
View File

@ -82,7 +82,6 @@ int SUPR3CallVMMR0Ex(PVMR0 pVMR0, VMCPUID idCpu, unsigned
bool create_emt_vcpu(pthread_t * thread, size_t stack_size, bool create_emt_vcpu(pthread_t * thread, size_t stack_size,
const pthread_attr_t *attr,
void *(*start_routine)(void *), void *arg, void *(*start_routine)(void *), void *arg,
Genode::Cpu_session * cpu_session, Genode::Cpu_session * cpu_session,
Genode::Affinity::Location location, Genode::Affinity::Location location,

1
repos/ports/src/virtualbox/spec/muen/sup.cc
View File

@ -697,7 +697,6 @@ int SUPR3CallVMMR0Ex(PVMR0 pVMR0, VMCPUID idCpu, unsigned
bool create_emt_vcpu(pthread_t * thread, size_t stack_size, bool create_emt_vcpu(pthread_t * thread, size_t stack_size,
const pthread_attr_t *attr,
void *(*start_routine)(void *), void *arg, void *(*start_routine)(void *), void *arg,
Genode::Cpu_session * cpu_session, Genode::Cpu_session * cpu_session,
Genode::Affinity::Location location, Genode::Affinity::Location location,

5
repos/ports/src/virtualbox/spec/nova/sup.cc
View File

@ -286,7 +286,6 @@ void *operator new (__SIZE_TYPE__ size, int log2_align)
bool create_emt_vcpu(pthread_t * pthread, size_t stack, bool create_emt_vcpu(pthread_t * pthread, size_t stack,
const pthread_attr_t *attr,
void *(*start_routine)(void *), void *arg, void *(*start_routine)(void *), void *arg,
Genode::Cpu_session * cpu_session, Genode::Cpu_session * cpu_session,
Genode::Affinity::Location location, Genode::Affinity::Location location,
@ -305,13 +304,13 @@ bool create_emt_vcpu(pthread_t * pthread, size_t stack,
if (vmx) if (vmx)
vcpu_handler = new (0x10) Vcpu_handler_vmx(genode_env(), vcpu_handler = new (0x10) Vcpu_handler_vmx(genode_env(),
stack, attr, start_routine, stack, start_routine,
arg, cpu_session, location, arg, cpu_session, location,
cpu_id, name, pd_vcpus); cpu_id, name, pd_vcpus);
if (svm) if (svm)
vcpu_handler = new (0x10) Vcpu_handler_svm(genode_env(), vcpu_handler = new (0x10) Vcpu_handler_svm(genode_env(),
stack, attr, start_routine, stack, start_routine,
arg, cpu_session, location, arg, cpu_session, location,
cpu_id, name, pd_vcpus); cpu_id, name, pd_vcpus);

4
repos/ports/src/virtualbox/spec/nova/vcpu.h
View File

@ -767,7 +767,7 @@ class Vcpu_handler : public Vmm::Vcpu_dispatcher<Genode::Thread>,
}; };
Vcpu_handler(Genode::Env &env, size_t stack_size, const pthread_attr_t *attr, Vcpu_handler(Genode::Env &env, size_t stack_size,
void *(*start_routine) (void *), void *arg, void *(*start_routine) (void *), void *arg,
Genode::Cpu_session * cpu_session, Genode::Cpu_session * cpu_session,
Genode::Affinity::Location location, Genode::Affinity::Location location,
@ -776,7 +776,7 @@ class Vcpu_handler : public Vmm::Vcpu_dispatcher<Genode::Thread>,
: :
Vmm::Vcpu_dispatcher<Genode::Thread>(env, stack_size, cpu_session, Vmm::Vcpu_dispatcher<Genode::Thread>(env, stack_size, cpu_session,
location, name), location, name),
_pthread(*this, attr ? *attr : 0), _pthread(*this),
_start_routine(start_routine), _start_routine(start_routine),
_start_routine_arg(arg), _start_routine_arg(arg),
_vcpu(cpu_session, location, pd_vcpu), _vcpu(cpu_session, location, pd_vcpu),

4
repos/ports/src/virtualbox/spec/nova/vcpu_svm.h
View File

@ -94,14 +94,14 @@ class Vcpu_handler_svm : public Vcpu_handler
public: public:
Vcpu_handler_svm(Genode::Env &env, size_t stack_size, const pthread_attr_t *attr, Vcpu_handler_svm(Genode::Env &env, size_t stack_size,
void *(*start_routine) (void *), void *arg, void *(*start_routine) (void *), void *arg,
Genode::Cpu_session * cpu_session, Genode::Cpu_session * cpu_session,
Genode::Affinity::Location location, Genode::Affinity::Location location,
unsigned int cpu_id, const char * name, unsigned int cpu_id, const char * name,
Genode::Pd_session_capability pd_vcpu) Genode::Pd_session_capability pd_vcpu)
: :
Vcpu_handler(env, stack_size, attr, start_routine, arg, cpu_session, Vcpu_handler(env, stack_size, start_routine, arg, cpu_session,
location, cpu_id, name, pd_vcpu) location, cpu_id, name, pd_vcpu)
{ {
using namespace Nova; using namespace Nova;

4
repos/ports/src/virtualbox/spec/nova/vcpu_vmx.h
View File

@ -158,14 +158,14 @@ class Vcpu_handler_vmx : public Vcpu_handler
public: public:
Vcpu_handler_vmx(Genode::Env &env, size_t stack_size, const pthread_attr_t *attr, Vcpu_handler_vmx(Genode::Env &env, size_t stack_size,
void *(*start_routine) (void *), void *arg, void *(*start_routine) (void *), void *arg,
Genode::Cpu_session * cpu_session, Genode::Cpu_session * cpu_session,
Genode::Affinity::Location location, Genode::Affinity::Location location,
unsigned int cpu_id, const char * name, unsigned int cpu_id, const char * name,
Genode::Pd_session_capability pd_vcpu) Genode::Pd_session_capability pd_vcpu)
: :
Vcpu_handler(env, stack_size, attr, start_routine, arg, cpu_session, Vcpu_handler(env, stack_size, start_routine, arg, cpu_session,
location, cpu_id, name, pd_vcpu) location, cpu_id, name, pd_vcpu)
{ {
using namespace Nova; using namespace Nova;

1
repos/ports/src/virtualbox/sup.h
View File

@ -33,7 +33,6 @@ HRESULT genode_check_memory_config(ComObjPtr<Machine> machine);
* hardware acceleration support. * hardware acceleration support.
*/ */
bool create_emt_vcpu(pthread_t * pthread, size_t stack, bool create_emt_vcpu(pthread_t * pthread, size_t stack,
const pthread_attr_t *attr,
void *(*start_routine)(void *), void *arg, void *(*start_routine)(void *), void *arg,
Genode::Cpu_session * cpu_session, Genode::Cpu_session * cpu_session,
Genode::Affinity::Location location, Genode::Affinity::Location location,

9
repos/ports/src/virtualbox/thread.cc
View File

@ -89,7 +89,7 @@ static int create_thread(pthread_t *thread, const pthread_attr_t *attr,
Genode::Affinity::Space space = cpu_session->affinity_space(); Genode::Affinity::Space space = cpu_session->affinity_space();
Genode::Affinity::Location location(space.location_of_index(cpu_id)); Genode::Affinity::Location location(space.location_of_index(cpu_id));
if (create_emt_vcpu(thread, stack_size, attr, start_routine, arg, if (create_emt_vcpu(thread, stack_size, start_routine, arg,
cpu_session, location, cpu_id, rtthread->szName)) cpu_session, location, cpu_id, rtthread->szName))
return 0; return 0;
/* /*
@ -99,10 +99,9 @@ static int create_thread(pthread_t *thread, const pthread_attr_t *attr,
} }
pthread_t thread_obj = new (vmm_heap()) pthread_t thread_obj = new (vmm_heap())
pthread(attr ? *attr : 0, start_routine, pthread(start_routine, arg, stack_size, rtthread->szName,
arg, stack_size, rtthread->szName, cpu_connection(rtthread->enmType),
cpu_connection(rtthread->enmType), Genode::Affinity::Location());
Genode::Affinity::Location());
if (!thread_obj) if (!thread_obj)
return EAGAIN; return EAGAIN;

1
repos/ports/src/virtualbox5/accloff/sup.cc
View File

@ -84,7 +84,6 @@ int SUPR3CallVMMR0Ex(PVMR0 pVMR0, VMCPUID idCpu, unsigned
bool create_emt_vcpu(pthread_t * thread, size_t stack_size, bool create_emt_vcpu(pthread_t * thread, size_t stack_size,
const pthread_attr_t *attr,
void *(*start_routine)(void *), void *arg, void *(*start_routine)(void *), void *arg,
Genode::Cpu_session * cpu_session, Genode::Cpu_session * cpu_session,
Genode::Affinity::Location location, Genode::Affinity::Location location,

5
repos/ports/src/virtualbox5/spec/nova/sup.cc
View File

@ -772,7 +772,6 @@ void *operator new (__SIZE_TYPE__ size, int log2_align)
bool create_emt_vcpu(pthread_t * pthread, ::size_t stack, bool create_emt_vcpu(pthread_t * pthread, ::size_t stack,
const pthread_attr_t *attr,
void *(*start_routine)(void *), void *arg, void *(*start_routine)(void *), void *arg,
Genode::Cpu_session * cpu_session, Genode::Cpu_session * cpu_session,
Genode::Affinity::Location location, Genode::Affinity::Location location,
@ -791,13 +790,13 @@ bool create_emt_vcpu(pthread_t * pthread, ::size_t stack,
if (vmx) if (vmx)
vcpu_handler = new (0x10) Vcpu_handler_vmx(genode_env(), vcpu_handler = new (0x10) Vcpu_handler_vmx(genode_env(),
stack, attr, start_routine, stack, start_routine,
arg, cpu_session, location, arg, cpu_session, location,
cpu_id, name, pd_vcpus); cpu_id, name, pd_vcpus);
if (svm) if (svm)
vcpu_handler = new (0x10) Vcpu_handler_svm(genode_env(), vcpu_handler = new (0x10) Vcpu_handler_svm(genode_env(),
stack, attr, start_routine, stack, start_routine,
arg, cpu_session, location, arg, cpu_session, location,
cpu_id, name, pd_vcpus); cpu_id, name, pd_vcpus);

4
repos/ports/src/virtualbox5/spec/nova/vcpu.h
View File

@ -788,7 +788,7 @@ class Vcpu_handler : public Vmm::Vcpu_dispatcher<Genode::Thread>,
}; };
Vcpu_handler(Genode::Env &env, size_t stack_size, const pthread_attr_t *attr, Vcpu_handler(Genode::Env &env, size_t stack_size,
pthread::start_routine_t start_routine, void *arg, pthread::start_routine_t start_routine, void *arg,
Genode::Cpu_session * cpu_session, Genode::Cpu_session * cpu_session,
Genode::Affinity::Location location, Genode::Affinity::Location location,
@ -797,7 +797,7 @@ class Vcpu_handler : public Vmm::Vcpu_dispatcher<Genode::Thread>,
: :
Vmm::Vcpu_dispatcher<Genode::Thread>(env, stack_size, cpu_session, Vmm::Vcpu_dispatcher<Genode::Thread>(env, stack_size, cpu_session,
location, name), location, name),
_pthread(*this, attr ? *attr : 0), _pthread(*this),
_start_routine(start_routine), _start_routine(start_routine),
_start_routine_arg(arg), _start_routine_arg(arg),
_vcpu(cpu_session, location, pd_vcpu), _vcpu(cpu_session, location, pd_vcpu),

4
repos/ports/src/virtualbox5/spec/nova/vcpu_svm.h
View File

@ -84,14 +84,14 @@ class Vcpu_handler_svm : public Vcpu_handler
public: public:
Vcpu_handler_svm(Genode::Env &env, size_t stack_size, const pthread_attr_t *attr, Vcpu_handler_svm(Genode::Env &env, size_t stack_size,
void *(*start_routine) (void *), void *arg, void *(*start_routine) (void *), void *arg,
Genode::Cpu_session * cpu_session, Genode::Cpu_session * cpu_session,
Genode::Affinity::Location location, Genode::Affinity::Location location,
unsigned int cpu_id, const char * name, unsigned int cpu_id, const char * name,
Genode::Pd_session_capability pd_vcpu) Genode::Pd_session_capability pd_vcpu)
: :
Vcpu_handler(env, stack_size, attr, start_routine, arg, cpu_session, Vcpu_handler(env, stack_size, start_routine, arg, cpu_session,
location, cpu_id, name, pd_vcpu) location, cpu_id, name, pd_vcpu)
{ {
using namespace Nova; using namespace Nova;

4
repos/ports/src/virtualbox5/spec/nova/vcpu_vmx.h
View File

@ -169,14 +169,14 @@ class Vcpu_handler_vmx : public Vcpu_handler
public: public:
Vcpu_handler_vmx(Genode::Env &env, size_t stack_size, const pthread_attr_t *attr, Vcpu_handler_vmx(Genode::Env &env, size_t stack_size,
void *(*start_routine) (void *), void *arg, void *(*start_routine) (void *), void *arg,
Genode::Cpu_session * cpu_session, Genode::Cpu_session * cpu_session,
Genode::Affinity::Location location, Genode::Affinity::Location location,
unsigned int cpu_id, const char * name, unsigned int cpu_id, const char * name,
Genode::Pd_session_capability pd_vcpu) Genode::Pd_session_capability pd_vcpu)
: :
Vcpu_handler(env, stack_size, attr, start_routine, arg, cpu_session, Vcpu_handler(env, stack_size, start_routine, arg, cpu_session,
location, cpu_id, name, pd_vcpu) location, cpu_id, name, pd_vcpu)
{ {
using namespace Nova; using namespace Nova;