1. 26 7月, 2013 2 次提交
    • A
      Merge remote-tracking branch 'kraxel/seabios-1.7.3' into staging · d1ed9f41
      Anthony Liguori 提交于
      # By Gerd Hoffmann
      # Via Gerd Hoffmann
      * kraxel/seabios-1.7.3:
        seabios: update to 1.7.3
      
      Message-id: 1374673573-25074-1-git-send-email-kraxel@redhat.com
      Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
      d1ed9f41
    • A
      Merge remote-tracking branch 'riku/linux-user-for-upstream' into staging · 874ec3c5
      Anthony Liguori 提交于
      * riku/linux-user-for-upstream: (21 commits)
        linux-user: Handle compressed ISA encodings when processing MIPS exceptions
        linux-user: Unlock mmap_lock when resuming guest from page_unprotect
        linux-user: Reset copied CPUs in cpu_copy() always
        linux-user: Fix epoll on ARM hosts
        linux-user: fix segmentation fault passing with h2g(x) != x
        linux-user: Fix pipe syscall return for SPARC
        linux-user: Fix target_stat and target_stat64 for OpenRISC
        linux-user: Avoid conditional cpu_reset()
        configure: Make NPTL non-optional
        linux-user: Enable NPTL for x86-64
        linux-user: Add i386 TLS setter
        linux-user: Clean up handling of clone() argument order
        linux-user: Add missing 'break' in i386 get_thread_area syscall
        linux-user: Enable NPTL for m68k
        linux-user: Enable NPTL for SPARC targets
        linux-user: Enable NPTL for OpenRISC
        linux-user: Move includes of target-specific headers to end of qemu.h
        configure: Enable threading for unicore32-linux-user
        configure: Enable threading on all ppc and mips linux-user targets
        configure: Don't say target_nptl="no" if there is no linux-user target
        ...
      
      Conflicts:
      	linux-user/main.c
      Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
      874ec3c5
  2. 25 7月, 2013 28 次提交
  3. 24 7月, 2013 5 次提交
    • G
      seabios: update to 1.7.3 · 41b8280a
      Gerd Hoffmann 提交于
      Changes summary (git shortlog rel-1.7.2.2..rel-1.7.3):
      
      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 (3):
            config: allow DEBUG_IO for !QEMU
            coreboot: add qemu detection
            tweak coreboot qemu detection
      
      Hu Tao (1):
            Add pvpanic device driver
      
      Kevin O'Connor (99):
            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.
      
      Laszlo Ersek (1):
            Enable VGA output when setting Cirrus-specific mode
      
      Michael S. Tsirkin (1):
            acpi: make default DSDT optional
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      41b8280a
    • S
      po/Makefile: Use macro quiet-command for nice looking messages · 0cd8eaa0
      Stefan Weil 提交于
      Suppress also the "... done" message from msgmerge.
      Signed-off-by: NStefan Weil <sw@weilnetz.de>
      Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
      0cd8eaa0
    • S
      po/Makefile: Fix generation of messages.po · 1fa44923
      Stefan Weil 提交于
      * Tell xgettext that we use UTF-8 encoding (this is currently optional).
      
      * Set charset=UTF-8 in messages.po. This avoids warnings from msgmerge:
        warning: Charset "CHARSET" is not a portable encoding name.
      
      * Use filename relative to root directory (ui/gtk.c instead of ../ui/gtk.c
        or $(SRC_PATH)/ui/gtk.c) for comments in *.po files.
      Signed-off-by: NStefan Weil <sw@weilnetz.de>
      Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
      1fa44923
    • S
      po/Makefile: Fix *.mo generation for out-of-tree builds (regression) · 00134a62
      Stefan Weil 提交于
      Commit f8475655 added a wildcard search
      for *.po files. This search found no files for out of tree builds, so
      those builds no longer created and installed *.mo files.
      Signed-off-by: NStefan Weil <sw@weilnetz.de>
      Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
      00134a62
    • S
      po/Makefile: Fix and improve help message · 18e12d49
      Stefan Weil 提交于
      The help message contains single quotes which got lost in the output.
      Fix also a typo and use two instead of three lines.
      Signed-off-by: NStefan Weil <sw@weilnetz.de>
      Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
      18e12d49
  4. 23 7月, 2013 5 次提交
    • A
      Merge remote-tracking branch 'quintela/migration.next' into staging · f03d07d4
      Anthony Liguori 提交于
      # By Michael R. Hines (8) and others
      # Via Juan Quintela
      * quintela/migration.next:
        migration: add autoconvergence documentation
        Fix real mode guest segments dpl value in savevm
        Fix real mode guest migration
        rdma: account for the time spent in MIG_STATE_SETUP through QMP
        rdma: introduce MIG_STATE_NONE and change MIG_STATE_SETUP state transition
        rdma: allow state transitions between other states besides ACTIVE
        rdma: send pc.ram
        rdma: core logic
        rdma: introduce ram_handle_compressed()
        rdma: bugfix: ram_control_save_page()
        rdma: update documentation to reflect new unpin support
      
      Message-id: 1374590725-14144-1-git-send-email-quintela@redhat.com
      Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
      f03d07d4
    • A
      Merge remote-tracking branch 'afaerber/tags/qom-cpu-for-anthony' into staging · 3988982c
      Anthony Liguori 提交于
      QOM CPUState refactorings
      
      * Fix NULL pointer dereference in gdbstub
      * Introduce vaddr type
      * Introduce CPUClass::set_pc()
      * Introduce CPUClass::synchronize_from_tb()
      * Introduce CPUClass::get_phys_page_debug()
      * Introduce CPUClass::memory_rw_debug()
      * Move singlestep_enabled and gdb_regs fields out of CPU_COMMON
      * Adopt CPUState in more APIs
      * Propagate CPUState in gdbstub
      
      # gpg: Signature made Mon 22 Jul 2013 07:50:17 PM CDT using RSA key ID 3E7E013F
      # gpg: Can't check signature: public key not found
      
      # By Andreas Färber (21) and others
      # Via Andreas Färber
      * afaerber/tags/qom-cpu-for-anthony: (24 commits)
        linux-user: Use X86CPU property to retrieve CPUID family
        gdbstub: Change gdb_register_coprocessor() argument to CPUState
        cpu: Move gdb_regs field from CPU_COMMON to CPUState
        gdbstub: Change GDBState::{c,g}_cpu and find_cpu() to CPUState
        cpu: Introduce CPUClass::memory_rw_debug() for target_memory_rw_debug()
        exec: Change cpu_memory_rw_debug() argument to CPUState
        cpu: Turn cpu_get_phys_page_debug() into a CPUClass hook
        gdbstub: Change gdb_{read,write}_register() argument to CPUState
        gdbstub: Change gdb_handlesig() argument to CPUState
        gdbstub: Change syscall callback argument to CPUState
        kvm: Change kvm_{insert,remove}_breakpoint() argument to CPUState
        cpu: Change cpu_single_step() argument to CPUState
        gdbstub: Update gdb_handlesig() and gdb_signalled() Coding Style
        cpu: Move singlestep_enabled field from CPU_COMMON to CPUState
        target-alpha: Copy implver to DisasContext
        target-alpha: Copy singlestep_enabled to DisasContext
        cpu: Introduce CPUClass::synchronize_from_tb() for cpu_pc_from_tb()
        target-unicore32: Implement CPUClass::set_pc()
        target-moxie: Implement CPUClass::set_pc()
        target-m68k: Implement CPUClass::set_pc()
        ...
      3988982c
    • A
      Merge remote-tracking branch 'afaerber/tags/qom-devices-for-anthony' into staging · 931f0adf
      Anthony Liguori 提交于
      QOM device refactorings
      
      * Avoid TYPE_* in VMStateDescription name
      * Replace some DO_UPCAST()s and FROM_SYSBUS()s with QOM casts
      * Limit legacy SCSI command line handling to non-hotplugged devices
      * Replace some SysBusDeviceClass::init with DeviceClass::realize
      
      # gpg: Signature made Mon 22 Jul 2013 06:31:42 PM CDT using RSA key ID 3E7E013F
      # gpg: Can't check signature: public key not found
      
      # By Hu Tao (26) and others
      # Via Andreas Färber
      * afaerber/tags/qom-devices-for-anthony: (55 commits)
        isa-bus: Drop isabus_bridge_init() since it does nothing
        ioapic: Use QOM realize for ioapic
        kvmvapic: Use QOM realize
        kvm/clock: Use QOM realize for kvmclock
        hpet: Use QOM realize for hpet
        scsi: Improve error propagation for scsi_bus_legacy_handle_cmdline()
        megasas: Legacy command line handling fix
        scsi/esp: Use QOM realize for scsi esp
        fw_cfg: Use QOM realize for fw_cfg
        ahci: Use QOM realize for ahci
        pflash_cfi02: Use QOM realize for pflash_cfi02
        pflash_cfi01: Use QOM realize for pflash_cfi01
        fdc: Improve error propagation for QOM realize
        fdc: Use QOM realize for fdc
        kvm/clock: QOM'ify some more
        hpet: QOM'ify some more
        scsi/esp: QOM'ify some more
        fwcfg: QOM'ify some more
        ahci: QOM'ify some more
        pflash-cfi02: QOM'ify some more
        ...
      931f0adf
    • K
      linux-user: Handle compressed ISA encodings when processing MIPS exceptions · a0333817
      Kwok Cheung Yeung 提交于
      Decode trap instructions during the handling of an EXCP_BREAK or EXCP_TRAP
      according to the current ISA mode.
      Signed-off-by: NKwok Cheung Yeung <kcy@codesourcery.com>
      Signed-off-by: NRiku Voipio <riku.voipio@linaro.org>
      a0333817
    • A
      linux-user: Unlock mmap_lock when resuming guest from page_unprotect · d02532f0
      Alexander Graf 提交于
      The page_unprotect() function is running everything locked. Before every
      potential exit path of the function mmap_unlock() gets called to make sure
      we don't leak the lock.
      
      However, the function calls tb_invalidate_phys_page() which again can
      exit a signal through longjmp, leaving our mmap_unlock() attempts in vain.
      
      Add a hint to tb_invalidate_phys_page() that we need to unlock before we
      can leave back into guest context, so that we don't leak the lock.
      
      This fixes 16-bit i386 wine programs running in linux-user for me.
      Signed-off-by: NAlexander Graf <agraf@suse.de>
      Signed-off-by: NRiku Voipio <riku.voipio@linaro.org>
      d02532f0