summaryrefslogtreecommitdiff
path: root/include/hw/acpi/pc-hotplug.h
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-08-15 17:43:51 +0100
committerPeter Maydell <peter.maydell@linaro.org>2014-08-15 17:43:51 +0100
commitf2c85a2f36f57f155cda7bc9f7c42b44f1a2439e (patch)
treefb094b872fdc1944ab05f9e0038b030f8272fda4 /include/hw/acpi/pc-hotplug.h
parent5c6b3c50cca2106e5fbcbc6efa94c2f8b9d29fd8 (diff)
parent260cb1c409f6b41fc284ece95462e458d7fda6c4 (diff)
downloadqemu-f2c85a2f36f57f155cda7bc9f7c42b44f1a2439e.tar.gz
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: Michael 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: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/acpi/pc-hotplug.h')
-rw-r--r--include/hw/acpi/pc-hotplug.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/hw/acpi/pc-hotplug.h b/include/hw/acpi/pc-hotplug.h
index bf5157d7c3..b9db29576c 100644
--- a/include/hw/acpi/pc-hotplug.h
+++ b/include/hw/acpi/pc-hotplug.h
@@ -32,7 +32,7 @@
#define ACPI_MEMORY_HOTPLUG_IO_LEN 24
#define ACPI_MEMORY_HOTPLUG_BASE 0x0a00
-#define MEMORY_HOPTLUG_DEVICE MHPD
+#define MEMORY_HOTPLUG_DEVICE MHPD
#define MEMORY_SLOTS_NUMBER MDNR
#define MEMORY_HOTPLUG_IO_REGION HPMR
#define MEMORY_SLOT_ADDR_LOW MRBL