From patchwork Wed Jan 23 21:32:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 156405 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp1201706jaa; Wed, 23 Jan 2019 13:33:46 -0800 (PST) X-Google-Smtp-Source: ALg8bN7L1Q+37kM1f6YJL45K2cMjhGeAXgYSCZGz4yvBAzc+7oCMIVPv2ZjEf1Yn7/pgBWxQ6aIj X-Received: by 2002:ac8:34cb:: with SMTP id x11mr4137756qtb.115.1548279226662; Wed, 23 Jan 2019 13:33:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548279226; cv=none; d=google.com; s=arc-20160816; b=GL9YtWxf7qV8vXi1J8xpkeUaQ1TLYGyofauJhKismIxi6ze7v194h1xjPMU31HTARU 1it53Wakn8w/daXlc7SdvXsMXK+9hSuL6yrZnGX+6oD+zVhM2fvfnKl2k4RDsSemOcOt daYsKlCyh0OAbYO7jAFw1iqqcm/IxWUJcXors5iJ5LvBpopexUDYenddSE1c0PpknQMu zZHPpTr9zEPuXb3g+mDDYRn0zD6KdlDq17S9cpgB/+aWo0bHjW1mj9rEQB0NpSRhBsw2 KnNlynoW+GOCHoMbzVaNcLytYkPRZVjlKAGDlPeAxemDY5ugCVwFqEM/kgIra9P32gnA fUUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :delivered-to; bh=WnDdKoAWWRKVdga5HlVjoJsy4X1v3aWEOAD1meFDVIo=; b=akWWKnMW5mIlRocBI4h39vam1+bIBJBTVCs0zWc2l/MYzXwlwNtW6jn3UvAvFsd6kv N+qs6V4vHrLOtDq4hlZI620wEvc9uAjHyimcl3FVHTUCsjKqof6hCWNPzOqxSlLtTizA gdVsQ7m2kP/dbmMkukANQ+mGCZHfH/MxRwaPgsQxudgn7JFxsb4WxI/64pH9HCMdM7KC ZTQx6za9MW+SN1rUDEL2ezBT93WbMjJTC4FkioJYFUuC9NbrZWFgr8c5BQW01FVRMD8D OEpdqDgf5oSboYUStDytfDW9/j7X+V5h0Wa+dCK1VP1MCTOa9HmbjX9NC3+mUQAjkYDq WRtA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id w58si2995706qtb.24.2019.01.23.13.33.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Jan 2019 13:33:46 -0800 (PST) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7850DC07F66B; Wed, 23 Jan 2019 21:33:44 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 428E4BA9E; Wed, 23 Jan 2019 21:33:44 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id F26C318033A8; Wed, 23 Jan 2019 21:33:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x0NLXNOd032309 for ; Wed, 23 Jan 2019 16:33:23 -0500 Received: by smtp.corp.redhat.com (Postfix) id 73368BA8D; Wed, 23 Jan 2019 21:33:23 +0000 (UTC) Delivered-To: libvirt-list@redhat.com Received: from worklaptop.redhat.com (ovpn-120-34.rdu2.redhat.com [10.10.120.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id C4E68BA50; Wed, 23 Jan 2019 21:33:22 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Wed, 23 Jan 2019 16:32:36 -0500 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 08/25] qemu: command: Make BuildVirtioDevStr more generic X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 23 Jan 2019 21:33:45 +0000 (UTC) Switch qemuBuildVirtioDevStr to use virDomainDeviceSetData: callers pass in the virDomainDeviceType and the void * DefPtr. This will save us from having to repeatedly extend the function argument list in subsequent patches. Signed-off-by: Cole Robinson --- src/qemu/qemu_command.c | 82 ++++++++++++++++++++++++++++++++--------- 1 file changed, 64 insertions(+), 18 deletions(-) -- 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 2dde4b9125..3a9e9def78 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -396,14 +396,34 @@ qemuBuildDeviceAddressStr(virBufferPtr buf, } +/** + * qemuBuildVirtioDevStr + * @buf: virBufferPtr to append the built string + * @baseName: qemu virtio device basename string. Ex: virtio-rng for + * @devtype: virDomainDeviceType of the device. Ex: VIR_DOMAIN_DEVICE_TYPE_RNG + * @devdata: *DefPtr of the device definition + * + * Build the qemu virtio -device name from the passed parameters. Currently + * this is mostly about attaching the correct string prefix to @baseName for + * the passed @type. So for @baseName "virtio-rng" and devdata->info.type + * VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI, generate "virtio-rng-pci" + * + * Returns: -1 on failure, 0 on success + */ static int qemuBuildVirtioDevStr(virBufferPtr buf, const char *baseName, - virDomainDeviceAddressType type) + virDomainDeviceType devtype, + void *devdata) { const char *implName = NULL; + virDomainDeviceDef device = { .type = devtype }; + virDomainDeviceInfoPtr info; - switch (type) { + virDomainDeviceSetData(&device, devdata); + info = virDomainDeviceGetInfo(&device); + + switch (info->type) { case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI: implName = "pci"; break; @@ -434,7 +454,7 @@ qemuBuildVirtioDevStr(virBufferPtr buf, case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_LAST: default: - virReportEnumRangeError(virDomainDeviceAddressType, type); + virReportEnumRangeError(virDomainDeviceAddressType, info->type); return -1; } @@ -443,7 +463,6 @@ qemuBuildVirtioDevStr(virBufferPtr buf, return 0; } - static int qemuBuildVirtioOptionsStr(virBufferPtr buf, virDomainVirtioOptionsPtr virtio, @@ -2050,8 +2069,10 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, break; case VIR_DOMAIN_DISK_BUS_VIRTIO: - if (qemuBuildVirtioDevStr(&opt, "virtio-blk", disk->info.type) < 0) + if (qemuBuildVirtioDevStr(&opt, "virtio-blk", + VIR_DOMAIN_DEVICE_DISK, disk) < 0) { goto error; + } if (disk->iothread) virBufferAsprintf(&opt, ",iothread=iothread%u", disk->iothread); @@ -2639,8 +2660,10 @@ qemuBuildFSDevStr(const virDomainDef *def, goto error; } - if (qemuBuildVirtioDevStr(&opt, "virtio-9p", fs->info.type) < 0) + if (qemuBuildVirtioDevStr(&opt, "virtio-9p", + VIR_DOMAIN_DEVICE_FS, fs) < 0) { goto error; + } virBufferAsprintf(&opt, ",id=%s", fs->info.alias); virBufferAsprintf(&opt, ",fsdev=%s%s", @@ -2845,8 +2868,10 @@ qemuBuildControllerDevStr(const virDomainDef *domainDef, case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: switch ((virDomainControllerModelSCSI) def->model) { case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI: - if (qemuBuildVirtioDevStr(&buf, "virtio-scsi", def->info.type) < 0) + if (qemuBuildVirtioDevStr(&buf, "virtio-scsi", + VIR_DOMAIN_DEVICE_CONTROLLER, def) < 0) { goto error; + } if (def->iothread) { virBufferAsprintf(&buf, ",iothread=iothread%u", @@ -2886,8 +2911,10 @@ qemuBuildControllerDevStr(const virDomainDef *domainDef, break; case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: - if (qemuBuildVirtioDevStr(&buf, "virtio-serial", def->info.type) < 0) + if (qemuBuildVirtioDevStr(&buf, "virtio-serial", + VIR_DOMAIN_DEVICE_CONTROLLER, def) < 0) { goto error; + } virBufferAsprintf(&buf, ",id=%s", def->info.alias); if (def->opts.vioserial.ports != -1) { @@ -3655,8 +3682,10 @@ qemuBuildNicDevStr(virDomainDefPtr def, char macaddr[VIR_MAC_STRING_BUFLEN]; if (virDomainNetIsVirtioModel(net)) { - if (qemuBuildVirtioDevStr(&buf, "virtio-net", net->info.type) < 0) + if (qemuBuildVirtioDevStr(&buf, "virtio-net", + VIR_DOMAIN_DEVICE_NET, net) < 0) { goto error; + } usingVirtio = true; } else { @@ -4050,7 +4079,8 @@ qemuBuildMemballoonCommandLine(virCommandPtr cmd, return 0; if (qemuBuildVirtioDevStr(&buf, "virtio-balloon", - def->memballoon->info.type) < 0) { + VIR_DOMAIN_DEVICE_MEMBALLOON, + def->memballoon) < 0) { goto error; } @@ -4148,20 +4178,28 @@ qemuBuildVirtioInputDevStr(const virDomainDef *def, switch ((virDomainInputType)dev->type) { case VIR_DOMAIN_INPUT_TYPE_MOUSE: - if (qemuBuildVirtioDevStr(&buf, "virtio-mouse", dev->info.type) < 0) + if (qemuBuildVirtioDevStr(&buf, "virtio-mouse", + VIR_DOMAIN_DEVICE_INPUT, dev) < 0) { goto error; + } break; case VIR_DOMAIN_INPUT_TYPE_TABLET: - if (qemuBuildVirtioDevStr(&buf, "virtio-tablet", dev->info.type) < 0) + if (qemuBuildVirtioDevStr(&buf, "virtio-tablet", + VIR_DOMAIN_DEVICE_INPUT, dev) < 0) { goto error; + } break; case VIR_DOMAIN_INPUT_TYPE_KBD: - if (qemuBuildVirtioDevStr(&buf, "virtio-keyboard", dev->info.type) < 0) + if (qemuBuildVirtioDevStr(&buf, "virtio-keyboard", + VIR_DOMAIN_DEVICE_INPUT, dev) < 0) { goto error; + } break; case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH: - if (qemuBuildVirtioDevStr(&buf, "virtio-input-host", dev->info.type) < 0) + if (qemuBuildVirtioDevStr(&buf, "virtio-input-host", + VIR_DOMAIN_DEVICE_INPUT, dev) < 0) { goto error; + } break; case VIR_DOMAIN_INPUT_TYPE_LAST: default: @@ -4479,8 +4517,10 @@ qemuBuildDeviceVideoStr(const virDomainDef *def, } if (STREQ(model, "virtio-gpu")) { - if (qemuBuildVirtioDevStr(&buf, "virtio-gpu", video->info.type) < 0) + if (qemuBuildVirtioDevStr(&buf, "virtio-gpu", + VIR_DOMAIN_DEVICE_VIDEO, video) < 0) { goto error; + } } else { virBufferAsprintf(&buf, "%s", model); } @@ -4925,8 +4965,10 @@ qemuBuildSCSIVHostHostdevDevStr(const virDomainDef *def, goto cleanup; } - if (qemuBuildVirtioDevStr(&buf, "vhost-scsi", dev->info->type) < 0) + if (qemuBuildVirtioDevStr(&buf, "vhost-scsi", + VIR_DOMAIN_DEVICE_HOSTDEV, dev) < 0) { goto cleanup; + } virBufferAsprintf(&buf, ",wwpn=%s,vhostfd=%s,id=%s", hostsrc->wwpn, @@ -5873,8 +5915,10 @@ qemuBuildRNGDevStr(const virDomainDef *def, dev->source.file)) goto error; - if (qemuBuildVirtioDevStr(&buf, "virtio-rng", dev->info.type) < 0) + if (qemuBuildVirtioDevStr(&buf, "virtio-rng", + VIR_DOMAIN_DEVICE_RNG, dev) < 0) { goto error; + } virBufferAsprintf(&buf, ",rng=obj%s,id=%s", dev->info.alias, dev->info.alias); @@ -10346,8 +10390,10 @@ qemuBuildVsockDevStr(virDomainDefPtr def, char *ret = NULL; - if (qemuBuildVirtioDevStr(&buf, "vhost-vsock", vsock->info.type) < 0) + if (qemuBuildVirtioDevStr(&buf, "vhost-vsock", + VIR_DOMAIN_DEVICE_VSOCK, vsock) < 0) { goto cleanup; + } virBufferAsprintf(&buf, ",id=%s", vsock->info.alias); virBufferAsprintf(&buf, ",guest-cid=%u", vsock->guest_cid);