From 2c7e2afdb548abb41ef3f9754041607a438725ab Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Wed, 21 Jun 2017 10:30:11 +0200 Subject: [PATCH] create the VMs with the right coreAmount --- src/plugins/vm/s4u_VirtualMachine.cpp | 2 +- src/surf/cpu_interface.cpp | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/plugins/vm/s4u_VirtualMachine.cpp b/src/plugins/vm/s4u_VirtualMachine.cpp index 070acd9610..ebae51c755 100644 --- a/src/plugins/vm/s4u_VirtualMachine.cpp +++ b/src/plugins/vm/s4u_VirtualMachine.cpp @@ -23,7 +23,7 @@ VirtualMachine::VirtualMachine(const char* name, s4u::Host* pm, int coreAmount) // Create a VCPU for this VM surf::CpuCas01* sub_cpu = dynamic_cast(pm->pimpl_cpu); - pimpl_cpu = surf_cpu_model_vm->createCpu(this, sub_cpu->getSpeedPeakList(), 1 /*cores*/); + pimpl_cpu = surf_cpu_model_vm->createCpu(this, sub_cpu->getSpeedPeakList(), coreAmount); if (sub_cpu->getPState() != 0) pimpl_cpu->setPState(sub_cpu->getPState()); diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index 6443263e07..282b59fda6 100644 --- a/src/surf/cpu_interface.cpp +++ b/src/surf/cpu_interface.cpp @@ -113,8 +113,6 @@ Cpu::Cpu(Model* model, simgrid::s4u::Host* host, lmm_constraint_t constraint, st for (double value : *speedPerPstate) { speedPerPstate_.push_back(value); } - - xbt_assert(model == surf_cpu_model_pm || core==1, "Currently, VM cannot be multicore"); } Cpu::~Cpu() = default; -- 2.20.1