From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46701) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCOH5-00082Z-W9 for qemu-devel@nongnu.org; Mon, 13 Jun 2016 05:35:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bCOH1-0000no-L1 for qemu-devel@nongnu.org; Mon, 13 Jun 2016 05:35:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49385) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCOH1-0000nW-Fk for qemu-devel@nongnu.org; Mon, 13 Jun 2016 05:35:11 -0400 References: <1465552478-5540-1-git-send-email-caoj.fnst@cn.fujitsu.com> <1465552478-5540-11-git-send-email-caoj.fnst@cn.fujitsu.com> From: Marcel Apfelbaum Message-ID: <575E7E4A.9030403@redhat.com> Date: Mon, 13 Jun 2016 12:35:06 +0300 MIME-Version: 1.0 In-Reply-To: <1465552478-5540-11-git-send-email-caoj.fnst@cn.fujitsu.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v8 10/17] pci bridge dev: change msi property type List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Cao jin , qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Markus Armbruster On 06/10/2016 12:54 PM, Cao jin wrote: > From bit to enum OnOffAuto. > > cc: Michael S. Tsirkin > cc: Markus Armbruster > cc: Marcel Apfelbaum > > Reviewed-by: Markus Armbruster > Signed-off-by: Cao jin > --- > hw/pci-bridge/pci_bridge_dev.c | 13 +++++++------ > 1 file changed, 7 insertions(+), 6 deletions(-) > > diff --git a/hw/pci-bridge/pci_bridge_dev.c b/hw/pci-bridge/pci_bridge_dev.c > index 41ca47b..0fbecc4 100644 > --- a/hw/pci-bridge/pci_bridge_dev.c > +++ b/hw/pci-bridge/pci_bridge_dev.c > @@ -42,9 +42,10 @@ struct PCIBridgeDev { > > MemoryRegion bar; > uint8_t chassis_nr; > -#define PCI_BRIDGE_DEV_F_MSI_REQ 0 > -#define PCI_BRIDGE_DEV_F_SHPC_REQ 1 > +#define PCI_BRIDGE_DEV_F_SHPC_REQ 0 > uint32_t flags; > + > + OnOffAuto msi; > }; > typedef struct PCIBridgeDev PCIBridgeDev; > > @@ -66,7 +67,7 @@ static int pci_bridge_dev_initfn(PCIDevice *dev) > } > } else { > /* MSI is not applicable without SHPC */ > - bridge_dev->flags &= ~(1 << PCI_BRIDGE_DEV_F_MSI_REQ); > + bridge_dev->msi = ON_OFF_AUTO_OFF; > } > > err = slotid_cap_init(dev, 0, bridge_dev->chassis_nr, 0); > @@ -74,7 +75,7 @@ static int pci_bridge_dev_initfn(PCIDevice *dev) > goto slotid_error; > } > > - if ((bridge_dev->flags & (1 << PCI_BRIDGE_DEV_F_MSI_REQ)) && > + if (bridge_dev->msi != ON_OFF_AUTO_OFF && > msi_nonbroken) { > err = msi_init(dev, 0, 1, true, true); > if (err < 0) { > @@ -147,8 +148,8 @@ static Property pci_bridge_dev_properties[] = { > /* Note: 0 is not a legal chassis number. */ > DEFINE_PROP_UINT8(PCI_BRIDGE_DEV_PROP_CHASSIS_NR, PCIBridgeDev, chassis_nr, > 0), > - DEFINE_PROP_BIT(PCI_BRIDGE_DEV_PROP_MSI, PCIBridgeDev, flags, > - PCI_BRIDGE_DEV_F_MSI_REQ, true), > + DEFINE_PROP_ON_OFF_AUTO(PCI_BRIDGE_DEV_PROP_MSI, PCIBridgeDev, msi, > + ON_OFF_AUTO_AUTO), > DEFINE_PROP_BIT(PCI_BRIDGE_DEV_PROP_SHPC, PCIBridgeDev, flags, > PCI_BRIDGE_DEV_F_SHPC_REQ, true), > DEFINE_PROP_END_OF_LIST(), > Reviewed-by: Marcel Apfelbaum Thanks, Marcel