Commit 526d5809 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging 



* KVM page size fix for PPC
* Support for Linux 4.4's new Hyper-V features
* Eliminate g_slice from areas I maintain
* checkpatch fix
* Peter's cpu_reload_memory_map() cleanups
* More changes to MAINTAINERS
* Require Python 2.6
* chardev creation fixes
* PCI requester id for ARM KVM
* cleanups and doc fixes
* Allow customization of the Hyper-V vendor id

# gpg: Signature made Mon 19 Oct 2015 09:13:10 BST using RSA key ID 78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"

* remotes/bonzini/tags/for-upstream: (49 commits)
  kvm: Allow the Hyper-V vendor ID to be specified
  kvm: Move x86-specific functions into target-i386/kvm.c
  kvm: Pass PCI device pointer to MSI routing functions
  hw/pci: Introduce pci_requester_id()
  kvm: Make KVM_CAP_SIGNAL_MSI globally available
  doc/rcu: fix g_free_rcu() usage example
  qemu-char: cleanup after completed conversion to cd->create
  qemu-char: convert ringbuf backend to data-driven creation
  qemu-char: convert vc backend to data-driven creation
  qemu-char: convert spice backend to data-driven creation
  qemu-char: convert console backend to data-driven creation
  qemu-char: convert stdio backend to data-driven creation
  qemu-char: convert testdev backend to data-driven creation
  qemu-char: convert braille backend to data-driven creation
  qemu-char: convert msmouse backend to data-driven creation
  qemu-char: convert mux backend to data-driven creation
  qemu-char: convert null backend to data-driven creation
  qemu-char: convert pty backend to data-driven creation
  qemu-char: convert UDP backend to data-driven creation
  qemu-char: convert socket backend to data-driven creation
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents aedc8806 1c4a55db

MAINTAINERS

+45 −6
Original line number Diff line number Diff line
@@ -255,6 +255,12 @@ L: xen-devel@lists.xensource.com 
S: Supported

F: xen-*

F: */xen*

F: hw/char/xen_console.c

F: hw/display/xenfb.c

F: hw/net/xen_nic.c

F: hw/xen/

F: hw/xenpv/

F: include/hw/xen/



Hosts:

------
@@ -286,6 +292,36 @@ F: hw/*/allwinner* 
F: include/hw/*/allwinner*

F: hw/arm/cubieboard.c



ARM PrimeCell

M: Peter Maydell <peter.maydell@linaro.org>

S: Maintained

F: hw/char/pl011.c

F: hw/display/pl110*

F: hw/dma/pl080.c

F: hw/dma/pl330.c

F: hw/gpio/pl061.c

F: hw/input/pl050.c

F: hw/intc/pl190.c

F: hw/sd/pl181.c

F: hw/timer/pl031.c

F: include/hw/arm/primecell.h



ARM cores

M: Peter Maydell <peter.maydell@linaro.org>

S: Maintained

F: hw/intc/arm*

F: hw/intc/gic_internal.h

F: hw/misc/a9scu.c

F: hw/misc/arm11scu.c

F: hw/timer/a9gtimer*

F: hw/timer/arm_*

F: include/hw/arm/arm.h

F: include/hw/intc/arm*

F: include/hw/misc/a9scu.h

F: include/hw/misc/arm11scu.h

F: include/hw/timer/a9gtimer.h

F: include/hw/timer/arm_mptimer.h



Exynos

M: Evgeny Voevodin <e.voevodin@samsung.com>

M: Maksim Kozlov <m.kozlov@samsung.com>
@@ -322,11 +358,6 @@ M: Peter Maydell <peter.maydell@linaro.org> 
S: Maintained

F: hw/arm/integratorcp.c



Mainstone

L: qemu-devel@nongnu.org

S: Orphan

F: hw/arm/mainstone.c



Musicpal

M: Jan Kiszka <jan.kiszka@web.de>

S: Maintained
@@ -346,11 +377,17 @@ Real View 
M: Peter Maydell <peter.maydell@linaro.org>

S: Maintained

F: hw/arm/realview*

F: hw/intc/realview_gic.c

F: include/hw/intc/realview_gic.h



Spitz

PXA2XX

M: Andrzej Zaborowski <balrogg@gmail.com>

S: Maintained

F: hw/arm/mainstone.c

F: hw/arm/spitz.c

F: hw/arm/tosa.c

F: hw/arm/z2.c

F: hw/*/pxa2xx*



Stellaris

M: Peter Maydell <peter.maydell@linaro.org>
@@ -726,6 +763,8 @@ M: Scott Wood <scottwood@freescale.com> 
L: qemu-ppc@nongnu.org

S: Supported

F: hw/ppc/e500*

F: hw/pci-host/ppce500.c

F: hw/net/fsl_etsec/



Character devices

M: Paolo Bonzini <pbonzini@redhat.com>

README

+106 −2
Original line number Diff line number Diff line 
Read the documentation in qemu-doc.html or on http://wiki.qemu-project.org

         QEMU README

         ===========



- QEMU team
 
QEMU is a generic and open source machine & userspace emulator and

virtualizer.



QEMU is capable of emulating a complete machine in software without any

need for hardware virtualization support. By using dynamic translation,

it achieves very good performance. QEMU can also integrate with the Xen

and KVM hypervisors to provide emulated hardware while allowing the

hypervisor to manage the CPU. With hypervisor support, QEMU can achieve

near native performance for CPUs. When QEMU emulates CPUs directly it is

capable of running operating systems made for one machine (e.g. an ARMv7

board) on a different machine (e.g. an x86_64 PC board).



QEMU is also capable of providing userspace API virtualization for Linux

and BSD kernel interfaces. This allows binaries compiled against one

architecture ABI (e.g. the Linux PPC64 ABI) to be run on a host using a

different architecture ABI (e.g. the Linux x86_64 ABI). This does not

involve any hardware emulation, simply CPU and syscall emulation.



QEMU aims to fit into a variety of use cases. It can be invoked directly

by users wishing to have full control over its behaviour and settings.

It also aims to facilitate integration into higher level management

layers, by providing a stable command line interface and monitor API.

It is commonly invoked indirectly via the libvirt library when using

open source applications such as oVirt, OpenStack and virt-manager.



QEMU as a whole is released under the GNU General Public License,

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



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





Submitting patches

==================



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



   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

qemu-devel@nongnu.org mailing list. All patches submitted must contain

a 'Signed-off-by' line from the author. Patches should follow the

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





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/



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

the bug is also known to affect latest upstream code, it can also be

reported via launchpad.



For additional information on bug reporting consult:



  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



Information on additional methods of contacting the community can be

found online via the QEMU website:



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



-- End

backends/baum.c

+12 −5
Original line number Diff line number Diff line
@@ -561,7 +561,10 @@ static void baum_close(struct CharDriverState *chr) 
    g_free(baum);

}



CharDriverState *chr_baum_init(void)

static CharDriverState *chr_baum_init(const char *id,

                                      ChardevBackend *backend,

                                      ChardevReturn *ret,

                                      Error **errp)

{

    BaumDriverState *baum;

    CharDriverState *chr;
@@ -586,14 +589,16 @@ CharDriverState *chr_baum_init(void) 


    baum->brlapi_fd = brlapi__openConnection(handle, NULL, NULL);

    if (baum->brlapi_fd == -1) {

        brlapi_perror("baum_init: brlapi_openConnection");

        error_setg(errp, "brlapi__openConnection: %s",

                   brlapi_strerror(brlapi_error_location()));

        goto fail_handle;

    }



    baum->cellCount_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, baum_cellCount_timer_cb, baum);



    if (brlapi__getDisplaySize(handle, &baum->x, &baum->y) == -1) {

        brlapi_perror("baum_init: brlapi_getDisplaySize");

        error_setg(errp, "brlapi__getDisplaySize: %s",

                   brlapi_strerror(brlapi_error_location()));

        goto fail;

    }
@@ -609,7 +614,8 @@ CharDriverState *chr_baum_init(void) 
        tty = BRLAPI_TTY_DEFAULT;



    if (brlapi__enterTtyMode(handle, tty, NULL) == -1) {

        brlapi_perror("baum_init: brlapi_enterTtyMode");

        error_setg(errp, "brlapi__enterTtyMode: %s",

                   brlapi_strerror(brlapi_error_location()));

        goto fail;

    }
@@ -629,7 +635,8 @@ fail_handle: 


static void register_types(void)

{

    register_char_driver("braille", CHARDEV_BACKEND_KIND_BRAILLE, NULL);

    register_char_driver("braille", CHARDEV_BACKEND_KIND_BRAILLE, NULL,

                         chr_baum_init);

}



type_init(register_types);

backends/msmouse.c

+6 −2
Original line number Diff line number Diff line
@@ -63,7 +63,10 @@ static void msmouse_chr_close (struct CharDriverState *chr) 
    g_free (chr);

}



CharDriverState *qemu_chr_open_msmouse(void)

static CharDriverState *qemu_chr_open_msmouse(const char *id,

                                              ChardevBackend *backend,

                                              ChardevReturn *ret,

                                              Error **errp)

{

    CharDriverState *chr;
@@ -79,7 +82,8 @@ CharDriverState *qemu_chr_open_msmouse(void) 


static void register_types(void)

{

    register_char_driver("msmouse", CHARDEV_BACKEND_KIND_MSMOUSE, NULL);

    register_char_driver("msmouse", CHARDEV_BACKEND_KIND_MSMOUSE, NULL,

                         qemu_chr_open_msmouse);

}



type_init(register_types);

backends/testdev.c

+6 −2
Original line number Diff line number Diff line
@@ -108,7 +108,10 @@ static void testdev_close(struct CharDriverState *chr) 
    g_free(testdev);

}



CharDriverState *chr_testdev_init(void)

static CharDriverState *chr_testdev_init(const char *id,

                                         ChardevBackend *backend,

                                         ChardevReturn *ret,

                                         Error **errp)

{

    TestdevCharState *testdev;

    CharDriverState *chr;
@@ -125,7 +128,8 @@ CharDriverState *chr_testdev_init(void) 


static void register_types(void)

{

    register_char_driver("testdev", CHARDEV_BACKEND_KIND_TESTDEV, NULL);

    register_char_driver("testdev", CHARDEV_BACKEND_KIND_TESTDEV, NULL,

                         chr_testdev_init);

}



type_init(register_types);