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

[Blue Swirl]

On Sat, Jul 23, 2011 at 3:07 AM, Alexander Graf <address@hidden> wrote:
> Great. Thanks. Instead of just pulling my xen-next tree which had an 
> outstanding pull request for days now you apply Avi's patch which obviously 
> conflicts with my current queue, so I have to rebase it again.

Your patch carried the tree with it, while Avi's was only a single
patch fixing specifically the broken build. Given the release
schedule, I didn't want to pull large patch sets anymore.

> Not everyone is as privileged as you. Some of us have to wait for Anthony or 
> someone else to pull their trees. We can't just commit :(.

I don't think rebasing could be avoided even if there were 2000
developers with commit rights.

> Either way - leave the patch in. I'll rebase my tree.

Thank you for your work. If you think Avi's patch has some huge
problems, you could also revert it as the first step.

>
>
> Alex
>
> Am 22.07.2011 um 20:54 schrieb Blue Swirl <address@hidden>:
>
>> Thanks, applied.
>>
>> On Wed, Jul 20, 2011 at 12:14 PM, Avi Kivity <address@hidden> 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
>>>
>>>
>>>
>