From patchwork Tue Dec 4 14:35:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fred.konrad@greensocs.com X-Patchwork-Id: 203664 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CE70A2C008A for ; Wed, 5 Dec 2012 01:36:33 +1100 (EST) Received: from localhost ([::1]:57142 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tftbr-0005Kl-Pc for incoming@patchwork.ozlabs.org; Tue, 04 Dec 2012 09:36:31 -0500 Received: from eggs.gnu.org ([208.118.235.92]:42929) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TftbP-00053R-FO for qemu-devel@nongnu.org; Tue, 04 Dec 2012 09:36:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TftbI-0000rc-MA for qemu-devel@nongnu.org; Tue, 04 Dec 2012 09:36:03 -0500 Received: from greensocs.com ([87.106.252.221]:47863 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TftbI-0000rK-Bn for qemu-devel@nongnu.org; Tue, 04 Dec 2012 09:35:56 -0500 Received: from localhost (unknown [127.0.0.1]) by s15328186.onlinehome-server.info (Postfix) with ESMTP id DF65842AFCE; Tue, 4 Dec 2012 14:35:55 +0000 (UTC) Received: from s15328186.onlinehome-server.info ([127.0.0.1]) by localhost (s15328186.onlinehome-server.info [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vLnHqK07zONX; Tue, 4 Dec 2012 15:35:55 +0100 (CET) Received: by s15328186.onlinehome-server.info (Postfix, from userid 491) id A677D40F4C9; Tue, 4 Dec 2012 15:35:55 +0100 (CET) Received: from compaq.katmai.xl.cx.katmai.xl.cx (lan31-11-83-155-143-136.fbx.proxad.net [83.155.143.136]) by s15328186.onlinehome-server.info (Postfix) with ESMTPSA id CE7B640F4C9; Tue, 4 Dec 2012 15:35:54 +0100 (CET) From: fred.konrad@greensocs.com To: qemu-devel@nongnu.org Date: Tue, 4 Dec 2012 15:35:38 +0100 Message-Id: <1354631742-4693-3-git-send-email-fred.konrad@greensocs.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1354631742-4693-1-git-send-email-fred.konrad@greensocs.com> References: <1354631742-4693-1-git-send-email-fred.konrad@greensocs.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 87.106.252.221 Cc: peter.maydell@linaro.org, aliguori@us.ibm.com, e.voevodin@samsung.com, mark.burton@greensocs.com, stefanha@redhat.com, cornelia.huck@de.ibm.com, afaerber@suse.de, fred.konrad@greensocs.com Subject: [Qemu-devel] [RFC PATCH v5 2/6] virtio-bus : Introduce virtio-bus X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: KONRAD Frederic Introduce virtio-bus. Refactored transport device will create a bus which extends virtio-bus. Signed-off-by: KONRAD Frederic --- hw/Makefile.objs | 1 + hw/virtio-bus.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ hw/virtio-bus.h | 76 +++++++++++++++++++++++++++++++++++++ 3 files changed, 188 insertions(+) create mode 100644 hw/virtio-bus.c create mode 100644 hw/virtio-bus.h diff --git a/hw/Makefile.objs b/hw/Makefile.objs index d581d8d..6fa4de4 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -3,6 +3,7 @@ common-obj-y += loader.o common-obj-$(CONFIG_VIRTIO) += virtio-console.o common-obj-$(CONFIG_VIRTIO) += virtio-rng.o common-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o +common-obj-$(CONFIG_VIRTIO) += virtio-bus.o common-obj-y += fw_cfg.o common-obj-$(CONFIG_PCI) += pci.o pci_bridge.o pci_bridge_dev.o common-obj-$(CONFIG_PCI) += msix.o msi.o diff --git a/hw/virtio-bus.c b/hw/virtio-bus.c new file mode 100644 index 0000000..ccf1cb0 --- /dev/null +++ b/hw/virtio-bus.c @@ -0,0 +1,111 @@ +/* + * VirtioBus + * + * Copyright (C) 2012 : GreenSocs Ltd + * http://www.greensocs.com/ , email: info@greensocs.com + * + * Developed by : + * Frederic Konrad + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, see . + * + */ + +#include "hw.h" +#include "qemu-error.h" +#include "qdev.h" +#include "virtio-bus.h" +#include "virtio.h" + +/* #define DEBUG_VIRTIO_BUS */ + +#ifdef DEBUG_VIRTIO_BUS +#define DPRINTF(fmt, ...) \ +do { printf("virtio_bus: " fmt , ## __VA_ARGS__); } while (0) +#else +#define DPRINTF(fmt, ...) do { } while (0) +#endif + +/* Plug the VirtIODevice */ +int virtio_bus_plug_device(VirtIODevice *vdev) +{ + DeviceState *qdev = DEVICE(vdev); + BusState *qbus = BUS(qdev_get_parent_bus(qdev)); + VirtioBusState *bus = VIRTIO_BUS(qbus); + VirtioBusClass *klass = VIRTIO_BUS_GET_CLASS(bus); + DPRINTF("%s : plug device.\n", qbus->name); + + bus->vdev = vdev; + + if (klass->init != NULL) { + klass->init(qbus->parent); + } + + /* + * The lines below will disappear when we drop VirtIOBindings. + */ + bus->bindings.notify = klass->notify; + bus->bindings.save_config = klass->save_config; + bus->bindings.save_queue = klass->save_queue; + bus->bindings.load_config = klass->load_config; + bus->bindings.load_queue = klass->load_queue; + bus->bindings.load_done = klass->load_done; + bus->bindings.get_features = klass->get_features; + bus->bindings.query_guest_notifiers = klass->query_guest_notifiers; + bus->bindings.set_guest_notifiers = klass->set_guest_notifiers; + bus->bindings.set_host_notifier = klass->set_host_notifier; + bus->bindings.vmstate_change = klass->vmstate_change; + virtio_bind_device(bus->vdev, &(bus->bindings), qbus->parent); + + return 0; +} + +/* Destroy the VirtIODevice */ +void virtio_bus_destroy_device(VirtioBusState *bus) +{ + DeviceState *qdev; + BusState *qbus = BUS(bus); + VirtioBusClass *klass = VIRTIO_BUS_GET_CLASS(bus); + DPRINTF("%s : remove device.\n", qbus->name); + + if (bus->vdev != NULL) { + if (klass->exit != NULL) { + klass->exit(qbus->parent); + } + qdev = DEVICE(bus->vdev); + qdev_free(qdev); + bus->vdev = NULL; + } +} + +/* Return the virtio device id of the plugged device. */ +uint16_t get_virtio_device_id(VirtioBusState *bus) +{ + return bus->vdev->device_id; +} + +static const TypeInfo virtio_bus_info = { + .name = TYPE_VIRTIO_BUS, + .parent = TYPE_BUS, + .instance_size = sizeof(VirtioBusState), + .abstract = true, + .class_size = sizeof(VirtioBusClass), +}; + +static void virtio_register_types(void) +{ + type_register_static(&virtio_bus_info); +} + +type_init(virtio_register_types) diff --git a/hw/virtio-bus.h b/hw/virtio-bus.h new file mode 100644 index 0000000..570ad98 --- /dev/null +++ b/hw/virtio-bus.h @@ -0,0 +1,76 @@ +/* + * VirtioBus + * + * Copyright (C) 2012 : GreenSocs Ltd + * http://www.greensocs.com/ , email: info@greensocs.com + * + * Developed by : + * Frederic Konrad + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, see . + * + */ + +#ifndef VIRTIO_BUS_H +#define VIRTIO_BUS_H + +#include "qdev.h" +#include "sysemu.h" +#include "virtio.h" + +#define TYPE_VIRTIO_BUS "virtio-bus" +#define VIRTIO_BUS_GET_CLASS(obj) \ + OBJECT_GET_CLASS(VirtioBusClass, obj, TYPE_VIRTIO_BUS) +#define VIRTIO_BUS_CLASS(klass) \ + OBJECT_CLASS_CHECK(VirtioBusClass, klass, TYPE_VIRTIO_BUS) +#define VIRTIO_BUS(obj) OBJECT_CHECK(VirtioBusState, (obj), TYPE_VIRTIO_BUS) + +typedef struct VirtioBusState VirtioBusState; + +typedef struct VirtioBusClass { + /* This is what a VirtioBus must implement */ + BusClass parent; + void (*notify)(void *opaque, uint16_t vector); + void (*save_config)(void *opaque, QEMUFile *f); + void (*save_queue)(void *opaque, int n, QEMUFile *f); + int (*load_config)(void *opaque, QEMUFile *f); + int (*load_queue)(void *opaque, int n, QEMUFile *f); + int (*load_done)(void *opaque, QEMUFile *f); + unsigned (*get_features)(void *opaque); + bool (*query_guest_notifiers)(void *opaque); + int (*set_guest_notifiers)(void *opaque, bool assigned); + int (*set_host_notifier)(void *opaque, int n, bool assigned); + void (*vmstate_change)(void *opaque, bool running); + /* transport independent init function. */ + void (*init)(void *opaque); + /* transport independent exit function. */ + void (*exit)(void *opaque); +} VirtioBusClass; + +struct VirtioBusState { + BusState parent_obj; + /* + * Only one VirtIODevice can be plugged on the bus. + */ + VirtIODevice *vdev; + /* + * This should be removed when we refactor virtio-device. + */ + VirtIOBindings bindings; +}; + +int virtio_bus_plug_device(VirtIODevice *vdev); +void virtio_bus_destroy_device(VirtioBusState *bus); +uint16_t get_virtio_device_id(VirtioBusState *bus); +#endif /* VIRTIO_BUS_H */