mirror of
https://github.com/libguestfs/libguestfs.git
synced 2026-03-22 07:03:38 +00:00
0a164fe364
Instead of storing the number of sockets, cores, and threads separately
with the possibility to have each of them optional, store them together,
so either we have a CPU topology or none. This slightly simplifies the
handling of CPU topology.
Most of the output modes/producers already considered a missing
information of a topology as "1" when any of the other was specified, so
the behaviour is unchanged. The only behaviour changes are when
parsing, and creating libvirt XMLs:
- libvirt requires all the three attributes to be specified, so when
reading use them only if <topology> has all of them
- for the same reason, write <topology> only when all of them are
specified
Adapt the vmx, and ova input modes to consider 1 threads when they have
the other information of a CPU topology, since none of them can provide
that information yet.
(cherry picked from commit ac398265c4)
104 lines
3.0 KiB
OCaml
104 lines
3.0 KiB
OCaml
(* virt-v2v
|
|
* Copyright (C) 2009-2018 Red Hat Inc.
|
|
*
|
|
* 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; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* 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.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*)
|
|
|
|
open Printf
|
|
|
|
open Std_utils
|
|
open Tools_utils
|
|
open Common_gettext.Gettext
|
|
|
|
open Types
|
|
open Utils
|
|
open Name_from_disk
|
|
|
|
class input_disk input_format disk = object
|
|
inherit input
|
|
|
|
method as_options =
|
|
sprintf "-i disk%s %s"
|
|
(match input_format with
|
|
| None -> ""
|
|
| Some fmt -> " -if " ^ fmt)
|
|
disk
|
|
|
|
method source () =
|
|
(* Check the input file exists and is readable. *)
|
|
Unix.access disk [Unix.R_OK];
|
|
|
|
(* What name should we use for the guest? We try to derive it from
|
|
* the filename passed in. Users can override this using the
|
|
* `-on name' option.
|
|
*)
|
|
let name = name_from_disk disk in
|
|
|
|
(* Get the absolute path to the disk file. *)
|
|
let disk_absolute = absolute_path disk in
|
|
|
|
(* The rest of virt-v2v doesn't actually work unless we detect
|
|
* the format of the input, so:
|
|
*)
|
|
let format =
|
|
match input_format with
|
|
| Some format -> format
|
|
| None ->
|
|
match (open_guestfs ())#disk_format disk with
|
|
| "unknown" ->
|
|
error (f_"cannot detect the input disk format; use the -if parameter")
|
|
| format -> format in
|
|
|
|
let disk = {
|
|
s_disk_id = 0;
|
|
s_qemu_uri = disk_absolute;
|
|
s_format = Some format;
|
|
s_controller = None;
|
|
} in
|
|
|
|
(* Give the guest a simple generic network interface. *)
|
|
let network = {
|
|
s_mac = None;
|
|
s_nic_model = None;
|
|
s_vnet = "default"; s_vnet_orig = "default";
|
|
s_vnet_type = Network
|
|
} in
|
|
|
|
let source = {
|
|
s_hypervisor = UnknownHV;
|
|
s_name = name; s_orig_name = name;
|
|
s_memory = 2048L *^ 1024L *^ 1024L; (* 2048 MB *)
|
|
s_vcpu = 1; (* 1 vCPU is a safe default *)
|
|
s_cpu_vendor = None;
|
|
s_cpu_model = None;
|
|
s_cpu_topology = None;
|
|
s_features = [ "acpi"; "apic"; "pae" ];
|
|
s_firmware = UnknownFirmware; (* causes virt-v2v to autodetect *)
|
|
s_display =
|
|
Some { s_display_type = Window; s_keymap = None; s_password = None;
|
|
s_listen = LNoListen; s_port = None };
|
|
s_video = None;
|
|
s_sound = None;
|
|
s_disks = [disk];
|
|
s_removables = [];
|
|
s_nics = [network];
|
|
} in
|
|
|
|
source
|
|
end
|
|
|
|
let input_disk = new input_disk
|
|
let () = Modules_list.register_input_module "disk"
|