diff options
| author | mav <mav@FreeBSD.org> | 2014-07-12 02:40:25 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2014-07-12 02:40:25 +0000 |
| commit | 48e8be2fd2d78a1492d044dc7536d84e09044893 (patch) | |
| tree | e47e79a1685c4a0e44c3451668ec322ba1ae0c46 | |
| parent | 59eea8bc78cdf57c68b4e6351b3150d24b22ae4b (diff) | |
| download | FreeBSD-src-48e8be2fd2d78a1492d044dc7536d84e09044893.zip FreeBSD-src-48e8be2fd2d78a1492d044dc7536d84e09044893.tar.gz | |
MFC r268283:
Improve readability of XML generated by CTL_LUN_LIST.
| -rw-r--r-- | sys/cam/ctl/ctl.c | 15 | ||||
| -rw-r--r-- | sys/cam/ctl/ctl_backend_block.c | 4 |
2 files changed, 10 insertions, 9 deletions
diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c index 0a7fee9..e99825c 100644 --- a/sys/cam/ctl/ctl.c +++ b/sys/cam/ctl/ctl.c @@ -3049,7 +3049,7 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, if (retval != 0) break; - retval = sbuf_printf(sb, "<backend_type>%s" + retval = sbuf_printf(sb, "\t<backend_type>%s" "</backend_type>\n", (lun->backend == NULL) ? "none" : lun->backend->name); @@ -3057,7 +3057,7 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, if (retval != 0) break; - retval = sbuf_printf(sb, "<lun_type>%d</lun_type>\n", + retval = sbuf_printf(sb, "\t<lun_type>%d</lun_type>\n", lun->be_lun->lun_type); if (retval != 0) @@ -3070,20 +3070,20 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, continue; } - retval = sbuf_printf(sb, "<size>%ju</size>\n", + retval = sbuf_printf(sb, "\t<size>%ju</size>\n", (lun->be_lun->maxlba > 0) ? lun->be_lun->maxlba + 1 : 0); if (retval != 0) break; - retval = sbuf_printf(sb, "<blocksize>%u</blocksize>\n", + retval = sbuf_printf(sb, "\t<blocksize>%u</blocksize>\n", lun->be_lun->blocksize); if (retval != 0) break; - retval = sbuf_printf(sb, "<serial_number>"); + retval = sbuf_printf(sb, "\t<serial_number>"); if (retval != 0) break; @@ -3099,7 +3099,7 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, if (retval != 0) break; - retval = sbuf_printf(sb, "<device_id>"); + retval = sbuf_printf(sb, "\t<device_id>"); if (retval != 0) break; @@ -3120,7 +3120,8 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, break; } STAILQ_FOREACH(opt, &lun->be_lun->options, links) { - retval = sbuf_printf(sb, "<%s>%s</%s>", opt->name, opt->value, opt->name); + retval = sbuf_printf(sb, "\t<%s>%s</%s>\n", + opt->name, opt->value, opt->name); if (retval != 0) break; } diff --git a/sys/cam/ctl/ctl_backend_block.c b/sys/cam/ctl/ctl_backend_block.c index 318a0de..25c1b94 100644 --- a/sys/cam/ctl/ctl_backend_block.c +++ b/sys/cam/ctl/ctl_backend_block.c @@ -2511,7 +2511,7 @@ ctl_be_block_lun_info(void *be_lun, struct sbuf *sb) lun = (struct ctl_be_block_lun *)be_lun; retval = 0; - retval = sbuf_printf(sb, "<num_threads>"); + retval = sbuf_printf(sb, "\t<num_threads>"); if (retval != 0) goto bailout; @@ -2521,7 +2521,7 @@ ctl_be_block_lun_info(void *be_lun, struct sbuf *sb) if (retval != 0) goto bailout; - retval = sbuf_printf(sb, "</num_threads>"); + retval = sbuf_printf(sb, "</num_threads>\n"); bailout: |
