diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2010-05-03 16:00:22 -0300 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2010-05-03 16:00:22 -0300 |
| commit | c015d83dd73765c6ce5964e5f60714b583abb7a3 (patch) | |
| tree | d1d94ee7958b89c99d24955a26643e8c33e0e986 /Makefile.target | |
| parent | 4374df92c2ad0c0efbbe79e5ca26f34769fabd57 (diff) | |
| parent | cb4e5f8ed1b648c451491b10dc92b1af1e324535 (diff) | |
Merge commit 'cb4e5f8ed1b648c451491b10dc92b1af1e324535' into upstream-merge
* commit 'cb4e5f8ed1b648c451491b10dc92b1af1e324535': (25 commits)
block: read-only: open cdrom as read-only when using monitor's change command
fix whitespace bogon in some versions of make
Changes to usb-linux to conform to coding style
Add KVM CFLAGS to vhost build
QMP: Introduce RESUME event
virtio-9p: Create a syntactic shortcut for the file-system pass-thru
virtio-9p: Add P9_TFLUSH support
virtio-9p: Add P9_TREMOVE support.
virtio-9p: Add P9_TWSTAT support
virtio-9p: Add P9_TCREATE support
virtio-9p: Add P9_TWRITE support
virtio-9p: Add P9_TCLUNK support
virtio-9p: Add P9_TREAD support
virtio-9p: Add P9_TOPEN support.
virtio-9p: Add P9_TWALK support
virtio-9p: Add P9_TSTAT support
virtio-9p: Add P9_TATTACH support.
virtio-9p: Add P9_TVERSION support
virtio-9p: Add sg helper functions
virtio-9p: Add stat and mode related helper functions.
...
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'Makefile.target')
| -rw-r--r-- | Makefile.target | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.target b/Makefile.target index 8f36a705f..cb5ab2ae5 100644 --- a/Makefile.target +++ b/Makefile.target @@ -33,7 +33,7 @@ PROGS=$(QEMU_PROG) LIBS+=-lm -kvm.o kvm-all.o: QEMU_CFLAGS+=$(KVM_CFLAGS) +kvm.o kvm-all.o vhost.o vhost_net.o: QEMU_CFLAGS+=$(KVM_CFLAGS) CFLAGS += $(KVM_CFLAGS) @@ -178,6 +178,7 @@ obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o obj-y += vhost_net.o obj-$(CONFIG_VHOST_NET) += vhost.o +obj-$(CONFIG_LINUX) += virtio-9p.o virtio-9p-debug.o virtio-9p-local.o obj-y += rwhandler.o obj-$(CONFIG_KVM) += kvm.o kvm-all.o obj-$(CONFIG_NO_KVM) += kvm-stub.o |