OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Pull request 

-----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEhpWov9P5fNqsNXdanKSrs4Grc8gFAl38oYcACgkQnKSrs4Gr
 c8g8vgf+M5I7pJpPe6bRORrpd0K2Ji6kU9LS7Up6Tm6WLPsX3izVvKrWoHBCKJyt
 R6fwImw4WukDuesYvOMVZWfsr+hSyjw1GVSahMOJZ8zKvZdRt1cvXMaiwck0178J
 wBycLDXdTxrVpYoHJzXCE/dvD39nvMeCA8E3PImThPfI9Rxdg3QTbvilj62//Omj
 fV0ZZPdvi4CFkzbqbBSoLTzepl3NOtoeffeaaKa7JQfw7ttrWicZM8PayKVTgML1
 TPD6EOiwekXP/H6l1jYV4zTMHxjutrZwdePmGq8uTDmVOUgFzFgV9dZcBNHQAmBb
 DwzDBR0RhjsuKnZ01kpg95f8cP0h4A==
 =R5ec
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging

Pull request

# gpg: Signature made Fri 20 Dec 2019 10:25:11 GMT
# gpg:                using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full]
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>" [full]
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/block-pull-request:
  virtio-blk: fix out-of-bounds access to bitmap in notify_guest_bh
  docs: fix rst syntax errors in unbuilt docs
  virtio-blk: deprecate SCSI passthrough

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2020-01-03 17:18:08 +00:00
parent 40f09ee833 725fe5d10d
commit f0dcfddece
5 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/arm-cpu-features.rst
View File

@ -41,9 +41,9 @@ CPU type is possible with the `query-cpu-model-expansion` QMP command.
Below are some examples where `scripts/qmp/qmp-shell` (see the top comment Below are some examples where `scripts/qmp/qmp-shell` (see the top comment
block in the script for usage) is used to issue the QMP commands. block in the script for usage) is used to issue the QMP commands.
(1) Determine which CPU features are available for the `max` CPU type 1. Determine which CPU features are available for the `max` CPU type
(Note, we started QEMU with qemu-system-aarch64, so `max` is (Note, we started QEMU with qemu-system-aarch64, so `max` is
implementing the ARMv8-A reference manual in this case):: implementing the ARMv8-A reference manual in this case)::
(QEMU) query-cpu-model-expansion type=full model={"name":"max"} (QEMU) query-cpu-model-expansion type=full model={"name":"max"}
{ "return": { { "return": {

4
docs/virtio-net-failover.rst
View File

@ -1,6 +1,6 @@
======================== ======================================
QEMU virtio-net standby (net_failover) QEMU virtio-net standby (net_failover)
======================== ======================================
This document explains the setup and usage of virtio-net standby feature which This document explains the setup and usage of virtio-net standby feature which
is used to create a net_failover pair of devices. is used to create a net_failover pair of devices.

19
docs/virtio-pmem.rst
View File

@ -27,17 +27,18 @@ virtio pmem usage
----------------- -----------------
A virtio pmem device backed by a memory-backend-file can be created on A virtio pmem device backed by a memory-backend-file can be created on
the QEMU command line as in the following example: the QEMU command line as in the following example::
-object memory-backend-file,id=mem1,share,mem-path=./virtio_pmem.img,size=4G -object memory-backend-file,id=mem1,share,mem-path=./virtio_pmem.img,size=4G
-device virtio-pmem-pci,memdev=mem1,id=nv1 -device virtio-pmem-pci,memdev=mem1,id=nv1
where: where:
- "object memory-backend-file,id=mem1,share,mem-path=<image>, size=<image size>"
creates a backend file with the specified size.
- "device virtio-pmem-pci,id=nvdimm1,memdev=mem1" creates a virtio pmem - "object memory-backend-file,id=mem1,share,mem-path=<image>, size=<image size>"
pci device whose storage is provided by above memory backend device. creates a backend file with the specified size.
- "device virtio-pmem-pci,id=nvdimm1,memdev=mem1" creates a virtio pmem
pci device whose storage is provided by above memory backend device.
Multiple virtio pmem devices can be created if multiple pairs of "-object" Multiple virtio pmem devices can be created if multiple pairs of "-object"
and "-device" are provided. and "-device" are provided.
@ -50,7 +51,7 @@ memory backing has to be added via 'object_add'; afterwards, the virtio
pmem device can be added via 'device_add'. pmem device can be added via 'device_add'.
For example, the following commands add another 4GB virtio pmem device to For example, the following commands add another 4GB virtio pmem device to
the guest: the guest::
(qemu) object_add memory-backend-file,id=mem2,share=on,mem-path=virtio_pmem2.img,size=4G (qemu) object_add memory-backend-file,id=mem2,share=on,mem-path=virtio_pmem2.img,size=4G
(qemu) device_add virtio-pmem-pci,id=virtio_pmem2,memdev=mem2 (qemu) device_add virtio-pmem-pci,id=virtio_pmem2,memdev=mem2

2
hw/block/dataplane/virtio-blk.c
View File

@ -67,7 +67,7 @@ static void notify_guest_bh(void *opaque)
memset(s->batch_notify_vqs, 0, sizeof(bitmap)); memset(s->batch_notify_vqs, 0, sizeof(bitmap));
for (j = 0; j < nvqs; j += BITS_PER_LONG) { for (j = 0; j < nvqs; j += BITS_PER_LONG) {
unsigned long bits = bitmap[j]; unsigned long bits = bitmap[j / BITS_PER_LONG];
while (bits != 0) { while (bits != 0) {
unsigned i = j + ctzl(bits); unsigned i = j + ctzl(bits);

11
qemu-deprecated.texi
View File

@ -284,6 +284,17 @@ spec you can use the ``-cpu rv64gcsu,priv_spec=v1.9.1`` command line argument.
@section Device options @section Device options
@subsection Emulated device options
@subsubsection -device virtio-blk,scsi=on|off (since 5.0.0)
The virtio-blk SCSI passthrough feature is a legacy VIRTIO feature. VIRTIO 1.0
and later do not support it because the virtio-scsi device was introduced for
full SCSI support. Use virtio-scsi instead when SCSI passthrough is required.
Note this also applies to ``-device virtio-blk-pci,scsi=on|off'', which is an
alias.
@subsection Block device options @subsection Block device options
@subsubsection "backing": "" (since 2.12.0) @subsubsection "backing": "" (since 2.12.0)