mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
bitkeeper revision 1.7.1.4 (3def5f48kwmL0X0eiElxGFHZW7Qdhg)
shrink ring1/3 segments to 3.5GB + associated changes + a few tweaks.
This commit is contained in:
smh22@boulderdash.cl.cam.ac.uk committed
1 parent
63e07da140
commit
6ffce1025b
4 files changed
+17
-10
No files matched your search
@@ -219,10 +219,10 @@ nopaging_gdt_descr:
|
||||
ENTRY(gdt_table)
|
||||
.quad 0x0000000000000000 /* NULL descriptor */
|
||||
.quad 0x0000000000000000 /* not used */
|
||||
.quad 0x00ceba000000ffff /* 0x11 ring 1 3.5GB code at 0x00000000 */
|
||||
.quad 0x00ceb2000000ffff /* 0x19 ring 1 3.5GB data at 0x00000000 */
|
||||
.quad 0x00cefa000000ffff /* 0x23 ring 3 3.5GB code at 0x00000000 */
|
||||
.quad 0x00cef2000000ffff /* 0x2b ring 3 3.5GB data at 0x00000000 */
|
||||
.quad 0x00cdba000000ffff /* 0x11 ring 1 3.5GB code at 0x00000000 */
|
||||
.quad 0x00cdb2000000ffff /* 0x19 ring 1 3.5GB data at 0x00000000 */
|
||||
.quad 0x00cdfa000000ffff /* 0x23 ring 3 3.5GB code at 0x00000000 */
|
||||
.quad 0x00cdf2000000ffff /* 0x2b ring 3 3.5GB data at 0x00000000 */
|
||||
.quad 0x00cf9a000000ffff /* 0x30 ring 0 4.0GB code at 0x00000000 */
|
||||
.quad 0x00cf92000000ffff /* 0x38 ring 0 4.0GB data at 0x00000000 */
|
||||
.quad 0x0000000000000000
|
||||
|
||||
@@ -17,5 +17,6 @@
|
||||
*/
|
||||
blk_ring_t *create_block_ring(int domain)
|
||||
{
|
||||
printk ("XEN create block ring");
|
||||
printk ("XEN create block ring <not implemented>");
|
||||
return (blk_ring_t *)NULL;
|
||||
}
|
||||
@@ -402,7 +402,7 @@ int setup_guestos(struct task_struct *p, dom0_newdomain_t *params)
|
||||
unsigned long cur_address, end_address, alloc_address, vaddr;
|
||||
unsigned long virt_load_address, virt_stack_address, virt_shinfo_address;
|
||||
unsigned long virt_ftable_start_addr = 0, virt_ftable_end_addr;
|
||||
unsigned long ft_mapping = frame_table;
|
||||
unsigned long ft_mapping = (unsigned long)frame_table;
|
||||
unsigned int ft_size = 0;
|
||||
start_info_t *virt_startinfo_address;
|
||||
unsigned long long time;
|
||||
@@ -410,7 +410,6 @@ int setup_guestos(struct task_struct *p, dom0_newdomain_t *params)
|
||||
l1_pgentry_t *l1tab = NULL;
|
||||
struct pfn_info *page = NULL;
|
||||
net_ring_t *net_ring;
|
||||
blk_ring_t *blk_ring;
|
||||
|
||||
if ( strncmp(__va(mod[0].mod_start), "XenoGues", 8) )
|
||||
{
|
||||
@@ -578,11 +577,18 @@ int setup_guestos(struct task_struct *p, dom0_newdomain_t *params)
|
||||
net_ring = create_net_vif(dom);
|
||||
if (!net_ring) panic("no network ring!\n");
|
||||
}
|
||||
virt_startinfo_address->net_rings = p->net_ring_base;
|
||||
|
||||
/* XXX SMH: horrible hack to convert hypervisor VAs in SHIP to guest VAs */
|
||||
#define SHIP2GUEST(_x) (virt_shinfo_address | (((unsigned long)(_x)) & 0xFFF))
|
||||
|
||||
virt_startinfo_address->net_rings =
|
||||
(net_ring_t *)SHIP2GUEST(p->net_ring_base);
|
||||
virt_startinfo_address->num_net_rings = p->num_net_vifs;
|
||||
|
||||
/* Add block io interface */
|
||||
virt_startinfo_address->blk_ring = p->blk_ring_base;
|
||||
virt_startinfo_address->blk_ring =
|
||||
(blk_ring_t *)SHIP2GUEST(p->blk_ring_base);
|
||||
|
||||
|
||||
/* We tell OS about any modules we were given. */
|
||||
if ( nr_mods > 1 )
|
||||
|
||||
@@ -166,7 +166,7 @@
|
||||
#include <asm/io.h>
|
||||
#include <asm/uaccess.h>
|
||||
|
||||
#if 1
|
||||
#if 0
|
||||
#define MEM_LOG(_f, _a...) printk("DOM%d: (file=memory.c, line=%d) " _f "\n", current->domain, __LINE__, ## _a )
|
||||
#else
|
||||
#define MEM_LOG(_f, _a...) ((void)0)
|
||||
|
||||