Patchwork [2/3] Use the correct header in the TCG MIPS code to find cacheflush() on OpenBSD.

login
register
mail settings
Submitter Brad
Date May 26, 2011, 3:06 a.m.
Message ID <20110526030600.GB4978@rox.home.comstyle.com>
Download mbox | patch
Permalink /patch/97488/
State New
Headers show

Comments

Brad - May 26, 2011, 3:06 a.m.
Use the correct header in the TCG MIPS code to find cacheflush() on OpenBSD
to fix compilation of the MIPS host support for OpenBSD/mips64 based architecures.

Signed-off-by: Brad Smith <brad@comstyle.com>

---
 tcg/mips/tcg-target.h |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
Brad - May 30, 2011, 9:01 p.m.
On 25/05/11 11:06 PM, Brad wrote:
> Use the correct header in the TCG MIPS code to find cacheflush() on OpenBSD
> to fix compilation of the MIPS host support for OpenBSD/mips64 based architecures.

ping.

> Signed-off-by: Brad Smith<brad@comstyle.com>
>
> ---
>   tcg/mips/tcg-target.h |    4 ++++
>   1 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/tcg/mips/tcg-target.h b/tcg/mips/tcg-target.h
> index 0028bfa..8cb7d88 100644
> --- a/tcg/mips/tcg-target.h
> +++ b/tcg/mips/tcg-target.h
> @@ -102,7 +102,11 @@ enum {
>   /* guest base is supported */
>   #define TCG_TARGET_HAS_GUEST_BASE
>
> +#ifdef __OpenBSD__
> +#include<machine/sysarch.h>
> +#else
>   #include<sys/cachectl.h>
> +#endif
>
>   static inline void flush_icache_range(unsigned long start, unsigned long stop)
>   {
Andreas Färber - May 30, 2011, 9:16 p.m.
Am 30.05.2011 um 23:01 schrieb Brad:

> On 25/05/11 11:06 PM, Brad wrote:
>> Use the correct header in the TCG MIPS code to find cacheflush() on  
>> OpenBSD
>> to fix compilation of the MIPS host support for OpenBSD/mips64  
>> based architecures.
>
> ping.
>
>> Signed-off-by: Brad Smith<brad@comstyle.com>
>>
>> ---
>>  tcg/mips/tcg-target.h |    4 ++++
>>  1 files changed, 4 insertions(+), 0 deletions(-)
>>
>> diff --git a/tcg/mips/tcg-target.h b/tcg/mips/tcg-target.h
>> index 0028bfa..8cb7d88 100644
>> --- a/tcg/mips/tcg-target.h
>> +++ b/tcg/mips/tcg-target.h
>> @@ -102,7 +102,11 @@ enum {
>>  /* guest base is supported */
>>  #define TCG_TARGET_HAS_GUEST_BASE
>>
>> +#ifdef __OpenBSD__
>> +#include<machine/sysarch.h>

Usually we have a space in there. Bad example below. ;)

>> +#else
>>  #include<sys/cachectl.h>
>> +#endif
>>
>>  static inline void flush_icache_range(unsigned long start,  
>> unsigned long stop)
>>  {
Brad - May 30, 2011, 9:22 p.m.
On 30/05/11 5:16 PM, Andreas Färber wrote:
> Am 30.05.2011 um 23:01 schrieb Brad:
>
>> On 25/05/11 11:06 PM, Brad wrote:
>>> Use the correct header in the TCG MIPS code to find cacheflush() on
>>> OpenBSD
>>> to fix compilation of the MIPS host support for OpenBSD/mips64 based
>>> architecures.
>>
>> ping.
>>
>>> Signed-off-by: Brad Smith<brad@comstyle.com>
>>>
>>> ---
>>> tcg/mips/tcg-target.h | 4 ++++
>>> 1 files changed, 4 insertions(+), 0 deletions(-)
>>>
>>> diff --git a/tcg/mips/tcg-target.h b/tcg/mips/tcg-target.h
>>> index 0028bfa..8cb7d88 100644
>>> --- a/tcg/mips/tcg-target.h
>>> +++ b/tcg/mips/tcg-target.h
>>> @@ -102,7 +102,11 @@ enum {
>>> /* guest base is supported */
>>> #define TCG_TARGET_HAS_GUEST_BASE
>>>
>>> +#ifdef __OpenBSD__
>>> +#include<machine/sysarch.h>
>
> Usually we have a space in there. Bad example below. ;)

In the original diff as it came across the mailing list even there
is a space.
Brad - May 30, 2011, 9:24 p.m.
On 30/05/11 5:22 PM, Brad wrote:
> On 30/05/11 5:16 PM, Andreas Färber wrote:
>> Am 30.05.2011 um 23:01 schrieb Brad:
>>
>>> On 25/05/11 11:06 PM, Brad wrote:
>>>> Use the correct header in the TCG MIPS code to find cacheflush() on
>>>> OpenBSD
>>>> to fix compilation of the MIPS host support for OpenBSD/mips64 based
>>>> architecures.
>>>
>>> ping.
>>>
>>>> Signed-off-by: Brad Smith<brad@comstyle.com>
>>>>
>>>> ---
>>>> tcg/mips/tcg-target.h | 4 ++++
>>>> 1 files changed, 4 insertions(+), 0 deletions(-)
>>>>
>>>> diff --git a/tcg/mips/tcg-target.h b/tcg/mips/tcg-target.h
>>>> index 0028bfa..8cb7d88 100644
>>>> --- a/tcg/mips/tcg-target.h
>>>> +++ b/tcg/mips/tcg-target.h
>>>> @@ -102,7 +102,11 @@ enum {
>>>> /* guest base is supported */
>>>> #define TCG_TARGET_HAS_GUEST_BASE
>>>>
>>>> +#ifdef __OpenBSD__
>>>> +#include<machine/sysarch.h>
>>
>> Usually we have a space in there. Bad example below. ;)
>
> In the original diff as it came across the mailing list even there
> is a space.

Looks like a case of stupid ThunderBird mangling the e-mail content upon
replying. I didn't send the diff with ThunderBird.
Andreas Färber - May 30, 2011, 9:41 p.m.
Am 30.05.2011 um 23:22 schrieb Brad:

> On 30/05/11 5:16 PM, Andreas Färber wrote:
>> Am 30.05.2011 um 23:01 schrieb Brad:
>>
>>> On 25/05/11 11:06 PM, Brad wrote:
>>>> Use the correct header in the TCG MIPS code to find cacheflush() on
>>>> OpenBSD
>>>> to fix compilation of the MIPS host support for OpenBSD/mips64  
>>>> based
>>>> architecures.
>>>
>>> ping.
>>>
>>>> Signed-off-by: Brad Smith<brad@comstyle.com>
>>>>
>>>> ---
>>>> tcg/mips/tcg-target.h | 4 ++++
>>>> 1 files changed, 4 insertions(+), 0 deletions(-)
>>>>
>>>> diff --git a/tcg/mips/tcg-target.h b/tcg/mips/tcg-target.h
>>>> index 0028bfa..8cb7d88 100644
>>>> --- a/tcg/mips/tcg-target.h
>>>> +++ b/tcg/mips/tcg-target.h
>>>> @@ -102,7 +102,11 @@ enum {
>>>> /* guest base is supported */
>>>> #define TCG_TARGET_HAS_GUEST_BASE
>>>>
>>>> +#ifdef __OpenBSD__
>>>> +#include<machine/sysarch.h>
>>
>> Usually we have a space in there. Bad example below. ;)
>
> In the original diff as it came across the mailing list even there
> is a space.

Confirmed, looks better on Patchwork: http://patchwork.ozlabs.org/patch/97488/

Andreas
Aurelien Jarno - June 3, 2011, 4:24 p.m.
On Wed, May 25, 2011 at 11:06:00PM -0400, Brad wrote:
> Use the correct header in the TCG MIPS code to find cacheflush() on OpenBSD
> to fix compilation of the MIPS host support for OpenBSD/mips64 based architecures.
> 
> Signed-off-by: Brad Smith <brad@comstyle.com>
> 
> ---
>  tcg/mips/tcg-target.h |    4 ++++
>  1 files changed, 4 insertions(+), 0 deletions(-)

Thanks, applied.

> diff --git a/tcg/mips/tcg-target.h b/tcg/mips/tcg-target.h
> index 0028bfa..8cb7d88 100644
> --- a/tcg/mips/tcg-target.h
> +++ b/tcg/mips/tcg-target.h
> @@ -102,7 +102,11 @@ enum {
>  /* guest base is supported */
>  #define TCG_TARGET_HAS_GUEST_BASE
>  
> +#ifdef __OpenBSD__
> +#include <machine/sysarch.h>
> +#else
>  #include <sys/cachectl.h>
> +#endif
>  
>  static inline void flush_icache_range(unsigned long start, unsigned long stop)
>  {
> -- 
> 1.7.5
> 
> -- 
> This message has been scanned for viruses and
> dangerous content by MailScanner, and is
> believed to be clean.
> 
> 
>

Patch

diff --git a/tcg/mips/tcg-target.h b/tcg/mips/tcg-target.h
index 0028bfa..8cb7d88 100644
--- a/tcg/mips/tcg-target.h
+++ b/tcg/mips/tcg-target.h
@@ -102,7 +102,11 @@  enum {
 /* guest base is supported */
 #define TCG_TARGET_HAS_GUEST_BASE
 
+#ifdef __OpenBSD__
+#include <machine/sysarch.h>
+#else
 #include <sys/cachectl.h>
+#endif
 
 static inline void flush_icache_range(unsigned long start, unsigned long stop)
 {