diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-11-01 14:27:05 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-11-01 14:27:05 +0000 |
| commit | c46ef897dbb75590af94b6e3dca6a9c5f9a1ea1e (patch) | |
| tree | 5413270f5e465e029c17967c15e968f3df5ae591 /hw/acpi/nvdimm.c | |
| parent | 39542105bbb19c690219d2f22844d8dfbd9bba05 (diff) | |
| parent | d8996368106fbf133a6e52561a34f6d0f5080446 (diff) | |
| download | qemu-c46ef897dbb75590af94b6e3dca6a9c5f9a1ea1e.tar.gz qemu-c46ef897dbb75590af94b6e3dca6a9c5f9a1ea1e.tar.bz2 qemu-c46ef897dbb75590af94b6e3dca6a9c5f9a1ea1e.zip | |
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
# gpg: Signature made Tue 01 Nov 2016 12:47:36 GMT
# gpg: using RSA key 0xBDBE7B27C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg: aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg: aka "Jeffrey Cody <codyprime@gmail.com>"
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98 D624 BDBE 7B27 C0DE 3057
* remotes/cody/tags/block-pull-request:
blockjobs: fix documentation
blockjobs: split interface into public/private, Part 1
Blockjobs: Internalize user_pause logic
blockjob: centralize QMP event emissions
Replication/Blockjobs: Create replication jobs as internal
blockjobs: Allow creating internal jobs
blockjobs: hide internal jobs from management API
block/gluster: fix port type in the QAPI options list
block/gluster: improve defense over string to int conversion
block: Turn on "unmap" in active commit
block/gluster: memory usage: use one glfs instance per volume
block: add gluster ifdef guard checks for SEEK_DATA/SEEK_HOLE support
rbd: make the code more readable
qapi: add release designator to gluster logfile option
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/acpi/nvdimm.c')
0 files changed, 0 insertions, 0 deletions