The following changes since commit 1831e150606a221898bf46ffaf0453e9952cbbc4:
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2014-09-30 16:45:35 +0100) are available in the git repository at: git://github.com/bonzini/qemu.git tags/for-upstream for you to fetch changes up to c8ee8cb6ed76d49412e5067aa1e3f7ce2d47ce46: qemu-char: Fix reconnect socket error reporting (2014-10-09 12:57:31 +0200) ---------------------------------------------------------------- Four changes here. Polling for reconnection of character devices, the QOMification of accelerators, a fix for -kernel support on x86, and one for a recently-introduced virtio-scsi optimization. ---------------------------------------------------------------- Corey Minyard (9): qemu-char: Make the filename size for a chardev a #define qemu-char: Rework qemu_chr_open_socket() for reconnect qemu-char: Move some items into TCPCharDriver qemu-char: set socket filename to disconnected when not connected qemu-char: Add reconnecting to client sockets qemu-char: Print the remote and local addresses for a socket qemu-error: Add error_vreport() qemu-sockets: Add error to non-blocking connect handler qemu-char: Fix reconnect socket error reporting Eduardo Habkost (17): vl.c: Small coding style fix accel: Move accel code to accel.c accel: Create AccelType typedef accel: Simplify configure_accelerator() using AccelType *acc variable accel: Move accel name lookup to separate function accel: Use QOM classes for accel types accel: Make AccelClass.available() optional accel: Report unknown accelerator as "not found" instead of "does not exist" accel: Move KVM accel registration to kvm-all.c accel: Move Xen registration code to xen-common.c accel: Move qtest accel registration to qtest.c accel: Remove tcg_available() function accel: Move accel init/allowed code to separate function accel: Rename 'init' method to 'init_machine' accel: Pass MachineState object to accel init functions accel: Create accel object when initializing machine kvm: Make KVMState be the TYPE_KVM_ACCEL instance struct Paolo Bonzini (2): linuxboot: compute initrd loading address virtio-scsi: fix use-after-free of VirtIOSCSIReq Makefile.objs | 1 + accel.c | 157 ++++++++++++++++++ arch_init.c | 5 - hw/scsi/virtio-scsi.c | 9 +- include/hw/boards.h | 3 +- include/hw/xen/xen.h | 1 - include/qemu/error-report.h | 1 + include/qemu/sockets.h | 2 +- include/qemu/typedefs.h | 3 + include/sysemu/accel.h | 62 ++++++++ include/sysemu/arch_init.h | 1 - include/sysemu/kvm.h | 2 - include/sysemu/qtest.h | 1 - kvm-all.c | 40 ++++- kvm-stub.c | 5 - migration-tcp.c | 4 +- migration-unix.c | 4 +- pc-bios/linuxboot.bin | Bin 1024 -> 1024 bytes pc-bios/optionrom/linuxboot.S | 47 +++++- pc-bios/optionrom/optionrom.h | 21 ++- qapi-schema.json | 15 +- qemu-char.c | 359 ++++++++++++++++++++++++++++++++---------- qemu-options.hx | 20 ++- qtest.c | 27 +++- util/qemu-error.c | 23 ++- util/qemu-sockets.c | 20 ++- vl.c | 83 +--------- xen-common-stub.c | 6 - xen-common.c | 25 ++- 29 files changed, 712 insertions(+), 235 deletions(-) create mode 100644 accel.c create mode 100644 include/sysemu/accel.h