diff mbox

[17/21] Remove #define __user in usb-linux.c

Message ID 1241040038-17183-18-git-send-email-aliguori@us.ibm.com (mailing list archive)
State New, archived
Headers show

Commit Message

Anthony Liguori April 29, 2009, 9:20 p.m. UTC
This has been consistently nacked in upstream QEMU.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---
 usb-linux.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

Comments

Avi Kivity April 30, 2009, 9:43 a.m. UTC | #1
Anthony Liguori wrote:
> This has been consistently nacked in upstream QEMU.
>
> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
> ---
>  usb-linux.c |    4 ----
>  1 files changed, 0 insertions(+), 4 deletions(-)
>
> diff --git a/usb-linux.c b/usb-linux.c
> index 26643bd..70d7a1c 100644
> --- a/usb-linux.c
> +++ b/usb-linux.c
> @@ -34,10 +34,6 @@
>  #include "qemu-timer.h"
>  #include "monitor.h"
>  
> -#if defined(__linux__)
> -#define __user
> -#endif
> -
>   

This will introduce a regression into qemu-kvm.git.
Anthony Liguori April 30, 2009, 1:11 p.m. UTC | #2
Avi Kivity wrote:
> Anthony Liguori wrote:
>> This has been consistently nacked in upstream QEMU.
>>
>> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
>> ---
>>  usb-linux.c |    4 ----
>>  1 files changed, 0 insertions(+), 4 deletions(-)
>>
>> diff --git a/usb-linux.c b/usb-linux.c
>> index 26643bd..70d7a1c 100644
>> --- a/usb-linux.c
>> +++ b/usb-linux.c
>> @@ -34,10 +34,6 @@
>>  #include "qemu-timer.h"
>>  #include "monitor.h"
>>  
>> -#if defined(__linux__)
>> -#define __user
>> -#endif
>> -
>>   
>
> This will introduce a regression into qemu-kvm.git.

It won't because -D__user is in CFLAGS.
Avi Kivity April 30, 2009, 1:17 p.m. UTC | #3
Anthony Liguori wrote:
> Avi Kivity wrote:
>> Anthony Liguori wrote:
>>> This has been consistently nacked in upstream QEMU.
>>>
>>> -#if defined(__linux__)
>>> -#define __user
>>> -#endif
>>> -
>>>   
>>
>> This will introduce a regression into qemu-kvm.git.
>
> It won't because -D__user is in CFLAGS.
>

Ah, ok, will apply.  But that's not in upstream either.
Anthony Liguori April 30, 2009, 1:20 p.m. UTC | #4
Avi Kivity wrote:
> Ah, ok, will apply.  But that's not in upstream either.

Nope, but one step at a time.
diff mbox

Patch

diff --git a/usb-linux.c b/usb-linux.c
index 26643bd..70d7a1c 100644
--- a/usb-linux.c
+++ b/usb-linux.c
@@ -34,10 +34,6 @@ 
 #include "qemu-timer.h"
 #include "monitor.h"
 
-#if defined(__linux__)
-#define __user
-#endif
-
 #include <dirent.h>
 #include <sys/ioctl.h>
 #include <signal.h>