summary refs log tree commit diff stats
path: root/json-parser.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-08-11 17:11:23 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2012-08-11 17:11:23 -0500
commit312942619af7bd81bda57769224a8280684dd1cf (patch)
tree5e3409db199d533c15cc699fbcc2794cc4146b7f /json-parser.c
parentc075a7239937e6ae45bcd3793c37b0168bfae93d (diff)
parent5222aaf223e52961cabeb7cabc579892ccd8bc59 (diff)
downloadfocaccia-qemu-312942619af7bd81bda57769224a8280684dd1cf.tar.gz
focaccia-qemu-312942619af7bd81bda57769224a8280684dd1cf.zip
Merge remote-tracking branch 'bonzini/scsi-next' into staging
* bonzini/scsi-next:
  scsi-disk: add support for the UNMAP command
  scsi-disk: improve out-of-range LBA detection for WRITE SAME
  scsi-disk: more assertions and resets for aiocb
  virtio-scsi: do not compare 32-bit QEMU tags against 64-bit virtio-scsi tags
  iscsi: Pick default initiator-name based on the name of the VM
  iscsi: reorganize code for parse_initiator_name
  iscsi: do not leak initiator_name
Diffstat (limited to 'json-parser.c')
0 files changed, 0 insertions, 0 deletions