Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into…
Browse files Browse the repository at this point in the history
… staging

* two old patches from prospective GSoC students
* i386 -kernel device tree support
* Coverity fix
* memory usage improvement from Peter
* checkpatch fix
* g_path_get_dirname cleanup
* caching of block status for iSCSI

# gpg: Signature made Tue 19 Jul 2016 07:43:41 BST
# 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:
  target-i386: Remove redundant HF_SOFTMMU_MASK
  block/iscsi: allow caching of the allocation map
  block/iscsi: fix rounding in iscsi_allocationmap_set
  Move README to markdown
  cpu-exec: Move down some declarations in cpu_exec()
  exec: avoid realloc in phys_map_node_reserve
  checkpatch: consider git extended headers valid patches
  megasas: remove useless check for cmd->frame
  compiler: never omit assertions if using a static analysis tool
  hw/i386: add device tree support
  Changed malloc to g_malloc, free to g_free in bsd-user/qemu.h
  use g_path_get_dirname instead of dirname

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
  • Loading branch information
pm215 committed Jul 19, 2016
2 parents db3e07d + da6d48e commit a3b3437
Show file tree
Hide file tree
Showing 14 changed files with 280 additions and 106 deletions.
41 changes: 20 additions & 21 deletions README → README.md
@@ -1,5 +1,5 @@
QEMU README
===========
QEMU
---

QEMU is a generic and open source machine & userspace emulator and
virtualizer.
Expand Down Expand Up @@ -31,31 +31,31 @@ version 2. For full licensing details, consult the LICENSE file.


Building
========
---

QEMU is multi-platform software intended to be buildable on all modern
Linux platforms, OS-X, Win32 (via the Mingw64 toolchain) and a variety
of other UNIX targets. The simple steps to build QEMU are:

mkdir build
cd build
../configure
make
mkdir build
cd build
../configure
make

Complete details of the process for building and configuring QEMU for
all supported host platforms can be found in the qemu-tech.html file.
Additional information can also be found online via the QEMU website:

http://qemu-project.org/Hosts/Linux
http://qemu-project.org/Hosts/W32
http://qemu-project.org/Hosts/Linux
http://qemu-project.org/Hosts/W32


Submitting patches
==================
---

The QEMU source code is maintained under the GIT version control system.

git clone git://git.qemu-project.org/qemu.git
git clone git://git.qemu-project.org/qemu.git

When submitting patches, the preferred approach is to use 'git
format-patch' and/or 'git send-email' to format & send the mail to the
Expand All @@ -66,18 +66,18 @@ guidelines set out in the HACKING and CODING_STYLE files.
Additional information on submitting patches can be found online via
the QEMU website

http://qemu-project.org/Contribute/SubmitAPatch
http://qemu-project.org/Contribute/TrivialPatches
http://qemu-project.org/Contribute/SubmitAPatch
http://qemu-project.org/Contribute/TrivialPatches


Bug reporting
=============
---

The QEMU project uses Launchpad as its primary upstream bug tracker. Bugs
found when running code built from QEMU git or upstream released sources
should be reported via:

https://bugs.launchpad.net/qemu/
https://bugs.launchpad.net/qemu/

If using QEMU via an operating system vendor pre-built binary package, it
is preferable to report bugs to the vendor's own bug tracker first. If
Expand All @@ -86,22 +86,21 @@ reported via launchpad.

For additional information on bug reporting consult:

http://qemu-project.org/Contribute/ReportABug
http://qemu-project.org/Contribute/ReportABug


Contact
=======
---

The QEMU community can be contacted in a number of ways, with the two
main methods being email and IRC

- qemu-devel@nongnu.org
http://lists.nongnu.org/mailman/listinfo/qemu-devel
- #qemu on irc.oftc.net
- Mailing List: qemu-devel@nongnu.org
- Archives: http://lists.nongnu.org/mailman/listinfo/qemu-devel
- IRC: #qemu on irc.oftc.net

Information on additional methods of contacting the community can be
found online via the QEMU website:

http://qemu-project.org/Contribute/StartHere

-- End

0 comments on commit a3b3437

Please sign in to comment.