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

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



acpi, pc features

pxb support for q35
nvdimm support
most of ipmi support
part of DSDT rewrite

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

# gpg: Signature made Tue 22 Dec 2015 16:47:18 GMT 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: (55 commits)
  acpi: extend aml_and() to accept target argument
  acpi: extend aml_or() to accept target argument
  acpi add aml_dma()
  acpi: add aml_to_buffer()
  acpi: add aml_to_hexstring()
  acpi: extend aml_field() to support LockRule
  acpi: add aml_lgreater()
  acpi: add aml_lor()
  acpi: add aml_sleep()
  acpi: add aml_alias()
  acpi: extend aml_shiftright() to accept target argument
  acpi: add aml_to_integer()
  acpi: add aml_call0() helper
  acpi: add aml_decrement() and aml_subtract()
  acpi: extend aml_add() to accept target argument
  acpi: aml: add helper for Opcode Arg2 Arg2 [Dst] AML pattern
  acpi: add aml_create_qword_field()
  acpi: add aml_mutex(), aml_acquire(), aml_release()
  acpi: add aml_lgreater_equal()
  acpi: add aml_sizeof
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 05bec7eb 5530427f

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -941,6 +941,13 @@ M: Jiri Pirko <jiri@resnulli.us> 
S: Maintained

F: hw/net/rocker/



NVDIMM

M: Xiao Guangrong <guangrong.xiao@linux.intel.com>

S: Maintained

F: hw/acpi/nvdimm.c

F: hw/mem/nvdimm.c

F: include/hw/mem/nvdimm.h



Subsystems

----------

Audio

default-configs/i386-softmmu.mak

+7 −0
Original line number Diff line number Diff line
@@ -9,6 +9,11 @@ CONFIG_VGA_CIRRUS=y 
CONFIG_VMWARE_VGA=y

CONFIG_VIRTIO_VGA=y

CONFIG_VMMOUSE=y

CONFIG_IPMI=y

CONFIG_IPMI_LOCAL=y

CONFIG_IPMI_EXTERN=y

CONFIG_ISA_IPMI_KCS=y

CONFIG_ISA_IPMI_BT=y

CONFIG_SERIAL=y

CONFIG_PARALLEL=y

CONFIG_I8254=y
@@ -46,6 +51,8 @@ CONFIG_APIC=y 
CONFIG_IOAPIC=y

CONFIG_PVPANIC=y

CONFIG_MEM_HOTPLUG=y

CONFIG_NVDIMM=y

CONFIG_ACPI_NVDIMM=y

CONFIG_XIO3130=y

CONFIG_IOH3420=y

CONFIG_I82801B11=y

default-configs/x86_64-softmmu.mak

+7 −0
Original line number Diff line number Diff line
@@ -9,6 +9,11 @@ CONFIG_VGA_CIRRUS=y 
CONFIG_VMWARE_VGA=y

CONFIG_VIRTIO_VGA=y

CONFIG_VMMOUSE=y

CONFIG_IPMI=y

CONFIG_IPMI_LOCAL=y

CONFIG_IPMI_EXTERN=y

CONFIG_ISA_IPMI_KCS=y

CONFIG_ISA_IPMI_BT=y

CONFIG_SERIAL=y

CONFIG_PARALLEL=y

CONFIG_I8254=y
@@ -46,6 +51,8 @@ CONFIG_APIC=y 
CONFIG_IOAPIC=y

CONFIG_PVPANIC=y

CONFIG_MEM_HOTPLUG=y

CONFIG_NVDIMM=y

CONFIG_ACPI_NVDIMM=y

CONFIG_XIO3130=y

CONFIG_IOH3420=y

CONFIG_I82801B11=y

docs/pci_expander_bridge.txt

+3 −3
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ A detailed command line would be: 
-object memory-backend-ram,size=1024M,policy=bind,host-nodes=0,id=ram-node0 -numa node,nodeid=0,cpus=0,memdev=ram-node0

-object memory-backend-ram,size=1024M,policy=bind,host-nodes=1,id=ram-node1 -numa node,nodeid=1,cpus=1,memdev=ram-node1

-device pxb,id=bridge1,bus=pci.0,numa_node=1,bus_nr=4 -netdev user,id=nd -device e1000,bus=bridge1,addr=0x4,netdev=nd

-device pxb,id=bridge2,bus=pci.0,numa_node=0,bus_nr=8,bus=pci.0 -device e1000,bus=bridge2,addr=0x3

-device pxb,id=bridge3,bus=pci.0,bus_nr=40,bus=pci.0 -drive if=none,id=drive0,file=[img] -device virtio-blk-pci,drive=drive0,scsi=off,bus=bridge3,addr=1

-device pxb,id=bridge2,bus=pci.0,numa_node=0,bus_nr=8, -device e1000,bus=bridge2,addr=0x3

-device pxb,id=bridge3,bus=pci.0,bus_nr=40, -drive if=none,id=drive0,file=[img] -device virtio-blk-pci,drive=drive0,scsi=off,bus=bridge3,addr=1



Here you have:

 - 2 NUMA nodes for the guest, 0 and 1. (both mapped to the same NUMA node in host, but you can and should put it in different host NUMA nodes)

hw/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ devices-dirs-$(CONFIG_SOFTMMU) += ide/ 
devices-dirs-$(CONFIG_SOFTMMU) += input/

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

devices-dirs-$(CONFIG_IPACK) += ipack/

devices-dirs-$(CONFIG_IPMI) += ipmi/

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

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

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