[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/8] virtio-serial-bus: Add a port 'name' property f
From: |
Amit Shah |
Subject: |
[Qemu-devel] [PATCH 4/8] virtio-serial-bus: Add a port 'name' property for port discovery in guests |
Date: |
Thu, 7 Jan 2010 13:01:42 +0530 |
The port 'id' or number is internal state between the guest kernel and
our bus implementation. This is invocation-dependent and isn't part of
the guest-host ABI.
To correcly enumerate and map ports between the host and the guest, the
'name' property is used.
Example:
-device virtserialport,name=org.qemu.port.0
This invocation will get us a char device in the guest at:
/dev/virtio-ports/org.qemu.port.0
which can be a symlink to
/dev/vport0p3
This 'name' property is exposed by the guest kernel in a sysfs
attribute:
/sys/kernel/virtio-ports/vport0p3/name
A simple udev script can pick up this name and create the symlink
mentioned above.
Signed-off-by: Amit Shah <address@hidden>
---
hw/virtio-serial-bus.c | 17 +++++++++++++++++
hw/virtio-serial.c | 1 +
hw/virtio-serial.h | 8 ++++++++
3 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c
index e6b5eb7..20d9580 100644
--- a/hw/virtio-serial-bus.c
+++ b/hw/virtio-serial-bus.c
@@ -226,6 +226,8 @@ static void handle_control_message(VirtIOSerial *vser, void
*buf)
{
struct VirtIOSerialPort *port;
struct virtio_console_control cpkt, *gcpkt;
+ uint8_t *buffer;
+ size_t buffer_len;
gcpkt = buf;
port = find_port_by_id(vser, ldl_p(&gcpkt->id));
@@ -248,6 +250,21 @@ static void handle_control_message(VirtIOSerial *vser,
void *buf)
send_control_event(port, VIRTIO_CONSOLE_CONSOLE_PORT, 1);
}
+ if (port->name) {
+ stw_p(&cpkt.event, VIRTIO_CONSOLE_PORT_NAME);
+ stw_p(&cpkt.value, 1);
+
+ buffer_len = sizeof(cpkt) + strlen(port->name) + 1;
+ buffer = qemu_malloc(buffer_len);
+
+ memcpy(buffer, &cpkt, sizeof(cpkt));
+ memcpy(buffer + sizeof(cpkt), port->name, strlen(port->name));
+ buffer[buffer_len - 1] = 0;
+
+ send_control_msg(port, buffer, buffer_len);
+ qemu_free(buffer);
+ }
+
if (port->host_connected) {
send_control_event(port, VIRTIO_CONSOLE_PORT_OPEN, 1);
}
diff --git a/hw/virtio-serial.c b/hw/virtio-serial.c
index d9a6f32..470446b 100644
--- a/hw/virtio-serial.c
+++ b/hw/virtio-serial.c
@@ -102,6 +102,7 @@ static VirtIOSerialPortInfo virtconsole_info = {
.qdev.props = (Property[]) {
DEFINE_PROP_UINT8("is_console", VirtConsole, port.is_console, 1),
DEFINE_PROP_CHR("chardev", VirtConsole, chr),
+ DEFINE_PROP_STRING("name", VirtConsole, port.name),
DEFINE_PROP_END_OF_LIST(),
},
};
diff --git a/hw/virtio-serial.h b/hw/virtio-serial.h
index b855375..5505841 100644
--- a/hw/virtio-serial.h
+++ b/hw/virtio-serial.h
@@ -54,6 +54,7 @@ struct virtio_console_header {
#define VIRTIO_CONSOLE_CONSOLE_PORT 1
#define VIRTIO_CONSOLE_RESIZE 2
#define VIRTIO_CONSOLE_PORT_OPEN 3
+#define VIRTIO_CONSOLE_PORT_NAME 4
/* == In-qemu interface == */
@@ -88,6 +89,13 @@ struct VirtIOSerialPort {
VirtQueue *ivq, *ovq;
/*
+ * This name is sent to the guest and exported via sysfs.
+ * The guest could create symlinks based on this information.
+ * The name is in the reverse fqdn format, like org.qemu.console.0
+ */
+ char *name;
+
+ /*
* This id helps identify ports between the guest and the host.
* The guest sends a "header" with this id with each data packet
* that it sends and the host can then find out which associated
--
1.6.2.5
- Re: [Qemu-devel] [PATCH 2/8] virtio-console: qdev conversion, new virtio-serial-bus, (continued)
- Re: [Qemu-devel] [PATCH 2/8] virtio-console: qdev conversion, new virtio-serial-bus, Gerd Hoffmann, 2010/01/05
- Re: [Qemu-devel] [PATCH 2/8] virtio-console: qdev conversion, new virtio-serial-bus, Anthony Liguori, 2010/01/05
- [Qemu-devel] Re: [PATCH 2/8] virtio-console: qdev conversion, new virtio-serial-bus, Gerd Hoffmann, 2010/01/05
- [Qemu-devel] Re: [PATCH 2/8] virtio-console: qdev conversion, new virtio-serial-bus, Amit Shah, 2010/01/05
[Qemu-devel] [PATCH 0/8] virtio-console: Move to qdev, multiple devices, generic ports, Amit Shah, 2010/01/07
- [Qemu-devel] [PATCH 1/8] virtio: Remove duplicate macro definition for max. virtqueues, bump up the max, Amit Shah, 2010/01/07
- [Qemu-devel] [PATCH 2/8] virtio-console: qdev conversion, new virtio-serial-bus, Amit Shah, 2010/01/07
- [Qemu-devel] [PATCH 3/8] virtio-serial-bus: Maintain guest and host port open/close state, Amit Shah, 2010/01/07
- [Qemu-devel] [PATCH 4/8] virtio-serial-bus: Add a port 'name' property for port discovery in guests,
Amit Shah <=
- [Qemu-devel] [PATCH 5/8] virtio-serial-bus: Add support for buffering guest output, throttling guests, Amit Shah, 2010/01/07
- [Qemu-devel] [PATCH 6/8] virtio-serial-bus: Add ability to hot-unplug ports, Amit Shah, 2010/01/07
- [Qemu-devel] [PATCH 7/8] virtio-serial: Add a 'virtserialport' device for generic serial port support, Amit Shah, 2010/01/07
- [Qemu-devel] [PATCH 8/8] Move virtio-serial to Makefile.hw, Amit Shah, 2010/01/07
- Re: [Qemu-devel] [PATCH 8/8] Move virtio-serial to Makefile.hw, Andreas Färber, 2010/01/07
- Re: [Qemu-devel] [PATCH 8/8] Move virtio-serial to Makefile.hw, Amit Shah, 2010/01/08
Re: [Qemu-devel] [PATCH 5/8] virtio-serial-bus: Add support for buffering guest output, throttling guests, Jamie Lokier, 2010/01/07
Re: [Qemu-devel] [PATCH 5/8] virtio-serial-bus: Add support for buffering guest output, throttling guests, Amit Shah, 2010/01/08
Re: [Qemu-devel] [PATCH 5/8] virtio-serial-bus: Add support for buffering guest output, throttling guests, Jamie Lokier, 2010/01/08
Re: [Qemu-devel] [PATCH 5/8] virtio-serial-bus: Add support for buffering guest output, throttling guests, Anthony Liguori, 2010/01/08