1. 09 5月, 2018 1 次提交
  2. 08 5月, 2018 5 次提交
    • P
      Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging · cc8f8ba7
      Peter Maydell 提交于
      Machine queue, 2018-05-07
      
      * pc-dimm: factor out MemoryDevice
        (virtio-pmem and virtio-mem will make use of the new abstraction later)
      * scripts/device-crash-test: Removed fixed CAN entries
      
      # gpg: Signature made Mon 07 May 2018 18:01:42 BST
      # gpg:                using RSA key 2807936F984DC5A6
      # gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
      # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6
      
      * remotes/ehabkost/tags/machine-next-pull-request:
        scripts/device-crash-test: Removed fixed CAN entries
        vl: allow 'maxmem' without 'slot'
        spapr: rename "hotplug memory" terminology to "device memory"
        pc: rename "hotplug memory" terminology to "device memory"
        machine: rename MemoryHotplugState to DeviceMemoryState
        pc-dimm: move actual plug/unplug of a memory region to MemoryDevice
        pc-dimm: factor out capacity and slot checks into MemoryDevice
        pc-dimm: factor out address search into MemoryDevice code
        pc-dimm: pass in the machine and to the MemoryHotplugState
        pc-dimm: no need to pass the memory region
        machine: make MemoryHotplugState accessible via the machine
        pc-dimm: factor out MemoryDevice interface
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      cc8f8ba7
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/vga-20180507-pull-request' into staging · d01beac1
      Peter Maydell 提交于
      qxl: fix local renderer crash
      
      # gpg: Signature made Mon 07 May 2018 10:52:09 BST
      # 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/vga-20180507-pull-request:
        qxl: fix local renderer crash
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      d01beac1
    • P
      Merge remote-tracking branch 'remotes/riscv/tags/riscv-qemu-2.13-pull-20180506' into staging · 3add3f7e
      Peter Maydell 提交于
      RISC-V: QEMU 2.13 Privileged ISA emulation updates
      
      Several code cleanups, minor specification conformance changes,
      fixes to make ROM read-only and add device-tree size checks.
      
      * Honour privileged ISA v1.10 counter enable CSRs.
      * Implements WARL behavior for CSRs that don't support writes
        * Past behavior of raising traps was non-conformant
          with the RISC-V Privileged ISA Specification v1.10.
      * Allow S-mode access to sstatus.MXR when priv ISA >= v1.10
      * Sets mtval/stval to zero on exceptions without addresses
        * Past behavior of leaving the last value was non-conformant
          with the RISC-V Privileged ISA Specition v1.10. mtval/stval
          must be set on all exceptions; to zero if not supported.
      * Make ROMs read-only and implement device-tree size checks
        * Uses memory_region_init_rom and rom_add_blob_fixed_as
      * Adds hexidecimal instruction bytes to disassembly output.
      * Fixes missing break statement for rv128 disassembly.
      * Several code cleanups
        * Replacing hard-coded constants with enums
        * Dead-code elimination
      
      This is an incremental pull that contains 20 reviewed changes out
      of 38 changes currently queued in the qemu-2.13-for-upstream branch.
      
      # gpg: Signature made Sun 06 May 2018 00:27:37 BST
      # gpg:                using DSA key 6BF1D7B357EF3E4F
      # gpg: Good signature from "Michael Clark <michaeljclark@mac.com>"
      # gpg:                 aka "Michael Clark <mjc@sifive.com>"
      # gpg:                 aka "Michael Clark <michael@metaparadigm.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: 7C99 930E B17C D8BA 073D  5EFA 6BF1 D7B3 57EF 3E4F
      
      * remotes/riscv/tags/riscv-qemu-2.13-pull-20180506:
        RISC-V: Mark ROM read-only after copying in code
        RISC-V: No traps on writes to misa,minstret,mcycle
        RISC-V: Make mtvec/stvec ignore vectored traps
        RISC-V: Add mcycle/minstret support for -icount auto
        RISC-V: Use [ms]counteren CSRs when priv ISA >= v1.10
        RISC-V: Allow S-mode mxr access when priv ISA >= v1.10
        RISC-V: Clear mtval/stval on exceptions without info
        RISC-V: Hardwire satp to 0 for no-mmu case
        RISC-V: Update E and I extension order
        RISC-V: Remove erroneous comment from translate.c
        RISC-V: Remove EM_RISCV ELF_MACHINE indirection
        RISC-V: Make virt header comment title consistent
        RISC-V: Make some header guards more specific
        RISC-V: Fix missing break statement in disassembler
        RISC-V: Include instruction hex in disassembly
        RISC-V: Remove unused class definitions
        RISC-V: Remove identity_translate from load_elf
        RISC-V: Use ROM base address and size from memmap
        RISC-V: Make virt board description match spike
        RISC-V: Replace hardcoded constants with enum values
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      3add3f7e
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/usb-20180507-pull-request' into staging · 302a84e8
      Peter Maydell 提交于
      usb: fixes for mtp and host.
      
      # gpg: Signature made Mon 07 May 2018 10:44:26 BST
      # 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/usb-20180507-pull-request:
        usb-host: skip open on pending postload bh
        usb-mtp: Unconditionally check for the readonly bit
        usb-mtp: Add some NULL checks for issues pointed out by coverity
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      302a84e8
    • G
      ppc: e500: use g_strdup_printf() instead of snprintf() · 2fb513d3
      Greg Kurz 提交于
      qemu-system-ppc fails to build with GCC 8.0.1:
      
      /home/hsp/src/qemu-master/hw/ppc/e500.c: In function ‘ppce500_load_device_tree’:
      /home/hsp/src/qemu-master/hw/ppc/e500.c:442:37: error: ‘/pic@’
      directive output may be truncated writing 5 bytes into a region of
      size between 1 and 128 [-Werror=format-truncation=]
           snprintf(mpic, sizeof(mpic), "%s/pic@%llx", soc, MPC8544_MPIC_REGS_OFFSET);
                                           ^~~~~
      In file included from /usr/include/stdio.h:862,
                       from /home/hsp/src/qemu-master/include/qemu/osdep.h:68,
                       from /home/hsp/src/qemu-master/hw/ppc/e500.c:17:
      /usr/include/bits/stdio2.h:64:10: note: ‘__builtin___snprintf_chk’
      output between 11 and 138 bytes into a destination of size 128
         return __builtin___snprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1,
                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
              __bos (__s), __fmt, __va_arg_pack ());
              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      /home/hsp/src/qemu-master/hw/ppc/e500.c:470:39: error:
      ‘/global-utilities@’ directive output may be truncated writing 18
      bytes into a region of size between 1 and 128
      [-Werror=format-truncation=]
           snprintf(gutil, sizeof(gutil), "%s/global-utilities@%llx", soc,
                                             ^~~~~~~~~~~~~~~~~~
      In file included from /usr/include/stdio.h:862,
                       from /home/hsp/src/qemu-master/include/qemu/osdep.h:68,
                       from /home/hsp/src/qemu-master/hw/ppc/e500.c:17:
      /usr/include/bits/stdio2.h:64:10: note: ‘__builtin___snprintf_chk’
      output between 24 and 151 bytes into a destination of size 128
         return __builtin___snprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1,
                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
              __bos (__s), __fmt, __va_arg_pack ());
              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      /home/hsp/src/qemu-master/hw/ppc/e500.c:477:36: error: ‘/msi@’
      directive output may be truncated writing 5 bytes into a region of
      size between 0 and 127 [-Werror=format-truncation=]
           snprintf(msi, sizeof(msi), "/%s/msi@%llx", soc, MPC8544_MSI_REGS_OFFSET);
                                          ^~~~~
      In file included from /usr/include/stdio.h:862,
                       from /home/hsp/src/qemu-master/include/qemu/osdep.h:68,
                       from /home/hsp/src/qemu-master/hw/ppc/e500.c:17:
      /usr/include/bits/stdio2.h:64:10: note: ‘__builtin___snprintf_chk’
      output between 12 and 139 bytes into a destination of size 128
         return __builtin___snprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1,
                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
              __bos (__s), __fmt, __va_arg_pack ());
              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      
      Fix this by converting e500 to use g_strdup_printf()+g_free() instead
      of snprintf(). This is done globally, even for call sites that don't
      break build, since this is the preferred practice in QEMU.
      Reported-by: NHoward Spoelstra <hsp.cat7@gmail.com>
      Signed-off-by: NGreg Kurz <groug@kaod.org>
      Reviewed-by: NPhilippe Mathieu-Daudé <f4bug@amsat.org>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      Message-id: 152568372989.443627.900708381919207053.stgit@bahia.lan
      Cc: qemu-stable@nongnu.org
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      2fb513d3
  3. 07 5月, 2018 16 次提交
  4. 06 5月, 2018 18 次提交