Message ID | 1241040038-17183-18-git-send-email-aliguori@us.ibm.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
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.
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.
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.
Avi Kivity wrote:
> Ah, ok, will apply. But that's not in upstream either.
Nope, but one step at a time.
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>
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(-)