[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v3 07/44] hw/smbios: Remove "smbios_ipmi.h"
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v3 07/44] hw/smbios: Remove "smbios_ipmi.h" |
Date: |
Thu, 20 Dec 2018 13:38:00 -0500 |
From: Philippe Mathieu-Daudé <address@hidden>
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.
Reviewed-by: Corey Minyard <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/smbios/smbios_build.h | 4 ++++
hw/smbios/smbios_ipmi.h | 15 ---------------
hw/smbios/smbios.c | 1 -
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_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 <address@hidden>
@@ -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.c b/hw/smbios/smbios.c
index 6fe5be3586..4bff9b5ea4 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_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 {
--
MST
- [Qemu-devel] [PULL v3 00/44] pci, pc, virtio: fixes, features, Michael S. Tsirkin, 2018/12/20
- [Qemu-devel] [PULL v3 01/44] pcie: set link state inactive/active after hot unplug/plug, Michael S. Tsirkin, 2018/12/20
- [Qemu-devel] [PULL v3 04/44] virtio: Provide version-specific variants of virtio PCI devices, Michael S. Tsirkin, 2018/12/20
- [Qemu-devel] [PULL v3 03/44] virtio: Helper for registering virtio device types, Michael S. Tsirkin, 2018/12/20
- [Qemu-devel] [PULL v3 05/44] tests: Remove unused include, Michael S. Tsirkin, 2018/12/20
- [Qemu-devel] [PULL v3 06/44] hw/smbios: Restrict access to "hw/smbios/ipmi.h", Michael S. Tsirkin, 2018/12/20
- [Qemu-devel] [PULL v3 02/44] pc:piix4: Update smbus I/O space after a migration, Michael S. Tsirkin, 2018/12/20
- [Qemu-devel] [PULL v3 09/44] hw/pci-bridge: Fix invalid free(), Michael S. Tsirkin, 2018/12/20
- [Qemu-devel] [PULL v3 07/44] hw/smbios: Remove "smbios_ipmi.h",
Michael S. Tsirkin <=
- [Qemu-devel] [PULL v3 08/44] hw/smbios: Move to the hw/firmware/ subdirectory, Michael S. Tsirkin, 2018/12/20
- [Qemu-devel] [PULL v3 10/44] pcie: Create enums for link speed and width, Michael S. Tsirkin, 2018/12/20
- [Qemu-devel] [PULL v3 12/44] qapi: Define PCIe link speed and width properties, Michael S. Tsirkin, 2018/12/20
- [Qemu-devel] [PULL v3 14/44] pcie: Fill PCIESlot link fields to support higher speeds and widths, Michael S. Tsirkin, 2018/12/20
- [Qemu-devel] [PULL v3 13/44] pcie: Add link speed and width fields to PCIESlot, Michael S. Tsirkin, 2018/12/20
- [Qemu-devel] [PULL v3 15/44] pcie: Allow generic PCIe root port to specify link speed and width, Michael S. Tsirkin, 2018/12/20
- [Qemu-devel] [PULL v3 17/44] pcie: Fast PCIe root ports for new machines, Michael S. Tsirkin, 2018/12/20
- [Qemu-devel] [PULL v3 11/44] pci: Sync PCIe downstream port LNKSTA on read, Michael S. Tsirkin, 2018/12/20
- [Qemu-devel] [PULL v3 18/44] intel_iommu: dump correct iova when failed, Michael S. Tsirkin, 2018/12/20
- [Qemu-devel] [PULL v3 19/44] intel_iommu: convert invalid traces into error reports, Michael S. Tsirkin, 2018/12/20