From: Paolo Bonzini <pbonzini@redhat.com>
To: Zhi Yong Wu <zwu.kernel@gmail.com>
Cc: aliguori@us.ibm.com, stefanha@linux.vnet.ibm.com,
Stefan Hajnoczi <stefanha@gmail.com>,
qemu-devel@nongnu.org, blauwirbel@gmail.com,
Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Subject: Re: [Qemu-devel] [PATCH v6 00/17] hub-based networking patchset
Date: Thu, 19 Jul 2012 18:08:52 +0200 [thread overview]
Message-ID: <50083114.4070308@redhat.com> (raw)
In-Reply-To: <CAEH94LgiG+0=c7WLwmhqwuMTL52iHRFbOx7fcqOHM-2ZVRqeZw@mail.gmail.com>
Il 19/07/2012 17:57, Zhi Yong Wu ha scritto:
> qapi/opts-visitor.h | 31 ++++
> qapi/opts-visitor.c | 427 +++++++++++++++++++++++++++++++++++++++++++++++++++
> qapi/Makefile.objs | 2 +-
> 3 files changed, 459 insertions(+), 1 deletions(-)
> create mode 100644 qapi/opts-visitor.h
> create mode 100644 qapi/opts-visitor.c
>
> From the above log of laszlo's patchset, there seems to be no too much
> conflict with my patchset.
The log is this:
error.h | 2 +-
net.h | 16 +--
net/dump.h | 5 +-
net/slirp.h | 4 +-
net/socket.h | 5 +-
net/tap.h | 10 +-
net/vde.h | 5 +-
qapi/opts-visitor.h | 31 +++
qapi/qapi-visit-core.h | 3 +
qemu-option-internal.h | 53 +++++
error.c | 3 +-
hw/cadence_gem.c | 2 +-
hw/dp8393x.c | 2 +-
hw/e1000.c | 2 +-
hw/eepro100.c | 2 +-
hw/etraxfs_eth.c | 2 +-
hw/lan9118.c | 2 +-
hw/lance.c | 2 +-
hw/mcf_fec.c | 2 +-
hw/milkymist-minimac2.c | 2 +-
hw/mipsnet.c | 2 +-
hw/musicpal.c | 2 +-
hw/ne2000-isa.c | 2 +-
hw/ne2000.c | 2 +-
hw/opencores_eth.c | 2 +-
hw/pcnet-pci.c | 2 +-
hw/rtl8139.c | 2 +-
hw/smc91c111.c | 2 +-
hw/spapr_llan.c | 2 +-
hw/stellaris_enet.c | 2 +-
hw/usb/dev-network.c | 2 +-
hw/vhost_net.c | 2 +-
hw/virtio-net.c | 10 +-
hw/xen_nic.c | 2 +-
hw/xgmac.c | 2 +-
hw/xilinx_axienet.c | 2 +-
hw/xilinx_ethlite.c | 2 +-
net.c | 494 +++++++++++-----------------------------
net/dump.c | 24 ++-
net/slirp.c | 96 +++------
net/socket.c | 124 ++++-------
net/tap-aix.c | 2 +-
net/tap-bsd.c | 2 +-
net/tap-haiku.c | 2 +-
net/tap-linux.c | 9 +-
net/tap-solaris.c | 2 +-
net/tap-win32.c | 14 +-
net/tap.c | 152 ++++++------
net/vde.c | 20 +-
qapi/opts-visitor.c | 427 ++++++++++++++++++++++++++++++++++
qapi/qapi-visit-core.c | 17 +-
qemu-option.c | 24 +--
tests/test-qmp-commands.c | 42 ++++
tests/test-qmp-input-visitor.c | 24 ++-
docs/qapi-code-gen.txt | 2 +
qapi-schema.json | 288 +++++++++++++++++++++++-
qapi/Makefile.objs | 2 +-
scripts/qapi-visit.py | 150 ++++++++-----
scripts/qapi.py | 6 +
59 files changed, 1350 insertions(+), 770 deletions(-)
create mode 100644 qapi/opts-visitor.h
create mode 100644 qemu-option-internal.h
create mode 100644 qapi/opts-visitor.c
and the net.h and net/* parts are going to conflict.
Paolo
next prev parent reply other threads:[~2012-07-19 16:09 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-20 9:42 [Qemu-devel] [PATCH v6 00/17] hub-based networking patchset zwu.kernel
2012-06-20 9:42 ` [Qemu-devel] [PATCH v6 01/17] net: Add a hub net client zwu.kernel
2012-06-20 9:42 ` [Qemu-devel] [PATCH v6 02/17] net: Use hubs for the vlan feature zwu.kernel
2012-06-20 9:42 ` [Qemu-devel] [PATCH v6 03/17] net: Look up 'vlan' net clients using hubs zwu.kernel
2012-06-20 9:42 ` [Qemu-devel] [PATCH v6 04/17] hub: Check that hubs are configured correctly zwu.kernel
2012-06-20 9:42 ` [Qemu-devel] [PATCH v6 05/17] net: Drop vlan argument to qemu_new_net_client() zwu.kernel
2012-06-20 9:42 ` [Qemu-devel] [PATCH v6 06/17] net: Remove vlan qdev property zwu.kernel
2012-06-20 9:42 ` [Qemu-devel] [PATCH v6 07/17] net: Remove vlan code from net.c zwu.kernel
2012-06-20 9:42 ` [Qemu-devel] [PATCH v6 08/17] net: Remove VLANState zwu.kernel
2012-06-20 9:42 ` [Qemu-devel] [PATCH v6 09/17] net: Rename non_vlan_clients to net_clients zwu.kernel
2012-06-20 9:42 ` [Qemu-devel] [PATCH v6 10/17] net: Rename VLANClientState to NetClientState zwu.kernel
2012-06-20 9:42 ` [Qemu-devel] [PATCH v6 11/17] net: Rename vc local variables to nc zwu.kernel
2012-06-20 9:42 ` [Qemu-devel] [PATCH v6 12/17] net: Rename qemu_del_vlan_client() to qemu_del_net_client() zwu.kernel
2012-06-20 9:42 ` [Qemu-devel] [PATCH v6 13/17] net: Make "info network" output more readable info zwu.kernel
2012-06-20 9:42 ` [Qemu-devel] [PATCH v6 14/17] net: cleanup deliver/deliver_iov func pointers zwu.kernel
2012-06-20 9:42 ` [Qemu-devel] [PATCH v6 15/17] net: determine if packets can be sent before net queue deliver packets zwu.kernel
2012-06-20 9:42 ` [Qemu-devel] [PATCH v6 16/17] hub: add the support for hub own flow control zwu.kernel
2012-06-20 9:42 ` [Qemu-devel] [PATCH v6 17/17] net: roll back qdev_prop_vlan zwu.kernel
2012-06-21 13:14 ` [Qemu-devel] [PATCH v6 00/17] hub-based networking patchset Stefan Hajnoczi
2012-06-24 15:11 ` Zhi Yong Wu
2012-07-19 15:40 ` Stefan Hajnoczi
2012-07-19 15:41 ` Paolo Bonzini
2012-07-19 15:48 ` Zhi Yong Wu
2012-07-19 15:49 ` Paolo Bonzini
2012-07-19 15:57 ` Zhi Yong Wu
2012-07-19 16:08 ` Paolo Bonzini [this message]
2012-07-19 16:16 ` Zhi Yong Wu
2012-07-19 15:48 ` Stefan Hajnoczi
2012-07-19 18:04 ` Laszlo Ersek
2012-07-20 5:16 ` Stefan Hajnoczi
2012-07-20 6:03 ` Laszlo Ersek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=50083114.4070308@redhat.com \
--to=pbonzini@redhat.com \
--cc=aliguori@us.ibm.com \
--cc=blauwirbel@gmail.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@gmail.com \
--cc=stefanha@linux.vnet.ibm.com \
--cc=wuzhy@linux.vnet.ibm.com \
--cc=zwu.kernel@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).