50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
|
From c24b649580f7eeb656124fabe255760829d01408 Mon Sep 17 00:00:00 2001
|
||
|
|
From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Wed, 26 Jul 2023 13:37:41 +0000
|
||
|
|
Subject: [PATCH] Check and report for incomplete 'global' option format
|
||
|
|
mainline inclusion commit 818e1636080768749dc826acd4825e71828ec7e6 category:
|
||
|
|
bugfix
|
||
|
|
|
||
|
|
---------------------------------------------------------------
|
||
|
|
|
||
|
|
Qemu might crash when provided incomplete '-global' option.
|
||
|
|
For example:
|
||
|
|
qemu-system-x86_64 -global driver=isa-fdc
|
||
|
|
qemu-system-x86_64: ../../devel/qemu/qapi/string-input-visitor.c:394:
|
||
|
|
string_input_visitor_new: Assertion `str' failed.
|
||
|
|
Aborted (core dumped)
|
||
|
|
|
||
|
|
Fixes: 3751d7c43f795b ("vl: allow full-blown QemuOpts syntax for -global")
|
||
|
|
Signed-off-by: Rohit Kumar <rohit.kumar3@nutanix.com>
|
||
|
|
Reviewed-by: Markus Armbruster <armbru@redhat.com>
|
||
|
|
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/604
|
||
|
|
Message-Id: <20220216071508.412974-1-rohit.kumar3@nutanix.com>
|
||
|
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
||
|
|
|
||
|
|
Signed-off-by: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
softmmu/qdev-monitor.c | 7 +++++++
|
||
|
|
1 file changed, 7 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c
|
||
|
|
index 4ca4e92ce2..14efb37014 100644
|
||
|
|
--- a/softmmu/qdev-monitor.c
|
||
|
|
+++ b/softmmu/qdev-monitor.c
|
||
|
|
@@ -1041,6 +1041,13 @@ int qemu_global_option(const char *str)
|
||
|
|
if (!opts) {
|
||
|
|
return -1;
|
||
|
|
}
|
||
|
|
+ if (!qemu_opt_get(opts, "driver")
|
||
|
|
+ || !qemu_opt_get(opts, "property")
|
||
|
|
+ || !qemu_opt_get(opts, "value")) {
|
||
|
|
+ error_report("options 'driver', 'property', and 'value'"
|
||
|
|
+ " are required");
|
||
|
|
+ return -1;
|
||
|
|
+ }
|
||
|
|
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|