Commit Graph

463 Commits

Author SHA1 Message Date
Cole Robinson
873a35dcee devices: char: move 'protocol' and 'log*' to CharSource
This violates our typical XML hierarchy, but that's how it's modeled
internally in libvirt, and these properties are shared among all
charsource users.
2019-05-14 11:57:50 -04:00
Cole Robinson
9d78759ac5 devices: redirdev: Use CharSource
redirdev does the same internally for libvirt, so let's follow that
pattern, and fix the fallout
2019-05-14 11:57:50 -04:00
Cole Robinson
6d46e37e09 devices: rng: Use CharSource
Re-use CharSource, just like libvirt does internally. Adjust all
callers to match. Rename type -> backend_model while we are here,
because type is ambiguous
2019-05-14 11:57:50 -04:00
Cole Robinson
b2b9d7d366 devices: char: Add CharSource
Move all ./source handling into CharSource, which will be reused by
other device classes as well. This requires us to add ../ handling
into our xmlapi xpath engine
2019-05-14 11:57:50 -04:00
Cole Robinson
e6eb1d447b devices: char: Rename some properties to better match XML
* bind_port -> bind_service
* source_host -> connect_host
* source_port -> connect_service
2019-05-13 12:35:55 -04:00
Cole Robinson
721ac4f745 cli: --clock: add timer[0-9]*.{name,present,tickpolicy} 2019-05-12 19:24:36 -04:00
Cole Robinson
20e60603d8 cli: --clock: Make invalid X_tickpolicy options no-ops
tickpolicy is only handled in libvirt for pit and rtc timers. Accept
the other options but make them silent no-ops
2019-05-12 19:14:05 -04:00
Cole Robinson
a1165b2981 cli: --clock: Explicitly register options
Rather than do so based off the TIMER_NAMES list. Makes it less
easy to accidentally break cli API
2019-05-12 19:14:05 -04:00
Cole Robinson
167bae862b cli: --sysinfo: use predictable cli subarg names
To match the XML schema, rename these subarguments and add aliases
to preserve compatibility:

* baseBoard_asset -> baseBoard.asset
* baseBoard_location -> baseBoard.location
* baseBoard_manufacturer -> baseBoard.manufacturer
* baseBoard_product -> baseBoard.product
* baseBoard_serial -> baseBoard.serial
* baseBoard_version -> baseBoard.version
* bios_date -> bios.date
* bios_release -> bios.release
* bios_vendor -> bios.vendor
* bios_version -> bios.version
* system_family -> system.family
* system_manufacturer -> system.manufacturer
* system_product -> system.product
* system_serial -> system.serial
* system_sku -> system.sku
* system_uuid -> system.uuid
* system_version -> system.version

In truth this does not accurately represent the XML either, which
uses a generic <entry name='FOO'>BAR</entry> syntax. We should
expose that raw config on the cli, but also provide these convenience
options too, so using '.' here is still useful to be consistent
with new style opt names.
2019-05-12 18:35:37 -04:00
Cole Robinson
f39af8b054 cli: --network: use predictable cli subarg names
To match the XML schema, rename these subarguments and add aliases
to preserve compatibility:

* driver_name -> driver.name
* driver_queues -> driver.queues
* filterref -> filterref.filter
* link_state -> link.state
* mac -> mac.address
* model -> model.type
* rom_bar -> rom.bar
* rom_file -> rom.file
* source_mode -> source.mode
* source_path -> source.path
* portgroup -> source.portgroup
* source_type -> source.type
* target -> target.dev
* virtualport.instanceid -> virtualport.parameters.instanceid
* virtualport_interfaceid -> virtualport.parameters.interfaceid
* virtualport_managerid -> virtualport.parameters.managerid
* virtualport.profileid -> virtualport.parameters.profileid
* virtualport.typeid -> virtualport.parameters.typeid
* virtualport.typeidversion -> virtualport.parameters.typeidversion
* virtualport_type -> virtualport.type

'model' and 'mac' are kept as advertised options, due to them being
commonly specified
2019-05-12 18:21:49 -04:00
Cole Robinson
f67384608c cli: --disk: use predictable cli subarg names
To match the XML schema, rename these subarguments and add aliases
to preserve compatibility:

* logical_block_size -> blockio.logical_block_size
* physical_block_size -> blockio.physical_block_size
* cache -> driver.cache
* detect_zeroes -> driver.detect_zeroes
* discard -> driver.discard
* error_policy -> driver.error_policy
* io -> driver.io
* driver_name -> driver.name
* driver_type -> driver.type
* read_bytes_sec -> iotune.read_bytes_sec
* read_iops_sec -> iotune.read_iops_sec
* total_bytes_sec -> iotune.total_bytes_sec
* total_iops_sec -> iotune.total_iops_sec
* write_bytes_sec -> iotune.write_bytes_sec
* write_iops_sec -> iotune.write_iops_sec
* snapshot_policy -> snapshot
* source_host_name -> source.host.name
* source_host_port -> source.host.port
* source_host_socket -> source.host.socket
* source_host_transport -> source.host.transport
* source_name -> source.name
* source_pool -> source.pool
* source_protocol -> source.protocol
* reservations.managed -> source.reservations.managed
* reservations.source.mode -> source.reservations.source.mode
* reservations.source.path -> source.reservations.source.path
* reservations.source.type -> source.reservations.source.type
* startup_policy -> source.startupPolicy
* source_volume -> source.volume
* bus -> target.bus
* target -> target.dev
* removable -> target.removable

'bus' and 'cache' are kept as advertised options, due to them being
commonly specified
2019-05-12 18:21:49 -04:00
Cole Robinson
919d08cdcd cli: --vcpus: use predictable cli subarg names
To match the XML schema, rename these subarguments and add aliases
to preserve compatibility:

* placement -> vcpu.placement
* cpuset -> vcpu.cpuset
* vcpu -> vcpus

Change the ambiguous maxvcpus handling to match how we fixed
it for the --memory case, which is similar

'cpuset', 'vcpus', and 'maxvcpus' are preserved in --vcpus=help output
because they are mentioned several times in the docs, and they are
historically more commonly used (at least the first two)
2019-05-12 18:21:49 -04:00
Cole Robinson
e81e2b16b9 cli: --video: use predictable cli subarg names
To match the XML schema, rename these subarguments and add aliases
to preserve compatibility:

* accel3d -> model.acceleration.accel3d
* heads -> model.heads
* ram -> model.ram
* model -> model.type
* vgamem -> model.vgamem
* vram -> model.vram
* vram64 -> model.vram64
2019-05-12 18:21:49 -04:00
Cole Robinson
6e18fba24c cli: --hostdev: use predictable cli subarg names
To match the XML schema, rename these subarguments and add aliases
to preserve compatibility:

* driver_name -> driver.name
* rom_bar -> rom.bar
2019-05-12 18:21:49 -04:00
Cole Robinson
d1c6c6e758 cli: --vsock: use predictable cli subarg names
To match the XML schema, rename these subarguments and add aliases
to preserve compatibility:

* cid -> cid.address
* auto_cid -> cid.auto

Add man docs for --vsock while we are at it, since they are missing
2019-05-12 18:21:49 -04:00
Cole Robinson
b92f1595a8 cli: --panic: use predictable cli subarg names
To match the XML schema, rename these subarguments and add aliases
to preserve compatibility:

* iobase -> address.iobase

Simplify model back compat handling as a result
2019-05-12 18:21:49 -04:00
Cole Robinson
b0c3c8e12e cli: --tpm: use predictable cli subarg names
To match the XML schema, rename these subarguments and add aliases
to preserve compatibility:

* path -> backend.device.path
* type -> backend.type
* version -> backend.version
2019-05-12 18:21:49 -04:00
Cole Robinson
8e1cdf2cd7 cli: --controller: use predictable cli subarg names
To match the XML schema, rename these subarguments and add aliases
to preserve compatibility:

* driver_queues -> driver.queues
* master -> master.startport
2019-05-12 18:21:49 -04:00
Cole Robinson
ea63141fca cli: --graphics: use predictable cli subarg names
To match the XML schema, rename these subarguments and add aliases
to preserve compatibility:

* clipboard_copypaste -> clipboard.copypaste
* filetransfer_enable -> filetransfer.enable
* gl -> gl.enable
* rendernode -> gl.rendernode
* image_compression -> image.compression
* mouse_mode -> mouse.mode
* passwd -> password
* passwdValidTo -> passwordValidTo
* streaming_mode -> streaming.mode
* tlsport -> tlsPort
2019-05-12 18:21:49 -04:00
Cole Robinson
83e15a3bce cli: --pm: use predictable cli subarg names
To match the XML schema, rename these subarguments and add aliases
to preserve compatibility:

* suspend_to_disk -> suspend_to_disk.enabled
* suspend_to_mem -> suspend_to_mem.enabled
2019-05-12 18:21:49 -04:00
Cole Robinson
a160fac5e8 cli: --features: use predictable cli subarg names
To match the XML schema, rename these subarguments and add aliases
to preserve compatibility:

* eoi -> apic.eoi
* gic_version -> gic.version
* hyperv_relaxed -> hyperv.relaxed.state
* hyperv_reset -> hyperv.reset.state
* hyperv_spinlocks_retries -> hyperv.spinlocks.retries
* hyperv_spinlocks -> hyperv.spinlocks.state
* hyperv_synic -> hyperv.synic.state
* hyperv_vapic -> hyperv.vapic.state
* kvm_hidden -> kvm.hidden.state
* pmu -> pmu.state
* smm -> smm.state
* vmcoreinfo -> vmcoreinfo.state
* vmport -> vmport.state
2019-05-12 18:21:49 -04:00
Cole Robinson
6aa9c6eecf cli: --idmap: use predictable cli subarg names
To match the XML schema, rename these subarguments and add aliases
to preserve compatibility:

* gid_count -> gid.count
* gid_start -> gid.start
* gid_target -> gid.target
* uid_count -> uid.count
* uid_start -> uid.start
* uid_target -> uid.target
2019-05-12 18:21:49 -04:00
Cole Robinson
8d26a08d25 cli: --boot: use predictable cli subarg names
To match the XML schema, rename these subarguments and add aliases
to preserve compatibility:

* rebootTimeout -> bios.rebootTimeout
* useserial -> bios.useserial
* boot_menu -> bootmenu.enable
* cmdline -> kernel_args
* loader_ro -> loader.readonly
* loader_secure -> loader.secure
* loader_type -> loader.type
* nvram_template -> nvram.template
* smbios_mode -> smbios.mode
2019-05-12 18:21:49 -04:00
Cole Robinson
3d30abf3ac cli: --cpu: use predictable cli subarg names
To match the XML schema, rename these subarguments and add aliases
to preserve compatibility:

* cell[0-9]*.cpus -> numa.cell[0-9]*.cpus
* cell[0-9]*.distances.sibling[0-9]*.id -> numa.cell[0-9]*.distances.sibling[0-9]*.id
* cell[0-9]*.distances.sibling[0-9]*.value -> numa.cell[0-9]*.distances.sibling[0-9]*.value
* cell[0-9]*.id -> numa.cell[0-9]*.id
* cell[0-9]*.memory -> numa.cell[0-9]*.memory
2019-05-12 18:21:49 -04:00
Cole Robinson
d2a07cf41a cli: --memorybacking: use predictable cli subarg names
To match the XML schema, rename these subarguments and add aliases
to preserve compatibility:

- size -> hugepages.page.size
- unit -> hugepages.page.unit
- nodeset -> hugepages.page.nodeset
- access_mode -> access.mode
- source_type -> source.type
2019-05-12 18:21:49 -04:00
Cole Robinson
536cd64515 cli: --blkiotune: use predictable cli subarg names
To match the XML schema, rename these subarguments and add aliases
to preserve compatibility:

- device_path -> device.path
- device_weight -> device.weight
2019-05-12 18:21:49 -04:00
Cole Robinson
375dd4c563 cli: --numatune: use predictable cli subarg names
To match the XML schema, rename:

- mode -> memory.mode
- nodeset -> memory.nodeset
2019-05-12 18:21:49 -04:00
Cole Robinson
2d80a0b4b9 cli: Add --memory opts to match XML names
Sort out the memory property naming ambiguity on the command line.

* memory -> currentMemory
* maxmemory -> memory
* hotplugmemorymax -> maxMemory
* hotplugmemoryslots -> maxMemory.slots

To maintain back compat, we need to do some funky handling with
memory and maxmemory values. Basically if currentMemory is specfied,
we interpret them as new style, otherwise preserve the old behavior.
2019-05-12 17:25:47 -04:00
Cole Robinson
7f9e21f9b5 cli: Rename boot_order to boot.order
And add a backcompat alias to match
2019-05-12 17:25:47 -04:00
Cole Robinson
cbb7d369ef cpu: Convert 'cache' to a singleton
Libvirt doesn't represent it at as a list, and tracking it as a list
complicates the cli machinery
2019-05-12 17:25:47 -04:00
Cole Robinson
a5ae150201 guest: Rename curvcpus and cpuset to better match XML hierarchy 2019-05-12 17:25:47 -04:00
Cole Robinson
ad36657b72 guest: Set vcpus from cpu.topology, if it's specified
We already did this in cli.py, but that's the wrong place to do it
2019-05-12 17:25:47 -04:00
Cole Robinson
3c57b13322 devices: panic: drop DeviceAddress wrapper opts
Just use regular address handling to represent 'type' and 'iobase'.
Add address handling to the command line
2019-05-12 17:25:47 -04:00
Cole Robinson
135b97637e guest: Rename memory properties to match XML values
Right now we have:

* memory -> ./currentMemory
* maxmem -> ./memory
* hotplugmaxmem -> ./maxMemory

Which is just a mess to know what we might be really setting behind
the scenes. Rename the properties to match the XML element name, and
adjust all users to the new names. cli options aren't changed though
2019-05-12 17:25:47 -04:00
Cole Robinson
97d92794bc cli: Make parser aliases a per-class dictionary
Rather than associate them per virt argument. It's less of a clean
fit this way, but I think it will make it less likely that aliases
are cargo culted around and added unnecessarily
2019-05-12 17:25:47 -04:00
Cole Robinson
80947bd0c5 cli: --memdev: Use cli names with '.', not underscore
And add back compat aliases so we don't break the command line
2019-05-12 17:25:47 -04:00
Cole Robinson
5f4b781580 cli: Tweak introspection sorting a bit
- Put clearxml at the very top, because it's a bit special and I
  don't like it mixed in with the interesting settings
- Put address.X at the top, after clearxml, because there's a lot of
  settings and I'd like to keep them away from the users' visual field
2019-05-12 17:22:13 -04:00
Cole Robinson
d8ed9a3678 cli: Fix --serial=help quadruple output
_init_class was being called multiple times
2019-05-12 17:22:13 -04:00
Cole Robinson
4142b73c71 cli: Fix introspection for non-virt options
Like --location and --check
2019-05-12 17:22:13 -04:00
Cole Robinson
2a30a5f0bf cli: make parse() guest argument optional
Because the non-guest parsers don't need it.
2019-05-12 17:22:13 -04:00
Cole Robinson
a7c620549a cli: Consistently name parsers as ParserX 2019-05-12 17:22:13 -04:00
Cole Robinson
c97d6bfd41 cli: Drop parse is_novalue
This isn't a pattern we should propagate. Open code the one instance
that depends on it
2019-05-12 17:22:13 -04:00
Cole Robinson
d1e1ee2770 cli: Drop parse is_list
The only place we were using it is for some funky --cpu back compat,
which we can open code easily enough
2019-05-12 17:22:13 -04:00
Cole Robinson
0575d60744 cli: Make propname mandatory again
Turns out propname is used for virt-xml device matching, even if we
have a cb, so it's useful to specify if the cliname truly maps to
a single propname. Add a programming error exception to try and
explain this situation so it doesn't slip in by accident.
2019-05-12 17:22:13 -04:00
Cole Robinson
b0a629ca72 cli: Make more usage of set_prop_path
It's more future proof
2019-05-12 17:22:13 -04:00
Cole Robinson
cc1d34edaf cli: Drop exec() and eval() usage
We have helpers that do manually do what we were using it for. Gives
a nice speedup too
2019-05-12 17:22:13 -04:00
Cole Robinson
4ecc4930dd cli: Rename __init_class__ to _init_class
Seems like a bad idea to define our own double underscore function,
incase a future python version wants to use that name.

Tweak some minor InitClass details while we are in the area
2019-05-10 14:02:44 -04:00
Cole Robinson
3bd7c7c55b cli: Clarify guest_propname and list_propname
There's conflicting 'propname' naming now, so rename some usage
to match
2019-05-10 14:02:44 -04:00
Cole Robinson
764bf1ad29 xmlapi: rename and move get_prop/set_prop to util
Change to set_prop_path and get_prop_path to make it a bit more
clear, and move out of xmlapi since it's not xml specific
2019-05-10 14:02:44 -04:00
Cole Robinson
0d90bbd5d5 cli: Drop support_cb
This is some extra validation to catch some char opt combos that
libvirt doesn't explicitly reject. It's not really interesting and
dropping it simplifies the cli parsing
2019-05-10 14:02:44 -04:00