- Devel - libvirt List Archives

[libvirt PATCH] esx: implement connectListAllNetworks
by Pino Toscano 14 Sep '20

14 Sep '20

Implement the .connectListAllNetworks networks API in the esx network driver. Signed-off-by: Pino Toscano <ptoscano(a)redhat.com> --- src/esx/esx_network_driver.c | 64 ++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index 88843aae2f..5d9c1e3c2c 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -863,6 +863,69 @@ esxNetworkIsPersistent(virNetworkPtr network G_GNUC_UNUSED) +#define MATCH(FLAG) (flags & (FLAG)) +static int +esxConnectListAllNetworks(virConnectPtr conn, + virNetworkPtr **nets, + unsigned int flags) +{ + int ret = -1; + esxPrivate *priv = conn->privateData; + esxVI_HostVirtualSwitch *hostVirtualSwitchList = NULL; + esxVI_HostVirtualSwitch *hostVirtualSwitch = NULL; + size_t count = 0; + size_t i; + + virCheckFlags(VIR_CONNECT_LIST_NETWORKS_FILTERS_ALL, -1); + + /* + * ESX networks are always active, persistent, and + * autostarted, so return zero elements in case we are asked + * for networks different than that. + */ + if (MATCH(VIR_CONNECT_LIST_NETWORKS_FILTERS_ACTIVE) && + !(MATCH(VIR_CONNECT_LIST_NETWORKS_ACTIVE))) + return 0; + if (MATCH(VIR_CONNECT_LIST_NETWORKS_FILTERS_PERSISTENT) && + !(MATCH(VIR_CONNECT_LIST_NETWORKS_PERSISTENT))) + return 0; + if (MATCH(VIR_CONNECT_LIST_NETWORKS_FILTERS_AUTOSTART) && + !(MATCH(VIR_CONNECT_LIST_NETWORKS_AUTOSTART))) + return 0; + + if (esxVI_EnsureSession(priv->primary) < 0 || + esxVI_LookupHostVirtualSwitchList(priv->primary, + &hostVirtualSwitchList) < 0) { + return -1; + } + + for (hostVirtualSwitch = hostVirtualSwitchList; hostVirtualSwitch; + hostVirtualSwitch = hostVirtualSwitch->_next) { + virNetworkPtr net = virtualswitchToNetwork(conn, hostVirtualSwitch); + + if (VIR_APPEND_ELEMENT(*nets, count, net) < 0) + goto cleanup; + } + + ret = count; + + cleanup: + if (ret < 0) { + if (*nets) { + for (i = 0; i < count; ++i) + VIR_FREE((*nets)[i]); + VIR_FREE(*nets); + } + } + + esxVI_HostVirtualSwitch_Free(&hostVirtualSwitchList); + + return ret; +} +#undef MATCH + + + virNetworkDriver esxNetworkDriver = { .connectNumOfNetworks = esxConnectNumOfNetworks, /* 0.10.0 */ .connectListNetworks = esxConnectListNetworks, /* 0.10.0 */ @@ -877,4 +940,5 @@ virNetworkDriver esxNetworkDriver = { .networkSetAutostart = esxNetworkSetAutostart, /* 0.10.0 */ .networkIsActive = esxNetworkIsActive, /* 0.10.0 */ .networkIsPersistent = esxNetworkIsPersistent, /* 0.10.0 */ + .connectListAllNetworks = esxConnectListAllNetworks, /* 6.8.0 */ }; -- 2.26.2

2 2

[libvirt PATCH v2 0/7] Remove VIR_{ALLOC, ALLOC_N, REALLOC_N}_QUIET macros.
by Tim Wiederhake 14 Sep '20

14 Sep '20

V1: https://www.redhat.com/archives/libvir-list/2020-September/msg00633.html Tim Wiederhake (7): tests: Fix false positive in testConfRoundTrip. util: Use glib memory functions in virErrorCopyNew util: Use glib memory functions in virLastErrorObject util: Remove VIR_ALLOC_QUIET tests: Use glib memory function in testConfRoundTrip util: Use glib memory functions in virJSONValueGetArrayAsBitmap util: Remove VIR_ALLOC_N_QUIET src/util/viralloc.h | 29 ----------------------------- src/util/virerror.c | 15 ++++----------- src/util/virjson.c | 3 +-- tests/virconftest.c | 28 +++++++++------------------- 4 files changed, 14 insertions(+), 61 deletions(-) -- 2.26.2

2 9

[libvirt PATCH 0/3] fix a memory leak on qemuProcessReconnect
by Ján Tomko 14 Sep '20

14 Sep '20

The first two patches have no functional impact on current code. Ján Tomko (3): qemu: rename qemuDomainObjFreeJob -> qemuDomainObjClearJob qemu: qemuDomainObjClearJob: use g_clear_pointer qemuProcessReconnect: clear 'oldjob' src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_domainjob.c | 7 +++++-- src/qemu/qemu_domainjob.h | 3 ++- src/qemu/qemu_process.c | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) -- 2.26.2

2 5

[PATCH v2] cphp: remove deprecated cpu-add command(s)
by Igor Mammedov 14 Sep '20

14 Sep '20

theses were deprecated since 4.0, remove both HMP and QMP variants. Users should use device_add command instead. To get list of possible CPUs and options, use 'info hotpluggable-cpus' HMP or query-hotpluggable-cpus QMP command. Signed-off-by: Igor Mammedov <imammedo(a)redhat.com> Reviewed-by: Thomas Huth <thuth(a)redhat.com> Acked-by: Dr. David Alan Gilbert <dgilbert(a)redhat.com> --- include/hw/boards.h | 1 - include/hw/i386/pc.h | 1 - include/monitor/hmp.h | 1 - docs/system/deprecated.rst | 25 +++++---- hmp-commands.hx | 15 ------ hw/core/machine-hmp-cmds.c | 12 ----- hw/core/machine-qmp-cmds.c | 12 ----- hw/i386/pc.c | 27 ---------- hw/i386/pc_piix.c | 1 - hw/s390x/s390-virtio-ccw.c | 12 ----- qapi/machine.json | 24 --------- tests/qtest/cpu-plug-test.c | 100 ++++-------------------------------- tests/qtest/test-hmp.c | 1 - 13 files changed, 21 insertions(+), 211 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 795910d01b..7abd5d889c 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -169,7 +169,6 @@ struct MachineClass { void (*init)(MachineState *state); void (*reset)(MachineState *state); void (*wakeup)(MachineState *state); - void (*hot_add_cpu)(MachineState *state, const int64_t id, Error **errp); int (*kvm_type)(MachineState *machine, const char *arg); void (*smp_parse)(MachineState *ms, QemuOpts *opts); diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 421a77acc2..79b7ab17bc 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -135,7 +135,6 @@ extern int fd_bootchk; void pc_acpi_smi_interrupt(void *opaque, int irq, int level); -void pc_hot_add_cpu(MachineState *ms, const int64_t id, Error **errp); void pc_smp_parse(MachineState *ms, QemuOpts *opts); void pc_guest_info_init(PCMachineState *pcms); diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h index c986cfd28b..642e9e91f9 100644 --- a/include/monitor/hmp.h +++ b/include/monitor/hmp.h @@ -89,7 +89,6 @@ void hmp_chardev_add(Monitor *mon, const QDict *qdict); void hmp_chardev_change(Monitor *mon, const QDict *qdict); void hmp_chardev_remove(Monitor *mon, const QDict *qdict); void hmp_chardev_send_break(Monitor *mon, const QDict *qdict); -void hmp_cpu_add(Monitor *mon, const QDict *qdict); void hmp_object_add(Monitor *mon, const QDict *qdict); void hmp_object_del(Monitor *mon, const QDict *qdict); void hmp_info_memdev(Monitor *mon, const QDict *qdict); diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index a158e765c3..c43c53f432 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -284,13 +284,6 @@ The ``query-cpus`` command is replaced by the ``query-cpus-fast`` command. The ``arch`` output member of the ``query-cpus-fast`` command is replaced by the ``target`` output member. -``cpu-add`` (since 4.0) -''''''''''''''''''''''' - -Use ``device_add`` for hotplugging vCPUs instead of ``cpu-add``. See -documentation of ``query-hotpluggable-cpus`` for additional -details. - ``query-events`` (since 4.0) '''''''''''''''''''''''''''' @@ -306,12 +299,6 @@ the 'wait' field, which is only applicable to sockets in server mode Human Monitor Protocol (HMP) commands ------------------------------------- -``cpu-add`` (since 4.0) -''''''''''''''''''''''' - -Use ``device_add`` for hotplugging vCPUs instead of ``cpu-add``. See -documentation of ``query-hotpluggable-cpus`` for additional details. - ``acl_show``, ``acl_reset``, ``acl_policy``, ``acl_add``, ``acl_remove`` (since 4.0.0) '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' @@ -521,6 +508,12 @@ QEMU Machine Protocol (QMP) commands The "autoload" parameter has been ignored since 2.12.0. All bitmaps are automatically loaded from qcow2 images. +``cpu-add`` (removed in 5.2) +'''''''''''''''''''''''''''' + +Use ``device_add`` for hotplugging vCPUs instead of ``cpu-add``. See +documentation of ``query-hotpluggable-cpus`` for additional details. + Human Monitor Protocol (HMP) commands ------------------------------------- @@ -530,6 +523,12 @@ The ``hub_id`` parameter of ``hostfwd_add`` / ``hostfwd_remove`` (removed in 5.0 The ``[hub_id name]`` parameter tuple of the 'hostfwd_add' and 'hostfwd_remove' HMP commands has been replaced by ``netdev_id``. +``cpu-add`` (removed in 5.2) +'''''''''''''''''''''''''''' + +Use ``device_add`` for hotplugging vCPUs instead of ``cpu-add``. See +documentation of ``query-hotpluggable-cpus`` for additional details. + Guest Emulator ISAs ------------------- diff --git a/hmp-commands.hx b/hmp-commands.hx index 60f395c276..d1e3e0e1c6 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1761,21 +1761,6 @@ SRST Executes a qemu-io command on the given block device. ERST - { - .name = "cpu-add", - .args_type = "id:i", - .params = "id", - .help = "add cpu (deprecated, use device_add instead)", - .cmd = hmp_cpu_add, - }, - -SRST -``cpu-add`` *id* - Add CPU with id *id*. This command is deprecated, please - +use ``device_add`` instead. For details, refer to - 'docs/cpu-hotplug.rst'. -ERST - { .name = "qom-list", .args_type = "path:s?", diff --git a/hw/core/machine-hmp-cmds.c b/hw/core/machine-hmp-cmds.c index 39999c47c5..f4092b98cc 100644 --- a/hw/core/machine-hmp-cmds.c +++ b/hw/core/machine-hmp-cmds.c @@ -46,18 +46,6 @@ void hmp_info_cpus(Monitor *mon, const QDict *qdict) qapi_free_CpuInfoFastList(cpu_list); } -void hmp_cpu_add(Monitor *mon, const QDict *qdict) -{ - int cpuid; - Error *err = NULL; - - error_report("cpu_add is deprecated, please use device_add instead"); - - cpuid = qdict_get_int(qdict, "id"); - qmp_cpu_add(cpuid, &err); - hmp_handle_error(mon, err); -} - void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict) { Error *err = NULL; diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c index 21551221ad..5362c80a18 100644 --- a/hw/core/machine-qmp-cmds.c +++ b/hw/core/machine-qmp-cmds.c @@ -284,18 +284,6 @@ HotpluggableCPUList *qmp_query_hotpluggable_cpus(Error **errp) return machine_query_hotpluggable_cpus(ms); } -void qmp_cpu_add(int64_t id, Error **errp) -{ - MachineClass *mc; - - mc = MACHINE_GET_CLASS(current_machine); - if (mc->hot_add_cpu) { - mc->hot_add_cpu(current_machine, id, errp); - } else { - error_setg(errp, "Not supported"); - } -} - void qmp_set_numa_node(NumaOptions *cmd, Error **errp) { if (!runstate_check(RUN_STATE_PRECONFIG)) { diff --git a/hw/i386/pc.c b/hw/i386/pc.c index d11daacc23..d071da787b 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -777,32 +777,6 @@ void pc_smp_parse(MachineState *ms, QemuOpts *opts) } } -void pc_hot_add_cpu(MachineState *ms, const int64_t id, Error **errp) -{ - X86MachineState *x86ms = X86_MACHINE(ms); - int64_t apic_id = x86_cpu_apic_id_from_index(x86ms, id); - Error *local_err = NULL; - - if (id < 0) { - error_setg(errp, "Invalid CPU id: %" PRIi64, id); - return; - } - - if (apic_id >= ACPI_CPU_HOTPLUG_ID_LIMIT) { - error_setg(errp, "Unable to add CPU: %" PRIi64 - ", resulting APIC ID (%" PRIi64 ") is too large", - id, apic_id); - return; - } - - - x86_cpu_new(X86_MACHINE(ms), apic_id, &local_err); - if (local_err) { - error_propagate(errp, local_err); - return; - } -} - static void rtc_set_cpus_count(ISADevice *rtc, uint16_t cpus_count) { if (cpus_count > 0xff) { @@ -1966,7 +1940,6 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) mc->auto_enable_numa_with_memdev = true; mc->has_hotpluggable_cpus = true; mc->default_boot_order = "cad"; - mc->hot_add_cpu = pc_hot_add_cpu; mc->smp_parse = pc_smp_parse; mc->block_default_type = IF_IDE; mc->max_cpus = 255; diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 33fa035fb7..8ce7dda464 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -752,7 +752,6 @@ static void pc_i440fx_1_4_machine_options(MachineClass *m) { pc_i440fx_1_5_machine_options(m); m->hw_version = "1.4.0"; - m->hot_add_cpu = NULL; compat_props_add(m->compat_props, pc_compat_1_4, pc_compat_1_4_len); } diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 3106bbea33..28266a3a35 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -553,17 +553,6 @@ static HotplugHandler *s390_get_hotplug_handler(MachineState *machine, return NULL; } -static void s390_hot_add_cpu(MachineState *machine, - const int64_t id, Error **errp) -{ - ObjectClass *oc; - - g_assert(machine->possible_cpus->cpus[0].cpu); - oc = OBJECT_CLASS(CPU_GET_CLASS(machine->possible_cpus->cpus[0].cpu)); - - s390x_new_cpu(object_class_get_name(oc), id, errp); -} - static void s390_nmi(NMIState *n, int cpu_index, Error **errp) { CPUState *cs = qemu_get_cpu(cpu_index); @@ -604,7 +593,6 @@ static void ccw_machine_class_init(ObjectClass *oc, void *data) s390mc->hpage_1m_allowed = true; mc->init = ccw_init; mc->reset = s390_machine_reset; - mc->hot_add_cpu = s390_hot_add_cpu; mc->block_default_type = IF_VIRTIO; mc->no_cdrom = 1; mc->no_floppy = 1; diff --git a/qapi/machine.json b/qapi/machine.json index 0ac1880e4a..d8ed096e9a 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -307,30 +307,6 @@ ## { 'command': 'query-cpus-fast', 'returns': [ 'CpuInfoFast' ] } -## -# @cpu-add: -# -# Adds CPU with specified ID. -# -# @id: ID of CPU to be created, valid values [0..max_cpus) -# -# Features: -# @deprecated: This command is deprecated. Use `device_add` instead. -# See the `query-hotpluggable-cpus` command for details. -# -# Returns: Nothing on success -# -# Since: 1.5 -# -# Example: -# -# -> { "execute": "cpu-add", "arguments": { "id": 2 } } -# <- { "return": {} } -# -## -{ 'command': 'cpu-add', 'data': {'id': 'int'}, - 'features': [ 'deprecated' ] } - ## # @MachineInfo: # diff --git a/tests/qtest/cpu-plug-test.c b/tests/qtest/cpu-plug-test.c index e8ffbbce4b..a1c689414b 100644 --- a/tests/qtest/cpu-plug-test.c +++ b/tests/qtest/cpu-plug-test.c @@ -25,54 +25,6 @@ struct PlugTestData { }; typedef struct PlugTestData PlugTestData; -static void test_plug_with_cpu_add(gconstpointer data) -{ - const PlugTestData *s = data; - char *args; - QDict *response; - unsigned int i; - - args = g_strdup_printf("-machine %s -cpu %s " - "-smp 1,sockets=%u,cores=%u,threads=%u,maxcpus=%u", - s->machine, s->cpu_model, - s->sockets, s->cores, s->threads, s->maxcpus); - qtest_start(args); - - for (i = 1; i < s->maxcpus; i++) { - response = qmp("{ 'execute': 'cpu-add'," - " 'arguments': { 'id': %d } }", i); - g_assert(response); - g_assert(!qdict_haskey(response, "error")); - qobject_unref(response); - } - - qtest_end(); - g_free(args); -} - -static void test_plug_without_cpu_add(gconstpointer data) -{ - const PlugTestData *s = data; - char *args; - QDict *response; - - args = g_strdup_printf("-machine %s -cpu %s " - "-smp 1,sockets=%u,cores=%u,threads=%u,maxcpus=%u", - s->machine, s->cpu_model, - s->sockets, s->cores, s->threads, s->maxcpus); - qtest_start(args); - - response = qmp("{ 'execute': 'cpu-add'," - " 'arguments': { 'id': %d } }", - s->sockets * s->cores * s->threads); - g_assert(response); - g_assert(qdict_haskey(response, "error")); - qobject_unref(response); - - qtest_end(); - g_free(args); -} - static void test_plug_with_device_add(gconstpointer data) { const PlugTestData *td = data; @@ -144,36 +96,13 @@ static void add_pc_test_case(const char *mname) data->cores = 3; data->threads = 2; data->maxcpus = data->sockets * data->cores * data->threads; - if (g_str_has_suffix(mname, "-1.4") || - (strcmp(mname, "pc-1.3") == 0) || - (strcmp(mname, "pc-1.2") == 0) || - (strcmp(mname, "pc-1.1") == 0) || - (strcmp(mname, "pc-1.0") == 0)) { - path = g_strdup_printf("cpu-plug/%s/init/%ux%ux%u&maxcpus=%u", - mname, data->sockets, data->cores, - data->threads, data->maxcpus); - qtest_add_data_func_full(path, data, test_plug_without_cpu_add, - test_data_free); - g_free(path); - } else { - PlugTestData *data2 = g_memdup(data, sizeof(PlugTestData)); - - data2->machine = g_strdup(data->machine); - data2->device_model = g_strdup(data->device_model); - path = g_strdup_printf("cpu-plug/%s/cpu-add/%ux%ux%u&maxcpus=%u", - mname, data->sockets, data->cores, - data->threads, data->maxcpus); - qtest_add_data_func_full(path, data, test_plug_with_cpu_add, - test_data_free); - g_free(path); - path = g_strdup_printf("cpu-plug/%s/device-add/%ux%ux%u&maxcpus=%u", - mname, data2->sockets, data2->cores, - data2->threads, data2->maxcpus); - qtest_add_data_func_full(path, data2, test_plug_with_device_add, - test_data_free); - g_free(path); - } + path = g_strdup_printf("cpu-plug/%s/device-add/%ux%ux%u&maxcpus=%u", + mname, data->sockets, data->cores, + data->threads, data->maxcpus); + qtest_add_data_func_full(path, data, test_plug_with_device_add, + test_data_free); + g_free(path); } static void add_pseries_test_case(const char *mname) @@ -205,7 +134,7 @@ static void add_pseries_test_case(const char *mname) static void add_s390x_test_case(const char *mname) { char *path; - PlugTestData *data, *data2; + PlugTestData *data; if (!g_str_has_prefix(mname, "s390-ccw-virtio-")) { return; @@ -220,21 +149,10 @@ static void add_s390x_test_case(const char *mname) data->threads = 1; data->maxcpus = data->sockets * data->cores * data->threads; - data2 = g_memdup(data, sizeof(PlugTestData)); - data2->machine = g_strdup(data->machine); - data2->device_model = g_strdup(data->device_model); - - path = g_strdup_printf("cpu-plug/%s/cpu-add/%ux%ux%u&maxcpus=%u", + path = g_strdup_printf("cpu-plug/%s/device-add/%ux%ux%u&maxcpus=%u", mname, data->sockets, data->cores, data->threads, data->maxcpus); - qtest_add_data_func_full(path, data, test_plug_with_cpu_add, - test_data_free); - g_free(path); - - path = g_strdup_printf("cpu-plug/%s/device-add/%ux%ux%u&maxcpus=%u", - mname, data2->sockets, data2->cores, - data2->threads, data2->maxcpus); - qtest_add_data_func_full(path, data2, test_plug_with_device_add, + qtest_add_data_func_full(path, data, test_plug_with_device_add, test_data_free); g_free(path); } diff --git a/tests/qtest/test-hmp.c b/tests/qtest/test-hmp.c index aea1384bac..94a8023173 100644 --- a/tests/qtest/test-hmp.c +++ b/tests/qtest/test-hmp.c @@ -27,7 +27,6 @@ static const char *hmp_cmds[] = { "chardev-change testchardev1 ringbuf", "chardev-remove testchardev1", "commit all", - "cpu-add 1", "cpu 0", "device_add ?", "device_add usb-mouse,id=mouse1", -- 2.27.0

3 3

Issues with building libvirt v6.7.0 on RHEL8.3
by Eli Cohen 14 Sep '20

14 Sep '20

Hello all, I hope this is being posted in the right mailing list. I am trying to build libvirt v6.7.0 on RHEL8.3 x86_64 server in order to later apply patches for VDPA support posted recently by Jonathon Jongsma <jjongsma(a)redhat.com>. I am following the instrutions in https://libvirt.org/contribute.html and running from the root directory: meson build --prefix=/usr I fail on the following error: meson.build:921:2: ERROR: Program 'rpcgen portable-rpcgen' not found I can't find any reference how to overcome this obstacle. Thanks for any help, Eli

3 12

[libvirt] [PATCH 00/17] virsh bash completion improvements
by Lin Ma 14 Sep '20

14 Sep '20

Lin Ma (17): virshDomainNameCompleter: Add some of VIR_CONNECT_LIST_DOMAINS_ flags virsh: snapshot: Only return domains that have snapshot images virsh: managedsave-*: Only return domains that have a managed save image virsh: checkpoint: Only return domains that have checkpoints virsh: Add event completer to --enable/--disable args of perf command vshReadlineParse: Ignore vshReadlineOptionsGenerator for VSH_OT_INT options virsh: Add network uuid completion to network-name command virsh: Add domain uuid completion to domname command virsh: Add iothread IDs completion to iothread* commands virsh: Add completion for --iothread argument of attach-disk command virsh: Add vcpu IDs completion to vcpupin command virsh: Add vcpu list completion to setvcpu command virsh: Add logical CPU list completion for --cpulist argument virsh: limit completion of net-dhcp-leases to active networks virsh: limit completion of net-port* to active networks virsh: limit completion of backup-{begin, dumpxml} to active domains virsh: limit completion of checkpoint-{create, delete} to active domains tools/virsh-backup.c | 4 +- tools/virsh-checkpoint.c | 17 +- tools/virsh-completer-domain.c | 264 +++++++++++++++++++++++++++++++- tools/virsh-completer-domain.h | 31 ++++ tools/virsh-completer-network.c | 42 +++++ tools/virsh-completer-network.h | 4 + tools/virsh-domain.c | 33 +++- tools/virsh-network.c | 12 +- tools/virsh-snapshot.c | 16 +- tools/vsh.c | 1 + 10 files changed, 395 insertions(+), 29 deletions(-) -- 2.26.0

2 20

[PATCH 00/17] qemu: Fix startup of VM with SCSI hostdev with long user-provided alias
by Peter Krempa 14 Sep '20

14 Sep '20

Device alias was used to generate the backend nodename. This doesn't work well if somebody specifies a very long useralias since qemu limits nodename to 32 bytes. Stop basing the nodename on the alias. Peter Krempa (17): virDomainHostdevSubsysSCSIiSCSIClear: Inline contents into only caller virDomainStorageNetworkParseHosts: Switch to a more modern XML parsing approach virDomainHostdevSubsysSCSIHostDefParseXML: Switch to a more modern XML parsing approach syntax-check: Don't forbid curly braces around single line condition body qemuxml2argvtest: hostdev-scsi-virtio-scsi: Add hostdev with useralias conf: Add virStorageSource member for SCSI host device config data tests: qemustatusxml2xmldata: Rename 'disk-secinfo-upgrade' case to 'upgrade' tests: qemustatusxml2xmldata: Add local SCSI hostdev to 'upgrade' case qemu: domain: Fill in (i)SCSI backend nodename if it is not present in status XML qemuBuildHostdevSCSI(A|De)tachPrepare: Use virStorageSource in def for SCSI hostdevs qemuBlockStorageSourceAttachData: remove 'storageNodeNameCopy' qemu: domain: Extract preparation of hostdev specific data to a separate function qemuDomainSecretHostdevPrepare: remove qemuDomainPrepareHostdev: Allocate backend nodenames in the prepare function qemuDomainPrepareHostdev: base hostdev secret object names on backend alias qemuDomainPrepareHostdev: Don't base backend nodename on device alias qemuxml2argvtest: hostdev-scsi-virtio-scsi: Use longer user-alias for SCSI hostdev build-aux/check-spacing.pl | 36 ---- docs/coding-style.rst | 8 +- src/conf/domain_conf.c | 170 ++++++++--------- src/conf/domain_conf.h | 1 + src/qemu/qemu_block.c | 1 - src/qemu/qemu_block.h | 1 - src/qemu/qemu_command.c | 74 +++++--- src/qemu/qemu_domain.c | 176 ++++++++++++------ src/qemu/qemu_domain.h | 8 +- src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_process.c | 21 +++ tests/qemustatusxml2xmldata/modern-in.xml | 1 + ...-secinfo-upgrade-in.xml => upgrade-in.xml} | 9 + ...ecinfo-upgrade-out.xml => upgrade-out.xml} | 20 ++ .../hostdev-scsi-lsi.x86_64-latest.args | 38 ++-- ...hostdev-scsi-virtio-scsi.x86_64-2.8.0.args | 5 + ...hostdev-scsi-virtio-scsi.x86_64-4.1.0.args | 5 + ...ostdev-scsi-virtio-scsi.x86_64-latest.args | 36 ++-- .../hostdev-scsi-virtio-scsi.xml | 8 + .../hostdev-scsi-virtio-scsi.xml | 8 + tests/qemuxml2xmltest.c | 2 +- 21 files changed, 370 insertions(+), 260 deletions(-) rename tests/qemustatusxml2xmldata/{disk-secinfo-upgrade-in.xml => upgrade-in.xml} (98%) rename tests/qemustatusxml2xmldata/{disk-secinfo-upgrade-out.xml => upgrade-out.xml} (96%) -- 2.26.2

2 35

[PATCH 0/5] Support CSS and DASD devices in node_device driver
by Bjoern Walk 14 Sep '20

14 Sep '20

This series enables support for channel subsystem (CSS) devices, Direct Access Storage Devices (DASDs) in the node_device driver and adds support to create vfio-ccw mdev devices in the node_device driver. Boris Fiuczynski (5): node_device: refactor udevProcessCCW node_device: detect CSS devices virsh: nodedev: ability to filter CSS capabilities node_device: detect DASD devices node_device: mdev vfio-ccw support docs/formatnode.html.in | 12 +++ docs/manpages/virsh.rst | 2 +- docs/schemas/nodedev.rng | 16 ++++ include/libvirt/libvirt-nodedev.h | 1 + src/conf/domain_addr.c | 2 +- src/conf/domain_addr.h | 3 + src/conf/node_device_conf.c | 5 ++ src/conf/node_device_conf.h | 4 +- src/conf/virnodedeviceobj.c | 4 +- src/libvirt-nodedev.c | 1 + src/libvirt_private.syms | 1 + src/node_device/node_device_driver.c | 49 +++++++++--- src/node_device/node_device_udev.c | 77 ++++++++++++++++--- .../ccw_0_0_10000-invalid.xml | 4 +- tests/nodedevschemadata/ccw_0_0_ffff.xml | 4 +- tests/nodedevschemadata/css_0_0_ffff.xml | 10 +++ tests/nodedevxml2xmltest.c | 1 + tools/virsh-nodedev.c | 3 + 18 files changed, 172 insertions(+), 27 deletions(-) create mode 100644 tests/nodedevschemadata/css_0_0_ffff.xml -- 2.24.1

4 30

[libvirt PATCH v2] esx: improve some of the virErrorNumber used
by Pino Toscano 14 Sep '20

14 Sep '20

A lot of virReportError() calls use VIR_ERR_INTERNAL_ERROR to represent the number of the error, even in cases where there is one fitting more. Hence, replace some of them with better virErrorNumber values. Signed-off-by: Pino Toscano <ptoscano(a)redhat.com> --- Changes in v2: - remove some of the VIR_ERR_INTERNAL_ERROR -> VIR_ERR_INVALID_ARG changes as they refer to really internal bits src/esx/esx_network_driver.c | 4 ++-- src/esx/esx_storage_backend_iscsi.c | 4 ++-- src/esx/esx_storage_backend_vmfs.c | 12 ++++++------ src/esx/esx_util.c | 2 +- src/esx/esx_vi.c | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index d46fc9253d..88843aae2f 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -355,7 +355,7 @@ esxNetworkDefineXML(virConnectPtr conn, const char *xml) for (hostPortGroup = hostPortGroupList; hostPortGroup; hostPortGroup = hostPortGroup->_next) { if (STREQ(def->portGroups[i].name, hostPortGroup->spec->name)) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_NETWORK_EXIST, _("HostPortGroup with name '%s' exists already"), def->portGroups[i].name); goto cleanup; @@ -388,7 +388,7 @@ esxNetworkDefineXML(virConnectPtr conn, const char *xml) if (def->forward.ifs[i].type != VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_NETDEV) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_NO_SUPPORT, _("unsupported device type in network %s " "interface pool"), def->name); diff --git a/src/esx/esx_storage_backend_iscsi.c b/src/esx/esx_storage_backend_iscsi.c index 395a347cf3..017b800f06 100644 --- a/src/esx/esx_storage_backend_iscsi.c +++ b/src/esx/esx_storage_backend_iscsi.c @@ -321,7 +321,7 @@ esxStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) if (!target) { /* pool not found */ - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_NO_STORAGE_POOL, _("Could not find storage pool with name '%s'"), pool->name); goto cleanup; @@ -699,7 +699,7 @@ esxStorageVolGetXMLDesc(virStorageVolPtr volume, } if (!scsiLun) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_NO_STORAGE_VOL, _("Could find volume with name: %s"), volume->name); goto cleanup; } diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backend_vmfs.c index 4f613bf93b..a98001d6b2 100644 --- a/src/esx/esx_storage_backend_vmfs.c +++ b/src/esx/esx_storage_backend_vmfs.c @@ -897,7 +897,7 @@ esxStorageVolCreateXML(virStoragePoolPtr pool, goto cleanup; if (def->type != VIR_STORAGE_VOL_FILE) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + virReportError(VIR_ERR_NO_SUPPORT, "%s", _("Creating non-file volumes is not supported")); goto cleanup; } @@ -913,7 +913,7 @@ esxStorageVolCreateXML(virStoragePoolPtr pool, } if (!virStringHasCaseSuffix(def->name, ".vmdk")) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_NO_SUPPORT, _("Volume name '%s' has unsupported suffix, " "expecting '.vmdk'"), def->name); goto cleanup; @@ -1032,7 +1032,7 @@ esxStorageVolCreateXML(virStoragePoolPtr pool, key = g_strdup(datastorePath); } } else { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_NO_SUPPORT, _("Creation of %s volumes is not supported"), virStorageFileFormatTypeToString(def->target.format)); goto cleanup; @@ -1111,7 +1111,7 @@ esxStorageVolCreateXMLFrom(virStoragePoolPtr pool, goto cleanup; if (def->type != VIR_STORAGE_VOL_FILE) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + virReportError(VIR_ERR_NO_SUPPORT, "%s", _("Creating non-file volumes is not supported")); goto cleanup; } @@ -1127,7 +1127,7 @@ esxStorageVolCreateXMLFrom(virStoragePoolPtr pool, } if (!virStringHasCaseSuffix(def->name, ".vmdk")) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_NO_SUPPORT, _("Volume name '%s' has unsupported suffix, " "expecting '.vmdk'"), def->name); goto cleanup; @@ -1212,7 +1212,7 @@ esxStorageVolCreateXMLFrom(virStoragePoolPtr pool, key = g_strdup(datastorePath); } } else { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_NO_SUPPORT, _("Creation of %s volumes is not supported"), virStorageFileFormatTypeToString(def->target.format)); goto cleanup; diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index 11f43acc19..cd3d8925b9 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -226,7 +226,7 @@ esxUtil_ParseDatastorePath(const char *datastorePath, char **datastoreName, /* Expected format: '[<datastore>] <path>' where <path> is optional */ if (!(tmp = STRSKIP(copyOfDatastorePath, "[")) || *tmp == ']' || !(preliminaryDatastoreName = strtok_r(tmp, "]", &saveptr))) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_INVALID_ARG, _("Datastore path '%s' doesn't have expected format " "'[<datastore>] <path>'"), datastorePath); goto cleanup; diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index a4f3be02a4..f099716d3e 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -1390,7 +1390,7 @@ esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName, } } } else { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_HTTP_ERROR, _("HTTP response code %d for call to '%s'"), (*response)->responseCode, methodName); goto cleanup; -- 2.26.2

2 1

[libvirt PATCH v2] esx: generator: fix free of elements in lists
by Pino Toscano 14 Sep '20

14 Sep '20

When a list is freed, we iterate through all the items, invoking the free function for each; the actual free function called for each element is the function of the actual type of each element, and thus the @_next pointer in the element struct has the same type as the element itself. Currently, the free function gets the parent of the current element type, and invoke its free function to continue freeing the list. However, in case the hierarchy of the classes has more than 1 level (i.e. Class <- SubClass <- SubSubClass), the invoked free function is only the parent class' one, and not the actual base class of the hierarchy. To fix that, change the generator to get the base class of a class, and invoking that instead. Also, avoid to set the @_next back, as it is not needed. Fixes commits 5cff36e39ae691fbd7c40597df1732eecf294150 and f76c6dde2e33233566e886d96e76b5fe0c102d9a. Signed-off-by: Pino Toscano <ptoscano(a)redhat.com> --- Changes in v2: - ancestor -> base class scripts/esx_vi_generator.py | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/scripts/esx_vi_generator.py b/scripts/esx_vi_generator.py index 863c8af964..e0782e35f3 100755 --- a/scripts/esx_vi_generator.py +++ b/scripts/esx_vi_generator.py @@ -751,13 +751,13 @@ class Object(GenericObject): source += "{\n" if self.features & Object.FEATURE__LIST: - if self.extends is not None: + base_class = get_base_class(self) + if base_class: # avoid "dereferencing type-punned pointer will break # strict-aliasing rules" warnings - source += " esxVI_%s *next = (esxVI_%s *)item->_next;\n\n" \ - % (self.extends, self.extends) - source += " esxVI_%s_Free(&next);\n" % self.extends - source += " item->_next = (esxVI_%s *)next;\n\n" % self.name + source += " esxVI_%s *baseNext = (esxVI_%s *)item->_next;\n" \ + % (base_class, base_class) + source += " esxVI_%s_Free(&baseNext);\n\n" % base_class else: source += " esxVI_%s_Free(&item->_next);\n\n" % self.name @@ -1250,6 +1250,21 @@ def is_known_type(type): type in enums_by_name) +def get_base_class(obj): + if not obj.extends: + return None + base_class = None + try: + base_class = base_class_by_name[obj.extends] + except KeyError: + parent = objects_by_name[obj.extends] + base_class = get_base_class(parent) + if not base_class: + base_class = parent.name + base_class_by_name[name] = base_class + return base_class + + def open_file(filename): return open(filename, "wt") @@ -1341,6 +1356,7 @@ managed_objects_by_name = {} enums_by_name = {} methods_by_name = {} block = None +base_class_by_name = {} # parse input file -- 2.26.2

2 1