ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/nvme: reattach subsystem namespaces on hotplug 

With commit 5ffbaeed16 ("hw/nvme: fix controller hot unplugging")
namespaces get moved from the controller to the subsystem if one
is specified.
That keeps the namespaces alive after a controller hot-unplug, but
after a controller hotplug we have to reconnect the namespaces
from the subsystem to the controller.

Fixes: 5ffbaeed16 ("hw/nvme: fix controller hot unplugging")
Cc: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Hannes Reinecke <hare@suse.de>
[k.jensen: only attach to shared and non-detached namespaces]
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
This commit is contained in:
Hannes Reinecke 2021-09-09 11:43:08 +02:00 committed by Klaus Jensen
parent 44a3aa0608
commit 9fc6e86e8b
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/nvme/subsys.c
View File

@ -14,7 +14,7 @@
int nvme_subsys_register_ctrl(NvmeCtrl *n, Error **errp) int nvme_subsys_register_ctrl(NvmeCtrl *n, Error **errp)
{ {
NvmeSubsystem *subsys = n->subsys; NvmeSubsystem *subsys = n->subsys;
int cntlid; int cntlid, nsid;
for (cntlid = 0; cntlid < ARRAY_SIZE(subsys->ctrls); cntlid++) { for (cntlid = 0; cntlid < ARRAY_SIZE(subsys->ctrls); cntlid++) {
if (!subsys->ctrls[cntlid]) { if (!subsys->ctrls[cntlid]) {
@ -29,12 +29,20 @@ int nvme_subsys_register_ctrl(NvmeCtrl *n, Error **errp)
subsys->ctrls[cntlid] = n; subsys->ctrls[cntlid] = n;
for (nsid = 1; nsid < ARRAY_SIZE(subsys->namespaces); nsid++) {
NvmeNamespace *ns = subsys->namespaces[nsid];
if (ns && ns->params.shared && !ns->params.detached) {
nvme_attach_ns(n, ns);
}
}
return cntlid; return cntlid;
} }
void nvme_subsys_unregister_ctrl(NvmeSubsystem *subsys, NvmeCtrl *n) void nvme_subsys_unregister_ctrl(NvmeSubsystem *subsys, NvmeCtrl *n)
{ {
subsys->ctrls[n->cntlid] = NULL; subsys->ctrls[n->cntlid] = NULL;
n->cntlid = -1;
} }
static void nvme_subsys_setup(NvmeSubsystem *subsys) static void nvme_subsys_setup(NvmeSubsystem *subsys)