X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_halt.c;h=5316edc965437f1aa6edcde1c5b701f4430139c1;hb=3cd1d3771e3f8e30b09f6c4995851979aaafc5ff;hp=9b95739be2c35325ed31927f44967129ac0b4103;hpb=f9bb3db89469169bb5775dc031d89e570c6fed70;p=palacios.git diff --git a/palacios/src/palacios/svm_halt.c b/palacios/src/palacios/svm_halt.c index 9b95739..5316edc 100644 --- a/palacios/src/palacios/svm_halt.c +++ b/palacios/src/palacios/svm_halt.c @@ -1,17 +1,44 @@ -/* Northwestern University */ -/* (c) 2008, Peter Dinda */ +/* + * This file is part of the Palacios Virtual Machine Monitor developed + * by the V3VEE Project with funding from the United States National + * Science Foundation and the Department of Energy. + * + * The V3VEE Project is a joint project between Northwestern University + * and the University of New Mexico. You can find out more at + * http://www.v3vee.org + * + * Copyright (c) 2008, Peter Dinda + * Copyright (c) 2008, Jack Lange + * Copyright (c) 2008, The V3VEE Project + * All rights reserved. + * + * Author: Peter Dinda + * + * This is free software. You are permitted to use, + * redistribute, and modify it as specified in the file "V3VEE_LICENSE". + */ + + + + + #include #include -// From GeekOS -void Yield(void); + + +#ifndef DEBUG_HALT +#undef PrintDebug +#define PrintDebug(fmt, args...) +#endif + // // This should trigger a #GP if cpl!=0, otherwise, yield to host // -int handle_svm_halt(struct guest_info * info) +int v3_handle_svm_halt(struct guest_info * info) { if (info->cpl!=0) { v3_raise_exception(info, GPF_EXCEPTION); @@ -30,7 +57,7 @@ int handle_svm_halt(struct guest_info * info) PrintDebug("GeekOS Yield\n"); rdtscll(yield_start); - Yield(); + V3_Yield(); rdtscll(yield_stop);