diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2016-12-01 13:38:36 +0000 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2016-12-01 13:38:36 +0000 |
| commit | 2cfe5d7bc2662b1fe4a8bfc0a847ab0db6948695 (patch) | |
| tree | 00ea06f4cf6e73fe8010b100d463e98143dbb434 /include | |
| parent | 1cd56fd2e14f67ead2f0458b4ae052f19865c41c (diff) | |
| parent | 9730280d54634caa5d63f0d8fcd85da8311d2ebf (diff) | |
| download | qemu-2cfe5d7bc2662b1fe4a8bfc0a847ab0db6948695.zip qemu-2cfe5d7bc2662b1fe4a8bfc0a847ab0db6948695.tar.gz qemu-2cfe5d7bc2662b1fe4a8bfc0a847ab0db6948695.tar.bz2 | |
Merge remote-tracking branch 'mst/tags/for_upstream' into staging
virtio, vhost, pc: fixes
Minor fixes since 2.8.0-rc2.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Wed 30 Nov 2016 02:25:12 AM GMT
# gpg: using RSA key 0x281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>"
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17 0970 C350 3912 AFBE 8E67
# Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA 8A0D 281F 0DB8 D28D 5469
* mst/tags/for_upstream:
virtio-crypto: fix uninitialized variables
loader: fix undefined behavior in rom_order_compare()
loader: fix handling of custom address spaces when adding ROM blobs
intel_iommu: fix incorrect device invalidate
spec/vhost-user: fix the VHOST_USER prefix
Message-id: 1480564455-23933-1-git-send-email-mst@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/loader.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/hw/loader.h b/include/hw/loader.h index 0381706..0c864cf 100644 --- a/include/hw/loader.h +++ b/include/hw/loader.h @@ -180,7 +180,7 @@ MemoryRegion *rom_add_blob(const char *name, const void *blob, size_t len, size_t max_len, hwaddr addr, const char *fw_file_name, FWCfgReadCallback fw_callback, - void *callback_opaque); + void *callback_opaque, AddressSpace *as); int rom_add_elf_program(const char *name, void *data, size_t datasize, size_t romsize, hwaddr addr, AddressSpace *as); int rom_check_and_register_reset(void); @@ -194,7 +194,7 @@ void hmp_info_roms(Monitor *mon, const QDict *qdict); #define rom_add_file_fixed(_f, _a, _i) \ rom_add_file(_f, NULL, _a, _i, false, NULL, NULL) #define rom_add_blob_fixed(_f, _b, _l, _a) \ - rom_add_blob(_f, _b, _l, _l, _a, NULL, NULL, NULL) + rom_add_blob(_f, _b, _l, _l, _a, NULL, NULL, NULL, NULL) #define rom_add_file_mr(_f, _mr, _i) \ rom_add_file(_f, NULL, 0, _i, false, _mr, NULL) #define rom_add_file_as(_f, _as, _i) \ @@ -202,7 +202,7 @@ void hmp_info_roms(Monitor *mon, const QDict *qdict); #define rom_add_file_fixed_as(_f, _a, _i, _as) \ rom_add_file(_f, NULL, _a, _i, false, NULL, _as) #define rom_add_blob_fixed_as(_f, _b, _l, _a, _as) \ - rom_add_blob(_f, _b, _l, _l, _a, NULL, NULL, _as) + rom_add_blob(_f, _b, _l, _l, _a, NULL, NULL, NULL, _as) #define PC_ROM_MIN_VGA 0xc0000 #define PC_ROM_MIN_OPTION 0xc8000 |