From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56700) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bcI3m-00049v-JE for qemu-devel@nongnu.org; Tue, 23 Aug 2016 16:12:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bcI3j-00069K-9G for qemu-devel@nongnu.org; Tue, 23 Aug 2016 16:12:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49746) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bcI3j-00069D-0z for qemu-devel@nongnu.org; Tue, 23 Aug 2016 16:12:31 -0400 Date: Tue, 23 Aug 2016 23:12:28 +0300 From: "Michael S. Tsirkin" Message-ID: <20160823230711-mutt-send-email-mst@kernel.org> References: <1471853367-18474-1-git-send-email-jasowang@redhat.com> <1471853367-18474-3-git-send-email-jasowang@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1471853367-18474-3-git-send-email-jasowang@redhat.com> Subject: Re: [Qemu-devel] [PULL 2/2] e1000e: remove internal interrupt flag List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jason Wang Cc: qemu-devel@nongnu.org, peter.maydell@linaro.org, Cao jin , Dmitry Fleytman , Markus Armbruster , Marcel Apfelbaum , Paolo Bonzini On Mon, Aug 22, 2016 at 04:09:27PM +0800, Jason Wang wrote: > From: Cao jin > > Commit 66bf7d58 removed internal msi state flag E1000E_USE_MSI, E1000E_USE_MSIX > is not necessary too, remove it now. And interrupt flag field intr_state also > can be removed now. > > CC: Dmitry Fleytman > CC: Jason Wang > CC: Markus Armbruster > CC: Marcel Apfelbaum > CC: Michael S. Tsirkin > CC: Paolo Bonzini > Signed-off-by: Cao jin > Reviewed-by: Markus Armbruster > Acked-by: Dmitry Fleytman > Reviewed-by: Paolo Bonzini > Signed-off-by: Jason Wang We really shouldn't merge cleanups at this stage, imho. > --- > hw/net/e1000e.c | 8 +------- > 1 file changed, 1 insertion(+), 7 deletions(-) > > diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c > index d001c96..bad43f4 100644 > --- a/hw/net/e1000e.c > +++ b/hw/net/e1000e.c > @@ -69,7 +69,6 @@ typedef struct E1000EState { > uint16_t subsys_ven_used; > uint16_t subsys_used; > > - uint32_t intr_state; > bool disable_vnet; > > E1000ECore core; > @@ -89,8 +88,6 @@ typedef struct E1000EState { > #define E1000E_MSIX_TABLE (0x0000) > #define E1000E_MSIX_PBA (0x2000) > > -#define E1000E_USE_MSIX BIT(0) > - > static uint64_t > e1000e_mmio_read(void *opaque, hwaddr addr, unsigned size) > { > @@ -302,8 +299,6 @@ e1000e_init_msix(E1000EState *s) > } else { > if (!e1000e_use_msix_vectors(s, E1000E_MSIX_VEC_NUM)) { > msix_uninit(d, &s->msix, &s->msix); > - } else { > - s->intr_state |= E1000E_USE_MSIX; > } > } > } > @@ -311,7 +306,7 @@ e1000e_init_msix(E1000EState *s) > static void > e1000e_cleanup_msix(E1000EState *s) > { > - if (s->intr_state & E1000E_USE_MSIX) { > + if (msix_enabled(PCI_DEVICE(s))) { > e1000e_unuse_msix_vectors(s, E1000E_MSIX_VEC_NUM); > msix_uninit(PCI_DEVICE(s), &s->msix, &s->msix); > } > @@ -601,7 +596,6 @@ static const VMStateDescription e1000e_vmstate = { > VMSTATE_MSIX(parent_obj, E1000EState), > > VMSTATE_UINT32(ioaddr, E1000EState), > - VMSTATE_UINT32(intr_state, E1000EState), > VMSTATE_UINT32(core.rxbuf_min_shift, E1000EState), > VMSTATE_UINT8(core.rx_desc_len, E1000EState), > VMSTATE_UINT32_ARRAY(core.rxbuf_sizes, E1000EState, > -- > 2.7.4