From nobody Thu May 2 01:40:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1635513327; cv=none; d=zohomail.com; s=zohoarc; b=Iv94PaYJ0IaUbjayF3daLeVNnsUzMjv45TepxW8o2B655PpHeHLjZ9fQlGQ5IwMU2ZBn+DJtG+LLSgPOUbt9qwfMUf5bFReF1Ykrg/C+Ys0Ut3N2+mTSYGRoxsFRnKnbabNMPDp7FkYibR4UR08TIFFzm+VstuMpIzP2af7ho2Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635513327; 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; bh=glb+wLecGWaINAM9TyxGw+lRHERwfPD7woSe8BcPxNI=; b=SIpgs+2n5Q/bzrw56g+mnNfe80wHWqnG/C9JlP8PsL0KqBrNeWGz++t2xERjJZW3/EXc5h3s7tSZlnSeWi6b0k1A7404VvBaBlJlo1cknqBOc4OsHVVDUk8/jFIjWY6InS6L+H8vMT7inx1NLz6S5nVBem2noWj0iMAD9ygVokk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1635513327365575.5195025631584; Fri, 29 Oct 2021 06:15:27 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-138-7-Olpqf7PZSXUkhx1IhDnA-1; Fri, 29 Oct 2021 09:14:37 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 19C6B10144E8; Fri, 29 Oct 2021 13:14:31 +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 E243426E56; Fri, 29 Oct 2021 13:14:30 +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 527D8180BAD2; Fri, 29 Oct 2021 13:14:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 19TDEPuc008735 for ; Fri, 29 Oct 2021 09:14:25 -0400 Received: by smtp.corp.redhat.com (Postfix) id C451010016F5; Fri, 29 Oct 2021 13:14:25 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2ABA7100763D for ; Fri, 29 Oct 2021 13:14:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635513326; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=glb+wLecGWaINAM9TyxGw+lRHERwfPD7woSe8BcPxNI=; b=WIWQC27+0DEDudUpp5px3ZlcPArtQijlvAeDMVu17DMzcdDICy44D5SxS13phpJ4SSVIjO TS5WRdQuOJrtri7V6+0LG5RngMHMfwMmH8REou5+45CZaGSHRfZnePE3k/B2p5es50F/fn coZWT7kut/Pwo/sS/fOj5rRfmxNRgI4= X-MC-Unique: 7-Olpqf7PZSXUkhx1IhDnA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 1/7] qemuMonitorJSONQueryBlock: Reformat function header Date: Fri, 29 Oct 2021 15:14:16 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com 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.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1635513328042100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_monitor_json.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index e9be9bdabd..19af6219aa 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2036,10 +2036,11 @@ qemuMonitorJSONGetBalloonInfo(qemuMonitor *mon, } -int qemuMonitorJSONGetMemoryStats(qemuMonitor *mon, - char *balloonpath, - virDomainMemoryStatPtr stats, - unsigned int nr_stats) +int +qemuMonitorJSONGetMemoryStats(qemuMonitor *mon, + char *balloonpath, + virDomainMemoryStatPtr stats, + unsigned int nr_stats) { int ret =3D -1; g_autoptr(virJSONValue) cmd =3D NULL; --=20 2.31.1 From nobody Thu May 2 01:40:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1635513354; cv=none; d=zohomail.com; s=zohoarc; b=Dcd6Mt8mBfKmSTPh51CD75shFCT0Ki+E/3Nb1Z5OTkx2vJHlT9VmWWxmA42omAOJ9qOycsTHSE3nhjHW7wM8I9mBFORId1E/IPbqBextOoy4GWkaFdcTgdIEQlE2ZO9EHEuwHdU2nEnAFmU+6m+pcWs5GtXMMVnuJWaxK9cmPcc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635513354; 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; bh=6e7NvBKtde3SHjF2CyQ4mdv7Psu7g6BVnWfyPieKPWs=; b=Cg2hpCLQ1txLYviGGEFfRCQ5Fg68MPmo8e+T1YGHTsYG9paGIi6EgJH4xY7anDgPbIsMkzvpKwbW5P0uxQfjFwV2hj0wXCCC+HDTmYlTdROGfVRmiy9uu9g6c9YSniJwVyuVCWWSrK6CL2nzLbxWSX41eb4LwM2TSYDcsljDwSQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 16355133540681008.1666923030704; Fri, 29 Oct 2021 06:15:54 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-199-F6X6bKPjN1yauzbxOS77Tw-1; Fri, 29 Oct 2021 09:14:35 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0F80819251B1; Fri, 29 Oct 2021 13:14:30 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E31666788F; Fri, 29 Oct 2021 13:14:29 +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 B2CBA4EA37; Fri, 29 Oct 2021 13:14:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 19TDEQmq008743 for ; Fri, 29 Oct 2021 09:14:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id E07A01017CE7; Fri, 29 Oct 2021 13:14:26 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 47FE310023B8 for ; Fri, 29 Oct 2021 13:14:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635513353; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=6e7NvBKtde3SHjF2CyQ4mdv7Psu7g6BVnWfyPieKPWs=; b=O+mSv1cYVkCpoYqX2suOjja1B1AYxGa1JvXGWtncVUZ3Q28z0OPc4ixyq2zEniVXxlzfoU qaYvrOlT7O4xsuo1PyYLhFceQLiRxDvyWrXKeWc5Gslt28rvLZcWL7kuBfGHaa8AmE2x2m Hg/k/ZlAxUSKOoOG4YUV4HB1dWAqVSU= X-MC-Unique: F6X6bKPjN1yauzbxOS77Tw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 2/7] qemuMonitorJSONBlockInfoAdd: Refactor hash table addition Date: Fri, 29 Oct 2021 15:14:17 +0200 Message-Id: <09acc4fe352a7c27ee82b8370bf79534ff47b55d.1635513203.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com 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.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1635513355886100001 Content-Type: text/plain; charset="utf-8" Open code virHashAddEntry so that the error code path can be avoided. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_monitor_json.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 19af6219aa..962876b43a 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2220,27 +2220,21 @@ qemuMonitorJSONBlockInfoAdd(GHashTable *table, const char *entryname) { struct qemuDomainDiskInfo *tmp =3D NULL; - int ret =3D -1; + + if (g_hash_table_contains(table, entryname)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Duplicate block info for '%s'"), entryname); + return -1; + } tmp =3D g_new0(struct qemuDomainDiskInfo, 1); *tmp =3D *info; - tmp->nodename =3D NULL; - - if (info->nodename) - tmp->nodename =3D g_strdup(info->nodename); + tmp->nodename =3D g_strdup(info->nodename); - if (virHashAddEntry(table, entryname, tmp) < 0) - goto cleanup; - - tmp =3D NULL; - ret =3D 0; + g_hash_table_insert(table, g_strdup(entryname), tmp); - cleanup: - if (tmp) - VIR_FREE(tmp->nodename); - VIR_FREE(tmp); - return ret; + return 0; } --=20 2.31.1 From nobody Thu May 2 01:40:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1635513283; cv=none; d=zohomail.com; s=zohoarc; b=K6FWeLqtvr48P0x8r0olfR9XAxj8fgbS9Q44SSR6pJPb/w9AkGiktbKfeZOtXQ+ZsHLfZsYfwSbaBY6LrgNIqbMVRzYbldz/fFcG4OCaIxazf7QCIgq9alsvpAPCs60Ozmxw/rXXUPI2qBCW5hdf+hprVx+/Jnvnqp6DcphKXLE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635513283; 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; bh=8f0HnR/rlOGIPhHhKXIeYqpfhESw6z8+rVLtdGQP/oY=; b=KleyXjWC4nwPATF5gqSh8tOXXp3E4RF3Z9CxsHrNSfPm2e58ToKJ/CLrSkKf21/gyIe5+B8EjHVliS5Hz3gPaxV9+NK4d1abF/5Y/m7pNbb2GvI5rWZhJ5Xm+WF1R3wrHm1xMl5nqXK+yrdWCLNbQPhk9rcoJE9rQ6f+WH9oN3U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1635513283723852.5056598607158; Fri, 29 Oct 2021 06:14:43 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-230-YBeW9g7uM9G4xgNS9mJ4gA-1; Fri, 29 Oct 2021 09:14:40 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 63E1219251A4; Fri, 29 Oct 2021 13:14:32 +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 4983C10016F5; Fri, 29 Oct 2021 13:14:32 +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 183271819AC2; Fri, 29 Oct 2021 13:14:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 19TDESFm008750 for ; Fri, 29 Oct 2021 09:14:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4E463101E591; Fri, 29 Oct 2021 13:14:28 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 64CCA10016F5 for ; Fri, 29 Oct 2021 13:14:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635513282; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=8f0HnR/rlOGIPhHhKXIeYqpfhESw6z8+rVLtdGQP/oY=; b=Ay3jLOJro3G/TfbtS4TLrTrH1FolLyDNokUVnqBVCztQ+HbR2LJNI5AA25P24LrAb6axqo oslmRFLvzARTSydAhuHoByQJCtU8p+8Sv1EOfihgkSOvusD6TovUkTRPWDPf4x+23dhl0g gDUgoJs3Noj8lm3zYmCqZ4SMl5qFgjo= X-MC-Unique: YBeW9g7uM9G4xgNS9mJ4gA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 3/7] qemuhotplugtest: Remove tests for legacy cpu hotplug on x86 Date: Fri, 29 Oct 2021 15:14:18 +0200 Message-Id: <47aea68aeff6e69d68d65fdc7a778cdb7df7cc2d.1635513203.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com 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.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1635513285429100001 Content-Type: text/plain; charset="utf-8" Modern cpu hotplug was introduced in qemu-2.7, thus all qemu versions actually support it. Remove the tests for the legacy hotplug. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tests/qemuhotplugtest.c | 1 - .../x86-old-bulk-domain.xml | 21 -- .../x86-old-bulk-monitor.json | 193 ------------------ .../x86-old-bulk-result-conf.xml | 31 --- .../x86-old-bulk-result-live.xml | 39 ---- 5 files changed, 285 deletions(-) delete mode 100644 tests/qemuhotplugtestcpus/x86-old-bulk-domain.xml delete mode 100644 tests/qemuhotplugtestcpus/x86-old-bulk-monitor.json delete mode 100644 tests/qemuhotplugtestcpus/x86-old-bulk-result-conf.xml delete mode 100644 tests/qemuhotplugtestcpus/x86-old-bulk-result-live.xml diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index ec448da09e..3484041cc8 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -874,7 +874,6 @@ mymain(void) } while (0) DO_TEST_CPU_GROUP("x86-modern-bulk", 7, true, false); - DO_TEST_CPU_GROUP("x86-old-bulk", 7, false, false); DO_TEST_CPU_GROUP("ppc64-modern-bulk", 24, true, false); DO_TEST_CPU_GROUP("ppc64-modern-bulk", 15, true, true); DO_TEST_CPU_GROUP("ppc64-modern-bulk", 23, true, true); diff --git a/tests/qemuhotplugtestcpus/x86-old-bulk-domain.xml b/tests/qemu= hotplugtestcpus/x86-old-bulk-domain.xml deleted file mode 100644 index ef0e39397b..0000000000 --- a/tests/qemuhotplugtestcpus/x86-old-bulk-domain.xml +++ /dev/null @@ -1,21 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219100 - 219100 - 8 - - hvm - - - - - - - destroy - restart - destroy - - /usr/bin/qemu-system-x86_64 - - diff --git a/tests/qemuhotplugtestcpus/x86-old-bulk-monitor.json b/tests/qe= muhotplugtestcpus/x86-old-bulk-monitor.json deleted file mode 100644 index 626c0a5699..0000000000 --- a/tests/qemuhotplugtestcpus/x86-old-bulk-monitor.json +++ /dev/null @@ -1,193 +0,0 @@ -{"execute":"query-cpus-fast","id":"libvirt-1"} - -{ - "return": [ - { - "target": "x86", - "current": true, - "cpu-index": 0, - "qom-path": "/machine/unattached/device[0]", - "pc": -2130415978, - "halted": true, - "thread-id": 518291 - }, - { - "target": "x86", - "current": false, - "cpu-index": 1, - "qom-path": "/machine/unattached/device[2]", - "pc": -2130415978, - "halted": true, - "thread-id": 518292 - }, - { - "target": "x86", - "current": false, - "cpu-index": 2, - "qom-path": "/machine/unattached/device[3]", - "pc": -2130415978, - "halted": true, - "thread-id": 518294 - }, - { - "target": "x86", - "current": false, - "cpu-index": 3, - "qom-path": "/machine/unattached/device[4]", - "pc": -2130415978, - "halted": true, - "thread-id": 518295 - }, - { - "target": "x86", - "current": false, - "cpu-index": 4, - "qom-path": "/machine/unattached/device[5]", - "pc": -2130415978, - "halted": true, - "thread-id": 518296 - } - ], - "id": "libvirt-22" -} - -{"execute":"cpu-add","arguments":{"id":5},"id":"libvirt-2"} - -{"return": {}} - -{"execute":"query-cpus-fast","id":"libvirt-3"} - -{ - "return": [ - { - "target": "x86", - "current": true, - "cpu-index": 0, - "qom-path": "/machine/unattached/device[0]", - "pc": -2130415978, - "halted": true, - "thread-id": 518291 - }, - { - "target": "x86", - "current": false, - "cpu-index": 1, - "qom-path": "/machine/unattached/device[2]", - "pc": -2130415978, - "halted": true, - "thread-id": 518292 - }, - { - "target": "x86", - "current": false, - "cpu-index": 2, - "qom-path": "/machine/unattached/device[3]", - "pc": -2130415978, - "halted": true, - "thread-id": 518294 - }, - { - "target": "x86", - "current": false, - "cpu-index": 3, - "qom-path": "/machine/unattached/device[4]", - "pc": -2130415978, - "halted": true, - "thread-id": 518295 - }, - { - "target": "x86", - "current": false, - "cpu-index": 4, - "qom-path": "/machine/unattached/device[5]", - "pc": -2130415978, - "halted": true, - "thread-id": 518296 - }, - { - "target": "x86", - "current": false, - "cpu-index": 5, - "qom-path": "/machine/peripheral/vcpu5", - "pc": -2130415978, - "halted": true, - "thread-id": 518297 - } - ], - "id": "libvirt-22" -} - -{"execute":"cpu-add","arguments":{"id":6},"id":"libvirt-4"} - -{"return": {}} - -{"execute":"query-cpus-fast","id":"libvirt-5"} - -{ - "return": [ - { - "target": "x86", - "current": true, - "cpu-index": 0, - "qom-path": "/machine/unattached/device[0]", - "pc": -2130415978, - "halted": true, - "thread-id": 518291 - }, - { - "target": "x86", - "current": false, - "cpu-index": 1, - "qom-path": "/machine/unattached/device[2]", - "pc": -2130415978, - "halted": true, - "thread-id": 518292 - }, - { - "target": "x86", - "current": false, - "cpu-index": 2, - "qom-path": "/machine/unattached/device[3]", - "pc": -2130415978, - "halted": true, - "thread-id": 518294 - }, - { - "target": "x86", - "current": false, - "cpu-index": 3, - "qom-path": "/machine/unattached/device[4]", - "pc": -2130415978, - "halted": true, - "thread-id": 518295 - }, - { - "target": "x86", - "current": false, - "cpu-index": 4, - "qom-path": "/machine/unattached/device[5]", - "pc": -2130415978, - "halted": true, - "thread-id": 518296 - }, - { - "target": "x86", - "current": false, - "cpu-index": 5, - "qom-path": "/machine/peripheral/vcpu5", - "pc": -2130415978, - "halted": true, - "thread-id": 518297 - }, - { - "target": "x86", - "current": false, - "cpu-index": 6, - "qom-path": "/machine/peripheral/vcpu6", - "pc": -2130415978, - "halted": true, - "thread-id": 518298 - } - ], - "id": "libvirt-22" -} diff --git a/tests/qemuhotplugtestcpus/x86-old-bulk-result-conf.xml b/tests= /qemuhotplugtestcpus/x86-old-bulk-result-conf.xml deleted file mode 100644 index a3ca61ce76..0000000000 --- a/tests/qemuhotplugtestcpus/x86-old-bulk-result-conf.xml +++ /dev/null @@ -1,31 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219100 - 219100 - 8 - - hvm - - - - - - - destroy - restart - destroy - - /usr/bin/qemu-system-x86_64 - -
- - - - -