diff options
| author | rwatson <rwatson@FreeBSD.org> | 2011-01-04 14:49:54 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2011-01-04 14:49:54 +0000 |
| commit | b5469e8b581b388e373b5a39d23cc88058622db2 (patch) | |
| tree | e0d5d75c0d8583fa305bc8fca00f7523da80fddf /sys/i386/include/pcpu.h | |
| parent | cdb6d8e9a40ffe79e58357fb15b6a624f27c9e6e (diff) | |
| download | FreeBSD-src-b5469e8b581b388e373b5a39d23cc88058622db2.zip FreeBSD-src-b5469e8b581b388e373b5a39d23cc88058622db2.tar.gz | |
Make "options XENHVM" compile for i386, not just amd64 -- a largely
mechanical change. This opens the door for using PV device drivers
under Xen HVM on i386, as well as more general harmonisation of i386
and amd64 Xen support in FreeBSD.
Reviewed by: cperciva
MFC after: 3 weeks
Diffstat (limited to 'sys/i386/include/pcpu.h')
| -rw-r--r-- | sys/i386/include/pcpu.h | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/sys/i386/include/pcpu.h b/sys/i386/include/pcpu.h index 8906eda..aaba413 100644 --- a/sys/i386/include/pcpu.h +++ b/sys/i386/include/pcpu.h @@ -44,13 +44,16 @@ * other processors" */ -#ifdef XEN +#if defined(XEN) || defined(XENHVM) #ifndef NR_VIRQS #define NR_VIRQS 24 #endif #ifndef NR_IPIS #define NR_IPIS 2 #endif +#endif + +#if defined(XEN) /* These are peridically updated in shared_info, and then copied here. */ struct shadow_time_info { @@ -72,8 +75,18 @@ struct shadow_time_info { int pc_callfunc_irq; \ int pc_virq_to_irq[NR_VIRQS]; \ int pc_ipi_to_irq[NR_IPIS] -#else + +#elif defined(XENHVM) + +#define PCPU_XEN_FIELDS \ + ; \ + unsigned int pc_last_processed_l1i; \ + unsigned int pc_last_processed_l2i + +#else /* !XEN && !XENHVM */ + #define PCPU_XEN_FIELDS + #endif #define PCPU_MD_FIELDS \ |
