Commit 62680fad authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging 



# gpg: Signature made Mon 22 Aug 2016 09:06:32 BST
# gpg:                using RSA key 0xEF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 215D 46F4 8246 689E C77F  3562 EF04 965B 398D 6211

* remotes/jasowang/tags/net-pull-request:
  e1000e: remove internal interrupt flag
  slirp: fix segv when init failed

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 5f9f818e e0af5a0e

hw/net/e1000e.c

+1 −7
Original line number Diff line number Diff line
@@ -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,

net/slirp.c

+3 −1
Original line number Diff line number Diff line
@@ -131,7 +131,9 @@ static void net_slirp_cleanup(NetClientState *nc) 
    SlirpState *s = DO_UPCAST(SlirpState, nc, nc);



    slirp_cleanup(s->slirp);

    if (s->exit_notifier.notify) {

        qemu_remove_exit_notifier(&s->exit_notifier);

    }

    slirp_smb_cleanup(s);

    QTAILQ_REMOVE(&slirp_stacks, s, entry);

}