 c8193acc07
			
		
	
	
		c8193acc07
		
	
	
	
	
		
			
			- We lost Juan and Leo in the maintainers file - Steven's suspend state fix - Steven's fix for coverity on migrate_mode - Avihai's migration cleanup series -----BEGIN PGP SIGNATURE----- iIgEABYKADAWIQS5GE3CDMRX2s990ak7X8zN86vXBgUCZZY0TxIccGV0ZXJ4QHJl ZGhhdC5jb20ACgkQO1/MzfOr1wbSxgEAoM5g3wkc22lpAlRpU+hJUqT9NVOVQSK+ Fk7XJYTdSgABAKzykA6hAmU5Kj+yVI6jI874SVZbs2FWpFs4osvsKk4D =sfuM -----END PGP SIGNATURE----- Merge tag 'migration-20240104-pull-request' of https://gitlab.com/peterx/qemu into staging migration 1st pull for 9.0 - We lost Juan and Leo in the maintainers file - Steven's suspend state fix - Steven's fix for coverity on migrate_mode - Avihai's migration cleanup series # -----BEGIN PGP SIGNATURE----- # # iIgEABYKADAWIQS5GE3CDMRX2s990ak7X8zN86vXBgUCZZY0TxIccGV0ZXJ4QHJl # ZGhhdC5jb20ACgkQO1/MzfOr1wbSxgEAoM5g3wkc22lpAlRpU+hJUqT9NVOVQSK+ # Fk7XJYTdSgABAKzykA6hAmU5Kj+yVI6jI874SVZbs2FWpFs4osvsKk4D # =sfuM # -----END PGP SIGNATURE----- # gpg: Signature made Thu 04 Jan 2024 04:30:07 GMT # gpg: using EDDSA key B9184DC20CC457DACF7DD1A93B5FCCCDF3ABD706 # gpg: issuer "peterx@redhat.com" # gpg: Good signature from "Peter Xu <xzpeter@gmail.com>" [unknown] # gpg: aka "Peter Xu <peterx@redhat.com>" [unknown] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: B918 4DC2 0CC4 57DA CF7D D1A9 3B5F CCCD F3AB D706 * tag 'migration-20240104-pull-request' of https://gitlab.com/peterx/qemu: (26 commits) migration: fix coverity migrate_mode finding migration/multifd: Remove unnecessary usage of local Error migration: Remove unnecessary usage of local Error migration: Fix migration_channel_read_peek() error path migration/multifd: Remove error_setg() in migration_ioc_process_incoming() migration/multifd: Fix leaking of Error in TLS error flow migration/multifd: Simplify multifd_channel_connect() if else statement migration/multifd: Fix error message in multifd_recv_initial_packet() migration: Remove errp parameter in migration_fd_process_incoming() migration: Refactor migration_incoming_setup() migration: Remove nulling of hostname in migrate_init() migration: Remove migrate_max_downtime() declaration tests/qtest: postcopy migration with suspend tests/qtest: precopy migration with suspend tests/qtest: option to suspend during migration tests/qtest: migration events migration: preserve suspended for bg_migration migration: preserve suspended for snapshot migration: preserve suspended runstate migration: propagate suspended runstate ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
		
			
				
	
	
		
			155 lines
		
	
	
		
			4.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			155 lines
		
	
	
		
			4.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * Global State configuration
 | |
|  *
 | |
|  * Copyright (c) 2014-2017 Red Hat Inc
 | |
|  *
 | |
|  * Authors:
 | |
|  *  Juan Quintela <quintela@redhat.com>
 | |
|  *
 | |
|  * This work is licensed under the terms of the GNU GPL, version 2 or later.
 | |
|  * See the COPYING file in the top-level directory.
 | |
|  */
 | |
| 
 | |
| #include "qemu/osdep.h"
 | |
| #include "qemu/cutils.h"
 | |
| #include "qemu/error-report.h"
 | |
| #include "sysemu/runstate.h"
 | |
| #include "qapi/error.h"
 | |
| #include "migration.h"
 | |
| #include "migration/global_state.h"
 | |
| #include "migration/vmstate.h"
 | |
| #include "trace.h"
 | |
| 
 | |
| typedef struct {
 | |
|     uint32_t size;
 | |
| 
 | |
|     /*
 | |
|      * runstate was 100 bytes, zero padded, but we trimmed it to add a
 | |
|      * few fields and maintain backwards compatibility.
 | |
|      */
 | |
|     uint8_t runstate[32];
 | |
|     uint8_t has_vm_was_suspended;
 | |
|     uint8_t vm_was_suspended;
 | |
|     uint8_t unused[66];
 | |
| 
 | |
|     RunState state;
 | |
|     bool received;
 | |
| } GlobalState;
 | |
| 
 | |
| static GlobalState global_state;
 | |
| 
 | |
| static void global_state_do_store(RunState state)
 | |
| {
 | |
|     const char *state_str = RunState_str(state);
 | |
|     assert(strlen(state_str) < sizeof(global_state.runstate));
 | |
|     strpadcpy((char *)global_state.runstate, sizeof(global_state.runstate),
 | |
|               state_str, '\0');
 | |
|     global_state.has_vm_was_suspended = true;
 | |
|     global_state.vm_was_suspended = vm_get_suspended();
 | |
| 
 | |
|     memset(global_state.unused, 0, sizeof(global_state.unused));
 | |
| }
 | |
| 
 | |
| void global_state_store(void)
 | |
| {
 | |
|     global_state_do_store(runstate_get());
 | |
| }
 | |
| 
 | |
| void global_state_store_running(void)
 | |
| {
 | |
|     global_state_do_store(RUN_STATE_RUNNING);
 | |
| }
 | |
| 
 | |
| bool global_state_received(void)
 | |
| {
 | |
|     return global_state.received;
 | |
| }
 | |
| 
 | |
| RunState global_state_get_runstate(void)
 | |
| {
 | |
|     return global_state.state;
 | |
| }
 | |
| 
 | |
| static bool global_state_needed(void *opaque)
 | |
| {
 | |
|     return migrate_get_current()->store_global_state;
 | |
| }
 | |
| 
 | |
| static int global_state_post_load(void *opaque, int version_id)
 | |
| {
 | |
|     GlobalState *s = opaque;
 | |
|     Error *local_err = NULL;
 | |
|     int r;
 | |
|     char *runstate = (char *)s->runstate;
 | |
| 
 | |
|     s->received = true;
 | |
|     trace_migrate_global_state_post_load(runstate);
 | |
| 
 | |
|     if (strnlen((char *)s->runstate,
 | |
|                 sizeof(s->runstate)) == sizeof(s->runstate)) {
 | |
|         /*
 | |
|          * This condition should never happen during migration, because
 | |
|          * all runstate names are shorter than 32 bytes (the size of
 | |
|          * s->runstate). However, a malicious stream could overflow
 | |
|          * the qapi_enum_parse() call, so we force the last character
 | |
|          * to a NUL byte.
 | |
|          */
 | |
|         s->runstate[sizeof(s->runstate) - 1] = '\0';
 | |
|     }
 | |
|     r = qapi_enum_parse(&RunState_lookup, runstate, -1, &local_err);
 | |
| 
 | |
|     if (r == -1) {
 | |
|         if (local_err) {
 | |
|             error_report_err(local_err);
 | |
|         }
 | |
|         return -EINVAL;
 | |
|     }
 | |
|     s->state = r;
 | |
| 
 | |
|     /*
 | |
|      * global_state is saved on the outgoing side before forcing a stopped
 | |
|      * state, so it may have saved state=suspended and vm_was_suspended=0.
 | |
|      * Now we are in a paused state, and when we later call vm_start, it must
 | |
|      * restore the suspended state, so we must set vm_was_suspended=1 here.
 | |
|      */
 | |
|     vm_set_suspended(s->vm_was_suspended || r == RUN_STATE_SUSPENDED);
 | |
| 
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| static int global_state_pre_save(void *opaque)
 | |
| {
 | |
|     GlobalState *s = opaque;
 | |
| 
 | |
|     trace_migrate_global_state_pre_save((char *)s->runstate);
 | |
|     s->size = strnlen((char *)s->runstate, sizeof(s->runstate)) + 1;
 | |
|     assert(s->size <= sizeof(s->runstate));
 | |
| 
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| static const VMStateDescription vmstate_globalstate = {
 | |
|     .name = "globalstate",
 | |
|     .version_id = 1,
 | |
|     .minimum_version_id = 1,
 | |
|     .post_load = global_state_post_load,
 | |
|     .pre_save = global_state_pre_save,
 | |
|     .needed = global_state_needed,
 | |
|     .fields = (const VMStateField[]) {
 | |
|         VMSTATE_UINT32(size, GlobalState),
 | |
|         VMSTATE_BUFFER(runstate, GlobalState),
 | |
|         VMSTATE_UINT8(has_vm_was_suspended, GlobalState),
 | |
|         VMSTATE_UINT8(vm_was_suspended, GlobalState),
 | |
|         VMSTATE_BUFFER(unused, GlobalState),
 | |
|         VMSTATE_END_OF_LIST()
 | |
|     },
 | |
| };
 | |
| 
 | |
| void register_global_state(void)
 | |
| {
 | |
|     /* We would use it independently that we receive it */
 | |
|     strcpy((char *)&global_state.runstate, "");
 | |
|     global_state.received = false;
 | |
|     vmstate_register(NULL, 0, &vmstate_globalstate, &global_state);
 | |
| }
 |