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

[Qemu-commits] [qemu/qemu] adde22: Add -incoming defer

From: GitHub
Subject: [Qemu-commits] [qemu/qemu] adde22: Add -incoming defer
Date: Mon, 16 Mar 2015 10:30:06 -0700 
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: adde220a93a0192782243d25580a647004f6dd44
      
https://github.com/qemu/qemu/commit/adde220a93a0192782243d25580a647004f6dd44
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M migration/migration.c

  Log Message:
  -----------
  Add -incoming defer

-incoming defer causes qemu to wait for an incoming migration
to be specified later.  The monitor can be used to set migration
capabilities that may affect the incoming connection process.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: bf1ae1f4dc348650fb7f32a3fcc278f60a7b1bf6
      
https://github.com/qemu/qemu/commit/bf1ae1f4dc348650fb7f32a3fcc278f60a7b1bf6
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M hmp-commands.hx
    M hmp.c
    M hmp.h
    M migration/migration.c
    M qapi-schema.json
    M qmp-commands.hx

  Log Message:
  -----------
  Add migrate_incoming

Add migrate_incoming/migrate-incoming to start an incoming
migration.

Once a qemu has been started with
    -incoming defer

the migration can be started by issuing:
    migrate_incoming uri

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: 6e1dea46b89e137ee1593ded5566d5371a61d304
      
https://github.com/qemu/qemu/commit/6e1dea46b89e137ee1593ded5566d5371a61d304
  Author: Juan Quintela <address@hidden>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M arch_init.c
    M include/migration/migration.h
    M include/migration/qemu-file.h
    M migration/qemu-file.c
    M migration/rdma.c

  Log Message:
  -----------
  ram: make all save_page functions take a uint64_t parameter

It used to be an int, but then we can't pass directly the
bytes_transferred parameter, that would happen later in the series.

Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Amit Shah <address@hidden>


  Commit: 0fcd8d31402bdc7ef7187f005bee8f0799a4cce0
      
https://github.com/qemu/qemu/commit/0fcd8d31402bdc7ef7187f005bee8f0799a4cce0
  Author: Juan Quintela <address@hidden>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M arch_init.c

  Log Message:
  -----------
  ram_find_and_save_block:  change calling convention

Add a parameter to pass the number of bytes written, and make it return
the number of pages written instead.

Signed-off-by: Juan Quintela <address@hidden>


  Commit: 87cf878b2ea8d24c78ea3210880538aa31459dfd
      
https://github.com/qemu/qemu/commit/87cf878b2ea8d24c78ea3210880538aa31459dfd
  Author: Juan Quintela <address@hidden>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M arch_init.c

  Log Message:
  -----------
  ram_save_page: change calling covention

Add a parameter to pass the number of bytes written, and make it return
the number of pages written instead.

Signed-off-by: Juan Quintela <address@hidden>


  Commit: f4be0f75f68ec463d07c65cb2f636e6adf1388e6
      
https://github.com/qemu/qemu/commit/f4be0f75f68ec463d07c65cb2f636e6adf1388e6
  Author: Juan Quintela <address@hidden>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M arch_init.c

  Log Message:
  -----------
  save_xbzrle_page: change calling convention

Add a parameter to pass the number of bytes written, and make it return
the number of pages written instead.

Signed-off-by: Juan Quintela <address@hidden>


  Commit: 73bab2fc2adeb18b26752937f3cf60afa9658a9c
      
https://github.com/qemu/qemu/commit/73bab2fc2adeb18b26752937f3cf60afa9658a9c
  Author: Juan Quintela <address@hidden>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M arch_init.c

  Log Message:
  -----------
  save_block_hdr: we can recalculate the cont parameter here

No need to pass it through all the callers.  Once there, update
last_sent_block here.

Signed-off-by: Juan Quintela <address@hidden>


  Commit: f6f14c58d542b306b6a0ff207db793d0aba62aa1
      
https://github.com/qemu/qemu/commit/f6f14c58d542b306b6a0ff207db793d0aba62aa1
  Author: Juan Quintela <address@hidden>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M arch_init.c

  Log Message:
  -----------
  rename save_block_hdr to save_page_header

It has always been a page header, not a block header.  Once there, the
flag argument was only passed to make a bit or with it, just do the or
on the caller.

Signed-off-by: Juan Quintela <address@hidden>


  Commit: 1925cebc4b12903e3a66106893fd97e35c5d0baf
      
https://github.com/qemu/qemu/commit/1925cebc4b12903e3a66106893fd97e35c5d0baf
  Author: Alexander Graf <address@hidden>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M savevm.c

  Log Message:
  -----------
  migration: Read JSON VM description on incoming migration

One of the really nice things about the VM description format is that it goes
over the wire when live migration is happening. Unfortunately QEMU today closes
any socket once it sees VM_EOF coming, so we never give the VMDESC the chance to
actually land on the wire.

This patch makes QEMU read the description as well. This way we ensure that
anything wire tapping us in between will get the chance to also interpret the
stream.

Along the way we also fix virt tests that assume that number_bytes_sent on the
sender side is equal to number_bytes_read which was true before the VMDESC
patches and is true again with this patch.

Signed-off-by: Alexander Graf <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Tested-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: 9850c6047b8b4343e91da4780a41bb88faeb018a
      
https://github.com/qemu/qemu/commit/9850c6047b8b4343e91da4780a41bb88faeb018a
  Author: Alexander Graf <address@hidden>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M hw/core/machine.c
    M include/hw/boards.h
    M qemu-options.hx
    M savevm.c

  Log Message:
  -----------
  migration: Allow to suppress vmdesc submission

We now always send a JSON blob describing the migration file format as part
of the migration stream. However, some tools built around QEMU have proven
to stumble over this.

This patch gives the user the chance to disable said self-describing part of
the migration stream. To disable vmdesc submission, just add

  -machine suppress-vmdesc=on

to your QEMU command line.

Signed-off-by: Alexander Graf <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: 54ed388b29794ab08089f1b5c7b0a03d075c3b5d
      
https://github.com/qemu/qemu/commit/54ed388b29794ab08089f1b5c7b0a03d075c3b5d
  Author: Alexander Graf <address@hidden>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c

  Log Message:
  -----------
  pc: Disable vmdesc submission for old machines

Older PC machine types might by accident be backwards live migration compatible,
but with the new vmdesc self-describing blob in our live migration stream we
would break that compatibility.

Also users wouldn't expect massive behaviorial differences when updating to a
new version of QEMU while retaining their old machine type, especially not
potential breakage in tooling around live migration.

So disable vmdesc submission for old PC machine types.

Signed-off-by: Alexander Graf <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: bc68d2e5128284c8beb98b1c5b0331a0ed9f3197
      
https://github.com/qemu/qemu/commit/bc68d2e5128284c8beb98b1c5b0331a0ed9f3197
  Author: Peter Maydell <address@hidden>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M arch_init.c
    M hmp-commands.hx
    M hmp.c
    M hmp.h
    M hw/core/machine.c
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M include/hw/boards.h
    M include/migration/migration.h
    M include/migration/qemu-file.h
    M migration/migration.c
    M migration/qemu-file.c
    M migration/rdma.c
    M qapi-schema.json
    M qemu-options.hx
    M qmp-commands.hx
    M savevm.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20150316' 
into staging

migration/next for 20150316

# gpg: Signature made Mon Mar 16 13:36:37 2015 GMT using RSA key ID 5872D723
# gpg: Can't check signature: public key not found

* remotes/juanquintela/tags/migration/20150316:
  pc: Disable vmdesc submission for old machines
  migration: Allow to suppress vmdesc submission
  migration: Read JSON VM description on incoming migration
  rename save_block_hdr to save_page_header
  save_block_hdr: we can recalculate the cont parameter here
  save_xbzrle_page: change calling convention
  ram_save_page: change calling covention
  ram_find_and_save_block:  change calling convention
  ram: make all save_page functions take a uint64_t parameter
  Add migrate_incoming
  Add -incoming defer

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


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