diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-12 09:20:28 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-12 09:20:28 -0400 |
commit | ccff9b1db693062b0a9c9070f4304deb47ef215c (patch) | |
tree | a956cc800a03f11254105fbd9926bab537b6863f /include/xen | |
parent | 3dc329baa2ed1740036183041cefaf8ceb714038 (diff) | |
parent | cb6b6df111e46b9d0f79eb971575fd50555f43f4 (diff) |
Merge tag 'stable/for-linus-3.7-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
Pull Xen fixes from Konrad Rzeszutek Wilk:
"This has four bug-fixes and one tiny feature that I forgot to put
initially in my tree due to oversight.
The feature is for kdump kernels to speed up the /proc/vmcore reading.
There is a ram_is_pfn helper function that the different platforms can
register for. We are now doing that.
The bug-fixes cover some embarrassing struct pv_cpu_ops variables
being set to NULL on Xen (but not baremetal). We had a similar issue
in the past with {write|read}_msr_safe and this fills the three
missing ones. The other bug-fix is to make the console output (hvc)
be capable of dealing with misbehaving backends and not fall flat on
its face. Lastly, a quirk for older XenBus implementations that came
with an ancient v3.4 hypervisor (so RHEL5 based) - reading of certain
non-existent attributes just hangs the guest during bootup - so we
take precaution of not doing that on such older installations.
Feature:
- Register a pfn_is_ram helper to speed up reading of /proc/vmcore.
Bug-fixes:
- Three pvops call for Xen were undefined causing BUG_ONs.
- Add a quirk so that the shutdown watches (used by kdump) are not
used with older Xen (3.4).
- Fix ungraceful state transition for the HVC console."
* tag 'stable/for-linus-3.7-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen/pv-on-hvm kexec: add quirk for Xen 3.4 and shutdown watches.
xen/bootup: allow {read|write}_cr8 pvops call.
xen/bootup: allow read_tscp call for Xen PV guests.
xen pv-on-hvm: add pfn_is_ram helper for kdump
xen/hvc: handle backend CLOSED without CLOSING
Diffstat (limited to 'include/xen')
-rw-r--r-- | include/xen/interface/hvm/hvm_op.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/include/xen/interface/hvm/hvm_op.h b/include/xen/interface/hvm/hvm_op.h index a4827f46ee97..956a04682865 100644 --- a/include/xen/interface/hvm/hvm_op.h +++ b/include/xen/interface/hvm/hvm_op.h | |||
@@ -43,4 +43,23 @@ struct xen_hvm_pagetable_dying { | |||
43 | typedef struct xen_hvm_pagetable_dying xen_hvm_pagetable_dying_t; | 43 | typedef struct xen_hvm_pagetable_dying xen_hvm_pagetable_dying_t; |
44 | DEFINE_GUEST_HANDLE_STRUCT(xen_hvm_pagetable_dying_t); | 44 | DEFINE_GUEST_HANDLE_STRUCT(xen_hvm_pagetable_dying_t); |
45 | 45 | ||
46 | enum hvmmem_type_t { | ||
47 | HVMMEM_ram_rw, /* Normal read/write guest RAM */ | ||
48 | HVMMEM_ram_ro, /* Read-only; writes are discarded */ | ||
49 | HVMMEM_mmio_dm, /* Reads and write go to the device model */ | ||
50 | }; | ||
51 | |||
52 | #define HVMOP_get_mem_type 15 | ||
53 | /* Return hvmmem_type_t for the specified pfn. */ | ||
54 | struct xen_hvm_get_mem_type { | ||
55 | /* Domain to be queried. */ | ||
56 | domid_t domid; | ||
57 | /* OUT variable. */ | ||
58 | uint16_t mem_type; | ||
59 | uint16_t pad[2]; /* align next field on 8-byte boundary */ | ||
60 | /* IN variable. */ | ||
61 | uint64_t pfn; | ||
62 | }; | ||
63 | DEFINE_GUEST_HANDLE_STRUCT(xen_hvm_get_mem_type); | ||
64 | |||
46 | #endif /* __XEN_PUBLIC_HVM_HVM_OP_H__ */ | 65 | #endif /* __XEN_PUBLIC_HVM_HVM_OP_H__ */ |