diff options
| author | Andrew Cooper <andrew.cooper3@citrix.com> | 2012-02-09 06:20:49 -0800 |
|---|---|---|
| committer | Andrew Cooper <andrew.cooper3@citrix.com> | 2012-02-09 06:20:49 -0800 |
| commit | 6c1e5375c1370d410837e560adc83c3d3854d367 (patch) | |
| tree | 372c5398c5372b356c372e028d12883884aa4410 /xen/include/asm-x86/hvm/vioapic.h | |
| parent | 36556194faa97929b06adf50cdd327ff5dae54e9 (diff) | |
| download | xen-6c1e5375c1370d410837e560adc83c3d3854d367.tar.gz xen-6c1e5375c1370d410837e560adc83c3d3854d367.tar.bz2 xen-6c1e5375c1370d410837e560adc83c3d3854d367.zip | |
CONFIG: remove #ifdef __ia64__ from the x86 arch tree
__ia64__ really really should not be defined in the x86 arch subtree,
so remove it from xen/include/public/arch-x86/hvm/save.h
This in turn allows the removal of VIOAPIC_IS_IOSAPIC, as x86 does not
use streamlined {IO,L}APICs, allowing for the removal of more code
from the x86 tree.
Changes since v2:
* Leave the EOI register write protected by VIOAPIC_VERSION_ID >=
0x20. Currently, only version 0x11 is emulated, but leave this
correct code in place in case a decision is make to emulate the
newer version.
Changes since v1:
* Refresh patch following the decision not to try emulating a
version 0x20 IOAPIC
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Committed-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'xen/include/asm-x86/hvm/vioapic.h')
| -rw-r--r-- | xen/include/asm-x86/hvm/vioapic.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/xen/include/asm-x86/hvm/vioapic.h b/xen/include/asm-x86/hvm/vioapic.h index 7721ece46c..f2c17535bf 100644 --- a/xen/include/asm-x86/hvm/vioapic.h +++ b/xen/include/asm-x86/hvm/vioapic.h @@ -30,11 +30,7 @@ #include <xen/smp.h> #include <public/hvm/save.h> -#if !VIOAPIC_IS_IOSAPIC #define VIOAPIC_VERSION_ID 0x11 /* IOAPIC version */ -#else -#define VIOAPIC_VERSION_ID 0x21 /* IOSAPIC version */ -#endif #define VIOAPIC_EDGE_TRIG 0 #define VIOAPIC_LEVEL_TRIG 1 |