diff options
| author | Peter Maydell | 2014-06-11 22:34:08 +0200 |
|---|---|---|
| committer | Peter Maydell | 2014-06-11 22:34:08 +0200 |
| commit | 05fedeef835c3c889e5d2e44f8abb11dcfcadefc (patch) | |
| tree | 8dbcf074dec8246cb542e68f6b84c7abf5176e50 /include | |
| parent | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-bsd-user-20140611' i... (diff) | |
| parent | json-parser: drop superfluous assignment for token variable (diff) | |
| download | qemu-05fedeef835c3c889e5d2e44f8abb11dcfcadefc.tar.gz qemu-05fedeef835c3c889e5d2e44f8abb11dcfcadefc.tar.xz qemu-05fedeef835c3c889e5d2e44f8abb11dcfcadefc.zip | |
Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging
* remotes/qmp-unstable/queue/qmp:
json-parser: drop superfluous assignment for token variable
readline: Clear screen on form feed.
monitor: Add delvm and loadvm argument completion
monitor: Add host_net_remove arguments completion
readline: Make completion strings always unique
monitor: Add host_net_add device argument completion
net: Export valid host network devices list
monitor: Add migrate_set_capability completion
monitor: Add watchdog_action argument completion
monitor: Add ringbuf_write and ringbuf_read argument completion
dump: simplify get_len_buf_out()
dump: hoist lzo_init() from get_len_buf_out() to dump_init()
dump: select header bitness based on ELF class, not ELF architecture
dump: eliminate DumpState.page_size ("guest's page size")
dump: eliminate DumpState.page_shift ("guest's page shift")
dump: simplify write_start_flat_header()
dump: fill in the flat header signature more pleasingly to the eye
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/net.h | 1 | ||||
| -rw-r--r-- | include/sysemu/char.h | 3 | ||||
| -rw-r--r-- | include/sysemu/dump.h | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/net/net.h b/include/net/net.h index 8166345a13..8b189da5ee 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -177,6 +177,7 @@ struct NICInfo { extern int nb_nics; extern NICInfo nd_table[MAX_NICS]; extern int default_net; +extern const char *host_net_devices[]; /* from net.c */ extern const char *legacy_tftp_prefix; diff --git a/include/sysemu/char.h b/include/sysemu/char.h index b81a6ff185..7f5eeb38b0 100644 --- a/include/sysemu/char.h +++ b/include/sysemu/char.h @@ -286,9 +286,8 @@ void qemu_chr_add_handlers(CharDriverState *s, void qemu_chr_be_generic_open(CharDriverState *s); void qemu_chr_accept_input(CharDriverState *s); int qemu_chr_add_client(CharDriverState *s, int fd); -void qemu_chr_info_print(Monitor *mon, const QObject *ret_data); -void qemu_chr_info(Monitor *mon, QObject **ret_data); CharDriverState *qemu_chr_find(const char *name); +bool chr_is_ringbuf(const CharDriverState *chr); QemuOpts *qemu_chr_parse_compat(const char *label, const char *filename); diff --git a/include/sysemu/dump.h b/include/sysemu/dump.h index efab7a32f3..12af557b55 100644 --- a/include/sysemu/dump.h +++ b/include/sysemu/dump.h @@ -22,10 +22,10 @@ #define ARCH_PFN_OFFSET (0) -#define paddr_to_pfn(X, page_shift) \ - (((unsigned long long)(X) >> (page_shift)) - ARCH_PFN_OFFSET) -#define pfn_to_paddr(X, page_shift) \ - (((unsigned long long)(X) + ARCH_PFN_OFFSET) << (page_shift)) +#define paddr_to_pfn(X) \ + (((unsigned long long)(X) >> TARGET_PAGE_BITS) - ARCH_PFN_OFFSET) +#define pfn_to_paddr(X) \ + (((unsigned long long)(X) + ARCH_PFN_OFFSET) << TARGET_PAGE_BITS) /* * flag for compressed format |