← Back to branch summary

~ubuntu-branches/ubuntu/vivid/qemu/vivid

« back to all changes in this revision

Viewing changes to libcacard/vscclient.c

  • Committer: Package Import Robot
  • Author(s): Serge Hallyn
  • Date: 2014-02-25 22:31:43 UTC
  • mfrom: (1.8.5)
  • Revision ID: package-import@ubuntu.com-20140225223143-odhqxfc60wxrjl15
Tags: 2.0.0~rc1+dfsg-0ubuntu1
https://launchpad.net/bugs/1294823
https://launchpad.net/bugs/1295072
* Merge 2.0.0-rc1
* debian/rules: consolidate ppc filter entries.
* Move qemu-system-arch64 into qemu-system-arm
* debian/patches/define-trusty-machine-type.patch: define a trusty machine
  type, currently the same as pc-i440fx-2.0, to put is in a better position
  to enable live migrations from trusty onward.  (LP: #1294823)
* debian/control: build-dep on libfdt >= 1.4.0  (LP: #1295072)
* Merge latest upstream git to commit dc9528f
* Debian/rules:
  - remove -enable-uname-release=2.6.32
  - don't make the aarch64 target Ubuntu-specific.
* Remove patches which are now upstream:
  - fix-smb-security-share.patch
  - slirp-smb-redirect-port-445-too.patch 
  - linux-user-Implement-sendmmsg-syscall.patch (better version is upstream)
  - signal-added-a-wrapper-for-sigprocmask-function.patch
  - ubuntu/signal-sigsegv-protection-on-do_sigprocmask.patch
  - ubuntu/Don-t-block-SIGSEGV-at-more-places.patch
  - ubuntu/ppc-force-cpu-threads-count-to-be-power-of-2.patch
* add link for /usr/share/qemu/bios-256k.bin
* Remove all linaro patches.
* Remove all arm64/ patches.  Many but not all are upstream.
* Remove CVE-2013-4377.patch which is upstream.
* debian/control-in: don't make qemu-system-aarch64 ubuntu-specific

Show diffs side-by-side

added added

removed removed

Lines of Context:
libcacard/vscclient.c
58
58
static guint socket_tag;
59
59
 
60
60
static void
61
 
update_socket_watch(gboolean out);
 
61
update_socket_watch(void);
62
62
 
63
63
static gboolean
64
64
do_socket_send(GIOChannel *source,
80
80
    g_byte_array_remove_range(socket_to_send, 0, bw);
81
81
 
82
82
    if (socket_to_send->len == 0) {
83
 
        update_socket_watch(FALSE);
 
83
        update_socket_watch();
84
84
        return FALSE;
85
85
    }
86
86
    return TRUE;
89
89
static gboolean
90
90
socket_prepare_sending(gpointer user_data)
91
91
{
92
 
    update_socket_watch(TRUE);
 
92
    update_socket_watch();
93
93
 
94
94
    return FALSE;
95
95
}
269
269
    send_msg(VSC_ReaderRemove, VSCARD_MINIMAL_READER_ID, NULL, 0);
270
270
    /* launch the event_thread. This will trigger reader adds for all the
271
271
     * existing readers */
272
 
    qemu_thread_create(&thread_id, event_thread, NULL, 0);
 
272
    qemu_thread_create(&thread_id, "vsc/event", event_thread, NULL, 0);
273
273
    return 0;
274
274
}
275
275
 
407
407
            }
408
408
            break;
409
409
        default:
410
 
            g_warn_if_reached();
 
410
            g_assert_not_reached();
411
411
            return FALSE;
412
412
        }
413
413
 
440
440
}
441
441
 
442
442
static void
443
 
update_socket_watch(gboolean out)
 
443
update_socket_watch(void)
444
444
{
 
445
    gboolean out = socket_to_send->len > 0;
 
446
 
445
447
    if (socket_tag != 0) {
446
448
        g_source_remove(socket_tag);
447
449
    }
760
762
 
761
763
    g_io_channel_unref(channel_stdin);
762
764
    g_io_channel_unref(channel_socket);
763
 
    g_byte_array_unref(socket_to_send);
 
765
    g_byte_array_free(socket_to_send, TRUE);
764
766
 
765
767
    closesocket(sock);
766
768
    return 0;