X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2Fpalacios.h;h=bd014304d7c9845c7d37b0256c91a11e84ec2f73;hb=8792ea4ea6462c30e016293fbbd2659b3befdad4;hp=b1618320f782c10ac887acdae90b2516603dcdac;hpb=af8e64fe97d7e075fdc1db893e9bcb550e38db91;p=palacios.git diff --git a/linux_module/palacios.h b/linux_module/palacios.h index b161832..bd01430 100644 --- a/linux_module/palacios.h +++ b/linux_module/palacios.h @@ -6,9 +6,6 @@ #include #include -#ifdef V3_CONFIG_CONSOLE -#include "palacios-console.h" -#endif #ifdef V3_CONFIG_GRAPHICS_CONSOLE #include "palacios-graphics-console.h" @@ -29,10 +26,10 @@ #define V3_VM_STREAM_CONNECT 21 #define V3_VM_STOP 22 -#define V3_VM_FB_INPUT 256+1 -#define V3_VM_FB_QUERY 256+2 +#define V3_VM_FB_INPUT (256+1) +#define V3_VM_FB_QUERY (256+2) -#define V3_VM_HOST_DEV_CONNECT 512+1 +#define V3_VM_HOST_DEV_CONNECT (10244+1) struct v3_guest_img { @@ -64,15 +61,15 @@ struct v3_guest { char name[128]; - struct list_head files; + + struct rb_root vm_ctrls; + struct list_head exts; + struct list_head streams; struct list_head sockets; -#ifdef V3_CONFIG_CONSOLE - struct palacios_console console; -#endif -#ifdef V3_CONFIG_CONSOLE +#ifdef V3_CONFIG_GRAPHICS_CONSOLE struct palacios_graphics_console graphics_console; #endif