Commit a9038e5e 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 2017-10-16

# gpg: Signature made Mon 16 Oct 2017 21:32:05 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:
  Add myself as maintainer for TPM code
  filter-mirror: segfault when specifying non existent device
  MAINTAINERS: Track default-configs/pci.mak
  MAINTAINERS: Fix Sun4v file
  MAINTAINERS: Clean up SCSI device section
  include/hw/or-irq.h: Drop unused in_irqs field
  io: Add missing GCC_FMT_ATTR (fix -Werror=suggest-attribute=format)
  os-posix: Drop misleading comment
  linux-user: Add some random ioctls
  futex: add missing header guards
  ui/gtk: Fix deprecation of vte_terminal_copy_clipboard
  gitignore: ignore check-qlit test
  linux-user: remove duplicate break in syscall
  qemu-doc.texi: remove trailing whitespace

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents dabc50e4 6b4f250b

MAINTAINERS

+5 −8
Original line number Diff line number Diff line
@@ -778,7 +778,7 @@ F: pc-bios/openbios-sparc64 
Sun4v

M: Artyom Tarasenko <atar4qemu@gmail.com>

S: Maintained

F: hw/sparc64/sun4v.c

F: hw/sparc64/niagara.c

F: hw/timer/sun4v-rtc.c

F: include/hw/timer/sun4v-rtc.h
@@ -934,6 +934,7 @@ F: hw/pci/* 
F: hw/pci-bridge/*

F: docs/pci*

F: docs/specs/*pci*

F: default-configs/pci.mak



ACPI/SMBIOS

M: Michael S. Tsirkin <mst@redhat.com>
@@ -980,16 +981,10 @@ SCSI 
M: Paolo Bonzini <pbonzini@redhat.com>

S: Supported

F: include/hw/scsi/*

F: include/scsi/*

F: hw/scsi/*

F: util/scsi*

F: tests/virtio-scsi-test.c

T: git git://github.com/bonzini/qemu.git scsi-next



LSI53C895A

S: Orphan

F: hw/scsi/lsi53c895a.c



SSI

M: Peter Crosthwaite <crosthwaite.peter@gmail.com>

M: Alistair Francis <alistair.francis@xilinx.com>
@@ -1540,12 +1535,14 @@ F: docs/devel/tracing.txt 
T: git git://github.com/stefanha/qemu.git tracing



TPM

S: Orphan

M: Stefan Berger <stefanb@linux.vnet.ibm.com>

S: Maintained

F: tpm.c

F: hw/tpm/*

F: include/hw/acpi/tpm.h

F: include/sysemu/tpm*

F: qapi/tpm.json

F: backends/tpm.c



Checkpatch

S: Odd Fixes

include/hw/or-irq.h

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ struct OrIRQState { 
    DeviceState parent_obj;



    qemu_irq out_irq;

    qemu_irq *in_irqs;

    bool levels[MAX_OR_LINES];

    uint16_t num_lines;

};

include/qemu/futex.h

+5 −0
Original line number Diff line number Diff line
@@ -11,6 +11,9 @@ 
 *

 */



#ifndef QEMU_FUTEX_H

#define QEMU_FUTEX_H



#include <sys/syscall.h>

#include <linux/futex.h>
@@ -34,3 +37,5 @@ static inline void qemu_futex_wait(void *f, unsigned val) 
        }

    }

}



#endif /* QEMU_FUTEX_H */

io/channel-websock.c

+4 −3
Original line number Diff line number Diff line
@@ -152,7 +152,8 @@ enum { 
    QIO_CHANNEL_WEBSOCK_OPCODE_PONG = 0xA

};



static void qio_channel_websock_handshake_send_res(QIOChannelWebsock *ioc,

static void GCC_FMT_ATTR(2, 3)

qio_channel_websock_handshake_send_res(QIOChannelWebsock *ioc,

                                       const char *resmsg,

                                       ...)

{

linux-user/ioctls.h

+5 −0
Original line number Diff line number Diff line
@@ -173,6 +173,11 @@ 
  IOCTL(SIOCGSTAMP, IOC_R, MK_PTR(MK_STRUCT(STRUCT_timeval)))

  IOCTL(SIOCGSTAMPNS, IOC_R, MK_PTR(MK_STRUCT(STRUCT_timespec)))



  IOCTL(RNDGETENTCNT, IOC_R, MK_PTR(TYPE_INT))

  IOCTL(RNDADDTOENTCNT, IOC_W, MK_PTR(TYPE_INT))

  IOCTL(RNDZAPENTCNT, 0, TYPE_NULL)

  IOCTL(RNDCLEARPOOL, 0, TYPE_NULL)



  IOCTL(CDROMPAUSE, 0, TYPE_NULL)

  IOCTL(CDROMSTART, 0, TYPE_NULL)

  IOCTL(CDROMSTOP, 0, TYPE_NULL)