From nobody Thu May 2 11:44:58 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=1677688157; cv=none; d=zohomail.com; s=zohoarc; b=XVd4qN+3o/B6C75l/+LSEwhwvLSV3l7uNDve4r0tcXPnOfZy9KsFry89jPJQovQ3rB0GnppDgNM6zzyeuzStW9gKEr79fQt43TuZlKkcT5HYXZOfvwGEWR3h9oh/3rw88lvdzKHEtbX6GRugT+KhCmMl0FR0+Usk3esfLmSIjaE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677688157; 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=KOPi6RG5vFqrHzQ8kdKP4ZUxyRDZr3TkQPRpt2/C5Mk=; b=iZ2aKXW9wDPExMftTGaYICiArhjTJIPP3o3x92DXgRjF2g8piZugF9vV0wsFFTJu71YYFz3CNJ26I5XfqvHKItgD7f0ogMgkszV4joNJY+eydH/suDQ/vLQDXOketqJ4EAd7MHuxOX4I+zG5KZsSPmpUN5uX0hKN+X5zGDJYSBg= 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 1677688157449954.2941523828445; Wed, 1 Mar 2023 08:29:17 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-74-Jb69gZkfNaaO0wphf5591Q-1; Wed, 01 Mar 2023 11:29:13 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D625F29ABA1E; Wed, 1 Mar 2023 16:29:10 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id C322114171B6; Wed, 1 Mar 2023 16:29:10 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C352D19452D8; Wed, 1 Mar 2023 16:28:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8180C1946A45 for ; Wed, 1 Mar 2023 16:28:43 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 76F7E422A9; Wed, 1 Mar 2023 16:28:43 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id D87F035454 for ; Wed, 1 Mar 2023 16:28:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677688156; 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=KOPi6RG5vFqrHzQ8kdKP4ZUxyRDZr3TkQPRpt2/C5Mk=; b=PNG3NFWUmzY70G80RHIyv9Epah4lpLj+jak/AscP3NbdIVSH5ZWq8Sj6Ijot1T/vKof+/V Fbuu67nBSOaknI9Geq+TqS4bjq8abTmn+vavnauU90+3CyagyGWWVkZS87Ecuj7Dx09g6m an9VXSDHpSm2NJJKorFHMXH4TJa5x/Y= X-MC-Unique: Jb69gZkfNaaO0wphf5591Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 1/4] qemu: agent: Make fetching of 'can-offline' member from 'guest-query-vcpus' optional Date: Wed, 1 Mar 2023 17:28:37 +0100 Message-Id: <111fccc33c87a568cb66b60adf4cd4359e147a38.1677688055.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: 1677688158896100003 Content-Type: text/plain; charset="utf-8" The 'can-offline' member is optional according to agent's schema and in fact in certain cases it's not returned. Libvirt then spams the logs if something is polling the bulk guest stats API. Noticed when going through oVirt logs which appears to call the bulk stats API repeatedly. Instead of requiring it we simply reply that the vCPU can't be offlined. Signed-off-by: Peter Krempa Reviewed-by: Laine Stump --- src/qemu/qemu_agent.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index f20bc4e6a7..b5aa518d55 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -1366,12 +1366,8 @@ qemuAgentGetVCPUs(qemuAgent *agent, return -1; } - if (virJSONValueObjectGetBoolean(entry, "can-offline", - &in->offlinable) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("'can-offline' missing in reply of guest-get-= vcpus")); - return -1; - } + in->offlinable =3D false; + ignore_value(virJSONValueObjectGetBoolean(entry, "can-offline", &i= n->offlinable)); } return ndata; --=20 2.39.2 From nobody Thu May 2 11:44:58 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1677688152; cv=none; d=zohomail.com; s=zohoarc; b=f1HOszjGXwiTFpYbw1vW/CSxYDEc5o0mE908pYqjnQYBQYvvijagguYAaZWNU5QGeWxXPEVWTuTIE//2JwCQNKl5VDETFMUJJPMk63Nc5qFcJZKf2WvMfN4ybke4EzVCH4o6lxMnmzdbhmAqGRW0Ow/kUggeP7337IhFH6XWVPA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677688152; 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=cuJqIZ4CMso5hKvEHB5Yj7xzYNCorcKEUW+5JK74uyE=; b=gRKmMZJYZVXXwaEWCz2o70lW5Tkwn/LxLpsJLQIkNlY9kQBzDAAFGjYQV5jTdUwDNUg4xEt4p8s2rPvi29RCRTpuoLubG3iBCckDh0nghffkN4/LTNbE2LhLLjUPytTLfrmGq6p+EPFOmI3rqYeqPteDtH2h10QC6PbkEPmXTaM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1677688152633487.9358632526347; Wed, 1 Mar 2023 08:29:12 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-573-twfxoxbxPTu8MnjeAbUgsw-1; Wed, 01 Mar 2023 11:29:07 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5F17129ABA19; Wed, 1 Mar 2023 16:29:03 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id CD8582026D4B; Wed, 1 Mar 2023 16:28:59 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 6932919465BB; Wed, 1 Mar 2023 16:28:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7EC5F19465BB for ; Wed, 1 Mar 2023 16:28:44 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 71FF043FBD; Wed, 1 Mar 2023 16:28:44 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id E8DEE35454 for ; Wed, 1 Mar 2023 16:28:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677688151; 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=cuJqIZ4CMso5hKvEHB5Yj7xzYNCorcKEUW+5JK74uyE=; b=cnLyvd+6ggTCj22ZUGYHKud0TxyR37knF9bq3ePFeeF4SmtEW1yueWcKHH+UKkkYMKZFKo vN/FTatPC/t2NuthJVRSQPSU05kgl310KSJ8IZhxSUSFy0orAdURvdC+babdb3zAEcjsNq i7v4za9HIiozw100sAwqoTko0CIhR6g= X-MC-Unique: twfxoxbxPTu8MnjeAbUgsw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 2/4] conf: domain: Add comment for 'virDomainObjTaint' Date: Wed, 1 Mar 2023 17:28:38 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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: 1677688152988100002 Content-Type: text/plain; charset="utf-8" Outline what the function does, especially the return value. Signed-off-by: Peter Krempa Reviewed-by: Laine Stump --- src/conf/domain_conf.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 84ffd93b7f..39ddfb7db0 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1915,8 +1915,17 @@ virDomainBlkioDeviceParseXML(xmlNodePtr root, } -bool virDomainObjTaint(virDomainObj *obj, - virDomainTaintFlags taint) +/** + * virDomainObjTaint: + * @obj: domain object + * @taint: domain taint flag + * + * Marks @obj as tainted by @taint. Returns 'false' if @obj already has + * been tainted with @taint. + */ +bool +virDomainObjTaint(virDomainObj *obj, + virDomainTaintFlags taint) { unsigned int flag =3D (1 << taint); --=20 2.39.2 From nobody Thu May 2 11:44:58 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=1677688152; cv=none; d=zohomail.com; s=zohoarc; b=L6BhHhGoswfsuM4R0HOigTMnpjjT2tR0or7m7a3GAiL4SCUn4osgt3+jLkUcgxuAIbB/pxHXh5fc0scAH1eiUN0F/Q8RcvR8hjoWKBNTefLxBpZ7bTKVzJgjGeU5oaUAb6r0V1epTjqVXv2IMQOkOK/eg3gmUGAee4nwY3N7HLE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677688152; 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=C6krt2JyHhXYZO3BDyzorX3PBGmG75wWlw0yKTqiPEQ=; b=eZ+TjWAcTnSeZZBs0o3IfEOqTZTM9VmJ8eHXINp8QdBr1WI750OHZcfa6V50FL/D+TUEec9VCp2DIleaXyL4Z2GltX9sXUM3SKU/o6va8BZqyNBoDh33FQX3/YSqo9fiFbOj86h5v3lpSVE8RESARAOu96c60419c8vzKuEqe/U= 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 1677688152056671.2757033189034; Wed, 1 Mar 2023 08:29:12 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-374-HHyyiKDbNMC0feB2LOdwQQ-1; Wed, 01 Mar 2023 11:29:05 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5F1D1803490; Wed, 1 Mar 2023 16:29:03 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1F67218EC1; Wed, 1 Mar 2023 16:29:01 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9F0E019472DE; Wed, 1 Mar 2023 16:28:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 812DB19465BD for ; Wed, 1 Mar 2023 16:28:45 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4B71043FBE; Wed, 1 Mar 2023 16:28:45 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id C8EEC35454 for ; Wed, 1 Mar 2023 16:28:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677688148; 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=C6krt2JyHhXYZO3BDyzorX3PBGmG75wWlw0yKTqiPEQ=; b=aQeNfGO5yDNtFdedsyg5suUpKSB7CYvA86ZSkZMdfBLxqpBxCLDVQMF1CvgPr21YAr16e+ 9I4PbqEiPGIJeOxWySl4BttX6xIfe8RoyWCx14bfR6FZptXSs4OC3jDzR0/JEGcwiB+t0T /kwGg1EBLfG4x5QMt3+s1ek5JD7XjTk= X-MC-Unique: HHyyiKDbNMC0feB2LOdwQQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 3/4] qemu: domain: Fix logic when tainting domain Date: Wed, 1 Mar 2023 17:28:39 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 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: 1677688152980100001 Content-Type: text/plain; charset="utf-8" Originally the code was skipping all repeated taints with the same taint flag but a logic bug introduced in commit 30626ed15b239c424ae inverted the condition. This caused that actually the first occurence was NOT logged but any subsequent was. This was noticed when going through oVirt logs as they use custom guest agent commands and the logs are totally spammed with this message. Fixes: 30626ed15b239c424ae891f096057a696eadd715 Signed-off-by: Peter Krempa Reviewed-by: Laine Stump --- src/qemu/qemu_domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 4cf9a259ea..40d5efd750 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6663,7 +6663,7 @@ void qemuDomainObjTaintMsg(virQEMUDriver *driver, const char *extrasuffix =3D ""; va_list args; - if (virDomainObjTaint(obj, taint)) { + if (!virDomainObjTaint(obj, taint)) { /* If an extra message was given we must always * emit the taint warning, otherwise it is a * one-time only warning per VM --=20 2.39.2 From nobody Thu May 2 11:44:58 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=1677688166; cv=none; d=zohomail.com; s=zohoarc; b=ZcTvAIUh/xlp2KPflD8CTJFeM6Ch2cq8SvHJsYwMkHA7Rf8092UG5q3p/wULWkU/jfEs07uLw3Kd1ovbsALVmd/av+Bek2V3VxwioUXJRbIrcDLrlpHmay/jB2yJfhvK4pGTOb0JWzwTRBul3eKrMUdYD5L16Wz8bPqW81/uudg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677688166; 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=QAAa1MV0XBtdzHNSHLKBUzZVOHNNEsp9YmRNkFL+JoA=; b=htNkworM2B0hfFjMlr1t2s+WvcWkyzYSspusO2YGsyl3szb+vmpO3P4nAVEVoWwYmOPprb6Dd1qnS83CbMs+IJvOw8llQa/yG92sGNV9BIMZyR4zhnbFDcqAtio9vIqs2OedUiZeKOKVOXmfbPswVmXRtc1ZLUhGK2VD+QnJjxs= 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 1677688166634890.4046416517107; Wed, 1 Mar 2023 08:29:26 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-228-Z3CAbAmuOCOZaY3DwFNk-Q-1; Wed, 01 Mar 2023 11:29:20 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D307229ABA02; Wed, 1 Mar 2023 16:29:18 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id BCFEC492C3E; Wed, 1 Mar 2023 16:29:18 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 373ED194867C; Wed, 1 Mar 2023 16:29:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 5966519452D8 for ; Wed, 1 Mar 2023 16:28:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 2DF4044002; Wed, 1 Mar 2023 16:28:46 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id A578C35454 for ; Wed, 1 Mar 2023 16:28:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677688165; 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=QAAa1MV0XBtdzHNSHLKBUzZVOHNNEsp9YmRNkFL+JoA=; b=PHjUJC6SrHbjhiINK8EtF3UF/fFBinOtJAjJdM3mDtDpD52kiUolXY4tNPEuBj2l5Txrt6 3n3qPOiWUMCWv6HtgwueMEV617nnmL+kYADYCA3mqRt4/vlG4m+xx0MEM26eSWE2erWDXJ 27uhAAMv9IYeKJ3m+1quEpPj1Dn5fJ4= X-MC-Unique: Z3CAbAmuOCOZaY3DwFNk-Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 4/4] qemu: domain: Unexport qemuDomainObjTaintMsg Date: Wed, 1 Mar 2023 17:28:40 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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: 1677688167172100001 Content-Type: text/plain; charset="utf-8" The function is used only inside qemu_domain.c unexport and move it above it's user. Signed-off-by: Peter Krempa Reviewed-by: Laine Stump --- src/qemu/qemu_domain.c | 30 ++++++++++++++++-------------- src/qemu/qemu_domain.h | 7 ------- 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 40d5efd750..a083e7e1ef 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6638,20 +6638,12 @@ qemuDomainDefFormatLive(virQEMUDriver *driver, } -void qemuDomainObjTaint(virQEMUDriver *driver, - virDomainObj *obj, - virDomainTaintFlags taint, - qemuDomainLogContext *logCtxt) -{ - qemuDomainObjTaintMsg(driver, obj, taint, logCtxt, NULL); - qemuDomainSaveStatus(obj); -} - -void qemuDomainObjTaintMsg(virQEMUDriver *driver, - virDomainObj *obj, - virDomainTaintFlags taint, - qemuDomainLogContext *logCtxt, - const char *fmt, ...) +static void G_GNUC_PRINTF(5, 6) +qemuDomainObjTaintMsg(virQEMUDriver *driver, + virDomainObj *obj, + virDomainTaintFlags taint, + qemuDomainLogContext *logCtxt, + const char *fmt, ...) { virErrorPtr orig_err =3D NULL; g_autofree char *timestamp =3D NULL; @@ -6725,6 +6717,16 @@ void qemuDomainObjTaintMsg(virQEMUDriver *driver, virErrorRestore(&orig_err); } + +void qemuDomainObjTaint(virQEMUDriver *driver, + virDomainObj *obj, + virDomainTaintFlags taint, + qemuDomainLogContext *logCtxt) +{ + qemuDomainObjTaintMsg(driver, obj, taint, logCtxt, NULL); + qemuDomainSaveStatus(obj); +} + static void qemuDomainObjCheckMachineTaint(virQEMUDriver *driver, virDomainObj *obj, diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 6adc067681..54c2e02557 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -629,13 +629,6 @@ void qemuDomainObjTaint(virQEMUDriver *driver, virDomainTaintFlags taint, qemuDomainLogContext *logCtxt); -void qemuDomainObjTaintMsg(virQEMUDriver *driver, - virDomainObj *obj, - virDomainTaintFlags taint, - qemuDomainLogContext *logCtxt, - const char *msg, - ...) G_GNUC_PRINTF(5, 6); - char **qemuDomainObjGetTainting(virQEMUDriver *driver, virDomainObj *obj); --=20 2.39.2