Re: [Qemu-devel] [PATCH] xen: fix xen-mapcache build on non-Xen capable targets

[Alexander Graf]

Oh, did the code that break this make it upstream already? I'll send a new pull 
request with my patches to fix all the regressions I've encountered ASAP.

Alex


On 20.07.2011, at 11:14, Avi Kivity wrote:

> Signed-off-by: Avi Kivity <address@hidden>
> ---
> xen-mapcache.h |   32 ++++++++++++++++++++++++++++++++
> 1 files changed, 32 insertions(+), 0 deletions(-)
> 
> diff --git a/xen-mapcache.h b/xen-mapcache.h
> index 606b8af..da874ca 100644
> --- a/xen-mapcache.h
> +++ b/xen-mapcache.h
> @@ -9,6 +9,10 @@
> #ifndef XEN_MAPCACHE_H
> #define XEN_MAPCACHE_H
> 
> +#include <stdlib.h>
> +
> +#ifdef CONFIG_XEN
> +
> void xen_map_cache_init(void);
> uint8_t *xen_map_cache(target_phys_addr_t phys_addr, target_phys_addr_t size,
>                        uint8_t lock);
> @@ -16,4 +20,32 @@ ram_addr_t xen_ram_addr_from_mapcache(void *ptr);
> void xen_invalidate_map_cache_entry(uint8_t *buffer);
> void xen_invalidate_map_cache(void);
> 
> +#else
> +
> +static inline void xen_map_cache_init(void)
> +{
> +}
> +
> +static inline uint8_t *xen_map_cache(target_phys_addr_t phys_addr,
> +                                     target_phys_addr_t size,
> +                                     uint8_t lock)
> +{
> +    abort();
> +}
> +
> +static inline ram_addr_t xen_ram_addr_from_mapcache(void *ptr)
> +{
> +    abort();
> +}
> +
> +static inline void xen_invalidate_map_cache_entry(uint8_t *buffer)
> +{
> +}
> +
> +static inline void xen_invalidate_map_cache(void)
> +{
> +}
> +
> +#endif
> +
> #endif /* !XEN_MAPCACHE_H */
> -- 
> 1.7.5.3
>