diff options
| author | Peter Maydell | 2020-10-01 16:28:55 +0200 |
|---|---|---|
| committer | Peter Maydell | 2020-10-01 16:28:55 +0200 |
| commit | b23317eec4715aa62de9a6e5490a01122c8eef0e (patch) | |
| tree | 4c46752e3d1092ab006305b3ca8f845ea348a342 /include/exec | |
| parent | Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into ... (diff) | |
| parent | tests/acpi: update expected data files (diff) | |
| download | qemu-b23317eec4715aa62de9a6e5490a01122c8eef0e.tar.gz qemu-b23317eec4715aa62de9a6e5490a01122c8eef0e.tar.xz qemu-b23317eec4715aa62de9a6e5490a01122c8eef0e.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/microvm-20200930-pull-request' into staging
microvm: add pcie support.
# gpg: Signature made Wed 30 Sep 2020 18:48:41 BST
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/microvm-20200930-pull-request:
tests/acpi: update expected data files
acpi/gpex: no reason to use a method for _CRS
tests/acpi: add microvm pcie test
tests/acpi: factor out common microvm test setup
tests/acpi: add empty tests/data/acpi/microvm/DSDT.pcie file
tests/acpi: allow updates for expected data files
microvm/pcie: add 64bit mmio window
microvm: add pcie support
microvm: add irq table
arm: use acpi_dsdt_add_gpex
acpi: add acpi_dsdt_add_gpex
move MemMapEntry
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/exec')
| -rw-r--r-- | include/exec/hwaddr.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/exec/hwaddr.h b/include/exec/hwaddr.h index a71c93cc81..8f16d179a8 100644 --- a/include/exec/hwaddr.h +++ b/include/exec/hwaddr.h @@ -18,4 +18,9 @@ typedef uint64_t hwaddr; #define HWADDR_PRIx PRIx64 #define HWADDR_PRIX PRIX64 +typedef struct MemMapEntry { + hwaddr base; + hwaddr size; +} MemMapEntry; + #endif |