Commit a20fd901 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-fetch' into staging 

trivial patches for 2016-10-08

# gpg: Signature made Sat 08 Oct 2016 09:56:38 BST
# gpg:                using RSA key 0x701B4F6B1A693E59
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg:                 aka "Michael Tokarev <mjt@corpit.ru>"
# gpg:                 aka "Michael Tokarev <mjt@debian.org>"
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D  4324 457C E0A0 8044 65C5
#      Subkey fingerprint: 7B73 BAD6 8BE7 A2C2 8931  4B22 701B 4F6B 1A69 3E59

* remotes/mjt/tags/trivial-patches-fetch: (26 commits)
  net/filter-mirror: Fix mirror initial check typo
  virtio: rename the bar index field name in VirtIOPCIProxy
  linux-user: include <poll.h> instead of <sys/poll.h>
  char: fix missing return in error path for chardev TLS init
  CODING_STYLE: Fix a typo ("have" vs. "has")
  bitmap: refine and move BITMAP_{FIRST/LAST}_WORD_MASK
  build-sys: fix find-in-path
  m68k: change default system clock for m5208evb
  exec: remove unused compacted argument
  usb: ehci: fix memory leak in ehci_process_itd
  qapi: make the json schema files more regular.
  maint: Add module_block.h to .gitignore
  MAINTAINERS: Some updates related to the SH4 machines
  MAINTAINERS: Add some more MIPS related files
  MAINTAINERS: Add usermode related config files
  MAINTAINERS: Add some more pattern to recognize all win32 related files
  MAINTAINERS: Add some more rocker related files
  MAINTAINERS: Add header files to CRIS section
  MAINTAINERS: Add some more files to the virtio section
  MAINTAINERS: Add some SPARC machine related files
  ...

# Conflicts:
#	MAINTAINERS
parents 0cb01557 52cfcb46

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
/qemu-monitor-info.texi

/qemu-version.h

/qemu-version.h.tmp

/module_block.h

/vscclient

/fsdev/virtfs-proxy-helper

*.[1-9]

CODING_STYLE

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ patches before submitting. 
Of course, the most important aspect in any coding style is whitespace.

Crusty old coders who have trouble spotting the glasses on their noses

can tell the difference between a tab and eight spaces from a distance

of approximately fifteen parsecs.  Many a flamewar have been fought and

of approximately fifteen parsecs.  Many a flamewar has been fought and

lost on this issue.



QEMU indents are four spaces.  Tabs are never used, except in Makefiles

MAINTAINERS

+33 −5
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ M: Edgar E. Iglesias <edgar.iglesias@gmail.com> 
S: Maintained

F: target-cris/

F: hw/cris/

F: include/hw/cris/

F: tests/tcg/cris/

F: disas/cris.c
@@ -149,6 +150,13 @@ M: Yongbok Kim <yongbok.kim@imgtec.com> 
S: Maintained

F: target-mips/

F: hw/mips/

F: hw/misc/mips_*

F: hw/intc/mips_gic.c

F: hw/timer/mips_gictimer.c

F: include/hw/mips/

F: include/hw/misc/mips_*

F: include/hw/intc/mips_gic.h

F: include/hw/timer/mips_gictimer.h

F: tests/tcg/mips/

F: disas/mips.c
@@ -157,6 +165,8 @@ M: Anthony Green <green@moxielogic.com> 
S: Maintained

F: target-moxie/

F: disas/moxie.c

F: hw/moxie/

F: default-configs/moxie-softmmu.mak



OpenRISC

M: Jia Liu <proljc@gmail.com>
@@ -319,6 +329,9 @@ L: qemu-devel@nongnu.org 
M: Stefan Weil <sw@weilnetz.de>

S: Maintained

F: *win32*

F: */*win32*

F: include/*/*win32*

X: qga/*win32*

F: qemu.nsi



ARM Machines
@@ -662,31 +675,38 @@ R2D 
M: Magnus Damm <magnus.damm@gmail.com>

S: Maintained

F: hw/sh4/r2d.c

F: hw/intc/sh_intc.c

F: hw/timer/sh_timer.c



Shix

M: Magnus Damm <magnus.damm@gmail.com>

S: Orphan

S: Odd Fixes

F: hw/sh4/shix.c



SPARC Machines

--------------

Sun4m

M: Blue Swirl <blauwirbel@gmail.com>

M: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

S: Maintained

F: hw/sparc/sun4m.c

F: hw/dma/sparc32_dma.c

F: hw/dma/sun4m_iommu.c

F: include/hw/sparc/sparc32_dma.h

F: include/hw/sparc/sun4m.h

F: pc-bios/openbios-sparc32



Sun4u

M: Blue Swirl <blauwirbel@gmail.com>

M: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

S: Maintained

F: hw/sparc64/sun4u.c

F: pc-bios/openbios-sparc64



Leon3

M: Fabien Chouteau <chouteau@adacore.com>

S: Maintained

F: hw/sparc/leon3.c

F: hw/*/grlib*

F: include/hw/sparc/grlib.h



S390 Machines

-------------
@@ -926,6 +946,8 @@ virtio 
M: Michael S. Tsirkin <mst@redhat.com>

S: Supported

F: hw/*/virtio*

F: hw/virtio/Makefile.objs

F: hw/virtio/trace-events

F: net/vhost-user.c

F: include/hw/virtio/

F: tests/virtio-balloon-test.c
@@ -1013,6 +1035,8 @@ Rocker 
M: Jiri Pirko <jiri@resnulli.us>

S: Maintained

F: hw/net/rocker/

F: tests/rocker/

F: docs/specs/rocker.txt



NVDIMM

M: Xiao Guangrong <guangrong.xiao@linux.intel.com>
@@ -1044,6 +1068,7 @@ M: Gerd Hoffmann <kraxel@redhat.com> 
S: Maintained

F: audio/

F: hw/audio/

F: include/hw/audio/

F: tests/ac97-test.c

F: tests/es1370-test.c

F: tests/intel-hda-test.c
@@ -1181,8 +1206,9 @@ Human Monitor (HMP) 
M: Dr. David Alan Gilbert <dgilbert@redhat.com>

S: Maintained

F: monitor.c

F: hmp.c

F: hmp-commands.hx

F: hmp.[ch]

F: hmp-commands*.hx

F: include/monitor/hmp-target.h



Network device backends

M: Jason Wang <jasowang@redhat.com>
@@ -1407,11 +1433,13 @@ F: user-exec.c 
BSD user

S: Orphan

F: bsd-user/

F: default-configs/*-bsd-user.mak



Linux user

M: Riku Voipio <riku.voipio@iki.fi>

S: Maintained

F: linux-user/

F: default-configs/*-linux-user.mak



Tiny Code Generator (TCG)

-------------------------

exec.c

+3 −5
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ static void phys_page_set(AddressSpaceDispatch *d, 
/* Compact a non leaf page entry. Simply detect that the entry has a single child,

 * and update our entry so we can skip it and go directly to the destination.

 */

static void phys_page_compact(PhysPageEntry *lp, Node *nodes, unsigned long *compacted)

static void phys_page_compact(PhysPageEntry *lp, Node *nodes)

{

    unsigned valid_ptr = P_L2_SIZE;

    int valid = 0;
@@ -275,7 +275,7 @@ static void phys_page_compact(PhysPageEntry *lp, Node *nodes, unsigned long *com 
        valid_ptr = i;

        valid++;

        if (p[i].skip) {

            phys_page_compact(&p[i], nodes, compacted);

            phys_page_compact(&p[i], nodes);

        }

    }
@@ -307,10 +307,8 @@ static void phys_page_compact(PhysPageEntry *lp, Node *nodes, unsigned long *com 


static void phys_page_compact_all(AddressSpaceDispatch *d, int nodes_nb)

{

    DECLARE_BITMAP(compacted, nodes_nb);



    if (d->phys_map.skip) {

        phys_page_compact(&d->phys_map, d->map.nodes, compacted);

        phys_page_compact(&d->phys_map, d->map.nodes);

    }

}

hw/arm/nseries.c

+1 −2
Original line number Diff line number Diff line
@@ -786,8 +786,7 @@ static void n8x0_cbus_setup(struct n800_s *s) 


static void n8x0_uart_setup(struct n800_s *s)

{

    CharDriverState *radio = uart_hci_init(

                    qdev_get_gpio_in(s->mpu->gpio, N8X0_BT_HOST_WKUP_GPIO));

    CharDriverState *radio = uart_hci_init();



    qdev_connect_gpio_out(s->mpu->gpio, N8X0_BT_RESET_GPIO,

                    csrhci_pins_get(radio)[csrhci_pin_reset]);