[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/45] vl: allow -incoming defer with -preconfig
From: |
Paolo Bonzini |
Subject: |
[PULL 03/45] vl: allow -incoming defer with -preconfig |
Date: |
Tue, 15 Dec 2020 12:54:03 -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
- [PULL 00/45] Misc patches for 2020-12-15, Paolo Bonzini, 2020/12/15
- [PULL 03/45] vl: allow -incoming defer with -preconfig,
Paolo Bonzini <=
- [PULL 02/45] vl: remove separate preconfig main_loop, Paolo Bonzini, 2020/12/15
- [PULL 05/45] vl: extract softmmu/globals.c, Paolo Bonzini, 2020/12/15
- [PULL 06/45] vl: move all generic initialization out of vl.c, Paolo Bonzini, 2020/12/15
- [PULL 08/45] machine: introduce MachineInitPhase, Paolo Bonzini, 2020/12/15
- [PULL 09/45] ppc/spapr: cleanup -machine pseries,nvdimm=X handling, Paolo Bonzini, 2020/12/15
- [PULL 01/45] remove preconfig state, Paolo Bonzini, 2020/12/15
- [PULL 04/45] vl: extract softmmu/runstate.c, Paolo Bonzini, 2020/12/15
- [PULL 12/45] memory: allow creating MemoryRegions before accelerators, Paolo Bonzini, 2020/12/15