Commit 625f9e1f authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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

parents a952c570 2542bfd5

docs/qapi-code-gen.txt

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ in the schema. The following files are generated: 
$(prefix)qmp-marshal.c: command marshal/dispatch functions for each

                        QMP command defined in the schema. Functions

                        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

                        visitor functions to convert native C return

                        values to QObjects from transmission back

hw/pci-stub.c

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

 * 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>

 *                    VA Linux Systems Japan K.K.

libcacard/vscclient.c

+1 −1
Original line number Diff line number Diff line
@@ -585,7 +585,7 @@ main( 
                printf(" recv APDU: ");

                print_byte_array(pbSendBuffer, mhHeader.length);

            }

            /* Transmit recieved APDU */

            /* Transmit received APDU */

            dwSendLength = mhHeader.length;

            dwRecvLength = sizeof(pbRecvBuffer);

            reader = vreader_get_reader_by_id(mhHeader.reader_id);

qemu-ga.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static struct GAState *ga_state; 


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)) {

        g_main_loop_quit(ga_state->main_loop);