qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 159b6e: hw: move char backends to backends/


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 159b6e: hw: move char backends to backends/
Date: Sun, 10 Mar 2013 19:30:16 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 159b6e9f144c7afdf3ad95c29d1fede9626fa8b1
      
https://github.com/qemu/qemu/commit/159b6e9f144c7afdf3ad95c29d1fede9626fa8b1
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-03-01 (Fri, 01 Mar 2013)

  Changed paths:
    M backends/Makefile.objs
    A backends/baum.c
    A backends/msmouse.c
    M hw/Makefile.objs
    R hw/baum.c
    R hw/baum.h
    R hw/msmouse.c
    R hw/msmouse.h
    A include/char/baum.h
    A include/char/msmouse.h
    M qemu-char.c
    M vl.c

  Log Message:
  -----------
  hw: move char backends to backends/

Braille and msmouse support is in hw/, but it is not hardware.
Move it to the backends/ directory.

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: fd7f0d66177ec1058a2a256856ff38fc9ceae5af
      
https://github.com/qemu/qemu/commit/fd7f0d66177ec1058a2a256856ff38fc9ceae5af
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-03-01 (Fri, 01 Mar 2013)

  Changed paths:
    M hw/Makefile.objs
    R hw/fifo.c
    R hw/fifo.h
    M hw/xilinx_spi.c
    M hw/xilinx_spips.c
    M include/migration/vmstate.h
    A include/qemu/fifo8.h
    M util/Makefile.objs
    A util/fifo8.c

  Log Message:
  -----------
  hw: move fifo.[ch] to libqemuutil

fifo.c is generic code that can be easily unit tested.  So it
belongs in libqemuutil.

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: b4a42f81383d60900aae09513f42eb857a5a7c7c
      
https://github.com/qemu/qemu/commit/b4a42f81383d60900aae09513f42eb857a5a7c7c
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-03-01 (Fri, 01 Mar 2013)

  Changed paths:
    M Makefile.objs
    M hw/9pfs/virtio-9p-proxy.c
    M hw/Makefile.objs
    M hw/dataplane/virtio-blk.c
    M hw/dataplane/vring.c
    M hw/pc87312.c
    M hw/pc_sysfw.c
    M hw/pci/shpc.c
    M hw/pci/slotid_cap.c
    M hw/qdev-addr.c
    R hw/qdev-monitor.c
    R hw/qdev-monitor.h
    M hw/qdev.c
    M hw/qdev.h
    M hw/s390x/sclpconsole.c
    M hw/usb/dev-network.c
    M hw/virtio-rng.c
    M hw/virtio-scsi.c
    M hw/xilinx.h
    M hw/xilinx_axienet.c
    A include/monitor/qdev.h
    M monitor.c
    A qdev-monitor.c
    M util/qemu-config.c
    M vl.c

  Log Message:
  -----------
  hw: move qdev-monitor.o to toplevel directory

qdev-monitor.c is the only "core qdev" file that is not used in
user-mode emulation, and it does not define anything that is used
by hardware models.  Remove it from the hw/ directory and
remove hw/qdev-monitor.h from hw/qdev.h too; this requires
some files to have some new explicitly includes.

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 1559e0d4b54d1b0744983b57da893617ceae8b94
      
https://github.com/qemu/qemu/commit/1559e0d4b54d1b0744983b57da893617ceae8b94
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-03-01 (Fri, 01 Mar 2013)

  Changed paths:
    M Makefile.objs
    A device-hotplug.c
    M hw/Makefile.objs
    R hw/device-hotplug.c
    M stubs/Makefile.objs
    A stubs/pci-drive-hot-add.c

  Log Message:
  -----------
  hw: move device-hotplug.o to toplevel, compile it once

The situation with device-hotplug.c is similar to qdev-monitor.c.
Add a stub for pci_drive_hot_add, so that it can be compiled once,
and move it out of hw/.

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 7e6b14dfb575a687cb26be9995c96e5bbf5cba2e
      
https://github.com/qemu/qemu/commit/7e6b14dfb575a687cb26be9995c96e5bbf5cba2e
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-03-01 (Fri, 01 Mar 2013)

  Changed paths:
    M hw/virtio-pci.h
    M hw/virtio.h

  Log Message:
  -----------
  virtio-9p: use CONFIG_VIRTFS, not CONFIG_LINUX

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 60653b28f505288689d0b44218de4bb9fd254519
      
https://github.com/qemu/qemu/commit/60653b28f505288689d0b44218de4bb9fd254519
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-03-01 (Fri, 01 Mar 2013)

  Changed paths:
    R hw/9p.h
    M hw/9pfs/virtio-9p-device.c
    A hw/9pfs/virtio-9p-device.h
    M hw/9pfs/virtio-9p.c
    M hw/9pfs/virtio-9p.h
    M hw/virtio-pci.c
    M hw/virtio-pci.h
    M hw/virtio.h

  Log Message:
  -----------
  virtio-9p: remove PCI dependencies from hw/9pfs/

Also move the 9p.h file to 9pfs/virtio-9p-device.h, for consistency
with the corresponding .c file.

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: eac7ec7f6a5c9e1a0a082ea8525f31549b1f0cb4
      
https://github.com/qemu/qemu/commit/eac7ec7f6a5c9e1a0a082ea8525f31549b1f0cb4
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-03-01 (Fri, 01 Mar 2013)

  Changed paths:
    M hw/vt82c686.c

  Log Message:
  -----------
  vt82c686: vt82c686 is not a PCI host bridge

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 7948b4b009b60c6e3b21daad29088b204ddb1966
      
https://github.com/qemu/qemu/commit/7948b4b009b60c6e3b21daad29088b204ddb1966
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-03-01 (Fri, 01 Mar 2013)

  Changed paths:
    M hw/ppc/e500-ccsr.h
    M hw/ppc/e500plat.c
    M hw/ppc/mpc8544ds.c

  Log Message:
  -----------
  ppc: do not use ../ in include files

This simplifies the scripted execution of the next patch.

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 83c9f4ca794ec3b6fa7e5a5bb055d378916503e0
      
https://github.com/qemu/qemu/commit/83c9f4ca794ec3b6fa7e5a5bb055d378916503e0
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-03-01 (Fri, 01 Mar 2013)

  Changed paths:
    M hw/a15mpcore.c
    M hw/a9mpcore.c
    M hw/a9scu.c
    M hw/ac97.c
    M hw/acpi.c
    M hw/acpi_ich9.c
    M hw/acpi_ich9.h
    M hw/acpi_piix4.c
    M hw/adb.c
    M hw/adb.h
    M hw/adlib.c
    M hw/ads7846.c
    M hw/alpha_dp264.c
    M hw/alpha_pci.c
    M hw/alpha_sys.h
    M hw/alpha_typhoon.c
    M hw/an5206.c
    M hw/apb_pci.c
    M hw/apic.c
    M hw/apic_common.c
    M hw/apic_internal.h
    M hw/apm.c
    M hw/apm.h
    M hw/applesmc.c
    M hw/arm11mpcore.c
    M hw/arm_boot.c
    M hw/arm_gic.c
    M hw/arm_gic_common.c
    M hw/arm_gic_internal.h
    M hw/arm_l2x0.c
    M hw/arm_mptimer.c
    M hw/arm_pic.c
    M hw/arm_sysctl.c
    M hw/arm_timer.c
    M hw/armv7m.c
    M hw/armv7m_nvic.c
    M hw/axis_dev88.c
    M hw/bitbang_i2c.c
    M hw/bitbang_i2c.h
    M hw/blizzard.c
    M hw/boards.h
    M hw/bonito.c
    M hw/bt-hci-csr.c
    M hw/bt-hci.c
    M hw/bt-hid.c
    M hw/bt-l2cap.c
    M hw/bt-sdp.c
    M hw/bt.c
    M hw/cadence_gem.c
    M hw/cadence_ttc.c
    M hw/cadence_uart.c
    M hw/cbus.c
    M hw/ccid.h
    M hw/cdrom.c
    M hw/cirrus_vga.c
    M hw/cirrus_vga_rop.h
    M hw/collie.c
    M hw/cris-boot.c
    M hw/cris_pic_cpu.c
    M hw/cs4231.c
    M hw/cs4231a.c
    M hw/cuda.c
    M hw/dataplane/event-poll.c
    M hw/dataplane/ioq.c
    M hw/dataplane/virtio-blk.c
    M hw/dataplane/vring.c
    M hw/dataplane/vring.h
    M hw/debugcon.c
    M hw/debugexit.c
    M hw/dec_pci.c
    M hw/dma.c
    M hw/dp8393x.c
    M hw/ds1225y.c
    M hw/ds1338.c
    M hw/dummy_m68k.c
    M hw/e1000.c
    M hw/ecc.c
    M hw/eccmemctl.c
    M hw/eepro100.c
    M hw/eeprom93xx.c
    M hw/empty_slot.c
    M hw/es1370.c
    M hw/escc.c
    M hw/esp-pci.c
    M hw/esp.c
    M hw/esp.h
    M hw/etraxfs.h
    M hw/etraxfs_dma.c
    M hw/etraxfs_eth.c
    M hw/etraxfs_pic.c
    M hw/etraxfs_ser.c
    M hw/etraxfs_timer.c
    M hw/exynos4210.c
    M hw/exynos4210_combiner.c
    M hw/exynos4210_fimd.c
    M hw/exynos4210_gic.c
    M hw/exynos4210_i2c.c
    M hw/exynos4210_mct.c
    M hw/exynos4210_pmu.c
    M hw/exynos4210_pwm.c
    M hw/exynos4210_rtc.c
    M hw/exynos4210_uart.c
    M hw/exynos4_boards.c
    M hw/fdc.c
    M hw/fmopl.c
    M hw/framebuffer.c
    M hw/fw_cfg.c
    M hw/g364fb.c
    M hw/grackle_pci.c
    M hw/grlib.h
    M hw/grlib_apbuart.c
    M hw/grlib_gptimer.c
    M hw/grlib_irqmp.c
    M hw/gt64xxx.c
    M hw/gumstix.c
    M hw/gus.c
    M hw/gusemu_hal.c
    M hw/gusemu_mixer.c
    M hw/hda-audio.c
    M hw/heathrow_pic.c
    M hw/hid.c
    M hw/highbank.c
    M hw/hpet.c
    M hw/hw.h
    M hw/i2c.c
    M hw/i2c.h
    M hw/i82374.c
    M hw/i82378.c
    M hw/i8254.c
    M hw/i8254.h
    M hw/i8254_common.c
    M hw/i8254_internal.h
    M hw/i8259.c
    M hw/i8259_common.c
    M hw/i8259_internal.h
    M hw/i82801b11.c
    M hw/ich9.h
    M hw/ide.h
    M hw/imx_avic.c
    M hw/imx_ccm.c
    M hw/imx_serial.c
    M hw/imx_timer.c
    M hw/integratorcp.c
    M hw/intel-hda.c
    M hw/intel-hda.h
    M hw/ioapic.c
    M hw/ioapic_common.c
    M hw/ioapic_internal.h
    M hw/ioh3420.c
    M hw/ioh3420.h
    M hw/ipack.c
    M hw/ipack.h
    M hw/ipoctal232.c
    M hw/irq.c
    M hw/isa-bus.c
    M hw/isa.h
    M hw/isa_mmio.c
    M hw/ivshmem.c
    M hw/jazz_led.c
    M hw/kvmvapic.c
    M hw/kzm.c
    M hw/lan9118.c
    M hw/lance.c
    M hw/leon3.c
    M hw/lm32_boards.c
    M hw/lm32_hwsetup.h
    M hw/lm32_juart.c
    M hw/lm32_pic.c
    M hw/lm32_sys.c
    M hw/lm32_timer.c
    M hw/lm32_uart.c
    M hw/lm4549.c
    M hw/lm832x.c
    M hw/loader.c
    M hw/lpc_ich9.c
    M hw/lsi53c895a.c
    M hw/m25p80.c
    M hw/m48t59.c
    M hw/mac_dbdma.c
    M hw/mac_nvram.c
    M hw/macio.c
    M hw/mainstone.c
    M hw/marvell_88w8618_audio.c
    M hw/max111x.c
    M hw/max7310.c
    M hw/mc146818rtc.c
    M hw/mc146818rtc.h
    M hw/mcf5206.c
    M hw/mcf5208.c
    M hw/mcf_fec.c
    M hw/mcf_intc.c
    M hw/mcf_uart.c
    M hw/megasas.c
    M hw/microblaze_boot.c
    M hw/microblaze_boot.h
    M hw/microblaze_pic_cpu.c
    M hw/milkymist-ac97.c
    M hw/milkymist-hpdmc.c
    M hw/milkymist-hw.h
    M hw/milkymist-memcard.c
    M hw/milkymist-minimac2.c
    M hw/milkymist-pfpu.c
    M hw/milkymist-softusb.c
    M hw/milkymist-sysctl.c
    M hw/milkymist-tmu2.c
    M hw/milkymist-uart.c
    M hw/milkymist-vgafb.c
    M hw/milkymist.c
    M hw/mips_addr.c
    M hw/mips_fulong2e.c
    M hw/mips_int.c
    M hw/mips_jazz.c
    M hw/mips_malta.c
    M hw/mips_mipssim.c
    M hw/mips_r4k.c
    M hw/mips_timer.c
    M hw/mipsnet.c
    M hw/mpc8544_guts.c
    M hw/mst_fpga.c
    M hw/multiboot.c
    M hw/musicpal.c
    M hw/nand.c
    M hw/ne2000-isa.c
    M hw/ne2000.c
    M hw/nseries.c
    M hw/omap1.c
    M hw/omap2.c
    M hw/omap_clk.c
    M hw/omap_dma.c
    M hw/omap_dss.c
    M hw/omap_gpio.c
    M hw/omap_gpmc.c
    M hw/omap_gptimer.c
    M hw/omap_i2c.c
    M hw/omap_intc.c
    M hw/omap_l4.c
    M hw/omap_lcdc.c
    M hw/omap_mmc.c
    M hw/omap_sdrc.c
    M hw/omap_spi.c
    M hw/omap_sx1.c
    M hw/omap_synctimer.c
    M hw/omap_tap.c
    M hw/omap_uart.c
    M hw/onenand.c
    M hw/opencores_eth.c
    M hw/openpic.c
    M hw/openrisc_pic.c
    M hw/openrisc_sim.c
    M hw/openrisc_timer.c
    M hw/palm.c
    M hw/pam.c
    M hw/parallel.c
    M hw/pc-testdev.c
    M hw/pc.c
    M hw/pc.h
    M hw/pc87312.c
    M hw/pc87312.h
    M hw/pc_piix.c
    M hw/pc_q35.c
    M hw/pc_sysfw.c
    M hw/pci_bridge_dev.c
    M hw/pckbd.c
    M hw/pcnet-pci.c
    M hw/pcnet.c
    M hw/pcspk.c
    M hw/pcspk.h
    M hw/petalogix_ml605_mmu.c
    M hw/petalogix_s3adsp1800_mmu.c
    M hw/pflash_cfi01.c
    M hw/pflash_cfi02.c
    M hw/piix4.c
    M hw/piix_pci.c
    M hw/pl011.c
    M hw/pl022.c
    M hw/pl031.c
    M hw/pl041.c
    M hw/pl050.c
    M hw/pl061.c
    M hw/pl080.c
    M hw/pl110.c
    M hw/pl110_template.h
    M hw/pl181.c
    M hw/pl190.c
    M hw/pm_smbus.c
    M hw/ppc.c
    M hw/ppc405.h
    M hw/ppc405_boards.c
    M hw/ppc405_uc.c
    M hw/ppc440_bamboo.c
    M hw/ppc4xx.h
    M hw/ppc4xx_devs.c
    M hw/ppc4xx_pci.c
    M hw/ppc_booke.c
    M hw/ppce500_pci.c
    M hw/ppce500_spin.c
    M hw/prep_pci.c
    M hw/ps2.c
    M hw/ptimer.c
    M hw/puv3.c
    M hw/puv3_dma.c
    M hw/puv3_gpio.c
    M hw/puv3_intc.c
    M hw/puv3_ost.c
    M hw/puv3_pm.c
    M hw/pxa2xx.c
    M hw/pxa2xx_dma.c
    M hw/pxa2xx_gpio.c
    M hw/pxa2xx_keypad.c
    M hw/pxa2xx_lcd.c
    M hw/pxa2xx_mmci.c
    M hw/pxa2xx_pcmcia.c
    M hw/pxa2xx_pic.c
    M hw/pxa2xx_timer.c
    M hw/q35.c
    M hw/q35.h
    M hw/qdev-addr.c
    M hw/qdev-properties-system.c
    M hw/qdev-properties.c
    M hw/qdev-properties.h
    M hw/qdev.c
    M hw/qdev.h
    M hw/qxl-logger.c
    M hw/qxl-render.c
    M hw/qxl.c
    M hw/qxl.h
    M hw/r2d.c
    M hw/rc4030.c
    M hw/realview.c
    M hw/realview_gic.c
    M hw/rtl8139.c
    M hw/s390x/event-facility.c
    M hw/s390x/s390-virtio-ccw.c
    M hw/s390x/sclp.c
    M hw/s390x/sclpconsole.c
    M hw/s390x/sclpquiesce.c
    M hw/sb16.c
    M hw/sbi.c
    M hw/scsi-bus.c
    M hw/scsi-disk.c
    M hw/scsi-generic.c
    M hw/scsi.h
    M hw/sd.c
    M hw/sdhci.c
    M hw/sdhci.h
    M hw/serial-isa.c
    M hw/serial-pci.c
    M hw/serial.c
    M hw/serial.h
    M hw/sga.c
    M hw/sh.h
    M hw/sh7750.c
    M hw/sh7750_regnames.c
    M hw/sh_intc.c
    M hw/sh_intc.h
    M hw/sh_pci.c
    M hw/sh_serial.c
    M hw/sh_timer.c
    M hw/shix.c
    M hw/slavio_intctl.c
    M hw/slavio_misc.c
    M hw/slavio_timer.c
    M hw/sm501.c
    M hw/smbios.c
    M hw/smbus.c
    M hw/smbus.h
    M hw/smbus_eeprom.c
    M hw/smbus_ich9.c
    M hw/smc91c111.c
    M hw/soc_dma.c
    M hw/spapr.c
    M hw/spapr_iommu.c
    M hw/spapr_llan.c
    M hw/spapr_pci.c
    M hw/spapr_vio.c
    M hw/spapr_vscsi.c
    M hw/spapr_vty.c
    M hw/sparc32_dma.c
    M hw/spitz.c
    M hw/ssd0303.c
    M hw/ssd0323.c
    M hw/ssi-sd.c
    M hw/ssi.c
    M hw/ssi.h
    M hw/stellaris.c
    M hw/stellaris_enet.c
    M hw/stellaris_input.c
    M hw/stream.c
    M hw/strongarm.c
    M hw/sun4c_intctl.c
    M hw/sun4m.c
    M hw/sun4m.h
    M hw/sun4m_iommu.c
    M hw/sun4u.c
    M hw/sysbus.c
    M hw/sysbus.h
    M hw/tc58128.c
    M hw/tc6393xb.c
    M hw/tcx.c
    M hw/tmp105.c
    M hw/tmp105.h
    M hw/tosa.c
    M hw/tpci200.c
    M hw/tsc2005.c
    M hw/tsc210x.c
    M hw/tusb6010.c
    M hw/twl92230.c
    M hw/unin_pci.c
    M hw/usb.h
    M hw/versatile_i2c.c
    M hw/versatile_pci.c
    M hw/versatilepb.c
    M hw/vexpress.c
    M hw/vfio_pci.c
    M hw/vga-isa-mm.c
    M hw/vga-isa.c
    M hw/vga-pci.c
    M hw/vga.c
    M hw/vhost.c
    M hw/vhost_net.c
    M hw/virtex_ml507.c
    M hw/virtio-balloon.c
    M hw/virtio-balloon.h
    M hw/virtio-blk.c
    M hw/virtio-blk.h
    M hw/virtio-bus.c
    M hw/virtio-bus.h
    M hw/virtio-console.c
    M hw/virtio-net.c
    M hw/virtio-net.h
    M hw/virtio-pci.c
    M hw/virtio-pci.h
    M hw/virtio-rng.c
    M hw/virtio-scsi.c
    M hw/virtio-scsi.h
    M hw/virtio-serial-bus.c
    M hw/virtio-serial.h
    M hw/virtio.c
    M hw/virtio.h
    M hw/vmmouse.c
    M hw/vmport.c
    M hw/vmware_vga.c
    M hw/vt82c686.c
    M hw/wdt_i6300esb.c
    M hw/wdt_ib700.c
    M hw/wm8750.c
    M hw/xen-host-pci-device.c
    M hw/xen-host-pci-device.h
    M hw/xen_apic.c
    M hw/xen_backend.c
    M hw/xen_backend.h
    M hw/xen_common.h
    M hw/xen_console.c
    M hw/xen_devconfig.c
    M hw/xen_disk.c
    M hw/xen_domainbuild.c
    M hw/xen_domainbuild.h
    M hw/xen_machine_pv.c
    M hw/xen_nic.c
    M hw/xen_platform.c
    M hw/xen_pt.c
    M hw/xen_pt.h
    M hw/xen_pt_config_init.c
    M hw/xen_pt_msi.c
    M hw/xenfb.c
    M hw/xgmac.c
    M hw/xics.c
    M hw/xilinx.h
    M hw/xilinx_axidma.c
    M hw/xilinx_axienet.c
    M hw/xilinx_ethlite.c
    M hw/xilinx_intc.c
    M hw/xilinx_spi.c
    M hw/xilinx_spips.c
    M hw/xilinx_timer.c
    M hw/xilinx_uartlite.c
    M hw/xilinx_zynq.c
    M hw/xio3130_downstream.c
    M hw/xio3130_downstream.h
    M hw/xio3130_upstream.c
    M hw/xio3130_upstream.h
    M hw/xtensa_lx60.c
    M hw/xtensa_pic.c
    M hw/xtensa_sim.c
    M hw/z2.c
    M hw/zaurus.c
    M hw/zynq_slcr.c

  Log Message:
  -----------
  hw: include hw header files with full paths

Done with this script:

cd hw
for i in `find . -name '*.h' | sed 's/^..//'`; do
  echo '\,^#.*include.*["<]'$i'[">], s,'$i',hw/&,'
done | sed -i -f - `find . -type f`

This is so that paths remain valid as files are moved.

Instead, files in hw/dataplane are referenced with the relative path.
We know they are not going to move to include/, and they are the only
include files that are in subdirectories _and_ move.

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 320ba5fe494c0ef59080eac33801ec1e453663fa
      
https://github.com/qemu/qemu/commit/320ba5fe494c0ef59080eac33801ec1e453663fa
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-03-01 (Fri, 01 Mar 2013)

  Changed paths:
    M Makefile.target
    M configure
    M hw/arm/Makefile.objs
    M hw/microblaze/Makefile.objs
    M hw/ppc/Makefile.objs

  Log Message:
  -----------
  build: always link device_tree.o into emulators if libfdt available

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: e4c8b28cde12d01ada8fe869567dc5717a2dfcb7
      
https://github.com/qemu/qemu/commit/e4c8b28cde12d01ada8fe869567dc5717a2dfcb7
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-03-01 (Fri, 01 Mar 2013)

  Changed paths:
    M configure
    M default-configs/ppc-softmmu.mak
    M default-configs/ppc64-softmmu.mak
    M default-configs/ppcemb-softmmu.mak
    M hw/ppc/Makefile.objs

  Log Message:
  -----------
  ppc: express FDT dependency of pSeries and e500 boards via default-configs/

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 530182169e897c0e401b245552a4c58dc6846912
      
https://github.com/qemu/qemu/commit/530182169e897c0e401b245552a4c58dc6846912
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-03-01 (Fri, 01 Mar 2013)

  Changed paths:
    M hw/Makefile.objs
    M hw/alpha/Makefile.objs
    A hw/alpha/dp264.c
    A hw/alpha/pci.c
    R hw/alpha_dp264.c
    R hw/alpha_pci.c
    R hw/an5206.c
    M hw/arm/Makefile.objs
    A hw/arm/boot.c
    A hw/arm/collie.c
    A hw/arm/exynos4_boards.c
    A hw/arm/gumstix.c
    A hw/arm/highbank.c
    A hw/arm/integratorcp.c
    A hw/arm/kzm.c
    A hw/arm/mainstone.c
    A hw/arm/musicpal.c
    A hw/arm/nseries.c
    A hw/arm/omap_sx1.c
    A hw/arm/palm.c
    A hw/arm/pic_cpu.c
    A hw/arm/realview.c
    A hw/arm/spitz.c
    A hw/arm/stellaris.c
    A hw/arm/tosa.c
    A hw/arm/versatilepb.c
    A hw/arm/vexpress.c
    A hw/arm/xilinx_zynq.c
    A hw/arm/z2.c
    R hw/arm_boot.c
    R hw/arm_pic.c
    R hw/axis_dev88.c
    R hw/collie.c
    R hw/cris-boot.c
    M hw/cris/Makefile.objs
    A hw/cris/axis_dev88.c
    A hw/cris/boot.c
    A hw/cris/pic_cpu.c
    R hw/cris_pic_cpu.c
    R hw/dummy_m68k.c
    R hw/exynos4_boards.c
    R hw/gumstix.c
    R hw/highbank.c
    M hw/i386/Makefile.objs
    A hw/i386/multiboot.c
    A hw/i386/pc.c
    A hw/i386/pc_piix.c
    A hw/i386/pc_q35.c
    A hw/i386/smbios.c
    A hw/i386/xen_domainbuild.c
    A hw/i386/xen_machine_pv.c
    R hw/integratorcp.c
    R hw/kzm.c
    R hw/leon3.c
    M hw/lm32/Makefile.objs
    A hw/lm32/lm32_boards.c
    A hw/lm32/milkymist.c
    R hw/lm32_boards.c
    M hw/m68k/Makefile.objs
    A hw/m68k/an5206.c
    A hw/m68k/dummy_m68k.c
    A hw/m68k/mcf5208.c
    R hw/mainstone.c
    R hw/mcf5208.c
    M hw/microblaze/Makefile.objs
    A hw/microblaze/boot.c
    A hw/microblaze/petalogix_ml605_mmu.c
    A hw/microblaze/petalogix_s3adsp1800_mmu.c
    A hw/microblaze/pic_cpu.c
    R hw/microblaze_boot.c
    R hw/microblaze_pic_cpu.c
    R hw/milkymist.c
    M hw/mips/Makefile.objs
    A hw/mips/addr.c
    A hw/mips/cputimer.c
    A hw/mips/mips_fulong2e.c
    A hw/mips/mips_int.c
    A hw/mips/mips_jazz.c
    A hw/mips/mips_malta.c
    A hw/mips/mips_mipssim.c
    A hw/mips/mips_r4k.c
    R hw/mips_addr.c
    R hw/mips_fulong2e.c
    R hw/mips_int.c
    R hw/mips_jazz.c
    R hw/mips_malta.c
    R hw/mips_mipssim.c
    R hw/mips_r4k.c
    R hw/mips_timer.c
    R hw/multiboot.c
    R hw/musicpal.c
    R hw/nseries.c
    R hw/omap_sx1.c
    M hw/openrisc/Makefile.objs
    A hw/openrisc/cputimer.c
    A hw/openrisc/openrisc_sim.c
    A hw/openrisc/pic_cpu.c
    R hw/openrisc_pic.c
    R hw/openrisc_sim.c
    R hw/openrisc_timer.c
    R hw/palm.c
    R hw/pc.c
    R hw/pc_piix.c
    R hw/pc_q35.c
    R hw/petalogix_ml605_mmu.c
    R hw/petalogix_s3adsp1800_mmu.c
    R hw/ppc.c
    M hw/ppc/Makefile.objs
    A hw/ppc/ppc.c
    A hw/ppc/ppc405_boards.c
    A hw/ppc/ppc405_uc.c
    A hw/ppc/ppc440_bamboo.c
    A hw/ppc/ppc_booke.c
    A hw/ppc/spapr.c
    A hw/ppc/virtex_ml507.c
    R hw/ppc405_boards.c
    R hw/ppc405_uc.c
    R hw/ppc440_bamboo.c
    R hw/ppc_booke.c
    R hw/puv3.c
    R hw/r2d.c
    R hw/realview.c
    M hw/sh4/Makefile.objs
    A hw/sh4/r2d.c
    A hw/sh4/shix.c
    R hw/shix.c
    R hw/smbios.c
    R hw/spapr.c
    M hw/sparc/Makefile.objs
    A hw/sparc/leon3.c
    A hw/sparc/sun4m.c
    M hw/sparc64/Makefile.objs
    A hw/sparc64/sun4u.c
    R hw/spitz.c
    R hw/stellaris.c
    R hw/sun4m.c
    R hw/sun4u.c
    R hw/tosa.c
    M hw/unicore32/Makefile.objs
    A hw/unicore32/puv3.c
    R hw/versatilepb.c
    R hw/vexpress.c
    R hw/virtex_ml507.c
    R hw/xen_domainbuild.c
    R hw/xen_machine_pv.c
    R hw/xilinx_zynq.c
    M hw/xtensa/Makefile.objs
    A hw/xtensa/pic_cpu.c
    A hw/xtensa/xtensa_lx60.c
    A hw/xtensa/xtensa_sim.c
    R hw/xtensa_lx60.c
    R hw/xtensa_pic.c
    R hw/xtensa_sim.c
    R hw/z2.c

  Log Message:
  -----------
  hw: move boards and other isolated files to hw/ARCH

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: dd285b06490d7ef5f7b2f5e6c87b85ddf4345078
      
https://github.com/qemu/qemu/commit/dd285b06490d7ef5f7b2f5e6c87b85ddf4345078
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-03-01 (Fri, 01 Mar 2013)

  Changed paths:
    M hw/arm/Makefile.objs
    A hw/arm/armv7m.c
    A hw/arm/exynos4210.c
    A hw/arm/omap1.c
    A hw/arm/omap2.c
    A hw/arm/pxa2xx.c
    A hw/arm/pxa2xx_gpio.c
    A hw/arm/pxa2xx_pic.c
    R hw/armv7m.c
    R hw/exynos4210.c
    R hw/omap1.c
    R hw/omap2.c
    R hw/pxa2xx.c
    R hw/pxa2xx_gpio.c
    R hw/pxa2xx_pic.c

  Log Message:
  -----------
  arm: move files referencing CPU to hw/arm/

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 8786b05e7bf3c4fc7a25fa14f1736a716cd8a8c4
      
https://github.com/qemu/qemu/commit/8786b05e7bf3c4fc7a25fa14f1736a716cd8a8c4
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-03-01 (Fri, 01 Mar 2013)

  Changed paths:
    M hw/i386/Makefile.objs
    A hw/i386/kvmvapic.c
    R hw/kvmvapic.c

  Log Message:
  -----------
  i386: move files referencing CPU to hw/i386/

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 9743b581a819a05668e6a1f60e3ee6486d25f141
      
https://github.com/qemu/qemu/commit/9743b581a819a05668e6a1f60e3ee6486d25f141
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-03-01 (Fri, 01 Mar 2013)

  Changed paths:
    M hw/m68k/Makefile.objs
    A hw/m68k/mcf5206.c
    A hw/m68k/mcf_intc.c
    R hw/mcf5206.c
    R hw/mcf_intc.c

  Log Message:
  -----------
  m68k: move files referencing CPU to hw/m68k/

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: c68c4a56e93f54b374c5207f0185f8e9fa2aec3b
      
https://github.com/qemu/qemu/commit/c68c4a56e93f54b374c5207f0185f8e9fa2aec3b
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-03-01 (Fri, 01 Mar 2013)

  Changed paths:
    R hw/mpc8544_guts.c
    M hw/ppc/Makefile.objs
    A hw/ppc/mpc8544_guts.c
    A hw/ppc/ppc4xx_devs.c
    A hw/ppc/ppce500_spin.c
    A hw/ppc/spapr_vio.c
    A hw/ppc/xics.c
    R hw/ppc4xx_devs.c
    R hw/ppce500_spin.c
    R hw/spapr_vio.c
    R hw/xics.c

  Log Message:
  -----------
  ppc: move files referencing CPU to hw/ppc/

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 9f64bd8aec7c31c76fa0954aaee1475d482662b4
      
https://github.com/qemu/qemu/commit/9f64bd8aec7c31c76fa0954aaee1475d482662b4
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-03-01 (Fri, 01 Mar 2013)

  Changed paths:
    M hw/ppc/Makefile.objs
    A hw/ppc/spapr_events.c
    A hw/ppc/spapr_hcall.c
    A hw/ppc/spapr_iommu.c
    A hw/ppc/spapr_rtas.c
    R hw/spapr_events.c
    R hw/spapr_hcall.c
    R hw/spapr_iommu.c
    R hw/spapr_rtas.c

  Log Message:
  -----------
  ppc: move more files to hw/ppc

These sPAPR files do not implement devices, move them over.
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 7a2771d1541ec9a0c585e9b853e5f4dc036919ad
      
https://github.com/qemu/qemu/commit/7a2771d1541ec9a0c585e9b853e5f4dc036919ad
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-03-01 (Fri, 01 Mar 2013)

  Changed paths:
    M hw/sh4/Makefile.objs
    A hw/sh4/sh7750.c
    A hw/sh4/sh7750_regnames.c
    R hw/sh7750.c
    R hw/sh7750_regnames.c

  Log Message:
  -----------
  sh: move files referencing CPU to hw/sh4/

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 1dde716ed6719c341c1bfa427781f0715af90cbc
      
https://github.com/qemu/qemu/commit/1dde716ed6719c341c1bfa427781f0715af90cbc
  Author: Peter Lieven <address@hidden>
  Date:   2013-03-05 (Tue, 05 Mar 2013)

  Changed paths:
    M block/iscsi.c

  Log Message:
  -----------
  iscsi: retry read, write, flush and unmap on unit attention check conditions

the storage might return a check condition status for various reasons.
(e.g. bus reset, capacity change, thin-provisioning info etc.)

currently all these informative status responses lead to an I/O error
which is populated to the guest. this patch introduces a retry mechanism
to avoid this.

Signed-off-by: Peter Lieven <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: cb1b83e740384b4e0d950f3d7c81c02b8ce86c2e
      
https://github.com/qemu/qemu/commit/cb1b83e740384b4e0d950f3d7c81c02b8ce86c2e
  Author: Peter Lieven <address@hidden>
  Date:   2013-03-05 (Tue, 05 Mar 2013)

  Changed paths:
    M block/iscsi.c

  Log Message:
  -----------
  iscsi: add iscsi_truncate support

this patch adds iscsi_truncate which effectively allows for
online resizing of iscsi volumes. for this to work you have
to resize the volume on your storage and then call
block_resize command in qemu which will issue a
readcapacity16 to update the capacity.

v4:
  - factor out complete readcapacity logic into a separate function
  - handle capacity change check condition in readcapacity function
    (this happens if the block_resize cmd is the first iscsi task
    executed after a resize on the storage)

v3:
  - remove switch statement in iscsi_open
  - create separate patch for brdv_drain_all() in bdrv_truncate()

v2:
  - add a general bdrv_drain_all() before bdrv_truncate() to avoid
    in-flight AIOs while the device is truncated
  - since no AIOs are in flight we can use a sync libiscsi call
    to re-read the capacity
  - factor out the readcapacity16 logic as it is redundant
    to iscsi_open() and iscsi_truncate().

Signed-off-by: Peter Lieven <address@hidden>
[allow any type of unit attention check condition in iscsi_readcapacity_sync(),
 as in Message-ID: <address@hidden> - Paolo]
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 3c33ea9640758bb625e110a77673e5abfd184e54
      
https://github.com/qemu/qemu/commit/3c33ea9640758bb625e110a77673e5abfd184e54
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-03-05 (Tue, 05 Mar 2013)

  Changed paths:
    M configure

  Log Message:
  -----------
  iscsi: look for pkg-config file too

Due to library conflicts, Fedora will have to put libiscsi in
/usr/lib/iscsi.  Simplify configuration by using a pkg-config
file.  The Fedora package will distribute one, and the patch
to add it has been sent to upstream libiscsi as well.

Cc: address@hidden
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 6f6710aa99ac53b59ff0f14380830cb9ab6bdc14
      
https://github.com/qemu/qemu/commit/6f6710aa99ac53b59ff0f14380830cb9ab6bdc14
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-03-05 (Tue, 05 Mar 2013)

  Changed paths:
    M hw/scsi-bus.c
    M trace-events

  Log Message:
  -----------
  scsi: do not call scsi_read_data/scsi_write_data for a canceled request

Cc: address@hidden
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: d0242eadc5bba4f3abe34bc5d536bbfb81aa9891
      
https://github.com/qemu/qemu/commit/d0242eadc5bba4f3abe34bc5d536bbfb81aa9891
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-03-05 (Tue, 05 Mar 2013)

  Changed paths:
    M hw/scsi-disk.c

  Log Message:
  -----------
  scsi-disk: do not complete canceled UNMAP requests

Canceled requests should never be completed, and doing that could cause
accesses to a NULL hba_private field.

Cc: address@hidden
Reported-by: Stefan Priebe <address@hidden>
Tested-by: Stefan Priebe <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 0c92e0e6b64c9061f7365a2712b9055ea35b52f9
      
https://github.com/qemu/qemu/commit/0c92e0e6b64c9061f7365a2712b9055ea35b52f9
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-03-05 (Tue, 05 Mar 2013)

  Changed paths:
    M hw/scsi-disk.c

  Log Message:
  -----------
  scsi-disk: handle io_canceled uniformly and correctly

Always check it immediately after calling bdrv_acct_done, and
always do a "goto done" in case the "done" label has to free
some memory---as is the case for scsi_unmap_complete in the
previous patch.

This patch could fix problems that happen when a request is
split into multiple parts, and one of them is canceled.  Then
the next part is fired, but the HBA's cancellation callbacks have
fired already.  Whether this happens or not, depends on how the
block/ driver implements AIO cancellation.  It it does a simple
bdrv_drain_all() or similar, then it will not have a problem.
If it only cancels the given AIOCB, this scenario could happen.

Cc: address@hidden
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 4652b792f01b559e005186b703ed9b1a11cbf8e3
      
https://github.com/qemu/qemu/commit/4652b792f01b559e005186b703ed9b1a11cbf8e3
  Author: Jan Kiszka <address@hidden>
  Date:   2013-03-08 (Fri, 08 Mar 2013)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: Create link to icon bitmap for out-of-tree builds

This allows to pick up the icon when starting QEMU directly from an
out-of-tree build directory.

Signed-off-by: Jan Kiszka <address@hidden>
Reviewed-by: Stefan Weil <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: eeb29fb9aa733f97d85857c210d6580a92a1b532
      
https://github.com/qemu/qemu/commit/eeb29fb9aa733f97d85857c210d6580a92a1b532
  Author: Cole Robinson <address@hidden>
  Date:   2013-03-08 (Fri, 08 Mar 2013)

  Changed paths:
    M tests/rtc-test.c

  Log Message:
  -----------
  rtc-test: Fix test failures with recent glib

As of glib 2.35.4, glib changed its logic for ordering test cases:

https://bugzilla.gnome.org/show_bug.cgi?id=694487

This was causing failures in rtc-test. Group the reordered test
cases into their own suite, which maintains the original ordering.

CC: address@hidden
Signed-off-by: Cole Robinson <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 58427a0f42679c875b077b7adc5db36897973865
      
https://github.com/qemu/qemu/commit/58427a0f42679c875b077b7adc5db36897973865
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-03-08 (Fri, 08 Mar 2013)

  Changed paths:
    M hw/milkymist-hw.h

  Log Message:
  -----------
  lm32: remove unused function

The milkymist-minimac device in fact does not exist at all.

Signed-off-by: Paolo Bonzini <address@hidden>
Acked-by: Michael Walle <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 4bd1afbdb3a228683dafa77a9fb3093f0dfab1de
      
https://github.com/qemu/qemu/commit/4bd1afbdb3a228683dafa77a9fb3093f0dfab1de
  Author: Lei Li <address@hidden>
  Date:   2013-03-08 (Fri, 08 Mar 2013)

  Changed paths:
    M util/osdep.c

  Log Message:
  -----------
  osdep: replace setsockopt by qemu_setsockopt

Fix the compiler warning when cross build qemu-ga
for windows by using qemu_setsockopt() instead of
setsockopt().

util/osdep.c: In function 'socket_set_nodelay':
util/osdep.c:69:5: warning: passing argument 4 of 'setsockopt' from
             incompatible pointer type [enabled by default]
In file included from /home/lei/qemu_b/include/sysemu/os-win32.h:30:0,
           from /home/lei/qemu_b/include/qemu-common.h:46,
           from util/osdep.c:48:
/usr/i686-w64-mingw32/sys-root/mingw/include/winsock2.h:990:63: note:
           expected 'const char *' but argument is of type 'int *'

Signed-off-by: Lei Li <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 358689fe299c306f1d81bea57a5067d0abb56699
      
https://github.com/qemu/qemu/commit/358689fe299c306f1d81bea57a5067d0abb56699
  Author: Michal Privoznik <address@hidden>
  Date:   2013-03-08 (Fri, 08 Mar 2013)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: Require at least spice-protocol-0.12.3

As of 5a49d3e9 we assume SPICE_PORT_EVENT_BREAK to be defined.
However, it is defined not in 0.12.2 what we require now, but in
0.12.3.  Therefore in order to prevent build failure we must
adjust our minimal requirements.

Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 7f9c9d12856e65e272297a619705864d9e6346f8
      
https://github.com/qemu/qemu/commit/7f9c9d12856e65e272297a619705864d9e6346f8
  Author: Stefan Berger <address@hidden>
  Date:   2013-03-08 (Fri, 08 Mar 2013)

  Changed paths:
    M backends/rng-random.c

  Log Message:
  -----------
  rng-random: Use qemu_open / qemu_close

In the rng backend use qemu_open and qemu_close rather than POSIX
open/close.

Signed-off-by: Stefan Berger <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: d37e12a07c06b13610b7fabb6b8e009d7a759bc8
      
https://github.com/qemu/qemu/commit/d37e12a07c06b13610b7fabb6b8e009d7a759bc8
  Author: Peter Maydell <address@hidden>
  Date:   2013-03-08 (Fri, 08 Mar 2013)

  Changed paths:
    M hw/pci/pci_host.h
    M hw/piix_pci.c
    M hw/ppc/prep.c

  Log Message:
  -----------
  pci_host: Drop write-only address_space field

The address_space field of PCIHostState was only ever written, never used.
Drop it completely.

Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Andreas Färber <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: db2d5eba652ecb7420ac4ef79fc747ef391ad0d9
      
https://github.com/qemu/qemu/commit/db2d5eba652ecb7420ac4ef79fc747ef391ad0d9
  Author: Lei Li <address@hidden>
  Date:   2013-03-08 (Fri, 08 Mar 2013)

  Changed paths:
    M qemu-options.hx

  Log Message:
  -----------
  Fix the wrong description in qemu manual

Fix LP#1151450 the wrong description in qemu manual:

'qemu-system-x86_84' should be 'qemu-system-x86_64'.

Signed-off-by: Lei Li <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 7830cf78ac00643930503732834c00387e9e75ff
      
https://github.com/qemu/qemu/commit/7830cf78ac00643930503732834c00387e9e75ff
  Author: Blue Swirl <address@hidden>
  Date:   2013-03-10 (Sun, 10 Mar 2013)

  Changed paths:
    M hw/baum.c

  Log Message:
  -----------
  baum: fix build

08744c98115cfa144ed3493556024e400b2e2573 removed hw/baum.h
but did not adjust hw/baum.c, breaking build. Fix.

Signed-off-by: Blue Swirl <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 44ab9ed4f859fc6f691ba433c24d354ba93f056f
      
https://github.com/qemu/qemu/commit/44ab9ed4f859fc6f691ba433c24d354ba93f056f
  Author: Blue Swirl <address@hidden>
  Date:   2013-03-10 (Sun, 10 Mar 2013)

  Changed paths:
    M qemu-char.c

  Log Message:
  -----------
  qemu-char: fix win32 build

96c6384776d631839a9c8fe02bf135f9ba22586c did not adjust
Win32 #ifdeffery properly, breaking build in later commits. Fix.

Signed-off-by: Blue Swirl <address@hidden>
Tested-by: Igor Mitsyanko <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 6d06368d6bebad74fd16ef76a6bbea0c1cb63c9a
      
https://github.com/qemu/qemu/commit/6d06368d6bebad74fd16ef76a6bbea0c1cb63c9a
  Author: Anthony Liguori <address@hidden>
  Date:   2013-03-10 (Sun, 10 Mar 2013)

  Changed paths:
    M block/iscsi.c
    M configure
    M hw/scsi-bus.c
    M hw/scsi-disk.c
    M trace-events

  Log Message:
  -----------
  Merge remote-tracking branch 'bonzini/scsi-next' into staging

# By Paolo Bonzini (4) and Peter Lieven (2)
# Via Paolo Bonzini
* bonzini/scsi-next:
  scsi-disk: handle io_canceled uniformly and correctly
  scsi-disk: do not complete canceled UNMAP requests
  scsi: do not call scsi_read_data/scsi_write_data for a canceled request
  iscsi: look for pkg-config file too
  iscsi: add iscsi_truncate support
  iscsi: retry read, write, flush and unmap on unit attention check conditions


  Commit: 6a245c666d02210b8461952eccc17379fdeedd9f
      
https://github.com/qemu/qemu/commit/6a245c666d02210b8461952eccc17379fdeedd9f
  Author: Anthony Liguori <address@hidden>
  Date:   2013-03-10 (Sun, 10 Mar 2013)

  Changed paths:
    M backends/rng-random.c
    M configure
    M hw/milkymist-hw.h
    M hw/pci/pci_host.h
    M hw/piix_pci.c
    M hw/ppc/prep.c
    M qemu-options.hx
    M tests/rtc-test.c
    M util/osdep.c

  Log Message:
  -----------
  Merge remote-tracking branch 'stefanha/trivial-patches' into staging

# By Lei Li (2) and others
# Via Stefan Hajnoczi
* stefanha/trivial-patches:
  Fix the wrong description in qemu manual
  pci_host: Drop write-only address_space field
  rng-random: Use qemu_open / qemu_close
  configure: Require at least spice-protocol-0.12.3
  osdep: replace setsockopt by qemu_setsockopt
  lm32: remove unused function
  rtc-test: Fix test failures with recent glib
  configure: Create link to icon bitmap for out-of-tree builds


  Commit: 6e72a00f909dcd093fbdd1faa2b3c8caa1697a6c
      
https://github.com/qemu/qemu/commit/6e72a00f909dcd093fbdd1faa2b3c8caa1697a6c
  Author: Anthony Liguori <address@hidden>
  Date:   2013-03-10 (Sun, 10 Mar 2013)

  Changed paths:
    M Makefile.objs
    M Makefile.target
    M backends/Makefile.objs
    A backends/baum.c
    A backends/msmouse.c
    M configure
    M default-configs/ppc-softmmu.mak
    M default-configs/ppc64-softmmu.mak
    M default-configs/ppcemb-softmmu.mak
    A device-hotplug.c
    R hw/9p.h
    M hw/9pfs/virtio-9p-device.c
    A hw/9pfs/virtio-9p-device.h
    M hw/9pfs/virtio-9p-proxy.c
    M hw/9pfs/virtio-9p.c
    M hw/9pfs/virtio-9p.h
    M hw/Makefile.objs
    M hw/a15mpcore.c
    M hw/a9mpcore.c
    M hw/a9scu.c
    M hw/ac97.c
    M hw/acpi.c
    M hw/acpi_ich9.c
    M hw/acpi_ich9.h
    M hw/acpi_piix4.c
    M hw/adb.c
    M hw/adb.h
    M hw/adlib.c
    M hw/ads7846.c
    M hw/alpha/Makefile.objs
    A hw/alpha/dp264.c
    A hw/alpha/pci.c
    R hw/alpha_dp264.c
    R hw/alpha_pci.c
    M hw/alpha_sys.h
    M hw/alpha_typhoon.c
    R hw/an5206.c
    M hw/apb_pci.c
    M hw/apic.c
    M hw/apic_common.c
    M hw/apic_internal.h
    M hw/apm.c
    M hw/apm.h
    M hw/applesmc.c
    M hw/arm/Makefile.objs
    A hw/arm/armv7m.c
    A hw/arm/boot.c
    A hw/arm/collie.c
    A hw/arm/exynos4210.c
    A hw/arm/exynos4_boards.c
    A hw/arm/gumstix.c
    A hw/arm/highbank.c
    A hw/arm/integratorcp.c
    A hw/arm/kzm.c
    A hw/arm/mainstone.c
    A hw/arm/musicpal.c
    A hw/arm/nseries.c
    A hw/arm/omap1.c
    A hw/arm/omap2.c
    A hw/arm/omap_sx1.c
    A hw/arm/palm.c
    A hw/arm/pic_cpu.c
    A hw/arm/pxa2xx.c
    A hw/arm/pxa2xx_gpio.c
    A hw/arm/pxa2xx_pic.c
    A hw/arm/realview.c
    A hw/arm/spitz.c
    A hw/arm/stellaris.c
    A hw/arm/tosa.c
    A hw/arm/versatilepb.c
    A hw/arm/vexpress.c
    A hw/arm/xilinx_zynq.c
    A hw/arm/z2.c
    M hw/arm11mpcore.c
    R hw/arm_boot.c
    M hw/arm_gic.c
    M hw/arm_gic_common.c
    M hw/arm_gic_internal.h
    M hw/arm_l2x0.c
    M hw/arm_mptimer.c
    R hw/arm_pic.c
    M hw/arm_sysctl.c
    M hw/arm_timer.c
    R hw/armv7m.c
    M hw/armv7m_nvic.c
    R hw/axis_dev88.c
    R hw/baum.c
    M hw/bitbang_i2c.c
    M hw/bitbang_i2c.h
    M hw/blizzard.c
    M hw/boards.h
    M hw/bonito.c
    M hw/bt-hci-csr.c
    M hw/bt-hci.c
    M hw/bt-hid.c
    M hw/bt-l2cap.c
    M hw/bt-sdp.c
    M hw/bt.c
    M hw/cadence_gem.c
    M hw/cadence_ttc.c
    M hw/cadence_uart.c
    M hw/cbus.c
    M hw/ccid.h
    M hw/cdrom.c
    M hw/cirrus_vga.c
    M hw/cirrus_vga_rop.h
    R hw/collie.c
    R hw/cris-boot.c
    M hw/cris/Makefile.objs
    A hw/cris/axis_dev88.c
    A hw/cris/boot.c
    A hw/cris/pic_cpu.c
    R hw/cris_pic_cpu.c
    M hw/cs4231.c
    M hw/cs4231a.c
    M hw/cuda.c
    M hw/dataplane/ioq.c
    M hw/dataplane/virtio-blk.c
    M hw/dataplane/vring.c
    M hw/dataplane/vring.h
    M hw/debugcon.c
    M hw/debugexit.c
    M hw/dec_pci.c
    R hw/device-hotplug.c
    M hw/dma.c
    M hw/dp8393x.c
    M hw/ds1225y.c
    M hw/ds1338.c
    R hw/dummy_m68k.c
    M hw/e1000.c
    M hw/ecc.c
    M hw/eccmemctl.c
    M hw/eepro100.c
    M hw/eeprom93xx.c
    M hw/empty_slot.c
    M hw/es1370.c
    M hw/escc.c
    M hw/esp-pci.c
    M hw/esp.c
    M hw/esp.h
    M hw/etraxfs.h
    M hw/etraxfs_dma.c
    M hw/etraxfs_eth.c
    M hw/etraxfs_pic.c
    M hw/etraxfs_ser.c
    M hw/etraxfs_timer.c
    R hw/exynos4210.c
    M hw/exynos4210_combiner.c
    M hw/exynos4210_fimd.c
    M hw/exynos4210_gic.c
    M hw/exynos4210_i2c.c
    M hw/exynos4210_mct.c
    M hw/exynos4210_pmu.c
    M hw/exynos4210_pwm.c
    M hw/exynos4210_rtc.c
    M hw/exynos4210_uart.c
    R hw/exynos4_boards.c
    M hw/fdc.c
    R hw/fifo.c
    R hw/fifo.h
    M hw/fmopl.c
    M hw/framebuffer.c
    M hw/fw_cfg.c
    M hw/g364fb.c
    M hw/grackle_pci.c
    M hw/grlib.h
    M hw/grlib_apbuart.c
    M hw/grlib_gptimer.c
    M hw/grlib_irqmp.c
    M hw/gt64xxx.c
    R hw/gumstix.c
    M hw/gus.c
    M hw/gusemu_hal.c
    M hw/gusemu_mixer.c
    M hw/hda-audio.c
    M hw/heathrow_pic.c
    M hw/hid.c
    R hw/highbank.c
    M hw/hpet.c
    M hw/hw.h
    M hw/i2c.c
    M hw/i2c.h
    M hw/i386/Makefile.objs
    A hw/i386/kvmvapic.c
    A hw/i386/multiboot.c
    A hw/i386/pc.c
    A hw/i386/pc_piix.c
    A hw/i386/pc_q35.c
    A hw/i386/smbios.c
    A hw/i386/xen_domainbuild.c
    A hw/i386/xen_machine_pv.c
    M hw/i82374.c
    M hw/i82378.c
    M hw/i8254.c
    M hw/i8254.h
    M hw/i8254_common.c
    M hw/i8254_internal.h
    M hw/i8259.c
    M hw/i8259_common.c
    M hw/i8259_internal.h
    M hw/i82801b11.c
    M hw/ich9.h
    M hw/ide.h
    M hw/imx_avic.c
    M hw/imx_ccm.c
    M hw/imx_serial.c
    M hw/imx_timer.c
    R hw/integratorcp.c
    M hw/intel-hda.c
    M hw/intel-hda.h
    M hw/ioapic.c
    M hw/ioapic_common.c
    M hw/ioapic_internal.h
    M hw/ioh3420.c
    M hw/ioh3420.h
    M hw/ipack.c
    M hw/ipack.h
    M hw/ipoctal232.c
    M hw/irq.c
    M hw/isa-bus.c
    M hw/isa.h
    M hw/isa_mmio.c
    M hw/ivshmem.c
    M hw/jazz_led.c
    R hw/kvmvapic.c
    R hw/kzm.c
    M hw/lan9118.c
    M hw/lance.c
    R hw/leon3.c
    M hw/lm32/Makefile.objs
    A hw/lm32/lm32_boards.c
    A hw/lm32/milkymist.c
    R hw/lm32_boards.c
    M hw/lm32_hwsetup.h
    M hw/lm32_juart.c
    M hw/lm32_pic.c
    M hw/lm32_sys.c
    M hw/lm32_timer.c
    M hw/lm32_uart.c
    M hw/lm4549.c
    M hw/lm832x.c
    M hw/loader.c
    M hw/lpc_ich9.c
    M hw/lsi53c895a.c
    M hw/m25p80.c
    M hw/m48t59.c
    M hw/m68k/Makefile.objs
    A hw/m68k/an5206.c
    A hw/m68k/dummy_m68k.c
    A hw/m68k/mcf5206.c
    A hw/m68k/mcf5208.c
    A hw/m68k/mcf_intc.c
    M hw/mac_dbdma.c
    M hw/mac_nvram.c
    M hw/macio.c
    R hw/mainstone.c
    M hw/marvell_88w8618_audio.c
    M hw/max111x.c
    M hw/max7310.c
    M hw/mc146818rtc.c
    M hw/mc146818rtc.h
    R hw/mcf5206.c
    R hw/mcf5208.c
    M hw/mcf_fec.c
    R hw/mcf_intc.c
    M hw/mcf_uart.c
    M hw/megasas.c
    M hw/microblaze/Makefile.objs
    A hw/microblaze/boot.c
    A hw/microblaze/petalogix_ml605_mmu.c
    A hw/microblaze/petalogix_s3adsp1800_mmu.c
    A hw/microblaze/pic_cpu.c
    R hw/microblaze_boot.c
    M hw/microblaze_boot.h
    R hw/microblaze_pic_cpu.c
    M hw/milkymist-ac97.c
    M hw/milkymist-hpdmc.c
    M hw/milkymist-hw.h
    M hw/milkymist-memcard.c
    M hw/milkymist-minimac2.c
    M hw/milkymist-pfpu.c
    M hw/milkymist-softusb.c
    M hw/milkymist-sysctl.c
    M hw/milkymist-tmu2.c
    M hw/milkymist-uart.c
    M hw/milkymist-vgafb.c
    R hw/milkymist.c
    M hw/mips/Makefile.objs
    A hw/mips/addr.c
    A hw/mips/cputimer.c
    A hw/mips/mips_fulong2e.c
    A hw/mips/mips_int.c
    A hw/mips/mips_jazz.c
    A hw/mips/mips_malta.c
    A hw/mips/mips_mipssim.c
    A hw/mips/mips_r4k.c
    R hw/mips_addr.c
    R hw/mips_fulong2e.c
    R hw/mips_int.c
    R hw/mips_jazz.c
    R hw/mips_malta.c
    R hw/mips_mipssim.c
    R hw/mips_r4k.c
    R hw/mips_timer.c
    M hw/mipsnet.c
    R hw/mpc8544_guts.c
    R hw/msmouse.c
    M hw/mst_fpga.c
    R hw/multiboot.c
    R hw/musicpal.c
    M hw/nand.c
    M hw/ne2000-isa.c
    M hw/ne2000.c
    R hw/nseries.c
    R hw/omap1.c
    R hw/omap2.c
    M hw/omap_clk.c
    M hw/omap_dma.c
    M hw/omap_dss.c
    M hw/omap_gpio.c
    M hw/omap_gpmc.c
    M hw/omap_gptimer.c
    M hw/omap_i2c.c
    M hw/omap_intc.c
    M hw/omap_l4.c
    M hw/omap_lcdc.c
    M hw/omap_mmc.c
    M hw/omap_sdrc.c
    M hw/omap_spi.c
    R hw/omap_sx1.c
    M hw/omap_synctimer.c
    M hw/omap_tap.c
    M hw/omap_uart.c
    M hw/onenand.c
    M hw/opencores_eth.c
    M hw/openpic.c
    M hw/openrisc/Makefile.objs
    A hw/openrisc/cputimer.c
    A hw/openrisc/openrisc_sim.c
    A hw/openrisc/pic_cpu.c
    R hw/openrisc_pic.c
    R hw/openrisc_sim.c
    R hw/openrisc_timer.c
    R hw/palm.c
    M hw/pam.c
    M hw/parallel.c
    M hw/pc-testdev.c
    R hw/pc.c
    M hw/pc.h
    M hw/pc87312.c
    M hw/pc87312.h
    R hw/pc_piix.c
    R hw/pc_q35.c
    M hw/pc_sysfw.c
    M hw/pci/shpc.c
    M hw/pci/slotid_cap.c
    M hw/pci_bridge_dev.c
    M hw/pckbd.c
    M hw/pcnet-pci.c
    M hw/pcnet.c
    M hw/pcspk.c
    M hw/pcspk.h
    R hw/petalogix_ml605_mmu.c
    R hw/petalogix_s3adsp1800_mmu.c
    M hw/pflash_cfi01.c
    M hw/pflash_cfi02.c
    M hw/piix4.c
    M hw/piix_pci.c
    M hw/pl011.c
    M hw/pl022.c
    M hw/pl031.c
    M hw/pl041.c
    M hw/pl050.c
    M hw/pl061.c
    M hw/pl080.c
    M hw/pl110.c
    M hw/pl110_template.h
    M hw/pl181.c
    M hw/pl190.c
    M hw/pm_smbus.c
    R hw/ppc.c
    M hw/ppc/Makefile.objs
    M hw/ppc/e500-ccsr.h
    M hw/ppc/e500plat.c
    A hw/ppc/mpc8544_guts.c
    M hw/ppc/mpc8544ds.c
    A hw/ppc/ppc.c
    A hw/ppc/ppc405_boards.c
    A hw/ppc/ppc405_uc.c
    A hw/ppc/ppc440_bamboo.c
    A hw/ppc/ppc4xx_devs.c
    A hw/ppc/ppc_booke.c
    A hw/ppc/ppce500_spin.c
    A hw/ppc/spapr.c
    A hw/ppc/spapr_events.c
    A hw/ppc/spapr_hcall.c
    A hw/ppc/spapr_iommu.c
    A hw/ppc/spapr_rtas.c
    A hw/ppc/spapr_vio.c
    A hw/ppc/virtex_ml507.c
    A hw/ppc/xics.c
    M hw/ppc405.h
    R hw/ppc405_boards.c
    R hw/ppc405_uc.c
    R hw/ppc440_bamboo.c
    M hw/ppc4xx.h
    R hw/ppc4xx_devs.c
    M hw/ppc4xx_pci.c
    R hw/ppc_booke.c
    M hw/ppce500_pci.c
    R hw/ppce500_spin.c
    M hw/prep_pci.c
    M hw/ps2.c
    M hw/ptimer.c
    R hw/puv3.c
    M hw/puv3_dma.c
    M hw/puv3_gpio.c
    M hw/puv3_intc.c
    M hw/puv3_ost.c
    M hw/puv3_pm.c
    R hw/pxa2xx.c
    M hw/pxa2xx_dma.c
    R hw/pxa2xx_gpio.c
    M hw/pxa2xx_keypad.c
    M hw/pxa2xx_lcd.c
    M hw/pxa2xx_mmci.c
    M hw/pxa2xx_pcmcia.c
    R hw/pxa2xx_pic.c
    M hw/pxa2xx_timer.c
    M hw/q35.c
    M hw/q35.h
    M hw/qdev-addr.c
    R hw/qdev-monitor.c
    R hw/qdev-monitor.h
    M hw/qdev-properties-system.c
    M hw/qdev-properties.c
    M hw/qdev-properties.h
    M hw/qdev.c
    M hw/qdev.h
    M hw/qxl-logger.c
    M hw/qxl-render.c
    M hw/qxl.c
    M hw/qxl.h
    R hw/r2d.c
    M hw/rc4030.c
    R hw/realview.c
    M hw/realview_gic.c
    M hw/rtl8139.c
    M hw/s390x/event-facility.c
    M hw/s390x/s390-virtio-ccw.c
    M hw/s390x/sclp.c
    M hw/s390x/sclpconsole.c
    M hw/s390x/sclpquiesce.c
    M hw/sb16.c
    M hw/sbi.c
    M hw/scsi-bus.c
    M hw/scsi-disk.c
    M hw/scsi-generic.c
    M hw/scsi.h
    M hw/sd.c
    M hw/sdhci.c
    M hw/sdhci.h
    M hw/serial-isa.c
    M hw/serial-pci.c
    M hw/serial.c
    M hw/serial.h
    M hw/sga.c
    M hw/sh.h
    M hw/sh4/Makefile.objs
    A hw/sh4/r2d.c
    A hw/sh4/sh7750.c
    A hw/sh4/sh7750_regnames.c
    A hw/sh4/shix.c
    R hw/sh7750.c
    R hw/sh7750_regnames.c
    M hw/sh_intc.c
    M hw/sh_intc.h
    M hw/sh_pci.c
    M hw/sh_serial.c
    M hw/sh_timer.c
    R hw/shix.c
    M hw/slavio_intctl.c
    M hw/slavio_misc.c
    M hw/slavio_timer.c
    M hw/sm501.c
    R hw/smbios.c
    M hw/smbus.c
    M hw/smbus.h
    M hw/smbus_eeprom.c
    M hw/smbus_ich9.c
    M hw/smc91c111.c
    M hw/soc_dma.c
    R hw/spapr.c
    R hw/spapr_events.c
    R hw/spapr_hcall.c
    R hw/spapr_iommu.c
    M hw/spapr_llan.c
    M hw/spapr_pci.c
    R hw/spapr_rtas.c
    R hw/spapr_vio.c
    M hw/spapr_vscsi.c
    M hw/spapr_vty.c
    M hw/sparc/Makefile.objs
    A hw/sparc/leon3.c
    A hw/sparc/sun4m.c
    M hw/sparc32_dma.c
    M hw/sparc64/Makefile.objs
    A hw/sparc64/sun4u.c
    R hw/spitz.c
    M hw/ssd0303.c
    M hw/ssd0323.c
    M hw/ssi-sd.c
    M hw/ssi.c
    M hw/ssi.h
    R hw/stellaris.c
    M hw/stellaris_enet.c
    M hw/stellaris_input.c
    M hw/stream.c
    M hw/strongarm.c
    M hw/sun4c_intctl.c
    R hw/sun4m.c
    M hw/sun4m.h
    M hw/sun4m_iommu.c
    R hw/sun4u.c
    M hw/sysbus.c
    M hw/sysbus.h
    M hw/tc58128.c
    M hw/tc6393xb.c
    M hw/tcx.c
    M hw/tmp105.c
    M hw/tmp105.h
    R hw/tosa.c
    M hw/tpci200.c
    M hw/tsc2005.c
    M hw/tsc210x.c
    M hw/tusb6010.c
    M hw/twl92230.c
    M hw/unicore32/Makefile.objs
    A hw/unicore32/puv3.c
    M hw/unin_pci.c
    M hw/usb.h
    M hw/usb/dev-network.c
    M hw/versatile_i2c.c
    M hw/versatile_pci.c
    R hw/versatilepb.c
    R hw/vexpress.c
    M hw/vfio_pci.c
    M hw/vga-isa-mm.c
    M hw/vga-isa.c
    M hw/vga-pci.c
    M hw/vga.c
    M hw/vhost.c
    M hw/vhost_net.c
    R hw/virtex_ml507.c
    M hw/virtio-balloon.c
    M hw/virtio-balloon.h
    M hw/virtio-blk.c
    M hw/virtio-blk.h
    M hw/virtio-bus.c
    M hw/virtio-bus.h
    M hw/virtio-console.c
    M hw/virtio-net.c
    M hw/virtio-net.h
    M hw/virtio-pci.c
    M hw/virtio-pci.h
    M hw/virtio-rng.c
    M hw/virtio-scsi.c
    M hw/virtio-scsi.h
    M hw/virtio-serial-bus.c
    M hw/virtio-serial.h
    M hw/virtio.c
    M hw/virtio.h
    M hw/vmmouse.c
    M hw/vmport.c
    M hw/vmware_vga.c
    M hw/vt82c686.c
    M hw/wdt_i6300esb.c
    M hw/wdt_ib700.c
    M hw/wm8750.c
    M hw/xen-host-pci-device.c
    M hw/xen-host-pci-device.h
    M hw/xen_apic.c
    M hw/xen_backend.c
    M hw/xen_backend.h
    M hw/xen_common.h
    M hw/xen_console.c
    M hw/xen_devconfig.c
    M hw/xen_disk.c
    R hw/xen_domainbuild.c
    M hw/xen_domainbuild.h
    R hw/xen_machine_pv.c
    M hw/xen_nic.c
    M hw/xen_platform.c
    M hw/xen_pt.c
    M hw/xen_pt.h
    M hw/xen_pt_config_init.c
    M hw/xen_pt_msi.c
    M hw/xenfb.c
    M hw/xgmac.c
    R hw/xics.c
    M hw/xilinx.h
    M hw/xilinx_axidma.c
    M hw/xilinx_axienet.c
    M hw/xilinx_ethlite.c
    M hw/xilinx_intc.c
    M hw/xilinx_spi.c
    M hw/xilinx_spips.c
    M hw/xilinx_timer.c
    M hw/xilinx_uartlite.c
    R hw/xilinx_zynq.c
    M hw/xio3130_downstream.c
    M hw/xio3130_downstream.h
    M hw/xio3130_upstream.c
    M hw/xio3130_upstream.h
    M hw/xtensa/Makefile.objs
    A hw/xtensa/pic_cpu.c
    A hw/xtensa/xtensa_lx60.c
    A hw/xtensa/xtensa_sim.c
    R hw/xtensa_lx60.c
    R hw/xtensa_pic.c
    R hw/xtensa_sim.c
    R hw/z2.c
    M hw/zaurus.c
    M hw/zynq_slcr.c
    M include/migration/vmstate.h
    A include/monitor/qdev.h
    A include/qemu/fifo8.h
    M monitor.c
    A qdev-monitor.c
    M stubs/Makefile.objs
    A stubs/pci-drive-hot-add.c
    M util/Makefile.objs
    A util/fifo8.c
    M util/qemu-config.c
    M vl.c

  Log Message:
  -----------
  Merge remote-tracking branch 'bonzini/hw-dirs' into staging

* bonzini/hw-dirs:
  sh: move files referencing CPU to hw/sh4/
  ppc: move more files to hw/ppc
  ppc: move files referencing CPU to hw/ppc/
  m68k: move files referencing CPU to hw/m68k/
  i386: move files referencing CPU to hw/i386/
  arm: move files referencing CPU to hw/arm/
  hw: move boards and other isolated files to hw/ARCH
  ppc: express FDT dependency of pSeries and e500 boards via default-configs/
  build: always link device_tree.o into emulators if libfdt available
  hw: include hw header files with full paths
  ppc: do not use ../ in include files
  vt82c686: vt82c686 is not a PCI host bridge
  virtio-9p: remove PCI dependencies from hw/9pfs/
  virtio-9p: use CONFIG_VIRTFS, not CONFIG_LINUX
  hw: move device-hotplug.o to toplevel, compile it once
  hw: move qdev-monitor.o to toplevel directory
  hw: move fifo.[ch] to libqemuutil
  hw: move char backends to backends/

Conflicts:
        backends/baum.c
        backends/msmouse.c
        hw/a15mpcore.c
        hw/arm/Makefile.objs
        hw/arm/pic_cpu.c
        hw/dataplane/event-poll.c
        hw/dataplane/virtio-blk.c
        include/char/baum.h
        include/char/msmouse.h
        qemu-char.c
        vl.c

Resolve conflicts caused by header movements.

Signed-off-by: Anthony Liguori <address@hidden>


  Commit: fa3889162ff724d09eb6b6bd06ba54769100a77f
      
https://github.com/qemu/qemu/commit/fa3889162ff724d09eb6b6bd06ba54769100a77f
  Author: Anthony Liguori <address@hidden>
  Date:   2013-03-10 (Sun, 10 Mar 2013)

  Changed paths:
    M MAINTAINERS
    M Makefile
    M hw/elf_ops.h
    M hw/loader.c
    M hw/loader.h
    M hw/mac_dbdma.c
    M hw/ppc/mac_newworld.c
    M hw/ppc/spapr.c
    M hw/ppc/spapr_hcall.c
    M hw/s390x/css.c
    M hw/s390x/s390-virtio-bus.c
    M hw/s390x/virtio-ccw.c
    M hw/spapr_llan.c
    M include/exec/gen-icount.h
    M scripts/make_device_config.sh
    M target-ppc/Makefile.objs
    A target-ppc/cpu-models.c
    A target-ppc/cpu-models.h
    M target-ppc/cpu-qom.h
    M target-ppc/cpu.h
    M target-ppc/kvm.c
    M target-ppc/translate_init.c
    M target-s390x/cpu.h
    M target-s390x/ioinst.c
    M target-s390x/kvm.c

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into staging

* origin/master: (75 commits)
  tcg: Don't make exitreq flag a local temporary
  Makefile: Add subdir dependency on config-devices-all.mak
  make_device_config.sh: Emit dependency file to directory where included
  Revert "make_device_config.sh: Fix target path in generated dependency file"
  s390/virtio-ccw: remove redundant call to blockdev_mark_auto_del
  s390/css: Fix subchannel detection
  Allow virtio-net features for legacy s390 virtio bus
  s390: virtio-ccw maintainer
  s390: simplify kvm cpu init
  pseries: Add compatible property to root of device tree
  target-ppc: Move CPU aliases out of translate_init.c
  target-ppc: Report CPU aliases for QMP
  target-ppc: List alias names alongside CPU models
  target-ppc: Make host CPU a subclass of the host's CPU model
  PPC: xnu kernel expects FLUSH to be cleared on STOP
  PPC: Fix dma interrupt
  target-ppc: Fix PPC_DUMP_SPR_ACCESS build
  target-ppc: Synchronize FPU state with KVM
  target-ppc: Add mechanism for synchronizing SPRs with KVM
  Save memory allocation in the elf loader
  ...


Compare: https://github.com/qemu/qemu/compare/a4960ef34829...fa3889162ff7

reply via email to

[Prev in Thread] Current Thread [Next in Thread]