From: BitKeeper B. <ri...@su...> - 2004-11-04 08:01:10
|
ChangeSet 1.1518, 2004/11/04 01:08:36+00:00, ia...@la... Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk into labyrinth.cl.cam.ac.uk:/auto/anfs/scratch/labyrinth/iap10/xeno-clone/xeno.bk SrvDaemon.py | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff -Nru a/tools/python/xen/xend/server/SrvDaemon.py b/tools/python/xen/xend/server/SrvDaemon.py --- a/tools/python/xen/xend/server/SrvDaemon.py 2004-11-04 03:01:04 -05:00 +++ b/tools/python/xen/xend/server/SrvDaemon.py 2004-11-04 03:01:04 -05:00 @@ -639,12 +639,22 @@ def getDomChannel(self, dom): """Get the channel to a domain. - dom domain - - returns channel (or None) + @param dom: domain + @return: channel (or None) """ return self.channelF.getDomChannel(dom) + def createDomChannel(self, dom, local_port=0, remote_port=0): + """Get the channel to a domain, creating if necessary. + + @param dom: domain + @param local_port: optional local port to re-use + @param remote_port: optional remote port to re-use + @return: channel + """ + return self.channelF.domChannel(dom, local_port=local_port, + remote_port=remote_port) + def blkif_create(self, dom, recreate=0): """Create or get a block device interface controller. @@ -672,13 +682,12 @@ def netif_get(self, dom): return self.netifCF.getControllerByDom(dom) - def console_create(self, dom, console_port=None, remote_port=0): + def console_create(self, dom, console_port=None): """Create a console for a domain. """ console = self.consoleCF.getControllerByDom(dom) if console is None: - console = self.consoleCF.createController(dom, console_port, - remote_port=remote_port) + console = self.consoleCF.createController(dom, console_port) return console def consoles(self): |
From: BitKeeper B. <ri...@su...> - 2004-11-04 23:02:26
|
ChangeSet 1.1537, 2004/11/04 21:44:28+00:00, ia...@la... Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk into labyrinth.cl.cam.ac.uk:/auto/anfs/scratch/labyrinth/iap10/xeno-clone/xeno.bk 0 files changed |
From: BitKeeper B. <ri...@su...> - 2004-11-17 02:02:44
|
ChangeSet 1.1583, 2004/11/17 00:33:38+00:00, ia...@la... Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk into labyrinth.cl.cam.ac.uk:/auto/anfs/scratch/labyrinth/iap10/xeno-clone/xeno.bk pgtable.h | 61 ++++++------------------------------------------------------- 1 files changed, 6 insertions(+), 55 deletions(-) diff -Nru a/linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/pgtable.h b/linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/pgtable.h --- a/linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/pgtable.h 2004-11-16 21:02:33 -05:00 +++ b/linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/pgtable.h 2004-11-16 21:02:33 -05:00 @@ -465,61 +465,12 @@ } while (0) /* NOTE: make_page* callers must call flush_page_update_queue() */ -static inline void __make_page_readonly(void *va) -{ - pgd_t *pgd = pgd_offset_k((unsigned long)va); - pmd_t *pmd = pmd_offset(pgd, (unsigned long)va); - pte_t *pte = pte_offset_kernel(pmd, (unsigned long)va); - queue_l1_entry_update(pte, (*(unsigned long *)pte)&~_PAGE_RW); -} - -static inline void __make_page_writable(void *va) -{ - pgd_t *pgd = pgd_offset_k((unsigned long)va); - pmd_t *pmd = pmd_offset(pgd, (unsigned long)va); - pte_t *pte = pte_offset_kernel(pmd, (unsigned long)va); - queue_l1_entry_update(pte, (*(unsigned long *)pte)|_PAGE_RW); -} - -static inline void make_page_readonly(void *va) -{ - pgd_t *pgd = pgd_offset_k((unsigned long)va); - pmd_t *pmd = pmd_offset(pgd, (unsigned long)va); - pte_t *pte = pte_offset_kernel(pmd, (unsigned long)va); - queue_l1_entry_update(pte, (*(unsigned long *)pte)&~_PAGE_RW); - if ( (unsigned long)va >= VMALLOC_START ) - __make_page_readonly(machine_to_virt( - *(unsigned long *)pte&PAGE_MASK)); -} - -static inline void make_page_writable(void *va) -{ - pgd_t *pgd = pgd_offset_k((unsigned long)va); - pmd_t *pmd = pmd_offset(pgd, (unsigned long)va); - pte_t *pte = pte_offset_kernel(pmd, (unsigned long)va); - queue_l1_entry_update(pte, (*(unsigned long *)pte)|_PAGE_RW); - if ( (unsigned long)va >= VMALLOC_START ) - __make_page_writable(machine_to_virt( - *(unsigned long *)pte&PAGE_MASK)); -} - -static inline void make_pages_readonly(void *va, unsigned int nr) -{ - while ( nr-- != 0 ) - { - make_page_readonly(va); - va = (void *)((unsigned long)va + PAGE_SIZE); - } -} - -static inline void make_pages_writable(void *va, unsigned int nr) -{ - while ( nr-- != 0 ) - { - make_page_writable(va); - va = (void *)((unsigned long)va + PAGE_SIZE); - } -} +void make_lowmem_page_readonly(void *va); +void make_lowmem_page_writable(void *va); +void make_page_readonly(void *va); +void make_page_writable(void *va); +void make_pages_readonly(void *va, unsigned int nr); +void make_pages_writable(void *va, unsigned int nr); static inline unsigned long arbitrary_virt_to_phys(void *va) { |
From: BitKeeper B. <ri...@su...> - 2004-11-22 23:18:10
|
ChangeSet 1.1605, 2004/11/22 17:51:03+00:00, ak...@la... Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk into labyrinth.cl.cam.ac.uk:/auto/anfs/nos1/akw27/xeno-clone/xeno.bk Kconfig | 4 ---- configs/xen0_defconfig | 3 +-- configs/xenU_defconfig | 3 +-- 3 files changed, 2 insertions(+), 8 deletions(-) diff -Nru a/linux-2.6.9-xen-sparse/arch/xen/Kconfig b/linux-2.6.9-xen-sparse/arch/xen/Kconfig --- a/linux-2.6.9-xen-sparse/arch/xen/Kconfig 2004-11-22 18:02:14 -05:00 +++ b/linux-2.6.9-xen-sparse/arch/xen/Kconfig 2004-11-22 18:02:14 -05:00 @@ -135,10 +135,6 @@ endmenu -config FOREIGN_PAGES - bool - default y - config HAVE_ARCH_DEV_ALLOC_SKB bool default y diff -Nru a/linux-2.6.9-xen-sparse/arch/xen/configs/xen0_defconfig b/linux-2.6.9-xen-sparse/arch/xen/configs/xen0_defconfig --- a/linux-2.6.9-xen-sparse/arch/xen/configs/xen0_defconfig 2004-11-22 18:02:14 -05:00 +++ b/linux-2.6.9-xen-sparse/arch/xen/configs/xen0_defconfig 2004-11-22 18:02:14 -05:00 @@ -21,7 +21,6 @@ # CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set CONFIG_XEN_WRITABLE_PAGETABLES=y CONFIG_XEN_SCRUB_PAGES=y -CONFIG_FOREIGN_PAGES=y CONFIG_HAVE_ARCH_DEV_ALLOC_SKB=y CONFIG_X86=y # CONFIG_X86_64 is not set @@ -160,7 +159,7 @@ # CONFIG_DEBUG_INFO is not set # CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_FRAME_POINTER is not set -CONFIG_4KSTACKS=y +# CONFIG_4KSTACKS is not set CONFIG_X86_BIOS_REBOOT=y CONFIG_X86_STD_RESOURCES=y CONFIG_PC=y diff -Nru a/linux-2.6.9-xen-sparse/arch/xen/configs/xenU_defconfig b/linux-2.6.9-xen-sparse/arch/xen/configs/xenU_defconfig --- a/linux-2.6.9-xen-sparse/arch/xen/configs/xenU_defconfig 2004-11-22 18:02:14 -05:00 +++ b/linux-2.6.9-xen-sparse/arch/xen/configs/xenU_defconfig 2004-11-22 18:02:14 -05:00 @@ -21,7 +21,6 @@ # CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set CONFIG_XEN_WRITABLE_PAGETABLES=y CONFIG_XEN_SCRUB_PAGES=y -CONFIG_FOREIGN_PAGES=y CONFIG_HAVE_ARCH_DEV_ALLOC_SKB=y CONFIG_X86=y # CONFIG_X86_64 is not set @@ -121,7 +120,7 @@ CONFIG_EARLY_PRINTK=y # CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_FRAME_POINTER is not set -CONFIG_4KSTACKS=y +# CONFIG_4KSTACKS is not set CONFIG_X86_BIOS_REBOOT=y CONFIG_X86_STD_RESOURCES=y CONFIG_PC=y |
From: BitKeeper B. <ri...@su...> - 2005-02-10 19:11:18
|
ChangeSet 1.1108.1.40, 2004/07/28 18:57:03+01:00, ac...@la... Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk into labyrinth.cl.cam.ac.uk:/auto/groups/xeno/users/ach61/xeno-clone/xeno.bk 0 files changed |
From: BitKeeper B. <ri...@su...> - 2005-02-10 19:11:39
|
ChangeSet 1.1108.1.41, 2004/07/28 19:59:26+01:00, ac...@la... Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk into labyrinth.cl.cam.ac.uk:/auto/groups/xeno/users/ach61/xeno-clone/xeno.bk 0 files changed |