From: Oliver Kurth <okurth@vmware.com>
Date: Tue, 27 Aug 2019 19:55:36 +0000 (-0700)
Subject: Bool type may not be a char (1 bytes).
X-Git-Tag: stable-11.1.0~264
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abd868db33a0ee6556655da561eecf54f4774703;p=thirdparty%2Fopen-vm-tools.git

Bool type may not be a char (1 bytes).

Change structures exposed to the guest to not use Bool -
 - while currently Bool is defined as char, we might use C's
   _Bool or C++'s bool for booleans - and neither standard
   mandates _Bool/bool to be 1 byte.
---

diff --git a/open-vm-tools/modules/shared/vmxnet/vmxnet3_defs.h b/open-vm-tools/modules/shared/vmxnet/vmxnet3_defs.h
index e1ecf9632..3d39b9f19 100644
--- a/open-vm-tools/modules/shared/vmxnet/vmxnet3_defs.h
+++ b/open-vm-tools/modules/shared/vmxnet/vmxnet3_defs.h
@@ -678,7 +678,7 @@ Vmxnet3_CoalesceScheme;
 typedef
 #include "vmware_pack_begin.h"
 struct Vmxnet3_IntrConf {
-   Bool   autoMask;
+   uint8  autoMask;      /* on/off flag */
    uint8  numIntrs;      /* # of interrupts */
    uint8  eventIntrIdx;
    uint8  modLevels[VMXNET3_MAX_INTRS]; /* moderation level for each intr */
@@ -694,7 +694,7 @@ Vmxnet3_IntrConf;
 typedef
 #include "vmware_pack_begin.h"
 struct Vmxnet3_QueueStatus {
-   Bool    stopped;
+   uint8   stopped;    /* on/off flag */
    uint8   _pad[3];
    __le32  error;
 }
@@ -714,7 +714,7 @@ Vmxnet3_TxQueueCtrl;
 typedef
 #include "vmware_pack_begin.h"
 struct Vmxnet3_RxQueueCtrl {
-   Bool    updateRxProd;
+   uint8   updateRxProd;   /* on/off flag */
    uint8   _pad[7];
    __le64  reserved;
 }