1. 31 Jan, 2017 4 commits
    • Daniel P. Berrange's avatar
      trace: move hw/i386/xen events to correct subdir · 9c582630
      Daniel P. Berrange authored
      The trace-events for a given source file should generally
      always live in the same directory as the source file.
      Reviewed-by: 's avatarStefan Hajnoczi <stefanha@redhat.com>
      Signed-off-by: 's avatarDaniel P. Berrange <berrange@redhat.com>
      Message-id: 20170125161417.31949-5-berrange@redhat.com
      Signed-off-by: 's avatarStefan Hajnoczi <stefanha@redhat.com>
      9c582630
    • Daniel P. Berrange's avatar
      trace: move hw/xen events to correct subdir · 1416f9ea
      Daniel P. Berrange authored
      The trace-events for a given source file should generally
      always live in the same directory as the source file.
      Reviewed-by: 's avatarStefan Hajnoczi <stefanha@redhat.com>
      Signed-off-by: 's avatarDaniel P. Berrange <berrange@redhat.com>
      Message-id: 20170125161417.31949-4-berrange@redhat.com
      Signed-off-by: 's avatarStefan Hajnoczi <stefanha@redhat.com>
      1416f9ea
    • Daniel P. Berrange's avatar
      trace: move hw/block/dataplane events to correct subdir · de928314
      Daniel P. Berrange authored
      The trace-events for a given source file should generally
      always live in the same directory as the source file.
      Reviewed-by: 's avatarStefan Hajnoczi <stefanha@redhat.com>
      Signed-off-by: 's avatarDaniel P. Berrange <berrange@redhat.com>
      Message-id: 20170125161417.31949-3-berrange@redhat.com
      Signed-off-by: 's avatarStefan Hajnoczi <stefanha@redhat.com>
      de928314
    • Daniel P. Berrange's avatar
      make: move top level dir to end of include search path · ba78db44
      Daniel P. Berrange authored
      Currently the search path is
      
        1. source dir corresponding to input file (implicit by compiler)
        2. top level build dir
        3. top level source dir
        4. top level source include/ dir
        5. source dir corresponding to input file
        6. build dir corresponding to output file
      
      Search item 5 is an effective no-op, since it duplicates item 1.
      When srcdir == builddir, item 6 also duplicates item 1, which
      causes a semantic difference between VPATH and non-VPATH builds.
      
      Thus to ensure consistent semantics we need item 6 to be present
      immediately after item 1. e.g.
      
        1. source dir corresponding to input file (implicit by compiler)
        2. build dir corresponding to output file
        3. top level build dir
        4. top level source dir
        5. top level source include/ dir
      
      When srcdir == builddir, items 1 & 2 collapse into one, and items
      3 & 4 collapse into one, but the overall search order is still
      consistent with srcdir != builddir
      
      A further complication is that while most of the source files
      are built with a current directory of $BUILD_DIR, target dependant
      files are built with a current directory of $BUILD_DIR/$TARGET.
      
      As a result, search item 2 resolves to a different location for
      target independant vs target dependant files. For example when
      building 'migration/ram.o', the use of '-I$(@D)' (which expands
      to '-Imigration') would not find '$BUILD_DIR/migration', but
      rather '$BUILD_DIR/$TARGET/migration'.
      
      If there are generated headers files to be used by the migration
      code in '$BUILD_DIR/migration', these will not be found by the
      relative include, an absolute include is needed instead. This
      has not been a problem so far, since nothing has been generating
      headers in sub-dirs, but the trace code will shortly be doing
      that. So it is needed to list '-I$(BUILD_DIR)/$(@D)' as well as
      '-I$(@D)' to ensure both directories are searched when building
      target dependant code. So the search order ends up being:
      
        1. source dir corresponding to input file (implicit by compiler)
        2. build dir corresponding to output file (absolute)
        3. build dir corresponding to output file (relative to cwd)
        4. top level build dir
        5. top level source dir
        6. top level source include/ dir
      
      One final complication is that the absolute '-I$(BUILD_DIR)/$(@D)'
      will sometimes end up pointing to a non-existant directory if
      that sub-dir does not have any target-independant files to be
      built. Rather than try to dynamically filter this, a simple
      'mkdir' ensures $(BUILD_DIR)/$(@D) is guaranteed to exist at
      all times.
      Signed-off-by: 's avatarDaniel P. Berrange <berrange@redhat.com>
      Reviewed-by: 's avatarEric Blake <eblake@redhat.com>
      Message-id: 20170125161417.31949-2-berrange@redhat.com
      Signed-off-by: 's avatarStefan Hajnoczi <stefanha@redhat.com>
      ba78db44
  2. 30 Jan, 2017 1 commit
    • Peter Maydell's avatar
      Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging · a0def594
      Peter Maydell authored
      * SCSI max_transfer support for scsi-generic (Eric)
      * x86 SMI broadcast (Laszlo)
      * Character device QOMification (Marc-André)
      * Record/replay improvements (Pavel)
      * iscsi fixes (Peter L.)
      * "info mtree -f" command (Peter Xu)
      * TSC clock rate reporting (Phil)
      * DEVICE_CATEGORY_CPU (Thomas)
      * Memory sign-extension fix (Ladi)
      
      # gpg: Signature made Fri 27 Jan 2017 17:08:51 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: (41 commits)
        memory: don't sign-extend 32-bit writes
        chardev: qom-ify
        vc: use a common prefix for chr callbacks
        baum: use a common prefix for chr callbacks
        gtk: overwrite the console.c char driver
        char: use error_report()
        spice-char: improve error reporting
        char: rename TCPChardev and NetChardev
        char: rename CharDriverState Chardev
        bt: use qemu_chr_alloc()
        char: allocate CharDriverState as a single object
        char: use a feature bit for replay
        char: introduce generic qemu_chr_get_kind()
        char: fold single-user functions in caller
        char: move callbacks in CharDriver
        char: use a static array for backends
        char: use a const CharDriver
        doc: fix spelling
        char: add qemu_chr_fe_add_watch() Returns description
        qemu-options: stdio is available on win32
        ...
      Signed-off-by: 's avatarPeter Maydell <peter.maydell@linaro.org>
      a0def594
  3. 27 Jan, 2017 35 commits