diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-06-30 13:09:31 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-06-30 13:09:31 +0300 |
| commit | dc090bec2ad897a102f1b652b5af34d7f278ea2a (patch) | |
| tree | 80c66d22810c6b490089f0bddf772f5225152386 /qemu-common.h | |
| parent | Merge commit 'd918f23efaf486293b96418fe5deaff8a5583304' into upstream-merge (diff) | |
| parent | fix KVMs GET_SUPPORTED_CPUID feature usage (diff) | |
| download | qemu-kvm-dc090bec2ad897a102f1b652b5af34d7f278ea2a.tar.gz qemu-kvm-dc090bec2ad897a102f1b652b5af34d7f278ea2a.tar.bz2 qemu-kvm-dc090bec2ad897a102f1b652b5af34d7f278ea2a.zip | |
Merge commit '6c1f42fe83bf9bc14a7a6cc5afd8dad83ee25c74' into upstream-merge
* commit '6c1f42fe83bf9bc14a7a6cc5afd8dad83ee25c74':
fix KVMs GET_SUPPORTED_CPUID feature usage
CPUID Fn8000_0001.EAX is family/model/stepping, not features
introduce -cpu host target
allow hypervisor CPUID bit to be overriden
support colon in filenames
Prefer ncurses over curses
slirp: Basic VLAN client info_str
slirp: Make hostfwd_add/remove multi-instance-aware
net: Provide VLAN client lookup helper
slirp: Enable multi-instance support for the smb service
slirp: Improve error handling in slirp_smb
slirp: Use shell to erase smb directory
slirp: Save/restore bootp client states
slirp: Enable multiple instances
slirp: Allocate/free stack instance dynamically
slirp: Use internal state in interface
slirp: Factor out internal state structure
slirp: Drop link_up checks from if_output and slirp_socket_can_recv
slirp: Clean up timeout handling around slirp_select_fill/poll
slirp: Drop redundant checks from slirp_output
Conflicts:
target-i386/helper.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'qemu-common.h')
| -rw-r--r-- | qemu-common.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qemu-common.h b/qemu-common.h index 2dcb224ea..8916502b8 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -104,6 +104,7 @@ void qemu_get_timedate(struct tm *tm, int offset); int qemu_timedate_diff(struct tm *tm); /* cutils.c */ +const char *fill_token(char *buf, int buf_size, const char *str, char); void pstrcpy(char *buf, int buf_size, const char *str); char *pstrcat(char *buf, int buf_size, const char *s); int strstart(const char *str, const char *val, const char **ptr); |