Commit 5c314a2e authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging 



virtio,pc,acpi fixes, cleanups

Mostly cleanups, notably Eduardo's compat code rework,
and smbios rearrangement for use by ARM.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Thu 13 Aug 2015 12:59:16 BST using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"

* remotes/mst/tags/for_upstream: (24 commits)
  MAINTAINERS: list smbios maintainers
  smbios: move smbios code into a common folder
  smbios: remove dependency on x86 e820 tables
  smbios: extract x86 smbios building code into a function
  acpi: avoid potential uninitialized access to cpu_hp_io_base
  virtio-net: remove useless codes
  pci: allow 0 address for PCI IO/MEM regions
  pc: Remove redundant arguments from pc_memory_init()
  pc: Remove redundant arguments from pc_cmos_init()
  pc: Remove redundant arguments from *load_linux()
  pc: Use PCMachineState as pc_guest_info_init() argument
  pc: Move {above,below}_4g_mem_size variables to PCMachineState
  pc: Use PCMachineState for pc_memory_init() argument
  pc: Use PCMachineState for pc_cmos_init() argument
  pc: Eliminate pc_default_machine_options()
  pc: Eliminate pc_common_machine_options()
  pc: Move PCMachineClass, PCMachineState to qemu/typedefs.h
  pc: Rename pc_machine variables to pcms
  pc: Use error_abort when registering properties
  target-i386: Remove x86_cpu_compat_set_features()
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 425591e3 d31e5ae7

MAINTAINERS

+3 −1
Original line number Diff line number Diff line
@@ -645,13 +645,15 @@ S: Supported 
F: include/hw/pci/*

F: hw/pci/*



ACPI

ACPI/SMBIOS

M: Michael S. Tsirkin <mst@redhat.com>

M: Igor Mammedov <imammedo@redhat.com>

S: Supported

F: include/hw/acpi/*

F: include/hw/smbios/*

F: hw/mem/*

F: hw/acpi/*

F: hw/smbios/*

F: hw/i386/acpi-build.[hc]

F: hw/i386/*dsl

F: hw/arm/virt-acpi-build.c

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)