mbox

[PULL,00/13] Netpatches

Message ID 1550847320-25110-1-git-send-email-jasowang@redhat.com
State New
Headers show

Pull-request

https://github.com/jasowang/qemu.git tags/net-pull-request

Message

Jason Wang Feb. 22, 2019, 2:55 p.m. UTC
The following changes since commit 7817ea16c1bb91ba3849e704d5f3e3c5775087bf:

  Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20190221' into staging (2019-02-22 13:04:42 +0000)

are available in the git repository at:

  https://github.com/jasowang/qemu.git tags/net-pull-request

for you to fetch changes up to eb4702b3ffcf11ec62f0c401f77f49219594e95c:

  net: netmap: improve netmap_receive_iov() (2019-02-22 22:39:24 +0800)

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

----------------------------------------------------------------
Dr. David Alan Gilbert (9):
      net: Introduce announce timer
      migration: Add announce parameters
      virtio-net: Switch to using announce timer
      migration: Switch to using announce timer
      net: Add a network device specific self-announcement ability
      virtio-net: Allow qemu_announce_self to trigger virtio announcements
      qmp: Add announce-self command
      hmp: Add hmp_announce_self
      tests: Add a test for qemu self announcements

Vincenzo Maffione (3):
      net: netmap: small improvements netmap_send()
      net: netmap: simplify netmap_receive()
      net: netmap: improve netmap_receive_iov()

Zhang Chen (1):
      net/colo-compare.c: Remove duplicated code

 hmp-commands.hx                |  14 +++++
 hmp.c                          |  33 ++++++++++
 hmp.h                          |   1 +
 hw/net/trace-events            |   6 ++
 hw/net/virtio-net.c            |  69 +++++++++++++++-----
 include/hw/virtio/virtio-net.h |   4 +-
 include/migration/misc.h       |  12 +---
 include/net/announce.h         |  41 ++++++++++++
 include/net/net.h              |   2 +
 include/qemu/typedefs.h        |   1 +
 include/sysemu/sysemu.h        |   2 -
 migration/migration.c          | 103 +++++++++++++++++++++++++++++-
 migration/migration.h          |   4 ++
 migration/savevm.c             |  72 +--------------------
 migration/trace-events         |   1 -
 net/Makefile.objs              |   1 +
 net/announce.c                 | 140 +++++++++++++++++++++++++++++++++++++++++
 net/colo-compare.c             |   8 ---
 net/netmap.c                   | 110 ++++++++++++++------------------
 net/trace-events               |   3 +
 qapi/migration.json            |  53 +++++++++++++++-
 qapi/net.json                  |  43 +++++++++++++
 tests/Makefile.include         |   3 +
 tests/test-announce-self.c     |  83 ++++++++++++++++++++++++
 tests/test-hmp.c               |   1 +
 25 files changed, 636 insertions(+), 174 deletions(-)
 create mode 100644 include/net/announce.h
 create mode 100644 net/announce.c
 create mode 100644 tests/test-announce-self.c

Comments

Peter Maydell Feb. 26, 2019, 4:06 p.m. UTC | #1
On Fri, 22 Feb 2019 at 14:55, Jason Wang <jasowang@redhat.com> wrote:
>
> The following changes since commit 7817ea16c1bb91ba3849e704d5f3e3c5775087bf:
>
>   Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20190221' into staging (2019-02-22 13:04:42 +0000)
>
> are available in the git repository at:
>
>   https://github.com/jasowang/qemu.git tags/net-pull-request
>
> for you to fetch changes up to eb4702b3ffcf11ec62f0c401f77f49219594e95c:
>
>   net: netmap: improve netmap_receive_iov() (2019-02-22 22:39:24 +0800)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------

Fails to build on at least some hosts:

cc -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -g   -Wl,--warn-common -g
  /home/pm215/qemu/tests/test-announce-self.c tests/libqtest.o
libqemuutil.a   -o tests/test-announce-self
/home/pm215/qemu/tests/test-announce-self.c:11:24: fatal error:
qemu/osdep.h: No such file or directory
 #include "qemu/osdep.h"
                        ^


Something looks to be wrong with the command line here -- it is
not adding the usual/expected set of QEMU cflags (and in particular
is missing the option that adds the QEMU source tree to the
include path).

thanks
-- PMM
Dr. David Alan Gilbert Feb. 26, 2019, 7:50 p.m. UTC | #2
* Peter Maydell (peter.maydell@linaro.org) wrote:
> On Fri, 22 Feb 2019 at 14:55, Jason Wang <jasowang@redhat.com> wrote:
> >
> > The following changes since commit 7817ea16c1bb91ba3849e704d5f3e3c5775087bf:
> >
> >   Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20190221' into staging (2019-02-22 13:04:42 +0000)
> >
> > are available in the git repository at:
> >
> >   https://github.com/jasowang/qemu.git tags/net-pull-request
> >
> > for you to fetch changes up to eb4702b3ffcf11ec62f0c401f77f49219594e95c:
> >
> >   net: netmap: improve netmap_receive_iov() (2019-02-22 22:39:24 +0800)
> >
> > ----------------------------------------------------------------
> >
> > ----------------------------------------------------------------
> 
> Fails to build on at least some hosts:
> 
> cc -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -g   -Wl,--warn-common -g
>   /home/pm215/qemu/tests/test-announce-self.c tests/libqtest.o
> libqemuutil.a   -o tests/test-announce-self
> /home/pm215/qemu/tests/test-announce-self.c:11:24: fatal error:
> qemu/osdep.h: No such file or directory
>  #include "qemu/osdep.h"
>                         ^
> 
> 
> Something looks to be wrong with the command line here -- it is
> not adding the usual/expected set of QEMU cflags (and in particular
> is missing the option that adds the QEMU source tree to the
> include path).

OK, I see it, I was missing a :
+tests/test-announce-self$(EXESUF): tests/test-announce-self.o

line

Curious that it worked on some platforms; I guess maybe there's an
implicit rule somewhere.

Dave

> thanks
> -- PMM
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK