Introduce the hw/firmware/ namespace

PATCH Superseded Philippe Mathieu-Daudé 4 participants 14 messages Dec 7, 2018 – Dec 10, 2018

Share & tools

Philippe Mathieu-Daudé

author

2018-12-07 16:51 UTC #0 lore raw

cover Introduce the hw/firmware/ namespace

QEMU interacts with various firmwares. We already have some helpers for some firmwares. Later we will add UEFI helpers.
This series introduce the hw/firmware namespace for this.

There is no need to move hw/smbios sources into a specific directory, we only focus on the headers.

Philippe Mathieu-Daudé (4):
tests: Remove unused include
hw/smbios: Restrict access to "smbios_ipmi.h"
hw/smbios: Remove "smbios_ipmi.h"
hw/smbios: Move to the hw/firmware/ namespace

 MAINTAINERS                              |  2 +-
 hw/arm/virt.c                            |  2 +-
 hw/i386/pc.c                             |  2 +-
 hw/i386/pc_piix.c                        |  2 +-
 hw/i386/pc_q35.c                         |  2 +-
 hw/smbios/smbios-stub.c                  |  2 +-
 hw/smbios/smbios.c                       |  3 +--
 hw/smbios/smbios_build.h                 |  4 ++++
 hw/smbios/smbios_type_38-stub.c          |  2 +-
 hw/smbios/smbios_type_38.c               |  3 +--
 include/hw/{smbios => firmware}/smbios.h |  0
 include/hw/smbios/ipmi.h                 | 15 ---------------
 tests/acpi-utils.c                       |  1 -
 tests/bios-tables-test.c                 |  2 +-
 vl.c                                     |  2 +-
 15 files changed, 15 insertions(+), 29 deletions(-)
 rename include/hw/{smbios => firmware}/smbios.h (100%)
 delete mode 100644 include/hw/smbios/ipmi.h

Signature · 1 line

2.17.2

Philippe Mathieu-Daudé

author

2018-12-07 16:51 UTC #1 lore raw

PATCH 1/4 tests: Remove unused include

Signed-off-by Philippe Mathieu-Daudé <[email protected]>

---
 tests/acpi-utils.c | 1 -
 1 file changed, 1 deletion(-)

tests/acpi-utils.c +0 -1

index 41dc1ea9b4..297af55d39 100644
@@ -15,7 +15,6 @@
 #include "qemu/osdep.h"
 #include <glib/gstdio.h>
 #include "qemu-common.h"
-#include "hw/smbios/smbios.h"
 #include "qemu/bitmap.h"
 #include "acpi-utils.h"
 #include "boot-sector.h"

Signature · 1 line

2.17.2

Laszlo Ersek

Reviewed-by on v1 1/4

2018-12-10 14:55 UTC #2 lore raw

Re: [Qemu-devel] [PATCH 1/4] tests: Remove unused include

Quoted 11 lines · Philippe Mathieu-Daudé

Signed-off-by Philippe Mathieu-Daudé <[email protected]>
---
 tests/acpi-utils.c | 1 -
 1 file changed, 1 deletion(-)
tests/acpi-utils.c +0 -0
index 41dc1ea9b4..297af55d39 100644

tests/acpi-utils.c line 20

Quoted 7 lines

tests/acpi-utils.c +0 -1

@@ -15,7 +15,6 @@
 #include "qemu/osdep.h"
 #include <glib/gstdio.h>
 #include "qemu-common.h"
-#include "hw/smbios/smbios.h"
 #include "qemu/bitmap.h"
 #include "acpi-utils.h"
 #include "boot-sector.h"

Opinions vary whether empty commit message bodies are good style or not. Personally I prefer to put at least one sentence in there, even if it only repeats the subject line. Up to subsystem maintainers to decide I guess.

With the commit message updated, or not:

Reviewed-by Laszlo Ersek <[email protected]>

Philippe Mathieu-Daudé

author

2018-12-10 16:04 UTC #3 lore raw

Re: [Qemu-devel] [PATCH 1/4] tests: Remove unused include

Quoted 16 lines · Laszlo Ersek

Quoted 15 lines · Philippe Mathieu-Daudé

Signed-off-by Philippe Mathieu-Daudé <[email protected]>

---
 tests/acpi-utils.c | 1 -
 1 file changed, 1 deletion(-)

tests/acpi-utils.c +0 -1

index 41dc1ea9b4..297af55d39 100644
@@ -15,7 +15,6 @@
 #include "qemu/osdep.h"
 #include <glib/gstdio.h>
 #include "qemu-common.h"
-#include "hw/smbios/smbios.h"
 #include "qemu/bitmap.h"

Quoted 8 lines

tests/acpi-utils.c line 20
Quoted 3 lines
tests/acpi-utils.c +0 -0
 #include "acpi-utils.h"
 #include "boot-sector.h"
Opinions vary whether empty commit message bodies are good style or not. Personally I prefer to put at least one sentence in there, even if it only repeats the subject line. Up to subsystem maintainers to decide I guess.

OK, understood.

Quoted 4 lines

With the commit message updated, or not:
Reviewed-by Laszlo Ersek <[email protected]>

Thanks!

Philippe Mathieu-Daudé

author

2018-12-07 16:51 UTC #4 lore raw

PATCH 2/4 hw/smbios: Restrict access to "smbios_ipmi.h"

In reply to Philippe Mathieu-Daudé

All the consumers of "smbios_ipmi.h" are located in hw/smbios/. There is no need to have this include publicly exposed, reduce the visibility by moving it in hw/smbios/.

Signed-off-by Philippe Mathieu-Daudé <[email protected]>

---
 hw/smbios/smbios.c                                  | 2 +-
 include/hw/smbios/ipmi.h => hw/smbios/smbios_ipmi.h | 0
 hw/smbios/smbios_type_38-stub.c                     | 2 +-
 hw/smbios/smbios_type_38.c                          | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename include/hw/smbios/ipmi.h => hw/smbios/smbios_ipmi.h (100%)

hw/smbios/smbios.c +1 -1

index 920939454e..30bd4731cf 100644
@@ -28,7 +28,7 @@
 #include "hw/loader.h"
 #include "exec/cpu-common.h"
 #include "smbios_build.h"
-#include "hw/smbios/ipmi.h"
+#include "smbios_ipmi.h"
 
 /* legacy structures and constants for <= 2.0 machines */
 struct smbios_header {

hw/smbios/smbios_ipmi.h renamed from include/hw/smbios/ipmi.h +0 -0

similarity index 100%
rename from include/hw/smbios/ipmi.h
rename to hw/smbios/smbios_ipmi.h

hw/smbios/smbios_type_38-stub.c +1 -1

index 5b83c9b1f1..fc4516bc8a 100644
@@ -8,7 +8,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/smbios/ipmi.h"
+#include "smbios_ipmi.h"
 
 void smbios_build_type_38_table(void)
 {

hw/smbios/smbios_type_38.c +1 -1

index 56e8609c00..d84e87d608 100644
@@ -9,10 +9,10 @@
 
 #include "qemu/osdep.h"
 #include "hw/ipmi/ipmi.h"
-#include "hw/smbios/ipmi.h"
 #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 {

Signature · 1 line

2.17.2

Laszlo Ersek

Reviewed-by on v1 2/4

2018-12-10 15:00 UTC #5 lore raw

Re: [Qemu-devel] [PATCH 2/4] hw/smbios: Restrict access to "smbios_ipmi.h"

Quoted 1 line · Philippe Mathieu-Daudé

All the consumers of "smbios_ipmi.h" are located in hw/smbios/.

I tried to verify this statement by grepping the tree for "smbios_ipmi.h". There were zero hits. Please use the more precise pathname "hw/smbios/ipmi.h". (I can't suggest just "ipmi.h", because that isn't unique.)

With this update:

Reviewed-by Laszlo Ersek <[email protected]>

Thanks,
Laszlo

Quoted 59 lines

There is no need to have this include publicly exposed, reduce the visibility by moving it in hw/smbios/.

Signed-off-by Philippe Mathieu-Daudé <[email protected]>

---
 hw/smbios/smbios.c                                  | 2 +-
 include/hw/smbios/ipmi.h => hw/smbios/smbios_ipmi.h | 0
 hw/smbios/smbios_type_38-stub.c                     | 2 +-
 hw/smbios/smbios_type_38.c                          | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename include/hw/smbios/ipmi.h => hw/smbios/smbios_ipmi.h (100%)

hw/smbios/smbios.c +1 -1

index 920939454e..30bd4731cf 100644
@@ -28,7 +28,7 @@
 #include "hw/loader.h"
 #include "exec/cpu-common.h"
 #include "smbios_build.h"
-#include "hw/smbios/ipmi.h"
+#include "smbios_ipmi.h"
 
 /* legacy structures and constants for <= 2.0 machines */
 struct smbios_header {

hw/smbios/smbios_ipmi.h renamed from include/hw/smbios/ipmi.h +0 -0

similarity index 100%
rename from include/hw/smbios/ipmi.h
rename to hw/smbios/smbios_ipmi.h

hw/smbios/smbios_type_38-stub.c +1 -1

index 5b83c9b1f1..fc4516bc8a 100644
@@ -8,7 +8,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/smbios/ipmi.h"
+#include "smbios_ipmi.h"
 
 void smbios_build_type_38_table(void)
 {

hw/smbios/smbios_type_38.c +1 -1

index 56e8609c00..d84e87d608 100644
@@ -9,10 +9,10 @@
 
 #include "qemu/osdep.h"
 #include "hw/ipmi/ipmi.h"
-#include "hw/smbios/ipmi.h"
 #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 {

Philippe Mathieu-Daudé

author

2018-12-10 16:04 UTC #6 lore raw

Re: [Qemu-devel] [PATCH 2/4] hw/smbios: Restrict access to "smbios_ipmi.h"

Quoted 7 lines · Laszlo Ersek

Quoted 1 line · Philippe Mathieu-Daudé
All the consumers of "smbios_ipmi.h" are located in hw/smbios/.
I tried to verify this statement by grepping the tree for "smbios_ipmi.h". There were zero hits. Please use the more precise pathname "hw/smbios/ipmi.h". (I can't suggest just "ipmi.h", because that isn't unique.)

I did not notice I used the post-patch pathname, thanks.

Quoted 7 lines

With this update:
Reviewed-by Laszlo Ersek <[email protected]>
Thanks,
Laszlo

Philippe Mathieu-Daudé

author

2018-12-07 16:51 UTC #7 lore raw

PATCH 3/4 hw/smbios: Remove "smbios_ipmi.h"

In reply to Philippe Mathieu-Daudé

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é <[email protected]>

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

hw/smbios/smbios.c +0 -1

index 30bd4731cf..9d737642cb 100644
@@ -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 {

hw/smbios/smbios_build.h +4 -0

index 93b360d520..56b5a1e3f3 100644
@@ -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 <[email protected]>

@@ -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 */

hw/smbios/smbios_ipmi.h deleted +0 ~~-15~~

deleted file mode 100644
index 1c9aae38f2..0000000000
@@ -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 */

hw/smbios/smbios_type_38-stub.c +1 -1

index fc4516bc8a..14b53d004b 100644
@@ -8,7 +8,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "smbios_ipmi.h"
+#include "smbios_build.h"
 
 void smbios_build_type_38_table(void)
 {

hw/smbios/smbios_type_38.c +0 -1

index d84e87d608..a1ad28d059 100644
@@ -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 {

Signature · 1 line

2.17.2

Corey Minyard

Reviewed-by on v1 3/4

2018-12-07 17:13 UTC #8 lore raw

Re: [Qemu-devel] [PATCH 3/4] hw/smbios: Remove "smbios_ipmi.h"

Quoted 5 lines · Philippe Mathieu-Daudé

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é <[email protected]>

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 <[email protected]>

Quoted 87 lines

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

hw/smbios/smbios.c +0 -1

index 30bd4731cf..9d737642cb 100644
@@ -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 {

hw/smbios/smbios_build.h +4 -0

index 93b360d520..56b5a1e3f3 100644
@@ -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 <[email protected]>

@@ -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 */

hw/smbios/smbios_ipmi.h deleted +0 ~~-15~~

deleted file mode 100644
index 1c9aae38f2..0000000000
@@ -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 */

hw/smbios/smbios_type_38-stub.c +1 -1

index fc4516bc8a..14b53d004b 100644
@@ -8,7 +8,7 @@
   */
 
  #include "qemu/osdep.h"
-#include "smbios_ipmi.h"
+#include "smbios_build.h"
 
  void smbios_build_type_38_table(void)
  {

hw/smbios/smbios_type_38.c +0 -1

index d84e87d608..a1ad28d059 100644
@@ -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

Reviewed-by on v1 3/4

2018-12-10 15:04 UTC #9 lore raw

Re: [Qemu-devel] [PATCH 3/4] hw/smbios: Remove "smbios_ipmi.h"

In reply to Philippe Mathieu-Daudé

Quoted 86 lines · Philippe Mathieu-Daudé

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é <[email protected]>

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

hw/smbios/smbios.c +0 -1

index 30bd4731cf..9d737642cb 100644
@@ -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 {

hw/smbios/smbios_build.h +4 -0

index 93b360d520..56b5a1e3f3 100644
@@ -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 <[email protected]>

@@ -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 */

hw/smbios/smbios_ipmi.h deleted +0 ~~-15~~

deleted file mode 100644
index 1c9aae38f2..0000000000
@@ -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 */

hw/smbios/smbios_type_38-stub.c +1 -1

index fc4516bc8a..14b53d004b 100644
@@ -8,7 +8,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "smbios_ipmi.h"
+#include "smbios_build.h"
 
 void smbios_build_type_38_table(void)
 {

hw/smbios/smbios_type_38.c +0 -0

index d84e87d608..a1ad28d059 100644

hw/smbios/smbios_type_38.c line 17

Quoted 7 lines

hw/smbios/smbios_type_38.c +0 -1

@@ -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 <[email protected]>

Philippe Mathieu-Daudé

author

2018-12-07 16:51 UTC #10 lore raw

PATCH 4/4 hw/smbios: Move to the hw/firmware/ namespace

In reply to Philippe Mathieu-Daudé

SMBIOS is just another firmware used by some QEMU models. We will later introduce more firmwares in this namespace.

Signed-off-by Philippe Mathieu-Daudé <[email protected]>

---
 MAINTAINERS                              | 2 +-
 hw/arm/virt.c                            | 2 +-
 hw/i386/pc.c                             | 2 +-
 hw/i386/pc_piix.c                        | 2 +-
 hw/i386/pc_q35.c                         | 2 +-
 hw/smbios/smbios-stub.c                  | 2 +-
 hw/smbios/smbios.c                       | 2 +-
 hw/smbios/smbios_type_38.c               | 2 +-
 include/hw/{smbios => firmware}/smbios.h | 0
 tests/bios-tables-test.c                 | 2 +-
 vl.c                                     | 2 +-
 11 files changed, 10 insertions(+), 10 deletions(-)
 rename include/hw/{smbios => firmware}/smbios.h (100%)

MAINTAINERS +1 -1

index 63effdc473..f7ba25c146 100644
@@ -1238,7 +1238,7 @@ M: Michael S. Tsirkin <[email protected]>
 M: Igor Mammedov <[email protected]>
 S: Supported
 F: include/hw/acpi/*
-F: include/hw/smbios/*
+F: include/hw/firmware/smbios.h
 F: hw/mem/*
 F: hw/acpi/*
 F: hw/smbios/*

hw/arm/virt.c +1 -1

index f69e7eb399..49813bca1b 100644
@@ -55,7 +55,7 @@
 #include "hw/intc/arm_gic.h"
 #include "hw/intc/arm_gicv3_common.h"
 #include "kvm_arm.h"
-#include "hw/smbios/smbios.h"
+#include "hw/firmware/smbios.h"
 #include "qapi/visitor.h"
 #include "standard-headers/linux/input.h"
 #include "hw/arm/smmuv3.h"

hw/i386/pc.c +1 -1

index f095725dba..afa1098082 100644
@@ -37,7 +37,7 @@
 #include "hw/pci/pci_bus.h"
 #include "hw/nvram/fw_cfg.h"
 #include "hw/timer/hpet.h"
-#include "hw/smbios/smbios.h"
+#include "hw/firmware/smbios.h"
 #include "hw/loader.h"
 #include "elf.h"
 #include "multiboot.h"

hw/i386/pc_piix.c +1 -1

index 7092d6d13f..e3ee3091d2 100644
@@ -30,7 +30,7 @@
 #include "hw/i386/pc.h"
 #include "hw/i386/apic.h"
 #include "hw/display/ramfb.h"
-#include "hw/smbios/smbios.h"
+#include "hw/firmware/smbios.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_ids.h"
 #include "hw/usb.h"

hw/i386/pc_q35.c +1 -1

index 4702bb13c4..bc31cd5822 100644
@@ -47,7 +47,7 @@
 #include "hw/i386/amd_iommu.h"
 #include "hw/i386/intel_iommu.h"
 #include "hw/display/ramfb.h"
-#include "hw/smbios/smbios.h"
+#include "hw/firmware/smbios.h"
 #include "hw/ide/pci.h"
 #include "hw/ide/ahci.h"
 #include "hw/usb.h"

hw/smbios/smbios-stub.c +1 -1

index d3a385441a..64e5ba93ec 100644
@@ -23,7 +23,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
-#include "hw/smbios/smbios.h"
+#include "hw/firmware/smbios.h"
 
 void smbios_entry_add(QemuOpts *opts, Error **errp)
 {

hw/smbios/smbios.c +1 -1

index 9d737642cb..2a61f38637 100644
@@ -24,7 +24,7 @@
 #include "sysemu/sysemu.h"
 #include "qemu/uuid.h"
 #include "sysemu/cpus.h"
-#include "hw/smbios/smbios.h"
+#include "hw/firmware/smbios.h"
 #include "hw/loader.h"
 #include "exec/cpu-common.h"
 #include "smbios_build.h"

hw/smbios/smbios_type_38.c +1 -1

index a1ad28d059..0c08f282de 100644
@@ -9,7 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/ipmi/ipmi.h"
-#include "hw/smbios/smbios.h"
+#include "hw/firmware/smbios.h"
 #include "qemu/error-report.h"
 #include "smbios_build.h"

include/hw/firmware/smbios.h renamed from include/hw/smbios/smbios.h +0 -0

similarity index 100%
rename from include/hw/smbios/smbios.h
rename to include/hw/firmware/smbios.h

tests/bios-tables-test.c +1 -1

index d661d9be62..dfa74a5bec 100644
@@ -13,7 +13,7 @@
 #include "qemu/osdep.h"
 #include <glib/gstdio.h>
 #include "qemu-common.h"
-#include "hw/smbios/smbios.h"
+#include "hw/firmware/smbios.h"
 #include "qemu/bitmap.h"
 #include "acpi-utils.h"
 #include "boot-sector.h"

vl.c +1 -1

index a5ae5f23d2..bfc3114dd4 100644
@@ -61,7 +61,7 @@ int main(int argc, char **argv)
 #include "hw/display/vga.h"
 #include "hw/bt.h"
 #include "sysemu/watchdog.h"
-#include "hw/smbios/smbios.h"
+#include "hw/firmware/smbios.h"
 #include "hw/acpi/acpi.h"
 #include "hw/xen/xen.h"
 #include "hw/qdev.h"

Signature · 1 line

2.17.2

Laszlo Ersek

Reviewed-by on v1 4/4

2018-12-10 15:10 UTC #11 lore raw

Re: [Qemu-arm] [PATCH 4/4] hw/smbios: Move to the hw/firmware/ namespace

Quoted 4 lines · Philippe Mathieu-Daudé

SMBIOS is just another firmware used by some QEMU models. We will later introduce more firmwares in this namespace.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>

Quoted 14 lines

---
 MAINTAINERS                              | 2 +-
 hw/arm/virt.c                            | 2 +-
 hw/i386/pc.c                             | 2 +-
 hw/i386/pc_piix.c                        | 2 +-
 hw/i386/pc_q35.c                         | 2 +-
 hw/smbios/smbios-stub.c                  | 2 +-
 hw/smbios/smbios.c                       | 2 +-
 hw/smbios/smbios_type_38.c               | 2 +-
 include/hw/{smbios => firmware}/smbios.h | 0
 tests/bios-tables-test.c                 | 2 +-
 vl.c                                     | 2 +-
 11 files changed, 10 insertions(+), 10 deletions(-)
 rename include/hw/{smbios => firmware}/smbios.h (100%)

(1) Please replace the word "namespace" in the subject, and in the commit message too, with "subdirectory".

(2) Please replace "firmware" -- both instances -- in the commit message with "firmware interface", or perhaps "firmware specification".

With the updates:

Reviewed-by Laszlo Ersek <[email protected]>

Thanks,
Laszlo

Quoted 135 lines

MAINTAINERS +1 -1

index 63effdc473..f7ba25c146 100644
@@ -1238,7 +1238,7 @@ M: Michael S. Tsirkin <[email protected]>
 M: Igor Mammedov <[email protected]>
 S: Supported
 F: include/hw/acpi/*
-F: include/hw/smbios/*
+F: include/hw/firmware/smbios.h
 F: hw/mem/*
 F: hw/acpi/*
 F: hw/smbios/*

hw/arm/virt.c +1 -1

index f69e7eb399..49813bca1b 100644
@@ -55,7 +55,7 @@
 #include "hw/intc/arm_gic.h"
 #include "hw/intc/arm_gicv3_common.h"
 #include "kvm_arm.h"
-#include "hw/smbios/smbios.h"
+#include "hw/firmware/smbios.h"
 #include "qapi/visitor.h"
 #include "standard-headers/linux/input.h"
 #include "hw/arm/smmuv3.h"

hw/i386/pc.c +1 -1

index f095725dba..afa1098082 100644
@@ -37,7 +37,7 @@
 #include "hw/pci/pci_bus.h"
 #include "hw/nvram/fw_cfg.h"
 #include "hw/timer/hpet.h"
-#include "hw/smbios/smbios.h"
+#include "hw/firmware/smbios.h"
 #include "hw/loader.h"
 #include "elf.h"
 #include "multiboot.h"

hw/i386/pc_piix.c +1 -1

index 7092d6d13f..e3ee3091d2 100644
@@ -30,7 +30,7 @@
 #include "hw/i386/pc.h"
 #include "hw/i386/apic.h"
 #include "hw/display/ramfb.h"
-#include "hw/smbios/smbios.h"
+#include "hw/firmware/smbios.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_ids.h"
 #include "hw/usb.h"

hw/i386/pc_q35.c +1 -1

index 4702bb13c4..bc31cd5822 100644
@@ -47,7 +47,7 @@
 #include "hw/i386/amd_iommu.h"
 #include "hw/i386/intel_iommu.h"
 #include "hw/display/ramfb.h"
-#include "hw/smbios/smbios.h"
+#include "hw/firmware/smbios.h"
 #include "hw/ide/pci.h"
 #include "hw/ide/ahci.h"
 #include "hw/usb.h"

hw/smbios/smbios-stub.c +1 -1

index d3a385441a..64e5ba93ec 100644
@@ -23,7 +23,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
-#include "hw/smbios/smbios.h"
+#include "hw/firmware/smbios.h"
 
 void smbios_entry_add(QemuOpts *opts, Error **errp)
 {

hw/smbios/smbios.c +1 -1

index 9d737642cb..2a61f38637 100644
@@ -24,7 +24,7 @@
 #include "sysemu/sysemu.h"
 #include "qemu/uuid.h"
 #include "sysemu/cpus.h"
-#include "hw/smbios/smbios.h"
+#include "hw/firmware/smbios.h"
 #include "hw/loader.h"
 #include "exec/cpu-common.h"
 #include "smbios_build.h"

hw/smbios/smbios_type_38.c +1 -1

index a1ad28d059..0c08f282de 100644
@@ -9,7 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/ipmi/ipmi.h"
-#include "hw/smbios/smbios.h"
+#include "hw/firmware/smbios.h"
 #include "qemu/error-report.h"
 #include "smbios_build.h"

include/hw/firmware/smbios.h renamed from include/hw/smbios/smbios.h +0 -0

similarity index 100%
rename from include/hw/smbios/smbios.h
rename to include/hw/firmware/smbios.h

tests/bios-tables-test.c +1 -1

index d661d9be62..dfa74a5bec 100644
@@ -13,7 +13,7 @@
 #include "qemu/osdep.h"
 #include <glib/gstdio.h>
 #include "qemu-common.h"
-#include "hw/smbios/smbios.h"
+#include "hw/firmware/smbios.h"
 #include "qemu/bitmap.h"
 #include "acpi-utils.h"
 #include "boot-sector.h"

vl.c +1 -1

index a5ae5f23d2..bfc3114dd4 100644
@@ -61,7 +61,7 @@ int main(int argc, char **argv)
 #include "hw/display/vga.h"
 #include "hw/bt.h"
 #include "sysemu/watchdog.h"
-#include "hw/smbios/smbios.h"
+#include "hw/firmware/smbios.h"
 #include "hw/acpi/acpi.h"
 #include "hw/xen/xen.h"
 #include "hw/qdev.h"

Philippe Mathieu-Daudé

author

2018-12-10 16:04 UTC #12 lore raw

Re: [Qemu-devel] [PATCH 4/4] hw/smbios: Move to the hw/firmware/ namespace

Quoted 20 lines · Laszlo Ersek

Quoted 4 lines · Philippe Mathieu-Daudé

SMBIOS is just another firmware used by some QEMU models. We will later introduce more firmwares in this namespace.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>

Quoted 14 lines

---
 MAINTAINERS                              | 2 +-
 hw/arm/virt.c                            | 2 +-
 hw/i386/pc.c                             | 2 +-
 hw/i386/pc_piix.c                        | 2 +-
 hw/i386/pc_q35.c                         | 2 +-
 hw/smbios/smbios-stub.c                  | 2 +-
 hw/smbios/smbios.c                       | 2 +-
 hw/smbios/smbios_type_38.c               | 2 +-
 include/hw/{smbios => firmware}/smbios.h | 0
 tests/bios-tables-test.c                 | 2 +-
 vl.c                                     | 2 +-
 11 files changed, 10 insertions(+), 10 deletions(-)
 rename include/hw/{smbios => firmware}/smbios.h (100%)

Quoted 5 lines

(1) Please replace the word "namespace" in the subject, and in the commit message too, with "subdirectory".
(2) Please replace "firmware" -- both instances -- in the commit message with "firmware interface", or perhaps "firmware specification".

I'll go with "firmware interface", because I'd like to eventually put here helpers for firmwares with no public specification.

Quoted 6 lines

With the updates:
Reviewed-by Laszlo Ersek <[email protected]>
Thanks,
Laszlo

Michael S. Tsirkin

Reviewed-by on the v1 series

2018-12-07 17:36 UTC #13 lore raw

In reply to Philippe Mathieu-Daudé

Quoted 6 lines · Philippe Mathieu-Daudé

QEMU interacts with various firmwares. We already have some helpers for some firmwares. Later we will add UEFI helpers.
This series introduce the hw/firmware namespace for this.
There is no need to move hw/smbios sources into a specific directory, we only focus on the headers.

I like this

Reviewed-by Michael S. Tsirkin <[email protected]>

will queue after giving people a bit of time for review.

Quoted 27 lines

Philippe Mathieu-Daudé (4):
tests: Remove unused include
hw/smbios: Restrict access to "smbios_ipmi.h"
hw/smbios: Remove "smbios_ipmi.h"
hw/smbios: Move to the hw/firmware/ namespace

 MAINTAINERS                              |  2 +-
 hw/arm/virt.c                            |  2 +-
 hw/i386/pc.c                             |  2 +-
 hw/i386/pc_piix.c                        |  2 +-
 hw/i386/pc_q35.c                         |  2 +-
 hw/smbios/smbios-stub.c                  |  2 +-
 hw/smbios/smbios.c                       |  3 +--
 hw/smbios/smbios_build.h                 |  4 ++++
 hw/smbios/smbios_type_38-stub.c          |  2 +-
 hw/smbios/smbios_type_38.c               |  3 +--
 include/hw/{smbios => firmware}/smbios.h |  0
 include/hw/smbios/ipmi.h                 | 15 ---------------
 tests/acpi-utils.c                       |  1 -
 tests/bios-tables-test.c                 |  2 +-
 vl.c                                     |  2 +-
 15 files changed, 15 insertions(+), 29 deletions(-)
 rename include/hw/{smbios => firmware}/smbios.h (100%)
 delete mode 100644 include/hw/smbios/ipmi.h

Signature · 1 line

2.17.2