diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-26 08:18:25 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-26 08:18:25 -0600 |
| commit | 0a87470116a169f0c764894e46014a77f5d32a9e (patch) | |
| tree | d4d75d74064113e75c87d9bd7fcfcaa82461699e /json-lexer.h | |
| parent | f8c4382e2cfe9b28b7d652b94712d258c751627b (diff) | |
| parent | 72bcca73c7a67c8506fa737618861ad413dabf38 (diff) | |
| download | qemu-0a87470116a169f0c764894e46014a77f5d32a9e.zip qemu-0a87470116a169f0c764894e46014a77f5d32a9e.tar.gz qemu-0a87470116a169f0c764894e46014a77f5d32a9e.tar.bz2 | |
Merge remote-tracking branch 'stefanha/block' into staging
* stefanha/block:
ide: Fix status register after short PRDs
ide: Fix crash with too long PRD
use int64_t for return values from rbd instead of int
vdi: don't override libuuid symbols
block: add bdrv_reopen() support for raw hdev, floppy, and cdrom
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'json-lexer.h')
0 files changed, 0 insertions, 0 deletions