Merge lp://staging/~serge-hallyn/ubuntu/maverick/qemu-kvm/fix-conflicts into lp://staging/ubuntu/maverick/qemu-kvm
Proposed by
Serge Hallyn
Status: | Merged |
---|---|
Merge reported by: | Dustin Kirkland |
Merged at revision: | not available |
Proposed branch: | lp://staging/~serge-hallyn/ubuntu/maverick/qemu-kvm/fix-conflicts |
Merge into: | lp://staging/ubuntu/maverick/qemu-kvm |
Diff against target: |
208488 lines (+108194/-49031) 978 files modified
.gitignore (+7/-1) .gitmodules (+2/-2) CODING_STYLE (+3/-0) Changelog (+1/-186) EXTERNAL_DEPENDENCIES (+0/-2) KVM_VERSION (+0/-1) MAINTAINERS (+3/-3) Makefile (+91/-232) Makefile.dis (+23/-0) Makefile.hw (+5/-36) Makefile.objs (+283/-0) Makefile.target (+106/-102) Makefile.user (+3/-12) QMP/README (+61/-33) QMP/qmp-events.txt (+200/-24) QMP/qmp-shell (+1/-0) QMP/qmp-spec.txt (+88/-19) QMP/qmp.py (+5/-1) QMP/vm-info (+2/-1) VERSION (+1/-1) arch_init.c (+645/-0) arch_init.h (+33/-0) arm-dis.c (+6/-11) arm-semi.c (+1/-0) audio/alsaaudio.c (+6/-5) audio/audio.c (+12/-3) audio/audio_template.h (+1/-1) audio/mixeng.c (+1/-1) audio/sdlaudio.c (+54/-41) balloon.c (+146/-0) balloon.h (+11/-5) block-migration.c (+226/-120) block.c (+723/-294) block.h (+100/-20) block/blkdebug.c (+473/-0) block/bochs.c (+28/-57) block/cloop.c (+24/-24) block/cow.c (+91/-66) block/curl.c (+19/-17) block/dmg.c (+63/-52) block/nbd.c (+1/-4) block/parallels.c (+13/-38) block/qcow.c (+60/-40) block/qcow2-cluster.c (+100/-57) block/qcow2-refcount.c (+195/-95) block/qcow2-snapshot.c (+11/-11) block/qcow2.c (+281/-93) block/qcow2.h (+10/-4) block/raw-posix.c (+135/-109) block/raw-win32.c (+20/-16) block/raw.c (+150/-0) block/sheepdog.c (+2036/-0) block/vdi.c (+22/-28) block/vmdk.c (+156/-142) block/vpc.c (+38/-27) block/vvfat.c (+43/-21) block_int.h (+61/-11) blockdev.c (+612/-0) blockdev.h (+64/-0) bsd-user/main.c (+14/-3) bsd-user/mmap.c (+3/-4) bswap.h (+8/-0) bt-host.c (+3/-10) buffered_file.c (+29/-19) cache-utils.c (+24/-0) check-qdict.c (+35/-1) check-qfloat.c (+0/-5) check-qint.c (+3/-0) check-qjson.c (+109/-4) check-qlist.c (+2/-2) check-qstring.c (+3/-0) cmd.c (+32/-4) cocoa.m (+0/-982) compatfd.c (+0/-26) compatfd.h (+0/-2) configure (+485/-192) console.c (+129/-66) console.h (+53/-7) cpu-all.h (+85/-190) cpu-common.h (+47/-3) cpu-defs.h (+28/-16) cpu-exec.c (+140/-74) cpus.c (+868/-0) cpus.h (+22/-0) create_config (+8/-4) curses.c (+0/-371) curses_keys.h (+0/-483) cursor.c (+210/-0) cursor_hidden.xpm (+37/-0) cursor_left_ptr.xpm (+39/-0) cutils.c (+18/-0) d3des.c (+0/-424) d3des.h (+0/-51) darwin-user/commpage.c (+1/-1) darwin-user/main.c (+7/-7) darwin-user/mmap.c (+1/-1) darwin-user/syscall.c (+1/-1) debian/binfmts/qemu-alpha (+0/-1) debian/binfmts/qemu-arm (+0/-1) debian/binfmts/qemu-armeb (+0/-1) debian/binfmts/qemu-cris (+0/-1) debian/binfmts/qemu-i386 (+0/-1) debian/binfmts/qemu-m68k (+0/-1) debian/binfmts/qemu-microblaze (+0/-1) debian/binfmts/qemu-mips (+0/-1) debian/binfmts/qemu-mipsel (+0/-1) debian/binfmts/qemu-ppc (+0/-1) debian/binfmts/qemu-ppc64 (+0/-1) debian/binfmts/qemu-ppc64abi32 (+0/-1) debian/binfmts/qemu-sh4 (+0/-1) debian/binfmts/qemu-sh4eb (+0/-1) debian/binfmts/qemu-sparc (+0/-1) debian/binfmts/qemu-sparc32plus (+0/-1) debian/binfmts/qemu-sparc64 (+0/-1) debian/binfmts/qemu-x86_64 (+0/-1) debian/changelog (+101/-0) debian/control (+44/-20) debian/patches/05_improve-qemu-img-errors.patch (+0/-19) debian/patches/1000-undo-earlier-static.patch (+23/-0) debian/patches/2000-vmmouse-adapt-to-mouse-handler-changes.patch (+112/-0) debian/patches/Detect-and-use-GCC-atomic-builtins-for-locking.patch (+10/-6) debian/patches/arm-higher-initrd-load-address.patch (+3/-3) debian/patches/arm-host-fix-compiler-warning.patch (+0/-87) debian/patches/arm-ignore-writes-of-perf-reg-cp15-with-crm-12.patch (+5/-3) debian/patches/caps-lock-key-up-event.patch (+33/-0) debian/patches/check-for-invalid-initrd-file.patch (+0/-30) debian/patches/fix-CMOS-info-for-drives-defined-with--device.patch (+0/-278) debian/patches/larger_default_ram_size.patch (+7/-5) debian/patches/linux-user-do-not-warn-for-missing-pselect6.patch (+0/-64) debian/patches/scm-rights-fd.patch (+0/-57) debian/patches/series (+3/-6) debian/qemu-common.install (+3/-3) debian/qemu-debootstrap (+4/-2) debian/qemu-kvm.install (+1/-1) debian/qemu-kvm.upstart (+4/-0) debian/rules (+10/-8) def-helper.h (+29/-9) default-configs/arm-softmmu.mak (+7/-2) default-configs/cris-softmmu.mak (+2/-0) default-configs/i386-softmmu.mak (+24/-0) default-configs/m68k-softmmu.mak (+1/-0) default-configs/microblaze-softmmu.mak (+2/-0) default-configs/mips-softmmu.mak (+28/-0) default-configs/mips64-softmmu.mak (+28/-0) default-configs/mips64el-softmmu.mak (+30/-0) default-configs/mipsel-softmmu.mak (+28/-0) default-configs/ppc-softmmu.mak (+28/-0) default-configs/ppc64-softmmu.mak (+28/-0) default-configs/ppcemb-softmmu.mak (+28/-0) default-configs/sh4-softmmu.mak (+4/-0) default-configs/sh4eb-softmmu.mak (+4/-0) default-configs/sparc-softmmu.mak (+3/-1) default-configs/sparc64-softmmu.mak (+11/-0) default-configs/x86_64-softmmu.mak (+24/-0) dis-asm.h (+5/-0) disas.c (+17/-0) disas.h (+4/-0) docs/migration.txt (+303/-0) docs/qdev-device-use.txt (+353/-0) docs/specs/ivshmem_device_spec.txt (+96/-0) dyngen-exec.h (+1/-26) elf.h (+4/-1) exec-all.h (+48/-57) exec.c (+929/-530) fpu/softfloat-native.c (+0/-20) fpu/softfloat-native.h (+1/-8) fpu/softfloat-specialize.h (+2/-2) fpu/softfloat.c (+83/-8) fpu/softfloat.h (+3/-0) fsdev/qemu-fsdev.c (+77/-0) fsdev/qemu-fsdev.h (+55/-0) gdbstub.c (+153/-76) gdbstub.h (+10/-4) gen-icount.h (+2/-0) hostregs_helper.h (+0/-61) hppa-dis.c (+2/-2) hw/9p.h (+24/-0) hw/ac97.c (+34/-30) hw/acpi.c (+1/-805) hw/acpi.h (+78/-0) hw/acpi_piix4.c (+693/-0) hw/adb.c (+2/-2) hw/ads7846.c (+1/-1) hw/alpha_palcode.c (+8/-55) hw/an5206.c (+4/-4) hw/apb_pci.c (+210/-58) hw/apic.c (+127/-141) hw/apic.h (+28/-0) hw/apm.c (+86/-0) hw/apm.h (+22/-0) hw/applesmc.c (+241/-0) hw/arm_boot.c (+3/-2) hw/arm_gic.c (+1/-1) hw/arm_timer.c (+2/-2) hw/armv7m.c (+16/-19) hw/armv7m_nvic.c (+5/-5) hw/axis_dev88.c (+10/-43) hw/baum.c (+13/-0) hw/boards.h (+1/-1) hw/bonito.c (+808/-0) hw/bt-hci-csr.c (+2/-2) hw/bt-hci.c (+1/-6) hw/bt-l2cap.c (+3/-3) hw/bt-sdp.c (+2/-2) hw/cirrus_vga.c (+1/-2) hw/cris-boot.c (+97/-0) hw/cris-boot.h (+11/-0) hw/cuda.c (+4/-2) hw/debugcon.c (+107/-0) hw/dec_pci.c (+103/-0) hw/dec_pci.h (+8/-0) hw/device-assignment.c (+540/-218) hw/device-assignment.h (+5/-2) hw/device-hotplug.c (+1/-3) hw/devices.h (+0/-3) hw/dma.c (+12/-10) hw/dummy_m68k.c (+3/-3) hw/e1000.c (+33/-20) hw/eepro100.c (+603/-577) hw/eeprom93xx.c (+4/-4) hw/eeprom93xx.h (+2/-2) hw/elf_ops.h (+20/-4) hw/empty_slot.c (+92/-0) hw/empty_slot.h (+2/-0) hw/es1370.c (+15/-14) hw/escc.c (+34/-30) hw/esp.c (+21/-11) hw/esp.h (+3/-3) hw/etraxfs.c (+19/-41) hw/etraxfs_eth.c (+2/-1) hw/etraxfs_ser.c (+52/-23) hw/event_notifier.c (+62/-0) hw/event_notifier.h (+16/-0) hw/extboot.c (+1/-13) hw/fdc.c (+246/-207) hw/fdc.h (+14/-10) hw/file-op-9p.h (+79/-0) hw/flash.h (+3/-2) hw/fw_cfg.c (+64/-24) hw/fw_cfg.h (+1/-1) hw/g364fb.c (+2/-2) hw/grackle_pci.c (+4/-55) hw/gt64xxx.c (+27/-33) hw/gumstix.c (+20/-10) hw/heathrow_pic.c (+1/-5) hw/hpet.c (+404/-245) hw/hpet_emul.h (+25/-36) hw/hw.h (+32/-10) hw/i2c.c (+1/-1) hw/i8254-kvm.c (+1/-1) hw/i8254.c (+6/-6) hw/i8259.c (+19/-16) hw/ide.h (+9/-5) hw/ide/cmd646.c (+57/-27) hw/ide/core.c (+200/-100) hw/ide/internal.h (+11/-9) hw/ide/isa.c (+6/-6) hw/ide/macio.c (+7/-13) hw/ide/microdrive.c (+4/-3) hw/ide/mmio.c (+2/-2) hw/ide/pci.c (+51/-2) hw/ide/piix.c (+15/-12) hw/ide/qdev.c (+40/-11) hw/ide/via.c (+190/-0) hw/integratorcp.c (+2/-2) hw/ioapic.c (+47/-26) hw/iommu.c (+0/-386) hw/isa-bus.c (+1/-0) hw/isa.h (+2/-2) hw/isa_mmio.c (+76/-37) hw/ivshmem.c (+829/-0) hw/lan9118.c (+90/-5) hw/loader.c (+7/-12) hw/loader.h (+4/-4) hw/lsi53c895a.c (+88/-38) hw/m48t59.c (+34/-35) hw/mac_dbdma.c (+50/-43) hw/mac_nvram.c (+2/-2) hw/macio.c (+0/-1) hw/mainstone.c (+14/-8) hw/marvell_88w8618_audio.c (+0/-4) hw/max111x.c (+2/-1) hw/mc146818rtc.c (+67/-59) hw/mc146818rtc.h (+12/-0) hw/mcf5208.c (+4/-4) hw/mips.h (+3/-6) hw/mips_addr.c (+34/-0) hw/mips_cpudevs.h (+15/-0) hw/mips_fulong2e.c (+412/-0) hw/mips_int.c (+38/-18) hw/mips_jazz.c (+37/-13) hw/mips_malta.c (+42/-30) hw/mips_mipssim.c (+17/-16) hw/mips_r4k.c (+28/-18) hw/mips_timer.c (+23/-1) hw/mipsnet.c (+2/-2) hw/msix.c (+67/-21) hw/msix.h (+2/-0) hw/mst_fpga.c (+2/-1) hw/multiboot.c (+332/-0) hw/multiboot.h (+12/-0) hw/musicpal.c (+35/-18) hw/nand.c (+15/-10) hw/ne2000.c (+2/-2) hw/nseries.c (+0/-7) hw/nvram.h (+4/-5) hw/omap.h (+49/-53) hw/omap1.c (+12/-920) hw/omap2.c (+18/-2279) hw/omap_gpio.c (+725/-0) hw/omap_gpmc.c (+419/-0) hw/omap_gptimer.c (+484/-0) hw/omap_intc.c (+598/-0) hw/omap_l4.c (+271/-0) hw/omap_sdrc.c (+165/-0) hw/omap_spi.c (+346/-0) hw/omap_sx1.c (+20/-15) hw/omap_synctimer.c (+96/-0) hw/omap_tap.c (+112/-0) hw/omap_uart.c (+194/-0) hw/onenand.c (+2/-3) hw/openpic.c (+146/-158) hw/palm.c (+2/-6) hw/parallel.c (+4/-4) hw/pc.c (+371/-684) hw/pc.h (+60/-37) hw/pc_piix.c (+357/-0) hw/pci-hotplug.c (+35/-62) hw/pci.c (+573/-166) hw/pci.h (+65/-112) hw/pci_host.c (+128/-140) hw/pci_host.h (+7/-3) hw/pci_host_template.h (+0/-109) hw/pci_ids.h (+9/-0) hw/pci_regs.h (+672/-0) hw/pcie_host.c (+1/-2) hw/pcie_host.h (+1/-2) hw/pckbd.c (+75/-43) hw/pcmcia.h (+1/-1) hw/pcnet.c (+14/-16) hw/pcspk.c (+2/-2) hw/petalogix_s3adsp1800_mmu.c (+32/-23) hw/pflash_cfi01.c (+195/-109) hw/pflash_cfi02.c (+169/-105) hw/piix4.c (+2/-4) hw/piix_pci.c (+30/-14) hw/pl011.c (+1/-1) hw/pl022.c (+1/-1) hw/pl061.c (+1/-1) hw/pl181.c (+15/-15) hw/pm_smbus.c (+176/-0) hw/pm_smbus.h (+21/-0) hw/poison.h (+0/-50) hw/ppc.c (+6/-16) hw/ppc.h (+4/-2) hw/ppc405_boards.c (+15/-16) hw/ppc405_uc.c (+29/-28) hw/ppc440.c (+3/-3) hw/ppc440_bamboo.c (+35/-21) hw/ppc4xx_devs.c (+10/-8) hw/ppc4xx_pci.c (+3/-3) hw/ppc_mac.h (+1/-0) hw/ppc_newworld.c (+86/-30) hw/ppc_oldworld.c (+25/-18) hw/ppc_prep.c (+20/-6) hw/ppce500_mpc8544ds.c (+33/-23) hw/ppce500_pci.c (+6/-7) hw/prep_pci.c (+0/-9) hw/ps2.c (+4/-2) hw/pxa.h (+0/-4) hw/pxa2xx.c (+48/-26) hw/pxa2xx_dma.c (+1/-1) hw/pxa2xx_gpio.c (+1/-1) hw/pxa2xx_keypad.c (+1/-1) hw/pxa2xx_lcd.c (+1/-1) hw/pxa2xx_mmci.c (+1/-1) hw/pxa2xx_pic.c (+2/-1) hw/pxa2xx_timer.c (+1/-1) hw/qdev-properties.c (+220/-74) hw/qdev.c (+191/-118) hw/qdev.h (+35/-7) hw/r2d.c (+86/-32) hw/rc4030.c (+3/-2) hw/realview.c (+12/-4) hw/rtl8139.c (+95/-61) hw/s390-virtio-bus.c (+24/-16) hw/s390-virtio-bus.h (+5/-1) hw/s390-virtio.c (+33/-15) hw/sb16.c (+3/-1) hw/scsi-bus.c (+43/-13) hw/scsi-defs.h (+4/-3) hw/scsi-disk.c (+212/-81) hw/scsi-generic.c (+28/-16) hw/scsi.h (+5/-3) hw/sd.c (+6/-6) hw/serial.c (+133/-63) hw/sh7750.c (+15/-15) hw/sh_intc.c (+3/-3) hw/sh_pci.c (+2/-2) hw/sh_serial.c (+2/-2) hw/slavio_intctl.c (+7/-5) hw/slavio_timer.c (+10/-6) hw/sm501.c (+339/-26) hw/sm501_template.h (+42/-0) hw/smc91c111.c (+24/-17) hw/sparc32_dma.c (+31/-13) hw/spitz.c (+7/-13) hw/ssd0323.c (+2/-1) hw/ssi-sd.c (+1/-2) hw/stellaris.c (+7/-6) hw/stellaris_enet.c (+2/-2) hw/stellaris_input.c (+1/-1) hw/sun4m.c (+150/-25) hw/sun4m_iommu.c (+392/-0) hw/sun4u.c (+278/-95) hw/syborg.c (+1/-1) hw/syborg_fb.c (+1/-1) hw/syborg_interrupt.c (+2/-1) hw/syborg_keyboard.c (+1/-1) hw/syborg_pointer.c (+1/-1) hw/syborg_rtc.c (+2/-1) hw/syborg_serial.c (+1/-1) hw/syborg_timer.c (+1/-1) hw/syborg_virtio.c (+11/-8) hw/tc58128.c (+4/-4) hw/tc6393xb.c (+1/-1) hw/tcx.c (+2/-2) hw/testdev.c (+66/-0) hw/tmp105.c (+2/-7) hw/tosa.c (+1/-4) hw/tsc2005.c (+1/-1) hw/tsc210x.c (+2/-2) hw/tusb6010.c (+0/-2) hw/unin_pci.c (+141/-58) hw/usb-bus.c (+3/-4) hw/usb-hid.c (+37/-9) hw/usb-hub.c (+2/-3) hw/usb-msd.c (+35/-17) hw/usb-musb.c (+107/-57) hw/usb-net.c (+3/-9) hw/usb-ohci.c (+103/-82) hw/usb-serial.c (+11/-5) hw/usb-uhci.c (+110/-40) hw/usb-uhci.h (+1/-0) hw/usb.h (+4/-0) hw/versatile_pci.c (+9/-9) hw/versatilepb.c (+1/-1) hw/vga-isa-mm.c (+2/-6) hw/vga-isa.c (+1/-1) hw/vga-pci.c (+0/-1) hw/vga.c (+20/-16) hw/vga_int.h (+3/-1) hw/vhost.c (+718/-0) hw/vhost.h (+48/-0) hw/vhost_net.c (+196/-0) hw/vhost_net.h (+19/-0) hw/virtio-9p-debug.c (+488/-0) hw/virtio-9p-debug.h (+7/-0) hw/virtio-9p-local.c (+499/-0) hw/virtio-9p.c (+2310/-0) hw/virtio-9p.h (+258/-0) hw/virtio-balloon.c (+124/-33) hw/virtio-balloon.h (+15/-0) hw/virtio-blk.c (+118/-130) hw/virtio-blk.h (+18/-7) hw/virtio-console.c (+134/-135) hw/virtio-console.h (+0/-19) hw/virtio-net.c (+142/-70) hw/virtio-net.h (+21/-2) hw/virtio-pci.c (+223/-24) hw/virtio-serial-bus.c (+795/-0) hw/virtio-serial.h (+184/-0) hw/virtio.c (+112/-22) hw/virtio.h (+48/-7) hw/vmmouse.c (+2/-2) hw/vmport.c (+3/-11) hw/vmware_vga.c (+44/-16) hw/vt82c686.c (+594/-0) hw/vt82c686.h (+11/-0) hw/watchdog.c (+17/-0) hw/wdt_i6300esb.c (+0/-1) hw/wm8750.c (+2/-3) hw/xen_backend.h (+1/-0) hw/xen_disk.c (+3/-5) hw/xen_domainbuild.c (+10/-4) hw/xen_machine_pv.c (+0/-3) hw/xenfb.c (+4/-3) hw/zaurus.c (+1/-1) hxtool (+60/-2) i386-dis.c (+32/-29) ia64-dis.c (+10599/-0) input.c (+288/-0) iov.c (+70/-0) iov.h (+19/-0) json-lexer.c (+56/-60) json-parser.c (+11/-4) json-streamer.c (+4/-4) keymaps.c (+0/-192) keymaps.h (+0/-60) kvm-all.c (+488/-246) kvm-stub.c (+143/-0) kvm-tpr-opt.c (+23/-55) kvm.h (+70/-26) kvm/configure (+0/-17) kvm/include/linux/kvm.h (+46/-2) kvm/include/linux/vhost.h (+130/-0) kvm/include/x86/asm/kvm.h (+38/-1) kvm/scripts/make-release (+16/-4) kvm/scripts/vmxcap (+1/-0) kvm/test/COPYRIGHT (+4/-0) kvm/test/Makefile (+64/-0) kvm/test/README (+23/-0) kvm/test/config-i386.mak (+12/-0) kvm/test/config-ia64.mak (+7/-0) kvm/test/config-powerpc-440.mak (+15/-0) kvm/test/config-powerpc.mak (+39/-0) kvm/test/config-x86-common.mak (+77/-0) kvm/test/config-x86_64.mak (+12/-0) kvm/test/configure (+75/-0) kvm/test/flat.lds (+20/-0) kvm/test/formats (+31/-0) kvm/test/iotable.c (+53/-0) kvm/test/iotable.h (+40/-0) kvm/test/kvmtrace.c (+706/-0) kvm/test/kvmtrace_format (+532/-0) kvm/test/lib/libcflat.h (+51/-0) kvm/test/lib/panic.c (+13/-0) kvm/test/lib/powerpc/44x/map.c (+51/-0) kvm/test/lib/powerpc/44x/timebase.S (+28/-0) kvm/test/lib/powerpc/44x/timebase.h (+25/-0) kvm/test/lib/powerpc/44x/tlbwe.S (+29/-0) kvm/test/lib/powerpc/io.c (+35/-0) kvm/test/lib/printf.c (+179/-0) kvm/test/lib/string.c (+32/-0) kvm/test/lib/x86/apic-defs.h (+133/-0) kvm/test/lib/x86/apic.c (+143/-0) kvm/test/lib/x86/apic.h (+34/-0) kvm/test/lib/x86/fake-apic.h (+14/-0) kvm/test/lib/x86/fwcfg.c (+45/-0) kvm/test/lib/x86/fwcfg.h (+44/-0) kvm/test/lib/x86/idt.h (+19/-0) kvm/test/lib/x86/io.c (+23/-0) kvm/test/lib/x86/msr.h (+406/-0) kvm/test/lib/x86/processor.h (+261/-0) kvm/test/lib/x86/smp.c (+128/-0) kvm/test/lib/x86/smp.h (+17/-0) kvm/test/main-ppc.c (+383/-0) kvm/test/powerpc/44x/tlbsx.S (+33/-0) kvm/test/powerpc/44x/tlbwe.S (+27/-0) kvm/test/powerpc/44x/tlbwe_16KB.S (+35/-0) kvm/test/powerpc/44x/tlbwe_hole.S (+27/-0) kvm/test/powerpc/cstart.S (+38/-0) kvm/test/powerpc/exit.c (+23/-0) kvm/test/powerpc/helloworld.c (+27/-0) kvm/test/powerpc/io.S (+32/-0) kvm/test/powerpc/spin.S (+4/-0) kvm/test/powerpc/sprg.S (+7/-0) kvm/test/testdev.txt (+14/-0) kvm/test/x86/README (+14/-0) kvm/test/x86/access.c (+708/-0) kvm/test/x86/apic.c (+309/-0) kvm/test/x86/cstart.S (+19/-0) kvm/test/x86/cstart64.S (+225/-0) kvm/test/x86/emulator.c (+397/-0) kvm/test/x86/hypercall.c (+31/-0) kvm/test/x86/idt.c (+142/-0) kvm/test/x86/idt_test.c (+49/-0) kvm/test/x86/ioram.h (+7/-0) kvm/test/x86/msr.c (+141/-0) kvm/test/x86/port80.c (+12/-0) kvm/test/x86/print.S (+31/-0) kvm/test/x86/print.h (+19/-0) kvm/test/x86/realmode.c (+1027/-0) kvm/test/x86/realmode.lds (+12/-0) kvm/test/x86/rmap_chain.c (+53/-0) kvm/test/x86/sieve.c (+51/-0) kvm/test/x86/smptest.c (+25/-0) kvm/test/x86/svm.c (+255/-0) kvm/test/x86/svm.h (+328/-0) kvm/test/x86/taskswitch.c (+164/-0) kvm/test/x86/tsc.c (+38/-0) kvm/test/x86/unittests.cfg (+55/-0) kvm/test/x86/vm.c (+229/-0) kvm/test/x86/vm.h (+46/-0) kvm/test/x86/vmexit.c (+188/-0) kvm/test/x86/xsave.c (+262/-0) kvm/user/COPYRIGHT (+0/-4) kvm/user/Makefile (+0/-60) kvm/user/balloon_ctl.c (+0/-92) kvm/user/bootstrap.lds (+0/-15) kvm/user/config-i386.mak (+0/-10) kvm/user/config-ia64.mak (+0/-7) kvm/user/config-powerpc-440.mak (+0/-15) kvm/user/config-powerpc.mak (+0/-39) kvm/user/config-x86-common.mak (+0/-77) kvm/user/config-x86_64.mak (+0/-12) kvm/user/configure (+0/-75) kvm/user/flat.lds (+0/-15) kvm/user/formats (+0/-31) kvm/user/iotable.c (+0/-53) kvm/user/iotable.h (+0/-40) kvm/user/kvmtrace.c (+0/-706) kvm/user/kvmtrace_format (+0/-532) kvm/user/main-ppc.c (+0/-383) kvm/user/main.c (+0/-611) kvm/user/test/lib/libcflat.h (+0/-42) kvm/user/test/lib/panic.c (+0/-13) kvm/user/test/lib/powerpc/44x/map.c (+0/-51) kvm/user/test/lib/powerpc/44x/timebase.S (+0/-28) kvm/user/test/lib/powerpc/44x/timebase.h (+0/-25) kvm/user/test/lib/powerpc/44x/tlbwe.S (+0/-29) kvm/user/test/lib/powerpc/io.c (+0/-35) kvm/user/test/lib/printf.c (+0/-179) kvm/user/test/lib/string.c (+0/-21) kvm/user/test/lib/x86/apic-defs.h (+0/-133) kvm/user/test/lib/x86/apic.c (+0/-143) kvm/user/test/lib/x86/apic.h (+0/-34) kvm/user/test/lib/x86/fake-apic.h (+0/-14) kvm/user/test/lib/x86/fwcfg.c (+0/-40) kvm/user/test/lib/x86/fwcfg.h (+0/-44) kvm/user/test/lib/x86/io.c (+0/-23) kvm/user/test/lib/x86/smp.c (+0/-128) kvm/user/test/lib/x86/smp.h (+0/-17) kvm/user/test/powerpc/44x/tlbsx.S (+0/-33) kvm/user/test/powerpc/44x/tlbwe.S (+0/-27) kvm/user/test/powerpc/44x/tlbwe_16KB.S (+0/-35) kvm/user/test/powerpc/44x/tlbwe_hole.S (+0/-27) kvm/user/test/powerpc/cstart.S (+0/-38) kvm/user/test/powerpc/exit.c (+0/-23) kvm/user/test/powerpc/helloworld.c (+0/-27) kvm/user/test/powerpc/io.S (+0/-32) kvm/user/test/powerpc/spin.S (+0/-4) kvm/user/test/powerpc/sprg.S (+0/-7) kvm/user/test/x86/access.c (+0/-604) kvm/user/test/x86/apic.c (+0/-317) kvm/user/test/x86/bootstrap.S (+0/-137) kvm/user/test/x86/cstart.S (+0/-19) kvm/user/test/x86/cstart64.S (+0/-225) kvm/user/test/x86/emulator.c (+0/-258) kvm/user/test/x86/exit.c (+0/-7) kvm/user/test/x86/hypercall.c (+0/-31) kvm/user/test/x86/ioram.h (+0/-7) kvm/user/test/x86/memtest1.S (+0/-44) kvm/user/test/x86/msr.c (+0/-52) kvm/user/test/x86/port80.c (+0/-12) kvm/user/test/x86/print.S (+0/-31) kvm/user/test/x86/print.h (+0/-19) kvm/user/test/x86/realmode.c (+0/-624) kvm/user/test/x86/realmode.lds (+0/-12) kvm/user/test/x86/runtime.h (+0/-6) kvm/user/test/x86/sieve.c (+0/-89) kvm/user/test/x86/simple.S (+0/-13) kvm/user/test/x86/smptest.c (+0/-25) kvm/user/test/x86/stringio.S (+0/-31) kvm/user/test/x86/test32.S (+0/-8) kvm/user/test/x86/tsc.c (+0/-38) kvm/user/test/x86/vm.c (+0/-271) kvm/user/test/x86/vm.h (+0/-10) kvm/user/test/x86/vmexit.c (+0/-164) linux-aio.c (+1/-1) linux-user/alpha/syscall.h (+212/-0) linux-user/alpha/syscall_nr.h (+8/-0) linux-user/alpha/target_signal.h (+27/-0) linux-user/arm/nwfpe/double_cpdo.c (+1/-2) linux-user/arm/nwfpe/extended_cpdo.c (+1/-2) linux-user/arm/nwfpe/fpa11.c (+1/-2) linux-user/arm/nwfpe/fpa11.h (+1/-2) linux-user/arm/nwfpe/fpa11.inl (+1/-2) linux-user/arm/nwfpe/fpa11_cpdo.c (+1/-2) linux-user/arm/nwfpe/fpa11_cpdt.c (+1/-2) linux-user/arm/nwfpe/fpa11_cprt.c (+1/-2) linux-user/arm/nwfpe/fpopcode.c (+1/-2) linux-user/arm/nwfpe/fpopcode.h (+1/-2) linux-user/arm/nwfpe/fpsr.h (+1/-2) linux-user/arm/nwfpe/single_cpdo.c (+1/-2) linux-user/arm/syscall_nr.h (+1/-1) linux-user/cpu-uname.c (+72/-0) linux-user/cpu-uname.h (+1/-0) linux-user/elfload.c (+262/-88) linux-user/elfload32.c (+0/-30) linux-user/flatload.c (+2/-1) linux-user/linuxload.c (+1/-5) linux-user/main.c (+302/-58) linux-user/mmap.c (+200/-108) linux-user/qemu.h (+2/-8) linux-user/signal.c (+418/-124) linux-user/strace.c (+6/-1) linux-user/syscall.c (+322/-50) linux-user/syscall_defs.h (+44/-3) m68k-dis.c (+38/-32) m68k-semi.c (+1/-0) microblaze-dis.c (+382/-126) migration-exec.c (+21/-24) migration-fd.c (+9/-22) migration-tcp.c (+14/-27) migration-unix.c (+13/-23) migration.c (+105/-123) migration.h (+12/-9) mips-dis.c (+35/-2) monitor.c (+857/-705) monitor.h (+22/-4) nbd.c (+1/-2) nbd.h (+0/-1) net.c (+126/-53) net.h (+6/-5) net/dump.c (+3/-2) net/slirp.c (+22/-12) net/socket.c (+6/-6) net/tap-bsd.c (+5/-3) net/tap-linux.c (+10/-7) net/tap-solaris.c (+3/-2) net/tap-win32.c (+7/-1) net/tap.c (+54/-2) net/tap.h (+5/-0) notify.c (+39/-0) notify.h (+43/-0) os-posix.c (+331/-0) os-win32.c (+221/-0) osdep.c (+85/-14) path.c (+4/-1) pc-bios/README (+8/-4) pc-bios/optionrom/Makefile (+2/-1) pc-bios/optionrom/extboot.S (+31/-35) poison.h (+50/-0) posix-aio-compat.c (+30/-29) qbool.c (+0/-8) qdict.c (+131/-18) qdict.h (+22/-3) qemu-barrier.h (+10/-0) qemu-binfmt-conf.sh (+3/-0) qemu-char.c (+62/-35) qemu-char.h (+7/-4) qemu-common.h (+26/-16) qemu-config.c (+158/-40) qemu-config.h (+9/-1) qemu-doc.texi (+296/-29) qemu-error.c (+209/-0) qemu-error.h (+41/-0) qemu-img-cmds.hx (+13/-1) qemu-img.c (+599/-131) qemu-img.texi (+12/-0) qemu-io.c (+259/-76) qemu-kvm-helper.c (+4/-9) qemu-kvm-ia64.c (+4/-2) qemu-kvm-x86.c (+328/-657) qemu-kvm.c (+182/-906) qemu-kvm.h (+58/-255) qemu-malloc.c (+7/-14) qemu-monitor.hx (+1572/-103) qemu-nbd.c (+41/-24) qemu-nbd.texi (+2/-2) qemu-objects.h (+3/-2) qemu-option.c (+190/-28) qemu-option.h (+10/-2) qemu-options.h (+41/-0) qemu-options.hx (+514/-234) qemu-os-posix.h (+39/-0) qemu-os-win32.h (+56/-0) qemu-sockets.c (+26/-2) qemu-tech.texi (+10/-0) qemu-thread.c (+29/-0) qemu-thread.h (+4/-0) qemu-timer.c (+1192/-0) qemu-timer.h (+204/-0) qemu-tool.c (+14/-11) qemu-x509.h (+9/-0) qemu_socket.h (+2/-0) qerror.c (+118/-17) qerror.h (+72/-6) qfloat.c (+0/-8) qint.c (+4/-3) qint.h (+12/-0) qjson.c (+16/-2) qlist.c (+4/-3) qlist.h (+14/-3) qobject.h (+2/-2) qstring.c (+4/-3) qstring.h (+12/-0) readline.c (+1/-0) rules.mak (+6/-3) rwhandler.c (+87/-0) rwhandler.h (+27/-0) s390-dis.c (+129/-37) savevm.c (+313/-106) sdl.c (+0/-894) sdl_keysym.h (+0/-277) sdl_zoom.c (+0/-95) sdl_zoom.h (+0/-25) sdl_zoom_template.h (+0/-225) sh4-dis.c (+2/-2) slirp/bootp.c (+10/-10) slirp/cksum.c (+14/-12) slirp/ip.h (+27/-27) slirp/ip_icmp.h (+1/-1) slirp/ip_input.c (+1/-1) slirp/ip_output.c (+11/-11) slirp/main.h (+1/-1) slirp/misc.c (+3/-9) slirp/misc.h (+10/-10) slirp/slirp.c (+4/-4) slirp/slirp.h (+3/-36) slirp/slirp_config.h (+0/-6) slirp/socket.c (+2/-5) slirp/socket.h (+5/-5) slirp/tcp.h (+7/-7) slirp/tcp_input.c (+9/-14) slirp/tcp_output.c (+5/-5) slirp/tcp_subr.c (+7/-7) slirp/tcp_var.h (+7/-7) slirp/tftp.c (+4/-7) slirp/tftp.h (+7/-7) slirp/udp.c (+4/-4) slirp/udp.h (+5/-5) softmmu_exec.h (+22/-3) softmmu_header.h (+1/-1) softmmu_template.h (+18/-13) sparc-dis.c (+25/-3) sysconfigs/target/target-x86_64.conf (+86/-0) sysemu.h (+27/-99) target-alpha/cpu.h (+108/-31) target-alpha/exec.h (+5/-10) target-alpha/helper.c (+142/-8) target-alpha/helper.h (+90/-95) target-alpha/op_helper.c (+444/-257) target-alpha/translate.c (+1429/-567) target-arm/cpu.h (+11/-14) target-arm/exec.h (+6/-8) target-arm/helper.c (+59/-55) target-arm/translate.c (+82/-14) target-cris/cpu.h (+15/-7) target-cris/crisv10-decode.h (+107/-0) target-cris/exec.h (+6/-11) target-cris/helper.c (+74/-14) target-cris/mmu.c (+20/-16) target-cris/mmu.h (+1/-1) target-cris/op_helper.c (+2/-0) target-cris/translate.c (+290/-169) target-cris/translate_v10.c (+1244/-0) target-i386/cpu.h (+48/-25) target-i386/cpuid.c (+1219/-0) target-i386/exec.h (+7/-56) target-i386/fake-exec.c (+7/-5) target-i386/helper.c (+16/-801) target-i386/kvm.c (+432/-64) target-i386/machine.c (+21/-27) target-i386/op_helper.c (+13/-6) target-i386/ops_sse_header.h (+3/-0) target-i386/translate.c (+31/-51) target-ia64/machine.c (+3/-2) target-m68k/cpu.h (+3/-6) target-m68k/exec.h (+6/-12) target-m68k/helper.c (+14/-12) target-m68k/translate.c (+0/-3) target-microblaze/cpu.h (+9/-11) target-microblaze/exec.h (+6/-10) target-microblaze/helper.c (+4/-8) target-microblaze/mmu.c (+1/-6) target-microblaze/op_helper.c (+16/-1) target-microblaze/translate.c (+59/-53) target-mips/TODO (+0/-1) target-mips/cpu.h (+40/-29) target-mips/exec.h (+7/-16) target-mips/helper.c (+53/-31) target-mips/helper.h (+9/-1) target-mips/mips-defs.h (+9/-0) target-mips/op_helper.c (+162/-25) target-mips/translate.c (+4699/-696) target-mips/translate_init.c (+56/-12) target-ppc/cpu.h (+31/-14) target-ppc/exec.h (+5/-8) target-ppc/helper.c (+36/-23) target-ppc/helper.h (+2/-0) target-ppc/kvm.c (+80/-1) target-ppc/kvm_ppc.h (+2/-0) target-ppc/machine.c (+0/-4) target-ppc/op_helper.c (+25/-13) target-ppc/translate.c (+15/-27) target-ppc/translate_init.c (+6/-6) target-s390x/cpu.h (+6/-8) target-s390x/exec.h (+7/-10) target-s390x/helper.c (+11/-11) target-s390x/kvm.c (+27/-7) target-s390x/op_helper.c (+1/-2) target-s390x/translate.c (+1/-2) target-sh4/README.sh4 (+1/-1) target-sh4/cpu.h (+16/-19) target-sh4/exec.h (+4/-8) target-sh4/helper.c (+29/-79) target-sh4/op_helper.c (+1/-1) target-sh4/translate.c (+36/-34) target-sparc/cpu.h (+148/-120) target-sparc/exec.h (+9/-25) target-sparc/helper.c (+222/-131) target-sparc/helper.h (+1/-0) target-sparc/machine.c (+9/-9) target-sparc/op_helper.c (+898/-297) target-sparc/translate.c (+318/-181) targphys.h (+1/-4) tcg-runtime.c (+24/-0) tcg/README (+55/-12) tcg/TODO (+1/-1) tcg/arm/tcg-target.c (+580/-466) tcg/arm/tcg-target.h (+19/-11) tcg/hppa/tcg-target.c (+1355/-647) tcg/hppa/tcg-target.h (+32/-116) tcg/i386/tcg-target.c (+1460/-740) tcg/i386/tcg-target.h (+69/-10) tcg/ia64/tcg-target.c (+2382/-0) tcg/ia64/tcg-target.h (+156/-0) tcg/mips/tcg-target.c (+237/-60) tcg/mips/tcg-target.h (+11/-5) tcg/ppc/tcg-target.c (+380/-73) tcg/ppc/tcg-target.h (+15/-6) tcg/ppc64/tcg-target.c (+195/-38) tcg/ppc64/tcg-target.h (+29/-5) tcg/s390/tcg-target.c (+2263/-44) tcg/s390/tcg-target.h (+50/-10) tcg/sparc/tcg-target.c (+413/-120) tcg/sparc/tcg-target.h (+42/-13) tcg/tcg-op.h (+354/-68) tcg/tcg-opc.h (+202/-170) tcg/tcg-runtime.h (+5/-0) tcg/tcg.c (+128/-36) tcg/tcg.h (+48/-21) tcg/x86_64/tcg-target.c (+0/-1418) tcg/x86_64/tcg-target.h (+0/-91) tests/Makefile (+2/-1) tests/qruncom.c (+1/-1) tests/runcom.c (+1/-1) tests/sha1.c (+12/-12) translate-all.c (+1/-28) ui/cocoa.m (+1014/-0) ui/curses.c (+365/-0) ui/curses_keys.h (+508/-0) ui/d3des.c (+424/-0) ui/d3des.h (+51/-0) ui/keymaps.c (+210/-0) ui/keymaps.h (+77/-0) ui/sdl.c (+879/-0) ui/sdl_keysym.h (+277/-0) ui/sdl_zoom.c (+95/-0) ui/sdl_zoom.h (+25/-0) ui/sdl_zoom_template.h (+225/-0) ui/vnc-auth-sasl.c (+637/-0) ui/vnc-auth-sasl.h (+74/-0) ui/vnc-auth-vencrypt.c (+175/-0) ui/vnc-auth-vencrypt.h (+33/-0) ui/vnc-enc-hextile-template.h (+211/-0) ui/vnc-enc-hextile.c (+116/-0) ui/vnc-enc-tight.c (+1715/-0) ui/vnc-enc-tight.h (+183/-0) ui/vnc-enc-zlib.c (+152/-0) ui/vnc-jobs-async.c (+331/-0) ui/vnc-jobs-sync.c (+73/-0) ui/vnc-jobs.h (+87/-0) ui/vnc-palette.c (+136/-0) ui/vnc-palette.h (+63/-0) ui/vnc-tls.c (+445/-0) ui/vnc-tls.h (+76/-0) ui/vnc.c (+2732/-0) ui/vnc.h (+501/-0) ui/vnc_keysym.h (+324/-0) ui/x_keymap.c (+168/-0) ui/x_keymap.h (+32/-0) usb-linux.c (+279/-201) vl.c (+460/-3637) vnc-auth-sasl.c (+0/-636) vnc-auth-sasl.h (+0/-74) vnc-auth-vencrypt.c (+0/-175) vnc-auth-vencrypt.h (+0/-33) vnc-tls.c (+0/-450) vnc-tls.h (+0/-76) vnc.c (+0/-2697) vnc.h (+0/-321) vnc_keysym.h (+0/-324) vnchextile.h (+0/-210) x_keymap.c (+0/-168) x_keymap.h (+0/-32) |
To merge this branch: | bzr merge lp://staging/~serge-hallyn/ubuntu/maverick/qemu-kvm/fix-conflicts |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Dustin Kirkland | Approve | ||
Review via email: mp+45808@code.staging.launchpad.net |
To post a comment you must log in.
Wrong destination branch, but I figured it out and pushed to lp:ubuntu/qemu-kvm