[CRIU] [PATCH 05/12] crtools: add image contants for pending signals

Andrey Wagin avagin at gmail.com
Tue Dec 18 13:43:00 EST 2012


2012/12/18 Pavel Emelyanov <xemul at parallels.com>:
> On 12/18/2012 10:36 AM, Andrey Vagin wrote:
>>
>> Signed-off-by: Andrey Vagin <avagin at openvz.org>
>> ---
>>  image.c           | 2 ++
>>  include/crtools.h | 2 ++
>>  include/image.h   | 2 ++
>>  3 files changed, 6 insertions(+)
>>
>> diff --git a/image.c b/image.c
>> index f1f93a0..a06e065 100644
>> --- a/image.c
>> +++ b/image.c
>> @@ -130,6 +130,8 @@ struct cr_fd_desc_tmpl fdset_template[CR_FD_MAX] = {
>>       FD_ENTRY(TMPFS,         "tmpfs-%d.tar.gz", show_raw_image),
>>       FD_ENTRY(TTY,           "tty",           show_tty),
>>       FD_ENTRY(TTY_INFO,      "tty-info",      show_tty_info),
>> +     FD_ENTRY(SIGNAL,        "signal-%d",     show_siginfo),
>> +     FD_ENTRY(PSIGNAL,       "psignal-%d",    show_siginfo),
>
> What's the difference between these two?

signal containes shared siginfo-s.
psignal containes private siginfo-s.

>
>>  };
>>
>>  static struct cr_fdset *alloc_cr_fdset(int nr)
>> diff --git a/include/crtools.h b/include/crtools.h
>> index eb7013b..702c59e 100644
>> --- a/include/crtools.h
>> +++ b/include/crtools.h
>> @@ -33,6 +33,7 @@ enum {
>>       CR_FD_ITIMERS,
>>       CR_FD_CREDS,
>>       CR_FD_FS,
>> +     CR_FD_SIGNAL,
>>       _CR_FD_TASK_TO,
>>
>>       /*
>> @@ -78,6 +79,7 @@ enum {
>>       _CR_FD_GLOB_TO,
>>
>>       CR_FD_TMPFS,
>> +     CR_FD_PSIGNAL,
>>
>>       CR_FD_MAX
>>  };
>> diff --git a/include/image.h b/include/image.h
>> index 916b9a8..136dce8 100644
>> --- a/include/image.h
>> +++ b/include/image.h
>> @@ -61,6 +61,8 @@
>>  #define NETDEV_MAGIC         0x57373951 /* Yaroslavl */
>>  #define TTY_MAGIC            0x59433025 /* Pushkin */
>>  #define TTY_INFO_MAGIC               0x59453036 /* Kolpino */
>> +#define SIGNAL_MAGIC         0x59255647 /* Berezniki */
>> +#define PSIGNAL_MAGIC                SIGNAL_MAGIC
>>
>>  #define IFADDR_MAGIC         RAW_IMAGE_MAGIC
>>  #define ROUTE_MAGIC          RAW_IMAGE_MAGIC
>>
>
>


More information about the CRIU mailing list