mirror of https://github.com/proxmox/mirror_qemu
qga: Add initial OpenBSD and NetBSD support
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>master
parent
cce910f219
commit
28236ad8d1
|
@ -75,7 +75,7 @@ have_tools = get_option('tools') \
|
||||||
.allowed()
|
.allowed()
|
||||||
have_ga = get_option('guest_agent') \
|
have_ga = get_option('guest_agent') \
|
||||||
.disable_auto_if(not have_system and not have_tools) \
|
.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') \
|
error_message: 'unsupported OS for QEMU guest agent') \
|
||||||
.allowed()
|
.allowed()
|
||||||
have_block = have_system or have_tools
|
have_block = have_system or have_tools
|
||||||
|
|
|
@ -21,7 +21,12 @@
|
||||||
#include <sys/ucred.h>
|
#include <sys/ucred.h>
|
||||||
#include <sys/mount.h>
|
#include <sys/mount.h>
|
||||||
#include <net/if_dl.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>
|
#include <net/ethernet.h>
|
||||||
|
#endif
|
||||||
#include <paths.h>
|
#include <paths.h>
|
||||||
|
|
||||||
#if defined(CONFIG_FSFREEZE) || defined(CONFIG_FSTRIM)
|
#if defined(CONFIG_FSFREEZE) || defined(CONFIG_FSTRIM)
|
||||||
|
|
|
@ -45,7 +45,12 @@
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
#include <net/if.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>
|
#include <net/ethernet.h>
|
||||||
|
#endif
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#ifdef CONFIG_SOLARIS
|
#ifdef CONFIG_SOLARIS
|
||||||
#include <sys/sockio.h>
|
#include <sys/sockio.h>
|
||||||
|
@ -2872,7 +2877,7 @@ static int guest_get_network_stats(const char *name,
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef __FreeBSD__
|
#ifndef CONFIG_BSD
|
||||||
/*
|
/*
|
||||||
* Fill "buf" with MAC address by ifaddrs. Pointer buf must point to a
|
* Fill "buf" with MAC address by ifaddrs. Pointer buf must point to a
|
||||||
* buffer with ETHER_ADDR_LEN length at least.
|
* 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);
|
close(sock);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
#endif /* __FreeBSD__ */
|
#endif /* CONFIG_BSD */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Build information about guest interfaces
|
* Build information about guest interfaces
|
||||||
|
|
|
@ -40,11 +40,11 @@
|
||||||
#include "commands-common.h"
|
#include "commands-common.h"
|
||||||
|
|
||||||
#ifndef _WIN32
|
#ifndef _WIN32
|
||||||
#ifdef __FreeBSD__
|
#ifdef CONFIG_BSD
|
||||||
#define QGA_VIRTIO_PATH_DEFAULT "/dev/vtcon/org.qemu.guest_agent.0"
|
#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"
|
#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_SERIAL_PATH_DEFAULT "/dev/ttyS0"
|
||||||
#define QGA_STATE_RELATIVE_DIR "run"
|
#define QGA_STATE_RELATIVE_DIR "run"
|
||||||
#else
|
#else
|
||||||
|
|
Loading…
Reference in New Issue