/* device vserver commands */
#define VCMD_set_mapping VC_CMD(DEVICE, 1, 0)
+#define VCMD_unset_mapping VC_CMD(DEVICE, 2, 0)
struct vcmd_set_mapping_v0 {
const char *device;
lib/syscall_ctxmigrate-v21.hc \
lib/syscall_setmapping.c \
lib/syscall_setmapping-v21.hc \
+ lib/syscall_unsetmapping.c \
+ lib/syscall_unsetmapping-v21.hc \
lib/syscall_schedinfo.c \
lib/syscall_schedinfo-v21.hc \
lib/syscall_getccaps-v21.hc \
--- /dev/null
+// $Id$ --*- c -*--
+
+// Copyright (C) 2004 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+// Copyright (C) 2006 Daniel Hokka Zakrisson
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; version 2 of the License.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+static inline ALWAYSINLINE int
+vc_unset_mapping_v21(xid_t xid, const char *device, const char *target, uint32_t flags)
+{
+ struct vcmd_set_mapping_v0 data = {
+ .device = device,
+ .target = target,
+ .flags = flags
+ };
+ return vserver(VCMD_unset_mapping, xid, &data);
+}
--- /dev/null
+// $Id$ --*- c -*--
+
+// Copyright (C) 2004 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+// Copyright (C) 2006 Daniel Hokka Zakrisson
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; version 2 of the License.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "vserver.h"
+#include "vserver-internal.h"
+#include "virtual.h"
+
+#if defined(VC_ENABLE_API_V21)
+# include "syscall_unsetmapping-v21.hc"
+#endif
+
+#if defined(VC_ENABLE_API_V21)
+int
+vc_unset_mapping(xid_t xid, const char *device, const char *target, uint32_t flags)
+{
+ CALL_VC(CALL_VC_V21(vc_unset_mapping, xid, device, target, flags));
+}
+#endif
/* misc. syscalls */
int vc_set_mapping(xid_t xid, const char *device, const char *target, uint32_t flags);
+ int vc_unset_mapping(xid_t xid, const char *device, const char *target, uint32_t flags);
/** \brief Information about parsing errors
vdevmap_opts=( "${vdevmap_opts[@]}" ${flags:+--flags "$flags"} \
${device:+--device "$device"} ${target:+--target "$target"} )
- $_VDEVMAP --xid "$xid" "${vdevmap_opts[@]}" || return $?
+ $_VDEVMAP --xid "$xid" --set "${vdevmap_opts[@]}" || return $?
done
}
{ "help", no_argument, 0, CMD_HELP },
{ "version", no_argument, 0, CMD_VERSION },
{ "xid", required_argument, 0, 'x' },
+ { "set", no_argument, 0, 's' },
+ { "unset", no_argument, 0, 'u' },
{ "open", no_argument, 0, 'o' },
{ "create", no_argument, 0, 'c' },
{ "remap", no_argument, 0, 'r' },
WRITE_MSG(fd, "Usage: ");
WRITE_STR(fd, cmd);
WRITE_MSG(fd,
- " --xid <xid> [--flags <flags>] [--open] [--create] [--remap] [--device <dev>] [--target <dev>]\n"
+ " --xid <xid> {--set|--unset} [--flags <flags>] [--open] [--create]\n"
+ " [--device <dev>] [--remap --target <dev>]\n"
+ "\n"
+ " --flags <flags> Set the specified flags\n"
+ " --open Allow opening of the device\n"
+ " --create If SECURE_MKNOD is given, allow mknod(2)\n"
+ " --device <dev> Device to apply the command to\n"
+ " --remap Remap the device to the target\n"
+ " --target <dev> Target for --remap\n"
"\n"
"Please report bugs to " PACKAGE_BUGREPORT "\n");
uint32_t flags = 0;
char *device = NULL;
char *target = NULL;
+ bool set = true;
unsigned long tmp = 0;
while (1) {
- int c = getopt_long(argc, argv, "+x:ocrf:d:t:", CMDLINE_OPTIONS, 0);
+ int c = getopt_long(argc, argv, "+x:suocrf:d:t:", CMDLINE_OPTIONS, 0);
if (c==-1) break;
switch (c) {
case 'r' : do_remap = true; break;
case 'd' : device = optarg; break;
case 't' : target = optarg; break;
+ case 's' : set = 1; break;
+ case 'u' : set = 0; break;
case 'f' :
if (!isNumberUnsigned(optarg, &tmp, false)) {
WRITE_MSG(2, "Invalid flags argument: '");
if (allow_create) flags |= VC_DATTR_CREATE;
if (do_remap) flags |= VC_DATTR_REMAP;
- if (xid==VC_NOCTX)
+ if (target && !do_remap)
+ WRITE_MSG(2, "Target specified without --remap; try '--help' for more information\n");
+ else if (xid==VC_NOCTX)
WRITE_MSG(2, "No xid specified; try '--help' for more information\n");
else if (optind!=argc)
WRITE_MSG(2, "Unused argument(s); try '--help' for more information\n");
- else if (vc_set_mapping(xid, device, target, flags)==-1)
+ else if (set && vc_set_mapping(xid, device, target, flags)==-1)
perror("vc_set_mapping()");
+ else if (!set && vc_unset_mapping(xid, device, target, flags)==-1)
+ perror("vc_unset_mapping()");
else
return EXIT_SUCCESS;