mbox

[PULL,0/4] migration: QTAILQ migration

Message ID 1483633930-7103-1-git-send-email-amit.shah@redhat.com
State New
Headers show

Pull-request

https://git.kernel.org/pub/scm/virt/qemu/amit/migration.git tags/migration-for-2.9-1

Message

Amit Shah Jan. 5, 2017, 4:32 p.m. UTC 
The following changes since commit dbe2b65566e76d3c3a0c3358285c0336ac61e757:

  Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-2.9-pull-request' into staging (2016-12-28 17:11:11 +0000)

are available in the git repository at:

  https://git.kernel.org/pub/scm/virt/qemu/amit/migration.git tags/migration-for-2.9-1

for you to fetch changes up to 8d0c57697abcc57166e918064d9a7f6c7316d01b:

  migration: add error_report (2017-01-04 19:21:26 +0530)

----------------------------------------------------------------
Migration: migrate QTAILQ infrastructure for vmstate

----------------------------------------------------------------



Jianjun Duan (4):
  migration: extend VMStateInfo
  migration: migrate QTAILQ
  tests/migration: Add test for QTAILQ migration
  migration: add error_report

 hw/display/virtio-gpu.c     |   8 +-
 hw/intc/s390_flic_kvm.c     |   8 +-
 hw/net/vmxnet3.c            |  24 ++++--
 hw/nvram/eeprom93xx.c       |   8 +-
 hw/nvram/fw_cfg.c           |   8 +-
 hw/pci/msix.c               |   8 +-
 hw/pci/pci.c                |  16 +++-
 hw/pci/shpc.c               |   7 +-
 hw/scsi/scsi-bus.c          |   8 +-
 hw/timer/twl92230.c         |   8 +-
 hw/usb/redirect.c           |  26 ++++--
 hw/virtio/virtio-pci.c      |   8 +-
 hw/virtio/virtio.c          |  15 +++-
 include/migration/vmstate.h |  39 +++++++--
 include/qemu/queue.h        |  60 ++++++++++++++
 migration/savevm.c          |   7 +-
 migration/trace-events      |   4 +
 migration/vmstate.c         | 188 +++++++++++++++++++++++++++++++++++---------
 target/alpha/machine.c      |   6 +-
 target/arm/machine.c        |  14 +++-
 target/i386/machine.c       |  26 ++++--
 target/mips/machine.c       |  14 +++-
 target/ppc/machine.c        |  12 ++-
 target/sparc/machine.c      |   6 +-
 tests/test-vmstate.c        | 147 ++++++++++++++++++++++++++++++++++
 25 files changed, 569 insertions(+), 106 deletions(-)

Comments

Peter Maydell Jan. 6, 2017, 12:10 p.m. UTC | #1 
On 5 January 2017 at 16:32, Amit Shah <amit.shah@redhat.com> wrote:
> The following changes since commit dbe2b65566e76d3c3a0c3358285c0336ac61e757:
>
>   Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-2.9-pull-request' into staging (2016-12-28 17:11:11 +0000)
>
> are available in the git repository at:
>
>   https://git.kernel.org/pub/scm/virt/qemu/amit/migration.git tags/migration-for-2.9-1
>
> for you to fetch changes up to 8d0c57697abcc57166e918064d9a7f6c7316d01b:
>
>   migration: add error_report (2017-01-04 19:21:26 +0530)
>
> ----------------------------------------------------------------
> Migration: migrate QTAILQ infrastructure for vmstate
>
> ----------------------------------------------------------------

Hi. I'm afraid this fails 'make check' for ppc64be:

TEST: tests/virtio-9p-test... (pid=62775)
  /i386/virtio/9p/pci/nop:                                             OK
  /i386/virtio/9p/pci/config:                                          OK
  /i386/virtio/9p/pci/fs/version/basic:                                OK
  /i386/virtio/9p/pci/fs/attach/basic:                                 **
ERROR:/home/pm215/qemu/tests/libqtest.c:339:qtest_rsp: assertion
failed (words[0] == "OK"): ("ERR" == "OK
")
**
ERROR:/home/pm215/qemu/qtest.c:281:qtest_process_command: assertion
failed: (command)
FAIL
GTester: last random seed: R02S8d2247e6c947755edd81860ea8a2b9c9
(pid=62788)
  /i386/virtio/9p/pci/fs/walk/basic:                                   **
ERROR:/home/pm215/qemu/tests/libqtest.c:339:qtest_rsp: assertion
failed (words[0] == "OK"): ("ERR" == "OK
")
**
ERROR:/home/pm215/qemu/qtest.c:281:qtest_process_command: assertion
failed: (command)
FAIL
GTester: last random seed: R02Sc5c6e6cda2c905d23a2e10a43aae0a39
(pid=62792)
  /i386/virtio/9p/pci/fs/walk/no_slash:                                **
ERROR:/home/pm215/qemu/tests/libqtest.c:339:qtest_rsp: assertion
failed (words[0] == "OK"): ("ERR" == "OK
")
**
ERROR:/home/pm215/qemu/qtest.c:281:qtest_process_command: assertion
failed: (command)
FAIL
GTester: last random seed: R02S1d66c364588fa2597428d8ebd81a1c87
(pid=62796)
  /i386/virtio/9p/pci/fs/walk/dotdot_from_root:                        **
ERROR:/home/pm215/qemu/tests/libqtest.c:339:qtest_rsp: assertion
failed (words[0] == "OK"): ("ERR" == "OK
")
**
ERROR:/home/pm215/qemu/qtest.c:281:qtest_process_command: assertion
failed: (command)
FAIL
GTester: last random seed: R02S8e89f14358da9979cf495fe61d427eb0
(pid=62800)
FAIL: tests/virtio-9p-test

thanks
-- PMM
Amit Shah Jan. 13, 2017, 3:37 a.m. UTC | #2 
On (Fri) 06 Jan 2017 [12:10:22], Peter Maydell wrote:
> On 5 January 2017 at 16:32, Amit Shah <amit.shah@redhat.com> wrote:
> > The following changes since commit dbe2b65566e76d3c3a0c3358285c0336ac61e757:
> >
> >   Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-2.9-pull-request' into staging (2016-12-28 17:11:11 +0000)
> >
> > are available in the git repository at:
> >
> >   https://git.kernel.org/pub/scm/virt/qemu/amit/migration.git tags/migration-for-2.9-1
> >
> > for you to fetch changes up to 8d0c57697abcc57166e918064d9a7f6c7316d01b:
> >
> >   migration: add error_report (2017-01-04 19:21:26 +0530)
> >
> > ----------------------------------------------------------------
> > Migration: migrate QTAILQ infrastructure for vmstate
> >
> > ----------------------------------------------------------------
> 
> Hi. I'm afraid this fails 'make check' for ppc64be:

Hi Peter, since this was due to something else, will you try to pull
this in again?  Or should I re-send the series?

Thanks,

		Amit
Peter Maydell Jan. 13, 2017, 9:43 a.m. UTC | #3 
On 13 January 2017 at 03:37, Amit Shah <amit.shah@redhat.com> wrote:
> On (Fri) 06 Jan 2017 [12:10:22], Peter Maydell wrote:
>> On 5 January 2017 at 16:32, Amit Shah <amit.shah@redhat.com> wrote:
>> > The following changes since commit dbe2b65566e76d3c3a0c3358285c0336ac61e757:
>> >
>> >   Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-2.9-pull-request' into staging (2016-12-28 17:11:11 +0000)
>> >
>> > are available in the git repository at:
>> >
>> >   https://git.kernel.org/pub/scm/virt/qemu/amit/migration.git tags/migration-for-2.9-1
>> >
>> > for you to fetch changes up to 8d0c57697abcc57166e918064d9a7f6c7316d01b:
>> >
>> >   migration: add error_report (2017-01-04 19:21:26 +0530)
>> >
>> > ----------------------------------------------------------------
>> > Migration: migrate QTAILQ infrastructure for vmstate
>> >
>> > ----------------------------------------------------------------
>>
>> Hi. I'm afraid this fails 'make check' for ppc64be:
>
> Hi Peter, since this was due to something else, will you try to pull
> this in again?  Or should I re-send the series?

I've put it back on my list to process.

thanks
-- PMM
Peter Maydell Jan. 16, 2017, 6:22 p.m. UTC | #4 
On 13 January 2017 at 09:43, Peter Maydell <peter.maydell@linaro.org> wrote:
> On 13 January 2017 at 03:37, Amit Shah <amit.shah@redhat.com> wrote:
>> On (Fri) 06 Jan 2017 [12:10:22], Peter Maydell wrote:
>>> On 5 January 2017 at 16:32, Amit Shah <amit.shah@redhat.com> wrote:
>>> > The following changes since commit dbe2b65566e76d3c3a0c3358285c0336ac61e757:
>>> >
>>> >   Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-2.9-pull-request' into staging (2016-12-28 17:11:11 +0000)
>>> >
>>> > are available in the git repository at:
>>> >
>>> >   https://git.kernel.org/pub/scm/virt/qemu/amit/migration.git tags/migration-for-2.9-1
>>> >
>>> > for you to fetch changes up to 8d0c57697abcc57166e918064d9a7f6c7316d01b:
>>> >
>>> >   migration: add error_report (2017-01-04 19:21:26 +0530)
>>> >
>>> > ----------------------------------------------------------------
>>> > Migration: migrate QTAILQ infrastructure for vmstate
>>> >
>>> > ----------------------------------------------------------------
>>>
>>> Hi. I'm afraid this fails 'make check' for ppc64be:
>>
>> Hi Peter, since this was due to something else, will you try to pull
>> this in again?  Or should I re-send the series?
>
> I've put it back on my list to process.

...but it fails to build on 32-bit:

/home/petmay01/qemu/tests/test-vmstate.c: In function 'test_load_q':
/home/petmay01/qemu/tests/test-vmstate.c:677:25: error: cast from
pointer to integer of different size [-Werror=pointer-to-int-cast]
     g_assert_cmpint((uint64_t) qele_from, ==, (uint64_t) qlast_from);
                         ^
/home/petmay01/qemu/tests/test-vmstate.c:677:56: error: cast from
pointer to integer of different size [-Werror=pointer-to-int-cast]
     g_assert_cmpint((uint64_t) qele_from, ==, (uint64_t) qlast_from);
                                                        ^
/home/petmay01/qemu/tests/test-vmstate.c:678:25: error: cast from
pointer to integer of different size [-Werror=pointer-to-int-cast]
     g_assert_cmpint((uint64_t) qele_to, ==, (uint64_t) qlast_to);
                         ^
/home/petmay01/qemu/tests/test-vmstate.c:678:54: error: cast from
pointer to integer of different size [-Werror=pointer-to-int-cast]
     g_assert_cmpint((uint64_t) qele_to, ==, (uint64_t) qlast_to);
                                                      ^
cc1: all warnings being treated as errors

Did you want uintptr_t ?

thanks
-- PMM