Commit 3d7196d4 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/usb-20171023-pull-request' into staging 



usb: ccid fix.

# gpg: Signature made Mon 23 Oct 2017 09:45:00 BST
# gpg:                using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/usb-20171023-pull-request:
  usb-ccid: remove needless migration state code

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 9293fcfe 31bd59db

hw/usb/dev-smartcard-reader.c

+1 −22
Original line number Diff line number Diff line
@@ -270,11 +270,6 @@ typedef struct BulkIn { 
    uint32_t pos;

} BulkIn;



enum {

    MIGRATION_NONE,

    MIGRATION_MIGRATED,

};



typedef struct CCIDBus {

    BusState qbus;

} CCIDBus;
@@ -306,9 +301,6 @@ typedef struct USBCCIDState { 
    CCID_ProtocolDataStructure abProtocolDataStructure;

    uint32_t ulProtocolDataStructureSize;

    uint32_t state_vmstate;

    uint32_t migration_target_ip;

    uint16_t migration_target_port;

    uint8_t  migration_state;

    uint8_t  bmSlotICCState;

    uint8_t  powered;

    uint8_t  notify_slot_change;
@@ -1243,9 +1235,6 @@ int ccid_card_ccid_attach(CCIDCardState *card) 
    USBCCIDState *s = USB_CCID_DEV(dev);



    DPRINTF(s, 1, "CCID Attach\n");

    if (s->migration_state == MIGRATION_MIGRATED) {

        s->migration_state = MIGRATION_NONE;

    }

    return 0;

}
@@ -1341,9 +1330,6 @@ static void ccid_realize(USBDevice *dev, Error **errp) 
    s->intr = usb_ep_get(dev, USB_TOKEN_IN, CCID_INT_IN_EP);

    s->bulk = usb_ep_get(dev, USB_TOKEN_IN, CCID_BULK_IN_EP);

    s->card = NULL;

    s->migration_state = MIGRATION_NONE;

    s->migration_target_ip = 0;

    s->migration_target_port = 0;

    s->dev.speed = USB_SPEED_FULL;

    s->dev.speedmask = USB_SPEED_MASK_FULL;

    s->notify_slot_change = false;
@@ -1379,13 +1365,6 @@ static int ccid_pre_save(void *opaque) 
    USBCCIDState *s = opaque;



    s->state_vmstate = s->dev.state;

    if (s->dev.attached) {

        /*

         * Migrating an open device, ignore reconnection CHR_EVENT to avoid an

         * erroneous detach.

         */

        s->migration_state = MIGRATION_MIGRATED;

    }



    return 0;

}
@@ -1452,7 +1431,7 @@ static VMStateDescription ccid_vmstate = { 
        VMSTATE_STRUCT_ARRAY(pending_answers, USBCCIDState,

                        PENDING_ANSWERS_NUM, 1, answer_vmstate, Answer),

        VMSTATE_UINT32(pending_answers_num, USBCCIDState),

        VMSTATE_UINT8(migration_state, USBCCIDState),

        VMSTATE_UNUSED(1), /* was migration_state */

        VMSTATE_UINT32(state_vmstate, USBCCIDState),

        VMSTATE_END_OF_LIST()

    }