diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2012-10-06 18:54:14 +0200 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2012-10-06 18:54:14 +0200 |
| commit | 048d3612a51b3da45081091b734f93428925ebf8 (patch) | |
| tree | ad2b1235146f9bc5b94c1bfae02327ee3b03fa40 /qga | |
| parent | 6b2f90fbbd31d594238098f46ef63ee307a12f55 (diff) | |
| parent | 02cd521f6e207bd8843a7c1309f6d065cf01c6ee (diff) | |
| download | qemu-048d3612a51b3da45081091b734f93428925ebf8.tar.gz qemu-048d3612a51b3da45081091b734f93428925ebf8.tar.bz2 qemu-048d3612a51b3da45081091b734f93428925ebf8.zip | |
Merge branch 'trivial-patches' of git://github.com/stefanha/qemu
* 'trivial-patches' of git://github.com/stefanha/qemu:
versatilepb: Use symbolic indices for ARM PIC
qdev: kill bogus comment
qemu-barrier: Fix compiler version check for future gcc versions
hw: Add missing 'static' attribute for QEMUMachine
cleanup useless return sentence
qemu-sockets: Fix compiler warning (regression for MinGW)
vnc: Fix spelling (hellmen -> hellman) in comment
slirp: Fix spelling in comment (enought -> enough, insure -> ensure)
tcg/arm: Use tcg_out_mov_reg rather than inline equivalent code
cpu: Add missing 'static' attribute to qemu_global_mutex
configure: Support empty target list (--target-list=)
hw: Fix return value check for bdrv_read, bdrv_write
Diffstat (limited to 'qga')
| -rw-r--r-- | qga/commands-posix.c | 2 | ||||
| -rw-r--r-- | qga/commands-win32.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/qga/commands-posix.c b/qga/commands-posix.c index b9f357cb96..726930a909 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -988,8 +988,6 @@ int64_t qmp_guest_fsfreeze_thaw(Error **err) void qmp_guest_fstrim(bool has_minimum, int64_t minimum, Error **err) { error_set(err, QERR_UNSUPPORTED); - - return; } #endif diff --git a/qga/commands-win32.c b/qga/commands-win32.c index 54bc5462e2..5bd8fb27f2 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -180,8 +180,6 @@ int64_t qmp_guest_fsfreeze_thaw(Error **err) void qmp_guest_fstrim(bool has_minimum, int64_t minimum, Error **err) { error_set(err, QERR_UNSUPPORTED); - - return; } typedef enum { |