diff options
| author | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-06-24 10:46:24 +0000 |
|---|---|---|
| committer | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-06-24 10:46:24 +0000 |
| commit | ed30037e48073a7d855fce58c1dfc563e446ff6c (patch) | |
| tree | 1a9a3439c4acbd1d420c222f26acfd8aea873c66 /tools/libxc/xc_linux_save.c | |
| parent | a3adbd6c3cabd7e5fa757827c0f058c7b19b889b (diff) | |
| download | xen-ed30037e48073a7d855fce58c1dfc563e446ff6c.tar.gz xen-ed30037e48073a7d855fce58c1dfc563e446ff6c.tar.bz2 xen-ed30037e48073a7d855fce58c1dfc563e446ff6c.zip | |
bitkeeper revision 1.1751 (42bbe480z9Fp_L5Tc500W8c8CL3g9A)
Rationalise x86 CRn guest state into a ctrlreg array in the per-vcpu
context structure. Most noticeably this means the pt_base field has
gone away -- replaced by ctrlreg[3] (CR3). VCPU_guest_stts is also
gone -- it was never arch-independent anyway.
Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'tools/libxc/xc_linux_save.c')
| -rw-r--r-- | tools/libxc/xc_linux_save.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/libxc/xc_linux_save.c b/tools/libxc/xc_linux_save.c index feb051884d..f761141170 100644 --- a/tools/libxc/xc_linux_save.c +++ b/tools/libxc/xc_linux_save.c @@ -459,7 +459,7 @@ int xc_linux_save(int xc_handle, int io_fd, u32 dom) shared_info_frame = info.shared_info_frame; /* A cheesy test to see whether the domain contains valid state. */ - if ( ctxt.pt_base == 0 ){ + if ( ctxt.ctrlreg[3] == 0 ){ ERR("Domain is not in a valid Linux guest OS state"); goto out; } @@ -1015,11 +1015,11 @@ int xc_linux_save(int xc_handle, int io_fd, u32 dom) } /* Canonicalise the page table base pointer. */ - if ( !MFN_IS_IN_PSEUDOPHYS_MAP(ctxt.pt_base >> PAGE_SHIFT) ) { + if ( !MFN_IS_IN_PSEUDOPHYS_MAP(ctxt.ctrlreg[3] >> PAGE_SHIFT) ) { ERR("PT base is not in range of pseudophys map"); goto out; } - ctxt.pt_base = live_mfn_to_pfn_table[ctxt.pt_base >> PAGE_SHIFT] << + ctxt.ctrlreg[3] = live_mfn_to_pfn_table[ctxt.ctrlreg[3] >> PAGE_SHIFT] << PAGE_SHIFT; if (write(io_fd, &ctxt, sizeof(ctxt)) != sizeof(ctxt) || |