On 6 June 2017 at 15:02, Paolo Bonzini <pbonz...@redhat.com> wrote: > The following changes since commit 70f31414e71250c6049a46851372ee6ea76f40dd: > > Merge remote-tracking branch 'remotes/ehabkost/tags/numa-pull-request' into > staging (2017-06-01 10:58:47 +0100) > > are available in the git repository at: > > git://github.com/bonzini/qemu.git tags/for-upstream > > for you to fetch changes up to 0c5029c963dbce627d75cd0267594224c89a6479: > > Merge tag 'tags/for-upstream' into HEAD
This doesn't build when merged into current master: /home/pm215/qemu/hw/scsi/vhost-user-scsi.c: In function ‘vhost_user_scsi_realize’: /home/pm215/qemu/hw/scsi/vhost-user-scsi.c:121:5: error: implicit declaration of function ‘register_savevm’ [-Werror=implicit-function-declaration] register_savevm(dev, "vhost-user-scsi", vhost_user_scsi_id++, 1, ^ /home/pm215/qemu/hw/scsi/vhost-user-scsi.c:121:5: error: nested extern declaration of ‘register_savevm’ [-Werror=nested-externs] It has crossed in the post with the ppc pullreq, which includes a patch which removes register_savevm() as finally unnecessary. This new device should almost certainly be using a vmstate struct instead. thanks -- PMM