All of lore.kernel.org
 help / color / mirror / Atom feed
From: Gavin Shan <gwshan@linux.vnet.ibm.com>
To: linuxppc-dev@ozlabs.org
Cc: kvm@vger.kernel.org, alex.williamson@redhat.com,
	david@gibson.dropbear.id.au, agraf@suse.de,
	Gavin Shan <gwshan@linux.vnet.ibm.com>
Subject: [PATCH v4 4/4] drivers/vfio: Remove duplicated PE states
Date: Thu, 26 Mar 2015 10:20:37 +1100	[thread overview]
Message-ID: <1427325637-14345-5-git-send-email-gwshan@linux.vnet.ibm.com> (raw)
In-Reply-To: <1427325637-14345-1-git-send-email-gwshan@linux.vnet.ibm.com>

The set of constants for PE states defined in uapi/linux/vfio.h is
duplicated to uapi/asm/eeh.h. The patch removes the set from the
former.

Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
---
 include/uapi/linux/vfio.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h
index d81c17f..3fd1e86 100644
--- a/include/uapi/linux/vfio.h
+++ b/include/uapi/linux/vfio.h
@@ -492,11 +492,6 @@ struct vfio_eeh_pe_op {
 #define VFIO_EEH_PE_UNFREEZE_IO		2	/* Enable IO for frozen PE   */
 #define VFIO_EEH_PE_UNFREEZE_DMA	3	/* Enable DMA for frozen PE  */
 #define VFIO_EEH_PE_GET_STATE		4	/* PE state retrieval        */
-#define  VFIO_EEH_PE_STATE_NORMAL	0	/* PE in functional state    */
-#define  VFIO_EEH_PE_STATE_RESET	1	/* PE reset in progress      */
-#define  VFIO_EEH_PE_STATE_STOPPED	2	/* Stopped DMA and IO        */
-#define  VFIO_EEH_PE_STATE_STOPPED_DMA	4	/* Stopped DMA only          */
-#define  VFIO_EEH_PE_STATE_UNAVAIL	5	/* State unavailable         */
 #define VFIO_EEH_PE_RESET_DEACTIVATE	5	/* Deassert PE reset         */
 #define VFIO_EEH_PE_RESET_HOT		6	/* Assert hot reset          */
 #define VFIO_EEH_PE_RESET_FUNDAMENTAL	7	/* Assert fundamental reset  */
-- 
1.8.3.2


WARNING: multiple messages have this Message-ID (diff)
From: Gavin Shan <gwshan@linux.vnet.ibm.com>
To: linuxppc-dev@ozlabs.org
Cc: Gavin Shan <gwshan@linux.vnet.ibm.com>,
	alex.williamson@redhat.com, agraf@suse.de, kvm@vger.kernel.org,
	david@gibson.dropbear.id.au
Subject: [PATCH v4 4/4] drivers/vfio: Remove duplicated PE states
Date: Thu, 26 Mar 2015 10:20:37 +1100	[thread overview]
Message-ID: <1427325637-14345-5-git-send-email-gwshan@linux.vnet.ibm.com> (raw)
In-Reply-To: <1427325637-14345-1-git-send-email-gwshan@linux.vnet.ibm.com>

The set of constants for PE states defined in uapi/linux/vfio.h is
duplicated to uapi/asm/eeh.h. The patch removes the set from the
former.

Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
---
 include/uapi/linux/vfio.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h
index d81c17f..3fd1e86 100644
--- a/include/uapi/linux/vfio.h
+++ b/include/uapi/linux/vfio.h
@@ -492,11 +492,6 @@ struct vfio_eeh_pe_op {
 #define VFIO_EEH_PE_UNFREEZE_IO		2	/* Enable IO for frozen PE   */
 #define VFIO_EEH_PE_UNFREEZE_DMA	3	/* Enable DMA for frozen PE  */
 #define VFIO_EEH_PE_GET_STATE		4	/* PE state retrieval        */
-#define  VFIO_EEH_PE_STATE_NORMAL	0	/* PE in functional state    */
-#define  VFIO_EEH_PE_STATE_RESET	1	/* PE reset in progress      */
-#define  VFIO_EEH_PE_STATE_STOPPED	2	/* Stopped DMA and IO        */
-#define  VFIO_EEH_PE_STATE_STOPPED_DMA	4	/* Stopped DMA only          */
-#define  VFIO_EEH_PE_STATE_UNAVAIL	5	/* State unavailable         */
 #define VFIO_EEH_PE_RESET_DEACTIVATE	5	/* Deassert PE reset         */
 #define VFIO_EEH_PE_RESET_HOT		6	/* Assert hot reset          */
 #define VFIO_EEH_PE_RESET_FUNDAMENTAL	7	/* Assert fundamental reset  */
-- 
1.8.3.2

  parent reply	other threads:[~2015-03-25 23:21 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-25 23:20 [PATCH v4 0/4] EEH Error Injection Support for VFIO Devices Gavin Shan
2015-03-25 23:20 ` Gavin Shan
2015-03-25 23:20 ` [PATCH v4 1/4] powerpc/eeh: Eliminate duplicated PE states Gavin Shan
2015-03-25 23:20   ` Gavin Shan
2015-03-25 23:20 ` [PATCH v4 2/4] powerpc/eeh: Introduce eeh_pe_inject_err() Gavin Shan
2015-03-25 23:20   ` Gavin Shan
2015-03-25 23:20 ` [PATCH v4 3/4] drivers/vfio: Support EEH error injection Gavin Shan
2015-03-25 23:20   ` Gavin Shan
2015-03-25 23:20 ` Gavin Shan [this message]
2015-03-25 23:20   ` [PATCH v4 4/4] drivers/vfio: Remove duplicated PE states Gavin Shan
2015-03-26  0:46   ` Alex Williamson
2015-03-26  0:46     ` Alex Williamson
2015-03-26  0:59     ` Gavin Shan
2015-03-26  0:59       ` Gavin Shan
2015-03-26  1:46       ` David Gibson
2015-03-26  1:46         ` David Gibson
2015-03-26  1:55       ` Alex Williamson
2015-03-26  1:55         ` Alex Williamson
2015-03-26  2:48         ` Gavin Shan
2015-03-26  2:48           ` Gavin Shan
2015-03-26  1:01     ` David Gibson
2015-03-26  1:01       ` David Gibson
2015-03-26  1:26       ` Gavin Shan
2015-03-26  1:26         ` Gavin Shan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1427325637-14345-5-git-send-email-gwshan@linux.vnet.ibm.com \
    --to=gwshan@linux.vnet.ibm.com \
    --cc=agraf@suse.de \
    --cc=alex.williamson@redhat.com \
    --cc=david@gibson.dropbear.id.au \
    --cc=kvm@vger.kernel.org \
    --cc=linuxppc-dev@ozlabs.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.