diff options
| author | Peter Maydell | 2019-05-23 13:00:37 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-05-23 13:00:37 +0200 |
| commit | c4600d5d417ea13e0f1cc047b227a2b5b0e694f5 (patch) | |
| tree | 0d161df5dd290aaa508108c15d087cddd46ffffa /include | |
| parent | Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2019-05-22' into ... (diff) | |
| parent | pci: msix: move 'MSIX_CAP_LENGTH' to header file (diff) | |
| download | qemu-c4600d5d417ea13e0f1cc047b227a2b5b0e694f5.tar.gz qemu-c4600d5d417ea13e0f1cc047b227a2b5b0e694f5.tar.xz qemu-c4600d5d417ea13e0f1cc047b227a2b5b0e694f5.zip | |
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into staging
typo fixes, TYPE_XXX usage cleanup, comments update,
virtio-mmio trace functions cleanup
# gpg: Signature made Wed 22 May 2019 17:06:56 BST
# gpg: using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier2/tags/trivial-branch-pull-request:
pci: msix: move 'MSIX_CAP_LENGTH' to header file
vfio: platform: fix a typo
hw: vfio: drop TYPE_FOO MACRO in VMStateDescription
vfio: pci: make "vfio-pci-nohotplug" as MACRO
configure: Fix spelling of sdl-image in --help
migration: Fix typo in migrate_add_blocker() error message
roms: List and describe the Makefile 'clean' rule
roms: Correct the EDK2_BASETOOLS_OPTFLAGS variable description
hw/virtio/virtio-mmio: Convert DPRINTF to trace and log
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/pci/msix.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/hw/pci/msix.h b/include/hw/pci/msix.h index 1f27658d35..08acfa836e 100644 --- a/include/hw/pci/msix.h +++ b/include/hw/pci/msix.h @@ -4,6 +4,8 @@ #include "qemu-common.h" #include "hw/pci/pci.h" +#define MSIX_CAP_LENGTH 12 + void msix_set_message(PCIDevice *dev, int vector, MSIMessage msg); MSIMessage msix_get_message(PCIDevice *dev, unsigned int vector); int msix_init(PCIDevice *dev, unsigned short nentries, |