mirror of https://github.com/xqemu/xqemu.git
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
This commit is contained in:
commit
0db4c324a8
|
@ -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
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* 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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -3806,7 +3806,7 @@ static void cout_tm64(DisasContext *s, DisasOps *o)
|
|||
}
|
||||
|
||||
/* ====================================================================== */
|
||||
/* The "PREPeration" generators. These initialize the DisasOps.OUT fields
|
||||
/* The "PREParation" generators. These initialize the DisasOps.OUT fields
|
||||
with the TCG register to which we will write. Used in combination with
|
||||
the "wout" generators, in some cases we need a new temporary, and in
|
||||
some cases we can write to a TCG global. */
|
||||
|
|
|
@ -776,7 +776,7 @@ pvscsi_update_irq_msi(void) "sending MSI notification"
|
|||
pvscsi_cmp_ring_put(unsigned long addr) "got completion descriptor 0x%lx"
|
||||
pvscsi_msg_ring_put(unsigned long addr) "got message descriptor 0x%lx"
|
||||
pvscsi_complete_request(uint64_t context, uint64_t len, uint8_t sense_key) "completion: ctx: 0x%"PRIx64", len: 0x%"PRIx64", sense key: %u"
|
||||
pvscsi_get_sg_list(int nsg, size_t size) "get SG list: depth: %u, size: %lu"
|
||||
pvscsi_get_sg_list(int nsg, size_t size) "get SG list: depth: %u, size: %zu"
|
||||
pvscsi_get_next_sg_elem(uint32_t flags) "unknown flags in SG element (val: 0x%x)"
|
||||
pvscsi_command_complete_not_found(uint32_t tag) "can't find request for tag 0x%x"
|
||||
pvscsi_command_complete_data_run(void) "not all data required for command transferred"
|
||||
|
|
Loading…
Reference in New Issue