[PULL v2 08/11] trace: remove control-vcpu.h