[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v7 15/15] vmw_pvscsi: remove unnecessary interna
From: |
Markus Armbruster |
Subject: |
Re: [Qemu-devel] [PATCH v7 15/15] vmw_pvscsi: remove unnecessary internal msi state flag |
Date: |
Thu, 09 Jun 2016 17:48:59 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) |
Cao jin <address@hidden> writes:
> Internal flag msi_used is uncesessary, msi_uninit() could be called
> directly, msi_enabled() is enough to check device msi state.
>
> cc: Paolo Bonzini <address@hidden>
> cc: Dmitry Fleytman <address@hidden>
> cc: Markus Armbruster <address@hidden>
> cc: Marcel Apfelbaum <address@hidden>
> cc: Michael S. Tsirkin <address@hidden>
>
> Signed-off-by: Cao jin <address@hidden>
> ---
> hw/scsi/vmw_pvscsi.c | 14 +++-----------
> 1 file changed, 3 insertions(+), 11 deletions(-)
>
> diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c
> index c384442..9838fa5 100644
> --- a/hw/scsi/vmw_pvscsi.c
> +++ b/hw/scsi/vmw_pvscsi.c
> @@ -121,8 +121,6 @@ typedef struct {
> uint8_t msg_ring_info_valid; /* Whether message ring initialized
> */
> uint8_t use_msg; /* Whether to use message ring
> */
>
> - uint8_t msi_used; /* Whether MSI support was installed successfully
> */
> -
> PVSCSIRingInfo rings; /* Data transfer rings manager
> */
> uint32_t resetting; /* Reset in progress
> */
>
> @@ -351,7 +349,7 @@ pvscsi_update_irq_status(PVSCSIState *s)
> trace_pvscsi_update_irq_level(should_raise, s->reg_interrupt_enabled,
> s->reg_interrupt_status);
>
> - if (s->msi_used && msi_enabled(d)) {
> + if (msi_enabled(d)) {
> if (should_raise) {
> trace_pvscsi_update_irq_msi();
> msi_notify(d, PVSCSI_VECTOR_COMPLETION);
> @@ -1049,12 +1047,9 @@ pvscsi_init_msi(PVSCSIState *s)
>
> res = msi_init(d, PVSCSI_MSI_OFFSET(s), PVSCSI_MSIX_NUM_VECTORS,
> PVSCSI_USE_64BIT, PVSCSI_PER_VECTOR_MASK, &err);
> - if (res < 0) {
> + if (res) {
I'd leave this alone.
> trace_pvscsi_init_msi_fail(res);
> error_free(err);
> - s->msi_used = false;
> - } else {
> - s->msi_used = true;
> }
> }
>
> @@ -1063,9 +1058,7 @@ pvscsi_cleanup_msi(PVSCSIState *s)
> {
> PCIDevice *d = PCI_DEVICE(s);
>
> - if (s->msi_used) {
> - msi_uninit(d);
> - }
> + msi_uninit(d);
> }
>
> static const MemoryRegionOps pvscsi_ops = {
> @@ -1208,7 +1201,6 @@ static const VMStateDescription vmstate_pvscsi = {
> VMSTATE_STRUCT_TEST(parent_obj, PVSCSIState,
> pvscsi_vmstate_test_pci_device, 0,
> vmstate_pci_device, PCIDevice),
> - VMSTATE_UINT8(msi_used, PVSCSIState),
> VMSTATE_UINT32(resetting, PVSCSIState),
> VMSTATE_UINT64(reg_interrupt_status, PVSCSIState),
> VMSTATE_UINT64(reg_interrupt_enabled, PVSCSIState),
- [Qemu-devel] [PATCH v7 01/15] pci core: assert ENOSPC when add capability, (continued)
- [Qemu-devel] [PATCH v7 01/15] pci core: assert ENOSPC when add capability, Cao jin, 2016/06/06
- [Qemu-devel] [PATCH v7 02/15] fix some coding style problems, Cao jin, 2016/06/06
- [Qemu-devel] [PATCH v7 06/15] usb xhci: change msi/msix property type, Cao jin, 2016/06/06
- [Qemu-devel] [PATCH v7 08/15] mptsas: change msi property type, Cao jin, 2016/06/06
- [Qemu-devel] [PATCH v7 04/15] megasas: Fix check for msi_init() failure, Cao jin, 2016/06/06
- [Qemu-devel] [PATCH v7 14/15] mptsas: remove unnecessary internal msi state flag, Cao jin, 2016/06/06
- [Qemu-devel] [PATCH v7 03/15] change pvscsi_init_msi() type to void, Cao jin, 2016/06/06
- [Qemu-devel] [PATCH v7 07/15] intel-hda: change msi property type, Cao jin, 2016/06/06
- [Qemu-devel] [PATCH v7 05/15] mptsas: change .realize function name, Cao jin, 2016/06/06
- [Qemu-devel] [PATCH v7 15/15] vmw_pvscsi: remove unnecessary internal msi state flag, Cao jin, 2016/06/06
- Re: [Qemu-devel] [PATCH v7 15/15] vmw_pvscsi: remove unnecessary internal msi state flag,
Markus Armbruster <=
- [Qemu-devel] [PATCH v7 12/15] pci: Convert msi_init() to Error and fix callers to check it, Cao jin, 2016/06/06
- [Qemu-devel] [PATCH v7 13/15] megasas: remove unnecessary megasas_use_msi(), Cao jin, 2016/06/06
- [Qemu-devel] [PATCH v7 11/15] msi_init: change return value to 0 on success, Cao jin, 2016/06/06