qga: Fix compiler warnings (missing format attribute, wrong format strings)

[qemu.git] / docs / migration.txt

diff --git a/docs/migration.txt b/docs/migration.txt
index f3ddd2f1a8373d5c3d75e3fd92aee7605ca50776..0e0a1d44da32ccd45beb8a6733f65053a46db264 100644 (file)
--- a/docs/migration.txt
+++ b/docs/migration.txt
@@ -41,7 +41,7 @@ All these four migration protocols use the same infrastructure to
 save/restore state devices.  This infrastructure is shared with the
 savevm/loadvm functionality.
 
 save/restore state devices.  This infrastructure is shared with the
 savevm/loadvm functionality.
 

-=== State Live Migration ==
+=== State Live Migration ===

 
 This is used for RAM and block devices.  It is not yet ported to vmstate.
 <Fill more information here>
 
 This is used for RAM and block devices.  It is not yet ported to vmstate.
 <Fill more information here>


@@ -55,10 +55,7 @@ QEMUFile with:
 QEMUFile *qemu_fopen_ops(void *opaque,
                          QEMUFilePutBufferFunc *put_buffer,
                          QEMUFileGetBufferFunc *get_buffer,
 QEMUFile *qemu_fopen_ops(void *opaque,
                          QEMUFilePutBufferFunc *put_buffer,
                          QEMUFileGetBufferFunc *get_buffer,

-                         QEMUFileCloseFunc *close,
-                         QEMUFileRateLimit *rate_limit,
-                         QEMUFileSetRateLimit *set_rate_limit,
-                         QEMUFileGetRateLimit *get_rate_limit);
+                         QEMUFileCloseFunc *close);

 
 The functions have the following functionality:
 
 
 The functions have the following functionality:
 


@@ -80,28 +77,13 @@ Close a file and return an error code.
 
 typedef int (QEMUFileCloseFunc)(void *opaque);
 
 
 typedef int (QEMUFileCloseFunc)(void *opaque);
 

-Called to determine if the file has exceeded its bandwidth allocation.  The
-bandwidth capping is a soft limit, not a hard limit.
-
-typedef int (QEMUFileRateLimit)(void *opaque);
-
-Called to change the current bandwidth allocation. This function must return
-the new actual bandwidth. It should be new_rate if everything goes OK, and
-the old rate otherwise.
-
-typedef size_t (QEMUFileSetRateLimit)(void *opaque, size_t new_rate);
-typedef size_t (QEMUFileGetRateLimit)(void *opaque);
-

 You can use any internal state that you need using the opaque void *
 pointer that is passed to all functions.
 
 You can use any internal state that you need using the opaque void *
 pointer that is passed to all functions.
 

-The rate limiting functions are used to limit the bandwidth used by
-QEMU migration.
-

 The important functions for us are put_buffer()/get_buffer() that
 allow to write/read a buffer into the QEMUFile.
 
 The important functions for us are put_buffer()/get_buffer() that
 allow to write/read a buffer into the QEMUFile.
 

-=== How to save the state of one device ==
+=== How to save the state of one device ===

 
 The state of a device is saved using intermediate buffers.  There are
 some helper functions to assist this saving.
 
 The state of a device is saved using intermediate buffers.  There are
 some helper functions to assist this saving.


@@ -115,7 +97,7 @@ associated with a series of fields saved.  The save_state always saves
 the state as the newer version.  But load_state sometimes is able to
 load state from an older version.
 
 the state as the newer version.  But load_state sometimes is able to
 load state from an older version.
 

- === Legacy way ===
+=== Legacy way ===

 
 This way is going to disappear as soon as all current users are ported to VMSTATE.
 
 
 This way is going to disappear as soon as all current users are ported to VMSTATE.
 


@@ -151,7 +133,7 @@ to interpret that definition to be able to load/save the state.  As
 the state is declared only once, it can't go out of sync in the
 save/load functions.
 
 the state is declared only once, it can't go out of sync in the
 save/load functions.
 

-An example (from hw/pckbd.c)
+An example (from hw/input/pckbd.c)

 
 static const VMStateDescription vmstate_kbd = {
     .name = "pckbd",
 
 static const VMStateDescription vmstate_kbd = {
     .name = "pckbd",


@@ -176,9 +158,9 @@ We registered this with:
 Note: talk about how vmstate <-> qdev interact, and what the instance ids mean.
 
 You can search for VMSTATE_* macros for lots of types used in QEMU in
 Note: talk about how vmstate <-> qdev interact, and what the instance ids mean.
 
 You can search for VMSTATE_* macros for lots of types used in QEMU in

-hw/hw.h.
+include/hw/hw.h.

 
 

-=== More about versions ==
+=== More about versions ===

 
 You can see that there are several version fields:
 
 
 You can see that there are several version fields:
 


@@ -245,7 +227,7 @@ using a specific functionality, ....
 
 It is impossible to create a way to make migration from any version to
 any other version to work.  But we can do better than only allowing
 
 It is impossible to create a way to make migration from any version to
 any other version to work.  But we can do better than only allowing

-migration from older versions no newer ones.  For that fields that are
+migration from older versions to newer ones.  For that fields that are

 only needed sometimes, we add the idea of subsections.  A subsection
 is "like" a device vmstate, but with a particularity, it has a Boolean
 function that tells if that values are needed to be sent or not.  If
 only needed sometimes, we add the idea of subsections.  A subsection
 is "like" a device vmstate, but with a particularity, it has a Boolean
 function that tells if that values are needed to be sent or not.  If


@@ -265,7 +247,8 @@ static bool ide_drive_pio_state_needed(void *opaque)
 {
     IDEState *s = opaque;
 
 {
     IDEState *s = opaque;
 

-    return (s->status & DRQ_STAT) != 0;
+    return ((s->status & DRQ_STAT) != 0)
+        || (s->bus->error_status & BM_STATUS_PIO_RETRY);

 }
 
 const VMStateDescription vmstate_ide_drive_pio_state = {
 }
 
 const VMStateDescription vmstate_ide_drive_pio_state = {