From: Jack Lange Date: Tue, 25 May 2010 21:35:57 +0000 (-0500) Subject: Merge branch 'devel' of ssh://palacios@newskysaw.cs.northwestern.edu/home/palacios... X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=59131f52dd171de5117b78b42ff92153c15a1601;hp=fb5a5b9e42a98314f95acd301116fc2022a90f9c;p=palacios-OLD.git Merge branch 'devel' of ssh://palacios@newskysaw.cs.northwestern.edu/home/palacios/palacios into devel --- diff --git a/palacios/include/palacios/vmm_paging.h b/palacios/include/palacios/vmm_paging.h index d1f93f2..3eb6774 100644 --- a/palacios/include/palacios/vmm_paging.h +++ b/palacios/include/palacios/vmm_paging.h @@ -186,13 +186,6 @@ typedef enum {PAGE_4KB, PAGE_2MB, PAGE_4MB, PAGE_1GB, - -/* Page Table Flag Values */ -#define PT32_HOOK 0x1 -#define V3_LARGE_PG 0x2 - - - /* We'll use the general form for now.... typedef enum {PDE32_ENTRY_NOT_PRESENT, PDE32_ENTRY_PTE32, PDE32_ENTRY_LARGE_PAGE} pde32_entry_type_t; typedef enum {PTE32_ENTRY_NOT_PRESENT, PTE32_ENTRY_PAGE} pte32_entry_type_t; diff --git a/palacios/src/devices/pci_passthrough.c b/palacios/src/devices/pci_passthrough.c index 9b302e1..3eee1d2 100644 --- a/palacios/src/devices/pci_passthrough.c +++ b/palacios/src/devices/pci_passthrough.c @@ -608,7 +608,7 @@ static int pt_config_update(uint_t reg_num, void * src, uint_t length, void * pr /* This is really iffy.... - * It was totally broken before, but it's totally fixed now + * It was totally broken before, but it's _not_ totally fixed now * The Expansion rom can be enabled/disabled via software using the low order bit * We should probably handle that somehow here... */