diff options
| -rw-r--r-- | MAINTAINERS | 13 | ||||
| -rw-r--r-- | include/hw/or-irq.h | 1 | ||||
| -rw-r--r-- | include/qemu/futex.h | 5 | ||||
| -rw-r--r-- | io/channel-websock.c | 7 | ||||
| -rw-r--r-- | linux-user/ioctls.h | 5 | ||||
| -rw-r--r-- | linux-user/syscall.c | 2 | ||||
| -rw-r--r-- | linux-user/syscall_defs.h | 7 | ||||
| -rw-r--r-- | net/filter-mirror.c | 6 | ||||
| -rw-r--r-- | os-posix.c | 1 | ||||
| -rw-r--r-- | qemu-doc.texi | 2 | ||||
| -rw-r--r-- | tests/.gitignore | 1 |
11 files changed, 35 insertions, 15 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b79633cb1b..9522d1b621 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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 diff --git a/include/hw/or-irq.h b/include/hw/or-irq.h index d400a8120b..fd900fcf19 100644 --- a/include/hw/or-irq.h +++ b/include/hw/or-irq.h @@ -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; }; diff --git a/include/qemu/futex.h b/include/qemu/futex.h index bb7dc9e296..91ae88966e 100644 --- a/include/qemu/futex.h +++ b/include/qemu/futex.h @@ -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 */ diff --git a/io/channel-websock.c b/io/channel-websock.c index df2c3a9f99..87ebdebfc0 100644 --- a/io/channel-websock.c +++ b/io/channel-websock.c @@ -152,9 +152,10 @@ enum { QIO_CHANNEL_WEBSOCK_OPCODE_PONG = 0xA }; -static void qio_channel_websock_handshake_send_res(QIOChannelWebsock *ioc, - const char *resmsg, - ...) +static void GCC_FMT_ATTR(2, 3) +qio_channel_websock_handshake_send_res(QIOChannelWebsock *ioc, + const char *resmsg, + ...) { va_list vargs; char *response; diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h index e6997ff230..35cad6f944 100644 --- a/linux-user/ioctls.h +++ b/linux-user/ioctls.h @@ -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) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 9b6364a266..9d4cc4cf5d 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -59,6 +59,7 @@ int __clone2(int (*fn)(void *), void *child_stack_base, #include <linux/icmp.h> #include <linux/icmpv6.h> #include <linux/errqueue.h> +#include <linux/random.h> #include "qemu-common.h" #ifdef CONFIG_TIMERFD #include <sys/timerfd.h> @@ -3131,7 +3132,6 @@ set_timeout: case TARGET_SO_RCVLOWAT: optname = SO_RCVLOWAT; break; - break; default: goto unimplemented; } diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index 40c5027e93..b3d55e35ac 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -1060,6 +1060,13 @@ struct target_pollfd { #define TARGET_SIOCGIWNAME 0x8B01 /* get name == wireless protocol */ +/* From <linux/random.h> */ + +#define TARGET_RNDGETENTCNT TARGET_IOR('R', 0x00, int) +#define TARGET_RNDADDTOENTCNT TARGET_IOW('R', 0x01, int) +#define TARGET_RNDZAPENTCNT TARGET_IO('R', 0x04) +#define TARGET_RNDCLEARPOOL TARGET_IO('R', 0x06) + /* From <linux/fs.h> */ #define TARGET_BLKROSET TARGET_IO(0x12,93) /* set device read-only (0 = read-write) */ diff --git a/net/filter-mirror.c b/net/filter-mirror.c index 90e2c92337..ce0dc23c2a 100644 --- a/net/filter-mirror.c +++ b/net/filter-mirror.c @@ -213,6 +213,12 @@ static void filter_mirror_setup(NetFilterState *nf, Error **errp) MirrorState *s = FILTER_MIRROR(nf); Chardev *chr; + if (s->outdev == NULL) { + error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND, "filter-mirror parameter"\ + " 'outdev' cannot be empty"); + return; + } + chr = qemu_chr_find(s->outdev); if (chr == NULL) { error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND, diff --git a/os-posix.c b/os-posix.c index 92e9d85215..b9c2343b1e 100644 --- a/os-posix.c +++ b/os-posix.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include <sys/wait.h> -/*needed for MAP_POPULATE before including qemu-options.h */ #include <pwd.h> #include <grp.h> #include <libgen.h> diff --git a/qemu-doc.texi b/qemu-doc.texi index d8bb2c664f..8c10956a66 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -105,7 +105,7 @@ QEMU full system emulation has the following features: QEMU uses a full software MMU for maximum portability. @item -QEMU can optionally use an in-kernel accelerator, like kvm. The accelerators +QEMU can optionally use an in-kernel accelerator, like kvm. The accelerators execute most of the guest code natively, while continuing to emulate the rest of the machine. diff --git a/tests/.gitignore b/tests/.gitignore index cf6d99c91e..53cb2efaee 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -6,6 +6,7 @@ check-qdict check-qnum check-qjson check-qlist +check-qlit check-qnull check-qstring check-qom-interface |