[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 09/38] pc: Fix machine property nvdimm-persistenc
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v4 09/38] pc: Fix machine property nvdimm-persistence error handling |
Date: |
Wed, 17 Oct 2018 10:26:33 +0200 |
Calling error_report() in a function that takes an Error ** argument
is suspicious. pc.c's pc_machine_set_nvdimm_persistence() does that,
and then exit()s. Wrong. Attempting to set machine property
nvdimm-persistence to a bad value instantly kills the VM:
$ qemu-system-x86_64 -nodefaults -S -display none -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 50, "minor": 0, "major": 3},
"package": "v3.0.0-837-gc5e4e49258"}, "capabilities": []}}
{"execute": "qmp_capabilities"}
{"return": {}}
{"execute": "qom-set", "arguments": {"path": "/machine", "property":
"nvdimm-persistence", "value": "instadeath"}}
-machine nvdimm-persistence=instadeath: unsupported option
$ echo $?
1
Broken when commit 11c39b5cd96 (v3.0.0) replaced error_propagate();
return by error_report(); exit() instead of error_setg(); return. Fix
that.
Fixes: 11c39b5cd966ddc067a1ca0c5392ec9b666c45b7
Cc: "Michael S. Tsirkin" <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
---
hw/i386/pc.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index cd5029c149..eab8572f2a 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -2209,8 +2209,9 @@ static void pc_machine_set_nvdimm_persistence(Object
*obj, const char *value,
else if (strcmp(value, "mem-ctrl") == 0)
nvdimm_state->persistence = 2;
else {
- error_report("-machine nvdimm-persistence=%s: unsupported option",
value);
- exit(EXIT_FAILURE);
+ error_setg(errp, "-machine nvdimm-persistence=%s: unsupported option",
+ value);
+ return;
}
g_free(nvdimm_state->persistence_string);
--
2.17.1
- Re: [Qemu-devel] [PATCH v4 30/38] spice: Clean up error reporting in add_channel(), (continued)
- [Qemu-devel] [PATCH v4 33/38] blockdev: Convert drive_new() to Error, Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 29/38] tpm: Clean up error reporting in tpm_init_tpmdev(), Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 32/38] vl: Assert drive_new() does not fail in default_drive(), Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 34/38] vl: Fix exit status for -drive format=help, Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 35/38] vl: Simplify call of parse_name(), Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 07/38] char: Use error_printf() to print help and such, Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 31/38] fsdev: Clean up error reporting in qemu_fsdev_add(), Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 36/38] block: Clean up bdrv_img_create()'s error reporting, Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 09/38] pc: Fix machine property nvdimm-persistence error handling,
Markus Armbruster <=
- [Qemu-devel] [PATCH v4 10/38] ioapic: Fix error handling in realize(), Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 17/38] seccomp: Clean up error reporting in parse_sandbox(), Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 05/38] vfio: Use warn_report() & friends to report warnings, Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 25/38] ui/keymaps: Fix handling of erroneous include files, Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 26/38] ui: Convert vnc_display_init(), init_keyboard_layout() to Error, Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 04/38] cpus hw target: Use warn_report() & friends to report warnings, Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 37/38] raw: Convert a warning to warn_report(), Markus Armbruster, 2018/10/17