qemu-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 4c4bad: ram: Split host_from_stream_offset()

From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 4c4bad: ram: Split host_from_stream_offset() into two help...
Date: Fri, 05 Feb 2016 07:30:05 -0800 
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 4c4bad486186fed9631b4ceb7c06d24e9fa65e6f
      
https://github.com/qemu/qemu/commit/4c4bad486186fed9631b4ceb7c06d24e9fa65e6f
  Author: zhanghailiang <address@hidden>
  Date:   2016-02-05 (Fri, 05 Feb 2016)

  Changed paths:
    M include/exec/ram_addr.h
    M migration/ram.c

  Log Message:
  -----------
  ram: Split host_from_stream_offset() into two helper functions

Split host_from_stream_offset() into two parts:
One is to get ram block, which the block idstr may be get from migration
stream, the other is to get hva (host) address from block and the offset.
Besides, we will do the check working in a new helper offset_in_ramblock().

Signed-off-by: zhanghailiang <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Amit Shah <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Amit Shah <address@hidden>


  Commit: 89a02a9f7bb6a371a42d9b26b76f4c9590548a03
      
https://github.com/qemu/qemu/commit/89a02a9f7bb6a371a42d9b26b76f4c9590548a03
  Author: zhanghailiang <address@hidden>
  Date:   2016-02-05 (Fri, 05 Feb 2016)

  Changed paths:
    M include/migration/migration.h
    M migration/exec.c
    M migration/fd.c
    M migration/migration.c
    M migration/postcopy-ram.c
    M migration/rdma.c
    M migration/savevm.c
    M migration/tcp.c
    M migration/unix.c

  Log Message:
  -----------
  migration: rename 'file' in MigrationState to 'to_dst_file'

Rename the 'file' member of MigrationState to 'to_dst_file' to
be consistent with to_src_file, from_src_file and from_dst_file.

Signed-off-by: zhanghailiang <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Amit Shah <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Amit Shah <address@hidden>


  Commit: fb3520a84e4939a4135033e2a7afefdd7b9ee8f5
      
https://github.com/qemu/qemu/commit/fb3520a84e4939a4135033e2a7afefdd7b9ee8f5
  Author: zhanghailiang <address@hidden>
  Date:   2016-02-05 (Fri, 05 Feb 2016)

  Changed paths:
    M migration/savevm.c

  Log Message:
  -----------
  savevm: Split load vm state function qemu_loadvm_state

qemu_loadvm_state is too long, and we can simplify it by splitting up
with three helper functions.

Signed-off-by: zhanghailiang <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Amit Shah <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Amit Shah <address@hidden>


  Commit: a08f6890347b5483a6764d5d18baceb41f3f7e89
      
https://github.com/qemu/qemu/commit/a08f6890347b5483a6764d5d18baceb41f3f7e89
  Author: zhanghailiang <address@hidden>
  Date:   2016-02-05 (Fri, 05 Feb 2016)

  Changed paths:
    M migration/ram.c

  Log Message:
  -----------
  migration/ram: Fix some helper functions' parameter to use PageSearchStatus

Some helper functions use parameters 'RAMBlock *block' and 'ram_addr_t *offset',
We can use 'PageSearchStatus *pss' directly instead, with this change, we
can reduce the number of parameters for these helper function, also
it is easily to add new parameters for these helper functions.

Signed-off-by: zhanghailiang <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Amit Shah <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Amit Shah <address@hidden>


  Commit: 9c994a976fdee5d52b451b3317675f1b162b51c5
      
https://github.com/qemu/qemu/commit/9c994a976fdee5d52b451b3317675f1b162b51c5
  Author: zhanghailiang <address@hidden>
  Date:   2016-02-05 (Fri, 05 Feb 2016)

  Changed paths:
    M qmp-commands.hx

  Log Message:
  -----------
  qmp-commands.hx: Fix the missing options for migration parameters commands

We didn't document x-cpu-throttle-initial/x-cpu-throttle-increment for
commands migrate-set-parameters and query-migrate-parameters.

Here we add the descriptions for these two options and fix the wrong example
for query-migrate-parameters qmp commands.
Besides, this will also fix the bug that we can't set x-cpu-throttle-initial
and x-cpu-throttle-increment through migrate-set-parameters qmp command.

Signed-off-by: zhanghailiang <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Amit Shah <address@hidden>
Message-Id: <address@hidden>
[Amit: fix typo in 'auto-converge']
Signed-off-by: Amit Shah <address@hidden>


  Commit: 164f59e86ed108366ddfc713266fed4614d2566d
      
https://github.com/qemu/qemu/commit/164f59e86ed108366ddfc713266fed4614d2566d
  Author: zhanghailiang <address@hidden>
  Date:   2016-02-05 (Fri, 05 Feb 2016)

  Changed paths:
    M qmp-commands.hx

  Log Message:
  -----------
  qmp-commands.hx: Document the missing options for migration capability 
commands

Add the missing descriptions for the options of migration capability commands,
and fix the example for query-migrate-capabilities command.

Signed-off-by: zhanghailiang <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Amit Shah <address@hidden>
Message-Id: <address@hidden>
[Amit: Strip whitespace]
Signed-off-by: Amit Shah <address@hidden>


  Commit: b33dc45c3f24961eadc84cd21ef17bab8e894e6f
      
https://github.com/qemu/qemu/commit/b33dc45c3f24961eadc84cd21ef17bab8e894e6f
  Author: Liang Li <address@hidden>
  Date:   2016-02-05 (Fri, 05 Feb 2016)

  Changed paths:
    M migration/migration.c

  Log Message:
  -----------
  migration: remove useless code.

Since 's->state' will be set in migrate_init(), there is no
need to set it before calling migrate_init(). The code and
the related comments can be removed.

Signed-off-by: Liang Li <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Amit Shah <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Amit Shah <address@hidden>


  Commit: 1483e0d74dcfd183ff46dd63cc57e1fe8b775bf8
      
https://github.com/qemu/qemu/commit/1483e0d74dcfd183ff46dd63cc57e1fe8b775bf8
  Author: Amit Shah <address@hidden>
  Date:   2016-02-05 (Fri, 05 Feb 2016)

  Changed paths:
    M scripts/vmstate-static-checker.py

  Log Message:
  -----------
  static checker: e1000-82540em got aliased to e1000

Commit 8304402033e8dbe8e379017d51ed1dd8344f1dce changed the name of the
e1000-82540em device to e1000.  This was flagged:

   Section "e1000-82540em" does not exist in dest

Add the mapping to the changed section names dictionary so the checker
can proceed.

Signed-off-by: Amit Shah <address@hidden>
Acked-by: Jason Wang <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Amit Shah <address@hidden>


  Commit: 15d61692da651fc79b3fc40050b986c5a73055c0
      
https://github.com/qemu/qemu/commit/15d61692da651fc79b3fc40050b986c5a73055c0
  Author: Greg Kurz <address@hidden>
  Date:   2016-02-05 (Fri, 05 Feb 2016)

  Changed paths:
    M migration/savevm.c

  Log Message:
  -----------
  migration: fix bad string passed to error_report()

state->name does not contain a terminating '\0' and you may get:

Machine type received is 'pseries-2.3y�?' and local is 'pseries-2.4'
load of migration failed: Invalid argument

Let's add a precision modifier to fix this.

Reviewed-by: Amit Shah <address@hidden>
Signed-off-by: Greg Kurz <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Amit Shah <address@hidden>


  Commit: ee8e8f92a730afc17ab8be6e86df6b9a23b8ebc6
      
https://github.com/qemu/qemu/commit/ee8e8f92a730afc17ab8be6e86df6b9a23b8ebc6
  Author: Peter Maydell <address@hidden>
  Date:   2016-02-05 (Fri, 05 Feb 2016)

  Changed paths:
    M include/exec/ram_addr.h
    M include/migration/migration.h
    M migration/exec.c
    M migration/fd.c
    M migration/migration.c
    M migration/postcopy-ram.c
    M migration/ram.c
    M migration/rdma.c
    M migration/savevm.c
    M migration/tcp.c
    M migration/unix.c
    M qmp-commands.hx
    M scripts/vmstate-static-checker.py

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/amit-migration/tags/migration-for-2.6-2' into staging

Migration pull req.

Small fixes, nothing major.

# gpg: Signature made Fri 05 Feb 2016 13:51:30 GMT using RSA key ID 854083B6
# gpg: Good signature from "Amit Shah <address@hidden>"
# gpg:                 aka "Amit Shah <address@hidden>"
# gpg:                 aka "Amit Shah <address@hidden>"

* remotes/amit-migration/tags/migration-for-2.6-2:
  migration: fix bad string passed to error_report()
  static checker: e1000-82540em got aliased to e1000
  migration: remove useless code.
  qmp-commands.hx: Document the missing options for migration capability 
commands
  qmp-commands.hx: Fix the missing options for migration parameters commands
  migration/ram: Fix some helper functions' parameter to use PageSearchStatus
  savevm: Split load vm state function qemu_loadvm_state
  migration: rename 'file' in MigrationState to 'to_dst_file'
  ram: Split host_from_stream_offset() into two helper functions

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/d38ea87ac54a...ee8e8f92a730
reply via email to
[Prev in Thread] Current Thread [Next in Thread]