On 08/06/15 19:14, Wei Huang wrote:
> 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.
Makes sense to me; "acpi" is also under "hw".
> As a result, CONFIG_SMBIOS=y is defined in
> x86 default config files.
>
> Signed-off-by: Wei Huang <w...@redhat.com>
> ---
> arch_init.c | 2 +-
> default-configs/i386-softmmu.mak | 1 +
> default-configs/x86_64-softmmu.mak | 1 +
> hw/Makefile.objs | 1 +
> hw/i386/Makefile.objs | 2 +-
> hw/i386/pc.c | 2 +-
> hw/i386/pc_piix.c | 2 +-
> hw/i386/pc_q35.c | 2 +-
> hw/smbios/Makefile.objs | 1 +
> hw/{i386 => smbios}/smbios.c | 2 +-
> include/hw/{i386 => smbios}/smbios.h | 0
> tests/bios-tables-test.c | 2 +-
> vl.c | 2 +-
> 13 files changed, 12 insertions(+), 8 deletions(-)
> create mode 100644 hw/smbios/Makefile.objs
> rename hw/{i386 => smbios}/smbios.c (99%)
> rename include/hw/{i386 => smbios}/smbios.h (100%)
>
> diff --git a/arch_init.c b/arch_init.c
> index 725c638..38f5fb9 100644
> --- a/arch_init.c
> +++ b/arch_init.c
> @@ -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"
> diff --git a/default-configs/i386-softmmu.mak
> b/default-configs/i386-softmmu.mak
> index 48b5762..5eaafa1 100644
> --- a/default-configs/i386-softmmu.mak
> +++ b/default-configs/i386-softmmu.mak
> @@ -49,3 +49,4 @@ CONFIG_MEM_HOTPLUG=y
> CONFIG_XIO3130=y
> CONFIG_IOH3420=y
> CONFIG_I82801B11=y
> +CONFIG_SMBIOS=y
> diff --git a/default-configs/x86_64-softmmu.mak
> b/default-configs/x86_64-softmmu.mak
> index 4962ed7..28e2099 100644
> --- a/default-configs/x86_64-softmmu.mak
> +++ b/default-configs/x86_64-softmmu.mak
> @@ -50,3 +50,4 @@ CONFIG_MEM_HOTPLUG=y
> CONFIG_XIO3130=y
> CONFIG_IOH3420=y
> CONFIG_I82801B11=y
> +CONFIG_SMBIOS=y
> diff --git a/hw/Makefile.objs b/hw/Makefile.objs
> index 73afa41..7e7c241 100644
> --- a/hw/Makefile.objs
> +++ b/hw/Makefile.objs
> @@ -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)
> diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs
> index bd4f147..723a4d8 100644
> --- a/hw/i386/Makefile.objs
> +++ b/hw/i386/Makefile.objs
> @@ -1,5 +1,5 @@
> 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
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index 944d5b1..80291fe 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -33,7 +33,7 @@
> #include "hw/pci/pci_bus.h"
> #include "hw/nvram/fw_cfg.h"
> #include "hw/timer/hpet.h"
> -#include "hw/i386/smbios.h"
> +#include "hw/smbios/smbios.h"
> #include "hw/loader.h"
> #include "elf.h"
> #include "multiboot.h"
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index a896624..653c710 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -28,7 +28,7 @@
> #include "hw/loader.h"
> #include "hw/i386/pc.h"
> #include "hw/i386/apic.h"
> -#include "hw/i386/smbios.h"
> +#include "hw/smbios/smbios.h"
> #include "hw/pci/pci.h"
> #include "hw/pci/pci_ids.h"
> #include "hw/usb.h"
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index 974aead..d83df14 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -39,7 +39,7 @@
> #include "hw/pci-host/q35.h"
> #include "exec/address-spaces.h"
> #include "hw/i386/ich9.h"
> -#include "hw/i386/smbios.h"
> +#include "hw/smbios/smbios.h"
> #include "hw/ide/pci.h"
> #include "hw/ide/ahci.h"
> #include "hw/usb.h"
> diff --git a/hw/smbios/Makefile.objs b/hw/smbios/Makefile.objs
> new file mode 100644
> index 0000000..f69a92f
> --- /dev/null
> +++ b/hw/smbios/Makefile.objs
> @@ -0,0 +1 @@
> +common-obj-$(CONFIG_SMBIOS) += smbios.o
> diff --git a/hw/i386/smbios.c b/hw/smbios/smbios.c
> similarity index 99%
> rename from hw/i386/smbios.c
> rename to hw/smbios/smbios.c
> index 12aee90..08ba62a 100644
> --- a/hw/i386/smbios.c
> +++ b/hw/smbios/smbios.c
> @@ -19,7 +19,7 @@
> #include "qemu/error-report.h"
> #include "sysemu/sysemu.h"
> #include "sysemu/cpus.h"
> -#include "hw/i386/smbios.h"
> +#include "hw/smbios/smbios.h"
> #include "hw/loader.h"
> #include "exec/cpu-common.h"
>
> diff --git a/include/hw/i386/smbios.h b/include/hw/smbios/smbios.h
> similarity index 100%
> rename from include/hw/i386/smbios.h
> rename to include/hw/smbios/smbios.h
> diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
> index 0de1742..613867a 100644
> --- a/tests/bios-tables-test.c
> +++ b/tests/bios-tables-test.c
> @@ -18,7 +18,7 @@
> #include "libqtest.h"
> #include "qemu/compiler.h"
> #include "hw/acpi/acpi-defs.h"
> -#include "hw/i386/smbios.h"
> +#include "hw/smbios/smbios.h"
> #include "qemu/bitmap.h"
>
> #define MACHINE_PC "pc"
> diff --git a/vl.c b/vl.c
> index 0adbbd6..584ca88 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -68,7 +68,7 @@ int main(int argc, char **argv)
> #include "hw/isa/isa.h"
> #include "hw/bt.h"
> #include "sysemu/watchdog.h"
> -#include "hw/i386/smbios.h"
> +#include "hw/smbios/smbios.h"
> #include "hw/xen/xen.h"
> #include "hw/qdev.h"
> #include "hw/loader.h"
>
Reviewed-by: Laszlo Ersek <ler...@redhat.com>
