From nobody Sun Feb 8 22:06:14 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564664203; cv=none; d=zoho.com; s=zohoarc; b=HY1QZSAghqwJOA3kqGvU3afkdW+9f7AQ09PWRXqPGEOL5SKwRmdDF+tHC8rMM2gbgZvXu64H7ARCdpVAboIlFOWRD/BohTtNB8b/k1Ow9ieiCcS7Mo87YTx29th6zO7OB350fny0WqCUYTTcddkJmnFNGj9fhq/FaCIFnStakM0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564664203; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=nrRvo0Xlxo9Om2dxh3B687tW9+Teob+XQ39pEIVUnf8=; b=NYmgRkE9fwWzWHMPjkF0JIw+u/qnXsKsF2YjvrXogloKmZIG/013ah+oZo4QK7IFHTBeOaYUN+yNejttrQ1ZwUPfwBxRb09YEBG800NnLvtGFA8FVgLRcCRwRQC10IG7Xdgm4xPkxLhHPSmpQkuDMsrq7q1XWdxtaGY2gynh1g0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1564664203817517.7672883288404; Thu, 1 Aug 2019 05:56:43 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 735FDC01FBD9; Thu, 1 Aug 2019 12:56:42 +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 22E545D6B2; Thu, 1 Aug 2019 12:56:42 +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 DD265180B536; Thu, 1 Aug 2019 12:56:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x71CufEa005922 for ; Thu, 1 Aug 2019 08:56:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id 546F25D9CD; Thu, 1 Aug 2019 12:56:41 +0000 (UTC) Received: from mx1.redhat.com (ext-mx16.extmail.prod.ext.phx2.redhat.com [10.5.110.45]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4E2C85D9CA for ; Thu, 1 Aug 2019 12:56:39 +0000 (UTC) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 97F0530C1321 for ; Thu, 1 Aug 2019 12:56:37 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id c2so70264712wrm.8 for ; Thu, 01 Aug 2019 05:56:37 -0700 (PDT) Received: from archpc.localdomain (x8d1ee222.agdsn.tu-dresden.de. [141.30.226.34]) by smtp.gmail.com with ESMTPSA id h14sm71248878wrs.66.2019.08.01.05.56.34 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 05:56:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=4Ox6ZdQ/Mu7zatKJT9BHM7d32mVFGUUrxHEVNdSwmAU=; b=B93lxmVDvwObs7ADD0SV8fG48VGdBETAvk8OVsGdAGXKj3hcwWgyCfyf+sODbYDdt6 0ScjKUFM6A0hs43XCxGywJtYRhOzEKdvby1OAY4FmpXAfdfnpwobqIOrhC0ra21LhEtC 7YtR+j972U043CnMoj1cFGgYW8rBxXboPFdUx1vggU/AFbyBNl/oIY0hSr1P+G3b93MJ Jgb5KcKjeal6Z/t5xKqpWY3hFzgbKjb14FJVtuAg2sPMxpcrKuYSGq8zfh/Ph0cqdLSa aIVp811YC1Y2sy50i5VLqDqVnkBcA2+OcKmKy44C/LLFqAavOly8chTwwg/mJ/rIjCTQ 3cJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4Ox6ZdQ/Mu7zatKJT9BHM7d32mVFGUUrxHEVNdSwmAU=; b=QGkeGG5VN1a59Qvka+yvqeQz0GDmmvZwUspU4OXIt0k7hWyM1ojwq/5V0P+noiIqa1 prbcPB0Twct9U4MHcYvR7LWTe/7WZsTbQRGBoMVurM9rPGMSmMVy7CuWfvrAoHye49jT /qe0Hf2vFfynUZoYEG0ahZ+UGuljvdZ1VL5wXOBJ1lH07eHHlA7UMZwQuKuLRvf4rN9B PzBGBbGbXc+uMAtX4wbbVbeuTnbaRm7nvjMM75IE7yh6VVkdd+XCWpTILrAgRawdNO1T K6nZB48aka+tEfAaoKhQ7h7LYUNLeHXWLpiO6DhmiSgOv2teJZJ9Z09zJNofDSCkJLl4 2atg== X-Gm-Message-State: APjAAAW5D1WiaFotF0ml1r1TvkFFgtyTZVna3cJ6n0xVHlErajn9rxj9 PVkBld9Xm3dAUSfw5sGrN58It0N3g4gCHw== X-Google-Smtp-Source: APXvYqzSikdEZhX0XLQzvjLYV+yYukUeTTXTZ3TwOh0dDAoy7zYVSlx9HExehLpm1NIl7OfMo5KCbQ== X-Received: by 2002:a5d:4206:: with SMTP id n6mr73709330wrq.110.1564664195767; Thu, 01 Aug 2019 05:56:35 -0700 (PDT) From: Ilias Stamatis To: libvir-list@redhat.com Date: Thu, 1 Aug 2019 14:54:48 +0200 Message-Id: <20190801125453.27030-2-stamatis.iliass@gmail.com> In-Reply-To: <20190801125453.27030-1-stamatis.iliass@gmail.com> References: <20190801125453.27030-1-stamatis.iliass@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Thu, 01 Aug 2019 12:56:38 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Thu, 01 Aug 2019 12:56:38 +0000 (UTC) for IP:'209.85.221.67' DOMAIN:'mail-wr1-f67.google.com' HELO:'mail-wr1-f67.google.com' FROM:'stamatis.iliass@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.1 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS) 209.85.221.67 mail-wr1-f67.google.com 209.85.221.67 mail-wr1-f67.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.45 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/6] test_driver: implement virDomainAttachDeviceFlags 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 01 Aug 2019 12:56:43 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Ilias Stamatis --- src/test/test_driver.c | 290 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 290 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index aae9875194..c8aad6a0bb 100755 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -4013,6 +4013,295 @@ static int testDomainUndefine(virDomainPtr domain) return testDomainUndefineFlags(domain, 0); } + +static int +testDomainAttachDeviceLiveAndConfig(virDomainDefPtr vmdef, + virDomainDeviceDefPtr dev) +{ + virDomainDiskDefPtr disk; + virDomainNetDefPtr net; + virDomainHostdevDefPtr hostdev; + virDomainControllerDefPtr controller; + virDomainHostdevDefPtr found; + virDomainLeaseDefPtr lease; + virDomainFSDefPtr fs; + virDomainRedirdevDefPtr redirdev; + virDomainShmemDefPtr shmem; + char mac[VIR_MAC_STRING_BUFLEN]; + + switch (dev->type) { + case VIR_DOMAIN_DEVICE_DISK: + disk =3D dev->data.disk; + if (virDomainDiskIndexByName(vmdef, disk->dst, true) >=3D 0) { + virReportError(VIR_ERR_INVALID_ARG, + _("target %s already exists."), disk->dst); + return -1; + } + + if (virDomainDiskInsert(vmdef, disk) < 0) + return -1; + + dev->data.disk =3D NULL; + break; + + case VIR_DOMAIN_DEVICE_CONTROLLER: + controller =3D dev->data.controller; + if (controller->idx !=3D -1 && + virDomainControllerFind(vmdef, controller->type, + controller->idx) >=3D 0) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("Target already exists")); + return -1; + } + + if (virDomainControllerInsert(vmdef, controller) < 0) + return -1; + + dev->data.controller =3D NULL; + break; + + case VIR_DOMAIN_DEVICE_NET: + net =3D dev->data.net; + if (virDomainHasNet(vmdef, net)) { + virReportError(VIR_ERR_INVALID_ARG, + _("network device with mac %s already exist= s"), + virMacAddrFormat(&net->mac, mac)); + return -1; + } + + if (virDomainNetInsert(vmdef, net)) + return -1; + + dev->data.net =3D NULL; + break; + + case VIR_DOMAIN_DEVICE_HOSTDEV: + hostdev =3D dev->data.hostdev; + if (virDomainHostdevFind(vmdef, hostdev, &found) >=3D 0) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("device is already in the domain configur= ation")); + return -1; + } + + if (virDomainHostdevInsert(vmdef, hostdev) < 0) + return -1; + + dev->data.hostdev =3D NULL; + break; + + case VIR_DOMAIN_DEVICE_LEASE: + lease =3D dev->data.lease; + if (virDomainLeaseIndex(vmdef, lease) >=3D 0) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("Lease %s in lockspace %s already exists"= ), + lease->key, NULLSTR(lease->lockspace)); + return -1; + } + + if (virDomainLeaseInsert(vmdef, lease) < 0) + return -1; + + dev->data.lease =3D NULL; + break; + + case VIR_DOMAIN_DEVICE_FS: + fs =3D dev->data.fs; + if (virDomainFSIndexByName(vmdef, fs->dst) >=3D 0) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("Target already exists")); + return -1; + } + + if (virDomainFSInsert(vmdef, fs) < 0) + return -1; + + dev->data.fs =3D NULL; + break; + + case VIR_DOMAIN_DEVICE_RNG: + if (dev->data.rng->info.type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TY= PE_NONE && + virDomainDefHasDeviceAddress(vmdef, &dev->data.rng->info))= { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("a device with the same address already e= xists ")); + return -1; + } + + if (VIR_APPEND_ELEMENT(vmdef->rngs, vmdef->nrngs, dev->data.rn= g) < 0) + return -1; + + dev->data.rng =3D NULL; + break; + + case VIR_DOMAIN_DEVICE_MEMORY: + if (vmdef->nmems =3D=3D vmdef->mem.memory_slots) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("no free memory device slot available")); + return -1; + } + + vmdef->mem.cur_balloon +=3D dev->data.memory->size; + if (virDomainMemoryInsert(vmdef, dev->data.memory) < 0) + return -1; + + dev->data.memory =3D NULL; + break; + + case VIR_DOMAIN_DEVICE_REDIRDEV: + redirdev =3D dev->data.redirdev; + + if (VIR_APPEND_ELEMENT(vmdef->redirdevs, vmdef->nredirdevs, re= dirdev) < 0) + return -1; + + dev->data.redirdev =3D NULL; + break; + + case VIR_DOMAIN_DEVICE_SHMEM: + shmem =3D dev->data.shmem; + if (virDomainShmemDefFind(vmdef, shmem) >=3D 0) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("device is already in the domain configur= ation")); + return -1; + } + + if (virDomainShmemDefInsert(vmdef, shmem) < 0) + return -1; + + dev->data.shmem =3D NULL; + break; + + case VIR_DOMAIN_DEVICE_WATCHDOG: + if (vmdef->watchdog) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("domain already has a watchdog")); + return -1; + } + VIR_STEAL_PTR(vmdef->watchdog, dev->data.watchdog); + break; + + case VIR_DOMAIN_DEVICE_INPUT: + if (VIR_APPEND_ELEMENT(vmdef->inputs, vmdef->ninputs, dev->dat= a.input) < 0) + return -1; + break; + + case VIR_DOMAIN_DEVICE_VSOCK: + if (vmdef->vsock) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("domain already has a vsock device")); + return -1; + } + VIR_STEAL_PTR(vmdef->vsock, dev->data.vsock); + break; + + default: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("persistent attach of device is not supported= ")); + return -1; + } + + return 0; +} + + +typedef enum { + TEST_DEVICE_ATTACH =3D 0, + TEST_DEVICE_DETACH, + TEST_DEVICE_UPDATE, +} virTestDeviceOperation; + + +static int +testDomainDeviceOperation(testDriverPtr driver, + virTestDeviceOperation operation, + const char *xml, + const char *alias, + virDomainDefPtr def) +{ + virDomainDeviceDefPtr dev =3D NULL; + unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE; + int ret =3D -1; + + if (operation =3D=3D TEST_DEVICE_DETACH) + parse_flags |=3D VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE; + + if (xml) { + if (!(dev =3D virDomainDeviceDefParse(xml, def, + driver->caps, driver->xmlopt, + parse_flags))) + goto cleanup; + } else if (alias) { + if (VIR_ALLOC(dev) < 0 || virDomainDefFindDevice(def, alias, dev, = true) < 0) + goto cleanup; + } + + switch (operation) { + case TEST_DEVICE_ATTACH: + if (testDomainAttachDeviceLiveAndConfig(def, dev) < 0) + goto cleanup; + break; + case TEST_DEVICE_DETACH: + break; + case TEST_DEVICE_UPDATE: + break; + } + + ret =3D 0; + cleanup: + if (xml) + virDomainDeviceDefFree(dev); + else + VIR_FREE(dev); + return ret; +} + + +static int +testDomainAttachDetachUpdateDevice(virDomainPtr dom, + virTestDeviceOperation operation, + const char *xml, + const char *alias, + unsigned int flags) +{ + testDriverPtr driver =3D dom->conn->privateData; + virDomainObjPtr vm =3D NULL; + virDomainDefPtr def; + virDomainDefPtr persistentDef; + int ret =3D -1; + + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG, -1); + + if (!(vm =3D testDomObjFromDomain(dom))) + goto cleanup; + + if (virDomainObjGetDefs(vm, flags, &def, &persistentDef) < 0) + goto cleanup; + + if (persistentDef) { + if (testDomainDeviceOperation(driver, operation, xml, alias, persi= stentDef) < 0) + goto cleanup; + } + + if (def) { + if (testDomainDeviceOperation(driver, operation, xml, alias, def) = < 0) + goto cleanup; + } + + ret =3D 0; + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + + +static int +testDomainAttachDeviceFlags(virDomainPtr dom, + const char *xml, + unsigned int flags) +{ + return testDomainAttachDetachUpdateDevice(dom, TEST_DEVICE_ATTACH, + xml, NULL, flags); +} + static int testDomainGetAutostart(virDomainPtr domain, int *autostart) { @@ -8659,6 +8948,7 @@ static virHypervisorDriver testHypervisorDriver =3D { .domainDefineXMLFlags =3D testDomainDefineXMLFlags, /* 1.2.12 */ .domainUndefine =3D testDomainUndefine, /* 0.1.11 */ .domainUndefineFlags =3D testDomainUndefineFlags, /* 0.9.4 */ + .domainAttachDeviceFlags =3D testDomainAttachDeviceFlags, /* 5.7.0 */ .domainGetAutostart =3D testDomainGetAutostart, /* 0.3.2 */ .domainSetAutostart =3D testDomainSetAutostart, /* 0.3.2 */ .domainGetDiskErrors =3D testDomainGetDiskErrors, /* 5.4.0 */ -- 2.22.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list