xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] xen: Clean up includes
@ 2016-05-24 15:27 Peter Maydell
  2016-05-24 15:56 ` Eric Blake
                   ` (2 more replies)
  0 siblings, 3 replies; 7+ messages in thread
From: Peter Maydell @ 2016-05-24 15:27 UTC (permalink / raw)
  To: qemu-devel; +Cc: Anthony Perard, Stefano Stabellini, xen-devel

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(-)

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

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH] xen: Clean up includes
  2016-05-24 15:27 [PATCH] xen: Clean up includes Peter Maydell
@ 2016-05-24 15:56 ` Eric Blake
  2016-05-25 16:08 ` Anthony PERARD
  2016-05-30 15:54 ` [Xen-devel] " Stefano Stabellini
  2 siblings, 0 replies; 7+ messages in thread
From: Eric Blake @ 2016-05-24 15:56 UTC (permalink / raw)
  To: Peter Maydell, qemu-devel; +Cc: Anthony Perard, Stefano Stabellini, xen-devel

[-- Attachment #1: Type: text/plain, Size: 570 bytes --]

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>

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] xen: Clean up includes
  2016-05-24 15:27 [PATCH] xen: Clean up includes Peter Maydell
  2016-05-24 15:56 ` Eric Blake
@ 2016-05-25 16:08 ` Anthony PERARD
  2016-05-30 15:54 ` [Xen-devel] " Stefano Stabellini
  2 siblings, 0 replies; 7+ messages in thread
From: Anthony PERARD @ 2016-05-25 16:08 UTC (permalink / raw)
  To: Peter Maydell; +Cc: xen-devel, Stefano Stabellini, qemu-devel

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>

-- 
Anthony PERARD

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [Xen-devel] [PATCH] xen: Clean up includes
  2016-05-24 15:27 [PATCH] xen: Clean up includes Peter Maydell
  2016-05-24 15:56 ` Eric Blake
  2016-05-25 16:08 ` Anthony PERARD
@ 2016-05-30 15:54 ` Stefano Stabellini
  2016-06-14 14:10   ` Peter Maydell
  2 siblings, 1 reply; 7+ messages in thread
From: Stefano Stabellini @ 2016-05-30 15:54 UTC (permalink / raw)
  To: Peter Maydell; +Cc: Anthony Perard, xen-devel, Stefano Stabellini, qemu-devel

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
> 

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] xen: Clean up includes
  2016-05-30 15:54 ` [Xen-devel] " Stefano Stabellini
@ 2016-06-14 14:10   ` Peter Maydell
  2016-06-14 14:37     ` Stefano Stabellini
  0 siblings, 1 reply; 7+ messages in thread
From: Peter Maydell @ 2016-06-14 14:10 UTC (permalink / raw)
  To: Stefano Stabellini
  Cc: Anthony Perard, xen-devel@lists.xensource.com Devel, QEMU Developers

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

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] xen: Clean up includes
  2016-06-14 14:10   ` Peter Maydell
@ 2016-06-14 14:37     ` Stefano Stabellini
  2016-06-14 14:40       ` Peter Maydell
  0 siblings, 1 reply; 7+ messages in thread
From: Stefano Stabellini @ 2016-06-14 14:37 UTC (permalink / raw)
  To: Peter Maydell
  Cc: Anthony Perard, xen-devel@lists.xensource.com Devel,
	Stefano Stabellini, QEMU Developers

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.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] xen: Clean up includes
  2016-06-14 14:37     ` Stefano Stabellini
@ 2016-06-14 14:40       ` Peter Maydell
  0 siblings, 0 replies; 7+ messages in thread
From: Peter Maydell @ 2016-06-14 14:40 UTC (permalink / raw)
  To: Stefano Stabellini
  Cc: Anthony Perard, xen-devel@lists.xensource.com Devel, QEMU Developers

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

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2016-06-14 14:40 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-05-24 15:27 [PATCH] xen: Clean up includes Peter Maydell
2016-05-24 15:56 ` Eric Blake
2016-05-25 16:08 ` Anthony PERARD
2016-05-30 15:54 ` [Xen-devel] " Stefano Stabellini
2016-06-14 14:10   ` Peter Maydell
2016-06-14 14:37     ` Stefano Stabellini
2016-06-14 14:40       ` Peter Maydell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).