From: Anthony Liguori Date: Tue, 18 Dec 2012 21:41:32 +0000 (-0600) Subject: Merge remote-tracking branch 'amit/master' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5455a474d92e345df83212fd1b2f59d4a5d46ca9;p=qemu.git Merge remote-tracking branch 'amit/master' into staging * amit/master: virtio-serial-bus: assert port is non-null in remove_port() virtio-serial-bus: send_control_msg() should not deal with cpkts virtio-serial: delete timer if active during exit virtio-serial: allocate post_load only at load-time virtio-serial: move active ports loading to separate function virtio-serial: use uint32_t to count ports Signed-off-by: Anthony Liguori --- 5455a474d92e345df83212fd1b2f59d4a5d46ca9