[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 03/15] vl: allow -incoming defer with -preconfig
From: |
Paolo Bonzini |
Subject: |
[PATCH 03/15] vl: allow -incoming defer with -preconfig |
Date: |
Wed, 2 Dec 2020 03:18:42 -0500 |
Now that there is no RUN_STATE_PRECONFIG anymore that can conflict with
RUN_STATE_INMIGRATE, we can allow -incoming defer with -preconfig.
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
softmmu/vl.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/softmmu/vl.c b/softmmu/vl.c
index abbbb83e1a..3dfac8299b 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -2986,9 +2986,8 @@ static void qemu_validate_options(void)
"mutually exclusive");
exit(EXIT_FAILURE);
}
- if (incoming && preconfig_requested) {
- error_report("'preconfig' and 'incoming' options are "
- "mutually exclusive");
+ if (incoming && preconfig_requested && strcmp(incoming, "defer") != 0) {
+ error_report("'preconfig' supports '-incoming defer' only");
exit(EXIT_FAILURE);
}
--
2.26.2
- [PATCH 00/15] Finish cleaning up qemu_init, Paolo Bonzini, 2020/12/02
- [PATCH 05/15] vl: extract softmmu/globals.c, Paolo Bonzini, 2020/12/02
- [PATCH 02/15] vl: remove separate preconfig main_loop, Paolo Bonzini, 2020/12/02
- [PATCH 04/15] vl: extract softmmu/runstate.c, Paolo Bonzini, 2020/12/02
- [PATCH 12/15] plugin: propagate errors, Paolo Bonzini, 2020/12/02