summaryrefslogtreecommitdiff
path: root/include/exec
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2013-07-31 15:11:07 +0200
committerAnthony Liguori <anthony@codemonkey.ws>2013-09-12 11:45:31 -0500
commit3435f39513a104294b5e3bbf3612047028d25cfc (patch)
tree38bfa549f3de370b8087e71e96cd332baae085e7 /include/exec
parent0628c18267bbe8d44f0faf3e71acf0ae31bea7fd (diff)
downloadqemu-3435f39513a104294b5e3bbf3612047028d25cfc.tar.gz
exec: Reduce ifdeffery around -mem-path
Instead of spreading its ifdeffery everywhere, confine it to qemu_ram_alloc_from_ptr(). Everywhere else, simply test block->fd, which is non-negative exactly when block uses -mem-path. Signed-off-by: Markus Armbruster <armbru@redhat.com> Acked-by: Laszlo Ersek <lersek@redhat.com> Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Message-id: 1375276272-15988-4-git-send-email-armbru@redhat.com Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>
Diffstat (limited to 'include/exec')
-rw-r--r--include/exec/cpu-all.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
index a407b50f4a..b6998f055a 100644
--- a/include/exec/cpu-all.h
+++ b/include/exec/cpu-all.h
@@ -453,9 +453,7 @@ typedef struct RAMBlock {
* Writes must take both locks.
*/
QTAILQ_ENTRY(RAMBlock) next;
-#if defined(__linux__) && !defined(TARGET_S390X)
int fd;
-#endif
} RAMBlock;
typedef struct RAMList {