From 5327981323cf16e252366f2d980c0c7a466913f7 Mon Sep 17 00:00:00 2001
From: yoshiyone <1254206987@qq.com>
Date: Wed, 9 Jul 2025 17:01:20 +0800
Subject: [PATCH] Fix zone append not working as expected in ZNS mode

---
 hw/femu/zns/zftl.c | 27 +++++++++++++++------------
 hw/femu/zns/zns.c  |  3 ++-
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/hw/femu/zns/zftl.c b/hw/femu/zns/zftl.c
index 9659db0e5ec..2a4f932d28b 100644
--- a/hw/femu/zns/zftl.c
+++ b/hw/femu/zns/zftl.c
@@ -338,18 +338,21 @@ static void *ftl_thread(void *arg)
 
             ftl_assert(req);
             switch (req->cmd.opcode) {
-            case NVME_CMD_WRITE:
-                lat = zns_write(zns, req);
-                break;
-            case NVME_CMD_READ:
-                lat = zns_read(zns, req);
-                break;
-            case NVME_CMD_DSM:
-                lat = 0;
-                break;
-            default:
-                //ftl_err("FTL received unkown request type, ERROR\n");
-                ;
+                // Fix bug: zone append not respecting configured delay
+                case NVME_CMD_ZONE_APPEND:
+                    /* Fall through */
+                case NVME_CMD_WRITE:
+                    lat = zns_write(zns, req);
+                    break;
+                case NVME_CMD_READ:
+                    lat = zns_read(zns, req);
+                    break;
+                case NVME_CMD_DSM:
+                    lat = 0;
+                    break;
+                default:
+                    //ftl_err("FTL received unkown request type, ERROR\n");
+                    ;
             }
 
             req->reqlat = lat;
diff --git a/hw/femu/zns/zns.c b/hw/femu/zns/zns.c
index a1acfe46101..396b71bdf03 100644
--- a/hw/femu/zns/zns.c
+++ b/hw/femu/zns/zns.c
@@ -844,7 +844,8 @@ static uint16_t zns_nvme_rw(FemuCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,
     NvmeZone *zone;
     NvmeZonedResult *res = (NvmeZonedResult *)&req->cqe;
     assert(n->zoned);
-    req->is_write = (rw->opcode == NVME_CMD_WRITE) ? 1 : 0;
+    // Fix zone append not working as expected
+    req->is_write = ((rw->opcode == NVME_CMD_WRITE) || (rw->opcode == NVME_CMD_ZONE_APPEND)) ? 1 : 0;
 
     status = nvme_check_mdts(n, data_size);
     if (status) {