[Qemu-commits] [qemu/qemu] 57d84c: virtio-serial-bus: keep port 0 reserved for virtco...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 57d84cf35302fe51789c18354bf09a521bb603df
      
https://github.com/qemu/qemu/commit/57d84cf35302fe51789c18354bf09a521bb603df
  Author: Amit Shah <address@hidden>
  Date:   2014-07-16 (Wed, 16 Jul 2014)

  Changed paths:
    M hw/char/virtio-serial-bus.c

  Log Message:
  -----------
  virtio-serial-bus: keep port 0 reserved for virtconsole even on unplug

We keep port 0 reserved for compat with older guests, where only
virtio-console was expected.  Even if a system is started without a
virtio-console port, port #0 is kept aside.  However, after a
virtconsole port is unplugged, port id 0 became available, and the next
hotplug of a virtserialport caused failure due to it not being a console
port.

Steps to reproduce:

$ ./x86_64-softmmu/qemu-system-x86_64 -m 512 -cpu host -enable-kvm -device 
virtio-serial-pci -monitor stdio  -vnc :1
QEMU 2.0.91 monitor - type 'help' for more information
(qemu) device_add virtconsole,id=p1
(qemu) device_del p1
(qemu) device_add virtserialport,id=p1
Port number 0 on virtio-serial devices reserved for virtconsole devices for 
backward compatibility.
Device 'virtserialport' could not be initialized
(qemu) quit

Reported-by: dengmin <address@hidden>
Reviewed-by: Amos Kong <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Amit Shah <address@hidden>


  Commit: 104369c8c7c116e7656ee6344d66ac872fd86143
      
https://github.com/qemu/qemu/commit/104369c8c7c116e7656ee6344d66ac872fd86143
  Author: Peter Maydell <address@hidden>
  Date:   2014-07-17 (Thu, 17 Jul 2014)

  Changed paths:
    M hw/char/virtio-serial-bus.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/amit/for-2.1' into staging

* remotes/amit/for-2.1:
  virtio-serial-bus: keep port 0 reserved for virtconsole even on unplug

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/5a7348045091...104369c8c7c1