1. 10 10月, 2013 1 次提交
    • M
      xen_disk: mark ioreq as mapped before unmapping in error case · a76f48e5
      Matthew Daley 提交于
      Commit 4472beae modified the semantics of ioreq_{un,}map so that they are
      idempotent if called when they're not needed (ie., twice in a row). However,
      it neglected to handle the case where batch mapping is not being used (the
      default), and one of the grants fails to map. In this case, ioreq_unmap will
      be called to unwind and unmap any mappings already performed, but ioreq_unmap
      simply returns due to the aforementioned change (the ioreq has not already
      been marked as mapped).
      
      The frontend user can therefore force xen_disk to leak grant mappings, a
      per-domain limited resource.
      
      Fix by marking the ioreq as mapped before calling ioreq_unmap in this
      situation.
      Signed-off-by: NMatthew Daley <mattjd@gmail.com>
      Signed-off-by: NStefano Stabellini <stefano.stabellini@eu.citrix.com>
      a76f48e5
  2. 01 10月, 2013 9 次提交
    • A
      Merge remote-tracking branch 'kraxel/seabios-1.7.3.2' into staging · a684f3cf
      Anthony Liguori 提交于
      # By Gerd Hoffmann
      # Via Gerd Hoffmann
      * kraxel/seabios-1.7.3.2:
        update seabios from 1.7.2.2 to 1.7.3.2
      
      Message-id: 1380533055-24960-1-git-send-email-kraxel@redhat.com
      a684f3cf
    • A
      Merge remote-tracking branch 'kraxel/roms.1' into staging · 349cd52c
      Anthony Liguori 提交于
      # By Gerd Hoffmann
      # Via Gerd Hoffmann
      * kraxel/roms.1:
        roms: add support for building sgabios
        roms: enable parallel seabios / seavgabios builds
        roms: enable ipxe cross builds
        roms: add rules to build slof
        roms: rewrite scripts/refresh-pxe-roms.sh
        roms: parallel ipxe builds
        roms: build lgplvgabios isavga variant
        roms: enable parallel builds for 'make lgplvgabios'
        roms: add 'make clean'
      
      Message-id: 1380532378-22138-1-git-send-email-kraxel@redhat.com
      349cd52c
    • A
      Merge remote-tracking branch 'mst/tags/for_anthony' into staging · eb322b81
      Anthony Liguori 提交于
      pc,pci,virtio fixes and cleanups
      
      This includes pc and pci cleanups and enhancements,
      and a virtio-net bugfix related to softmac programming.
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      
      # gpg: Signature made Sun 29 Sep 2013 01:51:16 AM CDT using RSA key ID D28D5469
      # gpg: Can't check signature: public key not found
      
      # By Michael S. Tsirkin (8) and others
      # Via Michael S. Tsirkin
      * mst/tags/for_anthony:
        smbios: Factor out smbios_maybe_add_str()
        smbios: Make multiple -smbios type= accumulate sanely
        smbios: Improve diagnostics for conflicting entries
        smbios: Convert to QemuOpts
        smbios: Normalize smbios_entry_add()'s error handling to exit(1)
        virtio-net: fix up HMP NIC info string on reset
        pci: remove explicit check to 64K ioport size
        piix4: disable io on reset
        piix: use 64 bit window programmed by guest
        q35: use 64 bit window programmed by guest
        pci: add helper to retrieve the 64-bit range
        range: add min/max operations on ranges
        range: add Range to typedefs
        q35: make pci window address/size match guest cfg
      
      Message-id: 1380437951-21788-1-git-send-email-mst@redhat.com
      eb322b81
    • A
      Merge remote-tracking branch 'kwolf/for-anthony' into staging · 4235d773
      Anthony Liguori 提交于
      # By Max Reitz (10) and others
      # Via Kevin Wolf
      * kwolf/for-anthony: (30 commits)
        qcow2: Remove useless count_contiguous_clusters() parameter
        qcow2: COMPRESSED on count_contiguous_clusters
        qcow2: count_contiguous_clusters and compression
        qcow2: Free only newly allocated clusters on error
        qcow2: Always use error path in l2_allocate
        qcow2: Don't put invalid L2 table into cache
        qemu-iotests: Preallocated zero clusters in 061
        qcow2: Correct bitmap size in zero expansion
        qemu-iotests: Quote $TEST_IMG* and $TEST_DIR usage
        qemu-iotests: Add basic ability to use binary sample images
        qemu-iotests: fix qmp.py search path
        block: use DIV_ROUND_UP in bdrv_co_do_readv
        qcow2: Assert against currently impossible overflow
        block: qed - use QEMU_PACKED for on-disk structures
        block: qcow2 - used QEMU_PACKED for on-disk structures
        block: vpc - use QEMU_PACKED for on-disk structures
        block: vdi - use QEMU_PACKED for on-disk structures
        rbd: avoid qemu_rbd_snap_list() memory leaks
        qdict: Extract qdict_extract_subqdict
        block: Fix compiler warning (-Werror=uninitialized)
        ...
      
      Message-id: 1380296370-14523-1-git-send-email-kwolf@redhat.com
      4235d773
    • A
      Merge remote-tracking branch 'sstabellini/xen-2013-09-25' into staging · 3469a60d
      Anthony Liguori 提交于
      # By Anthony PERARD (2) and Liu, Jinsong (2)
      # Via Stefano Stabellini
      * sstabellini/xen-2013-09-25:
        xen: Enable cpu-hotplug on xenfv machine.
        xen: Fix vcpu initialization.
        qemu: Add qemu xen logic for Xen HVM S3 resume
        qemu: Adjust qemu wakeup
      
      Message-id: alpine.DEB.2.02.1309251749180.5498@kaball.uk.xensource.com
      3469a60d
    • A
      Merge remote-tracking branch 'rth/tcg-ppc-pull' into staging · 28b9d47d
      Anthony Liguori 提交于
      # By Richard Henderson (19) and Paolo Bonzini (2)
      # Via Richard Henderson
      * rth/tcg-ppc-pull: (21 commits)
        tcg-ppc64: Implement CONFIG_QEMU_LDST_OPTIMIZATION
        tcg-ppc64: Add _noaddr functions for emitting forward branches
        tcg-ppc64: Streamline tcg_out_tlb_read
        tcg-ppc64: Implement tcg_register_jit
        tcg-ppc64: Handle long offsets better
        tcg-ppc64: Tidy register allocation order
        tcg-ppc64: Look through a constant function descriptor
        tcg-ppc64: Fold constant call address into descriptor load
        tcg-ppc64: Don't load the static chain from TCG
        tcg-ppc64: Avoid code for nop move
        tcg-ppc64: Use tcg_out64
        tcg-ppc64: Use TCG_REG_Rn constants
        tcg-ppc64: More use of TAI and SAI helper macros
        tcg-ppc64: Reformat tcg-target.c
        tcg-ppc: Fix and cleanup tcg_out_tlb_check
        tcg-ppc: Use conditional branch and link to slow path
        tcg-ppc: Cleanup tcg_out_qemu_ld/st_slow_path
        tcg-ppc: Avoid code for nop move
        tcg-ppc: use new return-argument ld/st helpers
        tcg-ppc: fix qemu_ld/qemu_st for AIX ABI
        ...
      
      Message-id: 1380126458-3247-1-git-send-email-rth@twiddle.net
      28b9d47d
    • A
      Merge remote-tracking branch 'quintela/migration.next' into staging · 8429d63b
      Anthony Liguori 提交于
      # By Isaku Yamahata (4) and others
      # Via Juan Quintela
      * quintela/migration.next:
        migration: ram_handle_compressed
        arch_init: make is_zero_page accept size
        migration: Fix debug print type
        migration: add version supporting macros for struct pointer
        rdma: constify ram_chunk_{index, start, end}
        rdma: clean up of qemu_rdma_cleanup()
        arch_init: right return for ram_save_iterate
        savevm: fix wrong initialization by ram_control_load_hook
        savevm: add comments for qemu_file_get_error()
      
      Message-id: 1380024203-25897-1-git-send-email-quintela@redhat.com
      8429d63b
    • A
      Merge remote-tracking branch 'kraxel/audio.1' into staging · d7f0efcb
      Anthony Liguori 提交于
      # By Bandan Das (3) and Gerd Hoffmann (1)
      # Via Gerd Hoffmann
      * kraxel/audio.1:
        audio: remove CONFIG_MIXEMU configure option
        hda-codec: make mixemu selectable at runtime
        hda-codec: refactor common definitions into a header file
        audio maintainers update
      
      Message-id: 1380011943-15083-1-git-send-email-kraxel@redhat.com
      d7f0efcb
    • A
      Merge remote-tracking branch 'borntraeger/tags/s390-next-20130924' into staging · 1b365b2e
      Anthony Liguori 提交于
      This is a bunch of fixes/changes for the s390 architecture. It also
      contains the fixes from the previous pull request, which did not make
      it yet.
      Overall it contains
      - a fix for kexec without kdump (which uses diag308 subcode 0 instead of 1)
      - several sclp related fixes
      - some initial sclp migration code
      - the sclp line mode console
      - A fix for a boot problem with the virtio ccw ipl bios
      - zeroed out padding bytes for the notes section of dump-guest-memory
      - some cleanups
      
      # gpg: Signature made Tue 24 Sep 2013 02:18:44 AM CDT using RSA key ID B5A61C7C
      # gpg: Can't check signature: public key not found
      
      # By Christian Borntraeger (6) and others
      # Via Christian Borntraeger
      * borntraeger/tags/s390-next-20130924:
        s390/sclplmconsole: Add support for SCLP line-mode console
        s390/ebcdic: Move conversion tables to header file
        s390/eventfacility: allow childs to handle more than 1 event type
        s390/eventfacility: remove unused event_type variable
        s390/eventfacility: Fix receive/send masks
        s390/eventfacility: fix multiple Read Event Data sources
        s390/sclp: add reset() functions
        s390/sclpquiesce: Add code to support live migration
        s390/sclpconsole: Add code to support live migration for sclpconsole
        s390/sclpconsole: modify definition of input buffer
        s390/kexec: Implement diag308 subcode 0
        s390/ioinst: Moved the CC setting to the IO instruction handlers
        s390/cpu: Make setcc() function available to other files
        s390/ipl: Update the s390-ccw.img rom
        s390/ipl: Fix waiting for virtio processing
        s390/dump: zero out padding bytes in notes sections
        s390/kvm: Add check for priviledged SCLP handler
      
      Message-id: 1380007671-18976-1-git-send-email-borntraeger@de.ibm.com
      1b365b2e
  3. 30 9月, 2013 10 次提交
    • G
      update seabios from 1.7.2.2 to 1.7.3.2 · 1cf9412b
      Gerd Hoffmann 提交于
      'git shortlog d4f7d90f..ece025f5' says:
      
      Alex Williamson (4):
            seabios q35: Enable all PIRQn IRQs at startup
            seabios q35: Add new PCI slot to irq routing function
            seabios: Add a dummy PCI slot to irq mapping function
            pciinit: Enable default VGA device
      
      Asias He (2):
            virtio-scsi: Set _DRIVER_OK flag before scsi target scanning
            virtio-scsi: Pack struct virtio_scsi_{req_cmd,resp_cmd}
      
      Avik Sil (1):
            USB-EHCI: Fix null pointer assignment
      
      Christian Gmeiner (5):
            geodevga: fix errors in geode_fp_* functions
            geodevga: move framebuffer setup
            geodevga: move output setup to own function
            geodevga: add debug to msr functions
            geodevga: fix wrong define name
      
      David Woodhouse (26):
            Add macros for pushing and popping struct bregs
            Clean up #if in pirtable.c. CONFIG_PIRTABLE can't be set if CONFIG_COREBOOT is
            post: Export functions which will be used individually by CSM
            Export callrom() for CSM to use
            Export copy_smbios() from biostables.c
            Import LegacyBios.h from OVMF
            Complete and checksum EFI_COMPATIBILITY16_TABLE at build time
            Add pic_save_mask() and pic_restore_mask() functions
            Add CSM support
            Add README.CSM
            Add find_pmtimer() function
            Enable PMTIMER for CSM build
            Fix rom_reserve()/rom_confirm() for CSM oprom dispatch
            Don't calibrate TSC if PMTIMER is already set up
            Move find_pmtimer() to ACPI table setup where it logically belongs
            Use find_pmtimer() after copying Xen ACPI tables
            Use find_pmtimer() after copying coreboot ACPI tables
            Unify return path for CSM to go via csm_return()
            Make CONFIG_OPTIONROMS_DEPLOYED depend on CONFIG_QEMU
            Implement !CONFIG_OPTIONROMS support for CSM
            Implement !CONFIG_BOOT for CSM
            Enable VGA output when settings bochs-specific mode
            Disable CONFIG_THREAD_OPTIONROMS for CSM build
            Fix return type of le64_to_cpu() and be64_to_cpu()
            Rename find_pmtimer() to find_acpi_features()
            Add acpi_reboot() reset method using RESET_REG
      
      Gerd Hoffmann (6):
            config: allow DEBUG_IO for !QEMU
            coreboot: add qemu detection
            tweak coreboot qemu detection
            apm: fix shutdown
            ahci: add missing check for allocation failure
            fix buildversion.sh
      
      Hu Tao (1):
            Add pvpanic device driver
      
      Kevin O'Connor (101):
            pmm: Use 'struct segoff_s' in pmm header.
            Minor: Update README - variable changes are now reset on soft-reboots.
            Normalize POST initialization function name suffixes.
            POST: Reorganize post init functions for better grouping and reusability.
            Fix rebase error in commit 8a0a972f that broke LOWMEM variables.
            Support calling a function other than maininit() from reloc_preinit().
            Ensure exported symbols are visible in the final link
            POST: Move QEMU specific ramsize and BIOS table setup to paravirt.c.
            POST: Reorganize post entry and "preinit" functions.
            POST: Move cpu caching and dma setup to platform_hardware_setup().
            Undo incorrect assumptions about Xen in commit 6ca0460f.
            Determine century during init and store in VARLOW mem during runtime.
            No need to check both CONFIG_THREADS and CONFIG_THREAD_OPTIONROMS.
            Add runningOnQEMU() and runningOnXen() for runtime platform detection.
            Consistently use CONFIG_COREBOOT, CONFIG_QEMU, and runningOnXen().
            Convert kvm_para_available() to runningOnKVM().
            Minor - move definitions to paravirt.c from paravirt.h.
            Only perform SMP setup on QEMU.
            Start device_hardware_setup in mainint even with CONFIG_THREAD_OPTIONROMS.
            The mathcp setup touches the PIC and thus move to the "setup" phase.
            Update tools/acpi_extract.py to handle iasl 20130117 release.
            Support skipping content when reading from QEMU fw_cfg romfile entries.
            Convert fw_cfg ACPI entries into romfile entries.
            Convert fw_cfg SMBIOS entries into romfile entries.
            Convert basic integer fw_cfg entries into romfile entries.
            Convert fw_cfg NUMA entries into a romfile entry.
            Process fw_cfg e820 entries during the fw_cfg setup stage.
            Integrate qemu_cfg_preinit() into qemu_romfile_init().
            Group QEMU platform setup together and move to paravirt.c.
            vgabios: Bochs/QEMU vgabios support should depend on CONFIG_QEMU.
            Warn on unaligned PCI ROM structure in option roms.
            Fix Makefile - don't reference "out/" directly, instead use "$(OUT)".
            build: Don't require $(OUT) to be a sub-directory of the main directory.
            Rename rom_get_top() to rom_get_max().
            Report on f-segment UMB ram also.
            Clarify build generated "zone low" values.
            Verify CC is valid during build tests.
            Disable handle_post() on CSM builds.
            Remove unnecessary "export" declarations from assembler functions.
            Minor assembler enhancements to __csm_return.
            Introduce VARFSEG for variables that will reside in the f-segment.
            Convert VAR16VISIBLE, VAR16EXPORT, and VAR32VISIBLE to VARFSEG.
            Don't relocate "varlow" variable references at runtime.
            Move malloc's ZoneFSeg and ZoneLow setup to malloc_init.
            Calculate "RamSize" needed by 16bit interface dynamically.
            Eliminate separate BiosTableSpace[] space for f-segment allocations.
            Use CONFIG_ prefix for Kconfig variables; use BUILD_ for others.
            Try to detect an unsuccessful hard-reboot to prevent soft-reboot loops.
            Minor - fix confusing final_sec32low_start name in layoutrom.py.
            Minor - introduce numeric defines for the IVT offset of hw irqs.
            Separate out 16bit PCI-BIOS entry point from regular int 0x1a entry point.
            Support using the "extra stack" for all 16bit irq entry points.
            Minor - improve comments and grouping of handle_08().
            floppy: Introduce 'struct floppy_pio_s' for floppy PIO ops.
            floppy: Cleanup floppy irq wait handling.
            floppy: Clean up Check Interrupt Status code.
            floppy: Move recalibration and results parsing to floppy_cmd().
            floppy: Improve floppy_pio() error checking.
            floppy: Implement media format sensing.
            floppy: Actually do controller reset in floppy_reset().
            Minor - note that passing QEMU config via cmos is deprecated.
            Cache boot-fail-wait to avoid romfile access after POST.
            Rename src/ssdt-susp.dsl to src/ssdt-misc.dsl.
            acpi: Eliminate BDAT parameter passing to DSDT code.
            Add additional dependency checks to Makefile.
            Don't use __FILE__ in virtio-ring.c.
            shadow: Don't use PCIDevices list in make_bios_readonly().
            smm: Don't use PCIDevices list in smm_setup().
            Add VARVERIFY32INIT attribute for variables only available during "init".
            Use VARVERIFY32INIT on global variables that point to "tmp" memory.
            vgabios: Fix stdvga_perform_gray_scale_summing().
            vgabios: Fix cirrus memory clear on mode switch.
            Minor - add missing newline to floppy debug statement.
            Fix bug in NUMA node setup - don't create SRAT if NUMA not present.
            Update README - copy *.aml files for QEMU.
            Add dependencies to vgafixup.py and buildversion.sh scripts.
            Set ZF prior to keyboard read call in check_for_keystroke().
            mptable: Don't describe pci-to-pci bridges.
            mptable: Use same PCI irqs as ACPI code.
            Cleanup QEMU_CFG_NUMA fw_cfg processing - split into two romfile entries.
            Use container_of on romfile entries.
            acpi: Move ACPI table definitions from acpi.c to acpi.h.
            acpi: Remove dead code with descriptions of bit flags.
            acpi: Use cpu_to_leXX() consistently.
            Minor - explicitly close files in buildrom.py.
            Minor - move "tracked memory alloc" code in pmm.c.
            Introduce and convert pmm code to use standard list helpers.
            Minor - relocate code in stacks.c to keep low-level thread code together.
            Introduce helper function have_threads() in stacks.c.
            Convert stacks.c to use standard list manipulation code.
            Convert boot.c to use standard list manipulation code.
            Convert pciinit.c to use standard list manipulation code.
            Convert PCIDevices list to use standard list manipultion code.
            Revert "Convert pciinit.c to use standard list manipulation code."
            Fix error in hlist_for_each_entry_safe macro.
            Convert pciinit.c to use standard list manipulation code.
            make qemu_cfg_init depend on QEMU_HARDWARE instead of QEMU
            Another fix for hlist_for_each_entry_safe.
            Minor - remove debugging dprintf added to pciinit.c.
            Fix USB EHCI detection that was broken in hlist conversion of PCIDevices.
            Fix bug in CBFS file walking with compressed files.
      
      Laszlo Ersek (1):
            Enable VGA output when setting Cirrus-specific mode
      
      Michael S. Tsirkin (2):
            acpi: make default DSDT optional
            acpi: sync FADT flags from PIIX4 to Q35
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      1cf9412b
    • G
      roms: add support for building sgabios · 774e80ea
      Gerd Hoffmann 提交于
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      774e80ea
    • G
      roms: enable parallel seabios / seavgabios builds · 95f7c680
      Gerd Hoffmann 提交于
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      95f7c680
    • G
      roms: enable ipxe cross builds · 779fa9d7
      Gerd Hoffmann 提交于
      779fa9d7
    • G
      roms: add rules to build slof · bcf06c15
      Gerd Hoffmann 提交于
      Add some logic to detect cross compilers.  Add support for "make slof",
      which should JustWork[tm] if you are on a ppx64 machine or have a ppc64
      cross compiler installed somewhere in your path.
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      bcf06c15
    • G
      roms: rewrite scripts/refresh-pxe-roms.sh · 93a2b3c4
      Gerd Hoffmann 提交于
      Just use the Makefile in roms/
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      93a2b3c4
    • G
      roms: parallel ipxe builds · 46ef7f33
      Gerd Hoffmann 提交于
      Enable parallel ipxe builds.  Reduce the recursive make calls.  Call
      recursive make properly using $(MAKE) $(MAKEFLAGS).
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      46ef7f33
    • G
      roms: build lgplvgabios isavga variant · 5a7bd333
      Gerd Hoffmann 提交于
      Add logic to also build+install the isavga vgabios variant.
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      5a7bd333
    • G
      roms: enable parallel builds for 'make lgplvgabios' · 1ede4dd0
      Gerd Hoffmann 提交于
      Recurse into vgabios once, adjust dependencies, call make using
      $(MAKE) $(MAKEFLAGS) so jobserver mode works.
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      1ede4dd0
    • G
      roms: add 'make clean' · 68875817
      Gerd Hoffmann 提交于
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      68875817
  4. 29 9月, 2013 5 次提交
  5. 27 9月, 2013 10 次提交
  6. 26 9月, 2013 5 次提交