| Message ID | 1464103638-27153-1-git-send-email-peter.maydell@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 05/24/2016 09:27 AM, Peter Maydell wrote: > Clean up includes so that osdep.h is included first and headers > which it implies are not included manually. > > This commit was created with scripts/clean-includes. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > hw/usb/xen-usb.c | 5 +---- > include/hw/xen/xen.h | 1 - > 2 files changed, 1 insertion(+), 5 deletions(-) > Reviewed-by: Eric Blake <eblake@redhat.com>
On Tue, May 24, 2016 at 04:27:18PM +0100, Peter Maydell wrote: > Clean up includes so that osdep.h is included first and headers > which it implies are not included manually. > > This commit was created with scripts/clean-includes. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Acked-by: Anthony PERARD <anthony.perard@citrix.com>
On Tue, 24 May 2016, Peter Maydell wrote: > Clean up includes so that osdep.h is included first and headers > which it implies are not included manually. > > This commit was created with scripts/clean-includes. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Stefano Stabellini <sstabellini@kernel.org> Added to my queue > hw/usb/xen-usb.c | 5 +---- > include/hw/xen/xen.h | 1 - > 2 files changed, 1 insertion(+), 5 deletions(-) > > diff --git a/hw/usb/xen-usb.c b/hw/usb/xen-usb.c > index 664df04..8fa47ed 100644 > --- a/hw/usb/xen-usb.c > +++ b/hw/usb/xen-usb.c > @@ -19,13 +19,10 @@ > * GNU GPL, version 2 or (at your option) any later version. > */ > > +#include "qemu/osdep.h" > #include <libusb.h> > -#include <stdio.h> > -#include <sys/types.h> > #include <sys/mman.h> > -#include <sys/time.h> > > -#include "qemu/osdep.h" > #include "qemu-common.h" > #include "qemu/config-file.h" > #include "hw/sysbus.h" > diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h > index 6365483..b2cd992 100644 > --- a/include/hw/xen/xen.h > +++ b/include/hw/xen/xen.h > @@ -8,7 +8,6 @@ > */ > > #include "qemu-common.h" > -#include "qemu/typedefs.h" > #include "exec/cpu-common.h" > #include "hw/irq.h" > > -- > 1.9.1 > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel >
On 30 May 2016 at 16:54, Stefano Stabellini <sstabellini@kernel.org> wrote: > On Tue, 24 May 2016, Peter Maydell wrote: >> Clean up includes so that osdep.h is included first and headers >> which it implies are not included manually. >> >> This commit was created with scripts/clean-includes. >> >> Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > > Reviewed-by: Stefano Stabellini <sstabellini@kernel.org> > > Added to my queue Hi; did this patch get lost? You've done a xen pullreq since this but this patch wasn't in it. thanks -- PMM
On Tue, 14 Jun 2016, Peter Maydell wrote: > On 30 May 2016 at 16:54, Stefano Stabellini <sstabellini@kernel.org> wrote: > > On Tue, 24 May 2016, Peter Maydell wrote: > >> Clean up includes so that osdep.h is included first and headers > >> which it implies are not included manually. > >> > >> This commit was created with scripts/clean-includes. > >> > >> Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > > > > Reviewed-by: Stefano Stabellini <sstabellini@kernel.org> > > > > Added to my queue > > Hi; did this patch get lost? You've done a xen pullreq since > this but this patch wasn't in it. I didn't lose it, I thought you had already committed it as 21cbfe5f37aaa3a13d3af28454e762c05be67429, but I realize now that although they have the same commit message, they are not the same patch. I was wondering how it got upstream given that I didn't send a pull request for it. Mystery solved. Next time it might be good to avoid having multiple patches touching similar code with exactly the same commit description. I'll send another pull request today.
On 14 June 2016 at 15:37, Stefano Stabellini <sstabellini@kernel.org> wrote: > I didn't lose it, I thought you had already committed it as > 21cbfe5f37aaa3a13d3af28454e762c05be67429, but I realize now that > although they have the same commit message, they are not the same patch. > > I was wondering how it got upstream given that I didn't send a pull > request for it. Mystery solved. Next time it might be good to avoid > having multiple patches touching similar code with exactly the same > commit description. Mmm, unfortunate side effect of the commit message being automatically created by the clean-includes script. -- PMM
diff --git a/hw/usb/xen-usb.c b/hw/usb/xen-usb.c index 664df04..8fa47ed 100644 --- a/hw/usb/xen-usb.c +++ b/hw/usb/xen-usb.c @@ -19,13 +19,10 @@ * GNU GPL, version 2 or (at your option) any later version. */ +#include "qemu/osdep.h" #include <libusb.h> -#include <stdio.h> -#include <sys/types.h> #include <sys/mman.h> -#include <sys/time.h> -#include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/config-file.h" #include "hw/sysbus.h" diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h index 6365483..b2cd992 100644 --- a/include/hw/xen/xen.h +++ b/include/hw/xen/xen.h @@ -8,7 +8,6 @@ */ #include "qemu-common.h" -#include "qemu/typedefs.h" #include "exec/cpu-common.h" #include "hw/irq.h"
Clean up includes so that osdep.h is included first and headers which it implies are not included manually. This commit was created with scripts/clean-includes. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- hw/usb/xen-usb.c | 5 +---- include/hw/xen/xen.h | 1 - 2 files changed, 1 insertion(+), 5 deletions(-)