1. Patchew
  2. QEMU
  3. [PATCH 00/10] Clean up includes
  4. View patch

[PATCH 04/10] aspeed: Clean up includes

Peter Maydell posted 10 patches 10 months ago
Maintainers: Gerd Hoffmann <kraxel@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, Christoph Muellner <christoph.muellner@vrull.eu>, LIU Zhiwei <zhiwei_liu@linux.alibaba.com>, Philipp Tomsich <philipp.tomsich@vrull.eu>, Palmer Dabbelt <palmer@dabbelt.com>, Alistair Francis <Alistair.Francis@wdc.com>, "Cédric Le Goater" <clg@kaod.org>, Peter Maydell <peter.maydell@linaro.org>, Andrew Jeffery <andrew@codeconstruct.com.au>, Joel Stanley <joel@jms.id.au>, Jonathan Cameron <jonathan.cameron@huawei.com>, Fan Ni <fan.ni@samsung.com>, "Maciej S. Szmigiero" <maciej.szmigiero@oracle.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, "Michael S. Tsirkin" <mst@redhat.com>, Laurent Vivier <laurent@vivier.eu>, David Hildenbrand <david@redhat.com>, Igor Mammedov <imammedo@redhat.com>, Xiao Guangrong <xiaoguangrong.eric@gmail.com>, Nicholas Piggin <npiggin@gmail.com>, Daniel Henrique Barboza <danielhb413@gmail.com>, David Gibson <david@gibson.dropbear.id.au>, Harsh Prateek Bora <harshpb@linux.ibm.com>, Stefano Stabellini <sstabellini@kernel.org>, Anthony Perard <anthony.perard@citrix.com>, Paul Durrant <paul@xen.org>, Ilya Maximets <i.maximets@ovn.org>, Jason Wang <jasowang@redhat.com>, "Alex Bennée" <alex.bennee@linaro.org>, Alexandre Iooss <erdnaxe@crans.org>, Mahmoud Mandour <ma.mandourr@gmail.com>, Bin Meng <bin.meng@windriver.com>, Weiwei Li <liwei1518@gmail.com>, Thomas Huth <thuth@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Peter Xu <peterx@redhat.com>, Fabiano Rosas <farosas@suse.de>
There is a newer version of this series
[PATCH 04/10] aspeed: Clean up includes
Posted by Peter Maydell 10 months ago 
This commit was created with scripts/clean-includes.

All .c should include qemu/osdep.h first.  The script performs three
related cleanups:

* Ensure .c files include qemu/osdep.h first.
* Including it in a .h is redundant, since the .c  already includes
  it.  Drop such inclusions.
* Likewise, including headers qemu/osdep.h includes is redundant.
  Drop these, too.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 hw/arm/aspeed_eeprom.h     | 1 -
 tests/qtest/qtest_aspeed.h | 2 --
 hw/arm/aspeed_eeprom.c     | 1 +
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/hw/arm/aspeed_eeprom.h b/hw/arm/aspeed_eeprom.h
index bbf9e54365b..f08c16ef506 100644
--- a/hw/arm/aspeed_eeprom.h
+++ b/hw/arm/aspeed_eeprom.h
@@ -7,7 +7,6 @@
 #ifndef ASPEED_EEPROM_H
 #define ASPEED_EEPROM_H
 
-#include "qemu/osdep.h"
 
 extern const uint8_t tiogapass_bmc_fruid[];
 extern const size_t tiogapass_bmc_fruid_len;
diff --git a/tests/qtest/qtest_aspeed.h b/tests/qtest/qtest_aspeed.h
index 235dfaa186a..d35b0c7cba5 100644
--- a/tests/qtest/qtest_aspeed.h
+++ b/tests/qtest/qtest_aspeed.h
@@ -12,8 +12,6 @@
 #ifndef QTEST_ASPEED_H
 #define QTEST_ASPEED_H
 
-#include <stdint.h>
-
 #include "libqtest.h"
 
 #define AST2600_ASPEED_I2C_BASE_ADDR 0x1e78a000
diff --git a/hw/arm/aspeed_eeprom.c b/hw/arm/aspeed_eeprom.c
index ace5266cec9..daa3d329d10 100644
--- a/hw/arm/aspeed_eeprom.c
+++ b/hw/arm/aspeed_eeprom.c
@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: GPL-2.0-only
  */
 
+#include "qemu/osdep.h"
 #include "aspeed_eeprom.h"
 
 /* Tiogapass BMC FRU */
-- 
2.34.1
Re: [PATCH 04/10] aspeed: Clean up includes
Posted by Richard Henderson 10 months ago 
On 1/26/24 02:34, Peter Maydell wrote:
> This commit was created with scripts/clean-includes.
> 
> All .c should include qemu/osdep.h first.  The script performs three
> related cleanups:
> 
> * Ensure .c files include qemu/osdep.h first.
> * Including it in a .h is redundant, since the .c  already includes
>    it.  Drop such inclusions.
> * Likewise, including headers qemu/osdep.h includes is redundant.
>    Drop these, too.
> 
> Signed-off-by: Peter Maydell<peter.maydell@linaro.org>
> ---
>   hw/arm/aspeed_eeprom.h     | 1 -
>   tests/qtest/qtest_aspeed.h | 2 --
>   hw/arm/aspeed_eeprom.c     | 1 +
>   3 files changed, 1 insertion(+), 3 deletions(-)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~
Re: [PATCH 04/10] aspeed: Clean up includes
Posted by Zhao Liu 10 months ago 
On Thu, Jan 25, 2024 at 04:34:02PM +0000, Peter Maydell wrote:
> Date: Thu, 25 Jan 2024 16:34:02 +0000
> From: Peter Maydell <peter.maydell@linaro.org>
> Subject: [PATCH 04/10] aspeed: Clean up includes
> X-Mailer: git-send-email 2.34.1
> 
> This commit was created with scripts/clean-includes.
> 
> All .c should include qemu/osdep.h first.  The script performs three
> related cleanups:
> 
> * Ensure .c files include qemu/osdep.h first.
> * Including it in a .h is redundant, since the .c  already includes
>   it.  Drop such inclusions.
> * Likewise, including headers qemu/osdep.h includes is redundant.
>   Drop these, too.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>  hw/arm/aspeed_eeprom.h     | 1 -
>  tests/qtest/qtest_aspeed.h | 2 --
>  hw/arm/aspeed_eeprom.c     | 1 +
>  3 files changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/hw/arm/aspeed_eeprom.h b/hw/arm/aspeed_eeprom.h
> index bbf9e54365b..f08c16ef506 100644
> --- a/hw/arm/aspeed_eeprom.h
> +++ b/hw/arm/aspeed_eeprom.h
> @@ -7,7 +7,6 @@
>  #ifndef ASPEED_EEPROM_H
>  #define ASPEED_EEPROM_H
>  
> -#include "qemu/osdep.h"
>  
>  extern const uint8_t tiogapass_bmc_fruid[];
>  extern const size_t tiogapass_bmc_fruid_len;
> diff --git a/tests/qtest/qtest_aspeed.h b/tests/qtest/qtest_aspeed.h
> index 235dfaa186a..d35b0c7cba5 100644
> --- a/tests/qtest/qtest_aspeed.h
> +++ b/tests/qtest/qtest_aspeed.h
> @@ -12,8 +12,6 @@
>  #ifndef QTEST_ASPEED_H
>  #define QTEST_ASPEED_H
>  
> -#include <stdint.h>
> -
>  #include "libqtest.h"
>  
>  #define AST2600_ASPEED_I2C_BASE_ADDR 0x1e78a000
> diff --git a/hw/arm/aspeed_eeprom.c b/hw/arm/aspeed_eeprom.c
> index ace5266cec9..daa3d329d10 100644
> --- a/hw/arm/aspeed_eeprom.c
> +++ b/hw/arm/aspeed_eeprom.c
> @@ -4,6 +4,7 @@
>   * SPDX-License-Identifier: GPL-2.0-only
>   */
>  
> +#include "qemu/osdep.h"

Just a question, as the code style, should we add a blank line after
this header?

>  #include "aspeed_eeprom.h"
>  
>  /* Tiogapass BMC FRU */
> -- 
> 2.34.1
> 

Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
Re: [PATCH 04/10] aspeed: Clean up includes
Posted by Peter Maydell 10 months ago 
On Fri, 26 Jan 2024 at 15:26, Zhao Liu <zhao1.liu@intel.com> wrote:
>
> On Thu, Jan 25, 2024 at 04:34:02PM +0000, Peter Maydell wrote:
> > Date: Thu, 25 Jan 2024 16:34:02 +0000
> > From: Peter Maydell <peter.maydell@linaro.org>
> > Subject: [PATCH 04/10] aspeed: Clean up includes
> > X-Mailer: git-send-email 2.34.1
> >
> > This commit was created with scripts/clean-includes.
> >
> > All .c should include qemu/osdep.h first.  The script performs three
> > related cleanups:
> >
> > * Ensure .c files include qemu/osdep.h first.
> > * Including it in a .h is redundant, since the .c  already includes
> >   it.  Drop such inclusions.
> > * Likewise, including headers qemu/osdep.h includes is redundant.
> >   Drop these, too.
> >
> > Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> > ---
> >  hw/arm/aspeed_eeprom.h     | 1 -
> >  tests/qtest/qtest_aspeed.h | 2 --
> >  hw/arm/aspeed_eeprom.c     | 1 +
> >  3 files changed, 1 insertion(+), 3 deletions(-)
> >
> > diff --git a/hw/arm/aspeed_eeprom.h b/hw/arm/aspeed_eeprom.h
> > index bbf9e54365b..f08c16ef506 100644
> > --- a/hw/arm/aspeed_eeprom.h
> > +++ b/hw/arm/aspeed_eeprom.h
> > @@ -7,7 +7,6 @@
> >  #ifndef ASPEED_EEPROM_H
> >  #define ASPEED_EEPROM_H
> >
> > -#include "qemu/osdep.h"
> >
> >  extern const uint8_t tiogapass_bmc_fruid[];
> >  extern const size_t tiogapass_bmc_fruid_len;
> > diff --git a/tests/qtest/qtest_aspeed.h b/tests/qtest/qtest_aspeed.h
> > index 235dfaa186a..d35b0c7cba5 100644
> > --- a/tests/qtest/qtest_aspeed.h
> > +++ b/tests/qtest/qtest_aspeed.h
> > @@ -12,8 +12,6 @@
> >  #ifndef QTEST_ASPEED_H
> >  #define QTEST_ASPEED_H
> >
> > -#include <stdint.h>
> > -
> >  #include "libqtest.h"
> >
> >  #define AST2600_ASPEED_I2C_BASE_ADDR 0x1e78a000
> > diff --git a/hw/arm/aspeed_eeprom.c b/hw/arm/aspeed_eeprom.c
> > index ace5266cec9..daa3d329d10 100644
> > --- a/hw/arm/aspeed_eeprom.c
> > +++ b/hw/arm/aspeed_eeprom.c
> > @@ -4,6 +4,7 @@
> >   * SPDX-License-Identifier: GPL-2.0-only
> >   */
> >
> > +#include "qemu/osdep.h"
>
> Just a question, as the code style, should we add a blank line after
> this header?

No, we don't generally include blank lines in the #include
block. (But all these patches are autogenerated, so you get
what the script generates :-))

thanks
-- PMM
Re: [PATCH 04/10] aspeed: Clean up includes
Posted by Philippe Mathieu-Daudé 10 months ago 
On 25/1/24 17:34, Peter Maydell wrote:
> This commit was created with scripts/clean-includes.
> 
> All .c should include qemu/osdep.h first.  The script performs three
> related cleanups:
> 
> * Ensure .c files include qemu/osdep.h first.
> * Including it in a .h is redundant, since the .c  already includes
>    it.  Drop such inclusions.
> * Likewise, including headers qemu/osdep.h includes is redundant.
>    Drop these, too.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>   hw/arm/aspeed_eeprom.h     | 1 -
>   tests/qtest/qtest_aspeed.h | 2 --
>   hw/arm/aspeed_eeprom.c     | 1 +
>   3 files changed, 1 insertion(+), 3 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Patchew 2.1-devel-b67e4c2

© 2016 - 2024 Red Hat, Inc.