diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-12-02 12:58:14 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-12-02 12:58:14 +0200 |
| commit | 41efb9b5532a76ddad1344ae83c963095af2c2ca (patch) | |
| tree | a260c3648cf9131bfd4383e2785812736f795e12 /Makefile | |
| parent | Merge commit 'b0293e54af32bcf08f4b4e5b4b472534de343972' into upstream-merge (diff) | |
| parent | msix: clear pending bit of an unused vector (diff) | |
| download | qemu-kvm-41efb9b5532a76ddad1344ae83c963095af2c2ca.tar.gz qemu-kvm-41efb9b5532a76ddad1344ae83c963095af2c2ca.tar.bz2 qemu-kvm-41efb9b5532a76ddad1344ae83c963095af2c2ca.zip | |
Merge commit '98304c846d8866dae6322ef400ce6595b23cfc41' into upstream-merge
* commit '98304c846d8866dae6322ef400ce6595b23cfc41': (33 commits)
msix: clear pending bit of an unused vector
msix: fix reset value for enable bit
msix: fix mask bit state after reset
virtio: do not reset msix state on soft reset
msix: add helper to unuse all msix entries
pci: convert goto into scope in bridge_filter
pci: pci bridge related clean up.
pci: fix pci_config_get_io_base().
pci: remove magic number, 256 in pci.c
pci: split up up pci_update mappings
pci: clean up of pci_update_mappings()
pci: remove unused constants
pci: move typedef, PCIHostState, PCIExpressHost to qemu-common.h.
pci: remove some unnecessary comment in pci.h
pci: clean up of pci_init_wmask().
pci: kill unnecessary included in pci.c
pci_host: remove unnecessary & 0xff.
pci: s/pci_find_host_bus/pci_find_root_bus/g
pci: remove pci_sub_bus() by open coding.
pci: shorten pci_host_{conf, data}_register_xxx function a bit.
...
Conflicts:
hw/msix.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -45,7 +45,7 @@ config-all-devices.mak: $(SUBDIR_DEVICES_MAK) $(call quiet-command,cat $< > $@.tmp, " GEN $@") @if test -f $@ ; then \ echo "WARNING: $@ out of date." ;\ - echo "Run \"make defconfing\" to regenerate." ; \ + echo "Run \"make defconfig\" to regenerate." ; \ rm $@.tmp ; \ else \ mv $@.tmp $@ ; \ |