Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
post-2.1 bugfixes A bunch of fixes that missed 2.1 by a small margin. If we do 2.1.1, some of these would be good candidates, added Cc qemu-stable as appropriate. Signed-off-by: NMichael S. Tsirkin <mst@redhat.com> # gpg: Signature made Thu 14 Aug 2014 17:07:25 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: pc: Get rid of pci-info leftovers e1000: use symbolic constants to init phy ctrl & status registers e1000: correctly handle phy_ctrl reserved & self-clearing bits ivshmem: fix building when debug mode is enabled acpi: align RSDP numa: show hex number in error message for consistency and prefix them with 0x pc-dimm: fix up error message pc-dimm: validate node property hw:i386: typo fix: MEMORY_HOPTLUG_DEVICE -> MEMORY_HOTPLUG_DEVICE hw/audio/intel-hda: Fix MSI capability address pc: Create 2.2 machine type pci: Use bus master address space for delivering MSI/MSI-X messages Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
Showing
想要评论请 注册 或 登录