summary refs log tree commit diff stats
path: root/qga/commands-bsd.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2022-12-20 21:35:09 +0000
committerPeter Maydell <peter.maydell@linaro.org>2022-12-20 21:35:09 +0000
commit67de3d090d0b62d779fa497e708859b5ec1b791d (patch)
treeaa012a51cdc9cad601da48ab1d6ae14c1a9ab647 /qga/commands-bsd.c
parent8540a1f69578afb3b37866b1ce5bec46a9f6efbc (diff)
parent9ca180bce1f9dad86b8d455a0c5c252d4c54eb92 (diff)
downloadfocaccia-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-bsd.c')
-rw-r--r--qga/commands-bsd.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/qga/commands-bsd.c b/qga/commands-bsd.c
index 15cade2d4c..17bddda1cf 100644
--- a/qga/commands-bsd.c
+++ b/qga/commands-bsd.c
@@ -21,7 +21,12 @@
 #include <sys/ucred.h>
 #include <sys/mount.h>
 #include <net/if_dl.h>
+#if defined(__NetBSD__) || defined(__OpenBSD__)
+#include <net/if_arp.h>
+#include <netinet/if_ether.h>
+#else
 #include <net/ethernet.h>
+#endif
 #include <paths.h>
 
 #if defined(CONFIG_FSFREEZE) || defined(CONFIG_FSTRIM)