diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-07-08 12:35:14 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-07-08 12:35:14 +0100 |
| commit | 62a3864eb09414d3cee94a2a592ecd414200912f (patch) | |
| tree | 20ae2962568fac03f49eaab0c0c3af4574184c79 /crypto/cipher.c | |
| parent | 59dc0a1e9b4ccd9d8d7366fdc31acd5c1fbb240a (diff) | |
| parent | c54e1eb4928d4e6762c7100d1d1ef5f08ddf922b (diff) | |
| download | focaccia-qemu-62a3864eb09414d3cee94a2a592ecd414200912f.tar.gz focaccia-qemu-62a3864eb09414d3cee94a2a592ecd414200912f.zip | |
Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2015-07-06-v3-tag' into staging
tag for qga-pull-2015-07-06-v3
v3:
- fix missing <windows.h> in configure test program.
v2:
- added configure check for guest-get-fs-info to avoid breakage on older
MinGWs
- removed extraneous include of ws2ipdef.h in w32
guest-network-get-interfaces. ws2tcpip.h already provides those
definitions, and older MinGWs don't have it.
- rebased on latest master
# gpg: Signature made Wed Jul 8 03:01:18 2015 BST using RSA key ID F108B584
# gpg: Good signature from "Michael Roth <flukshun@gmail.com>"
# gpg: aka "Michael Roth <mdroth@utexas.edu>"
# gpg: aka "Michael Roth <mdroth@linux.vnet.ibm.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: CEAC C9E1 5534 EBAB B82D 3FA0 3353 C9CE F108 B584
* remotes/mdroth/tags/qga-pull-2015-07-06-v3-tag:
qga: added GuestPCIAddress information
qga: added bus type and disk location path
configure: add configure check for ntdddisk.h
qga: added mountpoint and filesystem type for single volume
qga: added empty qmp_quest_get_fsinfo functionality.
qga: fail early for invalid time
qga: win32 qmp_guest_network_get_interfaces implementation
qga: add win32 library iphlpapi
Revert "guest agent: remove g_strcmp0 usage"
qga/qmp_guest_fstrim: Return per path fstrim result
qga/commands-posix: Fix bug in guest-fstrim
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'crypto/cipher.c')
0 files changed, 0 insertions, 0 deletions