ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Block/testing patches 

v2: Fix URL.
     Drop BSD patch.
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEUAN8t5cGD3bwIa1WyjViTGqRccYFAlw1U7MACgkQyjViTGqR
 ccbNSggArDEcOYVb/nY3KSU9F+/yo9sfK+JfO5RNree/YYgV4F7KF5GfZasHcnDA
 ATVvsP5TaZOXs1RQ+eV2TCmYNE2gJ6BcfL21MwdqvU2W+xd6Xrig0tiI8YJo9yvT
 +MrN4L2ub1QdYh8vMasJNjLhT5d6vQl2IfASx+npvU6CuMHMges9CwKmV76o7m0P
 ofOwhfbf9yTRkc/1MFgiGby4w+ZNyHpKReR8hKA43kxUhlkdScSv3wBjRQX3hf9P
 uJPeEEA6O5edwBtWElJB00btCzWoK/DIt6jVp1Dqb7VoutSU6VNQ5wyAnAyhlXus
 ktJGcWRfE9RHIu/CRo15NvLbo4tDvw==
 =wnFi
 -----END PGP SIGNATURE-----

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

Block/testing patches

v2: Fix URL.
    Drop BSD patch.

# gpg: Signature made Wed 09 Jan 2019 01:51:47 GMT
# gpg:                using RSA key CA35624C6A9171C6
# gpg: Good signature from "Fam Zheng <famz@redhat.com>"
# Primary key fingerprint: 5003 7CB7 9706 0F76 F021  AD56 CA35 624C 6A91 71C6

* remotes/famz/tags/staging-pull-request:
  docker: Use a stable snapshot for Debian Sid
  block/nvme: optimize the performance of nvme driver based on vfio-pci

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2019-01-10 14:13:56 +00:00
parent 8ae951fbc1 4ce58d861b
commit b7744b861b
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
block/nvme.c
View File

@ -837,7 +837,7 @@ try_map:
}
for (j = 0; j < qiov->iov[i].iov_len / s->page_size; j++) {
pagelist[entries++] = iova + j * s->page_size;
pagelist[entries++] = cpu_to_le64(iova + j * s->page_size);
}
trace_nvme_cmd_map_qiov_iov(s, i, qiov->iov[i].iov_base,
qiov->iov[i].iov_len / s->page_size);
@ -850,20 +850,16 @@ try_map:
case 0:
abort();
case 1:
cmd->prp1 = cpu_to_le64(pagelist[0]);
cmd->prp1 = pagelist[0];
cmd->prp2 = 0;
break;
case 2:
cmd->prp1 = cpu_to_le64(pagelist[0]);
cmd->prp2 = cpu_to_le64(pagelist[1]);;
cmd->prp1 = pagelist[0];
cmd->prp2 = pagelist[1];
break;
default:
cmd->prp1 = cpu_to_le64(pagelist[0]);
cmd->prp2 = cpu_to_le64(req->prp_list_iova);
for (i = 0; i < entries - 1; ++i) {
pagelist[i] = cpu_to_le64(pagelist[i + 1]);
}
pagelist[entries - 1] = 0;
cmd->prp1 = pagelist[0];
cmd->prp2 = cpu_to_le64(req->prp_list_iova + sizeof(uint64_t));
break;
}
trace_nvme_cmd_map_qiov(s, cmd, req, qiov, entries);

4
tests/docker/dockerfiles/debian-sid.docker
View File

@ -13,6 +13,10 @@
FROM debian:sid-slim
# Use a snapshot known to work (see http://snapshot.debian.org/#Usage)
ENV DEBIAN_SNAPSHOT_DATE "20181030"
RUN sed -i "s%^deb \(https\?://\)deb.debian.org/debian/\? \(.*\)%deb [check-valid-until=no] \1snapshot.debian.org/archive/debian/${DEBIAN_SNAPSHOT_DATE} \2%" /etc/apt/sources.list
# Duplicate deb line as deb-src
RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list