Commit c5840b90 authored by Sameeh Jubran's avatar Sameeh Jubran Committed by Michael Roth
Browse files

qga-win: Handle fstrim for OSes lower than Win8 

The defrag.exe tool which is used for executing the fstrim command
on Windows doesn't support retrim for OSes lower than Win8. This
commit handles this case and returns a suitable error.

Output of fstrim before this commit:
{"execute":"guest-fstrim"}
{"return": {"paths": [{"path": "C:\\", "error": "An invalid command line option
was specified. (0x89000008)"}, {"path": "F:\\", "error": "An invalid command
line option was specified. (0x89000008)"}, {"path": "S:\\", "error": "An
invalid command line option was specified. (0x89000008)"}]}}

Reported on:
https://bugzilla.redhat.com/show_bug.cgi?id=1594113



Signed-off-by: default avatarSameeh Jubran <sjubran@redhat.com>
* use alternative version query code proposed by Sameeh
* fix up version check logic
* avoid CamelCase variable names when possible
Signed-off-by: default avatarMichael Roth <mdroth@linux.vnet.ibm.com>
parent 4eecc2e2

qga/commands-win32.c

+13 −0
Original line number Diff line number Diff line
@@ -865,6 +865,19 @@ qmp_guest_fstrim(bool has_minimum, int64_t minimum, Error **errp) 
    GuestFilesystemTrimResponse *resp;

    HANDLE handle;

    WCHAR guid[MAX_PATH] = L"";

    OSVERSIONINFO osvi;

    BOOL win8_or_later;



    ZeroMemory(&osvi, sizeof(OSVERSIONINFO));

    osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);

    GetVersionEx(&osvi);

    win8_or_later = (osvi.dwMajorVersion > 6 ||

                          ((osvi.dwMajorVersion == 6) &&

                           (osvi.dwMinorVersion >= 2)));

    if (!win8_or_later) {

        error_setg(errp, "fstrim is only supported for Win8+");

        return NULL;

    }



    handle = FindFirstVolumeW(guid, ARRAYSIZE(guid));

    if (handle == INVALID_HANDLE_VALUE) {