From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40876) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSZK-00058F-8z for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:47:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bKSZI-0005eV-5i for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:47:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52329) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSZI-0005eQ-0I for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:47:24 -0400 Date: Tue, 5 Jul 2016 18:47:20 +0300 From: "Michael S. Tsirkin" Message-ID: <20160705184720-mutt-send-email-mst@redhat.com> References: <1467733400-17206-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1467733400-17206-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL v2 22/30] mptsas: change msi property type List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Cao jin , Paolo Bonzini , Markus Armbruster , Marcel Apfelbaum From: Cao jin >>From uint32 to enum OnOffAuto, and give it a shorter name. cc: Paolo Bonzini cc: Michael S. Tsirkin cc: Markus Armbruster cc: Marcel Apfelbaum Reviewed-by: Markus Armbruster Signed-off-by: Cao jin Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/scsi/mptsas.h | 3 ++- hw/scsi/mptsas.c | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/scsi/mptsas.h b/hw/scsi/mptsas.h index 595f81f..0436a33 100644 --- a/hw/scsi/mptsas.h +++ b/hw/scsi/mptsas.h @@ -27,7 +27,8 @@ struct MPTSASState { MemoryRegion diag_io; QEMUBH *request_bh; - uint32_t msi_available; + /* properties */ + OnOffAuto msi; uint64_t sas_addr; bool msi_in_use; diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c index be88e16..40033c4 100644 --- a/hw/scsi/mptsas.c +++ b/hw/scsi/mptsas.c @@ -1284,8 +1284,9 @@ static void mptsas_scsi_init(PCIDevice *dev, Error **errp) memory_region_init_io(&s->diag_io, OBJECT(s), &mptsas_diag_ops, s, "mptsas-diag", 0x10000); - if (s->msi_available && + if (s->msi != ON_OFF_AUTO_OFF && msi_init(dev, 0, 1, true, false) >= 0) { + /* TODO check for errors */ s->msi_in_use = true; } @@ -1403,7 +1404,7 @@ static const VMStateDescription vmstate_mptsas = { static Property mptsas_properties[] = { DEFINE_PROP_UINT64("sas_address", MPTSASState, sas_addr, 0), /* TODO: test MSI support under Windows */ - DEFINE_PROP_BIT("msi", MPTSASState, msi_available, 0, true), + DEFINE_PROP_ON_OFF_AUTO("msi", MPTSASState, msi, ON_OFF_AUTO_AUTO), DEFINE_PROP_END_OF_LIST(), }; -- MST