mirror of
				https://github.com/qemu/qemu.git
				synced 2025-10-31 20:44:16 +00:00 
			
		
		
		
	 9fc6e86e8b
			
		
	
	
		9fc6e86e8b
		
	
	
	
	
		
			
			With commit5ffbaeed16("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>
		
			
				
	
	
		
			97 lines
		
	
	
		
			2.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			97 lines
		
	
	
		
			2.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * QEMU NVM Express Subsystem: nvme-subsys
 | |
|  *
 | |
|  * Copyright (c) 2021 Minwoo Im <minwoo.im.dev@gmail.com>
 | |
|  *
 | |
|  * This code is licensed under the GNU GPL v2.  Refer COPYING.
 | |
|  */
 | |
| 
 | |
| #include "qemu/osdep.h"
 | |
| #include "qapi/error.h"
 | |
| 
 | |
| #include "nvme.h"
 | |
| 
 | |
| int nvme_subsys_register_ctrl(NvmeCtrl *n, Error **errp)
 | |
| {
 | |
|     NvmeSubsystem *subsys = n->subsys;
 | |
|     int cntlid, nsid;
 | |
| 
 | |
|     for (cntlid = 0; cntlid < ARRAY_SIZE(subsys->ctrls); cntlid++) {
 | |
|         if (!subsys->ctrls[cntlid]) {
 | |
|             break;
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     if (cntlid == ARRAY_SIZE(subsys->ctrls)) {
 | |
|         error_setg(errp, "no more free controller id");
 | |
|         return -1;
 | |
|     }
 | |
| 
 | |
|     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;
 | |
| }
 | |
| 
 | |
| void nvme_subsys_unregister_ctrl(NvmeSubsystem *subsys, NvmeCtrl *n)
 | |
| {
 | |
|     subsys->ctrls[n->cntlid] = NULL;
 | |
|     n->cntlid = -1;
 | |
| }
 | |
| 
 | |
| static void nvme_subsys_setup(NvmeSubsystem *subsys)
 | |
| {
 | |
|     const char *nqn = subsys->params.nqn ?
 | |
|         subsys->params.nqn : subsys->parent_obj.id;
 | |
| 
 | |
|     snprintf((char *)subsys->subnqn, sizeof(subsys->subnqn),
 | |
|              "nqn.2019-08.org.qemu:%s", nqn);
 | |
| }
 | |
| 
 | |
| static void nvme_subsys_realize(DeviceState *dev, Error **errp)
 | |
| {
 | |
|     NvmeSubsystem *subsys = NVME_SUBSYS(dev);
 | |
| 
 | |
|     qbus_init(&subsys->bus, sizeof(NvmeBus), TYPE_NVME_BUS, dev, dev->id);
 | |
| 
 | |
|     nvme_subsys_setup(subsys);
 | |
| }
 | |
| 
 | |
| static Property nvme_subsystem_props[] = {
 | |
|     DEFINE_PROP_STRING("nqn", NvmeSubsystem, params.nqn),
 | |
|     DEFINE_PROP_END_OF_LIST(),
 | |
| };
 | |
| 
 | |
| static void nvme_subsys_class_init(ObjectClass *oc, void *data)
 | |
| {
 | |
|     DeviceClass *dc = DEVICE_CLASS(oc);
 | |
| 
 | |
|     set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
 | |
| 
 | |
|     dc->realize = nvme_subsys_realize;
 | |
|     dc->desc = "Virtual NVMe subsystem";
 | |
|     dc->hotpluggable = false;
 | |
| 
 | |
|     device_class_set_props(dc, nvme_subsystem_props);
 | |
| }
 | |
| 
 | |
| static const TypeInfo nvme_subsys_info = {
 | |
|     .name = TYPE_NVME_SUBSYS,
 | |
|     .parent = TYPE_DEVICE,
 | |
|     .class_init = nvme_subsys_class_init,
 | |
|     .instance_size = sizeof(NvmeSubsystem),
 | |
| };
 | |
| 
 | |
| static void nvme_subsys_register_types(void)
 | |
| {
 | |
|     type_register_static(&nvme_subsys_info);
 | |
| }
 | |
| 
 | |
| type_init(nvme_subsys_register_types)
 |