[Qemu-commits] [qemu/qemu] d688c6: Postcopy: Avoid 0 length discards

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: d688c62d0928c46437b6b95848922398674538c8
      
https://github.com/qemu/qemu/commit/d688c62d0928c46437b6b95848922398674538c8
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2016-06-16 (Thu, 16 Jun 2016)

  Changed paths:
    M migration/ram.c

  Log Message:
  -----------
  Postcopy: Avoid 0 length discards

The discard code in migration/ram.c would send request for
zero length discards in the case where no discards were needed.
It doesn't appear to have had any bad effect.

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


  Commit: a22463a5dca6c1e3fbb474e758af7d864de61690
      
https://github.com/qemu/qemu/commit/a22463a5dca6c1e3fbb474e758af7d864de61690
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2016-06-16 (Thu, 16 Jun 2016)

  Changed paths:
    M migration/migration.c

  Log Message:
  -----------
  Migration: Split out ram part of qmp_query_migrate

The RAM section of qmp_query_migrate is reasonably complex
and repeated 3 times.  Split it out into a helper.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Reviwed-by: Denis V. Lunev <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Amit Shah <address@hidden>


  Commit: d3bf5418e2c5cf0e911b51b7041caddae5e8b38a
      
https://github.com/qemu/qemu/commit/d3bf5418e2c5cf0e911b51b7041caddae5e8b38a
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2016-06-16 (Thu, 16 Jun 2016)

  Changed paths:
    M hmp.c
    M include/migration/migration.h
    M migration/migration.c
    M migration/ram.c
    M qapi-schema.json

  Log Message:
  -----------
  Postcopy: Add stats on page requests

On the source, add a count of page requests received from the
destination.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Denis V. Lunev <address@hidden>
Message-id: address@hidden
Message-Id: <address@hidden>
Signed-off-by: Amit Shah <address@hidden>


  Commit: ea0c6d62391d269e2d8927a80912d479a0c5cf8a
      
https://github.com/qemu/qemu/commit/ea0c6d62391d269e2d8927a80912d479a0c5cf8a
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2016-06-16 (Thu, 16 Jun 2016)

  Changed paths:
    M tests/Makefile.include
    A tests/postcopy-test.c

  Log Message:
  -----------
  test: Postcopy

This is a postcopy test (x86 only) that actually runs the guest
and checks the memory contents.

The test runs from an x86 boot block with the hex embedded in the test;
the source for this is:

...........

.code16
.org 0x7c00
        .file   "fill.s"
        .text
        .globl  start
        .type   start, @function
start:             # at 0x7c00 ?
  cli
  lgdt gdtdesc
  mov $1,%eax
  mov %eax,%cr0  # Protected mode enable
  data32 ljmp $8,$0x7c20

.org 0x7c20
.code32
  # A20 enable - not sure I actually need this
  inb $0x92,%al
  or  $2,%al
  outb %al, $0x92
   # set up DS for the whole of RAM (needed on KVM)
  mov $16,%eax
  mov %eax,%ds
   mov $65,%ax
  mov $0x3f8,%dx
  outb %al,%dx
   # bl keeps a counter so we limit the output speed
  mov $0, %bl
mainloop:
  # Start from 1MB
  mov $(1024*1024),%eax
innerloop:
  incb (%eax)
  add $4096,%eax
  cmp $(100*1024*1024),%eax
  jl innerloop
   inc %bl
  jnz mainloop
   mov $66,%ax
  mov $0x3f8,%dx
  outb %al,%dx

        jmp mainloop
   # GDT magic from old (GPLv2)  Grub startup.S
  .p2align        2       /* force 4-byte alignment */
gdt:
  .word   0, 0
  .byte   0, 0, 0, 0
   /* -- code segment --
   * base = 0x00000000, limit = 0xFFFFF (4 KiB Granularity), present
   * type = 32bit code execute/read, DPL = 0
   */
  .word   0xFFFF, 0
  .byte   0, 0x9A, 0xCF, 0
   /* -- data segment --
   * base = 0x00000000, limit 0xFFFFF (4 KiB Granularity), present
   * type = 32 bit data read/write, DPL = 0
   */
  .word   0xFFFF, 0
  .byte   0, 0x92, 0xCF, 0

gdtdesc:
  .word   0x27                    /* limit */
  .long   gdt                     /* addr */

/* I'm a bootable disk */
.org 0x7dfe
  .byte 0x55
  .byte 0xAA

...........

and that can be assembled by the following magic:
    as --32 -march=i486 fill.s -o fill.o
    objcopy -O binary fill.o fill.boot
    dd if=fill.boot of=bootsect bs=256 count=2 skip=124
    xxd -i bootsect

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


  Commit: f5d457917817d7bfd2424bb88314eaf16b5ec9d6
      
https://github.com/qemu/qemu/commit/f5d457917817d7bfd2424bb88314eaf16b5ec9d6
  Author: Andrea Arcangeli <address@hidden>
  Date:   2016-06-16 (Thu, 16 Jun 2016)

  Changed paths:
    M tests/libqtest.c

  Log Message:
  -----------
  tests: fix libqtest socket timeouts

I kept getting timeouts and unix socket accept failures under high
load, the patch fixes it.

Signed-off-by: Andrea Arcangeli <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>
Message-id: address@hidden
Message-Id: <address@hidden>
Signed-off-by: Amit Shah <address@hidden>


  Commit: 096631bd95ac8f873fed9f62c4a57076ffcdb54d
      
https://github.com/qemu/qemu/commit/096631bd95ac8f873fed9f62c4a57076ffcdb54d
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2016-06-16 (Thu, 16 Jun 2016)

  Changed paths:
    M migration/migration.c

  Log Message:
  -----------
  Postcopy: Check for support when setting the capability

Knowing whether the destination host supports migration with
postcopy can be tricky.
The destination doesn't need the capability set, however
if we set it then use the opportunity to do the test and
tell the user/management layer early.

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


  Commit: bdbba12b6f334571c6b4e22ff9873f49e67efe44
      
https://github.com/qemu/qemu/commit/bdbba12b6f334571c6b4e22ff9873f49e67efe44
  Author: Daniel P. Berrange <address@hidden>
  Date:   2016-06-16 (Thu, 16 Jun 2016)

  Changed paths:
    M qapi-schema.json

  Log Message:
  -----------
  migration: fix typos in qapi-schema from latest migration additions

Recent migration QAPI enhancements had a few spelling mistakes
and also incorrect version number in a few places.

Signed-off-by: Daniel P. Berrange <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Message-Id: <address@hidden>
Signed-off-by: Amit Shah <address@hidden>


  Commit: 22724f4921e17919dc1b7b796c2c48eadfbcf2da
      
https://github.com/qemu/qemu/commit/22724f4921e17919dc1b7b796c2c48eadfbcf2da
  Author: Daniel P. Berrange <address@hidden>
  Date:   2016-06-16 (Thu, 16 Jun 2016)

  Changed paths:
    M include/migration/migration.h
    M migration/exec.c
    M migration/fd.c
    M migration/migration.c
    M migration/rdma.c
    M migration/socket.c
    M migration/tls.c

  Log Message:
  -----------
  migration: rename functions to starting migrations

Apply the following renames for starting incoming migration:

 process_incoming_migration -> migration_fd_process_incoming
 migration_set_incoming_channel -> migration_channel_process_incoming
 migration_tls_set_incoming_channel -> migration_tls_channel_process_incoming

and for starting outgoing migration:

 migration_set_outgoing_channel -> migration_channel_connect
 migration_tls_set_outgoing_channel -> migration_tls_channel_connect

Signed-off-by: Daniel P. Berrange <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Message-Id: <address@hidden>
Signed-off-by: Amit Shah <address@hidden>


  Commit: a66370b08d53837eb233cad090b3c2638084cc44
      
https://github.com/qemu/qemu/commit/a66370b08d53837eb233cad090b3c2638084cc44
  Author: Peter Maydell <address@hidden>
  Date:   2016-06-16 (Thu, 16 Jun 2016)

  Changed paths:
    M hmp.c
    M include/migration/migration.h
    M migration/exec.c
    M migration/fd.c
    M migration/migration.c
    M migration/ram.c
    M migration/rdma.c
    M migration/socket.c
    M migration/tls.c
    M qapi-schema.json
    M tests/Makefile.include
    M tests/libqtest.c
    A tests/postcopy-test.c

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

Migration:

- Fixes for TLS series
- Postcopy: Add stats, fix, test case

# gpg: Signature made Thu 16 Jun 2016 05:40:09 BST
# gpg:                using RSA key 0xEB0B4DFC657EF670
# gpg: Good signature from "Amit Shah <address@hidden>"
# gpg:                 aka "Amit Shah <address@hidden>"
# gpg:                 aka "Amit Shah <address@hidden>"
# Primary key fingerprint: 48CA 3722 5FE7 F4A8 B337  2735 1E9A 3B5F 8540 83B6
#      Subkey fingerprint: CC63 D332 AB8F 4617 4529  6534 EB0B 4DFC 657E F670

* remotes/amit-migration/tags/migration-for-2.7-4:
  migration: rename functions to starting migrations
  migration: fix typos in qapi-schema from latest migration additions
  Postcopy: Check for support when setting the capability
  tests: fix libqtest socket timeouts
  test: Postcopy
  Postcopy: Add stats on page requests
  Migration: Split out ram part of qmp_query_migrate
  Postcopy: Avoid 0 length discards

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


Compare: https://github.com/qemu/qemu/compare/5deaac15bf4f...a66370b08d53