[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/13] block: Simplify setting numeric options
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 10/13] block: Simplify setting numeric options |
Date: |
Thu, 26 Feb 2015 15:07:25 +0100 |
Don't convert numbers to strings for use with qemu_opt_set(), simply
use qemu_opt_set_number() instead.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
blockdev.c | 4 +---
vl.c | 13 ++++++-------
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 5aa23b5..b9c1c0c 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -180,7 +180,6 @@ QemuOpts *drive_add(BlockInterfaceType type, int index,
const char *file,
const char *optstr)
{
QemuOpts *opts;
- char buf[32];
opts = drive_def(optstr);
if (!opts) {
@@ -190,8 +189,7 @@ QemuOpts *drive_add(BlockInterfaceType type, int index,
const char *file,
qemu_opt_set(opts, "if", if_name[type], &error_abort);
}
if (index >= 0) {
- snprintf(buf, sizeof(buf), "%d", index);
- qemu_opt_set(opts, "index", buf, &error_abort);
+ qemu_opt_set_number(opts, "index", index, &error_abort);
}
if (file)
qemu_opt_set(opts, "file", file, &error_abort);
diff --git a/vl.c b/vl.c
index 66b0ad8..e2c1950 100644
--- a/vl.c
+++ b/vl.c
@@ -2971,13 +2971,12 @@ int main(int argc, char **argv, char **envp)
exit(1);
}
if (hda_opts != NULL) {
- char num[16];
- snprintf(num, sizeof(num), "%d", cyls);
- qemu_opt_set(hda_opts, "cyls", num, &error_abort);
- snprintf(num, sizeof(num), "%d", heads);
- qemu_opt_set(hda_opts, "heads", num, &error_abort);
- snprintf(num, sizeof(num), "%d", secs);
- qemu_opt_set(hda_opts, "secs", num, &error_abort);
+ qemu_opt_set_number(hda_opts, "cyls", cyls,
+ &error_abort);
+ qemu_opt_set_number(hda_opts, "heads", heads,
+ &error_abort);
+ qemu_opt_set_number(hda_opts, "secs", secs,
+ &error_abort);
if (translation == BIOS_ATA_TRANSLATION_LARGE) {
qemu_opt_set(hda_opts, "trans", "large",
&error_abort);
--
1.9.3
- [Qemu-devel] [PULL 00/13] QemuOpts: Convert various setters to Error, Markus Armbruster, 2015/02/26
- [Qemu-devel] [PULL 01/13] QemuOpts: Convert qemu_opt_set_bool() to Error, fix its use, Markus Armbruster, 2015/02/26
- [Qemu-devel] [PULL 02/13] QemuOpts: Convert qemu_opt_set_number() to Error, fix its use, Markus Armbruster, 2015/02/26
- [Qemu-devel] [PULL 04/13] qemu-img: Suppress unhelpful extra errors in convert, resize, Markus Armbruster, 2015/02/26
- [Qemu-devel] [PULL 10/13] block: Simplify setting numeric options,
Markus Armbruster <=
- [Qemu-devel] [PULL 07/13] QemuOpts: Propagate errors through opts_do_parse(), Markus Armbruster, 2015/02/26
- [Qemu-devel] [PULL 08/13] QemuOpts: Propagate errors through opts_parse(), Markus Armbruster, 2015/02/26
- [Qemu-devel] [PULL 11/13] qemu-sockets: Simplify setting numeric and boolean options, Markus Armbruster, 2015/02/26
- [Qemu-devel] [PULL 06/13] QemuOpts: Drop qemu_opt_set(), rename qemu_opt_set_err(), fix use, Markus Armbruster, 2015/02/26
- [Qemu-devel] [PULL 05/13] block: Suppress unhelpful extra errors in bdrv_img_create(), Markus Armbruster, 2015/02/26
- [Qemu-devel] [PULL 13/13] qtest: Use qemu_opt_set() instead of qemu_opts_parse(), Markus Armbruster, 2015/02/26
- [Qemu-devel] [PULL 12/13] pc: Use qemu_opt_set() instead of qemu_opts_parse(), Markus Armbruster, 2015/02/26
- [Qemu-devel] [PULL 09/13] qemu-img: Suppress unhelpful extra errors in convert, amend, Markus Armbruster, 2015/02/26
- [Qemu-devel] [PULL 03/13] QemuOpts: Convert qemu_opts_set() to Error, fix its use, Markus Armbruster, 2015/02/26