OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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

This commit is contained in:
Anthony Liguori 2011-09-01 13:57:19 -05:00
parent a952c570c8 2542bfd51c
commit 625f9e1f54
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/qapi-code-gen.txt
View File

@ -229,7 +229,7 @@ in the schema. The following files are generated:
$(prefix)qmp-marshal.c: command marshal/dispatch functions for each $(prefix)qmp-marshal.c: command marshal/dispatch functions for each
QMP command defined in the schema. Functions QMP command defined in the schema. Functions
generated by qapi-visit.py are used to generated by qapi-visit.py are used to
convert QObjects recieved from the wire into convert QObjects received from the wire into
function parameters, and uses the same function parameters, and uses the same
visitor functions to convert native C return visitor functions to convert native C return
values to QObjects from transmission back values to QObjects from transmission back

2
hw/pci-stub.c
View File

@ -1,5 +1,5 @@
/* /*
* PCI stubs for plathome that doesn't support pci bus. * PCI stubs for platforms that don't support pci bus.
* *
* Copyright (c) 2010 Isaku Yamahata <yamahata at valinux co jp> * Copyright (c) 2010 Isaku Yamahata <yamahata at valinux co jp>
* VA Linux Systems Japan K.K. * VA Linux Systems Japan K.K.

2
libcacard/vscclient.c
View File

@ -585,7 +585,7 @@ main(
printf(" recv APDU: "); printf(" recv APDU: ");
print_byte_array(pbSendBuffer, mhHeader.length); print_byte_array(pbSendBuffer, mhHeader.length);
} }
/* Transmit recieved APDU */ /* Transmit received APDU */
dwSendLength = mhHeader.length; dwSendLength = mhHeader.length;
dwRecvLength = sizeof(pbRecvBuffer); dwRecvLength = sizeof(pbRecvBuffer);
reader = vreader_get_reader_by_id(mhHeader.reader_id); reader = vreader_get_reader_by_id(mhHeader.reader_id);

2
qemu-ga.c
View File

@ -51,7 +51,7 @@ static struct GAState *ga_state;
static void quit_handler(int sig) static void quit_handler(int sig)
{ {
g_debug("recieved signal num %d, quitting", sig); g_debug("received signal num %d, quitting", sig);
if (g_main_loop_is_running(ga_state->main_loop)) { if (g_main_loop_is_running(ga_state->main_loop)) {
g_main_loop_quit(ga_state->main_loop); g_main_loop_quit(ga_state->main_loop);