[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 04/24] Make xg_main.c build on NetBSD
- To: Manuel Bouyer <bouyer@xxxxxxxxxx>
- From: Roger Pau Monné <roger.pau@xxxxxxxxxx>
- Date: Tue, 29 Dec 2020 12:24:23 +0100
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JdzG1yA1Ck/ufHwExhr4v1cwidMEQC3Xp9Yn3XSmBcQ=; b=J1T1BKY19FOJd6b/Vr8wdA5euZrb26KjfzFsSndQQGj1wpWX1Wn4V0olWrC5BQkUUY4y1ciOqbzqeiGh07G2gz8h5dJE34rrtpFmFFbwrYBKOX/MmwK4diUq2kJLtzwrVVzeTrTRm6t/op8+psnUTa4ssz8R2KaPeppajFlaXQxnHulIpyqMq5Qnph4WQg5D6Rvgsd8+NhO6wn4AONrjtv2eOzllzt8+GivBC1I5sWwEBls9Xd00YyHsLuDLZCrETYItCMvhHqECML15mopDNc1RYO8SSUQ1dbmk6Rl5IztD12/nMK//BXMk5BYuaRcKGWOofZ0F9EbJvLYg3rhJNg==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IL82TmXYftJ5A+aDPUE6XaXYmE1JMKCinZ1WvfwMjeawXFhsUtfUrW1BP781oV7Oat4iltnUoLFgBu7auqXBIo4EvDdDDJXthZoU5HMdtYREmNH1+Mly0NMTe90pNY40sHd4ey6AdbrZku5P1tGqMPZ5HuWhuX0ucaPzpkqUWGRbWymdQjw1tRc5JqTp7fp+RwEzhGIyh7asFv0UxmlB0g5u8m0ApylZ4+TdcGB/ASMmlQE7jcZRx8/Nk8h544/xtQxaJTHP82HhrtFLwISvQE723hoQIyUMQdmbilkfPASImGyjGZc0NEC9he9Hwqfq10TJQ/rzfPnktZqBSNKdkw==
- Authentication-results: esa2.hc3370-68.iphmx.com; dkim=pass (signature verified) header.i=@citrix.onmicrosoft.com
- Cc: <xen-devel@xxxxxxxxxxxxxxxxxxxx>
- Delivery-date: Tue, 29 Dec 2020 11:24:37 +0000
- Ironport-sdr: 2ut/vmsHbbZRnf8bnMXTxUfmXSgK+kZ74OoFWrklYeYWZc63It7/bFOH+8YW4voelzSjenQb7q hpMCZObSfCQ2FApMAZPv73J8cxVPUF3IgnwPbigKD0Y9R4R6UlP/UMaYZOVARqUt0M7pg1FRMP AFSK1SJMPENu8JnpC6H8yC4BYmnioiCX4sKQDthUXb3bhENDCi26jQPzKUTGiFKCquLTdqkm7o aoJfl2ksxUXIYVds/6GwwUM4KhuMBgsLXKuY7it25spS6FPvXP9lvmD1vsTwyCXjBaxDpAXxzs xYU=
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
On Mon, Dec 14, 2020 at 05:36:03PM +0100, Manuel Bouyer wrote:
> ---
> tools/debugger/gdbsx/xg/xg_main.c | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
> diff --git a/tools/debugger/gdbsx/xg/xg_main.c
> b/tools/debugger/gdbsx/xg/xg_main.c
> index a4e8653168..fa2741ccf8 100644
> --- a/tools/debugger/gdbsx/xg/xg_main.c
> +++ b/tools/debugger/gdbsx/xg/xg_main.c
> @@ -49,7 +49,11 @@
> #include "xg_public.h"
> #include <xen/version.h>
> #include <xen/domctl.h>
> +#ifdef __NetBSD__
> +#include <xen/xenio.h>
> +#else
> #include <xen/sys/privcmd.h>
> +#endif
> #include <xen/foreign/x86_32.h>
> #include <xen/foreign/x86_64.h>
>
> @@ -126,12 +130,19 @@ xg_init()
> int flags, saved_errno;
>
> XGTRC("E\n");
> +#ifdef __NetBSD__
> + if ((_dom0_fd=open("/kern/xen/privcmd", O_RDWR)) == -1) {
> + perror("Failed to open /kern/xen/privcmd\n");
> + return -1;
> + }
> +#else
> if ((_dom0_fd=open("/dev/xen/privcmd", O_RDWR)) == -1) {
> if ((_dom0_fd=open("/proc/xen/privcmd", O_RDWR)) == -1) {
> perror("Failed to open /dev/xen/privcmd or /proc/xen/privcmd\n");
> return -1;
> }
> }
> +#endif
I don't think you need to ifdef here, instead just add to the existing
if, ie:
if ((_dom0_fd=open("/dev/xen/privcmd", O_RDWR)) == -1 &&
(_dom0_fd=open("/proc/xen/privcmd", O_RDWR)) == -1 &&
(_dom0_fd=open("/kern/xen/privcmd", O_RDWR)) == -1) {
perror("Failed to open /dev/xen/privcmd, /proc/xen/privcmd or
/kern/xen/privcmd\n");
return -1;
}
Thanks, Roger.
|