[Qemu-commits] [qemu/qemu] f40685: configure: require glib 2.22

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: f40685c62b802c8c3f5c914e8d357dd5c4d4f9cc
      
https://github.com/qemu/qemu/commit/f40685c62b802c8c3f5c914e8d357dd5c4d4f9cc
  Author: John Snow <address@hidden>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: require glib 2.22

This provides g_ptr_array_new_with_free_func, as well as a few
other functions that we've been hacking around in glib-compat.h.
Cleaning up the compatibility headers will come later.

Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: John Snow <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Message-id: address@hidden


  Commit: 62754b157156c2cd26a00ce534aeec9e74619d95
      
https://github.com/qemu/qemu/commit/62754b157156c2cd26a00ce534aeec9e74619d95
  Author: John Snow <address@hidden>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M include/glib-compat.h

  Log Message:
  -----------
  glib: remove stale compat functions

Since we're bumping the version to 2.22+,
remove the now-stale compat functions.

Signed-off-by: John Snow <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Message-id: address@hidden


  Commit: 008b6e123ff2ee421112768e838b0b44bc7f6c45
      
https://github.com/qemu/qemu/commit/008b6e123ff2ee421112768e838b0b44bc7f6c45
  Author: John Snow <address@hidden>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M tests/libqos/ahci.c
    M tests/libqos/ahci.h

  Log Message:
  -----------
  libqos/ahci: Add halted command helpers

Sometimes we want a command to halt the VM instead
of complete successfully, so it'd be nice to let the
libqos/ahci functions cope with such scenarios.

Signed-off-by: John Snow <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Message-id: address@hidden


  Commit: 455e861cc625891baacf74e66c31a914883b80ca
      
https://github.com/qemu/qemu/commit/455e861cc625891baacf74e66c31a914883b80ca
  Author: John Snow <address@hidden>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M tests/libqos/ahci.c

  Log Message:
  -----------
  libqos/ahci: Fix sector set method

|| probably does not mean the same thing as |.

Additionally, allow users to submit a prd_size of 0
to indicate that they'd like to continue using the default.

Signed-off-by: John Snow <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Message-id: address@hidden


  Commit: 085248ae87704f1c1e4e1f929f58beca3ba294a2
      
https://github.com/qemu/qemu/commit/085248ae87704f1c1e4e1f929f58beca3ba294a2
  Author: John Snow <address@hidden>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M tests/libqos/libqos.c
    M tests/libqos/libqos.h
    M tests/libqos/malloc.c
    M tests/libqos/malloc.h

  Log Message:
  -----------
  libqos: Add migration helpers

libqos.c:
    -set_context for addressing which commands go where
    -migrate performs the actual migration

malloc.c:
    - Structure of the allocator is adjusted slightly with
      a second-tier malloc to make swapping around the allocators
      easy when we "migrate" the lists from the source to the destination.

Signed-off-by: John Snow <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Message-id: address@hidden


  Commit: 04329029a8c539eb5f75dcb6d8b016f0c53a031a
      
https://github.com/qemu/qemu/commit/04329029a8c539eb5f75dcb6d8b016f0c53a031a
  Author: John Snow <address@hidden>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M hw/ide/ahci.c
    M hw/ide/ich.c

  Log Message:
  -----------
  ich9/ahci: Enable Migration

Lift the flag preventing the migration of the ICH9/AHCI devices.

Signed-off-by: John Snow <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Message-id: address@hidden


  Commit: 278128ab06c36341edb2c8b0bfcfd92760f4db52
      
https://github.com/qemu/qemu/commit/278128ab06c36341edb2c8b0bfcfd92760f4db52
  Author: John Snow <address@hidden>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M tests/ahci-test.c

  Log Message:
  -----------
  qtest/ahci: Add migration test

Notes:

 * The migration is performed on QOSState objects.

 * The migration is performed in such a way that it does not assume
   consistency between the allocators attached to each. That is to say,
   you can use each QOSState object completely independently and then at
   an arbitrary point decide to migrate, and the destination object will
   now be consistent with the memory within the source guest. The source
   object that was migrated from will have a completely blank allocator.

ahci-test.c:
 - verify_state is added
 - ahci_migrate is added as a frontend to migrate
 - test_migrate_sanity test case is added.

Signed-off-by: John Snow <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Message-id: address@hidden


  Commit: 88e21f9485f0a41603f0af3483ff3f11c95979ab
      
https://github.com/qemu/qemu/commit/88e21f9485f0a41603f0af3483ff3f11c95979ab
  Author: John Snow <address@hidden>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M tests/ahci-test.c
    M tests/libqos/ahci.c

  Log Message:
  -----------
  qtest/ahci: add migrate dma test

Write to one guest, migrate, and then read from the other.
adjust ahci_io to clear any buffers it creates, so that we
can use ahci_io safely on both guests knowing we are using
empty buffers and not accidentally re-using data.

Signed-off-by: John Snow <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Message-id: address@hidden


  Commit: a606ce50c29561b567995ab663cbb40067623e82
      
https://github.com/qemu/qemu/commit/a606ce50c29561b567995ab663cbb40067623e82
  Author: John Snow <address@hidden>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M tests/ahci-test.c

  Log Message:
  -----------
  qtest/ahci: add flush migrate test

Use blkdebug to inject an error on first flush, then attempt to flush
on the first guest. When the error halts the VM, migrate to the
second VM, and attempt to resume the command.

Signed-off-by: John Snow <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Message-id: address@hidden


  Commit: 189d1b6126625212fbb50ed3a30a3e9e7ba7ca37
      
https://github.com/qemu/qemu/commit/189d1b6126625212fbb50ed3a30a3e9e7ba7ca37
  Author: John Snow <address@hidden>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M tests/ahci-test.c

  Log Message:
  -----------
  qtest/ahci: add halted dma test

If we're going to test the migration of halted DMA jobs,
we should probably check to make sure we can resume them
locally as a first step.

Signed-off-by: John Snow <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Message-id: address@hidden


  Commit: 5d1cf0917b4f1282ac81bb72697713d14c98a876
      
https://github.com/qemu/qemu/commit/5d1cf0917b4f1282ac81bb72697713d14c98a876
  Author: John Snow <address@hidden>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M tests/ahci-test.c

  Log Message:
  -----------
  qtest/ahci: add migrate halted dma test

Test migrating a halted DMA transaction.
Resume, then test data integrity.

Signed-off-by: John Snow <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Message-id: address@hidden


  Commit: 332cc7e9b39ddb2feacb4c71dcd18c3e5b0c3147
      
https://github.com/qemu/qemu/commit/332cc7e9b39ddb2feacb4c71dcd18c3e5b0c3147
  Author: John Snow <address@hidden>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M qtest.c

  Log Message:
  -----------
  qtest: allow arbitrarily long sends

qtest currently has a static buffer of size 1024 that if we
overflow, ignores the additional data silently which leads
to hangs or stream failures.

Use glib's string facilities to allow arbitrarily long data,
but split this off into a new function, qtest_sendf.

Static data can still be sent using qtest_send, which avoids
the malloc/copy overhead.

Signed-off-by: John Snow <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden


  Commit: 7a6a740d8dcc02f5693315d7935b5de9b963bb96
      
https://github.com/qemu/qemu/commit/7a6a740d8dcc02f5693315d7935b5de9b963bb96
  Author: John Snow <address@hidden>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M qtest.c
    M tests/libqtest.c
    M tests/libqtest.h

  Log Message:
  -----------
  qtest: Add base64 encoded read/write

For larger pieces of data that won't need to be debugged and
viewing the hex nibbles is unlikely to be useful, we can encode
data using base64 instead of encoding each byte as %02x, which
leads to some space savings and faster reads/writes.

For now, the default is left as hex nibbles in memwrite() and memread().
For the purposes of making qtest io easier to read and debug, some
callers may want to specify using the old encoding format for small
patches of data where the savings from base64 wouldn't be that profound.

memwrite/memread use a data encoding that takes 2x the size of the original
buffer, but base64 uses "only" (4/3)x, so for larger buffers we can save a
decent amount of time and space.

Signed-off-by: John Snow <address@hidden>
Message-id: address@hidden


  Commit: 4d00796364ec4edab86b08abc38fd644d5e3c0ad
      
https://github.com/qemu/qemu/commit/4d00796364ec4edab86b08abc38fd644d5e3c0ad
  Author: John Snow <address@hidden>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M qtest.c
    M tests/libqtest.c

  Log Message:
  -----------
  qtest: add memset to qtest protocol

Previously, memset was just a frontend to write() and only
stupidly sent the pattern many times across the wire.

Let's not discuss who stupidly wrote it like that in the first place.
(Hint: It was me.)

Signed-off-by: John Snow <address@hidden>
Message-id: address@hidden


  Commit: 91d0374a7ffbd6a9cd0ba159c9160d9f26220cf5
      
https://github.com/qemu/qemu/commit/91d0374a7ffbd6a9cd0ba159c9160d9f26220cf5
  Author: John Snow <address@hidden>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M tests/ahci-test.c
    M tests/libqos/ahci.c

  Log Message:
  -----------
  libqos/ahci: Swap memread/write with bufread/write

Where it makes sense, use the new faster primitives.
For generally small reads/writes such as for the PRDT
and FIS packets, stick with the more wasteful but
easier to debug memread/memwrite.

For ahci-test (before migration tests):
With this patch:
real    0m3.675s
user    0m2.582s
sys     0m1.718s

Without any qtest protocol improvements:
real    0m14.171s
user    0m12.072s
sys     0m12.527s

Signed-off-by: John Snow <address@hidden>
Message-id: address@hidden


  Commit: 5560b85a31e6f15a8841b66620d9497943094ee4
      
https://github.com/qemu/qemu/commit/5560b85a31e6f15a8841b66620d9497943094ee4
  Author: John Snow <address@hidden>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M qtest.c
    M tests/libqtest.c

  Log Message:
  -----------
  qtest: pre-buffer hex nibs

Instead of converting each byte one-at-a-time and then sending each byte
over the wire, use sprintf() to pre-compute all of the hex nibs into a
single buffer, then send the entire buffer all at once.

This gives a moderate speed boost to memread() and memwrite() functions.

Signed-off-by: John Snow <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-id: address@hidden


  Commit: 4827ac1e8f8306b24e61b44ea1f2082ea08099bb
      
https://github.com/qemu/qemu/commit/4827ac1e8f8306b24e61b44ea1f2082ea08099bb
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M hw/ide/macio.c

  Log Message:
  -----------
  macio: move unaligned DMA read code into separate pmac_dma_read() function

This considerably helps simplify the complexity of the macio read routines and
by switching macio CDROM accesses to use the new code, fixes the issue with
the CDROM device being detected intermittently by Darwin/OS X.

[Maintainer edit: printf format codes adjusted for 32/64bit. --js]

Signed-off-by: Mark Cave-Ayland <address@hidden>
Acked-by: John Snow <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: bd4214fc92090694aefa17882815c6109f0fd70c
      
https://github.com/qemu/qemu/commit/bd4214fc92090694aefa17882815c6109f0fd70c
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M hw/ide/macio.c
    M include/hw/ppc/mac_dbdma.h

  Log Message:
  -----------
  macio: move unaligned DMA write code into separate pmac_dma_write() function

Similarly switch the macio IDE routines over to use the new function and
tidy-up the remaining code as required.

[Maintainer edit: printf format codes adjusted for 32/64bit. --js]

Signed-off-by: Mark Cave-Ayland <address@hidden>
Acked-by: John Snow <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: cd6cb73beb63e5fa62ca8ed540b9d54063b15c44
      
https://github.com/qemu/qemu/commit/cd6cb73beb63e5fa62ca8ed540b9d54063b15c44
  Author: John Snow <address@hidden>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M hw/ide/ahci.c

  Log Message:
  -----------
  ahci: do not remap clb/fis unconditionally

This continues the IOMMU fix from 2.3, where we should not attempt
to remap the CLB or FIS RX buffers if the AHCI device is currently
running.

The same applies to migration: keep our mitts off these registers
unless the device is supposed to be on.

Does not impact backwards compatibility for the AHCI device.

Signed-off-by: John Snow <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Message-id: address@hidden


  Commit: 0915aed5842bd4dbe396b92d4f3b846ae29ad663
      
https://github.com/qemu/qemu/commit/0915aed5842bd4dbe396b92d4f3b846ae29ad663
  Author: Peter Maydell <address@hidden>
  Date:   2015-05-26 (Tue, 26 May 2015)

  Changed paths:
    M configure
    M hw/ide/ahci.c
    M hw/ide/ich.c
    M hw/ide/macio.c
    M include/glib-compat.h
    M include/hw/ppc/mac_dbdma.h
    M qtest.c
    M tests/ahci-test.c
    M tests/libqos/ahci.c
    M tests/libqos/ahci.h
    M tests/libqos/libqos.c
    M tests/libqos/libqos.h
    M tests/libqos/malloc.c
    M tests/libqos/malloc.h
    M tests/libqtest.c
    M tests/libqtest.h

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into 
staging

# gpg: Signature made Fri May 22 20:58:44 2015 BST using RSA key ID AAFC390E
# gpg: Good signature from "John Snow (John Huston) <address@hidden>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: FAEB 9711 A12C F475 812F  18F2 88A9 064D 1835 61EB
#      Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76  CBD0 7DEF 8106 AAFC 390E

* remotes/jnsnow/tags/ide-pull-request:
  ahci: do not remap clb/fis unconditionally
  macio: move unaligned DMA write code into separate pmac_dma_write() function
  macio: move unaligned DMA read code into separate pmac_dma_read() function
  qtest: pre-buffer hex nibs
  libqos/ahci: Swap memread/write with bufread/write
  qtest: add memset to qtest protocol
  qtest: Add base64 encoded read/write
  qtest: allow arbitrarily long sends
  qtest/ahci: add migrate halted dma test
  qtest/ahci: add halted dma test
  qtest/ahci: add flush migrate test
  qtest/ahci: add migrate dma test
  qtest/ahci: Add migration test
  ich9/ahci: Enable Migration
  libqos: Add migration helpers
  libqos/ahci: Fix sector set method
  libqos/ahci: Add halted command helpers
  glib: remove stale compat functions
  configure: require glib 2.22

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


Compare: https://github.com/qemu/qemu/compare/0d2ed6039cf8...0915aed5842b