← Back to branch summary

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

« back to all changes in this revision

Viewing changes to util/qemu-progress.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:
util/qemu-progress.c
24
24
 
25
25
#include "qemu-common.h"
26
26
#include "qemu/osdep.h"
27
 
#include "sysemu/sysemu.h"
28
27
#include <stdio.h>
29
28
 
30
29
struct progress_state {
83
82
{
84
83
#ifdef CONFIG_POSIX
85
84
    struct sigaction action;
 
85
    sigset_t set;
86
86
 
87
87
    memset(&action, 0, sizeof(action));
88
88
    sigfillset(&action.sa_mask);
89
89
    action.sa_handler = sigusr_print;
90
90
    action.sa_flags = 0;
91
91
    sigaction(SIGUSR1, &action, NULL);
 
92
 
 
93
    /*
 
94
     * SIGUSR1 is SIG_IPI and gets blocked in qemu_init_main_loop(). In the
 
95
     * tools that use the progress report SIGUSR1 isn't used in this meaning
 
96
     * and instead should print the progress, so reenable it.
 
97
     */
 
98
    sigemptyset(&set);
 
99
    sigaddset(&set, SIGUSR1);
 
100
    pthread_sigmask(SIG_UNBLOCK, &set, NULL);
92
101
#endif
93
102
 
94
103
    state.print = progress_dummy_print;