1. 06 11月, 2017 5 次提交
    • D
      build: don't fail if given a git submodule which does not exist · 37b5e74e
      Daniel P. Berrange 提交于
      If going back in time in git history, across a commit that introduces a new
      submodule, the 'git-submodule.sh' script will fail, causing rebuild to fail.
      
      This is because config-host.mak contains a GIT_SUBMODULES variable that lists
      a submodule that only exists in the later commit. config-host.mak won't get
      repopulated until config.status is invoked, but make won't get this far due to
      the submodule error.
      
      This change makes 'git-submodule.sh' check whether each module is known to git
      and drops any which are not present. A warning message will be printed when any
      submodule is dropped in this manner.
      Tested-by: NPhilippe Mathieu-Daudé <f4bug@amsat.org>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
      37b5e74e
    • D
      build: allow automatic git submodule updates to be disabled · f62bbee5
      Daniel P. Berrange 提交于
      Some people building QEMU use VPATH builds where the source directory is on a
      read-only volume. In such a case 'scripts/git-submodules.sh update' will always
      fail and users are required to run it manually themselves on their original
      writable source directory.
      
      While this is already supported, it is nice to give users a command line flag
      to configure to permanently disable automatic submodule updates, as it means
      they won't get hard to diagnose failures from git-submodules.sh at an arbitrary
      later date.
      
      This patch thus introduces a flag '--disable-git-update' which will prevent
      'make' from ever running 'scripts/git-submodules.sh update'. It will still run
      the 'status' command to determine if a submodule update is needed, but when it
      does this it'll simply stop and print a message instructing the developer what
      todo. eg
      
      $ ./configure  --target-list=x86_64-softmmu --disable-git-update
      ...snip...
      
      $ make
        GEN     config-host.h
        GEN     trace/generated-tcg-tracers.h
        GEN     trace/generated-helpers-wrappers.h
        GEN     trace/generated-helpers.h
        GEN     trace/generated-helpers.c
        GEN     module_block.h
      
      GIT submodule checkout is out of date. Please run
        scripts/git-submodule.sh update ui/keycodemapdb
      from the source directory checkout /home/berrange/src/virt/qemu
      
      make: *** [Makefile:31: git-submodule-update] Error 1
      Tested-by: NPhilippe Mathieu-Daudé <f4bug@amsat.org>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
      f62bbee5
    • D
      build: don't create temporary files in source dir · 96089f6d
      Daniel P. Berrange 提交于
      There are cases where users do VPATH builds with the source directory being on
      a read-only volume. In such a case they have to manually run the command
      'git-submodule.sh ...modules...' ahead of time. When checking for status we
      should not then write into the source dir.
      Tested-by: NPhilippe Mathieu-Daudé <f4bug@amsat.org>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
      96089f6d
    • D
      build: allow setting a custom GIT binary for transparent proxying · cc84d63a
      Daniel P. Berrange 提交于
      Some users can't run a bare 'git' command, due to need for a transparent
      proxying solution such as 'tsocks'. This adds an argument to configure to
      let users specify such a thing:
      
        ./configure --with-git="tsocks git"
      
      The submodule script is also updated to give the user a hint about using this
      flag, if we fail to checkout modules.
      Tested-by: NPhilippe Mathieu-Daudé <f4bug@amsat.org>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
      cc84d63a
    • P
      Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging · ec7a8bf0
      Peter Maydell 提交于
      * Remove legacy KVM PCI device assignment
      * Fix qemu-pr-helper.c compilation on older compilers
      
      # gpg: Signature made Sun 05 Nov 2017 13:52:36 GMT
      # gpg:                using RSA key 0xBFFBD25F78C7AE83
      # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
      # gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"
      # Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
      #      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83
      
      * remotes/bonzini/tags/for-upstream:
        build: disable -Wmissing-braces on older compilers
        pci-assign: Remove
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      ec7a8bf0
  2. 05 11月, 2017 2 次提交
  3. 03 11月, 2017 6 次提交
  4. 02 11月, 2017 3 次提交
  5. 01 11月, 2017 20 次提交
  6. 31 10月, 2017 4 次提交
    • P
      Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20171031' into staging · 7fa00e20
      Peter Maydell 提交于
      target-arm queue:
       * fix instruction-length bit in syndrome for WFI/WFE traps
       * xlnx-zcu102: Specify the max number of CPUs
       * msf2: Remove dead code reported by Coverity
       * msf2: Wire up SYSRESETREQ in SoC for system reset
       * hw/pci-host/gpex: Improve INTX to gsi routing error checking
      
      # gpg: Signature made Tue 31 Oct 2017 13:10:02 GMT
      # gpg:                using RSA key 0x3C2525ED14360CDE
      # 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-20171031:
        hw/pci-host/gpex: Improve INTX to gsi routing error checking
        msf2: Wire up SYSRESETREQ in SoC for system reset
        msf2: Remove dead code reported by Coverity
        xlnx-zcu102: Specify the max number of CPUs
        fix WFI/WFE length in syndrome register
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      7fa00e20
    • P
      Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2017-10-30' into staging · 92c7ec5c
      Peter Maydell 提交于
      nbd patches for 2017-10-30
      
      Vladimir Sementsov-Ogievskiy (some patches co-authored by Eric Blake):
      00/12 nbd minimal structured read
      
      # gpg: Signature made Mon 30 Oct 2017 20:54:54 GMT
      # gpg:                using RSA key 0xA7A16B4A2527436A
      # gpg: Good signature from "Eric Blake <eblake@redhat.com>"
      # gpg:                 aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>"
      # gpg:                 aka "[jpeg image of size 6874]"
      # Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2  F3AA A7A1 6B4A 2527 436A
      
      * remotes/ericb/tags/pull-nbd-2017-10-30:
        nbd: Minimal structured read for client
        nbd: Move nbd_read() to common header
        nbd/client: prepare nbd_receive_reply for structured reply
        nbd/client: refactor nbd_receive_starttls
        nbd/server: Include human-readable message in structured errors
        nbd: Minimal structured read for server
        nbd/server: Refactor zero-length option check
        nbd/server: Simplify nbd_negotiate_options loop
        nbd/server: Report error for write to read-only export
        nbd: Expose constants and structs for structured read
        nbd: Move nbd_errno_to_system_errno() to public header
        nbd: Include error names in trace messages
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      92c7ec5c
    • E
      hw/pci-host/gpex: Improve INTX to gsi routing error checking · 168df2de
      Eric Auger 提交于
      We exposed gpex_set_irq_num() for machines to set the INTx to
      GSI routing. However if the machine forgets to call that
      function we currently do not check the association was properly
      done. Let's initialize gsi values to -1 and if this value is
      found in gpex_route_intx_pin_to_irq, set the routing mode as
      disabled.
      Signed-off-by: NEric Auger <eric.auger@redhat.com>
      Message-id: 1508776211-22175-1-git-send-email-eric.auger@redhat.com
      Reviewed-by: NPeter Maydell <peter.maydell@linaro.org>
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      168df2de
    • S
      msf2: Wire up SYSRESETREQ in SoC for system reset · db7b98c6
      Subbaraya Sundeep 提交于
      Implemented system reset by creating SYSRESETREQ gpio
      out from nvic.
      Signed-off-by: NSubbaraya Sundeep <sundeep.lkml@gmail.com>
      Message-id: 1509253165-7434-1-git-send-email-sundeep.lkml@gmail.com
      Reviewed-by: NPeter Maydell <peter.maydell@linaro.org>
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      db7b98c6