Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20150303-1' into staging

[qemu.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 6e74d63ea59cdf68fdb91143b77e95fcfca7914a..090f974cb91c7e7b26616b09174af186624dd112 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,24 +4,33 @@
 /config-host.*
 /config-target.*
 /config.status
 /config-host.*
 /config-target.*
 /config.status

+/config-temp

 /trace/generated-tracers.h
 /trace/generated-tracers.c
 /trace/generated-tracers-dtrace.h
 /trace/generated-tracers.dtrace
 /trace/generated-events.h
 /trace/generated-events.c
 /trace/generated-tracers.h
 /trace/generated-tracers.c
 /trace/generated-tracers-dtrace.h
 /trace/generated-tracers.dtrace
 /trace/generated-events.h
 /trace/generated-events.c

+/trace/generated-helpers-wrappers.h
+/trace/generated-helpers.h
+/trace/generated-helpers.c
+/trace/generated-tcg-tracers.h
+/trace/generated-ust-provider.h
+/trace/generated-ust.c

 /libcacard/trace/generated-tracers.c
 *-timestamp
 /*-softmmu
 /*-darwin-user
 /*-linux-user
 /*-bsd-user
 /libcacard/trace/generated-tracers.c
 *-timestamp
 /*-softmmu
 /*-darwin-user
 /*-linux-user
 /*-bsd-user

-libdis*
-libuser
+/libdis*
+/libuser

 /linux-headers/asm
 /linux-headers/asm

+/qga/qapi-generated

 /qapi-generated
 /qapi-types.[ch]
 /qapi-visit.[ch]
 /qapi-generated
 /qapi-types.[ch]
 /qapi-visit.[ch]

+/qapi-event.[ch]

 /qmp-commands.h
 /qmp-marshal.c
 /qemu-doc.html
 /qmp-commands.h
 /qmp-marshal.c
 /qemu-doc.html


@@ -46,19 +55,9 @@ libuser
 /qemu-monitor.texi
 /qmp-commands.txt
 /vscclient
 /qemu-monitor.texi
 /qmp-commands.txt
 /vscclient

-/test-bitops
-/test-coroutine
-/test-int128
-/test-opts-visitor
-/test-qmp-input-visitor
-/test-qmp-output-visitor
-/test-string-input-visitor
-/test-string-output-visitor
-/test-visitor-serialization

 /fsdev/virtfs-proxy-helper
 /fsdev/virtfs-proxy-helper.1
 /fsdev/virtfs-proxy-helper.pod
 /fsdev/virtfs-proxy-helper
 /fsdev/virtfs-proxy-helper.1
 /fsdev/virtfs-proxy-helper.pod

-/.gdbinit

 *.a
 *.aux
 *.cp
 *.a
 *.aux
 *.cp


@@ -87,12 +86,8 @@ libuser
 *.pc
 .libs
 .sdk
 *.pc
 .libs
 .sdk

-*.swp
-*.orig
-.pc

 *.gcda
 *.gcno
 *.gcda
 *.gcno

-patches

 /pc-bios/bios-pq/status
 /pc-bios/vgabios-pq/status
 /pc-bios/optionrom/linuxboot.asm
 /pc-bios/bios-pq/status
 /pc-bios/vgabios-pq/status
 /pc-bios/optionrom/linuxboot.asm


@@ -114,3 +109,4 @@ cscope.*
 tags
 TAGS
 *~
 tags
 TAGS
 *~

+/tests/qemu-iotests/common.env