Commit d1186a33 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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

* stefanha/trivial-patches:
  ivshmem, qdev-monitor: fix order of qerror parameters
  iov_send_recv(): Handle zero bytes case even if OS does not
  framebuffer: Fix spelling in comment (leight -> height)
  Spelling fix in comment (peripherans -> peripherals)
  docs: Fix spelling (propery -> property)
  trace: Fix "Qemu" -> "QEMU"
  cputlb.c: Fix out of date comment
  ehci: fix assertion typo
  Makefile: Avoid explicit list of directories in clean target
parents fdef621b c3594ed7

Makefile

+2 −5
Original line number Diff line number Diff line
@@ -214,13 +214,10 @@ clean: 
# avoid old build problems by removing potentially incorrect old files

	rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h

	rm -f qemu-options.def

	rm -f *.o *.d *.a *.lo $(TOOLS) $(HELPERS-y) qemu-ga TAGS cscope.* *.pod *~ */*~

	find . -name '*.[od]' -exec rm -f {} +

	rm -f *.a *.lo $(TOOLS) $(HELPERS-y) qemu-ga TAGS cscope.* *.pod *~ */*~

	rm -Rf .libs

	rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d net/*.o net/*.d fsdev/*.o fsdev/*.d ui/*.o ui/*.d qapi/*.o qapi/*.d qga/*.o qga/*.d

	rm -f qom/*.o qom/*.d libuser/qom/*.o libuser/qom/*.d

	rm -f hw/usb/*.o hw/usb/*.d hw/*.o hw/*.d

	rm -f qemu-img-cmds.h

	rm -f trace/*.o trace/*.d

	rm -f trace-dtrace.dtrace trace-dtrace.dtrace-timestamp

	@# May not be present in GENERATED_HEADERS

	rm -f trace-dtrace.h trace-dtrace.h-timestamp

cputlb.c

+3 −1
Original line number Diff line number Diff line
@@ -312,7 +312,9 @@ void tlb_set_page(CPUArchState *env, target_ulong vaddr, 


/* NOTE: this function can trigger an exception */

/* NOTE2: the returned address is not exactly the physical address: it

   is the offset relative to phys_ram_base */

 * is actually a ram_addr_t (in system mode; the user mode emulation

 * version of this function returns a guest virtual address).

 */

tb_page_addr_t get_page_addr_code(CPUArchState *env1, target_ulong addr)

{

    int mmu_idx, page_index, pd;

docs/bootindex.txt

+1 −1
Original line number Diff line number Diff line 
= Bootindex propery =

= Bootindex property =



Block and net devices have bootindex property. This property is used to

determine the order in which firmware will consider devices for booting

hw/framebuffer.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ void framebuffer_update_display( 
    MemoryRegion *address_space,

    target_phys_addr_t base,

    int cols, /* Width in pixels.  */

    int rows, /* Leight in pixels.  */

    int rows, /* Height in pixels.  */

    int src_width, /* Length of source line, in bytes.  */

    int dest_row_pitch, /* Bytes between adjacent horizontal output pixels.  */

    int dest_col_pitch, /* Bytes between adjacent vertical output pixels.  */

hw/ivshmem.c

+2 −1
Original line number Diff line number Diff line
@@ -677,7 +677,8 @@ static int pci_ivshmem_init(PCIDevice *dev) 
    }



    if (s->role_val == IVSHMEM_PEER) {

        error_set(&s->migration_blocker, QERR_DEVICE_FEATURE_BLOCKS_MIGRATION, "ivshmem", "peer mode");

        error_set(&s->migration_blocker, QERR_DEVICE_FEATURE_BLOCKS_MIGRATION,

                  "peer mode", "ivshmem");

        migrate_add_blocker(s->migration_blocker);

    }