diff options
| author | Peter Maydell | 2014-02-26 23:31:10 +0100 |
|---|---|---|
| committer | Peter Maydell | 2014-02-26 23:31:10 +0100 |
| commit | 6f6831f61a44fde832ee6fab0cc5632de34cf6b7 (patch) | |
| tree | 47e59106156748bef6ef87537ad230ae7bec6044 /page_cache.c | |
| parent | Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into st... (diff) | |
| parent | rdma: rename 'x-rdma' => 'rdma' (diff) | |
| download | qemu-6f6831f61a44fde832ee6fab0cc5632de34cf6b7.tar.gz qemu-6f6831f61a44fde832ee6fab0cc5632de34cf6b7.tar.xz qemu-6f6831f61a44fde832ee6fab0cc5632de34cf6b7.zip | |
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20140225' into staging
migration/next for 20140225
# gpg: Signature made Tue 25 Feb 2014 14:04:31 GMT using RSA key ID 5872D723
# gpg: Can't check signature: public key not found
* remotes/juanquintela/tags/migration/20140225:
rdma: rename 'x-rdma' => 'rdma'
Fix two XBZRLE corruption issues
Fix vmstate_info_int32_le comparison/assign
qemu_file: use fwrite() correctly
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'page_cache.c')
| -rw-r--r-- | page_cache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/page_cache.c b/page_cache.c index 3ef6ee7ad2..b033681a93 100644 --- a/page_cache.c +++ b/page_cache.c @@ -150,7 +150,7 @@ uint8_t *get_cached_data(const PageCache *cache, uint64_t addr) return cache_get_by_addr(cache, addr)->it_data; } -int cache_insert(PageCache *cache, uint64_t addr, uint8_t *pdata) +int cache_insert(PageCache *cache, uint64_t addr, const uint8_t *pdata) { CacheItem *it = NULL; |