diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-11-06 10:04:16 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-11-06 10:04:16 +0000 |
| commit | ec7a8bf0b8f7dc7288fe8745464ee8217528cc6c (patch) | |
| tree | 4f470a0055f24505c86d789e746731c49d99fb45 /include/hw/pci/pci-assign.h | |
| parent | b33afc415622e5eb26e0f14fd27eb86e32a5472e (diff) | |
| parent | 20bc94a2b8449b7700b6bfa25a87ce2320a1c649 (diff) | |
| download | focaccia-qemu-ec7a8bf0b8f7dc7288fe8745464ee8217528cc6c.tar.gz focaccia-qemu-ec7a8bf0b8f7dc7288fe8745464ee8217528cc6c.zip | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
* Remove legacy KVM PCI device assignment * Fix qemu-pr-helper.c compilation on older compilers # gpg: Signature made Sun 05 Nov 2017 13:52:36 GMT # gpg: using RSA key 0xBFFBD25F78C7AE83 # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" # gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" # Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1 # Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83 * remotes/bonzini/tags/for-upstream: build: disable -Wmissing-braces on older compilers pci-assign: Remove Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/pci/pci-assign.h')
| -rw-r--r-- | include/hw/pci/pci-assign.h | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/include/hw/pci/pci-assign.h b/include/hw/pci/pci-assign.h deleted file mode 100644 index 55f42c56fa..0000000000 --- a/include/hw/pci/pci-assign.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This work is licensed under the terms of the GNU GPL, version 2. See - * the COPYING file in the top-level directory. - * - * Just split from hw/i386/kvm/pci-assign.c. - */ -#ifndef PCI_ASSIGN_H -#define PCI_ASSIGN_H - -#include "hw/pci/pci.h" - -//#define DEVICE_ASSIGNMENT_DEBUG - -#ifdef DEVICE_ASSIGNMENT_DEBUG -#define DEBUG(fmt, ...) \ - do { \ - fprintf(stderr, "%s: " fmt, __func__ , __VA_ARGS__); \ - } while (0) -#else -#define DEBUG(fmt, ...) -#endif - -void *pci_assign_dev_load_option_rom(PCIDevice *dev, struct Object *owner, - int *size, unsigned int domain, - unsigned int bus, unsigned int slot, - unsigned int function); -#endif /* PCI_ASSIGN_H */ |