qdisk boilerplate

Signed-off-by: Paul Durrant <paul.durrant@citrix.com>

diff --git a/hw/block/Makefile.objs b/hw/block/Makefile.objs
index 4c19a583c8ba128e4de6c336623ff24a7a34e2f5..b6fb161493bdbc0fa827117d924c7c23866bcef7 100644 (file)
--- a/hw/block/Makefile.objs
+++ b/hw/block/Makefile.objs
@@ -5,6 +5,7 @@ common-obj-$(CONFIG_NAND) += nand.o
 common-obj-$(CONFIG_PFLASH_CFI01) += pflash_cfi01.o
 common-obj-$(CONFIG_PFLASH_CFI02) += pflash_cfi02.o
 common-obj-$(CONFIG_XEN) += xen_disk.o
+common-obj-$(CONFIG_XEN) += xen_qdisk.o
 common-obj-$(CONFIG_ECC) += ecc.o
 common-obj-$(CONFIG_ONENAND) += onenand.o
 common-obj-$(CONFIG_NVME_PCI) += nvme.o

diff --git a/hw/block/xen_qdisk.c b/hw/block/xen_qdisk.c
new file mode 100644 (file)
index 0000000..85f4d87
--- /dev/null
+++ b/hw/block/xen_qdisk.c
@@ -0,0 +1,129 @@
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "hw/hw.h"
+#include "hw/block/block.h"
+#include "sysemu/blockdev.h"
+#include "sysemu/iothread.h"
+#include "sysemu/block-backend.h"
+#include "hw/xen/xen_bus.h"
+#include "xen_blkif.h"
+#include "trace.h"
+
+#define TYPE_XEN_QDISK_BACKEND  "xen-qdisk"
+#define XEN_QDISK_BACKEND(obj) \
+     OBJECT_CHECK(XenQdiskBackend, (obj), TYPE_XEN_QDISK_BACKEND)
+
+typedef struct XenQdiskBackend {
+    XenBackend xendev;
+    BlockConf conf;
+    bool discard_enable;
+    unsigned int max_ring_page_order;
+    BlockBackend *blk;
+} XenQdiskBackend;
+
+static void xen_qdisk_realize(XenBackend *dev, Error **errp)
+{
+    XenQdiskBackend *d = XEN_QDISK_BACKEND(dev);
+    DriveInfo *dinfo;
+    unsigned int info;
+    int64_t size;
+
+    if (!d->conf.blk) {
+        error_setg(errp, "drive property not set");
+        return;
+    }
+
+    if (!blk_is_inserted(d->conf.blk)) {
+        error_setg(errp, "Device needs media, but drive is empty");
+        return;
+    }
+
+    blkconf_blocksizes(&d->conf);
+
+    if (d->conf.logical_block_size >
+        d->conf.physical_block_size) {
+        error_setg(errp,
+                   "logical_block_size > physical_block_size not supported");
+        return;
+    }
+
+    d->blk = d->conf.blk;
+    blk_set_guest_block_size(d->blk, d->conf.logical_block_size);
+
+    xenstore_backend_printf(dev, "feature-discard", "%u",
+                            d->discard_enable);
+    xenstore_backend_printf(dev, "feature-flush-cache", "%u", 1);
+    xenstore_backend_printf(dev, "max-ring-page-order", "%u",
+                            d->max_ring_page_order);
+
+    info = blk_is_read_only(d->blk) ? VDISK_READONLY : 0;
+
+    dinfo = blk_legacy_dinfo(d->blk);
+    info |= dinfo->media_cd ? VDISK_CDROM : 0;
+
+    xenstore_backend_printf(dev, "info", "%u", info);
+
+    size = blk_getlength(d->blk);
+    xenstore_backend_printf(dev, "sector-size", "%u",
+                            d->conf.logical_block_size);
+    xenstore_backend_printf(dev, "sectors", "%lu",
+                            size / d->conf.logical_block_size);
+}
+
+static void xen_qdisk_connect(XenBackend *dev, Error **errp)
+{
+}
+
+static void xen_qdisk_disconnect(XenBackend *dev, Error **errp)
+{
+}  
+
+static void xen_qdisk_event(XenBackend *dev)
+{
+}  
+
+static void xen_qdisk_unrealize(XenBackend *dev, Error **errp)
+{
+    XenQdiskBackend *d = XEN_QDISK_BACKEND(dev);
+
+    blockdev_mark_auto_del(d->blk);
+}
+
+static Property xen_qdisk_props[] = {
+    DEFINE_BLOCK_PROPERTIES(XenQdiskBackend, conf),
+    DEFINE_PROP_BOOL("discard-enable", XenQdiskBackend, discard_enable,
+                     false),
+    DEFINE_PROP_UINT32("max-ring-page-order", XenQdiskBackend,
+                       max_ring_page_order, 4),
+    DEFINE_PROP_END_OF_LIST()
+};
+
+static void xen_qdisk_class_init(ObjectClass *klass, void *data)
+{
+    DeviceClass *dc = DEVICE_CLASS(klass);
+    XenBackendClass *k = XEN_BACKEND_CLASS(klass);
+
+    k->type = "xen-qdisk";
+    k->device = "bar";
+    k->realize = xen_qdisk_realize;
+    k->connect = xen_qdisk_connect;
+    k->disconnect = xen_qdisk_disconnect;
+    k->event = xen_qdisk_event;
+    k->unrealize = xen_qdisk_unrealize;
+    dc->desc = "Xen Qdisk Backend";
+    dc->props = xen_qdisk_props;
+}
+
+static const TypeInfo xen_qdisk_type_info = {
+    .name          = TYPE_XEN_QDISK_BACKEND,
+    .parent        = TYPE_XEN_BACKEND,
+    .instance_size = sizeof(XenQdiskBackend),
+    .class_init    = xen_qdisk_class_init,
+};
+
+static void xen_qdisk_register_types(void)
+{
+    type_register_static(&xen_qdisk_type_info);
+}
+
+type_init(xen_qdisk_register_types)

diff --git a/include/hw/xen/xen_bus.h b/include/hw/xen/xen_bus.h
index f73fb1dfea2d327bf398dce471cd17996da30d31..9fd430c19b63a4fc40b533d4fd73543247b3d002 100644 (file)
--- a/include/hw/xen/xen_bus.h
+++ b/include/hw/xen/xen_bus.h
@@ -39,6 +39,9 @@ struct XenBackend {
 };
 
 typedef void (*XenBackendRealize)(XenBackend *dev, Error **errp);
+typedef void (*XenBackendConnect)(XenBackend *dev, Error **errp);
+typedef void (*XenBackendDisconnect)(XenBackend *dev, Error **errp);
+typedef void (*XenBackendEvent)(XenBackend *dev);
 typedef void (*XenBackendUnrealize)(XenBackend *dev, Error **errp);
 
 typedef struct XenBackendClass {
@@ -48,6 +51,9 @@ typedef struct XenBackendClass {
     const char *type;
     const char *device;
     XenBackendRealize realize;
+    XenBackendConnect connect;
+    XenBackendDisconnect disconnect;
+    XenBackendEvent event;
     XenBackendUnrealize unrealize;
 } XenBackendClass;