Commit 0db4c324 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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

# By Andreas Färber (1) and others
# Via Michael Tokarev
* mjt/trivial-patches:
  pvscsi: fix compilation on 32 bit hosts
  Trivial grammar and spelling fixes
  configure: Pick up libseccomp include path
parents e9016ee2 6e860b5d

configure

+1 −0
Original line number Diff line number Diff line
@@ -1499,6 +1499,7 @@ libs_softmmu="$libs_softmmu -lz" 
if test "$seccomp" != "no" ; then

    if $pkg_config --atleast-version=1.0.0 libseccomp --modversion >/dev/null 2>&1; then

        libs_softmmu="$libs_softmmu `$pkg_config --libs libseccomp`"

        QEMU_CFLAGS="$QEMU_CFLAGS `$pkg_config --cflags libseccomp`"

	seccomp="yes"

    else

	if test "$seccomp" = "yes"; then

hw/moxie/moxiesim.c

+1 −1
Original line number Diff line number Diff line 
/*

 * QEMU/moxiesim emulation

 *

 * Emulates a very simple machine model similiar to the one use by the

 * Emulates a very simple machine model similar to the one used by the

 * GDB moxie simulator.

 *

 * Copyright (c) 2008, 2009, 2010, 2013 Anthony Green

include/hw/stream.h

+3 −3
Original line number Diff line number Diff line
@@ -25,9 +25,9 @@ typedef struct StreamSlaveClass { 
    /**

     * can push - determine if a stream slave is capable of accepting at least

     * one byte of data. Returns false if cannot accept. If not implemented, the

     * slave is assumed to always be capable of recieveing.

     * slave is assumed to always be capable of receiving.

     * @notify: Optional callback that the slave will call when the slave is

     * capable of recieving again. Only called if false is returned.

     * capable of receiving again. Only called if false is returned.

     * @notify_opaque: opaque data to pass to notify call.

     */

    bool (*can_push)(StreamSlave *obj, StreamCanPushNotifyFn notify,
@@ -37,7 +37,7 @@ typedef struct StreamSlaveClass { 
     * returned. If the slave short returns, the master must wait before trying

     * again, the slave may continue to just return 0 waiting for the vm time to

     * advance. The can_push() function can be used to trap the point in time

     * where the slave is ready to recieve again, otherwise polling on a QEMU

     * where the slave is ready to receive again, otherwise polling on a QEMU

     * timer will work.

     * @obj: Stream slave to push to

     * @buf: Data to write

include/sysemu/rng.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ struct RngBackendClass 
    ObjectClass parent_class;



    void (*request_entropy)(RngBackend *s, size_t size,

                            EntropyReceiveFunc *recieve_entropy, void *opaque);

                            EntropyReceiveFunc *receive_entropy, void *opaque);

    void (*cancel_requests)(RngBackend *s);



    void (*opened)(RngBackend *s, Error **errp);

qmp-commands.hx

+1 −1
Original line number Diff line number Diff line
@@ -2493,7 +2493,7 @@ The main json-object contains the following: 
            byte (json-int)

            These are sent over the wire much more efficiently.

         - "skipped": number of skipped zero pages (json-int)

         - "normal" : number of whole pages transfered.  I.e. they

         - "normal" : number of whole pages transferred.  I.e. they

            were not sent as duplicate or xbzrle pages (json-int)

         - "normal-bytes" : number of bytes transferred in whole

            pages. This is just normal pages times size of one page,