On 29 June 2016 at 16:35, Ed Maste <ema...@freebsd.org> wrote: > > I agree with a large code drop being undesirable.
Here's a little more information for reference. Sean's qemu-bsd-user branch is here: https://github.com/seanbruno/qemu-bsd-user The last upstream merge was from commit d6550e9e about a month ago. Diffstat reports: 243 files changed, 34213 insertions(+), 2898 deletions(-) 225 of those files are in bsd-user or are bsd-user.mak files in default-configs. The remaining changes outside of bsd-user are: Makefile.target | 2 configure | 99 + hw/audio/sb16.c | 6 hw/dma/i8257.c | 8 hw/intc/i8259.c | 1 hw/net/e1000.c | 2 include/qemu/atomic.h | 4 include/qemu/fprintf-fn.h | 10 net/clients.h | 5 net/hub.c | 1 net/net.c | 224 ++ net/tap-bsd.c | 1 net/tap.c | 8 qapi-schema.json | 5 qemu-char.c | 7 slirp/slirp_config.h | 18 ui/x_keymap.c | 6 They seem to be mostly unrelated to bsd-user itself but are patches taken from the FreeBSD ports tree - e.g. adding "-net pcap" https://svnweb.freebsd.org/ports/head/emulators/qemu-devel/files/pcap-patch-net_net.c?revision=416075&view=markup