diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2022-12-20 21:35:09 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2022-12-20 21:35:09 +0000 |
| commit | 67de3d090d0b62d779fa497e708859b5ec1b791d (patch) | |
| tree | aa012a51cdc9cad601da48ab1d6ae14c1a9ab647 /qga/commands-posix.c | |
| parent | 8540a1f69578afb3b37866b1ce5bec46a9f6efbc (diff) | |
| parent | 9ca180bce1f9dad86b8d455a0c5c252d4c54eb92 (diff) | |
| download | focaccia-qemu-67de3d090d0b62d779fa497e708859b5ec1b791d.tar.gz focaccia-qemu-67de3d090d0b62d779fa497e708859b5ec1b791d.zip | |
Merge tag 'qga-pull-2022-12-20' of github.com:kostyanf14/qemu into staging
qga-pull-2022-12-20 # gpg: Signature made Tue 20 Dec 2022 13:57:59 GMT # gpg: using RSA key C2C2C109EA43C63C1423EB84EF5D5E8161BA84E7 # gpg: Good signature from "Kostiantyn Kostiuk (Upstream PR sign) <kkostiuk@redhat.com>" [unknown] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: C2C2 C109 EA43 C63C 1423 EB84 EF5D 5E81 61BA 84E7 * tag 'qga-pull-2022-12-20' of github.com:kostyanf14/qemu: qga-win: choose the right libpcre version to include in MSI package qga: map GLib log levels to system levels qga-win: add logging to Windows event log qga: Add initial OpenBSD and NetBSD support qga:/qga-win: skip getting pci info for USB disks qga:/qga-win: adding a empty PCI address creation function Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qga/commands-posix.c')
| -rw-r--r-- | qga/commands-posix.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 1a28326ec7..b19b9c5d18 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -45,7 +45,12 @@ #include <arpa/inet.h> #include <sys/socket.h> #include <net/if.h> +#if defined(__NetBSD__) || defined(__OpenBSD__) +#include <net/if_arp.h> +#include <netinet/if_ether.h> +#else #include <net/ethernet.h> +#endif #include <sys/types.h> #ifdef CONFIG_SOLARIS #include <sys/sockio.h> @@ -2872,7 +2877,7 @@ static int guest_get_network_stats(const char *name, return -1; } -#ifndef __FreeBSD__ +#ifndef CONFIG_BSD /* * Fill "buf" with MAC address by ifaddrs. Pointer buf must point to a * buffer with ETHER_ADDR_LEN length at least. @@ -2921,7 +2926,7 @@ bool guest_get_hw_addr(struct ifaddrs *ifa, unsigned char *buf, close(sock); return true; } -#endif /* __FreeBSD__ */ +#endif /* CONFIG_BSD */ /* * Build information about guest interfaces |