]> git.proxmox.com Git - qemu.git/commit - ui/vnc.c
projects / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f8c4382 72bcca7)
Merge remote-tracking branch 'stefanha/block' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 26 Nov 2012 14:18:25 +0000 (08:18 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 26 Nov 2012 14:18:25 +0000 (08:18 -0600)
commit0a87470116a169f0c764894e46014a77f5d32a9e
treed4d75d74064113e75c87d9bd7fcfcaa82461699etree
parentf8c4382e2cfe9b28b7d652b94712d258c751627bcommit | diff
parent72bcca73c7a67c8506fa737618861ad413dabf38commit | diff
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>
Qemu copy for testing