提交 625f9e1f 编写于 作者: A Anthony Liguori

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

...@@ -229,7 +229,7 @@ in the schema. The following files are generated: ...@@ -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
......
/* /*
* 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.
......
...@@ -585,7 +585,7 @@ main( ...@@ -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);
......
...@@ -51,7 +51,7 @@ static struct GAState *ga_state; ...@@ -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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册