From nobody Sat Feb 7 06:55:29 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505824829533234.374921125441; Tue, 19 Sep 2017 05:40:29 -0700 (PDT) Received: from localhost ([::1]:42609 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duHpE-0003qZ-MS for importer@patchew.org; Tue, 19 Sep 2017 08:40:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59954) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duHfM-00048Y-MG for qemu-devel@nongnu.org; Tue, 19 Sep 2017 08:30:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duHfG-0005R1-Tl for qemu-devel@nongnu.org; Tue, 19 Sep 2017 08:30:16 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:33573) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1duHfG-0005Q9-Nd for qemu-devel@nongnu.org; Tue, 19 Sep 2017 08:30:10 -0400 Received: by mail-wm0-x243.google.com with SMTP id m127so3756869wmm.0 for ; Tue, 19 Sep 2017 05:30:10 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-246-117.clienti.tiscali.it. [78.12.246.117]) by smtp.gmail.com with ESMTPSA id k18sm1292878wmd.22.2017.09.19.05.30.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Sep 2017 05:30:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=pgBQmdux1gX7UnsyoemlFR8dRsoGnHo/zOdzLyQavrQ=; b=ZhUsCWLyYslLFKkVaXSpZUcDtyV3cCXDJKRh/KZOv1TBMtgcZPq4/K4XJNiaXsLCeU mW9WFmieiFK6JCETLs3X57N+Y2Q20nGjIbERuxCcsSwsJouR5y5Ti/vb0XdsHaHmTUfI nBkzV9Rc5pWi+3oPdmPoymHgoGp/SBfQ6pZUdM78cVatjwj0sS/ei7lVlAxGp43FHZrd Qd+DEPeXkNivxAjLDgh6UXa4tBO6A1E26hBLfjoBGkFxOMlZ7/c650CqcxdvxuDmkNOX LjIQ4Q0zmHqXH3LfXGvnwl9tLlkSv1O9zbT9PsSdiHUNJvJtt3dVZciWFweH3jJpSgUX dlvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=pgBQmdux1gX7UnsyoemlFR8dRsoGnHo/zOdzLyQavrQ=; b=hbIUWiXdEQxuhofYx897dUxFB52Hvn+hHl0g9xPMUYjTU9p/vuHQCk88sz+C9WKrNm u1Ss4DtFjuDoS8YzrIUG+pHPtKXK5anZOCx9OG3u2Ikz1wS4LaIUaJK3bZxZ8c9ts23V +wfU1w/HH0j0zHbv37xaBX7XNtE47T5rYpDoc30DoL9EImp/crVFswzG1GC1XwcwK5ll 7CuP5nB06e84e2XiMgDy8oX9MwZnDStjjWOhXq23lDqDBiPBOhaVozhnN0daNFvjtUvJ NXHMaA9fE4EUtKVscBfSzeMxOAwVcDhfs+OsAa78MoTMqcqagPyINgm6H8bJIpQIXbAQ ffBw== X-Gm-Message-State: AHPjjUi4AtOtVAiA8/EGjOjKD32PkjKSMyCFqFJ8096zFo77/1m/pjHl WiUsal+Yqpm6z7DJX5Dm0ePCWy8A X-Google-Smtp-Source: AOwi7QC+yVkxUjOiOe++LDhUTPwA6lMvBuxHxELt1iXudeRl3Sxvg6hUMs3jto2OX/YIMB+rxbgNUQ== X-Received: by 10.28.0.7 with SMTP id 7mr911602wma.109.1505824209422; Tue, 19 Sep 2017 05:30:09 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 14:29:12 +0200 Message-Id: <1505824179-21541-24-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1505824179-21541-1-git-send-email-pbonzini@redhat.com> References: <1505824179-21541-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [PULL 23/50] memory: Rename queue to mrqueue (memory region queue) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kamil Rytarowski Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Kamil Rytarowski SunOS declares struct queue in . This fixes build on SmartOS (Joyent). Patch cherry-picked from pkgsrc by jperkin (Joyent). Signed-off-by: Kamil Rytarowski Message-Id: <20170903163304.17919-1-n54@gmx.com> Signed-off-by: Paolo Bonzini --- memory.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/memory.c b/memory.c index c0adc35..b9920a6 100644 --- a/memory.c +++ b/memory.c @@ -2701,10 +2701,10 @@ typedef struct MemoryRegionList MemoryRegionList; =20 struct MemoryRegionList { const MemoryRegion *mr; - QTAILQ_ENTRY(MemoryRegionList) queue; + QTAILQ_ENTRY(MemoryRegionList) mrqueue; }; =20 -typedef QTAILQ_HEAD(queue, MemoryRegionList) MemoryRegionListHead; +typedef QTAILQ_HEAD(mrqueue, MemoryRegionList) MemoryRegionListHead; =20 #define MR_SIZE(size) (int128_nz(size) ? (hwaddr)int128_get64( \ int128_sub((size), int128_one())) : 0) @@ -2746,7 +2746,7 @@ static void mtree_print_mr(fprintf_function mon_print= f, void *f, bool found =3D false; =20 /* check if the alias is already in the queue */ - QTAILQ_FOREACH(ml, alias_print_queue, queue) { + QTAILQ_FOREACH(ml, alias_print_queue, mrqueue) { if (ml->mr =3D=3D mr->alias) { found =3D true; } @@ -2755,7 +2755,7 @@ static void mtree_print_mr(fprintf_function mon_print= f, void *f, if (!found) { ml =3D g_new(MemoryRegionList, 1); ml->mr =3D mr->alias; - QTAILQ_INSERT_TAIL(alias_print_queue, ml, queue); + QTAILQ_INSERT_TAIL(alias_print_queue, ml, mrqueue); } mon_printf(f, TARGET_FMT_plx "-" TARGET_FMT_plx " (prio %d, %s): alias %s @%s " TARGET_FMT_plx @@ -2783,26 +2783,26 @@ static void mtree_print_mr(fprintf_function mon_pri= ntf, void *f, QTAILQ_FOREACH(submr, &mr->subregions, subregions_link) { new_ml =3D g_new(MemoryRegionList, 1); new_ml->mr =3D submr; - QTAILQ_FOREACH(ml, &submr_print_queue, queue) { + QTAILQ_FOREACH(ml, &submr_print_queue, mrqueue) { if (new_ml->mr->addr < ml->mr->addr || (new_ml->mr->addr =3D=3D ml->mr->addr && new_ml->mr->priority > ml->mr->priority)) { - QTAILQ_INSERT_BEFORE(ml, new_ml, queue); + QTAILQ_INSERT_BEFORE(ml, new_ml, mrqueue); new_ml =3D NULL; break; } } if (new_ml) { - QTAILQ_INSERT_TAIL(&submr_print_queue, new_ml, queue); + QTAILQ_INSERT_TAIL(&submr_print_queue, new_ml, mrqueue); } } =20 - QTAILQ_FOREACH(ml, &submr_print_queue, queue) { + QTAILQ_FOREACH(ml, &submr_print_queue, mrqueue) { mtree_print_mr(mon_printf, f, ml->mr, level + 1, cur_start, alias_print_queue); } =20 - QTAILQ_FOREACH_SAFE(ml, &submr_print_queue, queue, next_ml) { + QTAILQ_FOREACH_SAFE(ml, &submr_print_queue, mrqueue, next_ml) { g_free(ml); } } @@ -2872,13 +2872,13 @@ void mtree_info(fprintf_function mon_printf, void *= f, bool flatview) } =20 /* print aliased regions */ - QTAILQ_FOREACH(ml, &ml_head, queue) { + QTAILQ_FOREACH(ml, &ml_head, mrqueue) { mon_printf(f, "memory-region: %s\n", memory_region_name(ml->mr)); mtree_print_mr(mon_printf, f, ml->mr, 1, 0, &ml_head); mon_printf(f, "\n"); } =20 - QTAILQ_FOREACH_SAFE(ml, &ml_head, queue, ml2) { + QTAILQ_FOREACH_SAFE(ml, &ml_head, mrqueue, ml2) { g_free(ml); } } --=20 1.8.3.1