search for: set_operation

..." ^ s_"Set mount options (eg /:noatime;/var:rw,noatime)"; + "--no-selinux-relabel", Arg.Unit (fun () -> ()), + " " ^ s_"Compatibility option, does nothing"; "--operation", Arg.String set_operations, " " ^ s_"Enable/disable specific operations"; "--operations", Arg.String set_operations, " " ^ s_"Enable/disable specific operations"; "-q", Arg.Set quiet, " " ^ s_"Don't print log mess...

...2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nv04_graph.c b/drivers/gpu/drm/nouveau/nv04_graph.c index 396ee92..d561d77 100644 --- a/drivers/gpu/drm/nouveau/nv04_graph.c +++ b/drivers/gpu/drm/nouveau/nv04_graph.c @@ -543,7 +543,7 @@ nv04_graph_mthd_set_operation(struct nouveau_channel *chan, int grclass, nv_wi32(dev, instance, tmp); nv_wr32(dev, NV04_PGRAPH_CTX_SWITCH1, tmp); - nv_wr32(dev, NV04_PGRAPH_CTX_CACHE1 + subc, tmp); + nv_wr32(dev, NV04_PGRAPH_CTX_CACHE1 + (subc<<2), tmp); return 0; } -- 1.6.5.6

On Thu, Jan 09, 2014 at 04:21:10PM +0100, Pino Toscano wrote: > + and set_operations op_string = > + let currentopset = > + match (!operations) with No need for parentheses around !operations. > + let n = ref op_name in > + let remove = string_prefix op_name "-" in > + if remove then > + n := String.sub op_name 1...

On Friday 10 January 2014 10:09:19 Richard W.M. Jones wrote: > On Thu, Jan 09, 2014 at 03:45:54PM +0000, Richard W.M. Jones wrote: > > On Thu, Jan 09, 2014 at 04:21:10PM +0100, Pino Toscano wrote: > > > + and set_operations op_string = > > > + let currentopset = > > > + match (!operations) with > > > > No need for parentheses around !operations. Fixed. > > > + let n = ref op_name in > > > + let remove = string_prefix op_name "-" in &gt...

...f --git a/sysprep/main.ml b/sysprep/main.ml index 689a394..49750a9 100644 --- a/sysprep/main.ml +++ b/sysprep/main.ml @@ -87,6 +87,40 @@ let debug_gc, operations, g, selinux_relabel, quiet, mount_opts = exit 1 ) Sysprep_operation.empty_set ops in operations := Some opset + and set_operations op_string = + let currentopset = + match !operations with + | Some x -> x + | None -> Sysprep_operation.empty_set + in + let ops = string_nsplit "," op_string in + let opset = List.fold_left ( + fun opset op_name -> + let op = + if...

On Tuesday 07 January 2014 12:12:43 Richard W.M. Jones wrote: > On Tue, Jan 07, 2014 at 11:16:08AM +0100, Pino Toscano wrote: > > On Friday 27 December 2013 10:58:15 you wrote: > > > virt-sysprep either runs with all default operations or a selected > > > list of operations with the --enable argument. A few times I've > > > found I'd like to use the

Make print_version_and_exit, long_options, display_short_options, and display_long_options private, as set_standard_options now takes care of handling the job for the common command line options. --- mllib/common_utils.mli | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/mllib/common_utils.mli b/mllib/common_utils.mli index 79032bc..24f8f83 100644 --- a/mllib/common_utils.mli +++

On Thu, Jan 09, 2014 at 03:45:54PM +0000, Richard W.M. Jones wrote: > On Thu, Jan 09, 2014 at 04:21:10PM +0100, Pino Toscano wrote: > > + and set_operations op_string = > > + let currentopset = > > + match (!operations) with > > No need for parentheses around !operations. > > > + let n = ref op_name in > > + let remove = string_prefix op_name "-" in > > + if remove then &g...

...ar network, " " ^ s_"Disable appliance network"; "--no-selinux-relabel", Arg.Unit (fun () -> ()), " " ^ s_"Compatibility option, does nothing"; "--operation", Arg.String set_operations, " " ^ s_"Enable/disable specific operations"; @@ -192,6 +195,7 @@ read the man page virt-sysprep(1). (* Dereference the rest of the args. *) let dryrun = !dryrun in + let network = !network in let operations = !operations in (* At this point we know...

This is just one possible way to fix this bug, but the simplest. Others I considered: - Keeping the network disabled by default. Options like --install wouldn't work and there would be no actionable error message telling users what to do to fix it. - Modifying virt-customize to warn/error/suggest if operations like --install were used but the network was disabled. However

..., " " ^ s_"Disable appliance network (default)"; "--no-selinux-relabel", Arg.Unit (fun () -> ()), " " ^ s_"Compatibility option, does nothing"; "--operation", Arg.String set_operations, " " ^ s_"Enable/disable specific operations"; @@ -192,6 +195,7 @@ read the man page virt-sysprep(1). (* Dereference the rest of the args. *) let dryrun = !dryrun in + let network = !network in let operations = !operations in (* At this point we know...

...quot; ^ s_"Disable appliance network (default)"; > - "--no-selinux-relabel", Arg.Unit (fun () -> ()), > - " " ^ s_"Compatibility option, does nothing"; > - "--operation", Arg.String set_operations, " " ^ s_"Enable/disable specific operations"; > - "--operations", Arg.String set_operations, " " ^ s_"Enable/disable specific operations"; > + [ "-a"; "--add" ], Getopt.String (s_"file", add_fil...

...etwork (default)"; + [ L"no-selinux-relabel" ], Getopt.Unit (fun () -> ()), s_"Compatibility option, does nothing"; - [ "--operation"; "--operations" ], Getopt.String (s_"operations", set_operations), s_"Enable/disable specific operations"; + [ L"operation"; L"operations" ], Getopt.String (s_"operations", set_operations), s_"Enable/disable specific operations"; ] in let args = basic_args @ Sysprep_operation.extra_args () in...

..., " " ^ s_"Disable appliance network (default)"; - "--no-selinux-relabel", Arg.Unit (fun () -> ()), - " " ^ s_"Compatibility option, does nothing"; - "--operation", Arg.String set_operations, " " ^ s_"Enable/disable specific operations"; - "--operations", Arg.String set_operations, " " ^ s_"Enable/disable specific operations"; + [ "-a"; "--add" ], Getopt.String (s_"file", add_file),...

..., " " ^ s_"Disable appliance network (default)"; - "--no-selinux-relabel", Arg.Unit (fun () -> ()), - " " ^ s_"Compatibility option, does nothing"; - "--operation", Arg.String set_operations, " " ^ s_"Enable/disable specific operations"; - "--operations", Arg.String set_operations, " " ^ s_"Enable/disable specific operations"; + [ "-a"; "--add" ], Getopt.String (s_"file", add_file),...

..., " " ^ s_"Disable appliance network (default)"; - "--no-selinux-relabel", Arg.Unit (fun () -> ()), - " " ^ s_"Compatibility option, does nothing"; - "--operation", Arg.String set_operations, " " ^ s_"Enable/disable specific operations"; - "--operations", Arg.String set_operations, " " ^ s_"Enable/disable specific operations"; + [ "-a"; "--add" ], Getopt.String (s_"file", add_file),...

...(eg /:noatime;/var:rw,noatime)"; "--no-selinux-relabel", Arg.Unit (fun () -> ()), " " ^ s_"Compatibility option, does nothing"; @@ -140,19 +138,9 @@ let main () = "--operations", Arg.String set_operations, " " ^ s_"Enable/disable specific operations"; "-q", Arg.Unit set_quiet, " " ^ s_"Don't print log messages"; "--quiet", Arg.Unit set_quiet, " " ^ s_"Don't print log messages&quot...

v1 -> v2: - Further fixes to Getopt int parsing. - Completed the L/S changes. - Fixed the test suite so it passes now. Also we don't need the special-case tests for 64 bit arch. Rich.

v3 -> v4: - Pushed the first patch upstream since it was ACKed. - Prevent use of M except for the special virt-v2v options. - Sort the options after added --help etc. - Make corresponding fixes to the tests. Rich.

v2 -> v3: - Add M variant and test it. Rich.