[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 3/6] qga: Add initial OpenBSD and NetBSD support
From: |
Konstantin Kostiuk |
Subject: |
[PULL v2 3/6] qga: Add initial OpenBSD and NetBSD support |
Date: |
Sat, 17 Dec 2022 11:07:37 +0200 |
From: Brad Smith <brad@comstyle.com>
qga: Add initial OpenBSD and NetBSD support
Signed-off-by: Brad Smith <brad@comstyle.com>
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
---
meson.build | 2 +-
qga/commands-bsd.c | 5 +++++
qga/commands-posix.c | 9 +++++++--
qga/main.c | 6 +++---
4 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/meson.build b/meson.build
index 5c6b5a1c75..4c6f8a674a 100644
--- a/meson.build
+++ b/meson.build
@@ -75,7 +75,7 @@ have_tools = get_option('tools') \
.allowed()
have_ga = get_option('guest_agent') \
.disable_auto_if(not have_system and not have_tools) \
- .require(targetos in ['sunos', 'linux', 'windows', 'freebsd'],
+ .require(targetos in ['sunos', 'linux', 'windows', 'freebsd', 'netbsd',
'openbsd'],
error_message: 'unsupported OS for QEMU guest agent') \
.allowed()
have_block = have_system or have_tools
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)
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
diff --git a/qga/main.c b/qga/main.c
index b3580508fa..0865c992f0 100644
--- a/qga/main.c
+++ b/qga/main.c
@@ -40,11 +40,11 @@
#include "commands-common.h"
#ifndef _WIN32
-#ifdef __FreeBSD__
+#ifdef CONFIG_BSD
#define QGA_VIRTIO_PATH_DEFAULT "/dev/vtcon/org.qemu.guest_agent.0"
-#else /* __FreeBSD__ */
+#else /* CONFIG_BSD */
#define QGA_VIRTIO_PATH_DEFAULT "/dev/virtio-ports/org.qemu.guest_agent.0"
-#endif /* __FreeBSD__ */
+#endif /* CONFIG_BSD */
#define QGA_SERIAL_PATH_DEFAULT "/dev/ttyS0"
#define QGA_STATE_RELATIVE_DIR "run"
#else
--
2.25.1
- [PULL v2 0/6] QEMU Guest Agent misc patches, Konstantin Kostiuk, 2022/12/17
- [PULL v2 3/6] qga: Add initial OpenBSD and NetBSD support,
Konstantin Kostiuk <=
- [PULL v2 1/6] qga:/qga-win: adding a empty PCI address creation function, Konstantin Kostiuk, 2022/12/17
- [PULL v2 2/6] qga:/qga-win: skip getting pci info for USB disks, Konstantin Kostiuk, 2022/12/17
- [PULL v2 4/6] qga-win: add logging to Windows event log, Konstantin Kostiuk, 2022/12/17
- [PULL v2 5/6] qga: map GLib log levels to system levels, Konstantin Kostiuk, 2022/12/17
- [PULL v2 6/6] qga-win: choose the right libpcre version to include in MSI package, Konstantin Kostiuk, 2022/12/17
- Re: [PULL v2 0/6] QEMU Guest Agent misc patches, Peter Maydell, 2022/12/17