Commit 60d8f328 authored by Wei Huang's avatar Wei Huang Committed by Michael S. Tsirkin
Browse files

smbios: move smbios code into a common folder 



To share smbios among different architectures, this patch moves SMBIOS
code (smbios.c and smbios.h) from x86 specific folders into new
hw/smbios directories. As a result, CONFIG_SMBIOS=y is defined in
x86 default config files.

Acked-by: default avatarGabriel Somlo <somlo@cmu.edu>
Tested-by: default avatarGabriel Somlo <somlo@cmu.edu>
Reviewed-by: default avatarLaszlo Ersek <lersek@redhat.com>
Tested-by: default avatarLeif Lindholm <leif.lindholm@linaro.org>
Signed-off-by: default avatarWei Huang <wei@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 89cc4a27

arch_init.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include "sysemu/arch_init.h"

#include "hw/pci/pci.h"

#include "hw/audio/audio.h"

#include "hw/i386/smbios.h"

#include "hw/smbios/smbios.h"

#include "qemu/config-file.h"

#include "qemu/error-report.h"

#include "qmp-commands.h"

default-configs/i386-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -49,3 +49,4 @@ CONFIG_MEM_HOTPLUG=y 
CONFIG_XIO3130=y

CONFIG_IOH3420=y

CONFIG_I82801B11=y

CONFIG_SMBIOS=y

default-configs/x86_64-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -50,3 +50,4 @@ CONFIG_MEM_HOTPLUG=y 
CONFIG_XIO3130=y

CONFIG_IOH3420=y

CONFIG_I82801B11=y

CONFIG_SMBIOS=y

hw/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ devices-dirs-$(CONFIG_VIRTIO) += virtio/ 
devices-dirs-$(CONFIG_SOFTMMU) += watchdog/

devices-dirs-$(CONFIG_SOFTMMU) += xen/

devices-dirs-$(CONFIG_MEM_HOTPLUG) += mem/

devices-dirs-$(CONFIG_SMBIOS) += smbios/

devices-dirs-y += core/

common-obj-y += $(devices-dirs-y)

obj-y += $(devices-dirs-y)

hw/i386/Makefile.objs

+1 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_KVM) += kvm/

obj-y += multiboot.o smbios.o

obj-y += multiboot.o

obj-y += pc.o pc_piix.o pc_q35.o

obj-y += pc_sysfw.o

obj-y += intel_iommu.o