From nobody Wed Nov 27 13:53:09 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1698673154; cv=none; d=zohomail.com; s=zohoarc; b=deeKb6DmKY3wgc8u9BsCRXuq47Zi4q33iapZtCA2tCU7mU1cbtRRimX8fGwhHFbgVsCQwSTNjcWuZFqiuOeOzYYNOT+i10ZOosh6wjRCzUW1NlZDGa8B4/eckq2uDMM6rAk9AOlPPO7zJyARRcWNGQBiCUdRkCl+9dLqpY6koOU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1698673154; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=C+YBsynf1oU3pnbEOavTdyJdTLRXwDqD9ZyGyLinOUc=; b=aWHtV8gviM83VfwkbZR8ZAV5jS1+hRWnwet9iRupkig2AL+lrzbgwHOo1WJGR8lVwP0Zuu8ZmTOcG6YI1/B8lEB0xWN7NYJmy2g6BoYRDl8aFUAq+97jSgf5SWdgbpeBI58YmyEE9sZkbjAndGqFqe21724kSwYNDqfNnLkRxOc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1698673154968474.87368082074; Mon, 30 Oct 2023 06:39:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qxSSM-0003ai-KR; Mon, 30 Oct 2023 09:37:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qxSSI-0003ZT-Gm for qemu-devel@nongnu.org; Mon, 30 Oct 2023 09:37:22 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qxSSD-0005pO-F0 for qemu-devel@nongnu.org; Mon, 30 Oct 2023 09:37:22 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-592-ZGwGNsFoPlm4usJP-2C7uQ-1; Mon, 30 Oct 2023 09:37:14 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 10C4985A5BD for ; Mon, 30 Oct 2023 13:37:14 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.193.56]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E4973C1596D for ; Mon, 30 Oct 2023 13:37:13 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id C623421E6A26; Mon, 30 Oct 2023 14:37:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698673036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=C+YBsynf1oU3pnbEOavTdyJdTLRXwDqD9ZyGyLinOUc=; b=afloCx/HVCXjjZ/tSnsm+Iiq6ap+HwSCasoo4/XbsuXF0lCVWyrAksmPWxj/AXrycGgA9P ObNsk1jaoTizDTsFxhQRwP/YvGuAZfjCHurfDgmdYkS/1ktdyKYklQgJ+3Gjq2hYJIMr1i 5wT11pGzsQW0Vz5gVb8EMF+mmM6o8Us= X-MC-Unique: ZGwGNsFoPlm4usJP-2C7uQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: marcandre.lureau@redhat.com Subject: [PATCH 1/5] dump: Rename qmp_dump_guest_memory() parameter to match QAPI schema Date: Mon, 30 Oct 2023 14:37:08 +0100 Message-ID: <20231030133712.2822276-2-armbru@redhat.com> In-Reply-To: <20231030133712.2822276-1-armbru@redhat.com> References: <20231030133712.2822276-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.483, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1698673155768100004 Content-Type: text/plain; charset="utf-8" The name of the second parameter differs between QAPI schema and C implementation: it's @protocol in the former and @file in the latter. Potentially confusing. Change the C implementation to match the QAPI schema. Signed-off-by: Markus Armbruster Reviewed-by: Marc-Andr=C3=A9 Lureau --- dump/dump.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dump/dump.c b/dump/dump.c index d355ada62e..a1fad17f9c 100644 --- a/dump/dump.c +++ b/dump/dump.c @@ -2061,11 +2061,12 @@ DumpQueryResult *qmp_query_dump(Error **errp) return result; } =20 -void qmp_dump_guest_memory(bool paging, const char *file, +void qmp_dump_guest_memory(bool paging, const char *protocol, bool has_detach, bool detach, - bool has_begin, int64_t begin, bool has_length, - int64_t length, bool has_format, - DumpGuestMemoryFormat format, Error **errp) + bool has_begin, int64_t begin, + bool has_length, int64_t length, + bool has_format, DumpGuestMemoryFormat format, + Error **errp) { ERRP_GUARD(); const char *p; @@ -2128,7 +2129,7 @@ void qmp_dump_guest_memory(bool paging, const char *f= ile, } =20 #if !defined(WIN32) - if (strstart(file, "fd:", &p)) { + if (strstart(protocol, "fd:", &p)) { fd =3D monitor_get_fd(monitor_cur(), p, errp); if (fd =3D=3D -1) { return; @@ -2136,7 +2137,7 @@ void qmp_dump_guest_memory(bool paging, const char *f= ile, } #endif =20 - if (strstart(file, "file:", &p)) { + if (strstart(protocol, "file:", &p)) { fd =3D qemu_open_old(p, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, S= _IRUSR); if (fd < 0) { error_setg_file_open(errp, errno, p); --=20 2.41.0