diff options
Diffstat (limited to 'qga')
| -rw-r--r-- | qga/commands-posix.c | 5 | ||||
| -rw-r--r-- | qga/commands-win32.c | 2 | ||||
| -rw-r--r-- | qga/main.c | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 6169bbf..26008db 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -45,9 +45,12 @@ #include <arpa/inet.h> #include <sys/socket.h> #include <net/if.h> -#if defined(__NetBSD__) || defined(__OpenBSD__) +#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(CONFIG_SOLARIS) #include <net/if_arp.h> #include <netinet/if_ether.h> +#if !defined(ETHER_ADDR_LEN) && defined(ETHERADDRL) +#define ETHER_ADDR_LEN ETHERADDRL +#endif #else #include <net/ethernet.h> #endif diff --git a/qga/commands-win32.c b/qga/commands-win32.c index 697c655..a101575 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -935,6 +935,8 @@ static GuestDiskAddressList *build_guest_disk_info(char *guid, Error **errp) DWORD last_err = GetLastError(); if (last_err == ERROR_MORE_DATA) { /* Try once more with big enough buffer */ + size = sizeof(VOLUME_DISK_EXTENTS) + + (sizeof(DISK_EXTENT) * (extents->NumberOfDiskExtents - 1)); g_free(extents); extents = g_malloc0(size); if (!DeviceIoControl( @@ -261,9 +261,9 @@ QEMU_COPYRIGHT "\n" " -s, --service service commands: install, uninstall, vss-install, vss-uninstall\n" #endif " -b, --block-rpcs comma-separated list of RPCs to disable (no spaces,\n" -" use \"help\" to list available RPCs)\n" +" use \"--block-rpcs=help\" to list available RPCs)\n" " -a, --allow-rpcs comma-separated list of RPCs to enable (no spaces,\n" -" use \"help\" to list available RPCs)\n" +" use \"--allow-rpcs=help\" to list available RPCs)\n" " -D, --dump-conf dump a qemu-ga config file based on current config\n" " options / command-line parameters to stdout\n" " -r, --retry-path attempt re-opening path if it's unavailable or closed\n" |