[Qemu-devel] [PULL 0/1] Usb 20171023 patches

[Qemu-devel] [PULL 0/1] Usb 20171023 patches

[Gerd Hoffmann]

The following changes since commit e822e81e350825dd94f41ee2538ff1432b812eb9:

  Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2017-10-20 15:04:00 +0100)

are available in the git repository at:

  git://git.kraxel.org/qemu tags/usb-20171023-pull-request

for you to fetch changes up to 31bd59db446de48eb985b4e1c0e31dae10fc35f8:

  usb-ccid: remove needless migration state code (2017-10-23 10:05:28 +0200)

----------------------------------------------------------------
usb: ccid fix.

----------------------------------------------------------------

Marc-André Lureau (1):
  usb-ccid: remove needless migration state code

 hw/usb/dev-smartcard-reader.c | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

-- 
2.9.3

[Qemu-devel] [PULL 1/1] usb-ccid: remove needless migration state code

[Gerd Hoffmann]

From: Marc-André Lureau <marcandre.lureau@redhat.com>

This code appears to be unused since its introduction. We need to keep
the state_vmstate field byte in VMState for compatibility reasons.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 20171013125533.9153-1-marcandre.lureau@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/usb/dev-smartcard-reader.c | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c
index 0c77d2a41d..e334d3be11 100644
--- a/hw/usb/dev-smartcard-reader.c
+++ b/hw/usb/dev-smartcard-reader.c
@@ -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()
     }
-- 
2.9.3

Re: [Qemu-devel] [PULL 0/1] Usb 20171023 patches

[Peter Maydell]

On 23 October 2017 at 09:45, Gerd Hoffmann <kraxel@redhat.com> wrote:
> The following changes since commit e822e81e350825dd94f41ee2538ff1432b812eb9:
>
>   Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2017-10-20 15:04:00 +0100)
>
> are available in the git repository at:
>
>   git://git.kraxel.org/qemu tags/usb-20171023-pull-request
>
> for you to fetch changes up to 31bd59db446de48eb985b4e1c0e31dae10fc35f8:
>
>   usb-ccid: remove needless migration state code (2017-10-23 10:05:28 +0200)
>
> ----------------------------------------------------------------
> usb: ccid fix.
>
> ----------------------------------------------------------------
>
> Marc-André Lureau (1):
>   usb-ccid: remove needless migration state code
>
>  hw/usb/dev-smartcard-reader.c | 23 +----------------------

Applied, thanks.

-- PMM