jcs.org / qemu
qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio
fork atom

hw/smbios: Remove "smbios_ipmi.h"

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 <cminyard@mvista.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

authored by

Philippe Mathieu-Daudé and committed by
Michael S. Tsirkin 5aca89d1 cc4d4cef

+5 -18
-1
hw/smbios/smbios.c
··· 28 28 #include "hw/loader.h" 29 29 #include "exec/cpu-common.h" 30 30 #include "smbios_build.h" 31 - #include "smbios_ipmi.h" 32 31 33 32 /* legacy structures and constants for <= 2.0 machines */ 34 33 struct smbios_header {
+4
hw/smbios/smbios_build.h
··· 3 3 * 4 4 * Copyright (C) 2009 Hewlett-Packard Development Company, L.P. 5 5 * Copyright (C) 2013 Red Hat, Inc. 6 + * Copyright (c) 2015,2016 Corey Minyard, MontaVista Software, LLC 6 7 * 7 8 * Authors: 8 9 * Alex Williamson <alex.williamson@hp.com> ··· 95 96 /* update smbios element count */ \ 96 97 smbios_table_cnt++; \ 97 98 } while (0) 99 + 100 + /* IPMI SMBIOS firmware handling */ 101 + void smbios_build_type_38_table(void); 98 102 99 103 #endif /* QEMU_SMBIOS_BUILD_H */
-15
hw/smbios/smbios_ipmi.h
··· 1 - /* 2 - * IPMI SMBIOS firmware handling 3 - * 4 - * Copyright (c) 2015,2016 Corey Minyard, MontaVista Software, LLC 5 - * 6 - * This work is licensed under the terms of the GNU GPL, version 2 or later. 7 - * See the COPYING file in the top-level directory. 8 - */ 9 - 10 - #ifndef QEMU_SMBIOS_IPMI_H 11 - #define QEMU_SMBIOS_IPMI_H 12 - 13 - void smbios_build_type_38_table(void); 14 - 15 - #endif /* QEMU_SMBIOS_IPMI_H */
+1 -1
hw/smbios/smbios_type_38-stub.c
··· 8 8 */ 9 9 10 10 #include "qemu/osdep.h" 11 - #include "smbios_ipmi.h" 11 + #include "smbios_build.h" 12 12 13 13 void smbios_build_type_38_table(void) 14 14 {
-1
hw/smbios/smbios_type_38.c
··· 12 12 #include "hw/smbios/smbios.h" 13 13 #include "qemu/error-report.h" 14 14 #include "smbios_build.h" 15 - #include "smbios_ipmi.h" 16 15 17 16 /* SMBIOS type 38 - IPMI */ 18 17 struct smbios_type_38 {