From: Jack Lange Date: Wed, 20 Apr 2011 03:07:10 +0000 (-0500) Subject: removed muxer X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=94c7ee057b065f64a3e2faa3df3150f72c99260b;hp=b45b6127e0af286c2dbd0c972a34bd88860a748a;p=palacios.git removed muxer --- diff --git a/palacios/include/palacios/vmm_muxer.h b/palacios/include/palacios/vmm_muxer.h deleted file mode 100644 index 1c50789..0000000 --- a/palacios/include/palacios/vmm_muxer.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * 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, Jack Lange - * Copyright (c) 2008, The V3VEE Project - * All rights reserved. - * - * Author: Jack Lange - * - * This is free software. You are permitted to use, - * redistribute, and modify it as specified in the file "V3VEE_LICENSE". - */ - -#ifndef __VMM_MUXER_H__ -#define __VMM_MUXER_H__ - -#ifdef __V3VEE__ - - -struct v3_vm_info; - - - -struct v3_vm_info * v3_get_foreground_vm(); -void v3_set_foreground_vm(struct v3_vm_info * vm); - - -int v3_add_mux_notification(int (*focus_change)(struct v3_vm_info * old_vm, struct v3_vm_info * new_vm)); - - -#endif - -#endif diff --git a/palacios/src/palacios/Makefile b/palacios/src/palacios/Makefile index 790280c..dd1b637 100644 --- a/palacios/src/palacios/Makefile +++ b/palacios/src/palacios/Makefile @@ -31,7 +31,6 @@ obj-y := \ vmm_binaries.o \ vmm_cpuid.o \ vmm_xml.o \ - vmm_muxer.o \ vmm_mem_hook.o \ vmm_mptable.o \ vmm_extensions.o \ diff --git a/palacios/src/palacios/vm_guest.c b/palacios/src/palacios/vm_guest.c index 9c37d7b..4ab0134 100644 --- a/palacios/src/palacios/vm_guest.c +++ b/palacios/src/palacios/vm_guest.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include @@ -526,10 +525,6 @@ static int info_hcall(struct guest_info * core, uint_t hcall_id, void * priv_dat int v3_init_vm(struct v3_vm_info * vm) { v3_cpu_arch_t cpu_type = v3_get_cpu_type(V3_Get_CPU()); - if (v3_get_foreground_vm() == NULL) { - v3_set_foreground_vm(vm); - } - #ifdef CONFIG_TELEMETRY diff --git a/palacios/src/palacios/vmm_host_events.c b/palacios/src/palacios/vmm_host_events.c index 432b9fb..3e6d09b 100644 --- a/palacios/src/palacios/vmm_host_events.c +++ b/palacios/src/palacios/vmm_host_events.c @@ -20,7 +20,6 @@ #include #include #include -#include int v3_init_host_events(struct v3_vm_info * vm) { struct v3_host_events * host_evts = &(vm->host_event_hooks); @@ -125,9 +124,6 @@ int v3_deliver_keyboard_event(struct v3_vm_info * vm, struct v3_host_events * host_evts = NULL; struct v3_host_event_hook * hook = NULL; - if (vm == NULL) { - vm = v3_get_foreground_vm(); - } host_evts = &(vm->host_event_hooks); @@ -150,9 +146,6 @@ int v3_deliver_mouse_event(struct v3_vm_info * vm, struct v3_host_events * host_evts = NULL; struct v3_host_event_hook * hook = NULL; - if (vm == NULL) { - vm = v3_get_foreground_vm(); - } host_evts = &(vm->host_event_hooks); @@ -175,9 +168,6 @@ int v3_deliver_timer_event(struct v3_vm_info * vm, struct v3_host_events * host_evts = NULL; struct v3_host_event_hook * hook = NULL; - if (vm == NULL) { - vm = v3_get_foreground_vm(); - } host_evts = &(vm->host_event_hooks); @@ -199,9 +189,6 @@ int v3_deliver_serial_event(struct v3_vm_info * vm, struct v3_host_events * host_evts = NULL; struct v3_host_event_hook * hook = NULL; - if (vm == NULL) { - vm = v3_get_foreground_vm(); - } host_evts = &(vm->host_event_hooks); @@ -225,9 +212,6 @@ int v3_deliver_console_event(struct v3_vm_info * vm, struct v3_host_events * host_evts = NULL; struct v3_host_event_hook * hook = NULL; - if (vm == NULL) { - vm = v3_get_foreground_vm(); - } host_evts = &(vm->host_event_hooks); @@ -250,9 +234,6 @@ int v3_deliver_packet_event(struct v3_vm_info * vm, struct v3_host_events * host_evts = NULL; struct v3_host_event_hook * hook = NULL; - if (vm == NULL) { - vm = v3_get_foreground_vm(); - } host_evts = &(vm->host_event_hooks); diff --git a/palacios/src/palacios/vmm_muxer.c b/palacios/src/palacios/vmm_muxer.c deleted file mode 100644 index 01e8169..0000000 --- a/palacios/src/palacios/vmm_muxer.c +++ /dev/null @@ -1,65 +0,0 @@ -/* - * 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, Jack Lange - * Copyright (c) 2008, The V3VEE Project - * All rights reserved. - * - * Author: Jack Lange - * - * This is free software. You are permitted to use, - * redistribute, and modify it as specified in the file "V3VEE_LICENSE". - */ - -#include -#include -#include - - - -static struct v3_vm_info * foreground_vm = NULL; - -// list of notification callbacks -static LIST_HEAD(cb_list); - - -struct mux_callback { - struct list_head cb_node; - - int (*focus_change)(struct v3_vm_info * old_vm, struct v3_vm_info * new_vm); -}; - - -struct v3_vm_info * v3_get_foreground_vm() { - return foreground_vm; -} - - -void v3_set_foreground_vm(struct v3_vm_info * vm) { - struct mux_callback * tmp_cb; - - list_for_each_entry(tmp_cb, &(cb_list), cb_node) { - tmp_cb->focus_change(foreground_vm, vm); - } - - foreground_vm = vm; -} - - -int v3_add_mux_notification(int (*focus_change)(struct v3_vm_info * old_vm, - struct v3_vm_info * new_vm)) { - - struct mux_callback * cb = (struct mux_callback *)V3_Malloc(sizeof(struct mux_callback)); - - cb->focus_change = focus_change; - - list_add(&(cb->cb_node), &cb_list); - - return 0; -}