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
