Skip to content
Snippets Groups Projects
  1. Nov 06, 2018
    • Peter Maydell's avatar
    • Peter Maydell's avatar
      Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2018-10-30-v2' into staging · 9012b5ca
      Peter Maydell authored
      
      Monitor patches for 2018-10-30
      
      # gpg: Signature made Tue 06 Nov 2018 17:37:16 GMT
      # gpg:                using RSA key 3870B400EB918653
      # gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
      # gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
      # Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653
      
      * remotes/armbru/tags/pull-monitor-2018-10-30-v2:
        vl: Avoid crash when -mon is underspecified
        monitor: delay monitor iothread creation
        monitor: guard iothread access by mon->use_io_thread
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      9012b5ca
    • Eric Blake's avatar
      vl: Avoid crash when -mon is underspecified · 0c57893d
      Eric Blake authored
      
      A quick coredump on an incomplete command line:
      ./x86_64-softmmu/qemu-system-x86_64 -mon mode=control,pretty=on
      
       #0  0x00007ffff723d9e4 in g_str_hash () at /lib64/libglib-2.0.so.0
       #1  0x00007ffff723ce38 in g_hash_table_lookup () at /lib64/libglib-2.0.so.0
       #2  0x0000555555cc0073 in object_class_property_find (klass=0x5555566a94b0, name=0x0, errp=0x0) at qom/object.c:1135
       #3  0x0000555555cc004b in object_class_property_find (klass=0x5555566a9440, name=0x0, errp=0x0) at qom/object.c:1129
       #4  0x0000555555cbfe6e in object_property_find (obj=0x5555568348c0, name=0x0, errp=0x0) at qom/object.c:1080
       #5  0x0000555555cc183d in object_resolve_path_component (parent=0x5555568348c0, part=0x0) at qom/object.c:1762
       #6  0x0000555555d82071 in qemu_chr_find (name=0x0) at chardev/char.c:802
       #7  0x00005555559d77cb in mon_init_func (opaque=0x0, opts=0x5555566b65a0, errp=0x0) at vl.c:2291
      
      Fix it to instead fail gracefully.
      
      Signed-off-by: default avatarEric Blake <eblake@redhat.com>
      Message-Id: <20181023213600.364086-1-eblake@redhat.com>
      Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
      Reviewed-by: default avatarPeter Xu <peterx@redhat.com>
      Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
      0c57893d
    • Wolfgang Bumiller's avatar
      monitor: delay monitor iothread creation · 85117701
      Wolfgang Bumiller authored
      
      Commit d32749de moved the call to monitor_init_globals()
      to before os_daemonize(), making it an unsuitable place to
      spawn the monitor iothread as it won't be inherited over the
      fork() in os_daemonize().
      
      We now spawn the thread the first time we instantiate a
      monitor which actually has use_io_thread == true.
      Instantiation of monitors happens only after os_daemonize().
      We still need to create the qmp_dispatcher_bh when not using
      iothreads, so this now still happens in
      monitor_init_globals().
      
      Signed-off-by: default avatarWolfgang Bumiller <w.bumiller@proxmox.com>
      Fixes: d32749de ("monitor: move init global earlier")
      Message-Id: <20180925081507.11873-3-w.bumiller@proxmox.com>
      Reviewed-by: default avatarEric Blake <eblake@redhat.com>
      Reviewed-by: default avatarPeter Xu <peterx@redhat.com>
      Tested-by: default avatarPeter Xu <peterx@redhat.com>
      [This fixes a crash on shutdown with --daemonize]
      Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
      85117701
    • Wolfgang Bumiller's avatar
      monitor: guard iothread access by mon->use_io_thread · 9a3e52e3
      Wolfgang Bumiller authored
      
      monitor_resume() and monitor_suspend() both want to
      "kick" the I/O thread if it is there, but in
      monitor_suspend() lacked the use_io_thread flag condition.
      This is required when we later only spawn the thread on
      first use.
      
      Signed-off-by: default avatarWolfgang Bumiller <w.bumiller@proxmox.com>
      Reviewed-by: default avatarEric Blake <eblake@redhat.com>
      Reviewed-by: default avatarPeter Xu <peterx@redhat.com>
      Message-Id: <20180925081507.11873-2-w.bumiller@proxmox.com>
      Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
      9a3e52e3
    • Eduardo Habkost's avatar
      tests: Fix Python 3 detection on older GNU make versions · 0ca70f19
      Eduardo Habkost authored
      
      The $(SHELLSTATUS) variable requires GNU make >= 4.2, but Travis
      seems to provide an older version.  Change the existing rules to
      use command output instead of exit code, to make it compatible
      with older GNU make versions.
      
      Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
      Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
      Tested-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      0ca70f19
    • Peter Maydell's avatar
      Merge remote-tracking branch 'remotes/kraxel/tags/seabios-20181106-pull-request' into staging · 31eac32a
      Peter Maydell authored
      
      seabios update for 3.1
      
      # gpg: Signature made Tue 06 Nov 2018 11:27:53 GMT
      # gpg:                using RSA key 4CB6D8EED3E87138
      # 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>"
      # Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138
      
      * remotes/kraxel/tags/seabios-20181106-pull-request:
        update seabios to master snapshot
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      31eac32a
    • Peter Maydell's avatar
      Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20181106' into staging · 9aca8666
      Peter Maydell authored
      
      target-arm queue:
       * Remove can't-happen if() from handle_vec_simd_shli()
       * hw/arm/exynos4210: Zero memory allocated for Exynos4210State
       * Set S and PTW in 64-bit PAR format
       * Fix ATS1Hx instructions
       * milkymist: Check for failure trying to load BIOS image
      
      # gpg: Signature made Tue 06 Nov 2018 11:37:30 GMT
      # gpg:                using RSA key 3C2525ED14360CDE
      # gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
      # gpg:                 aka "Peter Maydell <pmaydell@gmail.com>"
      # gpg:                 aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>"
      # Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83  15CF 3C25 25ED 1436 0CDE
      
      * remotes/pmaydell/tags/pull-target-arm-20181106:
        target/arm: Fix ATS1Hx instructions
        target/arm: Set S and PTW in 64-bit PAR format
        hw/arm/exynos4210: Zero memory allocated for Exynos4210State
        milkymist: Check for failure trying to load BIOS image
        target/arm: Remove can't-happen if() from handle_vec_simd_shli()
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      9aca8666
    • Peter Maydell's avatar
      Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging · b66db50f
      Peter Maydell authored
      
      pci, pc, virtio: fixes, features
      
      AMD IOMMU VAPIC support + fixes all over the place.
      
      Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
      
      # gpg: Signature made Mon 05 Nov 2018 18:24:10 GMT
      # gpg:                using RSA key 281F0DB8D28D5469
      # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
      # gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"
      # Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
      #      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469
      
      * remotes/mst/tags/for_upstream: (33 commits)
        vhost-scsi: prevent using uninitialized vqs
        piix_pci: fix i440fx data sheet link
        piix: use TYPE_FOO constants than string constats
        i440fx: use ARRAY_SIZE for pam_regions
        pci_bridge: fix typo in comment
        hw/pci: Add missing include
        hw/pci-bridge/ioh3420: Remove unuseful header
        hw/pci-bridge/xio3130: Remove unused functions
        tests/bios-tables-test: add 64-bit PCI MMIO aperture round-up test on Q35
        bios-tables-test: prepare expected files for mmio64
        hw/pci-host/x86: extend the 64-bit PCI hole relative to the fw-assigned base
        hw/pci-host/x86: extract get_pci_hole64_start_value() helpers
        pci-testdev: add optional memory bar
        MAINTAINERS: list "tests/acpi-test-data" files in ACPI/SMBIOS section
        x86_iommu/amd: Enable Guest virtual APIC support
        x86_iommu/amd: Add interrupt remap support when VAPIC is enabled
        i386: acpi: add IVHD device entry for IOAPIC
        x86_iommu/amd: Add interrupt remap support when VAPIC is not enabled
        x86_iommu/amd: Prepare for interrupt remap support
        x86_iommu/amd: make the address space naming consistent with intel-iommu
        ...
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      b66db50f
    • Peter Maydell's avatar
      target/arm: Fix ATS1Hx instructions · 23463e0e
      Peter Maydell authored
      
      ATS1HR and ATS1HW (which allow AArch32 EL2 to do address translations
      on the EL2 translation regime) were implemented in commit 14db7fe0.
      However, we got them wrong: these should do stage 1 address translations
      as defined for NS-EL2, which is ARMMMUIdx_S1E2. We were incorrectly
      making them perform stage 2 translations.
      
      A few years later in commit 1313e2d7 we forgot entirely that
      we'd implemented ATS1Hx, and added a comment that ATS1Hx were
      "not supported yet". Remove the comment; there is no extra code
      needed to handle these operations in do_ats_write(), because
      arm_s1_regime_using_lpae_format() returns true for ARMMMUIdx_S1E2,
      which forces 64-bit PAR format.
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      Reviewed-by: default avatarAlex Bennée <alex.bennee@linaro.org>
      Message-id: 20181016093703.10637-3-peter.maydell@linaro.org
      Reviewed-by: default avatarEdgar E. Iglesias <edgar.iglesias@xilinx.com>
      23463e0e
    • Peter Maydell's avatar
      target/arm: Set S and PTW in 64-bit PAR format · 0f7b791b
      Peter Maydell authored
      
      In do_ats_write() we construct a PAR value based on the result
      of the translation.  A comment says "S2WLK and FSTAGE are always
      zero, because we don't implement virtualization".
      Since we do in fact now implement virtualization, add the missing
      code that sets these bits based on the reported ARMMMUFaultInfo.
      
      (These bits are named PTW and S in ARMv8, so we follow that
      convention in the new comments in this patch.)
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      Reviewed-by: default avatarEdgar E. Iglesias <edgar.iglesias@xilinx.com>
      Reviewed-by: default avatarAlex Bennée <alex.bennee@linaro.org>
      Message-id: 20181016093703.10637-2-peter.maydell@linaro.org
      0f7b791b
    • Peter Maydell's avatar
      hw/arm/exynos4210: Zero memory allocated for Exynos4210State · 76a82ced
      Peter Maydell authored
      
      In exynos4210_init() we allocate memory for an Exynos4210State
      struct. Generally devices can assume that the memory allocated
      for their state struct is zero-initialized; we broke that
      assumption here by using g_new(). Use g_new0() instead.
      (In particular, some code assumes that the various irq arrays
      in the Exynos4210Irq sub-struct are zero-initialized.)
      
      In the longer term, this code should be QOMified, and then
      the struct memory will be allocated elsewhere and by functions
      which always zero-initalize it; but for 3.1 this is a
      simple fix.
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
      Tested-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
      Message-id: 20181105151132.13884-1-peter.maydell@linaro.org
      76a82ced
    • Peter Maydell's avatar
      milkymist: Check for failure trying to load BIOS image · 40af11eb
      Peter Maydell authored
      
      Check the return value from load_image_targphys(), which tells us
      whether our attempt to load the BIOS image into RAM failed.
      (Spotted by Coverity, CID 1190305.)
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
      Acked-by: default avatarMichael Walle <michael@walle.cc>
      Message-id: 20181030170032.1844-1-peter.maydell@linaro.org
      40af11eb
    • Peter Maydell's avatar
      target/arm: Remove can't-happen if() from handle_vec_simd_shli() · f6c98f91
      Peter Maydell authored
      
      In handle_vec_simd_shli() we have a check:
           if (size > 3 && !is_q) {
               unallocated_encoding(s);
               return;
           }
      However this can never be true, because we calculate
          int size = 32 - clz32(immh) - 1;
      where immh is a 4 bit field which we know cannot be all-zeroes.
      So the clz32() return must be in {28,29,30,31} and the resulting
      size is in {0,1,2,3}, and "size > 3" is never true.
      
      This unnecessary code confuses Coverity's analysis:
      in CID 1396476 it thinks we might later index off the
      end of an array because the condition implies that we
      might have a size > 3.
      
      Remove the code, and instead assert that the size is in [0..3],
      since the decode that enforces that is somewhat distant from
      this function.
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
      Reviewed-by: default avatarAlex Bennée <alex.bennee@linaro.org>
      Tested-by: default avatarAlex Bennée <alex.bennee@linaro.org>
      Message-id: 20181030162517.21816-1-peter.maydell@linaro.org
      f6c98f91
    • Gerd Hoffmann's avatar
      update seabios to master snapshot · 0b8f7448
      Gerd Hoffmann authored
      
      seabios 1.12 release is planned for november.
      
      update seabios to a master branch snapshot so it gets more testing
      and to make the delta smaller when updating to -final during freeze.
      
      git shortlog rel-1.11.2..14221cd86e
      ===================================
      
      Gerd Hoffmann (12):
            optionrom: enable non-vga display devices
            cbvga: factor out cbvga_setup_modes()
            qemu: add bochs-display support
            cbvga_setup_modes: use real mode number instead of 0x140
            cbvga_list_modes: don't list current mode twice
            cbvga_set_mode: disable clearmem in windows x86 emulator.
            bochs_display_setup: return error on failure
            pmm: use tmp zone on oom
            vgasrc: add allocate_pmm()
            qemu: add qemu ramfb support
            cbvga_set_mode: refine clear display logic
            pretty boot menu entry for cdrom drives
      
      Jing Liu (3):
            pci: fix the return value for truncated capability
            pci: clean up the debug message for pci capability found
            pci: recognize RH PCI legacy bridge resource reservation capability
      
      Kevin O'Connor (8):
            docs: Add sercon-port to Runtime_config.md documentation
            paravirt: Only enable sercon in NOGRAPHIC mode if no other console specified
            shadow: Don't invoke a shutdown on reboot unless in a reboot loop
            build: Use git describe --always
            docs: Update Download.md to use git clone via https
            ssdt: Fix building of legacy acpi tables on current iasl compiler
            docs: Update download file link
            sdcard: Increase SDHCI_POWER_ON_TIME to 5ms
      
      Marc-André Lureau (4):
            x86: add readq()
            tpm: generalize init_timeout()
            tpm: use get_tpm_version() callback
            tpm: add TPM CRB device support
      
      Marcel Apfelbaum (1):
            pci: fix 'io hints' capability for RedHat PCI bridges
      
      Matt DeVillier (2):
            nvme: fix I/O queue length calculation overflow
            SeaVGABios/cbvga: Fix bpp for coreboot framebuffer
      
      Nikolay Nikolov (11):
            floppy: Introduce the floppy_dor_read() function
            floppy: Introduce floppy_dor_mask()
            floppy: Introduce FLOPPY_DOR_XXX constants
            floppy: Preserve motor and drive sel bits when resetting the floppy controller
            floppy: Reset the floppy motor count in floppy_drive_pio()
            floppy: Use timer_check() in floppy_wait_irq()
            floppy: hold the DOR reset bit low for 4 microseconds, when resetting
            floppy: Execute a SPECIFY command after sensing the media type
            floppy: Support up to 4 floppy drives when turning on the floppy motor
            floppy: Wait for the floppy motor to reach a stable speed, after starting
            floppy: Send 4 sense interrupt commands during controller initialization
      
      Paul Menzel (1):
            docs/Download: Use more secure HTTPS URLs where possible
      
      Stefan Berger (5):
            tpm: Add support for TPM2 ACPI table
            tpm: Wait for tpmRegValidSts flag on CRB interface before probing
            tpm: revert return values for successful/failed CRB probing
            tpm: when CRB is active, select, lock it, and check addresses
            tpm: Request access to locality 0
      
      Stephen Douthit (3):
            tpm: Refactor duplicated wait code in tis_wait_sts() & crb_wait_reg()
            tpm: Wait for interface startup when probing
            tpm: Handle unimplemented TIS_REG_IFACE_ID in tis_get_tpm_version()
      
      Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
      0b8f7448
    • Brad Smith's avatar
      oslib-posix: Use MAP_STACK in qemu_alloc_stack() on OpenBSD · fc3d1bad
      Brad Smith authored
      
      Use MAP_STACK in qemu_alloc_stack() on OpenBSD.
      
      Added to our 6.4 release.
      
      MAP_STACK      Indicate that the mapping is used as a stack.  This
                     flag must be used in combination with MAP_ANON and
                     MAP_PRIVATE.
      
      Implement MAP_STACK option for mmap().  Synchronous faults (pagefault and
      syscall) confirm the stack register points at MAP_STACK memory, otherwise
      SIGSEGV is delivered. sigaltstack() and pthread_attr_setstack() are modified
      to create a MAP_STACK sub-region which satisfies alignment requirements.
      Observe that MAP_STACK can only be set/cleared by mmap(), which zeroes the
      contents of the region -- there is no mprotect() equivalent operation, so
      there is no MAP_STACK-adding gadget.
      
      Signed-off-by: default avatarBrad Smith <brad@comstyle.com>
      Reviewed-by: default avatarKamil Rytarowski <n54@gmx.com>
      Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      Message-id: 20181019125239.GA13884@humpty.home.comstyle.com
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      fc3d1bad
    • Peter Maydell's avatar
      Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20181105' into staging · 03c1ca1c
      Peter Maydell authored
      
      - some changes in s390x maintainership
      - bugfix in vfio-ap
      
      # gpg: Signature made Mon 05 Nov 2018 16:34:03 GMT
      # gpg:                using RSA key DECF6B93C6F02FAF
      # gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>"
      # gpg:                 aka "Cornelia Huck <huckc@linux.vnet.ibm.com>"
      # gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
      # gpg:                 aka "Cornelia Huck <cohuck@kernel.org>"
      # gpg:                 aka "Cornelia Huck <cohuck@redhat.com>"
      # Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF
      
      * remotes/cohuck/tags/s390x-20181105:
        MAINTAINERS: s390/boot: the ipl code and the bios belong together
        MAINTAINERS: s390: Remove myself
        MAINTAINERS: s390/pci: add Collin Walling as maintainer for zpci
        MAINTAINERS: s390/virtio-ccw: drop Christian, add Halil
        MAINTAINERS: s390: more maintainers for vfio-ccw
        s390x/vfio-ap: report correct error
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      03c1ca1c
  2. Nov 05, 2018
Loading