From: Avi Kivity <a...@redhat.com> * commit 'master': (180 commits) xen: add -vga xenfb option, configure xenfb (Gerd Hoffmann) simplify vga selection (Gerd Hoffmann) xen: pv domain builder. (Gerd Hoffmann) xen: blk & nic configuration via cmd line. (Gerd Hoffmann) xen: add net backend driver. (Gerd Hoffmann) xen: add block device backend driver. (Gerd Hoffmann) xen: add framebuffer backend driver (Gerd Hoffmann) xen: add console backend driver. (Gerd Hoffmann) xen: backend driver core (Gerd Hoffmann) xen: groundwork for xen support (Gerd Hoffmann) update .gitignore: add qemu-io (Gerd Hoffmann) qcow2: Add plausibility check for L1/L2 entries (Kevin Wolf) qcow2: Refcount checking code cleanup (Kevin Wolf) Introduce qemu-img check subcommand (Kevin Wolf) Introduce bdrv_check (Kevin Wolf) qcow2: Fix warnings in check_refcount() (Kevin Wolf) sending NUMA topology to BIOS (Andre Przywara) add info numa command to monitor (Andre Przywara) added -numa cmdline parameter parser (Andre Przywara) Safety net for the cases where disassembler/translator disagree over instruction decoding ...
Conflicts: Makefile Makefile.target configure cpu-all.h gdbstub.c hw/apic.c hw/cirrus_vga.c hw/eepro100.c hw/pc.c hw/pcnet.c hw/rtl8139.c hw/vga.c net.c pc-bios/bios.bin sysemu.h vl.c Signed-off-by: Avi Kivity <a...@redhat.com> -- To unsubscribe from this list: send the line "unsubscribe kvm-commits" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html