diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2010-07-04 07:29:43 -0300 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2010-07-04 07:29:43 -0300 |
| commit | 3353426cc7131045d603587df0647a747323f474 (patch) | |
| tree | c780420ff1cafdb0b7d8fb38dc306b5dc08f2d21 /.gitignore | |
| parent | 554147f5be31a0656fea120bd530a9b3370d425c (diff) | |
| parent | be41cbe0368b5becac02a1bf885341ba25ba9a9e (diff) | |
Merge commit 'be41cbe0368b5becac02a1bf885341ba25ba9a9e' into upstream-merge
* commit 'be41cbe0368b5becac02a1bf885341ba25ba9a9e':
kvm: Switch kvm_update_guest_debug to run_on_cpu
win32: Add missing function ffs
win32: Add define for missing EPROTONOSUPPORT
.gitignore: Ignore libdis*, qemu-options.def
x86: Clean up CPU reset
x86: Fix INIT processing
mask all interrupts when MASTER_DISABLE is set
fw_cfg: convert to qdev
Remove useless device dependency of HAS_AUDIO
virtio-pci: fix bus master bug setting on load
Factorize common migration incoming code
Exit if incoming migration fails
virtio-9p: Implement Security model for mksock using mknod.
virtio-9p: Implement Security model for mknod
virtio-9p: Security model for symlink and readlink
virtio-9p: Security model for mkdir
virtio-9p: Security model for create/open2
virtio-9p: Implemented Security model for lstat and fstat
virtio-9p: Security model for chown
virtio-9p: Security model for chmod
Conflicts:
kvm-all.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 6e04a311c..b3afd4b33 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ config-target.* *-darwin-user *-linux-user *-bsd-user +libdis* libhw32 libhw64 libuser @@ -21,6 +22,7 @@ qemu-img qemu-nbd qemu-nbd.8 qemu-nbd.pod +qemu-options.def qemu-options.texi qemu-img-cmds.texi qemu-img-cmds.h |