diff options
| author | Peter Maydell | 2015-06-01 16:22:46 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-06-01 16:22:46 +0200 |
| commit | b821cbe274c5a5cacf1a7b28360d869ae1e6e0c3 (patch) | |
| tree | 400b2e88bf5c577a4cbc5695d4fb12b30360df89 /include/exec | |
| parent | Merge remote-tracking branch 'remotes/bkoppelmann/tags/pull-tricore-20150530'... (diff) | |
| parent | vhost-user: add multi queue support (diff) | |
| download | qemu-b821cbe274c5a5cacf1a7b28360d869ae1e6e0c3.tar.gz qemu-b821cbe274c5a5cacf1a7b28360d869ae1e6e0c3.tar.xz qemu-b821cbe274c5a5cacf1a7b28360d869ae1e6e0c3.zip | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
pc, pci, tpm, virtio, vhost enhancements and fixes
A bunch of cleanups and fixes all over the place,
enhancements in TPM, virtio and vhost.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Mon Jun 1 13:19:48 2015 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: (60 commits)
vhost-user: add multi queue support
virtio: make features 64bit wide
qdev: add 64bit properties
virtio-mmio: ioeventfd support
hw/acpi/aml-build: Fix memory leak
acpi: add aml_while() term
acpi: add aml_increment() term
acpi: add aml_shiftright() term
acpi: add aml_shiftleft() term
acpi: add aml_index() term
acpi: add aml_lless() term
acpi: add aml_add() term
TPM2 ACPI table support
tpm: Probe for connected TPM 1.2 or TPM 2
Extend TPM TIS interface to support TPM 2
Add stream ID to MSI write
acpi: Simplify printing to dynamic string
i386: drop FDC in pc-q35-2.4+ if neither it nor floppy drives are wanted
i386/pc_q35: don't insist on board FDC if there's no default floppy
i386/pc: '-drive if=floppy' should imply a board-default FDC
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/exec')
| -rw-r--r-- | include/exec/memattrs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/exec/memattrs.h b/include/exec/memattrs.h index 1389b4b01d..96dc440423 100644 --- a/include/exec/memattrs.h +++ b/include/exec/memattrs.h @@ -33,6 +33,8 @@ typedef struct MemTxAttrs { unsigned int secure:1; /* Memory access is usermode (unprivileged) */ unsigned int user:1; + /* Stream ID (for MSI for example) */ + unsigned int stream_id:16; } MemTxAttrs; /* Bus masters which don't specify any attributes will get this, |