On 06/20/2016 08:13 AM, Cao jin wrote:
> From bit to enum OnOffAuto.
>
> cc: Hannes Reinecke <h...@suse.de>
> cc: Paolo Bonzini <pbonz...@redhat.com>
> cc: Michael S. Tsirkin <m...@redhat.com>
> cc: Markus Armbruster <arm...@redhat.com>
> cc: Marcel Apfelbaum <mar...@redhat.com>
>
> Reviewed-by: Markus Armbruster <arm...@redhat.com>
> Signed-off-by: Cao jin <caoj.f...@cn.fujitsu.com>
> ---
> hw/scsi/megasas.c | 28 +++++++++++-----------------
> 1 file changed, 11 insertions(+), 17 deletions(-)
>
> diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c
> index a9ffc32..7a4301b 100644
> --- a/hw/scsi/megasas.c
> +++ b/hw/scsi/megasas.c
> @@ -48,11 +48,7 @@
>
> #define MEGASAS_FLAG_USE_JBOD 0
> #define MEGASAS_MASK_USE_JBOD (1 << MEGASAS_FLAG_USE_JBOD)
> -#define MEGASAS_FLAG_USE_MSI 1
> -#define MEGASAS_MASK_USE_MSI (1 << MEGASAS_FLAG_USE_MSI)
> -#define MEGASAS_FLAG_USE_MSIX 2
> -#define MEGASAS_MASK_USE_MSIX (1 << MEGASAS_FLAG_USE_MSIX)
> -#define MEGASAS_FLAG_USE_QUEUE64 3
> +#define MEGASAS_FLAG_USE_QUEUE64 1
> #define MEGASAS_MASK_USE_QUEUE64 (1 << MEGASAS_FLAG_USE_QUEUE64)
>
> static const char *mfi_frame_desc[] = {
> @@ -96,6 +92,8 @@ typedef struct MegasasState {
> int busy;
> int diag;
> int adp_reset;
> + OnOffAuto msi;
> + OnOffAuto msix;
>
> MegasasCmd *event_cmd;
> int event_locale;
> @@ -159,12 +157,12 @@ static bool megasas_use_queue64(MegasasState *s)
>
> static bool megasas_use_msi(MegasasState *s)
> {
> - return s->flags & MEGASAS_MASK_USE_MSI;
> + return s->msi != ON_OFF_AUTO_OFF;
> }
>
> static bool megasas_use_msix(MegasasState *s)
> {
> - return s->flags & MEGASAS_MASK_USE_MSIX;
> + return s->msix != ON_OFF_AUTO_OFF;
> }
>
> static bool megasas_is_jbod(MegasasState *s)
> @@ -2352,12 +2350,12 @@ static void megasas_scsi_realize(PCIDevice *dev,
> Error **errp)
>
> if (megasas_use_msi(s) &&
> msi_init(dev, 0x50, 1, true, false)) {
> - s->flags &= ~MEGASAS_MASK_USE_MSI;
> + s->msi = ON_OFF_AUTO_OFF;
> }
> if (megasas_use_msix(s) &&
> msix_init(dev, 15, &s->mmio_io, b->mmio_bar, 0x2000,
> &s->mmio_io, b->mmio_bar, 0x3800, 0x68)) {
> - s->flags &= ~MEGASAS_MASK_USE_MSIX;
> + s->msix = ON_OFF_AUTO_OFF;
> }
> if (pci_is_express(dev)) {
> pcie_endpoint_cap_init(dev, 0xa0);
> @@ -2425,10 +2423,8 @@ static Property megasas_properties_gen1[] = {
> MEGASAS_DEFAULT_FRAMES),
> DEFINE_PROP_STRING("hba_serial", MegasasState, hba_serial),
> DEFINE_PROP_UINT64("sas_address", MegasasState, sas_addr, 0),
> - DEFINE_PROP_BIT("use_msi", MegasasState, flags,
> - MEGASAS_FLAG_USE_MSI, false),
> - DEFINE_PROP_BIT("use_msix", MegasasState, flags,
> - MEGASAS_FLAG_USE_MSIX, false),
> + DEFINE_PROP_ON_OFF_AUTO("msi", MegasasState, msi, ON_OFF_AUTO_AUTO),
> + DEFINE_PROP_ON_OFF_AUTO("msix", MegasasState, msix, ON_OFF_AUTO_AUTO),
> DEFINE_PROP_BIT("use_jbod", MegasasState, flags,
> MEGASAS_FLAG_USE_JBOD, false),
> DEFINE_PROP_END_OF_LIST(),
> @@ -2441,10 +2437,8 @@ static Property megasas_properties_gen2[] = {
> MEGASAS_GEN2_DEFAULT_FRAMES),
> DEFINE_PROP_STRING("hba_serial", MegasasState, hba_serial),
> DEFINE_PROP_UINT64("sas_address", MegasasState, sas_addr, 0),
> - DEFINE_PROP_BIT("use_msi", MegasasState, flags,
> - MEGASAS_FLAG_USE_MSI, true),
> - DEFINE_PROP_BIT("use_msix", MegasasState, flags,
> - MEGASAS_FLAG_USE_MSIX, true),
> + DEFINE_PROP_ON_OFF_AUTO("msi", MegasasState, msi, ON_OFF_AUTO_AUTO),
> + DEFINE_PROP_ON_OFF_AUTO("msix", MegasasState, msix, ON_OFF_AUTO_AUTO),
> DEFINE_PROP_BIT("use_jbod", MegasasState, flags,
> MEGASAS_FLAG_USE_JBOD, false),
> DEFINE_PROP_END_OF_LIST(),
>
Reviewed-by: Hannes Reinecke <h...@suse.com>
Cheers,
Hannes
--
Dr. Hannes Reinecke Teamlead Storage & Networking
h...@suse.de +49 911 74053 688
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton
HRB 21284 (AG Nürnberg)
