[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 1/2] vl.c: use single local_err throughout main()
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH v2 1/2] vl.c: use single local_err throughout main() |
Date: |
Mon, 20 Oct 2014 14:29:54 +0200 |
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
vl.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/vl.c b/vl.c
index aee73e1..528c289 100644
--- a/vl.c
+++ b/vl.c
@@ -2771,6 +2771,7 @@ int main(int argc, char **argv, char **envp)
};
const char *trace_events = NULL;
const char *trace_file = NULL;
+ Error *local_err = NULL;
const ram_addr_t default_ram_size = (ram_addr_t)DEFAULT_RAM_SIZE *
1024 * 1024;
ram_addr_t maxram_size = default_ram_size;
@@ -4072,7 +4073,6 @@ int main(int argc, char **argv, char **envp)
configure_accelerator(current_machine);
if (qtest_chrdev) {
- Error *local_err = NULL;
qtest_init(qtest_chrdev, qtest_log, &local_err);
if (local_err) {
error_report("%s", error_get_pretty(local_err));
@@ -4316,7 +4316,6 @@ int main(int argc, char **argv, char **envp)
#ifdef CONFIG_VNC
/* init remote displays */
if (vnc_display) {
- Error *local_err = NULL;
vnc_display_init(ds);
vnc_display_open(ds, vnc_display, &local_err);
if (local_err != NULL) {
@@ -4371,7 +4370,6 @@ int main(int argc, char **argv, char **envp)
}
if (incoming) {
- Error *local_err = NULL;
qemu_start_incoming_migration(incoming, &local_err);
if (local_err) {
error_report("-incoming %s: %s", incoming,
--
1.9.3