Thanks for doing this work, I really appreciate the clean ups and being able to turn off the compiler and static analysis overrides in the illumos downstream.

This change looks good to me. Is there anything stopping this being merged?
(I'm doing another sync to illumos at the end of the month and I'd like to include this if possible)

Thanks for doing this, we have something similar in the illumos port, although only for the type1 strings (https://man.omnios.org/bhyve.8#B), and the config keys are different (but I can add translators for backwards compatibility when I port this over).

Great, thanks all. Is there anything else I need to do to get this merged?

In D34372#778858, @rew wrote:

I didn't realize that these mutex's get initialized on FreeBSD, even without your patch.

In D34372#778732, @rew wrote:

Two more missing mutex initialisations.

In D34301#778155, @jhb wrote:

In some other places that use strsep the pattern is to name this variable tofree which might be a more obvious name than o[riginal]str.

Renamed 'ostr' to 'tofree'

Thanks for picking this up, looks good to me.

In D34301#777509, @rew wrote:

what purpose is ostr serving here?

Dropping the fix for bootrom.c

In D32953#772648, @chuck wrote:

Thanks for catching this. Your change will work just fine, but I'm tempted to add a helper wrapper like the below. Thoughts?

I'm in the process of porting this change over to illumos, and it looks like we should also be setting the appropriate bit in the oaes field in nvme_controller_data.

In D31983#721639, @jhb wrote:

I think the goal was to also be similar to the name used for the AHCI and NVMe device models which both use "ser" for this.

I am used to contributing to illumos so please feel free to ignore these comments.

Fine with me, thanks for doing this.

In D30717#690975, @jhb wrote:

I think I like Chuck's shorter version a bit better

Addressed feedback.