[Crash-utility] [PATCH v3 1/9] move MEMSRC_LOCAL from pc->flags to pc->flags2
We need a room for the new flag (introduced later) in pc->flags.
Signed-off-by: Oleg Nesterov <oleg(a)redhat.com>
---
defs.h | 2 +-
filesys.c | 2 +-
main.c | 2 +-
remote.c | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/defs.h b/defs.h
index 56ae06c..cc5db51 100644
--- a/defs.h
+++ b/defs.h
@@ -212,7 +212,6 @@ struct number_option {
#define DEVMEM (0x2000000ULL)
#define REM_LIVE_SYSTEM (0x4000000ULL)
#define NAMELIST_LOCAL (0x8000000ULL)
-#define MEMSRC_LOCAL (0x10000000ULL)
#define NAMELIST_SAVED (0x20000000ULL)
#define DUMPFILE_SAVED (0x40000000ULL)
#define UNLINK_NAMELIST (0x80000000ULL)
@@ -523,6 +522,7 @@ struct program_context {
#define SNAP (0x20000ULL)
#define EXCLUDED_VMEMMAP (0x40000ULL)
#define is_excluded_vmemmap() (pc->flags2 & EXCLUDED_VMEMMAP)
+#define MEMSRC_LOCAL (0x80000ULL)
char *cleanup;
char *namelist_orig;
char *namelist_debug_orig;
diff --git a/filesys.c b/filesys.c
index 9b59998..f05a8cd 100644
--- a/filesys.c
+++ b/filesys.c
@@ -162,7 +162,7 @@ fd_init(void)
static void
memory_source_init(void)
{
- if (REMOTE() && !(pc->flags & MEMSRC_LOCAL))
+ if (REMOTE() && !(pc->flags2 & MEMSRC_LOCAL))
return;
if (pc->flags & KERNEL_DEBUG_QUERY)
diff --git a/main.c b/main.c
index 821bb4e..a4db88d 100644
--- a/main.c
+++ b/main.c
@@ -1294,7 +1294,7 @@ dump_program_context(void)
if (pc->flags & REM_LIVE_SYSTEM)
sprintf(&buf[strlen(buf)],
"%sREM_LIVE_SYSTEM", others++ ? "|" :
"");
- if (pc->flags & MEMSRC_LOCAL)
+ if (pc->flags2 & MEMSRC_LOCAL)
sprintf(&buf[strlen(buf)],
"%sMEMSRC_LOCAL", others++ ? "|" :
"");
if (pc->flags & NAMELIST_LOCAL)
diff --git a/remote.c b/remote.c
index 2938669..88a326b 100644
--- a/remote.c
+++ b/remote.c
@@ -2537,7 +2537,7 @@ remote_fd_init(void)
error(INFO, "too many dumpfile/memory arguments\n");
program_usage(SHORT_FORM);
}
- pc->flags |= MEMSRC_LOCAL;
+ pc->flags2 |= MEMSRC_LOCAL;
if (pc->flags & (DEVMEM|MEMMOD)) {
if (!get_proc_version())
error(INFO, "/proc/version: %s\n",
@@ -3025,7 +3025,7 @@ dumpfile_save:
return FALSE;
}
- if (pc->flags & MEMSRC_LOCAL) {
+ if (pc->flags2 & MEMSRC_LOCAL) {
error(INFO, "%s is a local file\n", pc->dumpfile);
return FALSE;
}
--
2.5.0