[3/4] hw/smbios: Remove "smbios_ipmi.h"
diff mbox series

Message ID 20181207165103.3992-4-philmd@redhat.com
State New
Headers show
Series
  • Introduce the hw/firmware/ namespace
Related show

Commit Message

Philippe Mathieu-Daudé Dec. 7, 2018, 4:51 p.m. UTC
This header only declare a single function: smbios_build_type_38_table().
We already have a header that declares such functions: "smbios_build.h".
Move the declaration and remove the header.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 hw/smbios/smbios.c              |  1 -
 hw/smbios/smbios_build.h        |  4 ++++
 hw/smbios/smbios_ipmi.h         | 15 ---------------
 hw/smbios/smbios_type_38-stub.c |  2 +-
 hw/smbios/smbios_type_38.c      |  1 -
 5 files changed, 5 insertions(+), 18 deletions(-)
 delete mode 100644 hw/smbios/smbios_ipmi.h

Comments

Corey Minyard Dec. 7, 2018, 5:13 p.m. UTC | #1
On 12/7/18 10:51 AM, Philippe Mathieu-Daudé wrote:
> This header only declare a single function: smbios_build_type_38_table().
> We already have a header that declares such functions: "smbios_build.h".
> Move the declaration and remove the header.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

The two IPMI changes look good to me, a definite improvement. I'm not
sure of the value of having two separate patches, as a single patch would
not be any bigger than the second patch and I don't see any clarity two
patches bring.  But fine either way.

Reviewed-by: Corey Minyard <cminyard@mvista.com>


> ---
>   hw/smbios/smbios.c              |  1 -
>   hw/smbios/smbios_build.h        |  4 ++++
>   hw/smbios/smbios_ipmi.h         | 15 ---------------
>   hw/smbios/smbios_type_38-stub.c |  2 +-
>   hw/smbios/smbios_type_38.c      |  1 -
>   5 files changed, 5 insertions(+), 18 deletions(-)
>   delete mode 100644 hw/smbios/smbios_ipmi.h
>
> diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
> index 30bd4731cf..9d737642cb 100644
> --- a/hw/smbios/smbios.c
> +++ b/hw/smbios/smbios.c
> @@ -28,7 +28,6 @@
>   #include "hw/loader.h"
>   #include "exec/cpu-common.h"
>   #include "smbios_build.h"
> -#include "smbios_ipmi.h"
>   
>   /* legacy structures and constants for <= 2.0 machines */
>   struct smbios_header {
> diff --git a/hw/smbios/smbios_build.h b/hw/smbios/smbios_build.h
> index 93b360d520..56b5a1e3f3 100644
> --- a/hw/smbios/smbios_build.h
> +++ b/hw/smbios/smbios_build.h
> @@ -3,6 +3,7 @@
>    *
>    * Copyright (C) 2009 Hewlett-Packard Development Company, L.P.
>    * Copyright (C) 2013 Red Hat, Inc.
> + * Copyright (c) 2015,2016 Corey Minyard, MontaVista Software, LLC
>    *
>    * Authors:
>    *  Alex Williamson <alex.williamson@hp.com>
> @@ -96,4 +97,7 @@ extern unsigned smbios_table_cnt;
>           smbios_table_cnt++;                                               \
>       } while (0)
>   
> +/* IPMI SMBIOS firmware handling */
> +void smbios_build_type_38_table(void);
> +
>   #endif /* QEMU_SMBIOS_BUILD_H */
> diff --git a/hw/smbios/smbios_ipmi.h b/hw/smbios/smbios_ipmi.h
> deleted file mode 100644
> index 1c9aae38f2..0000000000
> --- a/hw/smbios/smbios_ipmi.h
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -/*
> - * IPMI SMBIOS firmware handling
> - *
> - * Copyright (c) 2015,2016 Corey Minyard, MontaVista Software, LLC
> - *
> - * This work is licensed under the terms of the GNU GPL, version 2 or later.
> - * See the COPYING file in the top-level directory.
> - */
> -
> -#ifndef QEMU_SMBIOS_IPMI_H
> -#define QEMU_SMBIOS_IPMI_H
> -
> -void smbios_build_type_38_table(void);
> -
> -#endif /* QEMU_SMBIOS_IPMI_H */
> diff --git a/hw/smbios/smbios_type_38-stub.c b/hw/smbios/smbios_type_38-stub.c
> index fc4516bc8a..14b53d004b 100644
> --- a/hw/smbios/smbios_type_38-stub.c
> +++ b/hw/smbios/smbios_type_38-stub.c
> @@ -8,7 +8,7 @@
>    */
>   
>   #include "qemu/osdep.h"
> -#include "smbios_ipmi.h"
> +#include "smbios_build.h"
>   
>   void smbios_build_type_38_table(void)
>   {
> diff --git a/hw/smbios/smbios_type_38.c b/hw/smbios/smbios_type_38.c
> index d84e87d608..a1ad28d059 100644
> --- a/hw/smbios/smbios_type_38.c
> +++ b/hw/smbios/smbios_type_38.c
> @@ -12,7 +12,6 @@
>   #include "hw/smbios/smbios.h"
>   #include "qemu/error-report.h"
>   #include "smbios_build.h"
> -#include "smbios_ipmi.h"
>   
>   /* SMBIOS type 38 - IPMI */
>   struct smbios_type_38 {
Laszlo Ersek Dec. 10, 2018, 3:04 p.m. UTC | #2
On 12/07/18 17:51, Philippe Mathieu-Daudé wrote:
> This header only declare a single function: smbios_build_type_38_table().
> We already have a header that declares such functions: "smbios_build.h".
> Move the declaration and remove the header.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>  hw/smbios/smbios.c              |  1 -
>  hw/smbios/smbios_build.h        |  4 ++++
>  hw/smbios/smbios_ipmi.h         | 15 ---------------
>  hw/smbios/smbios_type_38-stub.c |  2 +-
>  hw/smbios/smbios_type_38.c      |  1 -
>  5 files changed, 5 insertions(+), 18 deletions(-)
>  delete mode 100644 hw/smbios/smbios_ipmi.h
> 
> diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
> index 30bd4731cf..9d737642cb 100644
> --- a/hw/smbios/smbios.c
> +++ b/hw/smbios/smbios.c
> @@ -28,7 +28,6 @@
>  #include "hw/loader.h"
>  #include "exec/cpu-common.h"
>  #include "smbios_build.h"
> -#include "smbios_ipmi.h"
>  
>  /* legacy structures and constants for <= 2.0 machines */
>  struct smbios_header {
> diff --git a/hw/smbios/smbios_build.h b/hw/smbios/smbios_build.h
> index 93b360d520..56b5a1e3f3 100644
> --- a/hw/smbios/smbios_build.h
> +++ b/hw/smbios/smbios_build.h
> @@ -3,6 +3,7 @@
>   *
>   * Copyright (C) 2009 Hewlett-Packard Development Company, L.P.
>   * Copyright (C) 2013 Red Hat, Inc.
> + * Copyright (c) 2015,2016 Corey Minyard, MontaVista Software, LLC
>   *
>   * Authors:
>   *  Alex Williamson <alex.williamson@hp.com>
> @@ -96,4 +97,7 @@ extern unsigned smbios_table_cnt;
>          smbios_table_cnt++;                                               \
>      } while (0)
>  
> +/* IPMI SMBIOS firmware handling */
> +void smbios_build_type_38_table(void);
> +
>  #endif /* QEMU_SMBIOS_BUILD_H */
> diff --git a/hw/smbios/smbios_ipmi.h b/hw/smbios/smbios_ipmi.h
> deleted file mode 100644
> index 1c9aae38f2..0000000000
> --- a/hw/smbios/smbios_ipmi.h
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -/*
> - * IPMI SMBIOS firmware handling
> - *
> - * Copyright (c) 2015,2016 Corey Minyard, MontaVista Software, LLC
> - *
> - * This work is licensed under the terms of the GNU GPL, version 2 or later.
> - * See the COPYING file in the top-level directory.
> - */
> -
> -#ifndef QEMU_SMBIOS_IPMI_H
> -#define QEMU_SMBIOS_IPMI_H
> -
> -void smbios_build_type_38_table(void);
> -
> -#endif /* QEMU_SMBIOS_IPMI_H */
> diff --git a/hw/smbios/smbios_type_38-stub.c b/hw/smbios/smbios_type_38-stub.c
> index fc4516bc8a..14b53d004b 100644
> --- a/hw/smbios/smbios_type_38-stub.c
> +++ b/hw/smbios/smbios_type_38-stub.c
> @@ -8,7 +8,7 @@
>   */
>  
>  #include "qemu/osdep.h"
> -#include "smbios_ipmi.h"
> +#include "smbios_build.h"
>  
>  void smbios_build_type_38_table(void)
>  {
> diff --git a/hw/smbios/smbios_type_38.c b/hw/smbios/smbios_type_38.c
> index d84e87d608..a1ad28d059 100644
> --- a/hw/smbios/smbios_type_38.c
> +++ b/hw/smbios/smbios_type_38.c
> @@ -12,7 +12,6 @@
>  #include "hw/smbios/smbios.h"
>  #include "qemu/error-report.h"
>  #include "smbios_build.h"
> -#include "smbios_ipmi.h"
>  
>  /* SMBIOS type 38 - IPMI */
>  struct smbios_type_38 {
> 

Reviewed-by: Laszlo Ersek <lersek@redhat.com>

Patch
diff mbox series

diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
index 30bd4731cf..9d737642cb 100644
--- a/hw/smbios/smbios.c
+++ b/hw/smbios/smbios.c
@@ -28,7 +28,6 @@ 
 #include "hw/loader.h"
 #include "exec/cpu-common.h"
 #include "smbios_build.h"
-#include "smbios_ipmi.h"
 
 /* legacy structures and constants for <= 2.0 machines */
 struct smbios_header {
diff --git a/hw/smbios/smbios_build.h b/hw/smbios/smbios_build.h
index 93b360d520..56b5a1e3f3 100644
--- a/hw/smbios/smbios_build.h
+++ b/hw/smbios/smbios_build.h
@@ -3,6 +3,7 @@ 
  *
  * Copyright (C) 2009 Hewlett-Packard Development Company, L.P.
  * Copyright (C) 2013 Red Hat, Inc.
+ * Copyright (c) 2015,2016 Corey Minyard, MontaVista Software, LLC
  *
  * Authors:
  *  Alex Williamson <alex.williamson@hp.com>
@@ -96,4 +97,7 @@  extern unsigned smbios_table_cnt;
         smbios_table_cnt++;                                               \
     } while (0)
 
+/* IPMI SMBIOS firmware handling */
+void smbios_build_type_38_table(void);
+
 #endif /* QEMU_SMBIOS_BUILD_H */
diff --git a/hw/smbios/smbios_ipmi.h b/hw/smbios/smbios_ipmi.h
deleted file mode 100644
index 1c9aae38f2..0000000000
--- a/hw/smbios/smbios_ipmi.h
+++ /dev/null
@@ -1,15 +0,0 @@ 
-/*
- * IPMI SMBIOS firmware handling
- *
- * Copyright (c) 2015,2016 Corey Minyard, MontaVista Software, LLC
- *
- * This work is licensed under the terms of the GNU GPL, version 2 or later.
- * See the COPYING file in the top-level directory.
- */
-
-#ifndef QEMU_SMBIOS_IPMI_H
-#define QEMU_SMBIOS_IPMI_H
-
-void smbios_build_type_38_table(void);
-
-#endif /* QEMU_SMBIOS_IPMI_H */
diff --git a/hw/smbios/smbios_type_38-stub.c b/hw/smbios/smbios_type_38-stub.c
index fc4516bc8a..14b53d004b 100644
--- a/hw/smbios/smbios_type_38-stub.c
+++ b/hw/smbios/smbios_type_38-stub.c
@@ -8,7 +8,7 @@ 
  */
 
 #include "qemu/osdep.h"
-#include "smbios_ipmi.h"
+#include "smbios_build.h"
 
 void smbios_build_type_38_table(void)
 {
diff --git a/hw/smbios/smbios_type_38.c b/hw/smbios/smbios_type_38.c
index d84e87d608..a1ad28d059 100644
--- a/hw/smbios/smbios_type_38.c
+++ b/hw/smbios/smbios_type_38.c
@@ -12,7 +12,6 @@ 
 #include "hw/smbios/smbios.h"
 #include "qemu/error-report.h"
 #include "smbios_build.h"
-#include "smbios_ipmi.h"
 
 /* SMBIOS type 38 - IPMI */
 struct smbios_type_38 {