{"id":2221322,"url":"http://patchwork.ozlabs.org/api/1.0/patches/2221322/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260409060155.94704-3-matthieu@min.io>","date":"2026-04-09T06:01:54","name":"[2/2] block/monitor: add drive_insert HMP command","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"b469248ea1bc7826219e603869ffe3c67c6223e6","submitter":{"id":93098,"url":"http://patchwork.ozlabs.org/api/1.0/people/93098/?format=json","name":"mr-083","email":"matthieu@minio.io"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260409060155.94704-3-matthieu@min.io/mbox/","series":[{"id":499253,"url":"http://patchwork.ozlabs.org/api/1.0/series/499253/?format=json","date":"2026-04-09T06:01:52","name":"NVMe namespace hotplug and drive reconnection support","version":1,"mbox":"http://patchwork.ozlabs.org/series/499253/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2221322/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n secure) header.d=minio.io header.i=@minio.io header.a=rsa-sha256\n header.s=minio header.b=ZWE7DzCC;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4frtDV2gXnz1yD3\n\tfor ; Thu, 09 Apr 2026 18:20:58 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1wAkbi-0006Mj-Om; Thu, 09 Apr 2026 04:19:22 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from ) id 1wAiSj-0005n5-S4\n for qemu-devel@nongnu.org; Thu, 09 Apr 2026 02:01:57 -0400","from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from ) id 1wAiSh-0006pp-Us\n for qemu-devel@nongnu.org; Thu, 09 Apr 2026 02:01:57 -0400","by mail-wm1-x32c.google.com with SMTP id\n 5b1f17b1804b1-488971db0fdso4689325e9.0\n for ; Wed, 08 Apr 2026 23:01:55 -0700 (PDT)","from localhost\n (2a01cb00141148004df9ec80d3fa1cac.ipv6.abo.wanadoo.fr.\n [2a01:cb00:1411:4800:4df9:ec80:d3fa:1cac])\n by smtp.gmail.com with UTF8SMTPSA id\n 5b1f17b1804b1-488cd231a72sm47375955e9.14.2026.04.08.23.01.53\n (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);\n Wed, 08 Apr 2026 23:01:53 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=minio.io; s=minio; t=1775714514; x=1776319314; darn=nongnu.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=JQ+g+Ftg9KxAdBMCWpE/RWEcneIVeaJ38egOZv8j5vc=;\n b=ZWE7DzCCuXVIqjh5sBjNMFS3gAM0vSjgc0e0VeWlpFXavBtkQfvV1N5I3YjVchNnmz\n UgjoF/yz0v19fpxPaoDUadRFP4UOkROF9NVGm7jPBN395rLUjjxeH+ZZE3sD5IcTuH/y\n 2eL2P8PiIlgGoIJbTo2UnqJZVm/JqG2FQKzUehvjAF7tB1RHJdwTXSS3FSJC0RcRS7C7\n mo9gVPm0awDlKndS8uuy+fTLC0fZQyX2xwKgBJO/ijQM/dKu7RrMngy8PxCaCz9LtDkH\n LGYvotYux91HUU5g2meJLj0teV33dcrzehERBpi4e8wzmEoqXe4o2A/Tte4mJmYMRpfj\n mjWQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1775714514; x=1776319314;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=JQ+g+Ftg9KxAdBMCWpE/RWEcneIVeaJ38egOZv8j5vc=;\n b=XVZ6/cxo3WE4xse5pikzQU3JixZe2RzdR3LI5+WoK/lVYLjvRqYtpdMU9DkIRxIV8g\n IYl0goig8WDrn1+M0hQRaoUxl3J019xUvByhBMiNynleqo+j1nzRX57ZxP9L0RG39ZQR\n 4s2FKMRk5oP3jF9uG+yF6T4OmkfnIxkzADFhknr8Mt7QIbgUjbEu66W6q3Xm82El90YD\n 6VqA23PeZtHC+bd2XjMDzZy5HAe1+NbLBBE94IbgGYMDQqyerexO9h0ztjKJs/R4f7/3\n iUSzAQQoYj43RrmOSPxe0OyFJfunCdx++lG5g19RAmXEkJJVR31nP0BJlL3LswpPvemU\n 1/Ew==","X-Gm-Message-State":"AOJu0YzrkuTY+/p7mgetIuraUThNkzi1pFr3lroFX7I8HhyhbFXMaW5F\n jAwdAGo2fZcZnj6fP3iW5OPmAGTS3whJBI4a8/mj4ONyBUlsyi3vkT0pg3EJYplGwHYXCHNZGUN\n +Av+YxJ5dmZpkqGhNAUhAMNGQujzoud1EhuELVIoi5MqnoVTbce4babVqjB+1PDxeMbUSOvsi3q\n FY+EuKzI8MszbS2Cri02fGwcBmPe7hJemrxlYu6Fc=","X-Gm-Gg":"AeBDies9KOAB2HUz4pjW/EY72hbmJ1PVZGb1BrLy0//aV4Xn1X8hJutZ1lr6gE6zZHw\n fPD8UXuEzygCfNAMqicKNReCEIVGC4oqTiYd3fXiyNGTed9oe5A9ty1Q/BFHQZQzNk9WA7BHzoq\n NvOT/lFX5PeG/Jjo68T0KVvAtCHyhyxqk2wsXydFHqCDqr1tL288Fb4MzHs2w4AsrvLDcfVj7+q\n bS4lHLn5uppfHhHSAbxm9otzqDPJ06ElQQDru1lFPdavhiC8kR1ucleiU5ezT5hAM6kryffpLOf\n XP0POJdWv37Wpg6JkPloBTjpyBd2pceVVORZsHIlallAoUtZaHj33X2LeV3PnVTimEjISDNjaFf\n rVNm6w7v1MHgTKFdmsJzBA6buaLpSk6fxG5b51P0JUxls0D4Blfxut437aSdMJMkI5uAndnhbSv\n N5t9Znpe7O/b6fc9duDVJvx9fzZyPYlNDc4EaTZNK+F865lebUJi1SlBpx6lpsvLdQN5T3WZ0Xt\n PF0caZpqJq0vD8B69BeR94DkKYZ8UC7faqwB9snWX+wAcWVl3NVoq57lYHeUA==","X-Received":"by 2002:a05:600c:a311:b0:488:9bf8:7f17 with SMTP id\n 5b1f17b1804b1-488cd020238mr22822145e9.14.1775714514263;\n Wed, 08 Apr 2026 23:01:54 -0700 (PDT)","From":"mr-083 ","X-Google-Original-From":"mr-083 ","To":"qemu-devel@nongnu.org,\n\tqemu-block@nongnu.org","Cc":"its@irrelevant.dk, kbusch@kernel.org, stefanha@redhat.com,\n mr-083 ","Subject":"[PATCH 2/2] block/monitor: add drive_insert HMP command","Date":"Thu, 9 Apr 2026 08:01:54 +0200","Message-ID":"<20260409060155.94704-3-matthieu@min.io>","X-Mailer":"git-send-email 2.53.0","In-Reply-To":"<20260409060155.94704-1-matthieu@min.io>","References":"<20260409060155.94704-1-matthieu@min.io>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Received-SPF":"pass client-ip=2a00:1450:4864:20::32c;\n envelope-from=matthieu@minio.io; helo=mail-wm1-x32c.google.com","X-Spam_score_int":"-10","X-Spam_score":"-1.1","X-Spam_bar":"-","X-Spam_report":"(-1.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n HK_NAME_MR_MRS=0.998,\n RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,\n SPF_PASS=-0.001 autolearn=no autolearn_force=no","X-Spam_action":"no action","X-Mailman-Approved-At":"Thu, 09 Apr 2026 04:19:19 -0400","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"qemu development ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"Add a drive_insert HMP command that reconnects a host block device file\nto an existing guest device whose backing store was previously removed\nwith drive_del.\n\nAfter drive_del, the BlockBackend remains attached to the guest device\nbut has no BlockDriverState (shown as \"[not inserted]\" in info block).\ndrive_insert opens the specified file, finds the device's BlockBackend\nby iterating all backends and matching the attached device ID, then\ncalls blk_insert_bs() to reconnect the backing store.\n\nThis complements drive_del for non-removable devices (such as NVMe\nnamespaces) where blockdev-change-medium cannot be used. Combined with\nPCIe AER Surprise Down error injection to trigger a controller reset,\nthis enables complete NVMe disk hot-swap simulation where the guest\nsees the same device names throughout.\n\nExample usage:\n drive_del drv0 # remove backing store\n drive_insert ns0 disk.qcow2 # reconnect backing\n pcie_aer_inject_error rp0 SDN # trigger controller reset\n\nSigned-off-by: Matthieu Receveur \n---\n block/monitor/block-hmp-cmds.c | 59 ++++++++++++++++++++++++++++++++++\n hmp-commands.hx | 18 +++++++++++\n include/block/block-hmp-cmds.h | 1 +\n 3 files changed, 78 insertions(+)","diff":"diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c\nindex 1fd28d59eb..77e9662ead 100644\n--- a/block/monitor/block-hmp-cmds.c\n+++ b/block/monitor/block-hmp-cmds.c\n@@ -38,7 +38,9 @@\n #include \"qemu/osdep.h\"\n #include \"hw/core/boards.h\"\n #include \"system/block-backend.h\"\n+#include \"system/block-backend-global-state.h\"\n #include \"system/blockdev.h\"\n+#include \"block/block-global-state.h\"\n #include \"qapi/qapi-commands-block.h\"\n #include \"qapi/qapi-commands-block-export.h\"\n #include \"qobject/qdict.h\"\n@@ -195,6 +197,63 @@ unlock:\n hmp_handle_error(mon, err);\n }\n \n+void hmp_drive_insert(Monitor *mon, const QDict *qdict)\n+{\n+ const char *id = qdict_get_str(qdict, \"id\");\n+ const char *filename = qdict_get_str(qdict, \"filename\");\n+ BlockBackend *blk = NULL;\n+ BlockBackend *iter;\n+ BlockDriverState *bs;\n+ Error *err = NULL;\n+\n+ GLOBAL_STATE_CODE();\n+\n+ /*\n+ * After drive_del, the BlockBackend is removed from the monitor name\n+ * registry but still attached to the device. Find it by iterating all\n+ * BlockBackends and matching by the device ID shown in \"info block\".\n+ */\n+ for (iter = blk_all_next(NULL); iter; iter = blk_all_next(iter)) {\n+ DeviceState *dev = blk_get_attached_dev(iter);\n+ if (dev && dev->id && strcmp(dev->id, id) == 0) {\n+ blk = iter;\n+ break;\n+ }\n+ }\n+\n+ if (!blk) {\n+ /* Fallback: try by block backend name */\n+ blk = blk_by_name(id);\n+ }\n+\n+ if (!blk) {\n+ error_setg(&err, \"Device '%s' not found\", id);\n+ goto out;\n+ }\n+\n+ if (blk_bs(blk)) {\n+ error_setg(&err, \"Device '%s' already has a medium inserted\", id);\n+ goto out;\n+ }\n+\n+ bs = bdrv_open(filename, NULL, NULL, BDRV_O_RDWR, &err);\n+ if (!bs) {\n+ goto out;\n+ }\n+\n+ if (blk_insert_bs(blk, bs, &err) < 0) {\n+ bdrv_unref(bs);\n+ goto out;\n+ }\n+\n+ bdrv_unref(bs);\n+ monitor_printf(mon, \"OK\\n\");\n+ return;\n+\n+out:\n+ hmp_handle_error(mon, err);\n+}\n+\n void hmp_commit(Monitor *mon, const QDict *qdict)\n {\n const char *device = qdict_get_str(qdict, \"device\");\ndiff --git a/hmp-commands.hx b/hmp-commands.hx\nindex 5cc4788f12..79af8e8988 100644\n--- a/hmp-commands.hx\n+++ b/hmp-commands.hx\n@@ -207,6 +207,24 @@ SRST\n actions (drive options rerror, werror).\n ERST\n \n+ {\n+ .name = \"drive_insert\",\n+ .args_type = \"id:B,filename:F\",\n+ .params = \"device filename\",\n+ .help = \"insert a host block device into an empty drive\",\n+ .cmd = hmp_drive_insert,\n+ },\n+\n+SRST\n+``drive_insert`` *device* *filename*\n+ Insert a host block device file into a drive that has been emptied by\n+ ``drive_del``. This reconnects the backing store without removing the\n+ guest device, enabling transparent disk hot-swap for non-removable devices\n+ such as NVMe namespaces. Combined with PCIe AER Surprise Down error\n+ injection (``pcie_aer_inject_error`` *device* ``SDN``), this enables\n+ complete NVMe disk hot-swap simulation.\n+ERST\n+\n {\n .name = \"change\",\n .args_type = \"device:B,force:-f,target:F,arg:s?,read-only-mode:s?\",\ndiff --git a/include/block/block-hmp-cmds.h b/include/block/block-hmp-cmds.h\nindex 71113cd7ef..73c9607402 100644\n--- a/include/block/block-hmp-cmds.h\n+++ b/include/block/block-hmp-cmds.h\n@@ -21,6 +21,7 @@ void hmp_drive_add(Monitor *mon, const QDict *qdict);\n \n void hmp_commit(Monitor *mon, const QDict *qdict);\n void hmp_drive_del(Monitor *mon, const QDict *qdict);\n+void hmp_drive_insert(Monitor *mon, const QDict *qdict);\n \n void hmp_drive_mirror(Monitor *mon, const QDict *qdict);\n void hmp_drive_backup(Monitor *mon, const QDict *qdict);\n","prefixes":["2/2"]}