From bb756eebdac6fd24e8919e2c43f7d2c8c4091f59 Mon Sep 17 00:00:00 2001 From: RajithaY Date: Tue, 25 Apr 2017 03:31:15 -0700 Subject: Adding qemu as a submodule of KVMFORNFV This Patch includes the changes to add qemu as a submodule to kvmfornfv repo and make use of the updated latest qemu for the execution of all testcase Change-Id: I1280af507a857675c7f81d30c95255635667bdd7 Signed-off-by:RajithaY --- qemu/hw/char/virtio-console.c | 218 ------------------------------------------ 1 file changed, 218 deletions(-) delete mode 100644 qemu/hw/char/virtio-console.c (limited to 'qemu/hw/char/virtio-console.c') diff --git a/qemu/hw/char/virtio-console.c b/qemu/hw/char/virtio-console.c deleted file mode 100644 index 2e36481a7..000000000 --- a/qemu/hw/char/virtio-console.c +++ /dev/null @@ -1,218 +0,0 @@ -/* - * Virtio Console and Generic Serial Port Devices - * - * Copyright Red Hat, Inc. 2009, 2010 - * - * Authors: - * Amit Shah - * - * This work is licensed under the terms of the GNU GPL, version 2. See - * the COPYING file in the top-level directory. - */ - -#include "qemu/osdep.h" -#include "sysemu/char.h" -#include "qemu/error-report.h" -#include "trace.h" -#include "hw/virtio/virtio-serial.h" -#include "qapi-event.h" - -#define TYPE_VIRTIO_CONSOLE_SERIAL_PORT "virtserialport" -#define VIRTIO_CONSOLE(obj) \ - OBJECT_CHECK(VirtConsole, (obj), TYPE_VIRTIO_CONSOLE_SERIAL_PORT) - -typedef struct VirtConsole { - VirtIOSerialPort parent_obj; - - CharDriverState *chr; - guint watch; -} VirtConsole; - -/* - * Callback function that's called from chardevs when backend becomes - * writable. - */ -static gboolean chr_write_unblocked(GIOChannel *chan, GIOCondition cond, - void *opaque) -{ - VirtConsole *vcon = opaque; - - vcon->watch = 0; - virtio_serial_throttle_port(VIRTIO_SERIAL_PORT(vcon), false); - return FALSE; -} - -/* Callback function that's called when the guest sends us data */ -static ssize_t flush_buf(VirtIOSerialPort *port, - const uint8_t *buf, ssize_t len) -{ - VirtConsole *vcon = VIRTIO_CONSOLE(port); - ssize_t ret; - - if (!vcon->chr) { - /* If there's no backend, we can just say we consumed all data. */ - return len; - } - - ret = qemu_chr_fe_write(vcon->chr, buf, len); - trace_virtio_console_flush_buf(port->id, len, ret); - - if (ret < len) { - VirtIOSerialPortClass *k = VIRTIO_SERIAL_PORT_GET_CLASS(port); - - /* - * Ideally we'd get a better error code than just -1, but - * that's what the chardev interface gives us right now. If - * we had a finer-grained message, like -EPIPE, we could close - * this connection. - */ - if (ret < 0) - ret = 0; - if (!k->is_console) { - virtio_serial_throttle_port(port, true); - if (!vcon->watch) { - vcon->watch = qemu_chr_fe_add_watch(vcon->chr, - G_IO_OUT|G_IO_HUP, - chr_write_unblocked, vcon); - } - } - } - return ret; -} - -/* Callback function that's called when the guest opens/closes the port */ -static void set_guest_connected(VirtIOSerialPort *port, int guest_connected) -{ - VirtConsole *vcon = VIRTIO_CONSOLE(port); - DeviceState *dev = DEVICE(port); - - if (vcon->chr) { - qemu_chr_fe_set_open(vcon->chr, guest_connected); - } - - if (dev->id) { - qapi_event_send_vserport_change(dev->id, guest_connected, - &error_abort); - } -} - -static void guest_writable(VirtIOSerialPort *port) -{ - VirtConsole *vcon = VIRTIO_CONSOLE(port); - - if (vcon->chr) { - qemu_chr_accept_input(vcon->chr); - } -} - -/* Readiness of the guest to accept data on a port */ -static int chr_can_read(void *opaque) -{ - VirtConsole *vcon = opaque; - - return virtio_serial_guest_ready(VIRTIO_SERIAL_PORT(vcon)); -} - -/* Send data from a char device over to the guest */ -static void chr_read(void *opaque, const uint8_t *buf, int size) -{ - VirtConsole *vcon = opaque; - VirtIOSerialPort *port = VIRTIO_SERIAL_PORT(vcon); - - trace_virtio_console_chr_read(port->id, size); - virtio_serial_write(port, buf, size); -} - -static void chr_event(void *opaque, int event) -{ - VirtConsole *vcon = opaque; - VirtIOSerialPort *port = VIRTIO_SERIAL_PORT(vcon); - - trace_virtio_console_chr_event(port->id, event); - switch (event) { - case CHR_EVENT_OPENED: - virtio_serial_open(port); - break; - case CHR_EVENT_CLOSED: - if (vcon->watch) { - g_source_remove(vcon->watch); - vcon->watch = 0; - } - virtio_serial_close(port); - break; - } -} - -static void virtconsole_realize(DeviceState *dev, Error **errp) -{ - VirtIOSerialPort *port = VIRTIO_SERIAL_PORT(dev); - VirtConsole *vcon = VIRTIO_CONSOLE(dev); - VirtIOSerialPortClass *k = VIRTIO_SERIAL_PORT_GET_CLASS(dev); - - if (port->id == 0 && !k->is_console) { - error_setg(errp, "Port number 0 on virtio-serial devices reserved " - "for virtconsole devices for backward compatibility."); - return; - } - - if (vcon->chr) { - vcon->chr->explicit_fe_open = 1; - qemu_chr_add_handlers(vcon->chr, chr_can_read, chr_read, chr_event, - vcon); - } -} - -static void virtconsole_unrealize(DeviceState *dev, Error **errp) -{ - VirtConsole *vcon = VIRTIO_CONSOLE(dev); - - if (vcon->watch) { - g_source_remove(vcon->watch); - } -} - -static void virtconsole_class_init(ObjectClass *klass, void *data) -{ - VirtIOSerialPortClass *k = VIRTIO_SERIAL_PORT_CLASS(klass); - - k->is_console = true; -} - -static const TypeInfo virtconsole_info = { - .name = "virtconsole", - .parent = TYPE_VIRTIO_CONSOLE_SERIAL_PORT, - .class_init = virtconsole_class_init, -}; - -static Property virtserialport_properties[] = { - DEFINE_PROP_CHR("chardev", VirtConsole, chr), - DEFINE_PROP_END_OF_LIST(), -}; - -static void virtserialport_class_init(ObjectClass *klass, void *data) -{ - DeviceClass *dc = DEVICE_CLASS(klass); - VirtIOSerialPortClass *k = VIRTIO_SERIAL_PORT_CLASS(klass); - - k->realize = virtconsole_realize; - k->unrealize = virtconsole_unrealize; - k->have_data = flush_buf; - k->set_guest_connected = set_guest_connected; - k->guest_writable = guest_writable; - dc->props = virtserialport_properties; -} - -static const TypeInfo virtserialport_info = { - .name = TYPE_VIRTIO_CONSOLE_SERIAL_PORT, - .parent = TYPE_VIRTIO_SERIAL_PORT, - .instance_size = sizeof(VirtConsole), - .class_init = virtserialport_class_init, -}; - -static void virtconsole_register_types(void) -{ - type_register_static(&virtserialport_info); - type_register_static(&virtconsole_info); -} - -type_init(virtconsole_register_types) -- cgit 1.2.3-korg