Commit 50d2d550 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2019-11-04-tag' into staging 



qemu-ga patch queue for hard-freeze

* fix handling of Chinese network device names in
  guest-network-get-interfaces
* add missing blacklist entries for guest-get-memory-block-info for
  w32/non-linux builds

# gpg: Signature made Mon 04 Nov 2019 17:25:54 GMT
# gpg:                using RSA key CEACC9E15534EBABB82D3FA03353C9CEF108B584
# gpg:                issuer "mdroth@linux.vnet.ibm.com"
# gpg: Good signature from "Michael Roth <flukshun@gmail.com>" [full]
# gpg:                 aka "Michael Roth <mdroth@utexas.edu>" [full]
# gpg:                 aka "Michael Roth <mdroth@linux.vnet.ibm.com>" [full]
# Primary key fingerprint: CEAC C9E1 5534 EBAB B82D  3FA0 3353 C9CE F108 B584

* remotes/mdroth/tags/qga-pull-2019-11-04-tag:
  qga: Add "guest-get-memory-block-info" to blacklist
  qga-win: network-get-interfaces command name field bug fix

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents e9102eb8 28d8dd35

qga/commands-posix.c

+2 −1
Original line number Diff line number Diff line
@@ -2730,7 +2730,8 @@ GList *ga_command_blacklist_init(GList *blacklist) 
            "guest-suspend-hybrid", "guest-network-get-interfaces",

            "guest-get-vcpus", "guest-set-vcpus",

            "guest-get-memory-blocks", "guest-set-memory-blocks",

            "guest-get-memory-block-size", NULL};

            "guest-get-memory-block-size", "guest-get-memory-block-info",

            NULL};

        char **p = (char **)list;



        while (*p) {

qga/commands-win32.c

+6 −6
Original line number Diff line number Diff line
@@ -1387,12 +1387,12 @@ static IP_ADAPTER_ADDRESSES *guest_get_adapters_addresses(Error **errp) 
static char *guest_wctomb_dup(WCHAR *wstr)

{

    char *str;

    size_t i;

    size_t str_size;



    i = wcslen(wstr) + 1;

    str = g_malloc(i);

    WideCharToMultiByte(CP_ACP, WC_COMPOSITECHECK,

                        wstr, -1, str, i, NULL, NULL);

    str_size = WideCharToMultiByte(CP_UTF8, 0, wstr, -1, NULL, 0, NULL, NULL);

    /* add 1 to str_size for NULL terminator */

    str = g_malloc(str_size + 1);

    WideCharToMultiByte(CP_UTF8, 0, wstr, -1, str, str_size, NULL, NULL);

    return str;

}
@@ -1894,7 +1894,7 @@ GList *ga_command_blacklist_init(GList *blacklist) 
        "guest-suspend-hybrid",

        "guest-set-vcpus",

        "guest-get-memory-blocks", "guest-set-memory-blocks",

        "guest-get-memory-block-size",

        "guest-get-memory-block-size", "guest-get-memory-block-info",

        NULL};

    char **p = (char **)list_unsupported;