[v3,41/41] cutils: Do not include "qemu/units.h" directly

Message ID 20180415234307.28132-42-f4bug@amsat.org
State New
Headers show
Series
  • hw: Use the BYTE-based definitions when useful
Related show

Commit Message

Philippe Mathieu-Daudé April 15, 2018, 11:43 p.m.
All files using "qemu/units.h" definitions already include it directly,
we can now remove it from "qemu/cutils.h".

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 include/qemu/cutils.h | 1 -
 hw/core/machine.c     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

Comments

Marcel Apfelbaum April 16, 2018, 9:53 a.m. | #1
On 16/04/2018 2:43, Philippe Mathieu-Daudé wrote:
> All files using "qemu/units.h" definitions already include it directly,
> we can now remove it from "qemu/cutils.h".
> 
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  include/qemu/cutils.h | 1 -
>  hw/core/machine.c     | 2 +-
>  2 files changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/include/qemu/cutils.h b/include/qemu/cutils.h
> index 056e6629bb..cdb0f0db75 100644
> --- a/include/qemu/cutils.h
> +++ b/include/qemu/cutils.h
> @@ -2,7 +2,6 @@
>  #define QEMU_CUTILS_H
>  
>  #include "qemu/fprintf-fn.h"
> -#include "qemu/units.h"
>  
>  /**
>   * pstrcpy:
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index 2040177664..8f70c5ad94 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -19,7 +19,7 @@
>  #include "sysemu/sysemu.h"
>  #include "sysemu/numa.h"
>  #include "qemu/error-report.h"
> -#include "qemu/cutils.h"
> +#include "qemu/units.h"
>  #include "sysemu/qtest.h"
>  
>  static char *machine_get_accel(Object *obj, Error **errp)
> 

Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>

Thanks,
Marcel

Patch

diff --git a/include/qemu/cutils.h b/include/qemu/cutils.h
index 056e6629bb..cdb0f0db75 100644
--- a/include/qemu/cutils.h
+++ b/include/qemu/cutils.h
@@ -2,7 +2,6 @@ 
 #define QEMU_CUTILS_H
 
 #include "qemu/fprintf-fn.h"
-#include "qemu/units.h"
 
 /**
  * pstrcpy:
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 2040177664..8f70c5ad94 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -19,7 +19,7 @@ 
 #include "sysemu/sysemu.h"
 #include "sysemu/numa.h"
 #include "qemu/error-report.h"
-#include "qemu/cutils.h"
+#include "qemu/units.h"
 #include "sysemu/qtest.h"
 
 static char *machine_get_accel(Object *obj, Error **errp)