| commit | 8acab442bf67c1473bb020e2d65b685fee9f1934 | |
| author | Marcelo Tosatti <mtosatti@redhat.com> | |
| Thu, 21 Jan 2010 21:59:15 +0000 (21 19:59 -0200) | ||
| committer | Marcelo Tosatti <mtosatti@redhat.com> | |
| Thu, 21 Jan 2010 21:59:15 +0000 (21 19:59 -0200) | ||
| tree | 589c97e6c9dabfcb7c50f17c2346c9afcaf6b368 | treesnapshot (tar.gz zip) |
| parent | 818e0413c706747031fb7f64c34464baad540aa1 | commitdiff |
| parent | 98b19252cf1bd97c54bc4613f3537c5ec0aae263 | commitdiff |
Merge commit '98b19252cf1bd97c54bc4613f3537c5ec0aae263' into upstream-merge
* commit '98b19252cf1bd97c54bc4613f3537c5ec0aae263':
virtio-console: qdev conversion, new virtio-serial-bus
virtio: Remove duplicate macro definition for max. virtqueues, bump up the max
Disable fall-back to read-only when cannot open drive's file for read-write
Conflicts:
hw/pc.c
hw/virtio-console.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* commit '98b19252cf1bd97c54bc4613f3537c5ec0aae263':
virtio-console: qdev conversion, new virtio-serial-bus
virtio: Remove duplicate macro definition for max. virtqueues, bump up the max
Disable fall-back to read-only when cannot open drive's file for read-write
Conflicts:
hw/pc.c
hw/virtio-console.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>