[Qemu-devel] [PATCH 5/7] virtio-pstore: Support PSTORE_TYPE_CONSOLE

[Namhyung Kim]

With help of buffer management functions, it now supports CONSOLE type
pstore write.  The config space has flags field which defines the
VIRTIO_PSTORE_CONFIG_FL_CONSOLE.  When it's set, the virtio-pstore
driver also sets PSTORE_FLAGS_ASYNC so that the buffer management is
enabled.

Cc: Paolo Bonzini <address@hidden>
Cc: Radim Krčmář <address@hidden>
Cc: "Michael S. Tsirkin" <address@hidden>
Cc: Anthony Liguori <address@hidden>
Cc: Anton Vorontsov <address@hidden>
Cc: Colin Cross <address@hidden>
Cc: Kees Cook <address@hidden>
Cc: Tony Luck <address@hidden>
Cc: Steven Rostedt <address@hidden>
Cc: Ingo Molnar <address@hidden>
Cc: Minchan Kim <address@hidden>
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Signed-off-by: Namhyung Kim <address@hidden>
---
 drivers/virtio/virtio_pstore.c     | 9 ++++++++-
 include/uapi/linux/virtio_pstore.h | 4 ++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/drivers/virtio/virtio_pstore.c b/drivers/virtio/virtio_pstore.c
index 4ee1c186f582..458c4d3ccbb1 100644
--- a/drivers/virtio/virtio_pstore.c
+++ b/drivers/virtio/virtio_pstore.c
@@ -33,6 +33,7 @@ struct type_table {
        u16 virtio;
 } type_table[] = {
        TYPE_TABLE_ENTRY(DMESG),
+       TYPE_TABLE_ENTRY(CONSOLE),
 };
 
 #undef TYPE_TABLE_ENTRY
@@ -276,7 +277,8 @@ static int virt_pstore_init(struct virtio_pstore *vps)
        psinfo->read  = virt_pstore_read;
        psinfo->erase = virt_pstore_erase;
        psinfo->write = virt_pstore_write;
-       psinfo->flags = PSTORE_FLAGS_DMESG;
+       /* preserve flags from config */
+       psinfo->flags |= PSTORE_FLAGS_DMESG;
 
        psinfo->data  = vps;
        spin_lock_init(&psinfo->buf_lock);
@@ -313,10 +315,15 @@ static int virtpstore_init_vqs(struct virtio_pstore *vps)
 static void virtpstore_init_config(struct virtio_pstore *vps)
 {
        u32 bufsize;
+       u32 flags;
 
        virtio_cread(vps->vdev, struct virtio_pstore_config, bufsize, &bufsize);
+       virtio_cread(vps->vdev, struct virtio_pstore_config, flags, &flags);
 
        vps->pstore.bufsize = PAGE_ALIGN(bufsize);
+
+       if (flags & VIRTIO_PSTORE_CONFIG_FL_CONSOLE)
+               vps->pstore.flags |= PSTORE_FLAGS_CONSOLE | PSTORE_FLAGS_ASYNC;
 }
 
 static void virtpstore_confirm_config(struct virtio_pstore *vps)
diff --git a/include/uapi/linux/virtio_pstore.h 
b/include/uapi/linux/virtio_pstore.h
index f4b0d204d8ae..56d0b1554231 100644
--- a/include/uapi/linux/virtio_pstore.h
+++ b/include/uapi/linux/virtio_pstore.h
@@ -37,9 +37,12 @@
 
 #define VIRTIO_PSTORE_TYPE_UNKNOWN  0
 #define VIRTIO_PSTORE_TYPE_DMESG    1
+#define VIRTIO_PSTORE_TYPE_CONSOLE  2
 
 #define VIRTIO_PSTORE_FL_COMPRESSED  1
 
+#define VIRTIO_PSTORE_CONFIG_FL_CONSOLE  (1 << 0)
+
 struct virtio_pstore_req {
        __virtio16              cmd;
        __virtio16              type;
@@ -69,6 +72,7 @@ struct virtio_pstore_fileinfo {
 
 struct virtio_pstore_config {
        __virtio32              bufsize;
+       __virtio32              flags;
 };
 
 #endif /* _LINUX_VIRTIO_PSTORE_H */
-- 
2.8.0