build: workaround benign cpuinfo compiler warning
qa: resolve qa/957 valgrind failure in hinv SCSI metrics

Be more careful about the situations in which we allocate
space for SCSI indom entries, esp. since these persist to
disk and might be shuffled on reboot.