From 498114b37bc99fddcfc24b92bff7f1323fb32672 Mon Sep 17 00:00:00 2001 From: Joelle van Dyne Date: Mon, 22 Mar 2021 01:24:44 -0700 Subject: [PATCH] hw/block/nvme: expose 'bootindex' property The check for `n->namespace.blkconf.blk` always fails because this is in the initialization function. Signed-off-by: Joelle van Dyne Reviewed-by: Klaus Jensen Signed-off-by: Klaus Jensen --- hw/block/nvme.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 08c204d46c..7244534a89 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -6328,11 +6328,9 @@ static void nvme_instance_init(Object *obj) { NvmeCtrl *n = NVME(obj); - if (n->namespace.blkconf.blk) { - device_add_bootindex_property(obj, &n->namespace.blkconf.bootindex, - "bootindex", "/namespace@1,0", - DEVICE(obj)); - } + device_add_bootindex_property(obj, &n->namespace.blkconf.bootindex, + "bootindex", "/namespace@1,0", + DEVICE(obj)); object_property_add(obj, "smart_critical_warning", "uint8", nvme_get_smart_warning, -- 2.11.0