Merge branch 'master' of git://git.qemu.org/qemu into prep-up

Conflicts:
hw/Makefile.objs
hw/ppc_prep.c

Signed-off-by: Andreas Färber <andreas.faerber@web.de>

Merge remote-tracking branch 'mdroth/qga-pull-1-8-2013' into staging

* mdroth/qga-pull-1-8-2013:
qemu-ga: sample fsfreeze hooks
qemu-ga: execute hook to quiesce the guest on fsfreeze-freeze/thaw

Merge remote-tracking branch 'mdroth/qga-pull-1-8-2013' into staging

* mdroth/qga-pull-1-8-2013:
qemu-ga: sample fsfreeze hooks
qemu-ga: execute hook to quiesce the guest on fsfreeze-freeze/thaw
qemu-ga: guest_suspend(): improve error reporting
qemu-ga: bios_supports_mode(): improve error reporting
qemu-ga: qmp_guest_network_get_interfaces(): get rid of snprintf() + error_set()
qemu-ga: qmp_guest_fstrim(): get rid of sprintf() + error_set()
qemu-ga: qmp_guest_fsfreeze_*(): get rid of sprintf() + error_set()
qemu-ga: build_fs_mount_list(): take an Error argument
qemu-ga: qmp_guest_shutdown(): improve error reporting
qemu-ga: qmp_guest_file_*: improve error reporting
qemu-ga: qmp_guest_file_close(): fix fclose() error check
qemu-ga: guest_file_handle_find(): take an Error argument

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

show more ...

qemu-ga: sample fsfreeze hooks

Adds sample hook scripts for --fsfreeze-hook option of qemu-ga.
- fsfreeze-hook : execute scripts in fsfreeze-hook.d/
- fsfreeze-hook.d/mysql-flush.sh.sample : qui

qemu-ga: sample fsfreeze hooks

Adds sample hook scripts for --fsfreeze-hook option of qemu-ga.
- fsfreeze-hook : execute scripts in fsfreeze-hook.d/
- fsfreeze-hook.d/mysql-flush.sh.sample : quiesce MySQL before snapshot

Signed-off-by: Tomoki Sekiyama <tomoki.sekiyama.qu@hitachi.com>
Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>

show more ...