Permalink
Switch branches/tags
Commits on Jan 7, 2016
  1. petalogix-ml605: Set the MicroBlaze CPU version to 8.10.a

    Edgar E. Iglesias committed Nov 13, 2015
    Set the MicroBlaze CPU version to 8.10.a avoiding a runtime
    warning due to an unset CPU version.
    
    Reviewed-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
    Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
  2. s3adsp1800: Set the MicroBlaze CPU version to 7.10.d

    Edgar E. Iglesias committed Nov 13, 2015
    Set the MicroBlaze CPU version to 7.10.d avoiding a runtime
    warning due to an unset CPU version.
    
    Reviewed-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
    Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
  3. Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-signed…

    pm215 committed Jan 7, 2016
    …' into staging
    
    qemu-sparc update
    
    # gpg: Signature made Thu 07 Jan 2016 13:20:13 GMT using RSA key ID AE0F321F
    # gpg: Good signature from "Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>"
    
    * remotes/mcayland/tags/qemu-sparc-signed:
      target-sparc: implement NPT timer bit
      sun4u: split NPT and INT_DIS accesses between timer and compare registers
      sun4u: split out NPT and INT_DIS into separate CPUTimer fields
    
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
  4. target-sparc: implement NPT timer bit

    mcayland committed Nov 8, 2015
    If the NPT bit is set in the timer register, all non-supervisor read accesses
    to the register should fail with a privilege exception.
    
    Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
    Reviewed-By: Artyom Tarasenko <atar4qemu@gmail.com>
    Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  5. sun4u: split NPT and INT_DIS accesses between timer and compare regis…

    mcayland committed Nov 8, 2015
    …ters
    
    Accesses to the timer register high bit should only set NPT, whilst accesses
    to the timer compare register high bit should only set INT_DIS. This fixes
    issues with the timer being unexpectedly disabled whilst trying to boot
    FreeBSD SPARC64.
    
    Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
    Reviewed-By: Artyom Tarasenko <atar4qemu@gmail.com>
    Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  6. sun4u: split out NPT and INT_DIS into separate CPUTimer fields

    mcayland committed Nov 8, 2015
    Currently there is confusion between use of these bits for the timer and timer
    compare registers (while they both have the same value, the behaviour is
    different). Split into two separate CPUTimer fields so we can always reference
    the correct value.
    
    Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
    Reviewed-By: Artyom Tarasenko <atar4qemu@gmail.com>
    Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  7. Merge remote-tracking branch 'remotes/kraxel/tags/pull-seabios-201601…

    pm215 committed Jan 7, 2016
    …05-1' into staging
    
    seabios: update to release 1.9.0
    
    # gpg: Signature made Tue 05 Jan 2016 12:07:22 GMT using RSA key ID D3E87138
    # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
    # gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
    # gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
    
    * remotes/kraxel/tags/pull-seabios-20160105-1:
      seabios: update binaries to release 1.9.0
      seabios: stop updating aml files
      seabios: update 128k bios config
      seabios: use new EXTRAVERSION to tag qemu builds
      seabios: update submodule to release 1.9.0
    
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
  8. Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-requ…

    pm215 committed Jan 7, 2016
    …est' into staging
    
    # gpg: Signature made Thu 07 Jan 2016 09:13:22 GMT using RSA key ID 81AB73C8
    # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
    # gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
    
    * remotes/stefanha/tags/tracing-pull-request:
      trace: add make dependencies on tracetool source
      trace: fix make foo-timestamp rules
      trace: fix PRIx64 constants in trace-events
      trace: reflect the file name change
    
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
  9. trace: add make dependencies on tracetool source

    Stefan Hajnoczi committed Oct 28, 2015
    Patches that change tracetool can break the build if old build output
    files are lying around.
    
    This happens because the Makefile does not specify dependencies on
    tracetool.  The build will use old object files that do not match the
    current source code.
    
    Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
  10. trace: fix make foo-timestamp rules

    Stefan Hajnoczi committed Oct 28, 2015
    The Makefile uses intermediate timestamp files to avoid rebuilding if
    tracetool output is unchanged.
    
    Timestamps are implemented incorrectly.  This was fixed for rules.mak in
    commit 4b25966 ("rules.mak: cleanup
    config generation rules") but never fixed in trace/Makefile.objs.
    
    The problem with the old timestamp implementation was that make doesn't
    notice the updated file modification time until the next time it is run.
    It was necessary to run make twice in a row to achieve a full rebuild.
    
    Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
  11. trace: fix PRIx64 constants in trace-events

    mcayland committed with Stefan Hajnoczi Dec 19, 2015
    Commit c8ee0a4 introduced new events containing PRIx64 constants without
    including the % prefix in the preceding string. This results in a compile
    error during build if --enable-trace-backends is passed to configure.
    
    Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
    Message-id: 1450566522-6003-1-git-send-email-mark.cave-ayland@ilande.co.uk
    Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
  12. trace: reflect the file name change

    qhjindev committed with Stefan Hajnoczi Dec 11, 2015
    Some functions was moved from block.c to block/io.c, so the trace-events file should reflect that change.
    
    Signed-off-by: Qinghua Jin <qhjin_dev@163.com>
    Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Commits on Jan 5, 2016
  1. seabios: update binaries to release 1.9.0

    kraxel committed Dec 17, 2015
    Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
  2. seabios: stop updating aml files

    kraxel committed Dec 17, 2015
    ACPI aml files traditionally have been managed in the seabios repo.
    In qemu version 2.0 we've switched over to have qemu generate the
    acpi tables and provide them to the firmware via fw_cfg.
    
    The old aml files are still there and used for old machine types.
    Well, actually the q35 file only, the piix4 version is compiled into
    seabios (unless built with CONFIG_ACPI_DSDT=n) and is there for
    reference only.
    
    The aml files havn't been touched for a long time, and given that
    new features requiring acpi changes are typically only added to new
    machine types this is unlikely to change in the future.  So stop
    updating them.
    
    That allows to cleanup things a bit on the seabios side in the future.
    
    Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
  3. seabios: update 128k bios config

    kraxel committed Dec 17, 2015
    Turn off OHCI + TPM support to keep the size below 128k.
    
    Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
  4. seabios: use new EXTRAVERSION to tag qemu builds

    kraxel committed Dec 17, 2015
    Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
  5. seabios: update submodule to release 1.9.0

    kraxel committed Dec 17, 2015
    Highlights / user visible changes in seabios:
     * boot menu key is ESC now.
     * virtio 1.0 support.
     * sdcard support.
     * fw_cfg dma suport.
     * usual share of bugfixes ;)
    
    In vgabios:
     * Emulates leal instruction.  Works around a bug in old x86emu versions,
       which makes old xorg vesa drivers work (RHEL-5 for example).
    
    full shortlog rel-1.8.2..rel-1.9.0
    ----------------------------------
    
    Ameya Palande (1):
          x86: add barrier to read{b,w,l} and write{b,w,l} functions
    
    Andreas Färber (1):
          checkrom: Fix typo in error message
    
    Chen Fan (1):
          pci: enable SERR# for error forwarding in bridge control register
    
    Gerd Hoffmann (28):
          vga: simplify vga builds
          vga: rework virtio-vga support
          vga: add virtio-vga to kconfig
          pci: allow to loop over capabilities
          virtio: run drivers in 32bit mode
          virtio: add struct vp_device
          virtio: pass struct pci_device to vp_init_simple
          virtio: add version 1.0 structs and #defines
          virtio: add version 0.9.5 struct
          virtio: find version 1.0 virtio capabilities
          virtio: create vp_cap struct for legacy bar
          virtio: add read/write functions and macros
          virtio: make features 64bit, support version 1.0 features
          virtio: add version 1.0 support to vp_{get,set}_status
          virtio: add version 1.0 support to vp_get_isr
          virtio: add version 1.0 support to vp_reset
          virtio: add version 1.0 support to vp_notify
          virtio: remove unused vp_del_vq
          virtio: add version 1.0 support to vp_find_vq
          virtio-scsi: fix initialization for version 1.0
          virtio-blk: fix initialization for version 1.0
          virtio: use version 1.0 if available (flip the big switch)
          virtio: also probe version 1.0 pci ids
          virtio: legacy cleanup
          virtio-blk: 32bit cleanup
          virtio-scsi: 32bit cleanup
          virtio-ring: 32bit cleanup
          virtio-pci: use high memory for rings
    
    Julius Werner (1):
          xhci: Count new Max Scratchpad Bufs bits from XHCI 1.1
    
    Kevin O'Connor (126):
          docs: add page for SeaVGABIOS
          docs: Add page describing the patch contribution process
          docs: Add page on available CBFS/fw_cfg runtime config files
          docs: Prefer triple backticks to multiple lines with single backticks
          smp: Fix smp race introduced in 0673b787
          docs: Note release date of 1.8.1
          vgabios: On bda_save_restore() the saved vbe_mode also has flags in it
          vgabios: Don't use extra stack if it appears a modern OS is in use
          docs: Clarify that pci-optionrom-exec doesn't apply to roms in cbfs
          checkstack: Replace function information tuple with class
          checkstack: Simplify yield calculations
          checkstack: Prefer passing "function" class instead of function address
          smbios: Use integer signature instead of string signature
          vgabios: Don't use "smsww" instruction - it confuses x86emu
          vgabios: Add config option for assembler fixups
          vgabios: Emulate "leal" instruction
          checkstack: Minor - continue if not a regular asm line
          Don't forward declare functions with "inline" in headers
          build: Support "make VERSION=xyz" to override the default build version
          tcg: Use seabios setup()/prepboot() calling convention for tcg
          build: CONFIG_VGA_FIXUP_ASM should depend on CONFIG_BUILD_VGABIOS
          bootorder: Update "extra pci root" buses bootorder format to match qemu
          Make sure all code checks for malloc failures
          docs: Note release date of 1.8.2
          block: Split process_op() command dispatch up into multiple functions
          block: Introduce default_process_op() with common command handling codes
          block: Route scsi style commands through 'struct disk_op_s'
          blockcmd: Introduce scsi_fill_cmd()
          ata: Handle ATA ATAPI drives directly via 'struct disk_op_s' requests
          ahci: Handle AHCI ATAPI drives directly via 'struct disk_op_s' requests
          usb-msc: Handle USB drives directly via 'struct disk_op_s' requests
          usb-uas: Handle USB drives directly via 'struct disk_op_s' requests
          lsi-scsi: Handle LSI drives directly via 'struct disk_op_s' requests
          esp-scsi: Handle ESP drives directly via 'struct disk_op_s' requests
          megasas: Handle Megasas drives directly via 'struct disk_op_s' requests
          virtio-scsi: Handle virtio drives directly via 'struct disk_op_s' requests
          pvscsi: Move pvscsi_fill_req() code into pvscsi_cmd()
          pvscsi: Handle pvscsi drives directly via 'struct disk_op_s' requests
          blockcmd: Remove unused scsi_process_op() and cdb_cmd_data()
          blockcmd: Convert cdb_is_read() to scsi_is_read()
          block: Rename process_XXX_op() functions to XXX_process_op()
          coreboot: Try to auto-detect if the CBFS anchor pointer is a relative pointer
          ps2: Support mode for polling the PS2 port instead of using irqs
          ata: Make sure "chanid" is relative to PCI device for bootorder file
          Don't enable interrupts prior to IVT and PIC setup
          ps2: Don't wait 100ms to discard possible extra reset receive byte
          timer: Delay timestamp counter init until after pmtimer is probed
          timer: Add CONFIG_TSC_TIMER build option to disable the CPU TSC timer
          ramdisk: Allow ramdisk support (CONFIG_FLASH_FLOPPY) under QEMU
          Minor - move declaration of CDRom_locks to code that uses it
          smm: ignore bits 16,18-31 of SMM revision ID at runtime too
          vgafb: Minor - move gfx_common() variables outside of switch statement
          sdcard: Check if card is present before sending commands to card
          sdcard: Implement controller frequency setting according to sdhci spec
          sdcard: Make sure controller support 3.3V before enabling it
          sdcard: Set timeout control register during init (to max allowed timeout)
          sdcard: Improve SD card initialization command sequence
          sdcard: Add proper delays during card power up
          mptable: Don't create mptable if it is very large
          optionroms: Don't run option rom on PCI bar if CBFS/fw_cfg version exists
          edd: Pass the segment/offset from int 1348 calls using a 'struct segoff_s'
          edd: Reduce parameters to fill_generic_edd()
          Move CanInterrupt check to check_irqs()
          Call cpu_relax() if yielding prior to interrupts being enabled
          sdcard: Fix typo - use sdcard_pio() instead of sdcard_pio_app()
          sdcard: Fill command bits according to spec
          sdcard: Support SDHCI v3.00 spec clock setting
          sdcard: Move power setup to new function sdcard_set_power()
          sdcard: Power controller up to maximum voltage supported
          sdcard: Power down controller on failure
          sdcard: The card should never be in a busy state at start of sdcard_pio()
          sdcard: Implement timeout on every block read in sdcard_pio_transfer()
          sdcard: Rename waitw() to sdcard_waitw() and simplify
          sdcard: Perform a controller reset at start of init
          sdcard: Check for error events during sdcard_pio()
          sdcard: Initial support for MMC cards
          sdcard: Allow the sdcard driver to run on real hardware
          rtc: Support disabling the RTC timer irq support
          Add minimal support for machines without hardware interrupts
          ps2: Eliminate "etc/ps2-poll-only"; use CONFIG_HARDWARE_IRQ instead
          sdcard: Allow sdcard addresses to be specified in CBFS files
          xhci: Minor - add USB port type comments to xhci_hub_reset()
          docs: Don't use an add-symbol-file offset when describing gdb debugging
          rtc: Disable NMI in rtc_mask()
          sdcard: Move sdcard_set_frequency()/sdcard_set_power() in sdcard.c
          sdcard: Move frequency setting into sdcard_card_setup()
          sdcard: Move drive registration to sdcard_card_setup()
          sdcard: Turn card_type into a bitmap and store if card is MMC type
          sdcard: Display sdcard product name in boot menu
          sdcard: Obtain card capacity and report it on the boot menu
          megasas: Use outl() on MFI_IDB register
          minor - correct spelling error in comment
          Simplify transition16/32 assembler code
          docs: Minor - add "code relocation" link to "Execution and code flow" document
          Unify smm/sloppy variants of call32_prep/post and call16_helper
          Rename Call32Data to Call16Data
          Unify inline assembler in variants of call16 functions
          Unify call32_sloppy() and call32()
          Use transition32_nmi_off from call32() and call16_back()
          Consolidate code16*() functions
          Always enable caching on transition32; backup/restore cr0 on call32
          e820: Introduce e820_remove() and avoid exporting E820_HOLE
          e820: Rename memmap.c to e820map.c and use consistent "e820_" prefix
          e820: Update debugging messages to report 64bit values
          virtio: Simplify vring alignment code
          virtio: Move standard definitions from virtio-ring.h to standard headers
          malloc: Use consistent naming for internal low-level "alloc" functions
          malloc: Introduce common helper alloc_new_detail()
          malloc: Add warning if free() called on invalid memory
          malloc: Don't mix virtual and physical addresses
          memmap: Introduce SYMBOL() macro to access linker script symbols
          build: Rework version generation; don't allow make version override
          build: Report gcc and binutils versions in debug log
          build: Generate "reproducible" version strings on "clean" builds
          stacks: Use macro wrappers for call32() and stack_hop_back()
          malloc: Rename csm_malloc_preinit() to malloc_csm_preinit()
          build: Be more permissive in buildversion.py tool version scan
          docs: Document 'make EXTRAVERSION=xyz' and scripts/tarball.sh
          build: Allow official tarball builds to be considered "clean"
          coreboot: Minor - avoid K&R style function declaration
          biostables: Minor - fix incorrect indentation
          virtio: Minor - replace tab characters with space
          docs: Minor - replace seavgabios text in Build_overview.md with link
          buildversion: Avoid subprocess.check_output() as that requires python2.7
          buildversion: Add debugging messages
          docs: Note v1.9.0 release
    
    Kyösti Mälkki (1):
          PCI SDHCI driver: Fix base address
    
    Magnus Granberg (1):
          build: use -fstack-check=no when available
    
    Marc Marí (1):
          Add QEMU fw_cfg DMA interface
    
    Marcel Apfelbaum (2):
          fw/pci: scan all buses if extraroots romfile is present
          fw/pci: map memory and IO regions for multiple pci root buses
    
    Paolo Bonzini (4):
          boot.c: delay exiting boot if menu key is ESC
          boot: switch default menu key to ESC
          smm: ignore bits 16,18-31 of SMM revision ID
          smm: fix outl argument order
    
    Paulo Alcantara (1):
          ich9: initialise RCBA register through LPC interface
    
    Quan Xu (1):
          make SeaBios compatible with Xen vTPM.
    
    Stefan Berger (9):
          Add an implementation of a TPM TIS driver
          Implementation of the TCG BIOS extensions
          Support for BIOS interrupt handler
          Add 'measurement' code to the BIOS
          tpm: Introduce a #define for command tag
          tpm: Be consistent with array sizes in tcgbios.c
          tpm: clean up parameters to build_and_send_cmd
          tpm: Clean up in tcgbios.h
          tpm: Move call to tpm_option_rom into init_optionrom
    
    Stefan Weil (2):
          megasas: Fix outw, outl argument order
          Fix typos found by codespell
    
    Vladimir Serbinenko (3):
          ahci: Ignore max_ports.
          Link rom.o with -N option.
          Add multiboot support.
    
    tpearson@raptorengineeringinc.com (1):
          Add an option to only execute option ROMs contained in CBFS
    
    Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Commits on Dec 23, 2015
  1. Merge remote-tracking branch 'remotes/berrange/tags/pull-crypto-fixes…

    pm215 committed Dec 23, 2015
    …-2015-12-23-1' into staging
    
    Merge misc crypto changes & fixes
    
    # gpg: Signature made Wed 23 Dec 2015 11:11:54 GMT using RSA key ID 15104FDF
    # gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
    # gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>"
    
    * remotes/berrange/tags/pull-crypto-fixes-2015-12-23-1:
      crypto: fix transposed arguments in cipher error message
      crypto: ensure qapi/crypto.json is listed in qapi-modules
      crypto: move QCryptoCipherAlgorithm/Mode enum definitions into QAPI
      crypto: move QCryptoHashAlgorithm enum definition into QAPI
      crypto: add ability to query hash digest len
      crypto: add additional query accessors for cipher instances
    
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
  2. Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into s…

    pm215 committed Dec 23, 2015
    …taging
    
    Fix a 2.5 regression.
    
    # gpg: Signature made Wed 23 Dec 2015 10:57:00 GMT using DSA key ID 0101DBC2
    # gpg: Good signature from "Greg Kurz <gkurz@fr.ibm.com>"
    # gpg:                 aka "Greg Kurz <groug@free.fr>"
    # gpg:                 aka "Greg Kurz <gkurz@linux.vnet.ibm.com>"
    # gpg:                 aka "Gregory Kurz (Groug) <groug@free.fr>"
    # gpg:                 aka "Gregory Kurz (Cimai Technology) <gkurz@cimai.com>"
    # gpg:                 aka "Gregory Kurz (Meiosys Technology) <gkurz@meiosys.com>"
    # gpg: WARNING: This key is not certified with a trusted signature!
    # gpg:          There is no indication that the signature belongs to the owner.
    # Primary key fingerprint: 2BD4 3B44 535E C0A7 9894  DBA2 02FC 3AEB 0101 DBC2
    
    * remotes/gkurz/tags/for-upstream:
      virtio-9p: use accessor to get thread_pool
    
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
  3. Merge remote-tracking branch 'remotes/berrange/tags/pull-io-fixes-201…

    pm215 committed Dec 23, 2015
    …5-12-23-1' into staging
    
    Merge misc I/O channel fixes
    
    # gpg: Signature made Wed 23 Dec 2015 10:54:52 GMT using RSA key ID 15104FDF
    # gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
    # gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>"
    
    * remotes/berrange/tags/pull-io-fixes-2015-12-23-1:
      io: fix stack allocation when sending of file descriptors
      io: fix setting of QIO_CHANNEL_FEATURE_FD_PASS on server connections
      io: bind to loopback IP addrs in test suite
    
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
  4. Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into sta…

    pm215 committed Dec 23, 2015
    …ging
    
    acpi, pc features
    
    pxb support for q35
    nvdimm support
    most of ipmi support
    part of DSDT rewrite
    
    Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
    
    # gpg: Signature made Tue 22 Dec 2015 16:47:18 GMT using RSA key ID D28D5469
    # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
    # gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"
    
    * remotes/mst/tags/for_upstream: (55 commits)
      acpi: extend aml_and() to accept target argument
      acpi: extend aml_or() to accept target argument
      acpi add aml_dma()
      acpi: add aml_to_buffer()
      acpi: add aml_to_hexstring()
      acpi: extend aml_field() to support LockRule
      acpi: add aml_lgreater()
      acpi: add aml_lor()
      acpi: add aml_sleep()
      acpi: add aml_alias()
      acpi: extend aml_shiftright() to accept target argument
      acpi: add aml_to_integer()
      acpi: add aml_call0() helper
      acpi: add aml_decrement() and aml_subtract()
      acpi: extend aml_add() to accept target argument
      acpi: aml: add helper for Opcode Arg2 Arg2 [Dst] AML pattern
      acpi: add aml_create_qword_field()
      acpi: add aml_mutex(), aml_acquire(), aml_release()
      acpi: add aml_lgreater_equal()
      acpi: add aml_sizeof
      ...
    
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
  5. Merge remote-tracking branch 'remotes/sstabellini/tags/xen-2015-12-22…

    pm215 committed Dec 23, 2015
    …' into staging
    
    Xen 2015/12/22
    
    # gpg: Signature made Tue 22 Dec 2015 16:17:57 GMT using RSA key ID 70E1AE90
    # gpg: Good signature from "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"
    
    * remotes/sstabellini/tags/xen-2015-12-22:
      xen_disk: treat "vhd" as "vpc"
      xen/pass-through: correctly deal with RW1C bits
      xen/MSI-X: really enforce alignment
      xen/MSI-X: latch MSI-X table writes
    
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
  6. crypto: fix transposed arguments in cipher error message

    berrange committed Nov 20, 2015
    When reporting an incorrect key length for a cipher, we
    mixed up the actual vs expected arguments.
    
    Reviewed-by: Eric Blake <eblake@redhat.com>
    Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
  7. crypto: ensure qapi/crypto.json is listed in qapi-modules

    berrange committed Nov 19, 2015
    The rebuild of qapi-types.c/h is not correctly triggered
    when qapi/crypto.json is changed because it was missing
    from the list of files in the qapi-modules variable.
    
    Reviewed-by: Eric Blake <eblake@redhat.com>
    Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
  8. crypto: move QCryptoCipherAlgorithm/Mode enum definitions into QAPI

    berrange committed Nov 19, 2015
    The QCryptoCipherAlgorithm and QCryptoCipherMode enums are
    defined in the crypto/cipher.h header. In the future some
    QAPI types will want to reference the hash enums, so move
    the enum definition into QAPI too.
    
    Reviewed-by: Eric Blake <eblake@redhat.com>
    Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
  9. crypto: move QCryptoHashAlgorithm enum definition into QAPI

    berrange committed Nov 19, 2015
    The QCryptoHashAlgorithm enum is defined in the crypto/hash.h
    header. In the future some QAPI types will want to reference
    the hash enums, so move the enum definition into QAPI too.
    
    Reviewed-by: Eric Blake <eblake@redhat.com>
    Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
  10. crypto: add ability to query hash digest len

    berrange committed Oct 23, 2015
    Add a qcrypto_hash_digest_len() method which allows querying of
    the raw digest size for a given hash algorithm.
    
    Reviewed-by: Eric Blake <eblake@redhat.com>
    Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
  11. crypto: add additional query accessors for cipher instances

    berrange committed Oct 23, 2015
    Adds new methods to allow querying the length of the cipher
    key, block size and initialization vectors.
    
    Reviewed-by: Eric Blake <eblake@redhat.com>
    Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
  12. io: fix stack allocation when sending of file descriptors

    berrange committed Dec 21, 2015
    When sending file descriptors over a socket, we have to
    allocate a data buffer to hold the FDs in the scmsghdr.
    Unfortunately we allocated the buffer on the stack inside
    an if () {} block, but called sendmsg() outside the block.
    So the stack bytes holding the FDs were liable to be
    overwritten with other data. By luck this was not a problem
    when sending 1 FD, but if sending 2 or more then it would
    fail.
    
    The fix is to simply move the variables outside the nested
    'if' block. To keep valgrind quiet we also zero-initialize
    the 'control' buffer.
    
    Reviewed-by: Eric Blake <eblake@redhat.com>
    Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
  13. virtio-9p: use accessor to get thread_pool

    gkurz committed Dec 23, 2015
    The aio_context_new() function does not allocate a thread pool. This is
    deferred to the first call to the aio_get_thread_pool() accessor. It is
    hence forbidden to access the thread_pool field directly, as it may be
    NULL. The accessor *must* be used always.
    
    Fixes: ebac120
    Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
    Tested-by: Michael Tokarev <mjt@tls.msk.ru>
    Cc: qemu-stable@nongnu.org
    Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com>
Commits on Dec 22, 2015
  1. io: fix setting of QIO_CHANNEL_FEATURE_FD_PASS on server connections

    berrange committed Dec 21, 2015
    The QIO_CHANNEL_FEATURE_FD_PASS feature flag is set in the
    qio_channel_socket_set_fd() method, however, this only deals
    with client side connections.
    
    To ensure server side connections also have the feature flag
    set, we must set it in qio_channel_socket_accept() too. This
    also highlighted a typo fix where the code updated the
    sockaddr struct in the wrong object instance.
    
    Reviewed-by: Eric Blake <eblake@redhat.com>
    Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
  2. io: bind to loopback IP addrs in test suite

    berrange committed Dec 22, 2015
    The test suite currently binds to 0.0.0.0 or ::, which covers
    all interfaces of the machine. It is bad practice for test
    suite to open publically accessible ports on a machine, so
    switch to use loopback addrs 127.0.0.1 or ::1.
    
    Reported-by: Peter Maydell <peter.maydell@linaro.org>
    Reviewed-by: Eric Blake <eblake@redhat.com>
    Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
  3. acpi: extend aml_and() to accept target argument

    Igor Mammedov committed with mstsirkin Dec 9, 2015
    Signed-off-by: Igor Mammedov <imammedo@redhat.com>
    Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
    Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
  4. acpi: extend aml_or() to accept target argument

    Igor Mammedov committed with mstsirkin Dec 9, 2015
    Signed-off-by: Igor Mammedov <imammedo@redhat.com>
    Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
    Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
    Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
  5. acpi add aml_dma()

    Igor Mammedov committed with mstsirkin Dec 9, 2015
    Signed-off-by: Igor Mammedov <imammedo@redhat.com>
    Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
    Signed-off-by: Michael S. Tsirkin <mst@redhat.com>