summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmit Shah <amit.shah@redhat.com>2011-02-03 13:05:07 +0530
committerAmit Shah <amit.shah@redhat.com>2011-03-21 16:55:11 +0530
commit0b8b716d6c43b5a1d4e0293df1c77af4fff21bab (patch)
treec09371742388c8fb5121d42ed14216a6c4de6977
parent6b331efb733a0f913ddc0b7762a1307dec304061 (diff)
downloadhqemu-0b8b716d6c43b5a1d4e0293df1c77af4fff21bab.zip
hqemu-0b8b716d6c43b5a1d4e0293df1c77af4fff21bab.tar.gz
virtio-serial: Disallow generic ports at id 0
Port 0 is reserved for virtconsole devices for backward compatibility with the old -virtioconsole (from qemu 0.12) device type. libvirt prior to commit 8e28c5d40200b4c5d483bd585d237b9d870372e5 used port 0 for generic ports. libvirt will no longer do that, but disallow instantiating generic ports at id 0 from qemu as well. Signed-off-by: Amit Shah <amit.shah@redhat.com>
-rw-r--r--hw/virtio-console.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/hw/virtio-console.c b/hw/virtio-console.c
index c235b27..4440784 100644
--- a/hw/virtio-console.c
+++ b/hw/virtio-console.c
@@ -11,6 +11,7 @@
*/
#include "qemu-char.h"
+#include "qemu-error.h"
#include "virtio-serial.h"
typedef struct VirtConsole {
@@ -113,6 +114,14 @@ static int virtserialport_initfn(VirtIOSerialPort *port)
{
VirtConsole *vcon = DO_UPCAST(VirtConsole, port, port);
+ if (port->id == 0) {
+ /*
+ * Disallow a generic port at id 0, that's reserved for
+ * console ports.
+ */
+ error_report("Port number 0 on virtio-serial devices reserved for virtconsole devices for backward compatibility.");
+ return -1;
+ }
return generic_port_init(vcon, port);
}
OpenPOWER on IntegriCloud