[<<][simtrace][>>][..]
Wed Dec 11 19:01:00 EST 2013

Merge qemu osmocom

[master] tom@tx:~/git/qemu-osmocom$ git pull ~/git/qemu-dev master
remote: Counting objects: 66880, done.        
remote: Compressing objects: 100% (14136/14136), done.        
remote: Total 65545 (delta 52474), reused 64130 (delta 51162)        
Receiving objects: 100% (65545/65545), 19.17 MiB | 16.88 MiB/s, done.
Resolving deltas: 100% (52474/52474), completed with 1012 local objects.
From /home/tom/git/qemu-dev
 * branch            master     -> FETCH_HEAD
Removing xtensa-semi.c
Removing xen-mapcache.h
Removing x86_64.ld
Removing vmstate.h
Removing usb-stub.c
Removing usb-redir.c
Removing usb-linux.c
Removing usb-bsd.c
Removing ui/vnc-jobs-sync.c
Removing ui/vnc-jobs-async.c
Removing ui/spice-display.h
Removing ui/qemu-spice.h
Removing trace/stderr.h
Removing thunk.h
Removing test-string-output-visitor.c
Removing test-string-input-visitor.c
Removing test-qmp-output-visitor.c
Removing test-qmp-input-visitor.c
Removing test-qmp-commands.c
Removing test-coroutine.c
Removing tci-dis.c
Removing tcg/hppa/tcg-target.h
Removing tcg/hppa/tcg-target.c
Removing targphys.h
Removing target-xtensa/machine.c
Removing target-xtensa/helpers.h
Removing target-sparc/op_helper.c
Removing target-sparc/cpu_init.c
Removing target-sh4/machine.c
Removing target-s390x/op_helper.c
Removing target-s390x/machine.c
Removing target-s390x/helpers.h
Removing target-ppc/op_helper.c
Removing target-ppc/helper.c
Removing target-microblaze/machine.c
Removing target-m68k/machine.c
Removing target-m68k/helpers.h
Removing target-i386/op_helper.c
Removing target-i386/hyperv.h
Removing target-i386/hyperv.c
Removing target-i386/helper_template.h
Removing target-i386/cpuid.c
Removing target-alpha/op_helper.c
Removing sysemu.h
Removing sparc64.ld
Removing sparc.ld
Removing sparc-dis.c
Removing softmmu_template.h
Removing softmmu_header.h
Removing softmmu_exec.h
Removing softmmu_defs.h
Removing softmmu-semi.h
Removing sh4-dis.c
Adding scripts/tracetool/format/stap.py
Adding scripts/tracetool/format/h.py
Adding scripts/tracetool/format/events_h.py
Adding scripts/tracetool/format/events_c.py
Adding scripts/tracetool/format/d.py
Adding scripts/tracetool/format/c.py
Adding scripts/tracetool/format/__init__.py
Adding scripts/tracetool/backend/ust.py
Adding scripts/tracetool/backend/stderr.py
Adding scripts/tracetool/backend/simple.py
Adding scripts/tracetool/backend/ftrace.py
Adding scripts/tracetool/backend/events.py
Adding scripts/tracetool/backend/dtrace.py
Adding scripts/tracetool/backend/__init__.py
Adding scripts/tracetool/__init__.py
Removing scripts/tracetool
Removing scripts/signrom.sh
Removing s390.ld
Removing s390-dis.c
Removing readline.h
Removing range.h
Removing qstring.h
Removing qstring.c
Removing qom/Makefile
Removing qobject.h
Removing qlist.h
Removing qlist.c
Removing qjson.h
Removing qjson.c
Removing qint.h
Removing qint.c
Removing qfloat.h
Removing qfloat.c
Removing qerror.h
Removing qerror.c
Removing qemu_socket.h
Removing qemu-tool.c
Removing qemu-timer.h
Removing qemu-timer-common.c
Removing qemu-thread.h
Removing qemu-thread-win32.h
Removing qemu-thread-win32.c
Removing qemu-thread-posix.h
Removing qemu-thread-posix.c
Removing qemu-sockets.c
Removing qemu-queue.h
Removing qemu-progress.c
Removing qemu-os-win32.h
Removing qemu-os-posix.h
Removing qemu-option.h
Removing qemu-option.c
Removing qemu-objects.h
Removing qemu-log.h
Removing qemu-ga.c
Removing qemu-file.h
Removing qemu-error.h
Removing qemu-error.c
Removing qemu-coroutine.h
Removing qemu-coroutine-int.h
Removing qemu-config.h
Removing qemu-config.c
Removing qemu-common.h
Removing qemu-char.h
Removing qemu-barrier.h
Removing qemu-aio.h
Removing qdict.h
Removing qdict.c
Removing qbool.h
Removing qbool.c
Removing qapi/string-output-visitor.h
Removing qapi/string-input-visitor.h
Removing qapi/qmp-output-visitor.h
Removing qapi/qmp-input-visitor.h
Removing qapi/qmp-core.h
Removing qapi/qapi-visit-impl.h
Removing qapi/qapi-visit-core.h
Removing qapi/qapi-types-core.h
Removing qapi/qapi-dealloc-visitor.h
Removing qapi-schema-test.json
Removing qapi-schema-guest.json
Removing ppc64.ld
Removing ppc.ld
Removing ppc-dis.c
Removing posix-aio-compat.c
Removing poison.h
Removing pflib.h
Removing pflib.c
Removing pci-ids.txt
Removing pc-bios/mpc8544ds.dts
Removing pc-bios/mpc8544ds.dtb
Removing path.c
Removing oslib-win32.c
Removing oslib-posix.c
Removing osdep.h
Removing osdep.c
Removing notify.h
Removing notify.c
Removing net/vde.h
Removing net/tap.h
Removing net/socket.h
Removing net/slirp.h
Removing net/queue.h
Removing net/dump.h
Removing net/checksum.h
Removing net.h
Removing net.c
Removing nbd.h
Removing monitor.h
Removing module.c
Removing mips.ld
Removing mips-dis.c
Removing migration.h
Removing microblaze-dis.c
Removing memory.h
Removing main-loop.h
Removing m68k.ld
Removing m68k-semi.c
Removing m68k-dis.c
Removing linux-user/qemu-types.h
Removing linux-user/mipsn32/termbits.h
Removing linux-user/mipsn32/target_signal.h
Removing linux-user/mipsn32/syscall_nr.h
Removing linux-user/mipsn32/syscall.h
Removing linux-aio.c
Removing libfdt_env.h
Removing kvm.h
Removing json-streamer.h
Removing json-streamer.c
Removing json-parser.h
Removing json-parser.c
Removing json-lexer.h
Removing json-lexer.c
Removing iov.h
Removing iov.c
Removing iorange.h
Removing ioport.h
Removing ioport-user.c
Removing int128.h
Removing input.c
Removing include/qemu/qom-qobject.h
Removing include/qemu/object.h
Removing ia64.ld
Removing ia64-dis.c
Removing i386.ld
Removing i386-dis.c
Removing hw/zaurus.c
Removing hw/z2.c
Removing hw/xtensa_sim.c
Removing hw/xtensa_pic.c
Removing hw/xtensa_lx60.c
Removing hw/xio3130_upstream.h
Removing hw/xio3130_upstream.c
Removing hw/xio3130_downstream.h
Removing hw/xio3130_downstream.c
Removing hw/xilinx_uartlite.c
Removing hw/xilinx_timer.c
Removing hw/xilinx_intc.c
Removing hw/xilinx_ethlite.c
Removing hw/xilinx_axienet.c
Removing hw/xilinx_axidma.h
Removing hw/xilinx_axidma.c
Removing hw/xilinx.h
Removing hw/xics.h
Removing hw/xics.c
Removing hw/xgmac.c
Removing hw/xenfb.c
Removing hw/xen_platform.c
Removing hw/xen_nic.c
Removing hw/xen_machine_pv.c
Removing hw/xen_domainbuild.h
Removing hw/xen_domainbuild.c
Removing hw/xen_disk.c
Removing hw/xen_devconfig.c
Removing hw/xen_console.c
Removing hw/xen_common.h
Removing hw/xen_backend.h
Removing hw/xen_backend.c
Removing hw/xen.h
Removing hw/wm8750.c
Removing hw/wdt_ib700.c
Removing hw/wdt_i6300esb.c
Removing hw/watchdog.h
Removing hw/watchdog.c
Removing hw/vt82c686.c
Removing hw/vmware_vga.h
Removing hw/vmware_vga.c
Removing hw/vmport.c
Removing hw/vmmouse.c
Removing hw/virtio.h
Removing hw/virtio.c
Removing hw/virtio-serial.h
Removing hw/virtio-serial-bus.c
Removing hw/virtio-scsi.h
Removing hw/virtio-scsi.c
Removing hw/virtio-pci.h
Removing hw/virtio-pci.c
Removing hw/virtio-net.h
Removing hw/virtio-net.c
Removing hw/virtio-console.c
Removing hw/virtio-blk.h
Removing hw/virtio-blk.c
Removing hw/virtio-balloon.h
Removing hw/virtio-balloon.c
Removing hw/virtex_ml507.c
Removing hw/vhost_net.h
Removing hw/vhost_net.c
Removing hw/vhost.h
Removing hw/vhost.c
Removing hw/vga_template.h
Removing hw/vga_int.h
Removing hw/vga.c
Removing hw/vga-pci.c
Removing hw/vga-isa.c
Removing hw/vga-isa-mm.c
Removing hw/vexpress.c
Removing hw/versatilepb.c
Removing hw/versatile_pci.c
Removing hw/usb.h
Removing hw/usb.c
Removing hw/usb-xhci.c
Removing hw/usb-wacom.c
Removing hw/usb-uhci.h
Removing hw/usb-uhci.c
Removing hw/usb-serial.c
Removing hw/usb-ohci.h
Removing hw/usb-ohci.c
Removing hw/usb-net.c
Removing hw/usb-musb.c
Removing hw/usb-msd.c
Removing hw/usb-libhw.c
Removing hw/usb-hub.c
Removing hw/usb-hid.c
Removing hw/usb-ehci.c
Removing hw/usb-desc.h
Removing hw/usb-desc.c
Removing hw/usb-ccid.c
Removing hw/usb-bus.c
Removing hw/usb-bt.c
Removing hw/usb-audio.c
Removing hw/unin_pci.c
Removing hw/twl92230.c
Removing hw/tusb6010.c
Removing hw/tsc210x.c
Removing hw/tsc2005.c
Removing hw/tosa.c
Removing hw/tmp105.c
Removing hw/tcx.c
Removing hw/tc6393xb_template.h
Removing hw/tc6393xb.c
Removing hw/tc58128.c
Removing hw/sysbus.h
Removing hw/sysbus.c
Removing hw/sun4u.c
Removing hw/sun4m_iommu.c
Removing hw/sun4m.h
Removing hw/sun4m.c
Removing hw/sun4c_intctl.c
Removing hw/strongarm.h
Removing hw/strongarm.c
Removing hw/stellaris_input.c
Removing hw/stellaris_enet.c
Removing hw/stellaris.c
Removing hw/ssi.h
Removing hw/ssi.c
Removing hw/ssi-sd.c
Removing hw/ssd0323.c
Removing hw/ssd0303.c
Removing hw/srp.h
Removing hw/spitz.c
Removing hw/sparc32_dma.h
Removing hw/sparc32_dma.c
Removing hw/spapr_vty.c
Removing hw/spapr_vscsi.c
Removing hw/spapr_vio.h
Removing hw/spapr_vio.c
Removing hw/spapr_rtas.c
Removing hw/spapr_pci.h
Removing hw/spapr_pci.c
Removing hw/spapr_llan.c
Removing hw/spapr_hcall.c
Removing hw/spapr.h
Removing hw/spapr.c
Removing hw/soc_dma.h
Removing hw/soc_dma.c
Removing hw/smc91c111.c
Removing hw/smbus_eeprom.c
Removing hw/smbus.h
Removing hw/smbus.c
Removing hw/smbios.h
Removing hw/smbios.c
Removing hw/sm501.c
Removing hw/slavio_timer.c
Removing hw/slavio_misc.c
Removing hw/slavio_intctl.c
Removing hw/shix.c
Removing hw/sharpsl.h
Removing hw/sh_timer.c
Removing hw/sh_serial.c
Removing hw/sh_pci.c
Removing hw/sh_intc.h
Removing hw/sh_intc.c
Removing hw/sh7750_regnames.c
Removing hw/sh7750.c
Removing hw/sh.h
Removing hw/sga.c
Removing hw/serial.c
Removing hw/sd.h
Removing hw/sd.c
Removing hw/scsi.h
Removing hw/scsi-generic.c
Removing hw/scsi-disk.c
Removing hw/scsi-defs.h
Removing hw/scsi-bus.c
Removing hw/sbi.c
Removing hw/sb16.c
Removing hw/s390-virtio.c
Removing hw/s390-virtio-bus.h
Removing hw/s390-virtio-bus.c
Removing hw/rtl8139.c
Removing hw/realview_gic.c
Removing hw/realview.c
Removing hw/rc4030.c
Removing hw/r2d.c
Removing hw/qxl.h
Removing hw/qxl.c
Removing hw/qxl-render.c
Removing hw/qxl-logger.c
Removing hw/qdev.h
Removing hw/qdev.c
Removing hw/qdev-properties.c
Removing hw/qdev-monitor.c
Removing hw/qdev-addr.h
Removing hw/qdev-addr.c
Removing hw/pxa2xx_timer.c
Removing hw/pxa2xx_pic.c
Removing hw/pxa2xx_pcmcia.c
Removing hw/pxa2xx_mmci.c
Removing hw/pxa2xx_lcd.c
Removing hw/pxa2xx_keypad.c
Removing hw/pxa2xx_gpio.c
Removing hw/pxa2xx_dma.c
Removing hw/pxa2xx.c
Removing hw/pxa.h
Removing hw/ptimer.h
Removing hw/ptimer.c
Removing hw/ps2.h
Removing hw/ps2.c
Removing hw/prep_pci.c
Removing hw/ppce500_spin.c
Removing hw/ppce500_pci.c
Removing hw/ppce500_mpc8544ds.c
Removing hw/ppc_prep.c
Removing hw/ppc_oldworld.c
Removing hw/ppc_newworld.c
Removing hw/ppc_mac.h
Removing hw/ppc_booke.c
Removing hw/ppc4xx_pci.c
Removing hw/ppc4xx_devs.c
Removing hw/ppc4xx.h
Removing hw/ppc440_bamboo.c
Removing hw/ppc405_uc.c
Removing hw/ppc405_boards.c
Removing hw/ppc405.h
Removing hw/ppc.h
Removing hw/ppc.c
Removing hw/pm_smbus.h
Removing hw/pm_smbus.c
Removing hw/pl190.c
Removing hw/pl181.c
Removing hw/pl110_template.h
Removing hw/pl110.c
Removing hw/pl080.c
Removing hw/pl061.c
Removing hw/pl050.c
Removing hw/pl041.c
Removing hw/pl031.c
Removing hw/pl022.c
Removing hw/pl011.c
Removing hw/piix_pci.c
Removing hw/piix4.c
Removing hw/pflash_cfi02.c
Removing hw/pflash_cfi01.c
Removing hw/petalogix_s3adsp1800_mmu.c
Removing hw/petalogix_ml605_mmu.c
Removing hw/pcspk.h
Removing hw/pcspk.c
Removing hw/pcnet.h
Removing hw/pcnet.c
Removing hw/pcnet-pci.c
Removing hw/pcmcia.h
Removing hw/pckbd.c
Removing hw/pcie_port.h
Removing hw/pcie_port.c
Removing hw/pcie_host.h
Removing hw/pcie_host.c
Removing hw/pcie_aer.h
Removing hw/pcie_aer.c
Removing hw/pcie.h
Removing hw/pcie.c
Removing hw/pci_regs.h
Removing hw/pci_internals.h
Removing hw/pci_ids.h
Removing hw/pci_host.h
Removing hw/pci_host.c
Removing hw/pci_bridge.h
Removing hw/pci_bridge.c
Removing hw/pci.h
Removing hw/pci.c
Removing hw/pci-stub.c
Removing hw/pci-hotplug.c
Removing hw/pc_sysfw.c
Removing hw/pc_piix.c
Removing hw/pc.h
Removing hw/pc.c
Removing hw/parallel.c
Removing hw/palm.c
Removing hw/openpic.h
Removing hw/openpic.c
Removing hw/opencores_eth.c
Removing hw/onenand.c
Removing hw/omap_uart.c
Removing hw/omap_tap.c
Removing hw/omap_synctimer.c
Removing hw/omap_sx1.c
Removing hw/omap_spi.c
Removing hw/omap_sdrc.c
Removing hw/omap_mmc.c
Removing hw/omap_lcdc.c
Removing hw/omap_l4.c
Removing hw/omap_intc.c
Removing hw/omap_i2c.c
Removing hw/omap_gptimer.c
Removing hw/omap_gpmc.c
Removing hw/omap_gpio.c
Removing hw/omap_dss.c
Removing hw/omap_dma.c
Removing hw/omap_clk.c
Removing hw/omap2.c
Removing hw/omap1.c
Removing hw/omap.h
Removing hw/nvram.h
Removing hw/nseries.c
Removing hw/ne2000.h
Removing hw/ne2000.c
Removing hw/ne2000-isa.c
Removing hw/nand.c
Removing hw/musicpal.c
Removing hw/multiboot.h
Removing hw/multiboot.c
Removing hw/mst_fpga.c
Removing hw/msmouse.h
Removing hw/msmouse.c
Removing hw/msix.h
Removing hw/msix.c
Removing hw/msi.h
Removing hw/msi.c
Removing hw/mpc8544_guts.c
Removing hw/mipsnet.c
Removing hw/mips_timer.c
Removing hw/mips_r4k.c
Removing hw/mips_mipssim.c
Removing hw/mips_malta.c
Removing hw/mips_jazz.c
Removing hw/mips_int.c
Removing hw/mips_fulong2e.c
Removing hw/mips_cpudevs.h
Removing hw/mips_addr.c
Removing hw/mips.h
Removing hw/milkymist.c
Removing hw/milkymist-vgafb_template.h
Removing hw/milkymist-vgafb.c
Removing hw/milkymist-uart.c
Removing hw/milkymist-tmu2.c
Removing hw/milkymist-sysctl.c
Removing hw/milkymist-softusb.c
Removing hw/milkymist-pfpu.c
Removing hw/milkymist-minimac2.c
Removing hw/milkymist-memcard.c
Removing hw/milkymist-hw.h
Removing hw/milkymist-hpdmc.c
Removing hw/milkymist-ac97.c
Removing hw/microblaze_pic_cpu.h
Removing hw/microblaze_pic_cpu.c
Removing hw/mcf_uart.c
Removing hw/mcf_intc.c
Removing hw/mcf_fec.c
Removing hw/mcf5208.c
Removing hw/mcf5206.c
Removing hw/mcf.h
Removing hw/mc146818rtc.h
Removing hw/mc146818rtc.c
Removing hw/max7310.c
Removing hw/max111x.c
Removing hw/marvell_88w8618_audio.c
Removing hw/mainstone.c
Removing hw/macio.c
Removing hw/mac_nvram.c
Removing hw/mac_dbdma.h
Removing hw/mac_dbdma.c
Removing hw/m48t59.c
Removing hw/lsi53c895a.c
Removing hw/loader.h
Removing hw/loader.c
Removing hw/lm832x.c
Removing hw/lm4549.h
Removing hw/lm4549.c
Removing hw/lm32_uart.c
Removing hw/lm32_timer.c
Removing hw/lm32_sys.c
Removing hw/lm32_pic.h
Removing hw/lm32_pic.c
Removing hw/lm32_juart.h
Removing hw/lm32_juart.c
Removing hw/lm32_hwsetup.h
Removing hw/lm32_boards.c
Removing hw/lm32.h
Removing hw/leon3.c
Removing hw/lance.c
Removing hw/lan9118.c
Removing hw/kvmvapic.c
Removing hw/kvm/ioapic.c
Removing hw/kvm/i8259.c
Removing hw/kvm/clock.c
Removing hw/kvm/apic.c
Removing hw/jazz_led.c
Removing hw/ivshmem.c
Removing hw/isa_mmio.c
Removing hw/isa.h
Removing hw/isa-bus.c
Removing hw/irq.h
Removing hw/irq.c
Removing hw/ioh3420.h
Removing hw/ioh3420.c
Removing hw/ioapic_internal.h
Removing hw/ioapic_common.c
Removing hw/ioapic.h
Removing hw/ioapic.c
Removing hw/intel-hda.h
Removing hw/intel-hda.c
Removing hw/integratorcp.c
Removing hw/ide.h
Removing hw/i8259_internal.h
Removing hw/i8259_common.c
Removing hw/i8259.c
Removing hw/i8254.h
Removing hw/i8254.c
Removing hw/i82378.c
Removing hw/i82374.c
Removing hw/i2c.h
Removing hw/i2c.c
Removing hw/hw.h
Removing hw/hpet_emul.h
Removing hw/hpet.c
Removing hw/highbank.c
Removing hw/hid.h
Removing hw/hid.c
Removing hw/heathrow_pic.c
Removing hw/hda-audio.c
Removing hw/gus.c
Removing hw/gumstix.c
Removing hw/gt64xxx.c
Removing hw/grlib_irqmp.c
Removing hw/grlib_gptimer.c
Removing hw/grlib_apbuart.c
Removing hw/grlib.h
Removing hw/grackle_pci.c
Removing hw/g364fb.c
Removing hw/fw_cfg.h
Removing hw/fw_cfg.c
Removing hw/framebuffer.h
Removing hw/framebuffer.c
Removing hw/flash.h
Removing hw/fdc.h
Removing hw/fdc.c
Removing hw/exynos4_boards.c
Removing hw/exynos4210_uart.c
Removing hw/exynos4210_pwm.c
Removing hw/exynos4210_pmu.c
Removing hw/exynos4210_mct.c
Removing hw/exynos4210_gic.c
Removing hw/exynos4210_fimd.c
Removing hw/exynos4210_combiner.c
Removing hw/exynos4210.h
Removing hw/exynos4210.c
Removing hw/etraxfs_timer.c
Removing hw/etraxfs_ser.c
Removing hw/etraxfs_pic.c
Removing hw/etraxfs_eth.c
Removing hw/etraxfs_dma.h
Removing hw/etraxfs_dma.c
Removing hw/etraxfs.h
Removing hw/esp.h
Removing hw/esp.c
Removing hw/escc.h
Removing hw/escc.c
Removing hw/es1370.c
Removing hw/empty_slot.h
Removing hw/empty_slot.c
Removing hw/elf_ops.h
Removing hw/eeprom93xx.c
Removing hw/eepro100.c
Removing hw/eccmemctl.c
Removing hw/ecc.c
Removing hw/e1000_hw.h
Removing hw/e1000.c
Removing hw/dummy_m68k.c
Removing hw/ds1338.c
Removing hw/ds1225y.c
Removing hw/dp8393x.c
Removing hw/dma.c
Removing hw/devices.h
Removing hw/device-hotplug.c
Removing hw/dec_pci.h
Removing hw/dec_pci.c
Removing hw/debugcon.c
Removing hw/cuda.c
Removing hw/cs4231a.c
Removing hw/cs4231.c
Removing hw/cris_pic_cpu.c
Removing hw/cris-boot.h
Removing hw/cris-boot.c
Removing hw/collie.c
Removing hw/cirrus_vga.c
Removing hw/cdrom.c
Removing hw/ccid.h
Removing hw/ccid-card-passthru.c
Removing hw/ccid-card-emulated.c
Removing hw/cbus.c
Removing hw/bt.h
Removing hw/bt.c
Removing hw/bt-sdp.c
Removing hw/bt-l2cap.c
Removing hw/bt-hid.c
Removing hw/bt-hci.c
Removing hw/bt-hci-csr.c
Removing hw/bonito.c
Removing hw/boards.h
Removing hw/blizzard_template.h
Removing hw/blizzard.c
Removing hw/bitbang_i2c.h
Removing hw/bitbang_i2c.c
Removing hw/baum.h
Removing hw/baum.c
Removing hw/axis_dev88.c
Removing hw/audiodev.h
Removing hw/armv7m_nvic.c
Removing hw/armv7m.c
Removing hw/arm_timer.c
Removing hw/arm_sysctl.c
Removing hw/arm_pic.c
Removing hw/arm_mptimer.c
Removing hw/arm_l2x0.c
Removing hw/arm_gic.c
Removing hw/arm_boot.c
Removing hw/arm11mpcore.c
Removing hw/arm-misc.h
Removing hw/applesmc.c
Removing hw/apm.h
Removing hw/apm.c
Removing hw/apic_internal.h
Removing hw/apic_common.c
Removing hw/apic.h
Removing hw/apic.c
Removing hw/apb_pci.h
Removing hw/apb_pci.c
Removing hw/an5206.c
Removing hw/alpha_typhoon.c
Removing hw/alpha_sys.h
Removing hw/alpha_pci.c
Removing hw/alpha_dp264.c
Removing hw/ads7846.c
Removing hw/adlib.c
Removing hw/adb.h
Removing hw/adb.c
Removing hw/acpi_piix4.c
Removing hw/acpi.h
Removing hw/acpi.c
Removing hw/ac97.c
Removing hw/a9mpcore.c
Removing hw/a15mpcore.c
Removing hw/9p.h
Removing hppa.ld
Removing hppa-dis.c
Removing host-utils.h
Removing host-utils.c
Removing gen-icount.h
Removing gdbstub.h
Removing fpu/softfloat.h
Removing exec-obsolete.h
Removing exec-memory.h
Removing exec-all.h
Removing event_notifier.h
Removing event_notifier.c
Removing error_int.h
Removing error.h
Removing error.c
Removing envlist.c
Removing elf.h
Removing dyngen-exec.h
Removing dma.h
Removing disas.h
Removing dis-asm.h
Removing device_tree.h
Removing default-configs/ppc-darwin-user.mak
Removing default-configs/i386-darwin-user.mak
Removing def-helper.h
Removing darwin-user/syscalls.h
Removing darwin-user/syscall.c
Removing darwin-user/signal.c
Removing darwin-user/qemu.h
Removing darwin-user/mmap.c
Removing darwin-user/main.c
Removing darwin-user/machload.c
Removing darwin-user/ioctls_types.h
Removing darwin-user/ioctls.h
Removing darwin-user/commpage.c
Removing cutils.c
Removing cursor.c
Removing cris-dis.c
Removing cpus.h
Removing cpu-defs.h
Removing cpu-common.h
Removing cpu-all.h
Removing console.h
Removing console.c
Removing compiler.h
Removing compatfd.c
Removing cmd.h
Removing cmd.c
Removing check-qstring.c
Removing check-qlist.c
Removing check-qjson.c
Removing check-qint.c
Removing check-qfloat.c
Removing check-qdict.c
Removing cache-utils.h
Removing cache-utils.c
Removing buffered_file.h
Removing buffered_file.c
Removing bt-host.h
Removing bswap.h
Removing bsd-user/qemu-types.h
Removing blockdev.h
Removing block_int.h
Removing block/raw.c
Removing block/raw-posix-aio.h
Removing block.h
Removing bitops.h
Removing bitops.c
Removing bitmap.h
Removing bitmap.c
Removing balloon.h
Removing arm.ld
Removing arm-semi.c
Removing arm-dis.c
Removing arch_init.h
Removing alpha.ld
Removing alpha-dis.c
Removing aio.c
Removing aes.h
Removing aes.c
Removing acl.h
Removing acl.c
Removing a.out.h
Removing TODO
Removing QMP/qmp.py
Removing QMP/qmp-spec.txt
Removing QMP/qmp-shell
Removing QMP/qmp-events.txt
Removing QMP/README
Removing Makefile.user
Auto-merging Makefile.target
CONFLICT (content): Merge conflict in Makefile.target
Removing Makefile.hw
Removing Makefile.dis
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 2169 and retry the command.
Automatic merge failed; fix conflicts and then commit the result.
[master] tom@tx:~/git/qemu-osmocom$ 


Hmm... unexpected trouble.
The last merge was this, which is in mainline qemu
 2aeabc08179553e1a7eed6cf26286c3efc06ee0b


[osmocom_cc32rs512] tom@tx:~/git/qemu-osmocom$ git diff last_master
diff --git a/Makefile.target b/Makefile.target
index 343eb78..7513e5d 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -374,6 +374,7 @@ obj-arm-y += vexpress.o
 obj-arm-y += strongarm.o
 obj-arm-y += collie.o
 obj-arm-y += pl041.o lm4549.o
+obj-arm-y += cc32rs512.o cc32_iso_slave.o
 obj-arm-$(CONFIG_FDT) += device_tree.o
 
 obj-sh4-y = shix.o r2d.o sh7750.o sh7750_regnames.o tc58128.o


diff --git a/hw/cc32_iso_slave.c b/hw/cc32_iso_slave.c
...
diff --git a/hw/cc32rs512.c b/hw/cc32rs512.c
...



Hmm... maybe best to just cherry pick the patches..

0aafdf2366e12d767555c6d25719a4fd34eef839 cc32rs512: add simulation of the built-in flash controller
a4fb8f496a49976e8b6669a427d518c4dc98268d Initial support for the ChipCity CC32RS512 smart card



[Reply][About]
[<<][simtrace][>>][..]