Skip to content

Commits

Permalink
upstream-v9fs
Switch branches/tags

Name already in use

A tag already exists with the provided branch name. Many Git commands accept both tag and branch names, so creating this branch may cause unexpected behavior. Are you sure you want to create this branch?

Commits on Jan 12, 2016

  1. 9pfs: introduce V9fsVirtioState 

    V9fsState now only contains generic fields. Introduce V9fsVirtioState
for virtio transport.  Change virtio-pci and virtio-ccw to use
V9fsVirtioState.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    @kvaneesh
    Wei Liu authored and kvaneesh committed Jan 12, 2016
    Copy the full SHA
    00588a0 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2016

  1. 9pfs: factor out v9fs_device_{,un}realize_common 

    Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    @kvaneesh
    Wei Liu authored and kvaneesh committed Jan 8, 2016
    Copy the full SHA
    2a0c56a View commit details
    Browse the repository at this point in the history

  2. 9pfs: rename virtio-9p.c to 9p.c 

    Now that file only contains generic code.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    @kvaneesh
    Wei Liu authored and kvaneesh committed Jan 8, 2016
    Copy the full SHA
    60ce86c View commit details
    Browse the repository at this point in the history

  3. 9pfs: rename virtio_9p_set_fd_limit to use v9fs_ prefix 

    It's not virtio specific.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
    @kvaneesh
    Wei Liu authored and kvaneesh committed Jan 8, 2016
    Copy the full SHA
    72a1897 View commit details
    Browse the repository at this point in the history

  4. 9pfs: move handle_9p_output and make it static function 

    It's only used in virtio device.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    @kvaneesh
    Wei Liu authored and kvaneesh committed Jan 8, 2016
    Copy the full SHA
    0192cc5 View commit details
    Browse the repository at this point in the history

  5. 9pfs: export pdu_{submit,alloc,free} 

    They will be used in later patches.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    @kvaneesh
    Wei Liu authored and kvaneesh committed Jan 8, 2016
    Copy the full SHA
    4b311c5 View commit details
    Browse the repository at this point in the history

  6. 9pfs: factor out virtio_9p_push_and_notify 

    The new function resides in virtio specific file.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    @kvaneesh
    Wei Liu authored and kvaneesh committed Jan 8, 2016
    Copy the full SHA
    0d3716b View commit details
    Browse the repository at this point in the history

  7. 9pfs: break out 9p.h from virtio-9p.h 

    Move out generic definitions from virtio-9p.h to 9p.h. Fix header
inclusions.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    @kvaneesh
    Wei Liu authored and kvaneesh committed Jan 8, 2016
    Copy the full SHA
    ebe74f8 View commit details
    Browse the repository at this point in the history

  8. 9pfs: break out virtio_init_iov_from_pdu 

    Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    @kvaneesh
    Wei Liu authored and kvaneesh committed Jan 8, 2016
    Copy the full SHA
    592707a View commit details
    Browse the repository at this point in the history

  9. 9pfs: factor out pdu_push_and_notify 

    Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    @kvaneesh
    Wei Liu authored and kvaneesh committed Jan 8, 2016
    Copy the full SHA
    f657b17 View commit details
    Browse the repository at this point in the history

  10. 9pfs: factor out virtio_pdu_{,un}marshal 

    Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    @kvaneesh
    Wei Liu authored and kvaneesh committed Jan 8, 2016
    Copy the full SHA
    fe9fa96 View commit details
    Browse the repository at this point in the history

  11. 9pfs: make pdu_{,un}marshal proper functions 

    Factor out v9fs_iov_v{,un}marshal. Implement pdu_{,un}marshal with those
functions.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    @kvaneesh
    Wei Liu authored and kvaneesh committed Jan 8, 2016
    Copy the full SHA
    0e2082d View commit details
    Browse the repository at this point in the history

  12. 9pfs: PDU processing functions should start pdu_ prefix 

    This matches naming convention of pdu_marshal and pdu_unmarshal.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    @kvaneesh
    Wei Liu authored and kvaneesh committed Jan 8, 2016
    Copy the full SHA
    dc295f8 View commit details
    Browse the repository at this point in the history

  13. 9pfs: PDU processing functions don't need to take V9fsState as argument 

    V9fsState can be referenced by pdu->s. Initialise that in device
realization function.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    @kvaneesh
    Wei Liu authored and kvaneesh committed Jan 8, 2016
    Copy the full SHA
    ad38ce9 View commit details
    Browse the repository at this point in the history

  14. fsdev: rename virtio-9p-marshal.{c,h} to 9p-iov-marshal.{c,h} 

    And rename v9fs_marshal to v9fs_iov_marshal, v9fs_unmarshal to
v9fs_iov_unmarshal.

The rationale behind this change is that, this marshalling interface is
used both by virtio and proxy helper. Renaming files and functions to
reflect the true nature of this interface.

Xen transport is going to have its own marshalling interface.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    @kvaneesh
    Wei Liu authored and kvaneesh committed Jan 8, 2016
    Copy the full SHA
    2209bd0 View commit details
    Browse the repository at this point in the history

  15. fsdev: break out 9p-marshal.{c,h} from virtio-9p-marshal.{c,h} 

    Break out some generic functions for marshaling 9p state. Pure code
motion plus minor fixes for build system.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    @kvaneesh
    Wei Liu authored and kvaneesh committed Jan 8, 2016
    Copy the full SHA
    829dd28 View commit details
    Browse the repository at this point in the history

  16. 9pfs: remove dead code 

    Some structures in virtio-9p.h have been unused since 2011 when relevant
functions switched to use coroutines.

The declaration of pdu_packunpack and function do_pdu_unpack are
useless.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    @kvaneesh
    Wei Liu authored and kvaneesh committed Jan 8, 2016
    Copy the full SHA
    71042cf View commit details
    Browse the repository at this point in the history

  17. 9pfs: merge hw/virtio/virtio-9p.h into hw/9pfs/virtio-9p.h 

    The deleted file only contained V9fsConf which wasn't virtio specific.
Merge that to the general header of 9pfs.

Fixed header inclusions as I went along.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    @kvaneesh
    Wei Liu authored and kvaneesh committed Jan 8, 2016
    Copy the full SHA
    756cb74 View commit details
    Browse the repository at this point in the history

  18. 9pfs: rename virtio-9p-xattr{,-user}.{c,h} to 9p-xattr{,-user}.{c,h} 

    These three files are not virtio specific. Rename them to generic
names.

Fix comments and header inclusion in various files.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    @kvaneesh
    Wei Liu authored and kvaneesh committed Jan 8, 2016
    Copy the full SHA
    267ae09 View commit details
    Browse the repository at this point in the history

  19. 9pfs: rename virtio-9p-synth.{c,h} to 9p-synth.{c,h} 

    These two files are not virtio specific. Rename them to use generic
names.

Fix includes in various C files. Change define guards and comments
in header files.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    @kvaneesh
    Wei Liu authored and kvaneesh committed Jan 8, 2016
    Copy the full SHA
    364031f View commit details
    Browse the repository at this point in the history

  20. 9pfs: rename virtio-9p-proxy.{c,h} to 9p-proxy.{c,h} 

    Those two files are not virtio specific. Rename them to use generic
names.

Fix includes in various C files. Change define guards and comments
in header files.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    @kvaneesh
    Wei Liu authored and kvaneesh committed Jan 8, 2016
    Copy the full SHA
    494a8eb View commit details
    Browse the repository at this point in the history

  21. 9pfs: rename virtio-9p-posix-acl.c to 9p-posix-acl.c 

    This file is not virtio specific. Rename it to use generic name.

Fix comment and remove unneeded inclusion of virtio.h.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    @kvaneesh
    Wei Liu authored and kvaneesh committed Jan 8, 2016
    Copy the full SHA
    d57b780 View commit details
    Browse the repository at this point in the history

  22. 9pfs: rename virtio-9p-local.c to 9p-local.c 

    This file is not virtio specific. Rename it to use generic name.

Fix comment and remove unneeded inclusion of virtio.h.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    @kvaneesh
    Wei Liu authored and kvaneesh committed Jan 8, 2016
    Copy the full SHA
    f00d4f5 View commit details
    Browse the repository at this point in the history

  23. 9pfs: rename virtio-9p-handle.c to 9p-handle.c 

    This file is not virtio specific. Rename it to use generic name.

Fix comment and remove unneeded inclusion of virtio.h.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    @kvaneesh
    Wei Liu authored and kvaneesh committed Jan 8, 2016
    Copy the full SHA
    3b9ca04 View commit details
    Browse the repository at this point in the history

  24. 9pfs: rename virtio-9p-coth.{c,h} to coth.{c,h} 

    Those two files are not virtio specific. Rename them to use generic
names.

Fix includes in various C files. Change define guards and comments in
header files.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    @kvaneesh
    Wei Liu authored and kvaneesh committed Jan 8, 2016
    Copy the full SHA
    fe52840 View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2016

  1. petalogix-ml605: Set the MicroBlaze CPU version to 8.10.a 

    Set the MicroBlaze CPU version to 8.10.a avoiding a runtime
warning due to an unset CPU version.

Reviewed-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
    @edgarigl
    edgarigl committed Jan 7, 2016
    Copy the full SHA
    a7e00e2 View commit details
    Browse the repository at this point in the history

  2. s3adsp1800: Set the MicroBlaze CPU version to 7.10.d 

    Set the MicroBlaze CPU version to 7.10.d avoiding a runtime
warning due to an unset CPU version.

Reviewed-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
    @edgarigl
    edgarigl committed Jan 7, 2016
    Copy the full SHA
    ad24f94 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-signed… 

    …' into staging

qemu-sparc update

# gpg: Signature made Thu 07 Jan 2016 13:20:13 GMT using RSA key ID AE0F321F
# gpg: Good signature from "Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>"

* remotes/mcayland/tags/qemu-sparc-signed:
  target-sparc: implement NPT timer bit
  sun4u: split NPT and INT_DIS accesses between timer and compare registers
  sun4u: split out NPT and INT_DIS into separate CPUTimer fields

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    @pm215
    pm215 committed Jan 7, 2016
    Copy the full SHA
    2636994 View commit details
    Browse the repository at this point in the history

  4. target-sparc: implement NPT timer bit 

    If the NPT bit is set in the timer register, all non-supervisor read accesses
to the register should fail with a privilege exception.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-By: Artyom Tarasenko <atar4qemu@gmail.com>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
    @mcayland
    mcayland committed Jan 7, 2016
    Copy the full SHA
    c9a4644 View commit details
    Browse the repository at this point in the history

  5. sun4u: split NPT and INT_DIS accesses between timer and compare regis… 

    …ters

Accesses to the timer register high bit should only set NPT, whilst accesses
to the timer compare register high bit should only set INT_DIS. This fixes
issues with the timer being unexpectedly disabled whilst trying to boot
FreeBSD SPARC64.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-By: Artyom Tarasenko <atar4qemu@gmail.com>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
    @mcayland
    mcayland committed Jan 7, 2016
    Copy the full SHA
    bf43330 View commit details
    Browse the repository at this point in the history

  6. sun4u: split out NPT and INT_DIS into separate CPUTimer fields 

    Currently there is confusion between use of these bits for the timer and timer
compare registers (while they both have the same value, the behaviour is
different). Split into two separate CPUTimer fields so we can always reference
the correct value.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-By: Artyom Tarasenko <atar4qemu@gmail.com>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
    @mcayland
    mcayland committed Jan 7, 2016
    Copy the full SHA
    e913cac View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'remotes/kraxel/tags/pull-seabios-201601… 

    …05-1' into staging

seabios: update to release 1.9.0

# gpg: Signature made Tue 05 Jan 2016 12:07:22 GMT using RSA key ID D3E87138
# 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>"

* remotes/kraxel/tags/pull-seabios-20160105-1:
  seabios: update binaries to release 1.9.0
  seabios: stop updating aml files
  seabios: update 128k bios config
  seabios: use new EXTRAVERSION to tag qemu builds
  seabios: update submodule to release 1.9.0

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    @pm215
    pm215 committed Jan 7, 2016
    Copy the full SHA
    ac93a06 View commit details
    Browse the repository at this point in the history

  8. Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-requ… 

    …est' into staging

# gpg: Signature made Thu 07 Jan 2016 09:13:22 GMT using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* remotes/stefanha/tags/tracing-pull-request:
  trace: add make dependencies on tracetool source
  trace: fix make foo-timestamp rules
  trace: fix PRIx64 constants in trace-events
  trace: reflect the file name change

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    @pm215
    pm215 committed Jan 7, 2016
    Copy the full SHA
    4101dfe View commit details
    Browse the repository at this point in the history

  9. trace: add make dependencies on tracetool source 

    Patches that change tracetool can break the build if old build output
files are lying around.

This happens because the Makefile does not specify dependencies on
tracetool.  The build will use old object files that do not match the
current source code.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
    Stefan Hajnoczi committed Jan 7, 2016
    Copy the full SHA
    cef517c View commit details
    Browse the repository at this point in the history

  10. trace: fix make foo-timestamp rules 

    The Makefile uses intermediate timestamp files to avoid rebuilding if
tracetool output is unchanged.

Timestamps are implemented incorrectly.  This was fixed for rules.mak in
commit 4b25966 ("rules.mak: cleanup
config generation rules") but never fixed in trace/Makefile.objs.

The problem with the old timestamp implementation was that make doesn't
notice the updated file modification time until the next time it is run.
It was necessary to run make twice in a row to achieve a full rebuild.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
    Stefan Hajnoczi committed Jan 7, 2016
    Copy the full SHA
    9967e4f View commit details
    Browse the repository at this point in the history
Older