From nobody Fri May 17 15:28:08 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578486887; cv=none; d=zohomail.com; s=zohoarc; b=XKmZvu1cPFES32O4OV+qcxsK5AZfSZ/DLjyC3yPgsg2sAEalVR5mTk6uWCW8ovwF1vNnWs3bUQ8kYaDplUdqNdM1ewi35BkEJ3y02HzXH/WIdiiA3+gpePaKjfSppNdnona7Y+iHDCglz03Tuusviv1S/pYxRv3cEEaV9DLTZpU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578486887; h=Content-Type:Content-Transfer-Encoding:Cc: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=mcf3x4qvRFnXt/JzGXBT9qpotUnB0PCEc7IeTyjDok0=; b=l0z5l8c3id1GjhCJnj0irZCDIKPWkwBuOrJSzV8q/7OCfroxcT74Y0R9S+skplea+CAxcWbykDhJAfBo7e5qsDexl1/wCINofTmztK2FRrr9sq/gIfEEO7/sncL715X4PmTP8MmoPMvwYDwC0ByMAvegnzfYUyXxGglBBfVty2U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578486887296127.82138812642688; Wed, 8 Jan 2020 04:34:47 -0800 (PST) Received: from localhost ([::1]:42804 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAXt-0005LU-HN for importer@patchew.org; Wed, 08 Jan 2020 07:34:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60183) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAWD-0003ZL-0d for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipAWB-0004Bq-Sc for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:00 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:42673) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipAWB-0004BL-MO for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:32:59 -0500 Received: by mail-wr1-x435.google.com with SMTP id q6so3157187wro.9 for ; Wed, 08 Jan 2020 04:32:59 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id o4sm4037750wrw.97.2020.01.08.04.32.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 04:32:57 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=mcf3x4qvRFnXt/JzGXBT9qpotUnB0PCEc7IeTyjDok0=; b=aEUoe9thOY5O2uX16d5s+KzacDxsYT+CNZ0m+WcpRWnivnNzLRZJqLdUHh3yYtUwsb CMnRNnXLzO9Z5eIWjc+8ya3bx4H220ojhYFzclARXoJjed4k0tO/fgjuV6HeLslZogk8 N/3gNmU+RI67+o6897l0O7igQmhxXffJtqPK2aX6kuVJyd6XFDSNQul48A66G/jJsnHY zYEbSjLpO/1y6CKhnTvWyDXGe5lS12olknml7Kv8Yymin+sHgwcgHrUeVOUoD3X19vSy ERcT9Pyx8i9x+VgJnarC6By9IUBUYLXKsKD8r/bVJc0BeykAL9BnH8fCjeGU76Z+FPza LLvg== 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:mime-version:content-transfer-encoding; bh=mcf3x4qvRFnXt/JzGXBT9qpotUnB0PCEc7IeTyjDok0=; b=io/vTQvOM11uTi00oT/lkf1RMFmw3HrE862xJHBPVzNre68vNXiU4hN2X1j6352SJk eSO//sJuYO9JAI3pnTAk7MonMERjFen6dka+gdX///i4DXC1tCeMpWiyrYr/KWBUaT+0 /GDzDgyEa93fJigIsTXMlXssEUb1BIy5eupk1c7PsceCV3FIGqeTGFUkLd2PLtX2fup0 YNclsVAM4dMQKOQku2m8DEXLMQVPin6j5G4tO+7+a1r5oAwKpnuUufRqKxf8TBRwVNOr sHeG2X9nuYQe/dCauXTJOidJbg76KnkM64Ddm5pUKeAc+O7SMyc2IjvDb+ZTNbWrSWND TaXg== X-Gm-Message-State: APjAAAXjTWlup3eXihuoUgzG+S9WrhX1tCns0N4UkMHmsrpv0IYgf5JS axCPJjbhN9o89p8Hh4sZXdVCAVEk X-Google-Smtp-Source: APXvYqy1hoF20pauo+Nf7KebetkMxrjdW2A/aPGTwV5+EnUe+ntXMesJbmGThB16t/ojxPlwrsrMcw== X-Received: by 2002:a5d:6b88:: with SMTP id n8mr4521273wrx.288.1578486778116; Wed, 08 Jan 2020 04:32:58 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 01/38] x86: Check for machine state object class before typecasting it Date: Wed, 8 Jan 2020 13:32:18 +0100 Message-Id: <1578486775-52247-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> References: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::435 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michal Privoznik Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Michal Privoznik In ed9e923c3c ("x86: move SMM property to X86MachineState", 2019-12-17) In v4.2.0-246-ged9e923c3c the SMM property was moved from PC machine class to x86 machine class. Makes sense, but the change was too aggressive: in target/i386/kvm.c:kvm_arch_init() it altered check which sets SMRAM if given machine has SMM enabled. The line that detects whether given machine object is class of PC_MACHINE was removed from the check. This makes qemu try to enable SMRAM for all machine types, which is not what we want. Signed-off-by: Michal Privoznik Fixes: ed9e923c3c ("x86: move SMM property to X86MachineState", 2019-12-17) Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <7cc91bab3191bfd7e071bdd3fdf7fe2a2991deb0.1577692822.git.mprivo= zn@redhat.com> Signed-off-by: Paolo Bonzini --- target/i386/kvm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/target/i386/kvm.c b/target/i386/kvm.c index 0b51190..7ee3202 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -2173,6 +2173,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s) } =20 if (kvm_check_extension(s, KVM_CAP_X86_SMM) && + object_dynamic_cast(OBJECT(ms), TYPE_X86_MACHINE) && x86_machine_is_smm_enabled(X86_MACHINE(ms))) { smram_machine_done.notify =3D register_smram_listener; qemu_add_machine_init_done_notifier(&smram_machine_done); --=20 1.8.3.1 From nobody Fri May 17 15:28:08 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578486886; cv=none; d=zohomail.com; s=zohoarc; b=Ho28QWsGEgny2Bx4IgFeCeADXfcwPKMyyggM9RqENIGHvfkhr8mGBbAINXmIsMJnvosvmAXOzh+7xBj1oFM20G1ykCy0olPDIrBV/Q73IPbNrqVkN3sh1M7hDmxp/B7WlICEcNp/5jgSBRmxx6ZLSHiL/uFjE8sn6wmJoScapn4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578486886; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=Gy9btQ6/hiFDb+yxtplkQokqmOK4xY8N+OZWF2JIRzg=; b=Vxj/J45tZcftIIST2tZrf5IgDaMrqGZtzLw3hAEyTAbG81N6SCsOffMiN1yvWo5MT0379plwGIT5xyuFn7QhJgYeN5VckMYbQpirp4F3WT8L9SNnCTnlAaQeRAPax1ZiTreFshCUT8nMmRqCdK/cJ33QADVzxllsqcCMHV7oNMA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578486886464725.5023715762286; Wed, 8 Jan 2020 04:34:46 -0800 (PST) Received: from localhost ([::1]:42802 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAXs-0005II-6K for importer@patchew.org; Wed, 08 Jan 2020 07:34:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60200) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAWD-0003ZN-Uz for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipAWC-0004CF-JV for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:01 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:36677) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipAWC-0004Bg-D1 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:00 -0500 Received: by mail-wm1-x32d.google.com with SMTP id p17so2323114wma.1 for ; Wed, 08 Jan 2020 04:33:00 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id o4sm4037750wrw.97.2020.01.08.04.32.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 04:32:58 -0800 (PST) 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=Gy9btQ6/hiFDb+yxtplkQokqmOK4xY8N+OZWF2JIRzg=; b=uVAAq1O5zbSUP4gUAYETzx/Q1eW++7FFfF1E7r9RL4hvDqaLlY2ynJSlOhKZYCc+8e xLXzS8pQ5CNs8PecKzp7lCPVDS9DZ/LI745N6iXvw7/hkAMcr1Y8OlJ0lsvOEXc/5EFa 3vyukwO+D5yy6ht18JdKVthcI/4f90oxMTXpnH5DSKUbOaaFx9O9/6R5blFbs+CyyCVe L7MsWdQIy5zvhUd0nDmWXd8xHMp6mNhDmtQpicYpW+ewoHCYbS3WbtX/EsMq1OXPIXcy 0IawvP3TOjuNS7N/2zVBbSnPEzP70YcyRudNUC03wcNXPur94v8ARpI7lf6axZa+WfFQ MAkg== 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=Gy9btQ6/hiFDb+yxtplkQokqmOK4xY8N+OZWF2JIRzg=; b=QRUq4WInDq1zCFrIBwoeC1GxbyTI/lcEdfYE7+iIYD2XPxJXkmdUTw1ol/kmZ4xt2b evt6uF7LYsIL1SQ0tqWV9cDKGf2mmI0SMZv2FwHo0VtDyzeYbshYbQOuba1C7sLuvQRP dGhuPEL61bYS3z+hd0vcOLz3BWSmarqAETq8FythYeZ84zN7zQKWO4gpX10cMp8rYjUy 10BQ08mBsj+KT0jWIMlp5vFbFfRcobIm8JbeI0M3BWH/xUJA8StLZey6m04AntqhBDBK xhk+OJKZFzMHTlhLuoAPLHa77xF2Gv71bxZPffZRbx5FM/EFyoRAVWhoRVsPOIciiT4Q Xwaw== X-Gm-Message-State: APjAAAUV5bAuYdvrGA6P7e6oqjUc7ET9uQDYYNKhwNz5mJh7nS/VUJKA hgFAQuvYayvOp5uLFX2L50rpS4eh X-Google-Smtp-Source: APXvYqxnaRJGuAXC10yDrED+U3B6O/guHPlCxhLbplE72TC6qq7sGS2xCsVqacVfX6DoqVzL+PV0Ww== X-Received: by 2002:a05:600c:22d3:: with SMTP id 19mr3525935wmg.92.1578486779147; Wed, 08 Jan 2020 04:32:59 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 02/38] accel/kvm: Make "kernel_irqchip" default on Date: Wed, 8 Jan 2020 13:32:19 +0100 Message-Id: <1578486775-52247-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> References: <1578486775-52247-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:4864:20::32d X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Xiaoyao Li Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Xiaoyao Li Commit 11bc4a13d1f4 ("kvm: convert "-machine kernel_irqchip" to an accelerator property") moves kernel_irqchip property from "-machine" to "-accel kvm", but it forgets to set the default value of kernel_irqchip_allowed and kernel_irqchip_split. Also cleaning up the three useless members (kernel_irqchip_allowed, kernel_irqchip_required, kernel_irqchip_split) in struct MachineState. Fixes: 11bc4a13d1f4 ("kvm: convert "-machine kernel_irqchip" to an accelera= tor property") Reported-by: Vitaly Kuznetsov Signed-off-by: Xiaoyao Li Message-Id: <20191228104326.21732-1-xiaoyao.li@intel.com> Signed-off-by: Paolo Bonzini --- accel/kvm/kvm-all.c | 19 +++++++++++++------ include/hw/boards.h | 3 --- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index b2f1a5b..1ada2f4 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -98,7 +98,7 @@ struct KVMState int kvm_shadow_mem; bool kernel_irqchip_allowed; bool kernel_irqchip_required; - bool kernel_irqchip_split; + OnOffAuto kernel_irqchip_split; bool sync_mmu; bool manual_dirty_log_protect; /* The man page (and posix) say ioctl numbers are signed int, but @@ -1783,6 +1783,7 @@ static void kvm_irqchip_create(KVMState *s) { int ret; =20 + assert(s->kernel_irqchip_split !=3D ON_OFF_AUTO_AUTO); if (kvm_check_extension(s, KVM_CAP_IRQCHIP)) { ; } else if (kvm_check_extension(s, KVM_CAP_S390_IRQCHIP)) { @@ -1799,7 +1800,7 @@ static void kvm_irqchip_create(KVMState *s) * in-kernel irqchip for us */ ret =3D kvm_arch_irqchip_create(s); if (ret =3D=3D 0) { - if (s->kernel_irqchip_split) { + if (s->kernel_irqchip_split =3D=3D ON_OFF_AUTO_ON) { perror("Split IRQ chip mode not supported."); exit(1); } else { @@ -2070,6 +2071,10 @@ static int kvm_init(MachineState *ms) goto err; } =20 + if (s->kernel_irqchip_split =3D=3D ON_OFF_AUTO_AUTO) { + s->kernel_irqchip_split =3D mc->default_kernel_irqchip_split ? ON_= OFF_AUTO_ON : ON_OFF_AUTO_OFF; + } + if (s->kernel_irqchip_allowed) { kvm_irqchip_create(s); } @@ -3005,17 +3010,17 @@ static void kvm_set_kernel_irqchip(Object *obj, Vis= itor *v, case ON_OFF_SPLIT_ON: s->kernel_irqchip_allowed =3D true; s->kernel_irqchip_required =3D true; - s->kernel_irqchip_split =3D false; + s->kernel_irqchip_split =3D ON_OFF_AUTO_OFF; break; case ON_OFF_SPLIT_OFF: s->kernel_irqchip_allowed =3D false; s->kernel_irqchip_required =3D false; - s->kernel_irqchip_split =3D false; + s->kernel_irqchip_split =3D ON_OFF_AUTO_OFF; break; case ON_OFF_SPLIT_SPLIT: s->kernel_irqchip_allowed =3D true; s->kernel_irqchip_required =3D true; - s->kernel_irqchip_split =3D true; + s->kernel_irqchip_split =3D ON_OFF_AUTO_ON; break; default: /* The value was checked in visit_type_OnOffSplit() above. If @@ -3038,7 +3043,7 @@ bool kvm_kernel_irqchip_required(void) =20 bool kvm_kernel_irqchip_split(void) { - return kvm_state->kernel_irqchip_split; + return kvm_state->kernel_irqchip_split =3D=3D ON_OFF_AUTO_ON; } =20 static void kvm_accel_instance_init(Object *obj) @@ -3046,6 +3051,8 @@ static void kvm_accel_instance_init(Object *obj) KVMState *s =3D KVM_STATE(obj); =20 s->kvm_shadow_mem =3D -1; + s->kernel_irqchip_allowed =3D true; + s->kernel_irqchip_split =3D ON_OFF_AUTO_AUTO; } =20 static void kvm_accel_class_init(ObjectClass *oc, void *data) diff --git a/include/hw/boards.h b/include/hw/boards.h index 61f8bb8..fb1b43d 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -271,9 +271,6 @@ struct MachineState { =20 /*< public >*/ =20 - bool kernel_irqchip_allowed; - bool kernel_irqchip_required; - bool kernel_irqchip_split; char *dtb; char *dumpdtb; int phandle_start; --=20 1.8.3.1 From nobody Fri May 17 15:28:08 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578486893; cv=none; d=zohomail.com; s=zohoarc; b=X84+e6hRDeiEjmpLT7olf1D8owQtZI0Ds8MNF4ChRrH5RYuwNc6gVcRFIJUATPZcWD06lZTVCq4cIPP/vbbKCzFzEBZwj6Um9UU830pt0pbUk75xByCQYjl/fw1XcV0pkqH3C8M6uhPHnofVVANv+v5IiHcUtQBr+v4emPDx0Fc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578486893; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=UqcGASlTCMJvprrArRFDwqMRetNCkLLbCVZeMkPWPJg=; b=SGcOSiMPTo/M/eUi6679sqXpdy7yCEUuHj34kLKjn2p2aOqLyRsO5C5htt50jf17N93eLPpY0Ec+PIybdrgTk1z4CsUDZrhKU8mihwEdKZVSYfPSrYktqceScnsayINvzmA1oE0Jy0LW/8Kmtge8MQM8ys1yZZ+frPVswZfVlhg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578486893143716.1266939987241; Wed, 8 Jan 2020 04:34:53 -0800 (PST) Received: from localhost ([::1]:42806 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAXz-0005SQ-UI for importer@patchew.org; Wed, 08 Jan 2020 07:34:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60208) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAWE-0003ZT-Ha for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipAWD-0004Cu-Fc for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:02 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:54053) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipAWD-0004CT-A5 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:01 -0500 Received: by mail-wm1-x32f.google.com with SMTP id m24so2289955wmc.3 for ; Wed, 08 Jan 2020 04:33:01 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id o4sm4037750wrw.97.2020.01.08.04.32.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 04:32:59 -0800 (PST) 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=UqcGASlTCMJvprrArRFDwqMRetNCkLLbCVZeMkPWPJg=; b=RdP17KFj2BiPki7Bf5fmZctgh+lPGAjGZEPJvapioRSAPV6h28o/7eSDbSqXDoTJq/ ftKdNYpL5FXE9XFQ5TTVAAdu2WRedc0mmGkoPYS/eKX8FbOiX3vNs81yJ0SBKHpGV57K 7LPIaUtyCVih9nv4t9r6M79EWWCGmhLObIoVSciECgprZxjzUB5NZSzT59n9YXtYZraL ONVOMj2d6GUOAP7DCnnuHdCNrQpRzPS1tRj5H5GL+EgKPrgf5bcWffCFBU61dg0CddJ+ wGoXBl3TLCtAcVXJxuW+kQpaWazo04AspqqblzeKGlVvDuePxC+6TsbZds0c0naVe+VM YqZw== 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=UqcGASlTCMJvprrArRFDwqMRetNCkLLbCVZeMkPWPJg=; b=fBck4D3UkEDOW+QCDNx9KmXs3dimwml5y8HTMJjSGCfqvnNCaqeaSGVWl+IRONIT61 EqPp7VBCbb7H9YblG2mC8yLnsTYQqS/O3jeN/Q9Ru7VNcadfHK2ctoICoqvfbzCSGHUY riRDib7Fr3QodbMNX69SROqSdsHb0bEOSeOTdr+UdLGjg2Ge28l+QLvQQDUAQu5lnoHK M2SJW8lsb3Cda+nsNLUhJtvF4fos9OqDJ4Rzs8zzRgBmU/EcCl0kaj7j/Li2BcmGcX+K Y4XLAZ4zjg+Tv0wpT+mcPaAehQSMFuVTd8IU1VNC0KZ4+kx+XLf+lJ0SbgYkZH3jOxt/ JAJQ== X-Gm-Message-State: APjAAAWRZDZGbkPQ27aOw9w3/6CY0PZuPgc5NS9yqh07uY3f/+AC29Ou 52e3wSUBKoeJtJs2upLGJQpSljAr X-Google-Smtp-Source: APXvYqxmicQnUXWkSI7oXTTYVPD73FLc7DvpqSJtd9QpksqCGH5Mew0avrk3DwUrRj+s16tw1KLYRA== X-Received: by 2002:a1c:720a:: with SMTP id n10mr3522271wmc.74.1578486780149; Wed, 08 Jan 2020 04:33:00 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 03/38] hw: fix using 4.2 compat in 5.0 machine types for i440fx/q35 Date: Wed, 8 Jan 2020 13:32:20 +0100 Message-Id: <1578486775-52247-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> References: <1578486775-52247-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:4864:20::32f X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Denis Plotnikov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Denis Plotnikov 5.0 machine type uses 4.2 compats. This seems to be incorrect, since the latests machine type by now is 5.0 and it should use its own compat or shouldn't use any relying on the defaults. Seems, like this appeared because of some problems on merge/rebase. Signed-off-by: Denis Plotnikov Reviewed-by: Cornelia Huck Reviewed-by: Igor Mammedov Message-Id: <20191223072856.5369-1-dplotnikov@virtuozzo.com> Signed-off-by: Paolo Bonzini --- hw/i386/pc_piix.c | 1 - hw/i386/pc_q35.c | 1 - 2 files changed, 2 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 721c7aa..fa12203 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -425,7 +425,6 @@ static void pc_i440fx_5_0_machine_options(MachineClass = *m) m->alias =3D "pc"; m->is_default =3D 1; pcmc->default_cpu_version =3D 1; - compat_props_add(m->compat_props, hw_compat_4_2, hw_compat_4_2_len); } =20 DEFINE_I440FX_MACHINE(v5_0, "pc-i440fx-5.0", NULL, diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 52f4573..84cf925 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -354,7 +354,6 @@ static void pc_q35_5_0_machine_options(MachineClass *m) pc_q35_machine_options(m); m->alias =3D "q35"; pcmc->default_cpu_version =3D 1; - compat_props_add(m->compat_props, hw_compat_4_2, hw_compat_4_2_len); } =20 DEFINE_Q35_MACHINE(v5_0, "pc-q35-5.0", NULL, --=20 1.8.3.1 From nobody Fri May 17 15:28:08 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578487038; cv=none; d=zohomail.com; s=zohoarc; b=cWYekTlVVfRHg+iMJrA5593NlBjuKkjYBw5yqNnrQQV0ZN0mIE2iyoX0u++C42a6w+DJr9HxDh/DDu75qL93ekFslcYOCp3VWn2sch6baieUnlnPBEe1h2Uw3PLgy42mdBic7Lv9tX7zfFOhWh0+B6wnXMooFOyfUn3EwOJUYjY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578487038; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=nB7ia0X/j64Wf1GK1SEbzmS3pheCsvBwIJ/lbjlWJeo=; b=CkdYfZCwIRmb56yXExRJWdbyiZ2ruFMTrx925tQ/PMfqxfUFdVOnFR9qkFMWhYY7SxMe+yCQlY3yLY8eoqkJ6DPCoMr3JbuVa+sqEjDfs0Wx44foxD04J6gFcVbQcqV1TbKYG/Zci55Soj9hKOl6yK1QSp0kFwCaeeHgPCO2cos= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578487038806504.81822106016364; Wed, 8 Jan 2020 04:37:18 -0800 (PST) Received: from localhost ([::1]:42848 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAaL-0000Rq-DS for importer@patchew.org; Wed, 08 Jan 2020 07:37:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60223) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAWF-0003Zj-L8 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipAWE-0004DV-Ko for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:03 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:50267) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipAWE-0004D9-F5 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:02 -0500 Received: by mail-wm1-x331.google.com with SMTP id a5so2310457wmb.0 for ; Wed, 08 Jan 2020 04:33:02 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id o4sm4037750wrw.97.2020.01.08.04.33.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 04:33:00 -0800 (PST) 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=nB7ia0X/j64Wf1GK1SEbzmS3pheCsvBwIJ/lbjlWJeo=; b=A9UOv0Rh07AQvZPYE5UgAo+z6hG4/gZ1i0hDbi7o53jIWjTtMW4E6BQjUW3ScpYsUd qPrAYAIo3NR0pDNPRZrGy+JvAwYdfEVA5yga0hQLMBYlMPc44qF0SY9wgi4f44q/Aejb 3FPEh7ReXOBnWm+x1w9aGBc3V4vs/yazL1JeVF+Pq7CiNNrVglEzmindr3QPG+05I9yw Fic3FB5r1Yo+uoy4fNNyyPpyry8AbY8ZRTU7KYopymIPRez+XA+C0EJCSO5/pAcZBENk FYSrtTS4qr0ht6AoKXEe0sVmcPCr7/r1X0QP9aP4m8eC9gZ5uuj4IaasdjLnQShp5201 qmMA== 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=nB7ia0X/j64Wf1GK1SEbzmS3pheCsvBwIJ/lbjlWJeo=; b=dlRUt0iYElb2RGFHibN8G1i5K1w79l4y1ikE6XDdNVHwtxv4aZP7J1tkWF2jBFC23r 7126HX1B7/3NVcMYo+3HixQQgOZJ92mN366oZO/E1STp+lEbIAXKGoB9/cjlxMA4aTdP o8S+VB1dZrB4rtk7Jlg2JXlgsdNEtqZ4s8fuLpqjk+7N6LpB7yRoCLMlAVEKaTX+jUix XQLhtge19CN8UfnN/41mkp4CIgDXiHDB2YQU3JJo6v3Gy3QRzxPipg5VOC1LseZioeAY ucn3a8xcuFMqFKxF3g50ji5aDLre/dQdZhijE/D/hYmgqGyaDVt4QjT8hOaF4gZJcv23 lHfQ== X-Gm-Message-State: APjAAAW1qmQTGxVMc7DFK1EqUw7UDKX4V09jLwXJZ13medeI8ecR3hLj X5ikj6z7fiaFT17bdEEZJaiakSv/ X-Google-Smtp-Source: APXvYqzGh8CltuSge9Gks249GnW4NCTndUoUIjro0Op7rNAvvKH+Qb/mZG0CK3PnogpJsap43qjV+A== X-Received: by 2002:a1c:4144:: with SMTP id o65mr3731323wma.81.1578486780979; Wed, 08 Jan 2020 04:33:00 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 04/38] replay: check other timers for icount limit Date: Wed, 8 Jan 2020 13:32:21 +0100 Message-Id: <1578486775-52247-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> References: <1578486775-52247-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:4864:20::331 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pavel Dovgalyuk , Pavel Dovgalyuk Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Pavel Dovgalyuk Record/replay can stall when there are no virtual devices that generate events - it just uses all the time for vCPU thread. Therefore main loop has to wait too much for the vCPU thread, because they are synchronized in rr mode. This patch does not let creating too long vCPU executions without interrupting to main loop. It checks realtime timers that always exits to control user input. Signed-off-by: Pavel Dovgalyuk Message-Id: <157675958855.14346.18049977447896411847.stgit@pasha-Precision-= 3630-Tower> Signed-off-by: Paolo Bonzini --- cpus.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cpus.c b/cpus.c index b472378..be2d655 100644 --- a/cpus.c +++ b/cpus.c @@ -1316,6 +1316,10 @@ static int64_t tcg_get_icount_limit(void) */ deadline =3D qemu_clock_deadline_ns_all(QEMU_CLOCK_VIRTUAL, QEMU_TIMER_ATTR_ALL); + /* Check realtime timers, because they help with input processing = */ + deadline =3D qemu_soonest_timeout(deadline, + qemu_clock_deadline_ns_all(QEMU_CLOCK_REALTIME, + QEMU_TIMER_ATTR_ALL)); =20 /* Maintain prior (possibly buggy) behaviour where if no deadline * was set (as there is no QEMU_CLOCK_VIRTUAL timer) or it is more= than --=20 1.8.3.1 From nobody Fri May 17 15:28:08 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578487354; cv=none; d=zohomail.com; s=zohoarc; b=FYBA9ZzcGENYaoOQGyn+RSAvONRNzLXYV6LIX9ntIRogsHX4+eZNrJbwN0smPcA8isp9uX7YyH+kjROKj0LboMHzUEGnNkyZUz7Lz2edOMJqBv3gZb2zw0UHXoS7dyyb8LH5hkQyAFjVcj/j8jOmk/znQODQLPhCFVM3rWLgj+M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578487354; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=agawO6TXQ8QKofPYWK1JN+cVyKSPsslwSY+orcmanTg=; b=ItHExfj8p9BYG3MT4eyIGViBuHL9bCXqF1HO1yOfcZ19TNbrP5DU3l51CyBMPH0F1fVOu/sXBvCHWXLGQXcrGeiLXMNi5QsX4VYcLVmZaFyKtgGZHV4xjIiAZ/skP3MSBHQCygXPJZ/rJngU87uLX+W7ZjLzjJjEoEj+MEdw+iA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 157848735445149.0350727996655; Wed, 8 Jan 2020 04:42:34 -0800 (PST) Received: from localhost ([::1]:42920 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAfQ-0000LH-Qg for importer@patchew.org; Wed, 08 Jan 2020 07:42:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60242) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAWH-0003b5-7Z for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipAWF-0004EK-Qq for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:05 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:33332) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipAWF-0004Dp-KJ for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:03 -0500 Received: by mail-wr1-x42e.google.com with SMTP id b6so3248440wrq.0 for ; Wed, 08 Jan 2020 04:33:03 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id o4sm4037750wrw.97.2020.01.08.04.33.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 04:33:01 -0800 (PST) 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=agawO6TXQ8QKofPYWK1JN+cVyKSPsslwSY+orcmanTg=; b=DKSMcsPgSjpTuZpo+8ShGEF30gQ/WwN0TeasPiEiXKoDNRo2SEZHm89bULv1+2eXmS gClbr+j+YtCx/lvwLELXCE8Wntz++78EPuyA988bgnX1Mn+oT5U+eXpZruAsMw1s/XaD 1tIU67bbtgClEyanO+A6EkTSaf//usFGfp/mzvALpu/lSZ9yjIT6DR0KH6GP/E9uvj+e smJNZlBQZ0AeiCKhiUQobx+plrIjSyW9gLMLdUo5/VENSUFhkTWthwIYyvd8w9Zs35U1 50Q+bbc4HT9aPg9Eg8rH8eQxlc+CmSpkLeq7pvAcPv+nStiktwKdkvodElTn7ROFR9e4 neTQ== 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=agawO6TXQ8QKofPYWK1JN+cVyKSPsslwSY+orcmanTg=; b=SoAOt5ad0qkhzt3US6jjRnJmpNySRnWssnnEbnY3VrzYiMIdaJsPc1jp7EckjuRJjF 7nqQZ4V+oKcuXiwqcbO7tTsW5ip43hjdsn/8gqIZzlB7wOhq0WwOAECZNAYJEBrMgRGq OR+v25T5GhZDA5qnUJ7i38DJJSiOtRvXS9AspU3TfqJntI73Oa1DckttrmMhuLF7/py6 6ZWzdinWlfliPMSGqCadvnPDn137PSLTwYXf5zQA1WZTJfJ+0+0zycz/KVDKbZ3k4sle yhe+uivdOW9XPBa0tXTMqJhFjFsmHjHlv1GGpLy2Sp9pGrDG3oi2RYlTV+a5fDyp+NV4 jcCQ== X-Gm-Message-State: APjAAAVmcoco41vZEkFa5b+1F8cOXc1v140jV0FBSaCwRwDTMCDb947g vQ1A2hhdbe3Y2wR3UwdlDW96a+X3 X-Google-Smtp-Source: APXvYqwxR8dT45kjmEIyWjPVD9ZCaGrk+F8DCaYI37Ou+6lPMnLUXHGQGyEdczreTNHlD8M8YAWe3A== X-Received: by 2002:adf:fa12:: with SMTP id m18mr4116583wrr.309.1578486782175; Wed, 08 Jan 2020 04:33:02 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 05/38] replay: record and replay random number sources Date: Wed, 8 Jan 2020 13:32:22 +0100 Message-Id: <1578486775-52247-6-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> References: <1578486775-52247-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:4864:20::42e X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pavel Dovgalyuk , Pavel Dovgalyuk Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Pavel Dovgalyuk Record/replay feature of icount allows deterministic running of execution scenarios. Some CPUs and peripheral devices read random numbers from external sources making deterministic execution impossible. This patch adds recording and replaying of random read operations into guest-random module, which is used by the virtual hardware. Signed-off-by: Pavel Dovgalyuk Message-Id: <157675984852.14505.15709141760677102489.stgit@pasha-Precision-= 3630-Tower> Signed-off-by: Paolo Bonzini --- docs/replay.txt | 1 + include/sysemu/replay.h | 7 +++++++ replay/Makefile.objs | 3 ++- replay/replay-internal.h | 2 ++ replay/replay-random.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ replay/replay.c | 2 +- stubs/replay.c | 9 +++++++++ util/guest-random.c | 13 +++++++++++-- 8 files changed, 77 insertions(+), 4 deletions(-) create mode 100644 replay/replay-random.c diff --git a/docs/replay.txt b/docs/replay.txt index ce97c3f..f4619a6 100644 --- a/docs/replay.txt +++ b/docs/replay.txt @@ -67,6 +67,7 @@ Modifications of qemu include: * network filter for recording and replaying the packets * block driver for making block layer deterministic * serial port input record and replay + * recording of random numbers obtained from the external sources =20 Locking and thread synchronisation ---------------------------------- diff --git a/include/sysemu/replay.h b/include/sysemu/replay.h index 8df5172..5471bb5 100644 --- a/include/sysemu/replay.h +++ b/include/sysemu/replay.h @@ -117,6 +117,13 @@ int64_t replay_read_clock(ReplayClockKind kind); ? replay_save_clock((clock), (value), cpu_get_icount_raw_locke= d()) \ : (value)) =20 +/* Processing data from random generators */ + +/* Saves the values from the random number generator */ +void replay_save_random(int ret, void *buf, size_t len); +/* Loads the saved values for the random number generator */ +int replay_read_random(void *buf, size_t len); + /* Events */ =20 /*! Called when qemu shutdown is requested. */ diff --git a/replay/Makefile.objs b/replay/Makefile.objs index cee6539..939be96 100644 --- a/replay/Makefile.objs +++ b/replay/Makefile.objs @@ -6,4 +6,5 @@ common-obj-y +=3D replay-input.o common-obj-y +=3D replay-char.o common-obj-y +=3D replay-snapshot.o common-obj-y +=3D replay-net.o -common-obj-y +=3D replay-audio.o \ No newline at end of file +common-obj-y +=3D replay-audio.o +common-obj-y +=3D replay-random.o diff --git a/replay/replay-internal.h b/replay/replay-internal.h index 55fca1a..33ac551 100644 --- a/replay/replay-internal.h +++ b/replay/replay-internal.h @@ -34,6 +34,8 @@ enum ReplayEvents { EVENT_AUDIO_OUT, /* for audio in event */ EVENT_AUDIO_IN, + /* for random number generator */ + EVENT_RANDOM, /* for clock read/writes */ /* some of greater codes are reserved for clocks */ EVENT_CLOCK, diff --git a/replay/replay-random.c b/replay/replay-random.c new file mode 100644 index 0000000..afc7a0f --- /dev/null +++ b/replay/replay-random.c @@ -0,0 +1,44 @@ +/* + * replay-random.c + * + * Copyright (c) 2010-2020 Institute for System Programming + * of the Russian Academy of Sciences. + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + * + */ + +#include "qemu/osdep.h" +#include "qemu/error-report.h" +#include "sysemu/replay.h" +#include "replay-internal.h" + +void replay_save_random(int ret, void *buf, size_t len) +{ + g_assert(replay_mutex_locked()); + + replay_save_instructions(); + replay_put_event(EVENT_RANDOM); + replay_put_dword(ret); + replay_put_array(buf, len); +} + +int replay_read_random(void *buf, size_t len) +{ + int ret =3D 0; + g_assert(replay_mutex_locked()); + + replay_account_executed_instructions(); + if (replay_next_event_is(EVENT_RANDOM)) { + size_t buf_size =3D 0; + ret =3D replay_get_dword(); + replay_get_array(buf, &buf_size); + replay_finish_event(); + g_assert(buf_size =3D=3D len); + } else { + error_report("Missing random event in the replay log"); + exit(1); + } + return ret; +} diff --git a/replay/replay.c b/replay/replay.c index 5cc25bd..706c7b4 100644 --- a/replay/replay.c +++ b/replay/replay.c @@ -22,7 +22,7 @@ =20 /* Current version of the replay mechanism. Increase it when file format changes. */ -#define REPLAY_VERSION 0xe02008 +#define REPLAY_VERSION 0xe02009 /* Size of replay log header */ #define HEADER_SIZE (sizeof(uint32_t) + sizeof(uint64_t)) =20 diff --git a/stubs/replay.c b/stubs/replay.c index 10b3925..5974ec1 100644 --- a/stubs/replay.c +++ b/stubs/replay.c @@ -79,3 +79,12 @@ void replay_mutex_lock(void) void replay_mutex_unlock(void) { } + +void replay_save_random(int ret, void *buf, size_t len) +{ +} + +int replay_read_random(void *buf, size_t len) +{ + return 0; +} diff --git a/util/guest-random.c b/util/guest-random.c index 9453968..086115b 100644 --- a/util/guest-random.c +++ b/util/guest-random.c @@ -14,6 +14,7 @@ #include "qapi/error.h" #include "qemu/guest-random.h" #include "crypto/random.h" +#include "sysemu/replay.h" =20 =20 static __thread GRand *thread_rand; @@ -44,13 +45,21 @@ static int glib_random_bytes(void *buf, size_t len) =20 int qemu_guest_getrandom(void *buf, size_t len, Error **errp) { + int ret; + if (replay_mode =3D=3D REPLAY_MODE_PLAY) { + return replay_read_random(buf, len); + } if (unlikely(deterministic)) { /* Deterministic implementation using Glib's Mersenne Twister. */ - return glib_random_bytes(buf, len); + ret =3D glib_random_bytes(buf, len); } else { /* Non-deterministic implementation using crypto routines. */ - return qcrypto_random_bytes(buf, len, errp); + ret =3D qcrypto_random_bytes(buf, len, errp); + } + if (replay_mode =3D=3D REPLAY_MODE_RECORD) { + replay_save_random(ret, buf, len); } + return ret; } =20 void qemu_guest_getrandom_nofail(void *buf, size_t len) --=20 1.8.3.1 From nobody Fri May 17 15:28:08 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578487192; cv=none; d=zohomail.com; s=zohoarc; b=JeyXrYCDFKP8heQEZ3AHGBMPQxC3+EH1eoqU4u+6zdzN31oDZ7FvfRPeubVDYkibdwLcuI5IpxtOjMviAq0VvGi9304pKUVSXNukfjUOtqc0XXMSifDH2PRNvh8qPrv04CMh/EVPpHXX1hZjfSQARbjMn6NfRJTv+ynRHJqVPIM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578487192; h=Content-Type:Content-Transfer-Encoding:Cc: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=NqwSzhoujF6+WywSNH6TKtDufZjSTHCCK+sRGZfnoPY=; b=LavCBfBJUZMcE9pJ1gp9X6ZRTq0p0gxg6KGmwhlu9c/RNCVrN3+C6nyFPaJGU8jJDuVCOR9NJBN+AyanmVx/LyX/a42IjlWFb7ebuBgBZsCw/DqxhQeqGytiRnLShnLgR+VT9OaZZG5V0Kb6h5iynaJvRxx/rZ5EbhCTiCHBlIg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578487192602176.24805200662377; Wed, 8 Jan 2020 04:39:52 -0800 (PST) Received: from localhost ([::1]:42880 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAco-00053n-O5 for importer@patchew.org; Wed, 08 Jan 2020 07:39:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60245) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAWH-0003bm-Ls for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipAWG-0004Ep-Mw for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:05 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:35591) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipAWG-0004ER-H4 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:04 -0500 Received: by mail-wm1-x332.google.com with SMTP id p17so2337011wmb.0 for ; Wed, 08 Jan 2020 04:33:04 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id o4sm4037750wrw.97.2020.01.08.04.33.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 04:33:02 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=NqwSzhoujF6+WywSNH6TKtDufZjSTHCCK+sRGZfnoPY=; b=DAZxXj7gnqOqrfE2txCQIkjez8OwjzF0b4VDAcJV+BK0p/zKjgDmbIPl3iAVwr2odH Oi1QV60/xLcpEcbtmJR5vsnYjG0ISNiHdSqeUELZzCn3RCl9wuO8WafqhNM8hnUGnICv 64vFFp7cWrrhE2q8zt/cL2X4nepeCQ1VhA8WjIRCZPRdlrfkXnhPmaX1LtT7/86pun+s R9pRwWlti6j60ri9TxMKcI9X+axqM0br/I6c997j+6CsWhYEiWZRbeqx5TIbIOaqlc81 TUnQJAjB86ZO/5tpafe+22ujXfnQhN1wFNVALRyQvaWdyTvLoU8kO5srNcsRC6o5eNpS cwUw== 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:mime-version:content-transfer-encoding; bh=NqwSzhoujF6+WywSNH6TKtDufZjSTHCCK+sRGZfnoPY=; b=TRHyPHroTB0FFV51XkTFF3XA2gmKdcHEF4crP53nfqhKZWaqAX0hVFHvfmcAU9MZXe wNN+78UMM2k/WC5mgmNZHJcs9TKorsXdo7+m6flav4n7e3nD80XHs1utU3Y6I02kTKTb WxIWmqQEtxKaGFr71o3wiDJKGSY7EXkRmlpumLavB1x/Mo9dpUeSQtqBIqjQuB6O/vcR +aGaa1U2K3fV1Ak2bIgB3SlM6bLpbPKWoNzF1Vnw0WCyHM1RR3BAeCJpqPGwF0l1pjf7 0YnqNWBwTa0o4IDBL+9L0GGU/uara4ZgNAce8+1pcv3GuRRaQFK8fSY3xqgFWIcJP3oY B15g== X-Gm-Message-State: APjAAAX1BPpbtHlu5qg7QU6p/idejsuYgrtoMdO32NACXzGN5CHnCnhK nKyYXfghhKS4va1EnXuMwR0Siu20 X-Google-Smtp-Source: APXvYqz200Eevm7NCYaOAYm6y77rg31Vk2H3dLaoxIZlhvcH3sb9+hHAyOLTCwA1UaHhfdzv1th7ow== X-Received: by 2002:a1c:9c87:: with SMTP id f129mr3547620wme.26.1578486783328; Wed, 08 Jan 2020 04:33:03 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 06/38] hw/i386/x86-iommu: Add missing stubs Date: Wed, 8 Jan 2020 13:32:23 +0100 Message-Id: <1578486775-52247-7-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> References: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::332 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 In commit 6c730e4af9 we introduced a stub to build the MicroVM machine without Intel IOMMU. This stub is incomplete for the other PC machines. Add the missing stubs. Fixes: 6c730e4af9 ("pc: stubify x86 iommu", 2019-12-17) Reported-by: Travis-CI Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20191220154225.25879-1-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- hw/i386/x86-iommu-stub.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hw/i386/x86-iommu-stub.c b/hw/i386/x86-iommu-stub.c index 03576cd..c5ba077 100644 --- a/hw/i386/x86-iommu-stub.c +++ b/hw/i386/x86-iommu-stub.c @@ -32,3 +32,12 @@ X86IOMMUState *x86_iommu_get_default(void) return NULL; } =20 +bool x86_iommu_ir_supported(X86IOMMUState *s) +{ + return false; +} + +IommuType x86_iommu_get_type(void) +{ + abort(); +} --=20 1.8.3.1 From nobody Fri May 17 15:28:08 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578487518; cv=none; d=zohomail.com; s=zohoarc; b=kKIl5YGRZqgIHVgR4vwNF+fsUGGDJtREsLk5mLZ6q64YC5cE3H3kah7wpJZBwyrVQmb93nQXUWjBE7rDCzWCDFNd0f9wHdxFEijTTAxz36hajOqUtyBCU6UK5WIYE0bh3dkq765k1jpqBi7AkNsv8UySKm3SE0Zao/Vk0upCDgk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578487518; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=xX2tRJTI+oPA1urf0BIrcVPxBfzc8Z7IkhMGTh2h8oY=; b=kRPneIWJk63h5nydn8xRKEXB+pe3BUpF8VtPAq1YCdXi6gf3ONqfA3BBINuyg7V/MBxSdnUlgflicKEXWDlWeBBki6Bkyr+ZBAkbB5CZDvwQFjMndxlnKE89ckMIcxxf2e5s/OEdfu8lIyeSwh7i/yWaV7aFY7Xy/opwS81sn4c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 157848751834372.20921066333312; Wed, 8 Jan 2020 04:45:18 -0800 (PST) Received: from localhost ([::1]:42952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAi4-0004Jx-Fy for importer@patchew.org; Wed, 08 Jan 2020 07:45:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60262) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAWI-0003dF-Py for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipAWH-0004FW-J8 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:06 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:35421) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipAWH-0004Ev-DB; Wed, 08 Jan 2020 07:33:05 -0500 Received: by mail-wm1-x341.google.com with SMTP id p17so2337044wmb.0; Wed, 08 Jan 2020 04:33:05 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id o4sm4037750wrw.97.2020.01.08.04.33.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 04:33:03 -0800 (PST) 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=xX2tRJTI+oPA1urf0BIrcVPxBfzc8Z7IkhMGTh2h8oY=; b=oubnBGzoqJYXygw7vH57BllD6KPV4kb4x8fvEpf5gDT+wzXnbIlLHmQ0q0wzVgEDCL sTkYMUnZuNrmobxqKgRN+KrTUmzMmk6HfA0dMKonvuG0/hjX94h40Pmnctxfh0VxTdPW N1onMvS1V024XP5NuOKmSB0FkMmJIuSzWEDLVWKw7hgwPxXVvdwjPVPtlUoZO5MaaIoy /O7rzudjqI5n3+dIWb4ei9wgBK3Sgx76PzQuD+OKGFVXlZr969sPWaI87YiZEA5E0QTJ zmqjpDEXJsXWovR2fKLz/FMuGZEvOy7slSKEh9lpUCaNpw7r/1dO7hnYAVgl91SoCyxc ND6g== 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=xX2tRJTI+oPA1urf0BIrcVPxBfzc8Z7IkhMGTh2h8oY=; b=hrfzYIsfKLXAdCz2wkx6lG3vMJSbLdqIX/xusuRirZG6sHOENpfnJsi4BxK8AYVjPJ OmwyhfVzzepPk0orPVa/e23XuITnUbxIQxg6T/NQYOip7+ekGp/qK2LYxmnJ+NiQixmZ 3vAmtxDtRBPJHhiasT1tWo+BmUo4ySYn+3f98rXj61+2DhaSczUlTQA0F7sasaECCdjx 4WhauzFdy2+kXiF8j4haXkBQHMio6D1mOGM7XyaoBKKADuqQ8QnotGWvJOXG1+aKYK0V TIN7qh6PxPHHI5q9rnpeyzcQEiZi6TiTseTy4sIEDyGVvF2K3LqDI0+8CbVBI3JnGwBU zJ6A== X-Gm-Message-State: APjAAAV/4eacelQpJ3YtLHNC3/gLYoPano7zke3aF+E66BOsWQTwlnV2 mI6FakIQ4w/VfiYBXHG6q9TsNUrb X-Google-Smtp-Source: APXvYqzNk+hfybzP45nD1wMCqOSTJ1To9GBdYcn3zrzG3esqurbgyq7LUoIKPgbX6jEMq/pOQtk0rQ== X-Received: by 2002:a7b:c957:: with SMTP id i23mr3671995wml.49.1578486784205; Wed, 08 Jan 2020 04:33:04 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 07/38] hw/i386/pc: fix regression in parsing vga cmdline parameter Date: Wed, 8 Jan 2020 13:32:24 +0100 Message-Id: <1578486775-52247-8-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> References: <1578486775-52247-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:4864:20::341 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Wu , Sergio Lopez , qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Peter Wu When the 'vga=3D' parameter is succeeded by another parameter, QEMU 4.2.0 would refuse to start with a rather cryptic message: $ qemu-system-x86_64 -kernel /boot/vmlinuz-linux -append 'vga=3D792 qui= et' qemu: can't parse 'vga' parameter: Invalid argument It was not clear whether this applied to the '-vga std' parameter or the '-append' one. Fix the parsing regression and clarify the error. Fixes: 133ef074bd ("hw/i386/pc: replace use of strtol with qemu_strtoui in = x86_load_linux()") Cc: Sergio Lopez Signed-off-by: Peter Wu Message-Id: <20191221162124.1159291-1-peter@lekensteyn.nl> Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini --- hw/i386/x86.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/i386/x86.c b/hw/i386/x86.c index d8bb5c2..9b9a4d5 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -612,6 +612,7 @@ void x86_load_linux(X86MachineState *x86ms, vmode =3D strstr(kernel_cmdline, "vga=3D"); if (vmode) { unsigned int video_mode; + const char *end; int ret; /* skip "vga=3D" */ vmode +=3D 4; @@ -622,10 +623,9 @@ void x86_load_linux(X86MachineState *x86ms, } else if (!strncmp(vmode, "ask", 3)) { video_mode =3D 0xfffd; } else { - ret =3D qemu_strtoui(vmode, NULL, 0, &video_mode); - if (ret !=3D 0) { - fprintf(stderr, "qemu: can't parse 'vga' parameter: %s\n", - strerror(-ret)); + ret =3D qemu_strtoui(vmode, &end, 0, &video_mode); + if (ret !=3D 0 || (*end && *end !=3D ' ')) { + fprintf(stderr, "qemu: invalid 'vga=3D' kernel parameter.\= n"); exit(1); } } --=20 1.8.3.1 From nobody Fri May 17 15:28:08 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578486901; cv=none; d=zohomail.com; s=zohoarc; b=WEX+c47eFGoXSqKkdlZq39F7opKxbfMoYEutvWytz0pYxranvL9KxRx4W8YLe31mn8inrWR96v8ZH2YhZZ7s+O7A+RikmLSVUN7wiMU0bg5pTyR+GmRV2YTO7ZZhxmbdq7MZVdfnRW/ULzjpaUpsja6gJrd1kHWg1WzVsWrDHU0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578486901; h=Content-Type:Content-Transfer-Encoding:Cc: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=i2g/TgemWgl5O4aQNWuawgyyRlmyRO6mT3xQ0xkXqXE=; b=cvXTYCUNvR24JNGlFjvG8BBn6n8rVm5tHg2mtf/+Rgvo8RyHJkiBRS4ptqLpEFnINxRNWVcz3ry609hhsUC7hiLX1yzaFC7uoBB3Aj7+fnkqN+rXiygnmW6AbRU0U/ZzNgOZU2PxYXe8K7q5Q9SWzbWQ1xcEJGyL6lERP2PICEY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578486901730291.9273203035816; Wed, 8 Jan 2020 04:35:01 -0800 (PST) Received: from localhost ([::1]:42808 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAY8-0005YW-2w for importer@patchew.org; Wed, 08 Jan 2020 07:35:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60269) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAWJ-0003eI-Ef for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipAWI-0004Fr-Ba for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:07 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:32778) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipAWI-0004FQ-5c for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:06 -0500 Received: by mail-wm1-x32b.google.com with SMTP id d139so16419022wmd.0 for ; Wed, 08 Jan 2020 04:33:06 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id o4sm4037750wrw.97.2020.01.08.04.33.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 04:33:04 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=i2g/TgemWgl5O4aQNWuawgyyRlmyRO6mT3xQ0xkXqXE=; b=qcP7acUtTX8xWP80zC/e87WsdpTp3Kk0SINaC+Qb8bHdci7Ug5Q00jM5rpLI2Pxh6y 43u60gKm4b5NT2wzkJ/4AYhJzSfJwIMgRPVxOyoyxur4EOgLzh3FrTNWwNwaancczaSw pGo10rVBwX1Bh42YRFRykdh5Bhd1bLDRll8NUV3d48ZQIcqxAyKDUs7OxVekXVOeRj68 nhtNq6sz/GpePDBcJZ0II2Fu2/oX3KYuinOnwHSBzESJRBQus2QtpcYQFd4ILAZW1hdl 0acXxyg32TpPIHRAARDYF/pBICohbzBw+slNeuOzmEqcq8S5JyrBupEMtg9k8cGf8ale k2Yg== 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:mime-version:content-transfer-encoding; bh=i2g/TgemWgl5O4aQNWuawgyyRlmyRO6mT3xQ0xkXqXE=; b=OOktf7ThfRhqRCO02Z7oE0eg1/9P3N48Dr/qkPlU0DXODBDWj1z3tNvCZJ7a6ov2BP gp7DBHM8wgfZIoXr+ycC+79m36TX964VDdySoVXKYvul/xVWRvrnvdBovCVpnKVMuSWV m1iHKz30fhexIYT15n4tLEAyzbr2wsGumQLu/fY3pC2+QcrsXSDt7W1sGLNU4OcgaXVy tUrEJ3AsnSP6P5Gp9IRi6yIti7C0pKwqjBKiRYvmgp+gVwTLd70BkfXMuSB8GHCVnP02 tsy8Oq4U1paU2dzFQ/4AxpfFtBiShnnRz/POfHqaN8+eC1xmh7Y4FVzWz3FjounKGxdS IJRg== X-Gm-Message-State: APjAAAXmldKiaAqQbcy+sVLb+xk+uE3+2rQ17caUqd2lZ7/3SWK1tOZa PmGyg4VgKAVPBi7inILnGEekJhVf X-Google-Smtp-Source: APXvYqxmaxTl7dLyTBQzmnAQxGMkqOVL+k5zdDIwuJJv2GyOuy+R0Q3T056fdSfacNmm72HgIXE1UA== X-Received: by 2002:a7b:c4c5:: with SMTP id g5mr3725444wmk.85.1578486785006; Wed, 08 Jan 2020 04:33:05 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 08/38] hw/timer/Kconfig: Intel 8254 PIT depends of ISA bus Date: Wed, 8 Jan 2020 13:32:25 +0100 Message-Id: <1578486775-52247-9-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> References: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32b X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 Since i8254_common.c calls isa_register_ioport() from "hw/isa/isa.h" we can not select it when ISA_BUS is disabled. Add a 'depends on' clause. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20200106171912.16523-1-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- hw/timer/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig index a990f9f..59b3f44 100644 --- a/hw/timer/Kconfig +++ b/hw/timer/Kconfig @@ -15,6 +15,7 @@ config HPET =20 config I8254 bool + depends on ISA_BUS =20 config ALTERA_TIMER bool --=20 1.8.3.1 From nobody Fri May 17 15:28:08 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578487085; cv=none; d=zohomail.com; s=zohoarc; b=WcJqaWqkMrtaxs3v31i7CyPG8FKqcuawk9nXfzcrqZ39HQxPeyjEsn2KjjunBMlrKfiNtNWatctFR2vCTrM2tBXZsR7J8R8rDDhGFbBB1PKHulcET+KAc6+1C1xspO5gAdbDCYllKex3/WD/sM7QQlfnjj4nMY4ZwccJt/I7uI4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578487085; h=Content-Type:Content-Transfer-Encoding:Cc: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=3yhWA8yXlYsJVpooobRrkZ5hRD9Oh/35FTaEzQyVALk=; b=jcY8BZwkE8oHlr4Twfsakb+LwHC2f/XtCBsTpU7nW7FHxK3NEHGvCYo/14VQPkdalaKt+vhp5Z4kcd++1G8uCFm+Qa2V9v/2lPtAL0m9NxrSEajvwW1LGhDtL/3R1+G7krz4mzRNKAsqSwCWEs5VvE3bcWUz3/MMWY6E7I/NHqw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578487085874626.5740600486054; Wed, 8 Jan 2020 04:38:05 -0800 (PST) Received: from localhost ([::1]:42852 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAb6-0001g5-1I for importer@patchew.org; Wed, 08 Jan 2020 07:38:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60286) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAWK-0003fm-Dc for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipAWJ-0004GV-5c for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:08 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:50266) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipAWI-0004Fw-Vx for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:07 -0500 Received: by mail-wm1-x32f.google.com with SMTP id a5so2310729wmb.0 for ; Wed, 08 Jan 2020 04:33:06 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id o4sm4037750wrw.97.2020.01.08.04.33.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 04:33:05 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=3yhWA8yXlYsJVpooobRrkZ5hRD9Oh/35FTaEzQyVALk=; b=o+GypmTRf7QK5WHOcIUm34g5ke1D5ixjsIbuwOH6BhxATeHpUwEvKroFGxrKCN85Gl aIJJTpkV+XcCjU9WXA4PFigbDfWUmPzSEL92X/8qu5Rol/Th3Hl4dlXbMeCkvu70TbhJ 6DsfR9wamSy82jmS2oE+XOJN2KHr1BZrTDPnHMKVA/nJEjfm/vYUhkFwQcYPskPbYZc4 3fQ6gRkeFLrJutbTqqCVZFmB3dl8tBpQ5qWM0VyJzxWoLwzaMnzQKMYn3WDrblwEEnoy DsVQReGJdBItNPtNUzJ50VkPI0MD6IebVV2pDIF90TUnYjJvd9C4irpeIXuA/kwP5PZ5 ufvg== 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:mime-version:content-transfer-encoding; bh=3yhWA8yXlYsJVpooobRrkZ5hRD9Oh/35FTaEzQyVALk=; b=jsxTdJRhGhExClRiGfr5XNeshR64f7ILyrLJAm4xJymHJK5yo6byci7ZmER7d1i2+F X8RCRosl0U7nRcPVKgFGgPWes1GuYiijsq3YssPd9zCuqhi1ngKzcrxto/og7/4XH5Uj 5YKqZNCPEvd3uz1uKPKmuCShE0ei7cev5SUDXHvCOLIulilsjva30shAluH/6Ao9ynQZ nY6Resxk5Q5s8mmoym+OW4i3Zatn0p5QzMIlCYufVcxsXm/JcqpDDF0mMw5sAmNpakl/ Ii5TZV0SZOUYXJTz6lBh+P7xgrlL1DwXF/gWKld/0osEKirplFSiZ2tj00hdTL3YNCfT 0HQQ== X-Gm-Message-State: APjAAAWua7BRJYgKBrBEso3/pNGpT0Ukl6UWDHTtdXopNU6jxNvs+H9J XlIIuSLDv99RZK6rRu0oFQqQfUa3 X-Google-Smtp-Source: APXvYqwpOLz/VNGF1tLzpzLCMjK3QWloyXaw38yEMgaVj9pj7kBSK3gl7eB/oCzjm3SrOJgo08ON4w== X-Received: by 2002:a1c:1dcd:: with SMTP id d196mr3617884wmd.106.1578486785837; Wed, 08 Jan 2020 04:33:05 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 09/38] hw/usb/redirect: Do not link 'usb-redir' device when USB not enabled Date: Wed, 8 Jan 2020 13:32:26 +0100 Message-Id: <1578486775-52247-10-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> References: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32f X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 The 'usb-redir' device requires the USB core code to work. Do not link it when there is no USB support. This fixes: $ qemu-system-tricore -M tricore_testboard -device usb-redir qemu-system-tricore: -device usb-redir: No 'usb-bus' bus found for device= 'usb-redir' Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20191231183216.6781-2-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- hw/usb/Makefile.objs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs index 0ab20f9..0052d49 100644 --- a/hw/usb/Makefile.objs +++ b/hw/usb/Makefile.objs @@ -39,9 +39,11 @@ common-obj-$(CONFIG_USB_STORAGE_MTP) +=3D dev-mtp.o endif =20 # usb redirection +ifeq ($(CONFIG_USB),y) common-obj-$(CONFIG_USB_REDIR) +=3D redirect.o quirks.o redirect.o-cflags =3D $(USB_REDIR_CFLAGS) redirect.o-libs =3D $(USB_REDIR_LIBS) +endif =20 # usb pass-through ifeq ($(CONFIG_USB_LIBUSB)$(CONFIG_USB),yy) --=20 1.8.3.1 From nobody Fri May 17 15:28:08 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578487250; cv=none; d=zohomail.com; s=zohoarc; b=KFEW2IMB183j+XeAHCoyIctAWuscP/WAOwGc32AVoJXGfAhQ4r2M+1nkePyqjjQH0S+76aVoMjls53f6hcL3GqBWcuzPtk/dPJ3Vc7tT+ACjTwGUx3ta+8RmDfhBBW8W/LtFEdOrCXeBY5sYhKOY9/BywO1+TaT8Dmr+x+eF9ZI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578487250; h=Content-Type:Content-Transfer-Encoding:Cc: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=rosgTXU7NuqW50rtytxejrl5MTYMCw63euXWmhTQ/DQ=; b=ZC/nJRU0CKdwpDH/SuofvJZSiEubbOG53WgzvywQktpVzxCjMudHwxKs0dMHglMJWeASmJSKDplQiyvBSIC0qC5mM1/EC4TB7oog3SvsnCqcB4mCd6htxisDjKOBMLX5rR5ySo8mMGakUHg6yaFqHHHAj3j50D97lYbjnaNVugw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578487250200261.22606285200743; Wed, 8 Jan 2020 04:40:50 -0800 (PST) Received: from localhost ([::1]:42888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAdk-0006N9-MY for importer@patchew.org; Wed, 08 Jan 2020 07:40:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60308) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAWL-0003iU-Fw for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipAWK-0004HK-9e for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:09 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:40809) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipAWK-0004Gj-30 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:08 -0500 Received: by mail-wm1-x335.google.com with SMTP id t14so2304819wmi.5 for ; Wed, 08 Jan 2020 04:33:08 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id o4sm4037750wrw.97.2020.01.08.04.33.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 04:33:06 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=rosgTXU7NuqW50rtytxejrl5MTYMCw63euXWmhTQ/DQ=; b=m+wiMyb8fphkXLN0I9PLhEl1eEr9pbC7K3mvoiS4DiKUTkuy2xJydGyegQQ9myq3dg /n4pJ5zLWljrjsCh48GN7uAabfG0CAC/oQKge9Go4kiHpl/EzVOtOhLHFgKgfDQWxDFA sKKfKUGjdsvGl1CW8aELKg90ynN2RBuW2y+1gD847lLoTA1S/Ajig/F6yP7Pi8H1x2T8 4YI1xPzA4++8NLnhdevi38/3sdN9XJaqeP6ysCFN1yKB589jLjqGwp671ORgAvmdAxBh 9ZJDQily4hHvxfRIMWPcdHJNRglJd4mJm6/g346lVsJlqRMfoIPaomAmXJWJzpzY+RSO 8qxA== 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:mime-version:content-transfer-encoding; bh=rosgTXU7NuqW50rtytxejrl5MTYMCw63euXWmhTQ/DQ=; b=sc1Pl1lZF4QUyoqKtCb9AeY2ukmnjDPcbNpabFIccommu3nCFYvweDG6A7Y4/eDju4 9hxrhVoZR4FrU78m8AEzKCgdcYcISPjMpDPji+kTdPgNjuIZzSAUk9X9KIeMf+aIRMy9 1RQ+RtaD5zpk0evVMVsQeKgoSOglOIdwfeM0obADBRs0WMPkMvcRhr2UckRHDJ//vIU3 OzWc6YQ7F9xPnLX1+VGqnGbUf4Dt39FsV+tXWrytp/vVnsR1C4Bn52eca/hUlVEpl2Iv 0RYAXK6YU7pMHQuoYrJfZkWC3eP9QESzWH2ZrpQt4vJIGH3YXznkCGyNeBB9QVuvPgdW 9XeA== X-Gm-Message-State: APjAAAVksoS7ykE4sHsyFxprAKsoknTuO75sWDG4wqXttF+6Ggp7b0b0 Vd5qCM1WVGgVuIFgLhwNIRxlI2kk X-Google-Smtp-Source: APXvYqwft8YVYbtgH9fIxJ+ClV1SutL+5Pw9ND74+AU1CM0P25KR7R2b+uGmnp2CiKQlp1et4X33ag== X-Received: by 2002:a1c:a50e:: with SMTP id o14mr3528011wme.2.1578486786831; Wed, 08 Jan 2020 04:33:06 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 10/38] hw/intc/i8259: Fix Kconfig dependency on ISA bus Date: Wed, 8 Jan 2020 13:32:27 +0100 Message-Id: <1578486775-52247-11-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> References: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::335 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 The 8259 Interrupt Controller sits on a ISA bus. Add the missing dependency to fix: LINK x86_64-softmmu/qemu-system-x86_64 /usr/bin/ld: ../hw/intc/i8259_common.o: in function `pic_common_realize': hw/intc/i8259_common.c:84: undefined reference to `isa_register_ioport' /usr/bin/ld: hw/intc/i8259_common.c:86: undefined reference to `isa_regis= ter_ioport' /usr/bin/ld: ../hw/intc/i8259_common.o: in function `i8259_init_chip': hw/intc/i8259_common.c:97: undefined reference to `isa_create' collect2: error: ld returned 1 exit status make[1]: *** [Makefile:206: qemu-system-x86_64] Error 1 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20191231183216.6781-3-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- hw/intc/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig index 10a680b..a189d6f 100644 --- a/hw/intc/Kconfig +++ b/hw/intc/Kconfig @@ -3,6 +3,7 @@ config HEATHROW_PIC =20 config I8259 bool + select ISA_BUS =20 config PL190 bool --=20 1.8.3.1 From nobody Fri May 17 15:28:08 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578487049; cv=none; d=zohomail.com; s=zohoarc; b=QlZG8rAOsDvMS/Cmdz6e+k3+5Y4+vnfOiPBgX8bqC9lX3W+ueOmA6rwJwOAMrIOonVt3314vdsT7kB6v38QwEThchqtkyISJPGcHB4+vplo5e+bE15M0Fyk5i8GyNbIr28SJlIrZssmNRTwVcJOhNnn4pFKa4ViXepO1DkDdW90= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578487049; h=Content-Type:Content-Transfer-Encoding:Cc: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=9PjzHiXwj1KdaDnPbGNelnRbOtkZ/aefiRl2myJ+BXU=; b=mPumfAVjbuS+MiXgJP/hIrBhWPIQGffvCMKNqxPUIX37f28ImGzItlGsrW14iI2F8D/nKBMm9vpsGNHlp+9zMubtRaSJQU8sPqdow9bAfTjrRy7kPtSLw3LRPzk+4Wy43jrHdpBBoFn6tdwDDBVxKYBPqc2tiVl9rowulHSIqsk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578487049530166.42793932120435; Wed, 8 Jan 2020 04:37:29 -0800 (PST) Received: from localhost ([::1]:42850 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAaW-0000h6-0h for importer@patchew.org; Wed, 08 Jan 2020 07:37:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60326) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAWM-0003jc-7P for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipAWL-0004Iy-5e for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:10 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:39180) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipAWK-0004Hi-W0 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:09 -0500 Received: by mail-wm1-x330.google.com with SMTP id 20so2309129wmj.4 for ; Wed, 08 Jan 2020 04:33:08 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id o4sm4037750wrw.97.2020.01.08.04.33.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 04:33:07 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=9PjzHiXwj1KdaDnPbGNelnRbOtkZ/aefiRl2myJ+BXU=; b=qG6So0vTYWa8iEipqHSW/GMHxSRvAPLp+/DMdd3nP/LiDn3/96/+9pSiH5fuLymK15 NTRWF4wfyq2RXShDKap9rNDY55q4As8+U/bicuF2PNwlxlTTCAUEqeD1/pn9Big+XjdP W7IkJETfB5i5rjO0+27KR8BafoHwVcLjeacRmfAyWpiN7oyelRFQpRQtBi7cuFOUnAmR 66M6PKSkucXlWDo8FNji8k+LSEZzt9jKJqGVSy1rV8Aa0/P0XHCRlQZMfm9Q9tJnu5ZM Dy4RoLuEQMlC3P5V0lApjJ/r7dZ4n47zsQadZ5GDmYinunaqaWfzWLH4XuIr9O9FI+Gw AgFQ== 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:mime-version:content-transfer-encoding; bh=9PjzHiXwj1KdaDnPbGNelnRbOtkZ/aefiRl2myJ+BXU=; b=KfcYQhep/rhcpfFy6UY0lvQMvvs1PMjQ3rGX+kn1jEYulbuUVN416hTRQxbixWrYS3 9DTyMdOJJaxYiBu1sSA9sQM1n6UcOvGK7Mdwf18oREFWkDdghh+rbv32p6mdx6o2ibVZ FNWtBsGfKYQ0DiPmmiKLeqnmM5x7rWA6eUEzQTVE1zi5uOpx4SJ01RVkAiQsx4TI19pS 3YplthEk2RMpoE4OHUnnVeHcuR52flJ+/1XkpBgNBehGluElpPxmaJoMNn7l9P298nas lOmmPUqfGyUG6oimFbvrrFYj5z6RVDlA5axUvGTX+6APaeJD+qmeti1nqkjJt64gMmry wwgg== X-Gm-Message-State: APjAAAU4tW1oTGEd02dNZNpEzNdARxcWJ/VQcDG65I3pqSiISbLxqDnd gwRZJ8c81pPE1kazaBXqEmqQl+Cc X-Google-Smtp-Source: APXvYqwnr9EgKFTIZwRM1eZSGaYf/HS5mTKgumPV9FVDnZWvJwv/VbGA1gybr6iSyYtMM4Uy3wwO7w== X-Received: by 2002:a7b:cfc2:: with SMTP id f2mr3624754wmm.44.1578486787776; Wed, 08 Jan 2020 04:33:07 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 11/38] hw/i386/Kconfig: Let the MicroVM machine select the SERIAL_ISA config Date: Wed, 8 Jan 2020 13:32:28 +0100 Message-Id: <1578486775-52247-12-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> References: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::330 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 When configured with --without-default-devices, the build fails: LINK x86_64-softmmu/qemu-system-x86_64 /usr/bin/ld: hw/i386/microvm.o: in function `microvm_devices_init': hw/i386/microvm.c:157: undefined reference to `serial_hds_isa_init' collect2: error: ld returned 1 exit status make[1]: *** [Makefile:206: qemu-system-x86_64] Error 1 make: *** [Makefile:483: x86_64-softmmu/all] Error 2 While the MicroVM machine only uses the ISA serial port when the MICROVM_MACHINE_ISA_SERIAL property is set, it has to be linked with it. Replace the 'imply' Kconfig rule by a 'select'. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20191231183216.6781-4-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- hw/i386/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index 91cf584..cdc8515 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -95,7 +95,7 @@ config Q35 =20 config MICROVM bool - imply SERIAL_ISA + select SERIAL_ISA # for serial_hds_isa_init() select ISA_BUS select APIC select IOAPIC --=20 1.8.3.1 From nobody Fri May 17 15:28:08 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578487204; cv=none; d=zohomail.com; s=zohoarc; b=S8Lx+w3dGZma6ELnMkF1lYFmvbZj9/5BzBeahjFAfZ8xqyt4dDM8LUdRpYVC1LSC4SeH6eyB0YEN8tibDAs1RBSImgBWRq8MFLdycaTitCXnAsRd/aNLbXOThgwTLbAIUH5SI6j/Tr4vx4jEjTnu2Dh4pHFMNCFeorvDybkr1ZU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578487204; h=Content-Type:Content-Transfer-Encoding:Cc: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=se+V48CVFj2UMhia/l7TQbfN4HTq3HN6TcBQFtKO7+Q=; b=MEc17GIV0zeLoSZRe7LshxVU7bAxhoA3I/A54Q4JMsGmH6V35mYCtGZHmUD3Q3oTRDPpBDm6hX0WRKpPCapQf0g09KDiAFv9T1huQV2CxI+ul9A8ZtyXgfzuCY8s/8/hwxwASQu/9uR0tE9uPJTrWE0lTwWusppbg/PHVsjoSWY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578487204578164.621657681153; Wed, 8 Jan 2020 04:40:04 -0800 (PST) Received: from localhost ([::1]:42884 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAd1-0005Nf-27 for importer@patchew.org; Wed, 08 Jan 2020 07:40:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60335) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAWN-0003kl-2J for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipAWL-0004Jr-Uq for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:10 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:46969) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipAWL-0004Ir-Ol for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:09 -0500 Received: by mail-wr1-x429.google.com with SMTP id z7so3123858wrl.13 for ; Wed, 08 Jan 2020 04:33:09 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id o4sm4037750wrw.97.2020.01.08.04.33.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 04:33:08 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=se+V48CVFj2UMhia/l7TQbfN4HTq3HN6TcBQFtKO7+Q=; b=P7qTUpIzEQ0plOiP2KBlmpij9QZ42bwoNHY3LRT7zFaWoHfdzl63+1zdchsfS80Hda SB0TnjbnZca8TKkaDrfVTSVKVxz61K4ouh2CUQV/NIPlBUn7HnxqrrQkAzIUOsOotyEf SVW5los9GV9CrwClztMzEcnaElnNLZfKQpjSPsdCnkjFZeIA91tfoivs+q9NvAAaqOjQ +BFKsuD+U/svCvFIBBcmGYRJn4JPC5jI7yHsjVJSCjlSFtwJJqL/Kc75x/4gwgnZhWKd MMjDQVqoQILCvMpnLjCzIC1BCSWHzvgFDbkuibNfuw6Ba3ghiTIl9W0rwdeqYymAFcKF ULZA== 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:mime-version:content-transfer-encoding; bh=se+V48CVFj2UMhia/l7TQbfN4HTq3HN6TcBQFtKO7+Q=; b=SPu4e+H0yGmF6DyEZ6ej6FEgoYYccvdksyolaLnEhGWhFALUKTwJWW7CGp9KHAFbJH 09lZpXnpPA/z+26kTr/4QlrfZvGa04MxOux8lJnWLu6ftsq8t6M0YpIbLUyloghexKeh p8h3Nd0bzIkciY9o5IdiF8itm6F7rk88FhyUg47+88XSqwN4K6hMFn58tINcurc8t5wD 7yleH+sMDJM9humUIx1nZlWre7NRSD/8VlM/YvRic471f1t+fgYbnTnZoXNjpTF84FQr IDSod+D/QOMzKLeGSeir79aE+hj6TLZSHX6UwIY9oC7nt1jvZzbvfHdfJxB/GB/QDmOg u//w== X-Gm-Message-State: APjAAAV1h2Ai7J2Cb+DUfPwHniJ+lC2HWM8DyPqTGeSzZDJ8jEOXHkP6 ehqRtOAjyzTySuQLEthttjCgR1lC X-Google-Smtp-Source: APXvYqy12AOv3O4ADmjF14ctfr2Vd5agtCJLpeRKhyObrB8zens0tkyadRDfu934KV1Nt8FK4DYltQ== X-Received: by 2002:a5d:45c4:: with SMTP id b4mr4242923wrs.303.1578486788568; Wed, 08 Jan 2020 04:33:08 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 12/38] hw/ppc/Kconfig: Restrict the MPC I2C controller to e500-based platforms Date: Wed, 8 Jan 2020 13:32:29 +0100 Message-Id: <1578486775-52247-13-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> References: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::429 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 Only the PowerPC e500-based platforms use the MPC I2C controller. Do not build it for the other machines. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20191231183216.6781-7-philmd@redhat.com> Acked-by: David Gibson Signed-off-by: Paolo Bonzini --- default-configs/ppc-softmmu.mak | 1 - hw/ppc/Kconfig | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index bf86128..61b78b8 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -1,7 +1,6 @@ # Default configuration for ppc-softmmu =20 # For embedded PPCs: -CONFIG_MPC_I2C=3Dy CONFIG_DS1338=3Dy CONFIG_E500=3Dy CONFIG_PPC405=3Dy diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index f927ec9..0cd8d40 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -105,6 +105,7 @@ config E500 select PLATFORM_BUS select PPCE500_PCI select SERIAL + select MPC_I2C =20 config VIRTEX bool --=20 1.8.3.1 From nobody Fri May 17 15:28:08 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578487202; cv=none; d=zohomail.com; s=zohoarc; b=EDvZwYht5kpb1DTnAkAZyfcl5auvb2yQYonbY1FgsBzA7R8qM6yNE0JHj3LGcCQoJHvgpJKIfJz8GCXOd3VlM9oD+xuL4huQYZIYKJhRc3QVQwEkoQ3mRRwxL1H1IlIAPwyIA4QGBJFu9zTwKJaDgg1dg9A6jFR5OxRE/pFg5Fk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578487202; h=Content-Type:Content-Transfer-Encoding:Cc: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=/zR/PnmoD2vd+SET2VXoclQZXazuwhpa+44UehtkdK8=; b=dI99BzXRIxR8YA+Jnri01/3QOWNbAHWtmI0SdlX0KGBFQ3En8xrBDc/cOWX8wHrRACQUI3FGYtFP7DqsjSoIjUf60hthjs8OJXIXsIO/JQF3WW0SWJSohCs1a+dYxKuzJvr5gKWzVVVK1enYgG14/9WLwS/NfgeUNpMUAnxHWW0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578487202854114.82140709607677; Wed, 8 Jan 2020 04:40:02 -0800 (PST) Received: from localhost ([::1]:42882 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAcz-0005Lo-6t for importer@patchew.org; Wed, 08 Jan 2020 07:40:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60348) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAWO-0003mb-8x for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipAWN-0004KX-7z for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:12 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:33334) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipAWN-0004KE-28 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:11 -0500 Received: by mail-wr1-x42e.google.com with SMTP id b6so3248858wrq.0 for ; Wed, 08 Jan 2020 04:33:10 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id o4sm4037750wrw.97.2020.01.08.04.33.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 04:33:09 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=/zR/PnmoD2vd+SET2VXoclQZXazuwhpa+44UehtkdK8=; b=e/9xGxpZhSInAdrJvK2/xA1/nCbKQF8BTgToTkTsFGigZ4tLiTWGKyks8gtVK4Onyq AsYaizx1ORrNa4MLtQ5XYYhxIDFOGpUlt7vogwiXJVNNjpN2rTcxKA3K3sRCsXkTJxsC 0ifVsdXbDYccn9KjUcnDG8A1YBaKIA51imV+p+MNSyAAYhG046cZPzDnpX0Fe5dhBmkd 3WU5x3lEelQ8ccuep+djKh5K7OMH0q2MuKPXkyLPXpKc8Yew2WPTV1Ohe+x8VyYuj33a ufPAwUb0OPqbc04kEyjlq2PMp2mbxdu1fjkEbWrOkCNS0hDyHMCMHdz+SJR432FN9f2Z qTVg== 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:mime-version:content-transfer-encoding; bh=/zR/PnmoD2vd+SET2VXoclQZXazuwhpa+44UehtkdK8=; b=soBTwWGSF+bIOBURksMLj/GJ6kGXc1W8WQa9Lr7sDSWRuu6sbNorDwXQgTGBnScrEo HO3QfD89frV3nT5kOPV7pfZN7Scz2NucDA4VkLoGEUZo/lbnE5VjER8LQ/qYDp50oTcw ekRgxLaWDWIZ3h0J5V3A/wKQOsPqXO9rAjO8i4yOUpa20IARjY0Mvp1xahdxsHnvaOHH bvyaj3v0A8zJWXX37xa1bN/6tWKvAmKo/FhT+WNaLhpjCciY7IZmOWfAxB0C7N8G0cRS +0bxWYB/nnRV+GqccWH9Vrepu7hJvZzdb02JZ2zkYDgj/YXKbc6J4w+V1DXVEsJjhAlV Xi4g== X-Gm-Message-State: APjAAAWS5i+pvpQjB5tzYxarr6z+yJBy5Ez8Q84Scg8BYkIXv+UhTdVb J5MtBqXu3b4Q9sXbHWRll82R99+4 X-Google-Smtp-Source: APXvYqzWaXSEOIoet9f/MiRNa+2M775XLjBMxv22hh45jdkSAvUjywr3EwIEBSi8DA+Vq6TIDw5E7Q== X-Received: by 2002:adf:dc8d:: with SMTP id r13mr4500502wrj.357.1578486789987; Wed, 08 Jan 2020 04:33:09 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 13/38] hw/ppc/Kconfig: Let the Sam460ex board use the PowerPC 405 devices Date: Wed, 8 Jan 2020 13:32:30 +0100 Message-Id: <1578486775-52247-14-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> References: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42e X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 When configured with --without-default-devices, the build fails: LINK ppc-softmmu/qemu-system-ppc /usr/bin/ld: hw/ppc/sam460ex.o: in function `sam460ex_init': hw/ppc/sam460ex.c:313: undefined reference to `ppc4xx_plb_init' /usr/bin/ld: hw/ppc/sam460ex.c:353: undefined reference to `ppc405_ebc_in= it' collect2: error: ld returned 1 exit status make[1]: *** [Makefile:206: qemu-system-ppc] Error 1 Fix by selecting the PPC405 config. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20191231183216.6781-8-philmd@redhat.com> Reviewed-by: BALATON Zoltan Acked-by: David Gibson Signed-off-by: Paolo Bonzini --- hw/ppc/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index 0cd8d40..004b7d5 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -50,6 +50,7 @@ config PPC4XX =20 config SAM460EX bool + select PPC405 select PFLASH_CFI01 select IDE_SII3112 select M41T80 --=20 1.8.3.1 From nobody Fri May 17 15:28:08 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578487376; cv=none; d=zohomail.com; s=zohoarc; b=LQhWo5/PY+ME1HT4cdEdiHnuvdRYe70CTB6AI6aoZDI01LF0RdWvJ4f0U2GwAJhlz+o9fUbDocNbJR0dvzZzx8Z30NXCV3AFXyuUagCfIXmYBm3lKvPbohEa7RtVrFzax9gXIcQUD10arg0PiebZRVHiyaKDXxZKBu4mD+C2r3s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578487376; h=Content-Type:Content-Transfer-Encoding:Cc: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=h3yQhB8alBlldX2ihkI73aVBbhIVO77Uu7vlmxTBOs0=; b=ByQVJb4CIgjjXtMJ8qxkuSm+bSXuS1DWqPoJ6xGMf+cLyiMirdIrlWR1KW5+PlT9No5/XVflU5wQwijLwgWMst9Iqe4fJzpcXWy4HTyzZGoQaueQ8AbY5oilfSMAg5HintO0sPt7FvPDzOvvrTKNGWIk38fl2u5PhRT5gWO2mWk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578487376928124.42567884445702; Wed, 8 Jan 2020 04:42:56 -0800 (PST) Received: from localhost ([::1]:42932 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAfn-0000j0-FK for importer@patchew.org; Wed, 08 Jan 2020 07:42:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60359) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAWP-0003o9-Ee for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipAWO-0004LA-70 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:13 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:38060) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipAWO-0004Km-1G for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:12 -0500 Received: by mail-wm1-x32b.google.com with SMTP id u2so2317041wmc.3 for ; Wed, 08 Jan 2020 04:33:11 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id o4sm4037750wrw.97.2020.01.08.04.33.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 04:33:10 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=h3yQhB8alBlldX2ihkI73aVBbhIVO77Uu7vlmxTBOs0=; b=NOBTvHzzU+TzTlbk68TFb9Om3wppsaalL9VEV7HAcRNWeHkKC5NUE9LRBcqFsiadNg UR3KazNrjKsaWtFtjVoHQc8bAQmvx4t3cXJyC7eG9/nmbRPqpkK0oiJUUPyMsliYxKKD VQ9HLGoRxWwFVbgjTlrXr3aypxAX3pxsllDxG9hq8NhjvIBwXSBz8N8ge1k17yb4mqT8 sRyUBUM2octJwJEMw6osCOpt+CrkdommTzNYSNsEPYlsY4wLiSDhy/fvJAanF2ZjX1kh TbfH4yyMA8JdAoUGsY5eLQg+uaxF/be38Gf0RZm0vyT0SHGQHc6YQUcW+cgQTmX903mS s7aQ== 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:mime-version:content-transfer-encoding; bh=h3yQhB8alBlldX2ihkI73aVBbhIVO77Uu7vlmxTBOs0=; b=H9AnSVEu605s5Si9xtKf4LAST1/nGogYOQc2BRmX76Lltl5bIKcDWY4JEvwmt76lA1 a7KtXI1U3v3aQYC6T6atf8Yf7m3dWhZKOpK20zUfTksy6Xye03YZxaAfVC70zdZJIRIl 9x1XxITnsthLTWyXCMcnuZeyhWadiNxdPUNB+DV3L/liUzcYmmtKjhScZinCXR7Y21n+ yxxoF11LllDsm+4VklrcLD0yfuMwEtuyy93qQDFv0GfveIEqySd3vABGxPhG0e9lHUIG VbDNcYU+Y+dS6i73aO5ieplalNvhwN6EYxN3su349RT8lEoyQZuIZN8/tmmRIJp6xBnm uOrw== X-Gm-Message-State: APjAAAWRdkNq5wXJyG3tzoX8BmRl5ox+un9SbaVb7a4gAJvv2PbLKu78 Y0GQXMGhOWnOe0yzLUp/TRqB/Zp0 X-Google-Smtp-Source: APXvYqxyy1jPVw8ZgoBDyqgHBdbp+fvqft/r0Rb+kZcW7GfkvCmpxj7f2GXrQledOffbY3xd+mcgPg== X-Received: by 2002:a05:600c:230d:: with SMTP id 13mr3588051wmo.12.1578486790901; Wed, 08 Jan 2020 04:33:10 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 14/38] hw/ppc/Kconfig: Let the Xilinx Virtex5 ML507 use the PPC-440 devices Date: Wed, 8 Jan 2020 13:32:31 +0100 Message-Id: <1578486775-52247-15-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> References: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32b X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 When configured with --without-default-devices, the build fails: LINK ppc-softmmu/qemu-system-ppc /usr/bin/ld: hw/ppc/virtex_ml507.o: in function `ppc440_init_xilinx': hw/ppc/virtex_ml507.c:112: undefined reference to `ppcuic_init' collect2: error: ld returned 1 exit status make[1]: *** [Makefile:206: qemu-system-ppc] Error 1 make: *** [Makefile:483: ppc-softmmu/all] Error 2 Fix by selecting the PPC4XX config. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20191231183216.6781-9-philmd@redhat.com> Acked-by: David Gibson Signed-off-by: Paolo Bonzini --- hw/ppc/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index 004b7d5..d8482a5 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -110,6 +110,7 @@ config E500 =20 config VIRTEX bool + select PPC4XX select PFLASH_CFI01 select SERIAL select XILINX --=20 1.8.3.1 From nobody Fri May 17 15:28:08 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578487755; cv=none; d=zohomail.com; s=zohoarc; b=AzYshIBaKSyJ5dISY2gW+lmOLEsAsmM3cjmxY4x4aiu5Svu9uv3pPyb7vfvRPwcYti7NVJBKw+vQRcX4UtHnS4vN5aQ1W6IT+eowS0ZuuJfSWXiHk3jrmWjzGWIhIjChRNQOK8pCqpUNGf3ZEJgHX7yl68ZOVDPprwHdFqNiY2w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578487755; h=Content-Type:Content-Transfer-Encoding:Cc: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=G/wfhSCVdFYk0kyTP7PLIWQJ6W1w4exviX2br2pbzUs=; b=U0gDVlaDBKicIEcH97397lZsf8yEScFqTY187nTZh/yISZ9VTFWcqF5LqRrG19vh9aMk/wketsbXyy4XkerMPahZLifhSQbYPiPFwy7y8hFh22SLpWY1HoMDKXlA0ctY1nCOB8lp3tpltvqhHRJ+CW/Ppy4EhU6vO/I5ZfDlaFs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 157848775583498.976811374426; Wed, 8 Jan 2020 04:49:15 -0800 (PST) Received: from localhost ([::1]:43018 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAlu-0000WM-4M for importer@patchew.org; Wed, 08 Jan 2020 07:49:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60381) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAWR-0003qg-4h for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipAWQ-0004M3-1p for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:15 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:41923) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipAWP-0004Lb-Ry for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:14 -0500 Received: by mail-wr1-x430.google.com with SMTP id c9so3167376wrw.8 for ; Wed, 08 Jan 2020 04:33:13 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id o4sm4037750wrw.97.2020.01.08.04.33.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 04:33:11 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=G/wfhSCVdFYk0kyTP7PLIWQJ6W1w4exviX2br2pbzUs=; b=GEWvuMWMm0FIm13/D5imLf9jpwauudV0rGFLtWbzi/S4qLCjqKsfmZgeKaeEkWLFec /J1e2flm0k1kJGMfUxJjsCc5tmZZnQKghumyLyEpMSw1sMpMDX7GSvLkOXq3r/7dqCgs uMddYVZrY9WX4cdQsUp9TLjYFQ68mU8Q5lPSXeWAb0AwBsaoAY2rEPw4b4XgNuKO+xJ6 /leADosfxomPK37njXS5JZiJg7drLG8M4lqifqAmeLmLT7Jjp0xtma/fkfd1DMGR7tjJ ORAtssJWHrOoxtC3+CaxMykaR17hmRH8i7D0q3Hg/YDY1n1KTZXlBkhlzYyNNFxjHctv DdpA== 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:mime-version:content-transfer-encoding; bh=G/wfhSCVdFYk0kyTP7PLIWQJ6W1w4exviX2br2pbzUs=; b=j9batjcdpNIADDnBmBlYOyzHVRaev3oNfZ8SelU+3rKtbMDhTTdGyHM2sHb6Smu+TM R3IWL1XkKIMKesaGiaDfUhTUGJaAOQpP0npTF6Mk/GG/juQ8hkrZgOw43Gt2ey21pK0A roLss7IWo1KoYFghjsiQKsWaidaJ4Sjy7Fy2Q5C1XSfA1OdT5F6Jh9ImDeEFUsXVxByn 49G3YXFs9QLPnA6s5R6CnvBz0l/7Qm164sI4LQMSnCsQGs/Qf8a3t+jLTQ9aGHlXhYFl 6cBSLtV4SVk6MdkVkWt40uB6oOSIZyS7j32NEEvMJsu4CTP/h/YZJm7eBQi9RxV8naEQ zfyg== X-Gm-Message-State: APjAAAXEbUnpgtkFvh0QDfh7TTbXJhwHbRzKrewDhjWP6EHcIo1qFSMx dmm7SNW4W5Tm35iJhuuvpxdpYMKe X-Google-Smtp-Source: APXvYqxBLa9pMJtIac9q/Yyv/LI2wnh+TsNEOw5u7O+EArXvQGkkGNU9aSXzLrSkMh8oR83BzrZ98A== X-Received: by 2002:adf:f3d1:: with SMTP id g17mr4406509wrp.378.1578486791670; Wed, 08 Jan 2020 04:33:11 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 15/38] hw/ppc/Makefile: Simplify the sPAPR PCI objects rule Date: Wed, 8 Jan 2020 13:32:32 +0100 Message-Id: <1578486775-52247-16-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> References: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::430 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 The CONFIG_PSERIES already selects CONFIG_PCI. Simplify the Makefile rules. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20191231183216.6781-10-philmd@redhat.com> Acked-by: David Gibson Signed-off-by: Paolo Bonzini --- hw/ppc/Makefile.objs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index 101e9fc..79adf06 100644 --- a/hw/ppc/Makefile.objs +++ b/hw/ppc/Makefile.objs @@ -7,14 +7,11 @@ obj-$(CONFIG_PSERIES) +=3D spapr_pci.o spapr_rtc.o spapr_= drc.o obj-$(CONFIG_PSERIES) +=3D spapr_cpu_core.o spapr_ovec.o spapr_irq.o obj-$(CONFIG_PSERIES) +=3D spapr_tpm_proxy.o obj-$(CONFIG_SPAPR_RNG) +=3D spapr_rng.o +obj-$(call land,$(CONFIG_PSERIES),$(CONFIG_LINUX)) +=3D spapr_pci_vfio.o s= papr_pci_nvlink2.o # IBM PowerNV obj-$(CONFIG_POWERNV) +=3D pnv.o pnv_xscom.o pnv_core.o pnv_lpc.o pnv_psi.= o pnv_occ.o pnv_bmc.o obj-$(CONFIG_POWERNV) +=3D pnv_homer.o pnv_pnor.o =20 - -ifeq ($(CONFIG_PCI)$(CONFIG_PSERIES)$(CONFIG_LINUX), yyy) -obj-y +=3D spapr_pci_vfio.o spapr_pci_nvlink2.o -endif obj-$(CONFIG_PSERIES) +=3D spapr_rtas_ddw.o # PowerPC 4xx boards obj-$(CONFIG_PPC405) +=3D ppc405_boards.o ppc405_uc.o --=20 1.8.3.1 From nobody Fri May 17 15:28:08 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578487432; cv=none; d=zohomail.com; s=zohoarc; b=DXH6Bsukv2Aq2PHHek5MkN/pGDZYYjVZsTpREPM/5hZX6Q0YMkVmqvb6UUOqwOhEFEd96gfFwuvgwgHus/O1u0tXxfalhBRYFIX0umwk3UkzNvOZbXmdQrrJDXs34IDGxTIkG3RG7IYriaMScYoaUU6JSiuZS1X/+1SUiOzsjQI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578487432; h=Content-Type:Content-Transfer-Encoding:Cc: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=EKgddJUC32edGpEYyVtkWbvCn6HqFnHHNoZScg8SMCE=; b=S530QdiiXg3Jz1JkFYDZB7IwDcbNOsI0VoIG2yNIoqooBe3zLOT4zSJL1Ca9SM99p8rQ1Yg7Qu62D3uNAtQsMrzH1+OFlBOkJrdjDGutWuerly13Ph1dtdcvAEWPt0ix3BAxpYD63Wy/Q/STQ+skvEIXU0atCYJQ1T5BE3xBzko= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578487432578620.828043575479; Wed, 8 Jan 2020 04:43:52 -0800 (PST) Received: from localhost ([::1]:42934 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAgg-000257-So for importer@patchew.org; Wed, 08 Jan 2020 07:43:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60383) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAWR-0003qm-C0 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipAWQ-0004MB-52 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:15 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:44174) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipAWP-0004Le-VZ for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:14 -0500 Received: by mail-wr1-x431.google.com with SMTP id q10so3145191wrm.11 for ; Wed, 08 Jan 2020 04:33:13 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id o4sm4037750wrw.97.2020.01.08.04.33.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 04:33:11 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=EKgddJUC32edGpEYyVtkWbvCn6HqFnHHNoZScg8SMCE=; b=ZJ8wURPg+5wY7IrRf60rQD0o9JtsQmMHUNCq9krbpCrnn1sSOWmuSd1qecFxrklLSc 2/n0zJtpxvrgpLfUaYT+JFyLLDasoATVCfCU3OeItLc0y0PdRmt0PoSQ33u6XLS9QGDU zMzJmdTVikUvBaaoGRMUsO8zlWENb+jdZnYFUvnKPZvV7lkmSD8H9w9pWXHKFJAh+xMD HpXBhMldbe7tnIwdJzX6BRyDJUa8ercEJKDxQ/j4nPE4bhHadGc9Ur5OjngcG7cn3whj 7lBWxEA1Pc8XstxE8UBanjzswN/UwHWkUKjjdcb+RVnFYRJioFZaYFlKdjhsCNrwUU7g L9pg== 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:mime-version:content-transfer-encoding; bh=EKgddJUC32edGpEYyVtkWbvCn6HqFnHHNoZScg8SMCE=; b=bSlWvJppUMrYkMQL9D/2alYel7WNbreVEm5vVA+xyL3R56Y+pPxcZn39BRDwcMLEbX 8I543qjBNlS3qtzCWW5u/LuWPtsGzWLSSppy0tw59ylDnHwv2Ef7dd2dvJ0XQVfoYbEK yHePQwhNJ2ItCB62/28QEasnGv01lTP01/rR08/XUqgO+Nz3p7/RPlYQAEpA1xnDV9zu XMD1jdiu+OUGuYqniYMhF3TSQxwryARsRjwSOqiIS3JArRHxJ4xNFJHD3AhsYO5EfpF6 sgjezsIWLxgn6IGG800XXfSwA0de4PGhkLaGr5Soy7wct6Jv3EQD7xsTzpJCQ/OdO79H cdeA== X-Gm-Message-State: APjAAAXypRlu8S1ru0hfTnIhQFv9QA0kwX0AZ3EbmX1in30Y1ucKb5Sp 1aec9O+GaAm/os2rBa2wFVHzkcnR X-Google-Smtp-Source: APXvYqx340DkaCSIciOZeVwEvQHOhFj2xPHa7dAx8KDCHz1WBRxC+fKB1o2sUMr/HzJ34gjKmwFtUA== X-Received: by 2002:adf:ec4c:: with SMTP id w12mr4227592wrn.124.1578486792780; Wed, 08 Jan 2020 04:33:12 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 16/38] hw/ppc/Kconfig: Only select fw_cfg with machines using OpenBIOS Date: Wed, 8 Jan 2020 13:32:33 +0100 Message-Id: <1578486775-52247-17-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> References: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::431 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 The fw_cfg helpers are only used by machines using OpenBIOS. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20191231183216.6781-11-philmd@redhat.com> Acked-by: David Gibson Signed-off-by: Paolo Bonzini --- hw/ppc/Kconfig | 6 ++++++ hw/ppc/Makefile.objs | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index d8482a5..e4ca920 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -72,6 +72,7 @@ config PREP select M48T59 select PC87312 select RS6000_MC + select FW_CFG_PPC =20 config RS6000_MC bool @@ -85,6 +86,7 @@ config MAC_OLDWORLD select GRACKLE_PCI select HEATHROW_PIC select MACIO + select FW_CFG_PPC =20 config MAC_NEWWORLD bool @@ -96,6 +98,7 @@ config MAC_NEWWORLD select MACIO_GPIO select MAC_PMU select UNIN_PCI + select FW_CFG_PPC =20 config E500 bool @@ -130,3 +133,6 @@ config XIVE_KVM bool default y depends on XIVE_SPAPR && KVM + +config FW_CFG_PPC + bool diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index 79adf06..5c46c68 100644 --- a/hw/ppc/Makefile.objs +++ b/hw/ppc/Makefile.objs @@ -1,5 +1,6 @@ # shared objects -obj-y +=3D ppc.o ppc_booke.o fdt.o fw_cfg.o +obj-y +=3D ppc.o ppc_booke.o fdt.o +obj-$(CONFIG_FW_CFG_PPC) +=3D fw_cfg.o # IBM pSeries (sPAPR) obj-$(CONFIG_PSERIES) +=3D spapr.o spapr_caps.o spapr_vio.o spapr_events.o obj-$(CONFIG_PSERIES) +=3D spapr_hcall.o spapr_iommu.o spapr_rtas.o --=20 1.8.3.1 From nobody Fri May 17 15:28:08 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578487373; cv=none; d=zohomail.com; s=zohoarc; b=iUPKUK2siAiaVslBNFbavWUf4OrPwbStTKt+kxm4nX4LYuXBqIz7YP0SJbY4xUIbBb4ls6y94pHneO8xc+HGgbCLj31QJBcDnyvY/AcrKaDHXhtc5JGhkwxZEvGs79dgP4gY7zdIGRfrZ1STTUJL9FeaohoHrFu7LqTZJvkNt9Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578487373; h=Content-Type:Content-Transfer-Encoding:Cc: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=9GhguyiRSp1UcskdHA85/bdqym1ln7bK2buwf0+ga1w=; b=hR+8CTIFcRgkcpK0uecqoajhMgNNSY1k+NM2XeAfXcR9+WazMJdmXJhWFWB0D49MyJEpXyEb4WxP+k1tFQJ7PQOk0teYa42z+vb575hC1aoOfthULz7K7QKPf2wsvpqR7NzW5XakNKoNOP5KTepTX8NgBDUEs0P48+Y2AUVspY8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578487373935748.0394265605169; Wed, 8 Jan 2020 04:42:53 -0800 (PST) Received: from localhost ([::1]:42930 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAfk-0000gW-Ho for importer@patchew.org; Wed, 08 Jan 2020 07:42:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60410) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAWT-0003u4-FO for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipAWS-0004Ng-97 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:17 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:40110) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipAWS-0004NA-2w for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:16 -0500 Received: by mail-wr1-x436.google.com with SMTP id c14so3181103wrn.7 for ; Wed, 08 Jan 2020 04:33:16 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id o4sm4037750wrw.97.2020.01.08.04.33.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 04:33:13 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=9GhguyiRSp1UcskdHA85/bdqym1ln7bK2buwf0+ga1w=; b=hzJ6+SnoW8lY+KSRvWNZCNWAbSdcsOezhsQq2198AlMqgAZla4Bt/MIdGHCOQTz1A2 m/Hza6D03uwL2fbuWVhiKNt8DYRcAzUYy1MVRw+h8LBatdjCOQos1nxiioUKiaIs0bDv Uu3FqUSZKoJJYgEVi7jJunHbfsLds4mS7sGz4ffxO75eDDGQB9+I3TfVJiJoyf3fc/zw sTWL9JIZ9pmuX5OcW0vGbilM+RYz9f30/4mnZGSJxBIzmdTNsAt0+9hrYL9t6irjoV/6 BpXZk95S8NDzAEIcotuXULSiOXXS0sbsBC3JsYKec35b4LoygSBEly9xP4GFBRJc4tpn xRHw== 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:mime-version:content-transfer-encoding; bh=9GhguyiRSp1UcskdHA85/bdqym1ln7bK2buwf0+ga1w=; b=Gj/9u6E6wCq+tuiPu224qs1qL8x/YNDl7PRIKl8PWlhsYkNhKtJdSi9qhulc004ns0 oRwGejGbOmlqbRGxb+6aa8OnIS2bUCMdFiigOtOfyw65+VkIPLrkuMI4Gss4ha6NBrjP H3YN2uPV6eMLz7bhGLOyxRUya8DqPC4iC9XqjRM5eIqBSV/nicVDHXQ4qlu7J48uNKgN eD9/jdn7aNXaeEqbDg3ek2L+V848A6BB3Xq8zq4q66XxP8zHq/MqBjY3swJMp6xLw/BV zDyvucxmXZPWolVnJjE5F8n4MbtQh6GKDviJRytBvJuCorMpo/Rt0cS9PW/XrtY5eUkN vmUA== X-Gm-Message-State: APjAAAXXkk+kdQ/j041gUPzUGoS1yOQd0YtNYqG7jAvoBerm2wbQCTxJ 5wRycrjankJfnkyIbp7ieDObJPLE X-Google-Smtp-Source: APXvYqyDm34vOXvc+akpMSr15Evynypkz7uCAE8C7iekYLeoRDPYbeG05gIZDLm21wz7iZRSrF8SCQ== X-Received: by 2002:adf:e887:: with SMTP id d7mr4195010wrm.162.1578486794301; Wed, 08 Jan 2020 04:33:14 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 17/38] hw/ppc/Kconfig: Only select FDT helper for machines using it Date: Wed, 8 Jan 2020 13:32:34 +0100 Message-Id: <1578486775-52247-18-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> References: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::436 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 Not all machines use the ppc_create_page_sizes_prop() helper. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20191231183216.6781-12-philmd@redhat.com> Acked-by: David Gibson Signed-off-by: Paolo Bonzini --- hw/ppc/Kconfig | 10 ++++++++++ hw/ppc/Makefile.objs | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index e4ca920..8e62d8f 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -10,6 +10,7 @@ config PSERIES select XICS_SPAPR select XIVE_SPAPR select MSI_NONBROKEN + select FDT_PPC =20 config SPAPR_RNG bool @@ -26,6 +27,7 @@ config POWERNV select MC146818RTC select XICS select XIVE + select FDT_PPC =20 config PPC405 bool @@ -42,6 +44,7 @@ config PPC440 select PCI_EXPRESS select PPC4XX select SERIAL + select FDT_PPC =20 config PPC4XX bool @@ -60,6 +63,7 @@ config SAM460EX select SMBUS_EEPROM select USB_EHCI_SYSBUS select USB_OHCI + select FDT_PPC =20 config PREP bool @@ -110,6 +114,7 @@ config E500 select PPCE500_PCI select SERIAL select MPC_I2C + select FDT_PPC =20 config VIRTEX bool @@ -118,6 +123,7 @@ config VIRTEX select SERIAL select XILINX select XILINX_ETHLITE + select FDT_PPC =20 config XIVE bool @@ -134,5 +140,9 @@ config XIVE_KVM default y depends on XIVE_SPAPR && KVM =20 +# Only used by 64-bit targets config FW_CFG_PPC bool + +config FDT_PPC + bool diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index 5c46c68..a4bac57 100644 --- a/hw/ppc/Makefile.objs +++ b/hw/ppc/Makefile.objs @@ -1,5 +1,6 @@ # shared objects -obj-y +=3D ppc.o ppc_booke.o fdt.o +obj-y +=3D ppc.o ppc_booke.o +obj-$(CONFIG_FDT_PPC) +=3D fdt.o obj-$(CONFIG_FW_CFG_PPC) +=3D fw_cfg.o # IBM pSeries (sPAPR) obj-$(CONFIG_PSERIES) +=3D spapr.o spapr_caps.o spapr_vio.o spapr_events.o --=20 1.8.3.1 From nobody Fri May 17 15:28:08 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578487534; cv=none; d=zohomail.com; s=zohoarc; b=fA7Ldp/XIXmCI/Hv/RcNrSGrLK/cIavsp3Cf3QlLkiYImfOW7Dg1joUPT7+CLHWPHoNSAITKpByBX2nS4ZikS2yoVEafp1xN8rr4J6POVKTVZLhEFG/sZnCOEI5da+AB7x5YRr6ViNppUXhOcYdwvIDrNHOGtYaXu5/zr+t4JSI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578487534; h=Content-Type:Content-Transfer-Encoding:Cc: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=Qh4jWZJgN9CHYXZp74ZZsly2/NEoMB2jqVftu14Z+fE=; b=fCNYuIdzF6th1XjUd6YKHOuyZ+87Un5+4+LFVYssmLFUReCQqbzeIcRu3dtTfoUD9lq6g3ly5ciBwEMq0Ib4tFd+ZZoNLaDsQve3K0e43grVoXaHdw3fJ+msfwsgSxr3p3iPHNZb3XR17V5YthsiWZVTXuoFxcFFjIc5A21/KAs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578487534616307.64338587405894; Wed, 8 Jan 2020 04:45:34 -0800 (PST) Received: from localhost ([::1]:42956 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAiK-0004aj-Sa for importer@patchew.org; Wed, 08 Jan 2020 07:45:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60412) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAWT-0003uL-V4 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipAWS-0004Ns-Hv for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:17 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:46973) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipAWS-0004NJ-BS for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:16 -0500 Received: by mail-wr1-x42c.google.com with SMTP id z7so3124212wrl.13 for ; Wed, 08 Jan 2020 04:33:16 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id o4sm4037750wrw.97.2020.01.08.04.33.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 04:33:14 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=Qh4jWZJgN9CHYXZp74ZZsly2/NEoMB2jqVftu14Z+fE=; b=tE8L6qrChZzgiym0pYU+5CVN24I3GgKASNZKziCWOqQELRTuKc7GfuQ5tIKtm7H1St HhVjCPs6G9LkBOcTt9ySIU0CmMMMwRQZ1Cg1xc7PvLfmkG3evhQ9ovTv6yXcNrnXSZtD qF60re+tH0YGiIBFYw44tI4GWUQHGUUPlbxePJy7YE2VuJS6oHzmbUvIECI/XH+EbOFR ah7l44zuN0rWNEQgYz+aR95MPZ/4UNo4uDsyzQTmU4nYEtY+7eJ4tk+XJJgUASVK41iX j93i6fTDTulEyPY+/BNmOwBzjUMkJVpp/c2F2snaAeIIIKvUZXxHMY7Z8q2Ka2p+3MA/ wpkA== 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:mime-version:content-transfer-encoding; bh=Qh4jWZJgN9CHYXZp74ZZsly2/NEoMB2jqVftu14Z+fE=; b=jskZiKQCD9rAb+oOBoVaioUGBgwqSF0cc7g93Y0B8talY6aGiE0mCRLVsCI0se5AtZ 0VOAEcLmsnsqvrGIDD4JTKJsVyZ8EjkevI4k4j3W7ZrOGxWLw4ehn9BGUKlLOrIWDRbH 814n9+Ipw+FdbRq6ntshGqmP4QeKjkyO3NHkFyqKfImMwc55NgIvkuNaFRD7TOoz1EnU DLc+pgYP0HeJJASob7KN0ZoRidJqTN27vZjPhQS77bBji2MhNhpZtaE135hcDmkZt/f5 mNN0/W1vqrhCGpO2thFmMUSfrYcIQB5615D+okGRkXl7Wj4/gKz7KCvDxATs7hKK9evB cf4g== X-Gm-Message-State: APjAAAUxENEk21INMCxNsFBq9mIk2Ud7JcA3FdVXu8Apxj14SJuMUt5H Znf7jt/G2Hj0qhW9NqugS1tDkF4g X-Google-Smtp-Source: APXvYqxOTxAxFOfChmsvKZT7hZnt4cLU7CKfxqMP45qRpCpIH3zf+g/bFJrLsBPcSb/9Fcyehrkwag== X-Received: by 2002:a05:6000:50:: with SMTP id k16mr4250351wrx.145.1578486795102; Wed, 08 Jan 2020 04:33:15 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 18/38] hw/nvram/Kconfig: Add an entry for the NMC93xx EEPROM Date: Wed, 8 Jan 2020 13:32:35 +0100 Message-Id: <1578486775-52247-19-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> References: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 The NMC93xx EEPROM is only used by few NIC cards and the Am53C974 SCSI controller. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20191231183216.6781-13-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- hw/net/Kconfig | 2 ++ hw/nvram/Kconfig | 4 ++++ hw/nvram/Makefile.objs | 2 +- hw/scsi/Kconfig | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/hw/net/Kconfig b/hw/net/Kconfig index 3856417..af6a11b 100644 --- a/hw/net/Kconfig +++ b/hw/net/Kconfig @@ -14,6 +14,7 @@ config EEPRO100_PCI bool default y if PCI_DEVICES depends on PCI + select NMC93XX_EEPROM =20 config PCNET_PCI bool @@ -28,6 +29,7 @@ config TULIP bool default y if PCI_DEVICES depends on PCI + select NMC93XX_EEPROM =20 config E1000_PCI bool diff --git a/hw/nvram/Kconfig b/hw/nvram/Kconfig index ebaa749..24b0ce6 100644 --- a/hw/nvram/Kconfig +++ b/hw/nvram/Kconfig @@ -7,3 +7,7 @@ config AT24C =20 config MAC_NVRAM bool + +# NMC93XX uses the NS uWire interface (similar to SPI but less configurabl= e) +config NMC93XX_EEPROM + bool diff --git a/hw/nvram/Makefile.objs b/hw/nvram/Makefile.objs index 26f7b4c..a4bdfbf 100644 --- a/hw/nvram/Makefile.objs +++ b/hw/nvram/Makefile.objs @@ -1,5 +1,5 @@ common-obj-$(CONFIG_DS1225Y) +=3D ds1225y.o -common-obj-y +=3D eeprom93xx.o +common-obj-$(CONFIG_NMC93XX_EEPROM) +=3D eeprom93xx.o common-obj-$(CONFIG_AT24C) +=3D eeprom_at24c.o common-obj-y +=3D fw_cfg.o common-obj-y +=3D chrp_nvram.o diff --git a/hw/scsi/Kconfig b/hw/scsi/Kconfig index b3ba540..77d397c 100644 --- a/hw/scsi/Kconfig +++ b/hw/scsi/Kconfig @@ -34,6 +34,7 @@ config ESP_PCI default y if PCI_DEVICES depends on PCI select ESP + select NMC93XX_EEPROM =20 config SPAPR_VSCSI bool --=20 1.8.3.1 From nobody Fri May 17 15:28:08 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578487533; cv=none; d=zohomail.com; s=zohoarc; b=LsAQNbWfL5DFJDJrfOY9BxILWL2zhL0jpabL3BzhSqevdpHxwBoHjeKx9pnVo4+W8wwrGeQ7bizgWSLaRb3fHtIxsBt6q7QnQ88kdN/OLYW+SiTWhNAd7VyGIhHOiw3LEu7QxVmNo+ZKQ95NYkUN902vWG9fDMXf179zNmZZVPM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578487533; h=Content-Type:Content-Transfer-Encoding:Cc: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=CnOeB/Pwe7MijHlbGwtaQatM9vOSG1aqVBwm/NF6PNU=; b=ewt4diSDuWDosSp5lBcHqBQ0SW6n06i5eWAA0xluAkvQny/OlohETBOhUFjdtQxeIWbdUrKG8V3YxLkPj5h5Yi4u4hlNanYqujf95YhU4WBBzkgPCa48aXZUVDtymoRcV3lFScjYOiEQkAc5tJx3YHotqhVHKMXDO3+mVodJvK4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578487533462348.48847729245733; Wed, 8 Jan 2020 04:45:33 -0800 (PST) Received: from localhost ([::1]:42954 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAiI-0004Xs-T9 for importer@patchew.org; Wed, 08 Jan 2020 07:45:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60444) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAWV-0003w9-2w for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipAWT-0004Ob-S0 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:18 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:36679) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipAWT-0004O1-Lj for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:17 -0500 Received: by mail-wm1-x32c.google.com with SMTP id p17so2323907wma.1 for ; Wed, 08 Jan 2020 04:33:17 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id o4sm4037750wrw.97.2020.01.08.04.33.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 04:33:15 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=CnOeB/Pwe7MijHlbGwtaQatM9vOSG1aqVBwm/NF6PNU=; b=n/yW7GWx3WnhjsAvC6EMfZJjQLwle+CoGy0/kUsagbFjraKgy8hkJel9MzLfhD8Zt4 INKZb4VCl+EqORRJubSer4RStx4cpPjzo7fFNh9Qg/uwmyUT18RiQxmXCDN1jnQ08hsl N1IH5iVFNyaZJwyzRCiQsxOd8BO7DI5ZR6vUJ+Muc+8YaxeABicxjYROcJuqOflzkIxY WH1gZH607FXmczypHL+kB8vRe5bhCMnLyt8PhAmXBY228MrCxThltSNlLysFM3ULtRWU K3uyQbSP0XEhQud1t01N+epb3VBhyVrGFM5izH4CHZsiy+9qfeJ0j748UTDkMXkGlBWN uE8g== 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:mime-version:content-transfer-encoding; bh=CnOeB/Pwe7MijHlbGwtaQatM9vOSG1aqVBwm/NF6PNU=; b=X9HkxMxD3OQsHZXhO+Xumzx5XVVuvsqewg3aeOSZsOOlIhgRVAsxkfhcncKPYR0pWx Nt/Y3ngH3gWv91TLoC+lPS/Yka+O0bi6Rt4z8Q91gxOqGoGnE0R9RYWiscEmBDc8wbEF t/ka9vdWMNCO4H+QNeAF19BAbewhakGoNiDnGAmJl2lGw1B+i+r9uLMBAnEM1QQlDzOo 8LumZ35cxPjDV7/EcA4bUQbDV+n02QrIY1OjimdOGuj2WQUqthchn4Cka8xs7DaYTZGv I4YFFIH5vaacvgFBe6tFKrTS5hr8BIGy7px2lvS8WaM5PE0OYiM7GNO6iC4zNvG3+AVJ LkMw== X-Gm-Message-State: APjAAAUnZjfJFdhyYF+zeCWvcPghNvV1xw6Vu6DVKnJxmEmXdVttk19M D4fhf/LUZPhFiaWK7GJ0zlbLA2oC X-Google-Smtp-Source: APXvYqzqI7jwgG5VCKOFfW0SfU6EyiFQ29sk6mWhvbdjlgjUdACDYLR/2be+3I7mWg3Ar4zl64RJ+Q== X-Received: by 2002:a7b:c4cc:: with SMTP id g12mr3760579wmk.68.1578486796516; Wed, 08 Jan 2020 04:33:16 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 19/38] hw/nvram/Kconfig: Restrict CHRP NVRAM to machines using OpenBIOS or SLOF Date: Wed, 8 Jan 2020 13:32:36 +0100 Message-Id: <1578486775-52247-20-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> References: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 Only the OpenBIOS and SLOF firmwares use the CHRP NVRAM layout. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20191231183216.6781-14-philmd@redhat.com> Acked-by: David Gibson Signed-off-by: Paolo Bonzini --- hw/nvram/Kconfig | 4 ++++ hw/nvram/Makefile.objs | 2 +- hw/ppc/Kconfig | 1 + hw/sparc/Kconfig | 1 + hw/sparc64/Kconfig | 1 + 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/hw/nvram/Kconfig b/hw/nvram/Kconfig index 24b0ce6..e872fcb 100644 --- a/hw/nvram/Kconfig +++ b/hw/nvram/Kconfig @@ -7,7 +7,11 @@ config AT24C =20 config MAC_NVRAM bool + select CHRP_NVRAM =20 # NMC93XX uses the NS uWire interface (similar to SPI but less configurabl= e) config NMC93XX_EEPROM bool + +config CHRP_NVRAM + bool diff --git a/hw/nvram/Makefile.objs b/hw/nvram/Makefile.objs index a4bdfbf..090df63 100644 --- a/hw/nvram/Makefile.objs +++ b/hw/nvram/Makefile.objs @@ -2,7 +2,7 @@ common-obj-$(CONFIG_DS1225Y) +=3D ds1225y.o common-obj-$(CONFIG_NMC93XX_EEPROM) +=3D eeprom93xx.o common-obj-$(CONFIG_AT24C) +=3D eeprom_at24c.o common-obj-y +=3D fw_cfg.o -common-obj-y +=3D chrp_nvram.o +common-obj-$(CONFIG_CHRP_NVRAM) +=3D chrp_nvram.o common-obj-$(CONFIG_MAC_NVRAM) +=3D mac_nvram.o obj-$(CONFIG_PSERIES) +=3D spapr_nvram.o obj-$(CONFIG_NRF51_SOC) +=3D nrf51_nvm.o diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index 8e62d8f..e27efe9 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -11,6 +11,7 @@ config PSERIES select XIVE_SPAPR select MSI_NONBROKEN select FDT_PPC + select CHRP_NVRAM =20 config SPAPR_RNG bool diff --git a/hw/sparc/Kconfig b/hw/sparc/Kconfig index 2a83a80..22aff2f 100644 --- a/hw/sparc/Kconfig +++ b/hw/sparc/Kconfig @@ -12,6 +12,7 @@ config SUN4M select LANCE select M48T59 select STP2000 + select CHRP_NVRAM =20 config LEON3 bool diff --git a/hw/sparc64/Kconfig b/hw/sparc64/Kconfig index f9f8b0f..980a201 100644 --- a/hw/sparc64/Kconfig +++ b/hw/sparc64/Kconfig @@ -12,6 +12,7 @@ config SUN4U select IDE_CMD646 select PCKBD select SIMBA + select CHRP_NVRAM =20 config NIAGARA bool --=20 1.8.3.1 From nobody Fri May 17 15:28:08 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578487752; cv=none; d=zohomail.com; s=zohoarc; b=WkSHHFvIipFg/AhqROi4hGUJh4nqz0hjPXHV3U/HqzXKLQGdTIA7Xx+3CVMr0r7GWcTgfbsvf1/EX0P2QMQ2DD53EWoj26sEOcrbJ32pXqLctwhmRpENMcx5SfewPlQyI7gI9yyKqUzfCyeevPxoQVvCwNUdsapbHwtLsep1Rig= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578487752; h=Content-Type:Content-Transfer-Encoding:Cc: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=ZENGOtMS6+bKQUaERKPKm8qYGAS6+eCRE25grnCOJjk=; b=RokW3zqX8oPj5kPe8wK8L3f057n5MWrcVbp1ir0dDmHTkkxLArjoeEU3vbZifsKM80sSE1OxBVHqXrtpk486NeByKiFKwPSAtQeppVnS0GVqCrSXXgcERG+ngXPrgxrdU58QfGnXfOk3dB94IG+lIjwyxiWOkZUoZvDpAnmE3KE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578487752738349.78741117471577; Wed, 8 Jan 2020 04:49:12 -0800 (PST) Received: from localhost ([::1]:43016 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAlq-0000Sz-S2 for importer@patchew.org; Wed, 08 Jan 2020 07:49:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60451) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAWV-0003wr-Hw for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipAWU-0004PE-KS for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:19 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:51292) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipAWU-0004Of-Eg for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:18 -0500 Received: by mail-wm1-x332.google.com with SMTP id d73so2307213wmd.1 for ; Wed, 08 Jan 2020 04:33:18 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id o4sm4037750wrw.97.2020.01.08.04.33.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 04:33:16 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=ZENGOtMS6+bKQUaERKPKm8qYGAS6+eCRE25grnCOJjk=; b=PWoTVDsnsWBBEB81pkQ8E/z2BjlJZNHqextjiw8AvAw47LiNz7Ge0kEnw/RictIOpq ZDFUfLhOD5JpKxuNrUqHCB3XtiYQ1eTACdD+nfBwGaCG8RZxLgQckLDclRZdwAda4qkw 048jfBQyxdPatXYJJtVlOzpnIKhvJhwtM9GtO+/5xz2KgsaSpv/OUNDt90DwXmPTMKFA P0jxTzOKPWb92Kdnm7PtXASf4aelwR9z2qrcqh7F4WKw94pYysbz3I0qb/TTvQfYhpoD /rt3hOF90EBXeQkhPuGIfF8E2f2CWt1C3dYd2Jq+xemHsvnKcALZFdEpe0Z8grVzyXLy jNtg== 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:mime-version:content-transfer-encoding; bh=ZENGOtMS6+bKQUaERKPKm8qYGAS6+eCRE25grnCOJjk=; b=g6Q3RcAp82k4c+CnazdoPfwBhbJ8tF8FQol4/Fvy2XaeU20eG3b2EmlgmNUkx3TaMh MUVjN7UwM0RoDZ/iZgfyFnZG4ycYZQkZ2VLEj+VAok+js2ULalOj8sM9HwG2On9zP1ka mmyG93NbAYfS2yqVd74Z1x2EeMZY/LZIkrx0CrA+IoD6UeYg4X2J0gtEOcDIJQqxUXsY Y0ozjxbgmXGWYt3KB0fiV15xxLCVfCngkJe4/wggNe2NvL/09Cagx1chq9veboY/RTut f/xLYGTHbOSxFQniU/z3q130jpyOn1jimMQSFHjx0fwbf2YibXTjKvrTGvp8DlSEUmMz kmrg== X-Gm-Message-State: APjAAAWuK3ry/3sS1G76jRgwOC63TZFDVmeKzkQMnJd2sgzFICR44U1O k8Da+WL3IeOEPMjiq6igWZir2zJf X-Google-Smtp-Source: APXvYqwnv/cZtv7N/ojW3GZ3gVip8CNh+hKTEDwS47sKLhKzwdgn94qwPeFQvMK2TJamHGFY7G3j6Q== X-Received: by 2002:a05:600c:507:: with SMTP id i7mr3795819wmc.135.1578486797347; Wed, 08 Jan 2020 04:33:17 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 20/38] hw/rtc/mc146818: Add missing dependency on ISA Bus Date: Wed, 8 Jan 2020 13:32:37 +0100 Message-Id: <1578486775-52247-21-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> References: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::332 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 The MC146818 sits on an ISA bus. Since it can not be used without it, select ISA in the Kconfig. Fixes: 82f5181777 ("kconfig: introduce kconfig files", 2019-03-07) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20191224111628.3551-1-philmd@redhat.com> Reviewed-by: Stefano Garzarella Signed-off-by: Paolo Bonzini --- hw/rtc/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/rtc/Kconfig b/hw/rtc/Kconfig index 45daa8d..3dc2dd6 100644 --- a/hw/rtc/Kconfig +++ b/hw/rtc/Kconfig @@ -17,6 +17,7 @@ config TWL92230 depends on I2C =20 config MC146818RTC + depends on ISA_BUS bool =20 config SUN4V_RTC --=20 1.8.3.1 From nobody Fri May 17 15:28:08 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578487748; cv=none; d=zohomail.com; s=zohoarc; b=dmfRQnIO7a5rAZojSiR9LC1Z07n3DIfX+wn1xdZqszHa5gNDC25z0NMCwtvNRqmOyyWkgIjyUIg/d2CslnGHVkexhh5IaL0g+iv5sXyGDcEhPVufXHeFD7v8kaxScYvbJAT1fhpPNlJLKzlatETp0pN5bW7Kd+pQ5KvijMHOclE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578487748; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=pjqdkb919vSGbnhGqmpTVjV2nd+xhVlSchT013lEZf4=; b=YcmR0KTYGPYHaDsYdQDP949dEnuYqaAEor9GD8v+VeYPK2E6Jk1MemKuSBz0V6aGQYw78cclc5UTwyhpvGG4P3p/Cxn52fPh/z6xC84nS3rVFUri42WS++NRSrCOJe9Wuw6w224NZrM4gmvVPprLVGOyA/rqb0T0eVtmtZnkx2I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578487748506965.9099674755546; Wed, 8 Jan 2020 04:49:08 -0800 (PST) Received: from localhost ([::1]:43008 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAlm-0000L5-Lg for importer@patchew.org; Wed, 08 Jan 2020 07:49:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60477) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAWW-0003yV-Pc for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipAWV-0004Q0-Jd for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:20 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:56013) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipAWV-0004PQ-DN for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:19 -0500 Received: by mail-wm1-x332.google.com with SMTP id q9so2276610wmj.5 for ; Wed, 08 Jan 2020 04:33:19 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id o4sm4037750wrw.97.2020.01.08.04.33.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 04:33:17 -0800 (PST) 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=pjqdkb919vSGbnhGqmpTVjV2nd+xhVlSchT013lEZf4=; b=SOoNFmgyyOk6cSR2Im99JnLuqnckG49ouCoz9MhUFkUvzVH0p4cz3oUzV8uaCqmkxE bWB1Qz+e5kdqCMSi9jylSDKbKzoJU/M6cQEOyKZqoYZjwV1EWzSA4ebrF4pLkRSHzx22 IuQvX+xCcWj+AL4gl619PeBErChUNZkYTNJNbOXQBGLIeix7g5NO/RMD7yYPu/dw9izL HirjQ8sx0WQ99Oc9RIFXfrkwKWuk/3Xe3aCikoHk8pZe+PiFetlTd0Z9biWqvEM12/83 a/Yu3T0EYF56ez9+zGPolyHkHwal36JXg2jOn9FCfAv9ci8SX7S8c18tjHfi6QbbSKP9 bEyg== 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=pjqdkb919vSGbnhGqmpTVjV2nd+xhVlSchT013lEZf4=; b=HB3cHMW7+0EH6GL0eifBG44b5wYX0Gtwmzpi94fXBW16+6IlVe/bZ8AU+zL24BktId WdJxsLEuE1/aOHiEbtNqTn3oWVsk6VPgVoGInquumkgePMuPFoWr52QyhF2f+o5p+53U BhtJ0Ac1DOZtiEVc/v0bTONcqlzhhsJ84Ez68kyhJvlJYm2GlZB32ya8rof8I7clEI28 LTjeRUTYTjnEfw3B4VQQE/svE2E6ywIJ9lG3LdK1FJMNVuyVV9Fq1zdji80jMtB0wpaf Mz54gt4Qs2TSqjxM4UDARjcY8vN/VWUdZMXAN8VyoOzl9Yltz5VZtJnZfU8TVdAqv2xK ZlTA== X-Gm-Message-State: APjAAAX6pabeFthva2yjZ5uyTAtSMvoN1xWyGeL9kZ7hniVjKY1+x+XB UUSo/nH0lFlnIYDtIdLZyBwwr6r4 X-Google-Smtp-Source: APXvYqyHoiVzUTX26+8pWc32tXhi2ydMlQP0ECfcIKNbpoCRf9HuepfeWz8SMrVdBbNq0M5blgcN5Q== X-Received: by 2002:a1c:720a:: with SMTP id n10mr3523811wmc.74.1578486798283; Wed, 08 Jan 2020 04:33:18 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 21/38] target/i386: Fix handling of k_gs_base register in 32-bit mode in gdbstub Date: Wed, 8 Jan 2020 13:32:38 +0100 Message-Id: <1578486775-52247-22-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> References: <1578486775-52247-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:4864:20::332 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "mkdolata@us.ibm.com" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: "mkdolata@us.ibm.com" gdb-xml/i386-32bit.xml includes the k_gs_base register too, so we have to handle it even if TARGET_X86_64 is not defined. This is already done in x86_cpu_gdb_read_register, but not in x86_cpu_gdb_write_register where the incorrect return value causes all registers after it to be clobbered. Fixes https://bugs.launchpad.net/qemu/+bug/1857640. Signed-off-by: Marek Dolata Signed-off-by: Paolo Bonzini --- target/i386/gdbstub.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/i386/gdbstub.c b/target/i386/gdbstub.c index aef25b7..572ead6 100644 --- a/target/i386/gdbstub.c +++ b/target/i386/gdbstub.c @@ -350,15 +350,15 @@ int x86_cpu_gdb_write_register(CPUState *cs, uint8_t = *mem_buf, int n) env->segs[R_GS].base =3D ldl_p(mem_buf); return 4; =20 -#ifdef TARGET_X86_64 case IDX_SEG_REGS + 8: +#ifdef TARGET_X86_64 if (env->hflags & HF_CS64_MASK) { env->kernelgsbase =3D ldq_p(mem_buf); return 8; } env->kernelgsbase =3D ldl_p(mem_buf); - return 4; #endif + return 4; =20 case IDX_FP_REGS + 8: cpu_set_fpuc(env, ldl_p(mem_buf)); --=20 1.8.3.1 From nobody Fri May 17 15:28:08 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578487891; cv=none; d=zohomail.com; s=zohoarc; b=ApHhMs9XOWSjundpE/qKHyKetG8/JYqq4JYWVOVTDa2nFDM7QOtQ4F6pfDha6eXAd1imPYKf/GZ+OIWrX5Dmn3L617IN5u2RTgZFG0ptcirtJpgh6CcqiHqPdi7xB7CL/x5BAgufNsqrpvdKnEPVCsCXGvx67rFcREAbcPDgOcU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578487891; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=+1cYJv2/SCgEaS7XXUU1nSsoWuZ/j2VFPEMFOllKrRM=; b=GxPVfU7EYVGqyoqW8IfIi7rf9KYu37ED/KWOAevvkD07lxGJPwO6DR6/iLUaaGYxTmCZbDLwmsbts9xACEcl7KMrsGZxe8Kcm5Bq4+iSuH3wROb+etjsC6wRH/gEHi8fnsywOsJ+4HVO1nKNgIB5KUrebNHzg1yrcTzDyIyDECQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578487891433857.616018443155; Wed, 8 Jan 2020 04:51:31 -0800 (PST) Received: from localhost ([::1]:43052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAo5-0004W7-M0 for importer@patchew.org; Wed, 08 Jan 2020 07:51:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60498) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAWX-00040B-T8 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipAWW-0004Qq-P7 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:21 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:54663) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipAWW-0004QV-J4 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:20 -0500 Received: by mail-wm1-x32f.google.com with SMTP id b19so2289107wmj.4 for ; Wed, 08 Jan 2020 04:33:20 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id o4sm4037750wrw.97.2020.01.08.04.33.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 04:33:18 -0800 (PST) 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=+1cYJv2/SCgEaS7XXUU1nSsoWuZ/j2VFPEMFOllKrRM=; b=bVhaNaPqrDQgdP5kUomEIYo3Q4Y/Z42aG4o/qISYzhO+jonvaeNpueyKLdrE2pW4Fq MqxQqonlWXakjJmXE4PGXY6YFcNJpvkC7FLjWuzJIr0wFygKZvGNJKrF+le0Pwh7Uu1t 71u7QFREQtcSIonVNzdiHo2UDJ7XuvDwmyVp2WyX03fd6XzObG6LLG+K4P84WA38eMRU G3z7NM7ZUbSgsfcbUJWkbgE0GO+evvUjOao9nGJeGwrfyXBL1IErlPRpvukpNLci9gEv egb9FabPIdq1PaPRAeRSoOlHWuhWJW+N3D6beDqQZgVNywSHnugn9+VdVjy9f3mTgvOi vakA== 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=+1cYJv2/SCgEaS7XXUU1nSsoWuZ/j2VFPEMFOllKrRM=; b=CdphlD8RxGmit2fxuDUDz3lYszGuaOviAixGjhVoJ0f63rXlkINQ6mIeVC/wLL+ETM cK3VWeFs6oqGgg74xF/9FSbpxYdKsmBZcxJY8ahG+GxTNOu/6po5ezYqXkzr1USSchcQ /Tcc0RzKCtvEhFM9DUDo2stLEYmdqFiO3dE2K18mgUGyOeFkC5rSFYF8mtnBX9p3KC0I kmuEOc9T2KxS1BECbuFKozFV61Tgks+pkQdjkh5AnmMExbX9KfEK2WN9T1DTYZcl9mJk touH6KP3J4vnyGTV4/cd+dGh4sgdVmtnlZfxFeXupp99eCRqx4xXsxjfoJr/GMrJU2p1 CW/Q== X-Gm-Message-State: APjAAAXlzUs3N5AcFLBuRLW4JsmzyXXi8LUaHfRsMnVy68HlEo0x07uR rhp+JhTxeK7mcQV9oDnaspsmLaE0 X-Google-Smtp-Source: APXvYqydHOayDxZgebsipaKXg4xEAvDXJmDPPQz5N5+9LHkl0nSzmEKrbk68gVczU7x+kNpuouAC0A== X-Received: by 2002:a7b:c5d8:: with SMTP id n24mr3549692wmk.124.1578486799468; Wed, 08 Jan 2020 04:33:19 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 22/38] target/i386: Add new bit definitions of MSR_IA32_ARCH_CAPABILITIES Date: Wed, 8 Jan 2020 13:32:39 +0100 Message-Id: <1578486775-52247-23-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> References: <1578486775-52247-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:4864:20::32f X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Xiaoyao Li Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Xiaoyao Li The bit 6, 7 and 8 of MSR_IA32_ARCH_CAPABILITIES are recently disclosed for some security issues. Add the definitions for them to be used by named CPU models. Signed-off-by: Xiaoyao Li Message-Id: <20191225063018.20038-2-xiaoyao.li@intel.com> Signed-off-by: Paolo Bonzini --- target/i386/cpu.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index af28293..594326a 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -835,12 +835,15 @@ typedef uint64_t FeatureWordArray[FEATURE_WORDS]; #define CPUID_TOPOLOGY_LEVEL_DIE (5U << 8) =20 /* MSR Feature Bits */ -#define MSR_ARCH_CAP_RDCL_NO (1U << 0) -#define MSR_ARCH_CAP_IBRS_ALL (1U << 1) -#define MSR_ARCH_CAP_RSBA (1U << 2) +#define MSR_ARCH_CAP_RDCL_NO (1U << 0) +#define MSR_ARCH_CAP_IBRS_ALL (1U << 1) +#define MSR_ARCH_CAP_RSBA (1U << 2) #define MSR_ARCH_CAP_SKIP_L1DFL_VMENTRY (1U << 3) -#define MSR_ARCH_CAP_SSB_NO (1U << 4) -#define MSR_ARCH_CAP_MDS_NO (1U << 5) +#define MSR_ARCH_CAP_SSB_NO (1U << 4) +#define MSR_ARCH_CAP_MDS_NO (1U << 5) +#define MSR_ARCH_CAP_PSCHANGE_MC_NO (1U << 6) +#define MSR_ARCH_CAP_TSX_CTRL_MSR (1U << 7) +#define MSR_ARCH_CAP_TAA_NO (1U << 8) =20 #define MSR_CORE_CAP_SPLIT_LOCK_DETECT (1U << 5) =20 --=20 1.8.3.1 From nobody Fri May 17 15:28:08 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578488000; cv=none; d=zohomail.com; s=zohoarc; b=SmrVSFN3K5hP6jt8T6XdE+v2zS8DRxFWoTxQFHmBpjJ6F9w6Tn8ikUlhZsa4wfpxP52OLbQXpeCbtDw3XIB+IyYx74Tl2XcnsSzLu0LVIRxQTQ51hlSPpkPjj+Al4yfcpGXhtm/uiMnYa9B4GWquNRf85syiwMkuG6V6x1buYNQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578488000; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=UeENLvRwrDsNkqw+B9afODa0EzPzMsyGlro5fDioYQ4=; b=gcrfYZioL4nqs2ehGENl0g3X262JgXYe02CCTQzsZFcE/pzB5NSMUWs0lOvCE8hivKUHs5/x+2SRoSFgU9GMLGZh7RpjPQIHONMdrTnCPMYfpAPlfSwD4nBZV8b2orzfZXOT3LpFgu2MaXRQiPolWd2cxQLxz1jeOU9dcc13f8w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578488000771861.89903839778; Wed, 8 Jan 2020 04:53:20 -0800 (PST) Received: from localhost ([::1]:43078 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipApr-00079c-Ef for importer@patchew.org; Wed, 08 Jan 2020 07:53:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60524) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAWZ-00042f-Hy for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipAWY-0004Ry-84 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:23 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:35060) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipAWY-0004RO-1r for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:22 -0500 Received: by mail-wr1-x435.google.com with SMTP id g17so3219927wro.2 for ; Wed, 08 Jan 2020 04:33:21 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id o4sm4037750wrw.97.2020.01.08.04.33.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 04:33:19 -0800 (PST) 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=UeENLvRwrDsNkqw+B9afODa0EzPzMsyGlro5fDioYQ4=; b=uhxZA+fcpFGZkJxCF0Qw7W4oES8cuOWk88MnvMC74dlwsbHRm5TMMm0UfKFej6teJU oCUIvXZrm5UEE0UJXxkxVW6vbSK9dO3R/hAYiL4ljuSUCfvksS/DeEceqv2u84Sch4Pq 4qCn1BK3qyLB5/k1wVo1eISZaIFrJtYwj8BSHlfl2jWM0zSKn12VYCdpy4/NdlL/igQF m3ffUNyMLRI6upmxhkp+S8qX958NPhH9Xa8rleCa5HmGwD3JVXAUp1+rkNvv1jcGM6q3 FJX5j0rY2YljpGvx302LGtQgDAEj9v9RCUD3LsEgihwnO3ahZDmyE/6Z4+66zRzJ0ZiK PSdg== 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=UeENLvRwrDsNkqw+B9afODa0EzPzMsyGlro5fDioYQ4=; b=MAztcjSt9P6HRBDVc0r6or1PIDrmy6RNQtK+9gLN7N53A8lvBt4zqT+x3Nor+etS/4 N/8kslcG2CT4p0kHRUKVv4wVFWeAOusGWeW8/dLhHkcpITnpLzNAs0/dqdSn1pjn8Uc5 qWDISgCWw9yLo7VKJVVNaLHeGerdPT8Cev5ahW4MsIVXLicrlktY+rhmO5pvogArfguk bGE+h/vK66X64TYM7ika1oiSD0mIajIRHSQ9saTSXkfbdkGeTSeOQWrZSWXP7oW4ZsvV Wh8c70hsdguwrbtQZdFdV8cmIUY+UucYJfd226PGrhIBzdJkvRL1q0gvaLp4vgcg9ecE CnFQ== X-Gm-Message-State: APjAAAWnMwAfh62sAeyk4mN/u7DgYwORd1avi85VwF+3wG/xCzov849R jPcuksPvBBEmNykK5jrwcOZw+bWp X-Google-Smtp-Source: APXvYqzNITZ/My5eZyTBBG5Iicdwvi2V349rc6JrfxWBLfPzkutf2PejGVUBfJ0QGYeBTwHxfNVl2w== X-Received: by 2002:adf:ebc3:: with SMTP id v3mr4264098wrn.280.1578486800886; Wed, 08 Jan 2020 04:33:20 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 23/38] target/i386: Add missed features to Cooperlake CPU model Date: Wed, 8 Jan 2020 13:32:40 +0100 Message-Id: <1578486775-52247-24-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> References: <1578486775-52247-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:4864:20::435 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Xiaoyao Li Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Xiaoyao Li It lacks VMX features and two security feature bits (disclosed recently) in MSR_IA32_ARCH_CAPABILITIES in current Cooperlake CPU model, so add them. Fixes: 22a866b6166d ("i386: Add new CPU model Cooperlake") Signed-off-by: Xiaoyao Li Message-Id: <20191225063018.20038-3-xiaoyao.li@intel.com> Signed-off-by: Paolo Bonzini --- target/i386/cpu.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 31556b7..41f28ce 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -3198,7 +3198,8 @@ static X86CPUDefinition builtin_x86_defs[] =3D { CPUID_7_0_EDX_SPEC_CTRL_SSBD | CPUID_7_0_EDX_ARCH_CAPABILITIES, .features[FEAT_ARCH_CAPABILITIES] =3D MSR_ARCH_CAP_RDCL_NO | MSR_ARCH_CAP_IBRS_ALL | - MSR_ARCH_CAP_SKIP_L1DFL_VMENTRY | MSR_ARCH_CAP_MDS_NO, + MSR_ARCH_CAP_SKIP_L1DFL_VMENTRY | MSR_ARCH_CAP_MDS_NO | + MSR_ARCH_CAP_PSCHANGE_MC_NO | MSR_ARCH_CAP_TAA_NO, .features[FEAT_7_1_EAX] =3D CPUID_7_1_EAX_AVX512_BF16, /* @@ -3213,6 +3214,54 @@ static X86CPUDefinition builtin_x86_defs[] =3D { CPUID_XSAVE_XGETBV1, .features[FEAT_6_EAX] =3D CPUID_6_EAX_ARAT, + /* Missing: Mode-based execute control (XS/XU), processor tracing,= TSC scaling */ + .features[FEAT_VMX_BASIC] =3D MSR_VMX_BASIC_INS_OUTS | + MSR_VMX_BASIC_TRUE_CTLS, + .features[FEAT_VMX_ENTRY_CTLS] =3D VMX_VM_ENTRY_IA32E_MODE | + VMX_VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL | VMX_VM_ENTRY_LOAD_I= A32_PAT | + VMX_VM_ENTRY_LOAD_DEBUG_CONTROLS | VMX_VM_ENTRY_LOAD_IA32_EFE= R, + .features[FEAT_VMX_EPT_VPID_CAPS] =3D MSR_VMX_EPT_EXECONLY | + MSR_VMX_EPT_PAGE_WALK_LENGTH_4 | MSR_VMX_EPT_WB | MSR_VMX_EPT= _2MB | + MSR_VMX_EPT_1GB | MSR_VMX_EPT_INVEPT | + MSR_VMX_EPT_INVEPT_SINGLE_CONTEXT | MSR_VMX_EPT_INVEPT_ALL_CO= NTEXT | + MSR_VMX_EPT_INVVPID | MSR_VMX_EPT_INVVPID_SINGLE_ADDR | + MSR_VMX_EPT_INVVPID_SINGLE_CONTEXT | MSR_VMX_EPT_INVVPID_ALL_= CONTEXT | + MSR_VMX_EPT_INVVPID_SINGLE_CONTEXT_NOGLOBALS | MSR_VMX_EPT_AD= _BITS, + .features[FEAT_VMX_EXIT_CTLS] =3D + VMX_VM_EXIT_ACK_INTR_ON_EXIT | VMX_VM_EXIT_SAVE_DEBUG_CONTROL= S | + VMX_VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL | + VMX_VM_EXIT_LOAD_IA32_PAT | VMX_VM_EXIT_LOAD_IA32_EFER | + VMX_VM_EXIT_SAVE_IA32_PAT | VMX_VM_EXIT_SAVE_IA32_EFER | + VMX_VM_EXIT_SAVE_VMX_PREEMPTION_TIMER, + .features[FEAT_VMX_MISC] =3D MSR_VMX_MISC_ACTIVITY_HLT | + MSR_VMX_MISC_STORE_LMA | MSR_VMX_MISC_VMWRITE_VMEXIT, + .features[FEAT_VMX_PINBASED_CTLS] =3D VMX_PIN_BASED_EXT_INTR_MASK | + VMX_PIN_BASED_NMI_EXITING | VMX_PIN_BASED_VIRTUAL_NMIS | + VMX_PIN_BASED_VMX_PREEMPTION_TIMER | VMX_PIN_BASED_POSTED_INT= R, + .features[FEAT_VMX_PROCBASED_CTLS] =3D VMX_CPU_BASED_VIRTUAL_INTR_= PENDING | + VMX_CPU_BASED_USE_TSC_OFFSETING | VMX_CPU_BASED_HLT_EXITING | + VMX_CPU_BASED_INVLPG_EXITING | VMX_CPU_BASED_MWAIT_EXITING | + VMX_CPU_BASED_RDPMC_EXITING | VMX_CPU_BASED_RDTSC_EXITING | + VMX_CPU_BASED_CR8_LOAD_EXITING | VMX_CPU_BASED_CR8_STORE_EXIT= ING | + VMX_CPU_BASED_TPR_SHADOW | VMX_CPU_BASED_MOV_DR_EXITING | + VMX_CPU_BASED_UNCOND_IO_EXITING | VMX_CPU_BASED_USE_IO_BITMAP= S | + VMX_CPU_BASED_MONITOR_EXITING | VMX_CPU_BASED_PAUSE_EXITING | + VMX_CPU_BASED_VIRTUAL_NMI_PENDING | VMX_CPU_BASED_USE_MSR_BIT= MAPS | + VMX_CPU_BASED_CR3_LOAD_EXITING | VMX_CPU_BASED_CR3_STORE_EXIT= ING | + VMX_CPU_BASED_MONITOR_TRAP_FLAG | + VMX_CPU_BASED_ACTIVATE_SECONDARY_CONTROLS, + .features[FEAT_VMX_SECONDARY_CTLS] =3D + VMX_SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES | + VMX_SECONDARY_EXEC_WBINVD_EXITING | VMX_SECONDARY_EXEC_ENABLE= _EPT | + VMX_SECONDARY_EXEC_DESC | VMX_SECONDARY_EXEC_RDTSCP | + VMX_SECONDARY_EXEC_VIRTUALIZE_X2APIC_MODE | + VMX_SECONDARY_EXEC_ENABLE_VPID | VMX_SECONDARY_EXEC_UNRESTRIC= TED_GUEST | + VMX_SECONDARY_EXEC_APIC_REGISTER_VIRT | + VMX_SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY | + VMX_SECONDARY_EXEC_RDRAND_EXITING | VMX_SECONDARY_EXEC_ENABLE= _INVPCID | + VMX_SECONDARY_EXEC_ENABLE_VMFUNC | VMX_SECONDARY_EXEC_SHADOW_= VMCS | + VMX_SECONDARY_EXEC_RDSEED_EXITING | VMX_SECONDARY_EXEC_ENABLE= _PML, + .features[FEAT_VMX_VMFUNC] =3D MSR_VMX_VMFUNC_EPT_SWITCHING, .xlevel =3D 0x80000008, .model_id =3D "Intel Xeon Processor (Cooperlake)", }, --=20 1.8.3.1 From nobody Fri May 17 15:28:08 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578487894; cv=none; d=zohomail.com; s=zohoarc; b=DIL2d2aUvwFQSsYXCyR7A4KwdWxHmmhe36iIlDai8xlq42bRFlbdElK4v6+KxHr04NCaJpzFo8RAgw3WKusKa/01HBFgmFyjP1cNU5nYI1dFbki60xsYVVzSOoMbHxbHpjVPbWpZXiAnxImroK3dgwjgNw7mmkOJQkJoo41GckA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578487894; h=Content-Type:Content-Transfer-Encoding:Cc: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=lO5wl48k6ZDCJruKpNcQHB08wbkpBLoPs4vSZC8J3nY=; b=GTJg1ZV4DxVlOP8ImX96HExtBjrT95AtEV9r2UW7vOKmgpfjD6bL+D6Yn+r9vsv023dUwi41H+4PMXLm4eenko6mbRPtaHGKrJWtUcW6Z1/sw0RSahziSjUp5ODNekzQ8e5s4oPuKED1GHJsChVEZEbSYOse3U77N9kxtghPxog= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578487894340653.9632714273216; Wed, 8 Jan 2020 04:51:34 -0800 (PST) Received: from localhost ([::1]:43056 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAo8-0004e1-VI for importer@patchew.org; Wed, 08 Jan 2020 07:51:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60581) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAWc-00048G-Re for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipAWZ-0004TE-QI for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:26 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:39182) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipAWZ-0004SN-KC for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:23 -0500 Received: by mail-wm1-x330.google.com with SMTP id 20so2309943wmj.4 for ; Wed, 08 Jan 2020 04:33:23 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id o4sm4037750wrw.97.2020.01.08.04.33.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 04:33:21 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=lO5wl48k6ZDCJruKpNcQHB08wbkpBLoPs4vSZC8J3nY=; b=ctKceCIK+FnmoZUYBVJ2doBjzS4WNDc9zuFfDXLTCOq0gwHobqm4/QHSr5/vRvetOo 2vLJ3TWeWZuhP9AWlojO3aBrD/hRcQuwUcBNIo3pZzug8sh80fwB7O821cyf97w1QKNQ O/+Ilqqx3sqrLIYw31+dQD9PrBhx5prrSjJYy44OXJxShYEO6dHFJ7d2gRKt33NsJqgG lbcv1WmYTCRElEPaOojT7QJguDA6CHRAMrycQrNOnRGAWPI6zTDaUDk7SyWS90O5vUP2 aakw4HAwhI8eQuiHVTKupWNxaoOL/acf7/rVGaZRyY8MoHfsTZ3j0vXdcyOA/hy0Zvny MD2w== 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:mime-version:content-transfer-encoding; bh=lO5wl48k6ZDCJruKpNcQHB08wbkpBLoPs4vSZC8J3nY=; b=qZa7uvLw4cymWPMCSO3IwUUmHDjLtWLsR23x0v1itW4mfxhaWCKS0jWMspo/P+aSGx qAiUE9T4eVR38BgXmILSwzGkRyCo/+JXL0+l0BPTp1w9nWWJUOxhsKWF+J3+x5W5r064 JBAfXTTRFvVCXf70aR8XSJ8OM0HxHW3thhpOV+bDV/GQhjNrpbCYqg34rEMr+yw5zXsd FwKUrpJO1DDzO2Gnn+vSsiLorUj6f/59cbLh/eJFeWOXaRV+yxkXx6FipFrnSeo99HoF EwhyqFEIO2s4VMEHJ6KZmV2xzNkuyzF5FH5zmXkWAeOycrkjn4QcERSm8mfVovMaYBN2 nyWg== X-Gm-Message-State: APjAAAUQz7RMclc9MS7UqFVTntAc4rWVS3Rgnj9VmQDEwvGfeIecRTBG zgDxV7GmnOibUOk9+cWPFkP9UUV8 X-Google-Smtp-Source: APXvYqx9LhkAy8x00lGhJ7J3XbPdeKsCPJ69sNujImKGbltXSetdg9kdAtNy2cvVxCtJywL7mxnTNA== X-Received: by 2002:a7b:cc09:: with SMTP id f9mr3685247wmh.71.1578486802503; Wed, 08 Jan 2020 04:33:22 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 24/38] hw/ipmi: Remove unnecessary declarations Date: Wed, 8 Jan 2020 13:32:41 +0100 Message-Id: <1578486775-52247-25-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> References: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::330 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 Since we don't use these methods before defining them, no need to forward-declare them. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Corey Minyard Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <20191218172009.8868-2-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- hw/ipmi/ipmi_bmc_extern.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hw/ipmi/ipmi_bmc_extern.c b/hw/ipmi/ipmi_bmc_extern.c index 87da9ff..450926e 100644 --- a/hw/ipmi/ipmi_bmc_extern.c +++ b/hw/ipmi/ipmi_bmc_extern.c @@ -87,10 +87,6 @@ typedef struct IPMIBmcExtern { bool send_reset; } IPMIBmcExtern; =20 -static int can_receive(void *opaque); -static void receive(void *opaque, const uint8_t *buf, int size); -static void chr_event(void *opaque, int event); - static unsigned char ipmb_checksum(const unsigned char *data, int size, unsigned char start) { --=20 1.8.3.1 From nobody Fri May 17 15:28:08 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578488106; cv=none; d=zohomail.com; s=zohoarc; b=MxkCQCYe/Mq8vE0Bk0gUhBzggzym4QZqE94qYApjq7mekfEnCZ14oVQk0KkWZGIWgN2yyvNZdcDKIgOcOUkTnwV9P3OWVwOsR76EYrNMOLr7U5pAux58VXR0uRM6s2hhNX6x+CoMDtWdhcwSk6lo3NeT8kGir1+3iX2tlzHFEsk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578488106; h=Content-Type:Content-Transfer-Encoding:Cc: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=tU6eadOpHxdCLO2/As2DBQQOOukvsgPCPd77EIUHGOo=; b=AnkyzV75fMmY04w0PNrQK6ROmSaBe/+ltbaetrd5AdU0uzqXK/mYSYE5ICCWb2l2CzcjeE00noQwtWWAFDTYDbgfHktPf66aWeUNowAGQGCZipXS1NIJTY86nOR/GNMbRcLv09OJcETVdJnFzQjDjQwcZoqa0cUKJf2AIqC5aLU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578488106658400.889836832437; Wed, 8 Jan 2020 04:55:06 -0800 (PST) Received: from localhost ([::1]:43096 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipArZ-0001Im-8M for importer@patchew.org; Wed, 08 Jan 2020 07:55:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60572) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAWc-00047S-C6 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipAWb-0004UP-7H for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:26 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:35590) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipAWb-0004Tv-1U for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:25 -0500 Received: by mail-wm1-x32e.google.com with SMTP id p17so2338075wmb.0 for ; Wed, 08 Jan 2020 04:33:24 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id o4sm4037750wrw.97.2020.01.08.04.33.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 04:33:22 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=tU6eadOpHxdCLO2/As2DBQQOOukvsgPCPd77EIUHGOo=; b=fKQYfVeiqIzIF9umosjm6GyV5t7AsbxwOW1Btwi1N/+3mKnwbcA6LxJM2rK6WgC/8j ZRfxLcA1dwMaOkZlgthhQCHDIscdTtRnXR2Uwy0Tw3m4OPjWBm9RATmGTJPhrI6TjaVK K1YIErnCO35gHvVU15n/pxFbyjTvRs0n/N+gzKnyftwrOYakg5mJuOEh2gUpF/D9kfv1 COtGLt2shB2hUa9OO+Awc6Yec17TTnDwkAvX2vo+bDQLH2sHN+qGkVuk3BOsa/LYbSN3 w/9CwaMq9HGpiuaPrAzFceruqtDU3FdUag3tWQz9dnmxee1Vmoa7DgazSsfoz6L3+J/Z pIbg== 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:mime-version:content-transfer-encoding; bh=tU6eadOpHxdCLO2/As2DBQQOOukvsgPCPd77EIUHGOo=; b=mvEVf2dy7M4IL+4j3aPBEMJZDKocA6b2EcyUCffAHVWjP1lr9kHgPvmdQqZ+s/tD6n FoDjfs89yBQuoHNHjuzkm5W1k5AYOQqnN3HUxi3Vv83xXQ8DDE5lnqDz5HeDZIrxFTIj 4VG+QJqK1nNqF1twxyYN0EC6HJOYl7BwzxbUaPs3FQtKFfCCUI56S5W8IHKOEfXXI3yy LD75V/w2d7OZdSFrdtcRPPvs9UGlBUjNSPaTO1chgEu87Euo8lxN3gZLYJ7gq3vtBqev 9W0JczwrH0Vgd+nnP1CiY5Uo9MKsoiH/n92sXTOvhUosJObF3bRqSttsBC4OfQWhgeTK 5Qsg== X-Gm-Message-State: APjAAAXBt4ultTP0J67vbx6XxvigWcuWRDQ91TS8qmxs88OFM8k/a50I L7tJ9ql4LtWVDszPBkni7ejDJisZ X-Google-Smtp-Source: APXvYqwXilYPPA/5J97+42APDOl8pjk8bA1FK3bWCLj5mvWtst3d8Sc7hCeWklPJsNg5MwVHZYiPWg== X-Received: by 2002:a7b:cb01:: with SMTP id u1mr3180513wmj.156.1578486803861; Wed, 08 Jan 2020 04:33:23 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 25/38] hw/ipmi: Explicit we ignore some QEMUChrEvent in IOEventHandler Date: Wed, 8 Jan 2020 13:32:42 +0100 Message-Id: <1578486775-52247-26-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> References: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32e X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 The Chardev events are listed in the QEMUChrEvent enum. To be able to use this enum in the IOEventHandler typedef, we need to explicit all the events ignored by this frontend, to silent the following GCC warning: hw/ipmi/ipmi_bmc_extern.c: In function =E2=80=98chr_event=E2=80=99: hw/ipmi/ipmi_bmc_extern.c:389:5: error: enumeration value =E2=80=98CHR_EV= ENT_BREAK=E2=80=99 not handled in switch [-Werror=3Dswitch] 389 | switch (event) { | ^~~~~~ hw/ipmi/ipmi_bmc_extern.c:389:5: error: enumeration value =E2=80=98CHR_EV= ENT_MUX_IN=E2=80=99 not handled in switch [-Werror=3Dswitch] hw/ipmi/ipmi_bmc_extern.c:389:5: error: enumeration value =E2=80=98CHR_EV= ENT_MUX_OUT=E2=80=99 not handled in switch [-Werror=3Dswitch] cc1: all warnings being treated as errors Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Corey Minyard Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Richard Henderson Message-Id: <20191218172009.8868-3-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- hw/ipmi/ipmi_bmc_extern.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/ipmi/ipmi_bmc_extern.c b/hw/ipmi/ipmi_bmc_extern.c index 450926e..adf2afe 100644 --- a/hw/ipmi/ipmi_bmc_extern.c +++ b/hw/ipmi/ipmi_bmc_extern.c @@ -435,6 +435,12 @@ static void chr_event(void *opaque, int event) k->handle_rsp(s, ibe->outbuf[0], ibe->inbuf + 1, 3); } break; + + case CHR_EVENT_BREAK: + case CHR_EVENT_MUX_IN: + case CHR_EVENT_MUX_OUT: + /* Ignore */ + break; } } =20 --=20 1.8.3.1 From nobody Fri May 17 15:28:08 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578487896; cv=none; d=zohomail.com; s=zohoarc; b=oFkHjp+mz3vdYdXLkj6I+b3STqKpgKgWP3lVAt/tMR/u+8a5HhVBzl+Wnqu9kHpr3A4W5BgrIZlH7JKvd8Q0e0iM4V2G1Sr6jy3+25KvSbS+5JwGdQDLkZkfX7YTC+OkLVYAUOnXHX3wvbizz4X7DsuCf0VTM7+T4mpp9uIlq58= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578487896; h=Content-Type:Content-Transfer-Encoding:Cc: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=dVYlivSLcVgxjDh0k8Ch66Ht/NuPzIrFxYhvD6Dg4w8=; b=aN64fuQL+gRPeCRYB8UIHvIDzHtrrl2cs/wbmGNp/Ek9g7IvVjKbkQ87uXI5yy4li1uqx8RUCGlm2ye3o3ukoZ3aq2YhukN/VkXTUZwCfhU1t+klIMZy5NUAlH8mXkcmLAN1Qp7V/G4aSozvNkgjgY/tapNPloIqdWiveTaPy/U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578487896243648.8249655925803; Wed, 8 Jan 2020 04:51:36 -0800 (PST) Received: from localhost ([::1]:43060 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAoB-0004iF-1A for importer@patchew.org; Wed, 08 Jan 2020 07:51:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60595) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAWd-00049B-ES for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipAWc-0004VQ-DL for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:27 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:42671) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipAWc-0004Uk-7J for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:26 -0500 Received: by mail-wr1-x42f.google.com with SMTP id q6so3158691wro.9 for ; Wed, 08 Jan 2020 04:33:26 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id o4sm4037750wrw.97.2020.01.08.04.33.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 04:33:24 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=dVYlivSLcVgxjDh0k8Ch66Ht/NuPzIrFxYhvD6Dg4w8=; b=PvGuTorwHy7q+rkb5gBmB87gUPgp2T8danLORidRv6qGzwRKsvUvtzxjGictt2zzFO EssczltVXHPB265uyntrC2baxpAP0RqIJMtRcrJBWmN/NcE3G14Y8F4ir1n0IrVzb0o0 TrLAPSl8jzboDOp2B3iqS1U0iOaRKxTnQZpAbczgUHmZQ95OJQw9gGOuVhcEEmve35Qc +0w8HZ7pbj35lesFl0tPSHZHcNtrvMhWiFfb4yxwEelMra257X3Au9SntMhs6O6Q0gLP 3t1RsE1030G3YECrpb3kTExslmBv/kvFmoSGAructCfM6dcCPSL007R92zUIDA4vG0E1 t+TA== 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:mime-version:content-transfer-encoding; bh=dVYlivSLcVgxjDh0k8Ch66Ht/NuPzIrFxYhvD6Dg4w8=; b=IZBWmK//dyivo8iqhPUsqCNBtui+JdgD9dTBt1j5ZZSAFR0e6rcXD/PAAG9KafpVQB NvNPIvwQEFuwVKh3ztcn1TiOGzYvGUcRW60S0+yTYcXRfjm72wMI6uuRh026aSNDU1+P vRgmOK6SUqdwdxkxfQY8AQehEPi3guOXjdMk5C5ro6NmgWHkJcgvj9nEbVlA+rnMXwMU 1Ki1E5VC3kcdWcG6dKEnctFHxnlbAI0r9UptlTpOvLBEdDTrjUwKecszIzhxtz/FrxY+ W+IA5P9yfiQkByKu04wn0F10e7xLlIvGngG+z4HQnkyH5ZSESC49f1jLSnIuRjlI3tUe FpeA== X-Gm-Message-State: APjAAAUgNha5J0vVBNnRlPdUgKG277vdD8l8ZUl25ruSplPuAAWzT7WE fPgrrit5yekisL/DHUKdTyIozvA+ X-Google-Smtp-Source: APXvYqz7W1D6Je64+ZXLIqJoGYFzJc/kRDyl6qL7tqwAEDqTCxjeLXeS/fA4fPiCfEjBJ+xrXQFB1A== X-Received: by 2002:a5d:4b47:: with SMTP id w7mr4575350wrs.276.1578486804998; Wed, 08 Jan 2020 04:33:24 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 26/38] hw/char/terminal3270: Explicit ignored QEMUChrEvent in IOEventHandler Date: Wed, 8 Jan 2020 13:32:43 +0100 Message-Id: <1578486775-52247-27-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> References: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42f X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 The Chardev events are listed in the QEMUChrEvent enum. To be able to use this enum in the IOEventHandler typedef, we need to explicit all the events ignored by this frontend, to silent the following GCC warning: CC s390x-softmmu/hw/char/terminal3270.o hw/char/terminal3270.c: In function =E2=80=98chr_event=E2=80=99: hw/char/terminal3270.c:156:5: error: enumeration value =E2=80=98CHR_EVENT= _BREAK=E2=80=99 not handled in switch [-Werror=3Dswitch] 156 | switch (event) { | ^~~~~~ hw/char/terminal3270.c:156:5: error: enumeration value =E2=80=98CHR_EVENT= _MUX_IN=E2=80=99 not handled in switch [-Werror=3Dswitch] hw/char/terminal3270.c:156:5: error: enumeration value =E2=80=98CHR_EVENT= _MUX_OUT=E2=80=99 not handled in switch [-Werror=3Dswitch] cc1: all warnings being treated as errors Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Cornelia Huck Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <20191218172009.8868-4-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- hw/char/terminal3270.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/char/terminal3270.c b/hw/char/terminal3270.c index 6859c1b..2aab04f 100644 --- a/hw/char/terminal3270.c +++ b/hw/char/terminal3270.c @@ -166,6 +166,11 @@ static void chr_event(void *opaque, int event) sch->curr_status.scsw.dstat =3D SCSW_DSTAT_DEVICE_END; css_conditional_io_interrupt(sch); break; + case CHR_EVENT_BREAK: + case CHR_EVENT_MUX_IN: + case CHR_EVENT_MUX_OUT: + /* Ignore */ + break; } } =20 --=20 1.8.3.1 From nobody Fri May 17 15:28:08 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578488246; cv=none; d=zohomail.com; s=zohoarc; b=ISxck/RBiFbxr4eS+xqgHVKmY2vZdIptV9kX8cB5Vl9zIfirZxQpI/hQFwOCc49nNtjEtvygCRWxBX7aV+F1xdGZk88oyIpgjT69aSvqZBj0XfRc0wkR+P5M59UKOC5pjlkqGR0QcmdDs8OGsSZOJ9o24+qkHq3ZqqaHCefW5T4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578488246; h=Content-Type:Content-Transfer-Encoding:Cc: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=2fCObtda3dtFVMnkAjzfMw4PP0ps8t+z4lqGgFq4nFE=; b=GjiWPCNwgtOX1VsxukLwEF+qAovMhW8FJZ5f2Xwsw37QSdId/VIZHsETQNsEqi1Krx4HDuBlKqIKQF4FGH2J4Woq2MTLPyevjQiEQ93eRBfasVQ2qlYJRfJRq1jumernf8bkoeBtqG0WgBl/vIMshupCD38SSclrt4Kd1r6KQTE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 157848824637731.855586143269193; Wed, 8 Jan 2020 04:57:26 -0800 (PST) Received: from localhost ([::1]:43130 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAtp-0004an-BP for importer@patchew.org; Wed, 08 Jan 2020 07:57:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60609) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAWe-0004AT-5c for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipAWd-0004Vv-4M for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:28 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:32788) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipAWc-0004VI-UZ for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:27 -0500 Received: by mail-wm1-x334.google.com with SMTP id d139so16419636wmd.0 for ; Wed, 08 Jan 2020 04:33:26 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id o4sm4037750wrw.97.2020.01.08.04.33.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 04:33:25 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=2fCObtda3dtFVMnkAjzfMw4PP0ps8t+z4lqGgFq4nFE=; b=Uf3xqS+4ELIJpm7ViawxoTE+qT9ahInu+fbcyEW3Ck9w9w1xHM9+ChUYGqVOY9aOS1 xi/wROEpGfxawIkMWgSRaxtCRAIGkNFlYIEI2Jf+3ysA4JX1MWJ04rPTkRLY+CQE6yIB HukPc9MIYRDXyDgtXeK/HoL070yz1DzAV73QU7un61OYR63wwwyQX1sDnLlLZh304c+U ZxxPoeJcgYlToe5c4YqQhi9QktPf329wwqC9KvIdLGB6CnEWmMY5qYx5AWZTtyAPxB5p PgGBe852HAL4ZbtUT5stxeN4R7eFZnP/oUmTKgEZwzihudUzbD1yIAy9f9Ey01iE7D/u e25w== 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:mime-version:content-transfer-encoding; bh=2fCObtda3dtFVMnkAjzfMw4PP0ps8t+z4lqGgFq4nFE=; b=kg4MqQs7UJz5pVHp5fUFnORidNBxgdI6CJTc0eCVvqcuTy+HlskQ3hcNgRIsok10D2 eDU/LFkhBYVcqy86kUD8dysn5j5C9QlwuiwX4ZWZxJJG4FqXLU9meOwGXQZgA1QfIoXd JaeMmVnAYCTSnzToX6XqSL4qJxQHVY/CutdZwCyy//er3MuxY9FDNIKLP0K4/boynxk9 ADc4s0tGKaisoib7PsviTfin1dy0xD9VkMxdSv+oXnJfywTahGYeIUdM46YpskNT/W39 pUdHqdwlVRgNDN3cH94U7SV4ipMnLYKM/SEty+b0bdRBu8nSkICVjrcONeZU4ozvxFXH cwKA== X-Gm-Message-State: APjAAAVBJibkb2exZYrmD3lEqWmW0y1x7HHDu0u/iGchS1xjSXI5i7gv e/nJFH2GRfeQ15knIaacMgyrhr5I X-Google-Smtp-Source: APXvYqyA0b4mNM98RcHV53YUofbTs2+iVKgTTeOzjZqgiLC7LaWjw3mgLUqntSVcudvVygctM6fhiQ== X-Received: by 2002:a7b:cfc2:: with SMTP id f2mr3626384wmm.44.1578486805742; Wed, 08 Jan 2020 04:33:25 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 27/38] hw/usb/dev-serial: Explicit we ignore few QEMUChrEvent in IOEventHandler Date: Wed, 8 Jan 2020 13:32:44 +0100 Message-Id: <1578486775-52247-28-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> References: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::334 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 The Chardev events are listed in the QEMUChrEvent enum. To be able to use this enum in the IOEventHandler typedef, we need to explicit all the events ignored by this frontend, to silent the following GCC warning: hw/usb/dev-serial.c: In function =E2=80=98usb_serial_event=E2=80=99: hw/usb/dev-serial.c:468:5: error: enumeration value =E2=80=98CHR_EVENT_MU= X_IN=E2=80=99 not handled in switch [-Werror=3Dswitch] 468 | switch (event) { | ^~~~~~ hw/usb/dev-serial.c:468:5: error: enumeration value =E2=80=98CHR_EVENT_MU= X_OUT=E2=80=99 not handled in switch [-Werror=3Dswitch] cc1: all warnings being treated as errors Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <20191218172009.8868-5-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- hw/usb/dev-serial.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c index 45cc741..2ba6870 100644 --- a/hw/usb/dev-serial.c +++ b/hw/usb/dev-serial.c @@ -479,6 +479,10 @@ static void usb_serial_event(void *opaque, int event) usb_device_detach(&s->dev); } break; + case CHR_EVENT_MUX_IN: + case CHR_EVENT_MUX_OUT: + /* Ignore */ + break; } } =20 --=20 1.8.3.1 From nobody Fri May 17 15:28:08 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578488365; cv=none; d=zohomail.com; s=zohoarc; b=AlT0CHCPGVuigmNfWZxzRDLsBH0aD8AEM0K4begdB/Bj/3zzc0ETak61cRW4YOgLLY49tuHc2QP4nfV1sa1y19fF8nzcK9NYzjNONrW1ZPPudEM6LJRY376gEufb3vo8zztIyRdem+wtFkogogU+/uopLpOBeIF4vasWNssWVOQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578488365; h=Content-Type:Content-Transfer-Encoding:Cc: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=Szvn2P1fTtzbAoJG3/7kSHDMFC+czJio/vRe33KbfBY=; b=elPjsgrywUh+zQV+aEQB4FEi7zjaOqBE8BQBk3GUtZuoiF0kvGQAANg9eUwjQvoU/1AickRTxIkqTd8y5x5/bU7qorDfUcW4012km5ya/sacW0sjLSmjGV0KLIx5RJ2J0ErqpIrjEx3amWi+KT7dzT9y2xNFfEVLl80j6ZQLjok= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578488365369251.05027207404294; Wed, 8 Jan 2020 04:59:25 -0800 (PST) Received: from localhost ([::1]:43162 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAvj-0008C3-Rd for importer@patchew.org; Wed, 08 Jan 2020 07:59:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60620) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAWf-0004Bi-07 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipAWd-0004WW-Tz for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:28 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:36689) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipAWd-0004W6-Nc for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:27 -0500 Received: by mail-wm1-x335.google.com with SMTP id p17so2324541wma.1 for ; Wed, 08 Jan 2020 04:33:27 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id o4sm4037750wrw.97.2020.01.08.04.33.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 04:33:26 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=Szvn2P1fTtzbAoJG3/7kSHDMFC+czJio/vRe33KbfBY=; b=gOcyKNLPH99DkPWkpAq2BVmSLwolIUuNhQq84RtNQiX6T/ZvNLeEQv8lOpFICDAO2Q BC2F0t+wuLErMdSvs4+ynONXCt7AwljTzTeDfK/bCHkHl85j9zjolJoRXMNXcX6NafLP w7DWa6pDwTkYtjXd10QB5bRWomA2LwHDb0+WpKqKrozhtQTvyTHGYCXQZ/BW5s7qbslR 4NZ536iVFwfwSkivCVuVRZ2My6J5or/XhHDopq9PViDSVDLayQ8xamjwsY7qc9jFgz1P Z80XkiaflwauFHjP2+HJffKSgZyo59vGSOWVtHc8d8aA90KDStKQSafSEep1R2mAkAxG xTKg== 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:mime-version:content-transfer-encoding; bh=Szvn2P1fTtzbAoJG3/7kSHDMFC+czJio/vRe33KbfBY=; b=gG/us28+3lV1A8t36FLUB02aMkCCE5xyKHQDqXyi+55r+Ege89IxMzTgw+04ZkCHpf Yi2RxJOSm9CI5vzM2H/ysYOJhlLdA/9tAominpyMDk6ON/Pkw0fRKbKoeSaOvJ1bncoP YR7s3L6It3iYrGJJzoq6nZENKMx4lwm7WfBGA3kY5VxhhrPKsV0UhhmEQ7ooi9Zr53zZ gh+xvEAjkYtOIFnmZAcD4KfnZHWvvgB0qacrmrqPoPaYDLZUCxYDz9cJJFtqLjCC81FF /T3sc8jkImNX4D70WOYLZ9YkCdvYkslU80xuqlS2yJJm9xpCs3M8VWlnAh2htA4QPMyl j+IA== X-Gm-Message-State: APjAAAVHDDqqGiIYU6/w4EYSzXbc7fYX/zBEJT3FD36PXfGcHevgW69a eXvDelFcGEGyG1K7jGsyY/6MW/Jh X-Google-Smtp-Source: APXvYqwLCaan4SDdvW4zu+WRJnXtYUwJ8oFzQH5oB8rGtLgQuITuk+js0r2JL+S7D3Frfg8pDuDsiA== X-Received: by 2002:a7b:c389:: with SMTP id s9mr3617473wmj.7.1578486806603; Wed, 08 Jan 2020 04:33:26 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 28/38] hw/usb/redirect: Explicit we ignore few QEMUChrEvent in IOEventHandler Date: Wed, 8 Jan 2020 13:32:45 +0100 Message-Id: <1578486775-52247-29-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> References: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::335 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 The Chardev events are listed in the QEMUChrEvent enum. To be able to use this enum in the IOEventHandler typedef, we need to explicit all the events ignored by this frontend, to silent the following GCC warning: CC hw/usb/redirect.o hw/usb/redirect.c: In function =E2=80=98usbredir_chardev_event=E2=80=99: hw/usb/redirect.c:1361:5: error: enumeration value =E2=80=98CHR_EVENT_BRE= AK=E2=80=99 not handled in switch [-Werror=3Dswitch] 1361 | switch (event) { | ^~~~~~ hw/usb/redirect.c:1361:5: error: enumeration value =E2=80=98CHR_EVENT_MUX= _IN=E2=80=99 not handled in switch [-Werror=3Dswitch] hw/usb/redirect.c:1361:5: error: enumeration value =E2=80=98CHR_EVENT_MUX= _OUT=E2=80=99 not handled in switch [-Werror=3Dswitch] cc1: all warnings being treated as errors Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <20191218172009.8868-6-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- hw/usb/redirect.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index e0f5ca6..ddc1a59 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -1370,6 +1370,11 @@ static void usbredir_chardev_event(void *opaque, int= event) DPRINTF("chardev close\n"); qemu_bh_schedule(dev->chardev_close_bh); break; + case CHR_EVENT_BREAK: + case CHR_EVENT_MUX_IN: + case CHR_EVENT_MUX_OUT: + /* Ignore */ + break; } } =20 --=20 1.8.3.1 From nobody Fri May 17 15:28:08 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578488004; cv=none; d=zohomail.com; s=zohoarc; b=desDXZzcD9CZ7A41orrwQC3/aLGyu4XtE/XWO+xkdGFi7/3GHzX13RmaTW09UzHMVDY0KrqVh4rWCOQ4HM40HPtXq8qPfDFH5+IUm/zXZM6OuODIX+1BUaSuwEAIRR8B9YO6kFyhEdb7Lr6qZK1f4aa1CdmpZgDg3xIKYxemQXs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578488004; h=Content-Type:Content-Transfer-Encoding:Cc: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=+lLMocRpHqpsswHyjutdtcTIrryPFu7ndbSVvwhceQ8=; b=Zahn946vnkwCbFtK07g3+gXvS/1V4CGa5eCjl/ONIhxRCXvH/TgJObdQ2DtOqtKJLDV+9LY5tGPTDFj/WoVBJL64t/V3kwWb33U1Ylb9MUOGcy4VWSK5vc9Wadk5YVdmW1gQSGEsYT+IaZYYbInaEL8NIGUXV5kwSO0LzaeLGcc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 157848800482886.73679859146603; Wed, 8 Jan 2020 04:53:24 -0800 (PST) Received: from localhost ([::1]:43080 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipApv-0007H9-Ex for importer@patchew.org; Wed, 08 Jan 2020 07:53:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60634) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAWf-0004DB-Uy for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipAWe-0004XA-O8 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:29 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:50269) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipAWe-0004Wc-Hj for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:28 -0500 Received: by mail-wm1-x32f.google.com with SMTP id a5so2311985wmb.0 for ; Wed, 08 Jan 2020 04:33:28 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id o4sm4037750wrw.97.2020.01.08.04.33.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 04:33:26 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=+lLMocRpHqpsswHyjutdtcTIrryPFu7ndbSVvwhceQ8=; b=VYR2dxx0CNLpw2VM5q6ELJpaV3J3sJlihoH2Nt9Ir8V/UVG0P3S6YIgrytFSWNj4am pCGXCoCmwB2PM34hw0f57aJHlf3NAE4AS2CN8XkWfe5a1sdGie7fUehNA5ablU1KCVR/ vl4EyA1f0TmYiOEhFzx9GE2p062jVZdzZ1CrFkzHwudGYkYmeIOY0B3uIm/W79HrqTTh XOzLmki9OhezwhpLujITuJU560DFemJSHp9XC/r4wBieXlYoKd8V6M/5LysUiOLGLBOf lJ7XayO44xtJkNotYuGqXJRz3zuJzuO10ZJJiuuYCsK1+QaHYrQ55t/E1JhFv0OHyxEx nhDQ== 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:mime-version:content-transfer-encoding; bh=+lLMocRpHqpsswHyjutdtcTIrryPFu7ndbSVvwhceQ8=; b=Rtw4K7Pt7ZC8ZdRGXZwRNK6aHY6hrB/aHm/B11qgrfck2qy9V6gyp+wLFKh6xyJjfz ln5g5R3LZ2YAHYWkeoI1qEz1xHvYVhwKAuCDyzZRAV3xVDMFnvaCsScE/hQ6IhJjN/ra uLy0iQMqY1vA733W/mvHUm+K1GkUm6Eme2VqswiNNPbpbGZDEZS/hY7dnqBsBbabI8GM a3hNxk7y+u7LbEq3S0SyqkVjn3A9kmA6eTud6MD3OHsCpq46Bc84BO2WVyOL8c84cglk nMsmchyTfoQqqoAqLngPLreLwyFwcII+VymC9FvpVH6VVyMlAHNCGSECa358pKXQKy8A rIPw== X-Gm-Message-State: APjAAAV992+DnoF3Gk7TRyy0XmGXeIj8GCsV96NAE+3FOYefFn3JkJ1j AQ54Cw0/J4tXxmirykjBRI+S1Sqr X-Google-Smtp-Source: APXvYqwwkoJHfKxsBhAyrfeHxXAFSA8YtDgNHIJPiFZGfYyyI1XWfVw/DY0hTxli9k8eId8fA27NNw== X-Received: by 2002:a7b:c956:: with SMTP id i22mr3630249wml.67.1578486807379; Wed, 08 Jan 2020 04:33:27 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 29/38] ccid-card-passthru: Explicit we ignore QEMUChrEvent in IOEventHandler Date: Wed, 8 Jan 2020 13:32:46 +0100 Message-Id: <1578486775-52247-30-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> References: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32f X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 The Chardev events are listed in the QEMUChrEvent enum. To be able to use this enum in the IOEventHandler typedef, we need to explicit all the events ignored by this frontend, to silent the following GCC warning: hw/usb/ccid-card-passthru.c: In function =E2=80=98ccid_card_vscard_event= =E2=80=99: hw/usb/ccid-card-passthru.c:314:5: error: enumeration value =E2=80=98CHR_= EVENT_MUX_IN=E2=80=99 not handled in switch [-Werror=3Dswitch] 314 | switch (event) { | ^~~~~~ hw/usb/ccid-card-passthru.c:314:5: error: enumeration value =E2=80=98CHR_= EVENT_MUX_OUT=E2=80=99 not handled in switch [-Werror=3Dswitch] hw/usb/ccid-card-passthru.c:314:5: error: enumeration value =E2=80=98CHR_= EVENT_CLOSED=E2=80=99 not handled in switch [-Werror=3Dswitch] cc1: all warnings being treated as errors Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <20191218172009.8868-7-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- hw/usb/ccid-card-passthru.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c index 267ed9a..e53696c 100644 --- a/hw/usb/ccid-card-passthru.c +++ b/hw/usb/ccid-card-passthru.c @@ -318,6 +318,11 @@ static void ccid_card_vscard_event(void *opaque, int e= vent) case CHR_EVENT_OPENED: DPRINTF(card, D_INFO, "%s: CHR_EVENT_OPENED\n", __func__); break; + case CHR_EVENT_MUX_IN: + case CHR_EVENT_MUX_OUT: + case CHR_EVENT_CLOSED: + /* Ignore */ + break; } } =20 --=20 1.8.3.1 From nobody Fri May 17 15:28:08 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578488498; cv=none; d=zohomail.com; s=zohoarc; b=K5Dy+lzNXMVc+M7J1FyQ0w6je0x14loKsCiiUyHpyr17ks3Mlm0AqqAZYIpKYzF1Uli7Pb+CD/3/i8EOzjj+QXCvphh9XtUQgoXjih4FKyWwc+l5lxm8vYV1bBQl/ChnoTqQ5A1zUfgyfyeFHdOL354/jzINJkcy9u/GwY+0als= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578488498; h=Content-Type:Content-Transfer-Encoding:Cc: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=WCjKXrdR/R/3qFo/Ai4yhaPyA8z7tZNg/kZgnvxQquU=; b=eoyThwjCJwZYIwmmIx2cZU9mx7OsGm8FDiHEFbjQCW+WmCfIahmZrRNEiezbqeyDRJXZyVZ4kub9BvfYqzZ3SVfZ450uVeqq5mPNdWPDi47eGJFN5iHYUfGzREyDcYUswRV+6P3/OIss/mezbJfD2xokKAmt6N5VgMSX6Y+zGXU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578488498419997.6392803579915; Wed, 8 Jan 2020 05:01:38 -0800 (PST) Received: from localhost ([::1]:43270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAxt-0002EV-4X for importer@patchew.org; Wed, 08 Jan 2020 08:01:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60649) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAWh-0004Fp-Eo for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipAWg-0004Y1-Bb for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:31 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:37945) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipAWg-0004Xb-5Q for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:30 -0500 Received: by mail-wr1-x434.google.com with SMTP id y17so3205170wrh.5 for ; Wed, 08 Jan 2020 04:33:30 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id o4sm4037750wrw.97.2020.01.08.04.33.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 04:33:27 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=WCjKXrdR/R/3qFo/Ai4yhaPyA8z7tZNg/kZgnvxQquU=; b=pw7F6tsjEdudvYspXC+m76pFcZ8orsy7euPPjxvmvhmtHKyRLW9F7YaCgryQ+qWSOg hVwR2zpIDJqwowsks/JfHPJWp96FnRiIqAbApJutUWkMHhlLsB9lWTQEnUtXvtZRoohu poAzsShmfmi4yCjtk61lLjQT0mqZyws/+58d6uoDPPouFZroNykNLSNGlQD5eEIr0k6s n3i0dcoKHM5yq+HJT2xjzPGXgzybI/WY6P6huvKJFYkQODltS7btJuMUpxd76RgtdzBk XJdnSXlHL1QyXC2NElOcs3et4gaHSxD9RztwwThrys9Pd16a3ewWzVy2kaz4hYJ/hEYR nvhA== 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:mime-version:content-transfer-encoding; bh=WCjKXrdR/R/3qFo/Ai4yhaPyA8z7tZNg/kZgnvxQquU=; b=kOVHwSRYGjFXhk+UrnFdUN2MY8GTcnUrtgsE4bJ2B3DuG9lZ+3DNF12CrjZymFgZPt FA+UM5OZUHR7q1rX5ox1Il50tdGJ5sJz4uxwMWTx0uHoCNWbVICOy6VVTphBca0V0Shk tUu2zSyljQzecB76GmKML1ynuOYwFhPZhiqpYPi6Vi323+3/13QsRvQ2ZNBfsrk2+lgo Vu7lfaMZ48E7lTJf9675EpZSpsQsodls8RF4VPgrrfvm+6vJkoKSpiw5Z6imPGthcMb2 29eeFXYfOw0L/bBVn8LLlMx5fmIEa0BLRDpCxA3HAsmdfloNlTn5VTCZqLRZW8+lWqgF wq2A== X-Gm-Message-State: APjAAAVt0LjZ+B7iSXAPWZFMPNrAFgskYKg8YaG+sU48Iqtt2pD67hJK fN9jTi8gmfMpEweLWbxQcc/kl2Dy X-Google-Smtp-Source: APXvYqyH5tjfpK1LtyoG+8aQoS8uKNj6Cb07PiZdgEg6OLVQ6Z+vDHVN/mdxpPf+XkhFSwlLm0hFRg== X-Received: by 2002:adf:a285:: with SMTP id s5mr4302187wra.118.1578486808982; Wed, 08 Jan 2020 04:33:28 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 30/38] vhost-user-crypto: Explicit we ignore some QEMUChrEvent in IOEventHandler Date: Wed, 8 Jan 2020 13:32:47 +0100 Message-Id: <1578486775-52247-31-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> References: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::434 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 The Chardev events are listed in the QEMUChrEvent enum. To be able to use this enum in the IOEventHandler typedef, we need to explicit all the events ignored by this frontend, to silent the following GCC warning: CC backends/cryptodev-vhost-user.o backends/cryptodev-vhost-user.c: In function =E2=80=98cryptodev_vhost_use= r_event=E2=80=99: backends/cryptodev-vhost-user.c:163:5: error: enumeration value =E2=80=98= CHR_EVENT_BREAK=E2=80=99 not handled in switch [-Werror=3Dswitch] 163 | switch (event) { | ^~~~~~ backends/cryptodev-vhost-user.c:163:5: error: enumeration value =E2=80=98= CHR_EVENT_MUX_IN=E2=80=99 not handled in switch [-Werror=3Dswitch] backends/cryptodev-vhost-user.c:163:5: error: enumeration value =E2=80=98= CHR_EVENT_MUX_OUT=E2=80=99 not handled in switch [-Werror=3Dswitch] cc1: all warnings being treated as errors Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <20191218172009.8868-8-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- backends/cryptodev-vhost-user.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/backends/cryptodev-vhost-user.c b/backends/cryptodev-vhost-use= r.c index b344283..f1b4079 100644 --- a/backends/cryptodev-vhost-user.c +++ b/backends/cryptodev-vhost-user.c @@ -171,6 +171,11 @@ static void cryptodev_vhost_user_event(void *opaque, i= nt event) b->ready =3D false; cryptodev_vhost_user_stop(queues, s); break; + case CHR_EVENT_BREAK: + case CHR_EVENT_MUX_IN: + case CHR_EVENT_MUX_OUT: + /* Ignore */ + break; } } =20 --=20 1.8.3.1 From nobody Fri May 17 15:28:08 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578488116; cv=none; d=zohomail.com; s=zohoarc; b=EbWfBUUdMU6euep3VDzpnVgyxpF/EyM8fCLGHS5AiWFbQHcBNdN6uTTXXfx3dOXmYVR063CookWUEAw9iyhYHVZLetE0mtFOSTUMQkwxV5PiL9xbwVJkq6MxujMLduI0lRfOL0U40FPjnWDjnm+efjUES4siG7h7IbQFILUQ+w0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578488116; h=Content-Type:Content-Transfer-Encoding:Cc: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=0DFURfcrdlZMFc5Cww9NVOEhGZMTURpWj94rU1e8DFs=; b=R1qSC0XjAsYzbFnbTZuracqjl2jiW1avALTPOpEOXsXzZycuxHixmEDihlE/kgmNOwMvTNIwDZyGbRA1Fta3I3hYnoV940lpCLhNr1paZ2q0q7waM1GsQsRZ2Te61Iyr6o+730cfZ5yiEUWsssphg09fOFDxL4WNlJwoUiTyHIc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578488116500235.73115460476652; Wed, 8 Jan 2020 04:55:16 -0800 (PST) Received: from localhost ([::1]:43098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipArj-0001Tp-2Y for importer@patchew.org; Wed, 08 Jan 2020 07:55:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60665) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAWj-0004Ic-4u for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipAWi-0004Yy-3g for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:33 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:44181) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipAWh-0004YT-Ty for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:32 -0500 Received: by mail-wr1-x435.google.com with SMTP id q10so3146282wrm.11 for ; Wed, 08 Jan 2020 04:33:31 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id o4sm4037750wrw.97.2020.01.08.04.33.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 04:33:29 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=0DFURfcrdlZMFc5Cww9NVOEhGZMTURpWj94rU1e8DFs=; b=bRYRp0rUZJU0nvnAn06ZCG5z1UKtS9nM1be8EcEJaEb5qi6TKcEzq8PgH94Sjpz/X4 /e6WiB8K7V9WntAYFkj2ZrbF/aPwAIl7rsTz9U1Cf+U1q3atHyOYQyKMfr2Y3OoitQKB HZIGdr5+G8rLIIGJsYOeCkyPzSh2IalEeXYCyvYniXB+RM3nQIjg1aOx/wSRbahqwYqW jTtpWaqQwybpqXMyQRBSCDfhZhaDzyAjyjKMEExDrhDRIA/Pso0UjngkH4MiF8qxV/BE MWBjnzPu/OJkJZPH00HJ2tnjOa/aXqf6vqHuIJzZZ1C1oukUvJnqiWr7FsfUei9aLkgz BvsA== 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:mime-version:content-transfer-encoding; bh=0DFURfcrdlZMFc5Cww9NVOEhGZMTURpWj94rU1e8DFs=; b=Qd8nf5POYxpkxsLr4VZlZLNexBjXI9faXktT0XjGz4Mb5RBq0cQdPsUZXidkDWzZiR 6ydddV7+zvCNM7N+QqESq7t45GIaI2tHBv4hqXesLudCWLJweDOt9g/elJsMZtJOU/g9 XlZzDAfYqkSvtf8m+oLG2OMZRPdEOn48HdN4yp6/G2YGg6qg+5m/otXbzuwaVVA3aQYy yMsBJ/n+BA4qRq9aPg5ylbeAmt3Yz0Z+xVoa9/4rtNcsAFs52kpih1xBSvMVAwR869Dn GXDVzV3UnSV1X5t7/3uH+JPO7hjy1uCdqoNH+6WjcOGzmirgB4ds53fqavmJvmUlcTpC 6GRg== X-Gm-Message-State: APjAAAVirjqP/MSoIduaAuhAjFfmMiPFBdsIaFYgGVakFON5/a1LNcl7 9Hb3uNZtDIeKKnyqrtyUtSYowQER X-Google-Smtp-Source: APXvYqyBHVFY5D7Fk19GnkeaVc3yyQtNrJfcNMJ/IX5p5l/o+WgSgkZgxZ+z62uNJsFNxpiS1gdTEA== X-Received: by 2002:adf:f1d0:: with SMTP id z16mr4194631wro.209.1578486810188; Wed, 08 Jan 2020 04:33:30 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 31/38] vhost-user-net: Explicit we ignore few QEMUChrEvent in IOEventHandler Date: Wed, 8 Jan 2020 13:32:48 +0100 Message-Id: <1578486775-52247-32-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> References: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::435 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 The Chardev events are listed in the QEMUChrEvent enum. To be able to use this enum in the IOEventHandler typedef, we need to explicit all the events ignored by this frontend, to silent the following GCC warning: CC net/vhost-user.o net/vhost-user.c: In function =E2=80=98net_vhost_user_event=E2=80=99: net/vhost-user.c:269:5: error: enumeration value =E2=80=98CHR_EVENT_BREAK= =E2=80=99 not handled in switch [-Werror=3Dswitch] 269 | switch (event) { | ^~~~~~ net/vhost-user.c:269:5: error: enumeration value =E2=80=98CHR_EVENT_MUX_I= N=E2=80=99 not handled in switch [-Werror=3Dswitch] net/vhost-user.c:269:5: error: enumeration value =E2=80=98CHR_EVENT_MUX_O= UT=E2=80=99 not handled in switch [-Werror=3Dswitch] cc1: all warnings being treated as errors Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Michael S. Tsirkin Message-Id: <20191218172009.8868-9-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- net/vhost-user.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/net/vhost-user.c b/net/vhost-user.c index 014199d..c54c9c7 100644 --- a/net/vhost-user.c +++ b/net/vhost-user.c @@ -294,6 +294,11 @@ static void net_vhost_user_event(void *opaque, int eve= nt) aio_bh_schedule_oneshot(ctx, chr_closed_bh, opaque); } break; + case CHR_EVENT_BREAK: + case CHR_EVENT_MUX_IN: + case CHR_EVENT_MUX_OUT: + /* Ignore */ + break; } =20 if (err) { --=20 1.8.3.1 From nobody Fri May 17 15:28:08 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578487584; cv=none; d=zohomail.com; s=zohoarc; b=aIonopwvvhXzELVtHY/4OcqGSMFEoJZtd/t5+Hd2Q2LS6m27jdouQ1HInZ5dKcQ6Jp4DvrP4N1eLbkKiGgP27s1sVf+GrmL17DLYk7pg7PHmbmADTvRK92lMKGZYxkvyBcSPjvjZBVFkfawEQLSg4JOPD2poAOOW71e80ZsR+UE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578487584; h=Content-Type:Content-Transfer-Encoding:Cc: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=mI1xmok6rfPrAyTZSFPcrVMlse43VRmH+csJauDDLHs=; b=mVyO5E7n2fFzmmJBBiyRKAbdNZDQ91cIhEG/cYYJrWsQFbf0mvNGj/MqFP8Vr7FubRQgI5yMzoII3ber/gB3/+tV9YtRhT1i30ApEAxfcBKUv8sD3rV2vfMwsXwEv6JSVWfem7NVVO95ojeRvaGK7FMS9UELIbguCOB2fxSB7f8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578487584462320.3375594039916; Wed, 8 Jan 2020 04:46:24 -0800 (PST) Received: from localhost ([::1]:42978 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAj8-0005dj-C7 for importer@patchew.org; Wed, 08 Jan 2020 07:46:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60679) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAWk-0004KN-8F for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipAWj-0004Zt-71 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:34 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:45732) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipAWj-0004Z9-14 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:33 -0500 Received: by mail-wr1-x429.google.com with SMTP id j42so3125898wrj.12 for ; Wed, 08 Jan 2020 04:33:32 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id o4sm4037750wrw.97.2020.01.08.04.33.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 04:33:31 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=mI1xmok6rfPrAyTZSFPcrVMlse43VRmH+csJauDDLHs=; b=Sfy3xcbvOcQXU/z5zF64yZ2b4rRks64IvhiYuQsKIzJCofOXbOHVWQd110QY9pjr5o 2eA66BnciB90udT0GriFGbvXYcv42oe2s4IhKJf2zJznTpuV+8Dv9mKcEc2fZaFMKLbU jRgcrI8xKh1y1k5U4kKEJ8C8HlQBKjajMjxTfAKFmbvkN7IgnWakxa8rVXO0a6FPAHD0 AclydlJkWKdnuncov5LRf0Zz79sF5UFfgmlT7+qjFDpNfPHo3vFeUos9tvPvFclK/iiy m4NS/lSeqgSzUCwRxoD7LIxFtiCWlz77XF6/TOpF6bVQWsvcCxzlwGJ+6/FeKuxNoyW1 EaQw== 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:mime-version:content-transfer-encoding; bh=mI1xmok6rfPrAyTZSFPcrVMlse43VRmH+csJauDDLHs=; b=R/ZhI7leCb4qFAzhn//mo3cFEIXiWxB0ZQo4h6iF3BJ6ET064r0dqwfYTfx/XAfxu1 A7NE1AI4xgVXFEazItq2DnRmghtfC4l3YRjSW1s+EOu0Qth0TxFmw2LHGo3imXd8DnNe YgQ9scKzafsnb7Ih/AIiFs6nOLrn5wZgP5sDupaJP5LBzg4t5+ouIWUhYDRaupQCSFwI m+MhF1/j37VGIOkLOGNLZMZP5//IBh/jdO5tNamZH9RuHHqtQV3is6LzBGd1w9BxMhOw /UtNjjPMA/feZWZeCgfiqZm6sNuk01jizZlLQxx1kxYLcBa26W2dO46PPbegBbQ3Ztld jJIA== X-Gm-Message-State: APjAAAUSocNoRbvxmBWHdHVOKOjyWDukdB/YKXAWwgU/QKGd6zJ7BcOf XH0oN4hybyKeVKhXMKwSWkzKJyV3 X-Google-Smtp-Source: APXvYqwxUp7lFrRTHyNNXZwZY/J/1Pnih+U9pY1B29r48Ud8KhkN/CV1C5CWDZHLbDqRyxnGT9rHnA== X-Received: by 2002:a5d:51cc:: with SMTP id n12mr4444686wrv.177.1578486811883; Wed, 08 Jan 2020 04:33:31 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 32/38] vhost-user-blk: Explicit we ignore few QEMUChrEvent in IOEventHandler Date: Wed, 8 Jan 2020 13:32:49 +0100 Message-Id: <1578486775-52247-33-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> References: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::429 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 The Chardev events are listed in the QEMUChrEvent enum. To be able to use this enum in the IOEventHandler typedef, we need to explicit all the events ignored by this frontend, to silent the following GCC warning: CC s390x-softmmu/hw/block/vhost-user-blk.o hw/block/vhost-user-blk.c: In function =E2=80=98vhost_user_blk_event=E2= =80=99: hw/block/vhost-user-blk.c:370:5: error: enumeration value =E2=80=98CHR_EV= ENT_BREAK=E2=80=99 not handled in switch [-Werror=3Dswitch] 370 | switch (event) { | ^~~~~~ hw/block/vhost-user-blk.c:370:5: error: enumeration value =E2=80=98CHR_EV= ENT_MUX_IN=E2=80=99 not handled in switch [-Werror=3Dswitch] hw/block/vhost-user-blk.c:370:5: error: enumeration value =E2=80=98CHR_EV= ENT_MUX_OUT=E2=80=99 not handled in switch [-Werror=3Dswitch] cc1: all warnings being treated as errors Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Michael S. Tsirkin Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <20191218172009.8868-10-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- hw/block/vhost-user-blk.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c index 63da9bb..ccaf2ad 100644 --- a/hw/block/vhost-user-blk.c +++ b/hw/block/vhost-user-blk.c @@ -383,6 +383,11 @@ static void vhost_user_blk_event(void *opaque, int eve= nt) s->watch =3D 0; } break; + case CHR_EVENT_BREAK: + case CHR_EVENT_MUX_IN: + case CHR_EVENT_MUX_OUT: + /* Ignore */ + break; } } =20 --=20 1.8.3.1 From nobody Fri May 17 15:28:08 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578488039; cv=none; d=zohomail.com; s=zohoarc; b=QEsoMvlSl0YfdvnQAuke1E+FG0GOjaOVRrao18A9hy4K12MASWHV8wfxh3hiuo5URbZ2TZG4QRdvb7twdWUgS9lzMr8UXd0eoaYdPy9appETwg1iSbb6OAyev3NJheKwd95IVAmyBS8qwGgGRDxBTCFlQwZlNbdY4+Nfe/EY4/0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578488039; h=Content-Type:Content-Transfer-Encoding:Cc: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=8UTL2P0i77cpbG9WgGJIiLpRG//RBVj09gdW5qz0I7M=; b=bd2I4mDyRuxwpVG6jWfzzyLJvNfriMr8q6fk1jmlp7LfLg+oDpD21bDNpnEPRlTABxoujp3CzXngMs+CMgW5gVBLDGDSrf1WVcVyNGA9yw0UZD1Ed81C29Zd95MrAia6tFvzUjOOpNeqi3dvQvS3xPyXLakmCoG+vMNcmvt5aDs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578488039338355.9260786110767; Wed, 8 Jan 2020 04:53:59 -0800 (PST) Received: from localhost ([::1]:43082 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAqT-00089Y-Up for importer@patchew.org; Wed, 08 Jan 2020 07:53:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60699) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAWl-0004Mu-En for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipAWk-0004aU-CR for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:35 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:33839) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipAWk-0004a9-6a for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:34 -0500 Received: by mail-wr1-x42b.google.com with SMTP id t2so3239710wrr.1 for ; Wed, 08 Jan 2020 04:33:34 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id o4sm4037750wrw.97.2020.01.08.04.33.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 04:33:32 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=8UTL2P0i77cpbG9WgGJIiLpRG//RBVj09gdW5qz0I7M=; b=mmGI9Fcu75W2Jk1JspvBkG3FOkI+So/7SWMV/JaSsK5F6nRz0qB5usNydujaOO6D+R o+tBHpoVvFdkx2yJwITG8KaphmJUDpcpwqbKzTqvGG/VQB/QKbD7CEsIO3eXL+qdsoWk 5KMI/AfnEm+2w0lx1n42q+EwtMwG5kkoQ4wft8fYHKXOI4x0NT+Mj9+KUCuXsW1JN91l Aw4Gbd3BYb39u98Q+KUDr2piynow0mMlvwstTHPKrtAVRUVG6jDuFPACTuvqsLckDh6T 3AXLZir49gkHY1swtYZqXOARTNwxH4uK9hJ6FvXbjkpPy2dmVweMgh2y7ZVgFcyBmX/4 Z0Xg== 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:mime-version:content-transfer-encoding; bh=8UTL2P0i77cpbG9WgGJIiLpRG//RBVj09gdW5qz0I7M=; b=fZv4tTVDYgnpSd4jaXmWozXRxQt16dlptKxyEeM+PMSCWxaayKBcuCl54qORPdYre2 klpy3vj4JHPbXOj8ro+3QMem8feexu9M1DAt6ZblnmVbhgnPZFoG5EMtrK3pbIGQ6J7R Fsds2RrXH91eqPHjF0JS+W3LtgtdVa5KV8HF+P+nMzLfOIwv9Jz9Jl0lL9UXnwlCr75+ Xm1s40B3jOYsFHeKqh+o7pEDmwtNDrniH4FAKFWK7CLQ+XAA1TO+htu23tQAG+zFOPwx /ebPUnV6TJHvB5AabgRpl89OJWu52qhzPltwwyvbEQmWPqclW1ArN64kQwYF9EGEFEc9 8rNw== X-Gm-Message-State: APjAAAU6uK5Va69WItrqPdtaDCmxY/2Pa8UoKE3RQE3812Rt/6nemIPy gxOcDg0Ag8Tm34lwoUkoT3uvWU6E X-Google-Smtp-Source: APXvYqwGEF5qhrQE+5Jqv/0caK4snd5KntTxb+eio3plZGR6zDxoWQYFa6vdapx+0zlU/jS7XU5KRQ== X-Received: by 2002:a05:6000:1288:: with SMTP id f8mr4354857wrx.66.1578486812959; Wed, 08 Jan 2020 04:33:32 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 33/38] virtio-console: Explicit we ignore some QEMUChrEvent in IOEventHandler Date: Wed, 8 Jan 2020 13:32:50 +0100 Message-Id: <1578486775-52247-34-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> References: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42b X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 The Chardev events are listed in the QEMUChrEvent enum. To be able to use this enum in the IOEventHandler typedef, we need to explicit all the events ignored by this frontend, to silent the following GCC warning: CC hw/char/virtio-console.o hw/char/virtio-console.c: In function =E2=80=98chr_event=E2=80=99: hw/char/virtio-console.c:154:5: error: enumeration value =E2=80=98CHR_EVE= NT_BREAK=E2=80=99 not handled in switch [-Werror=3Dswitch] 154 | switch (event) { | ^~~~~~ hw/char/virtio-console.c:154:5: error: enumeration value =E2=80=98CHR_EVE= NT_MUX_IN=E2=80=99 not handled in switch [-Werror=3Dswitch] hw/char/virtio-console.c:154:5: error: enumeration value =E2=80=98CHR_EVE= NT_MUX_OUT=E2=80=99 not handled in switch [-Werror=3Dswitch] cc1: all warnings being treated as errors Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Michael S. Tsirkin Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <20191218172009.8868-11-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- hw/char/virtio-console.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/char/virtio-console.c b/hw/char/virtio-console.c index c13649f..cbb304d 100644 --- a/hw/char/virtio-console.c +++ b/hw/char/virtio-console.c @@ -162,6 +162,11 @@ static void chr_event(void *opaque, int event) } virtio_serial_close(port); break; + case CHR_EVENT_BREAK: + case CHR_EVENT_MUX_IN: + case CHR_EVENT_MUX_OUT: + /* Ignore */ + break; } } =20 --=20 1.8.3.1 From nobody Fri May 17 15:28:08 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578488157; cv=none; d=zohomail.com; s=zohoarc; b=J0Q2GltfW2DRWSkXCI3JSLOlcmKJBye588VFWwwOJRhD8Qw0R6w0MIr1/A3ChhMCd/ZB8bbKmn2Vzm4H0KcWxZ8778+vSFqsHymSA0eFbtLXhDbamS7t2pP2LtCAwVLQYyZARK17Cso9mhmWJ9aCfIpqou3lhV1D5KpQ59BuAg8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578488157; h=Content-Type:Content-Transfer-Encoding:Cc: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=/fSkOiubeSR2RsQ2FE11TyyAzCwnm2uZ+zIHW+a+jmk=; b=Ns4Fr0x9P+NEG7HCY7LRkKqfZU86+GWI8xlGsDOT/hI0Is/J0q8HBm5PN7uJTh3T1SpXUAag06KUOxIHfFUdGCSwZad5Bc9uHs2PshbaYS99FJ/1qeKuEUdK+DbfS80dFnWHCqrUo5PNM7Td9HQi1Htcavvq97cRuk0i6Lq1r8M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578488157967626.3214060149924; Wed, 8 Jan 2020 04:55:57 -0800 (PST) Received: from localhost ([::1]:43100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAsO-0002Ms-Kr for importer@patchew.org; Wed, 08 Jan 2020 07:55:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60716) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAWm-0004PA-E3 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipAWl-0004bC-CI for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:36 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:50274) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipAWl-0004ak-67 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:35 -0500 Received: by mail-wm1-x333.google.com with SMTP id a5so2312312wmb.0 for ; Wed, 08 Jan 2020 04:33:35 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id o4sm4037750wrw.97.2020.01.08.04.33.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 04:33:33 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=/fSkOiubeSR2RsQ2FE11TyyAzCwnm2uZ+zIHW+a+jmk=; b=k7viQz9hHdRB/kc7Z1yIt1Z1Fpa6raRZepLhOq6A4P7+nJnabr5MTuXWulgle7yKvI VgA0ANDuQruAO3BfZigEtOTGlYbSr9L8Yvv8N/0dFZXXupr0TzUsFeTVgifO0fiUu5Y/ DE4kyw12rfH7ejWiX00ue4RMx3AeS9wG7dqOEHae/EEZneIKb8AFu58hxFxDPYlQhaja 9willGtvIb2u4tqgVogp1nuprxAScccDfXwCJdPgKFdlN9tIGNCkOKwaiYhANthemfOb ZWrxg5LvFtYfWgSqBUJ09WnQqTaDn8tR+oPawuwresAybbGey6e4ESXFTajDuaHHRYTn ijBg== 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:mime-version:content-transfer-encoding; bh=/fSkOiubeSR2RsQ2FE11TyyAzCwnm2uZ+zIHW+a+jmk=; b=ojmjDx4PsYG8k+7vroEhZ+kgUDd/lzg1DWdeJKh4//q1nLF+Wrb7l2lo7PUuZ7m4EP ABsN/1PPvvUMvcvTFD+Ldpdm5gtd8fes56LxB66xg9nutzh5EaFoJNRIevTORnvi6ANo Tp5L06/nqob0JLkI3LqzrCbpqtXo8R8zmswL+lYbUBUsPCrZQdLgaPDcPErrATWql+/x Nqkui0QBEHDoCVswntwUuyKE68YyYmMG2jqnhB5BdnpSwCxAsOPTAPw7qzL3flqqSvhd BUURL6VSn6kiFXcAj3NOV8YCJtV118NdUN7MmEQDPGbicpAvMo5S5IWNTfhFR2G2Zu8a F1AA== X-Gm-Message-State: APjAAAXCRIawqQidTlg1WHqUZkOt31VxFN8vh/a3aFFreq7+a2bfzCwa Y0LLo+gbWU/FWkprerUcJ2MrMtlp X-Google-Smtp-Source: APXvYqwsdN8LajZk8WgLJ7VW/Lty3R60qSgpIVrvWN5+uoXDjyxb2J3J0UjJ0Qt/jSIPUpYUOeFrww== X-Received: by 2002:a7b:c351:: with SMTP id l17mr3777149wmj.25.1578486813980; Wed, 08 Jan 2020 04:33:33 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 34/38] monitor/qmp: Explicit we ignore few QEMUChrEvent in IOEventHandler Date: Wed, 8 Jan 2020 13:32:51 +0100 Message-Id: <1578486775-52247-35-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> References: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::333 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 The Chardev events are listed in the QEMUChrEvent enum. To be able to use this enum in the IOEventHandler typedef, we need to explicit all the events ignored by this frontend, to silent the following GCC warning: CC monitor/qmp.o monitor/qmp.c: In function =E2=80=98monitor_qmp_event=E2=80=99: monitor/qmp.c:345:5: error: enumeration value =E2=80=98CHR_EVENT_BREAK=E2= =80=99 not handled in switch [-Werror=3Dswitch] 345 | switch (event) { | ^~~~~~ monitor/qmp.c:345:5: error: enumeration value =E2=80=98CHR_EVENT_MUX_IN= =E2=80=99 not handled in switch [-Werror=3Dswitch] monitor/qmp.c:345:5: error: enumeration value =E2=80=98CHR_EVENT_MUX_OUT= =E2=80=99 not handled in switch [-Werror=3Dswitch] cc1: all warnings being treated as errors Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Markus Armbruster Message-Id: <20191218172009.8868-12-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- monitor/qmp.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/monitor/qmp.c b/monitor/qmp.c index b67a8e7..6c46be4 100644 --- a/monitor/qmp.c +++ b/monitor/qmp.c @@ -365,6 +365,11 @@ static void monitor_qmp_event(void *opaque, int event) mon_refcount--; monitor_fdsets_cleanup(); break; + case CHR_EVENT_BREAK: + case CHR_EVENT_MUX_IN: + case CHR_EVENT_MUX_OUT: + /* Ignore */ + break; } } =20 --=20 1.8.3.1 From nobody Fri May 17 15:28:08 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578488300; cv=none; d=zohomail.com; s=zohoarc; b=MPVNvCNgkL4biiZPCkl0jqGMwmaBWtKUeYRvAKxNbspVIGndWl8/HBC5JNnM+8h1YTz6MEr2JQ666s2F74vtuWsvBm24KSa4fTuM04ZncOaX+0QTR/ura4t6se5xv70g6VdO3iL4h6QKDcL3umuHEklVjS01dk7pXeO0HGMH1/Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578488300; h=Content-Type:Content-Transfer-Encoding:Cc: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=nCFDvneHvDjWpyCU9KybmAmT/8/EAEw7mDdY8fjzHtg=; b=ReAxtGyIf1WuxbCAyNMDwq/JZ+AsPEYKVHlJ4mbfqceIW4DGZJUIW60Qp17CulrcCGvLSr/mmPm9MmH45YwmuN5xOh/aA4zj8gGX4x7aOd3dhNWVemeClFUjq0Ro4eAg3XefkcM0kZBhwbf73qadnBZ8TjEgJI/O26GDgTP8niA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578488300513856.4595021966824; Wed, 8 Jan 2020 04:58:20 -0800 (PST) Received: from localhost ([::1]:43136 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAuh-000679-2V for importer@patchew.org; Wed, 08 Jan 2020 07:58:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60733) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAWn-0004QW-7P for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipAWm-0004bg-6b for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:37 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:54064) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipAWm-0004bN-0f for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:36 -0500 Received: by mail-wm1-x334.google.com with SMTP id m24so2291877wmc.3 for ; Wed, 08 Jan 2020 04:33:35 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id o4sm4037750wrw.97.2020.01.08.04.33.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 04:33:34 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=nCFDvneHvDjWpyCU9KybmAmT/8/EAEw7mDdY8fjzHtg=; b=aoD84MoyXokD58csuHv96AC8jtTpWWB8KuAHrMgRBSvW/L6VqjvT12xqSrFzZQGPi2 GAbuxkJrv2u1wOA+WEqhJtkBaYPP42Z5AUFVGoI0jrH2CKLRa9xrB51Dy0H10lSAhBav zmqOcg/dxkTfZHoMcRJ4mz2VXtkypKF2iNcjMkyz1FKIOTZbeUg1+e9CMQ0vOMcjD2QI f2mdUcSmH2xmcmpNHhOTJp2O+w9l+3eZac6eyvH7SDG5T051YjTdyJ0eAOZftrE3so4A 6dJkySQFutYmo55HxBugEHAKg8sOtNYNlkYxmwtluBiGFac2w8CZoHYNkWJBsblzx9td TEQg== 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:mime-version:content-transfer-encoding; bh=nCFDvneHvDjWpyCU9KybmAmT/8/EAEw7mDdY8fjzHtg=; b=WV5FhVPx4QvMKkfsg+MbKaPPt/PskRQomkr5881JjzAjvOwFz5WA372fHDdE/vZCwa mM+tE46kxJ+Kh75kgayGGKc9DRzarY06cwlGA1yOXQRFfjmi15OUmBFv6uu+r/5qBlnV VlGrGpw4bf3vGj5b5QfpafqYV6C5xpu2HKIS4I2EkNZ7VSVRrT6LI8A0iEeOyMuBs5Sn 6CMfvmPzkFiCs9WOShBTQAYlMsuXhQ5RT+0BEACxkqhiRusOaGGAdJOtatSm2YyZhuP/ 9miKVWWW0dBQ4Ch+sP9G8nZ6BVaf5rDbHScGThcA0zeoIh/e4WBffXe0EDJSxRSvBJnV 7HTw== X-Gm-Message-State: APjAAAV57D18cWFI8+3pqMeNj27kD5dQkPY7gFcmOkWy2qvOn18M8W55 E5zT1YvCKVB6BWC5nvIayi0k4cb4 X-Google-Smtp-Source: APXvYqz0F9gRx/UG72fiEBZ+ZvwrgDolXMcfeXsQMcZhqAU3JmJCsYOSdSVbdy8s5OubTu2q7XIKag== X-Received: by 2002:a7b:c389:: with SMTP id s9mr3618236wmj.7.1578486814862; Wed, 08 Jan 2020 04:33:34 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 35/38] monitor/hmp: Explicit we ignore a QEMUChrEvent in IOEventHandler Date: Wed, 8 Jan 2020 13:32:52 +0100 Message-Id: <1578486775-52247-36-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> References: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::334 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 The Chardev events are listed in the QEMUChrEvent enum. To be able to use this enum in the IOEventHandler typedef, we need to explicit an event ignored by this frontend, to silent the following GCC warning: CC monitor/hmp.o monitor/hmp.c: In function =E2=80=98monitor_event=E2=80=99: monitor/hmp.c:1330:5: error: enumeration value =E2=80=98CHR_EVENT_BREAK= =E2=80=99 not handled in switch [-Werror=3Dswitch] 1330 | switch (event) { | ^~~~~~ cc1: all warnings being treated as errors Acked-by: Dr. David Alan Gilbert Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <20191218172009.8868-13-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- monitor/hmp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/monitor/hmp.c b/monitor/hmp.c index 8942e28..706ebe7 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -1371,6 +1371,10 @@ static void monitor_event(void *opaque, int event) mon_refcount--; monitor_fdsets_cleanup(); break; + + case CHR_EVENT_BREAK: + /* Ignored */ + break; } } =20 --=20 1.8.3.1 From nobody Fri May 17 15:28:08 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578488629; cv=none; d=zohomail.com; s=zohoarc; b=e0jnWxa8br/C9h4i7js2cA29+dzwxbTGGPC1TIujGpI4ASpRQi0/b6PIcHVLFz9whs6gGOIcNPlh+BLR4+GmnDRKMZCnC9f01szfCip0elJtSz4BCYfamnKmXqtIVbXSQOkhEqWU2WSS58PCDVHU83c15bghnhg6QnzWJS8OObU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578488629; h=Content-Type:Content-Transfer-Encoding:Cc: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=n98xC83HGR1EyrVTal/VnLJiWwmzPPe4kCosA3uE+Sg=; b=Pk0gFEWbKUgFIimk4np8Joqq1MHzRm3bYg1SWFhkNxxMAY7B1t21dDCC/9FbGkCseFuV0ViD8jDPuFGA8OWKk/6pxfIvwqeOEHwLTU/KKKKIaMrnBAbB9LIZ3D0CkenwYgAhzk2nP6opo4+B84pMDWUoTEaH8ytaBdhIBugkAJQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578488629016271.414939564523; Wed, 8 Jan 2020 05:03:49 -0800 (PST) Received: from localhost ([::1]:43288 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAzz-0004DL-UM for importer@patchew.org; Wed, 08 Jan 2020 08:03:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60748) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAWo-0004Rm-15 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipAWn-0004cV-22 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:37 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:36962) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipAWm-0004bq-SM for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:37 -0500 Received: by mail-wm1-x333.google.com with SMTP id f129so2321303wmf.2 for ; Wed, 08 Jan 2020 04:33:36 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id o4sm4037750wrw.97.2020.01.08.04.33.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 04:33:35 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=n98xC83HGR1EyrVTal/VnLJiWwmzPPe4kCosA3uE+Sg=; b=FkLcqMYqcCyzbNoKqkYIO+VQj9dCjTD+g7WsUS7tdRSQSvG5qeuJNQjCRQ8o/zxQhZ bObDlxyiiN23L1qde9WYic81BsdYdWsqUqR14vTuoWVMZVRCnAVUTu4403yfHk303tI7 RjgsVMgkFzeRqkcB1TJvmB872SmX8XINGSh6UOYLShxvds2hPvL9hUJQWNySq7oD6GoH AlJM4QihDcI3pfPoKRfxWWUiGAgZeUpSkQIouhTRusvL0xEup7cE0A3Fe+c3FnZ950xJ HGIJ4su/FbfUVMpqk/jitLBCxCA4GPlSSHA1/7dJQausaAoqx7RFic5YRIIhURUyVKGi SoLA== 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:mime-version:content-transfer-encoding; bh=n98xC83HGR1EyrVTal/VnLJiWwmzPPe4kCosA3uE+Sg=; b=SWzSYyQltuhqJY4EGbQaKdqSiFvwgHf9eCdmCGabInAiHYga8ABKcHT0YRliQUUYOM 82aZMjyuVjbNrGcjgeFQSM69Hc65tkRF9QdTkMWazSqDZV/EBwplVF50pl+fpNmGHp5v ptz5zAXlZhDoluAhIn5slMfstn2bKEq1l0S8JuOngIfvg5Fs9RDe1zOo4o52JFoBD9dV 89pvVTN9hmqiCDZTwLc4q2Rf9eFZEgfbkQ7GTrP1T5f+nMzKD/RVqjZmBNS21xCuS4fH F7cF3GTk8QW2ttO5hhtamnMxBuyqZ2v9Yu7S3996dXww4HYTbN1yhjMy+O30sF4ew5zM RCZQ== X-Gm-Message-State: APjAAAW7cQ4JZF7fVxjPzjY6dbDs9FJgSuSxHcZZjRbdssfF+YScjlKZ SiFVmkIURT5fLejws+GRbDp+asvK X-Google-Smtp-Source: APXvYqy7snbyfEYUnr1hwHlU2wXU33NMddA/f75NmId8r28y/QMgLp85MrqgqfXrLUmrLZtgQ4RazA== X-Received: by 2002:a7b:c956:: with SMTP id i22mr3631039wml.67.1578486815801; Wed, 08 Jan 2020 04:33:35 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 36/38] chardev/char: Explicit we ignore some QEMUChrEvent in IOEventHandler Date: Wed, 8 Jan 2020 13:32:53 +0100 Message-Id: <1578486775-52247-37-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> References: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::333 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 The Chardev events are listed in the QEMUChrEvent enum. To be able to use this enum in the IOEventHandler typedef, we need to explicit all the events ignored by this frontend, to silent the following GCC warning: chardev/char.c: In function =E2=80=98qemu_chr_be_event=E2=80=99: chardev/char.c:65:5: error: enumeration value =E2=80=98CHR_EVENT_BREAK=E2= =80=99 not handled in switch [-Werror=3Dswitch] 65 | switch (event) { | ^~~~~~ chardev/char.c:65:5: error: enumeration value =E2=80=98CHR_EVENT_MUX_IN= =E2=80=99 not handled in switch [-Werror=3Dswitch] chardev/char.c:65:5: error: enumeration value =E2=80=98CHR_EVENT_MUX_OUT= =E2=80=99 not handled in switch [-Werror=3Dswitch] cc1: all warnings being treated as errors Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <20191218172009.8868-14-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- chardev/char.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/chardev/char.c b/chardev/char.c index 7b6b2cb..739da11 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -69,6 +69,11 @@ void qemu_chr_be_event(Chardev *s, int event) case CHR_EVENT_CLOSED: s->be_open =3D 0; break; + case CHR_EVENT_BREAK: + case CHR_EVENT_MUX_IN: + case CHR_EVENT_MUX_OUT: + /* Ignore */ + break; } =20 CHARDEV_GET_CLASS(s)->chr_be_event(s, event); --=20 1.8.3.1 From nobody Fri May 17 15:28:08 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578488252; cv=none; d=zohomail.com; s=zohoarc; b=esi2x4I6N0sEe4iar48UFeFgZnTZpYsPQaVBW/jPbTtEr+UJBTEHR0VRsYGrHofEXcNvmt/Amzh+4etcKcUJ122ckSVqVCfc8XUGJcQhg8W3EsJdoNyJ/zHmvkNfEx89fT2fBuoVO4xBElYO/qXkzVAJM2ryNrxLv13k5lORLIs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578488252; 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=lI/UiO0FLtiZA09SZKe3jYpK18b21lSc4c4LR3K/VDs=; b=Nl+4WjaMv/07DXO3U6CJ0ARaFe7ZbrHraP/E16J3x4xkuJT9cMl94YSDzibBjYnI/pKyWfnCUq2rfuZ+9CKa6XjVDv+fv8WNNKtRQTnvij7ZRn4DgR92Pvkla+FaLhes0TJax/eMod6BvSBUh6k/LS0Zm/zwsriuP+rRIPlndDw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15784882524451.0320071790555403; Wed, 8 Jan 2020 04:57:32 -0800 (PST) Received: from localhost ([::1]:43132 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAtv-0004ns-5c for importer@patchew.org; Wed, 08 Jan 2020 07:57:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60762) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAWp-0004TZ-5N for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipAWn-0004dE-VR for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:39 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:36212) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipAWn-0004ch-OM for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:37 -0500 Received: by mail-wm1-x341.google.com with SMTP id p17so2325038wma.1 for ; Wed, 08 Jan 2020 04:33:37 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id o4sm4037750wrw.97.2020.01.08.04.33.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 04:33:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lI/UiO0FLtiZA09SZKe3jYpK18b21lSc4c4LR3K/VDs=; b=TsHDMF5vCHzvDgzxwEFl1FN1p9Pmbx3hHVrAzPLJZyivAg6AEG3NlQ6XH+pPl1S2py IrAJA5J3k1gEdBaJfhUE2QaZr0u2pbSEpy2nV76J21LpooLuiR08t1CdQyPvzpH//753 Wx/1ZVpZBiCPbnqkXmlpvz5zQGPizKAsnH/OMpAWmE+rJAZE3tNaUbX0cEWnUcHscuCI MGdB4URatFXPYQDKJCBet2ZHh3VwEwaKWrvOBwQi+3m4dZbR+6JJvP9QMfav6WgEDAPb a2mJhBzL0ssjg+pEpxcHSHH6m2kyjd158dDzC56jrVNmG0/BW+lv1uyaHPokgsY0ByM9 CThw== 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:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=lI/UiO0FLtiZA09SZKe3jYpK18b21lSc4c4LR3K/VDs=; b=Qg1Nb6NtLbPiRJF6YscxpfCAtZuH9/6XY+rAdhmD+o1h5KMfbTDxc0AjOTx8lLKY0m GznBmHc6CPIb6ceUmDwrYTuL4id05u6FJkaVvYiKRrFDSPdh5xvS+n8Y1z/iYvPav/Ph vHLtjPpJGE7Kg4V8tkQCrT9lzwkaZFuOCc5PepjOTpHNjy1eW9mvhXa867uA16FBwrHy OwRVV+4pSLonjAb1ZIw0yG1fmUlHVgMYCrVwC5vtNwZDn1yWOjHOJ0pEQWXpHQ4VlPtL sXITjEysmEHV1QhKkS/+aD/uu6DZUCUwK/VsZouGxs91qbAtERl6o++TYIU/JFRt0Mux 4bLQ== X-Gm-Message-State: APjAAAX1/uavVuybHLs4o9a2ne4B9XK5nqWOhrpBWbdlJWzx5AxfxoDH kA3lFcvTRyC/g6g++aa9tVpgYK+C X-Google-Smtp-Source: APXvYqy+ghnelaFLwIt3+Em/6UBY35s+XLG+PaoIN8YJf9VfsfIm63foF9cPfXNu8A15xsvuHohdwg== X-Received: by 2002:a1c:66d5:: with SMTP id a204mr3503888wmc.64.1578486816630; Wed, 08 Jan 2020 04:33:36 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 37/38] chardev: use QEMUChrEvent instead of int Date: Wed, 8 Jan 2020 13:32:54 +0100 Message-Id: <1578486775-52247-38-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> References: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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" X-ZohoMail-DKIM: fail (Header signature does not verify) This uses the QEMUChrEvent enum everywhere except in IOEventHandler. The IOEventHandler change needs to happen at once for all front ends and is done with Coccinelle in the next patch. (Extracted from a patch by Philippe Mathieu-Daud=C3=A9). Signed-off-by: Paolo Bonzini --- chardev/char-mux.c | 6 +++--- chardev/char.c | 4 ++-- include/chardev/char-mux.h | 2 +- include/chardev/char.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/chardev/char-mux.c b/chardev/char-mux.c index 200c62a..2675ae0 100644 --- a/chardev/char-mux.c +++ b/chardev/char-mux.c @@ -117,7 +117,7 @@ static void mux_print_help(Chardev *chr) } } =20 -static void mux_chr_send_event(MuxChardev *d, int mux_nr, int event) +static void mux_chr_send_event(MuxChardev *d, int mux_nr, QEMUChrEvent eve= nt) { CharBackend *be =3D d->backends[mux_nr]; =20 @@ -126,7 +126,7 @@ static void mux_chr_send_event(MuxChardev *d, int mux_n= r, int event) } } =20 -static void mux_chr_be_event(Chardev *chr, int event) +static void mux_chr_be_event(Chardev *chr, QEMUChrEvent event) { MuxChardev *d =3D MUX_CHARDEV(chr); =20 @@ -232,7 +232,7 @@ static void mux_chr_read(void *opaque, const uint8_t *b= uf, int size) } } =20 -void mux_chr_send_all_event(Chardev *chr, int event) +void mux_chr_send_all_event(Chardev *chr, QEMUChrEvent event) { MuxChardev *d =3D MUX_CHARDEV(chr); int i; diff --git a/chardev/char.c b/chardev/char.c index 739da11..4f598f8 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -48,7 +48,7 @@ static Object *get_chardevs_root(void) return container_get(object_get_root(), "/chardevs"); } =20 -static void chr_be_event(Chardev *s, int event) +static void chr_be_event(Chardev *s, QEMUChrEvent event) { CharBackend *be =3D s->be; =20 @@ -59,7 +59,7 @@ static void chr_be_event(Chardev *s, int event) be->chr_event(be->opaque, event); } =20 -void qemu_chr_be_event(Chardev *s, int event) +void qemu_chr_be_event(Chardev *s, QEMUChrEvent event) { /* Keep track if the char device is open */ switch (event) { diff --git a/include/chardev/char-mux.h b/include/chardev/char-mux.h index 572cefd..417fe32 100644 --- a/include/chardev/char-mux.h +++ b/include/chardev/char-mux.h @@ -56,6 +56,6 @@ typedef struct MuxChardev { object_dynamic_cast(OBJECT(chr), TYPE_CHARDEV_MUX) =20 void mux_set_focus(Chardev *chr, int focus); -void mux_chr_send_all_event(Chardev *chr, int event); +void mux_chr_send_all_event(Chardev *chr, QEMUChrEvent event); =20 #endif /* CHAR_MUX_H */ diff --git a/include/chardev/char.h b/include/chardev/char.h index 087b202..00589a6 100644 --- a/include/chardev/char.h +++ b/include/chardev/char.h @@ -210,7 +210,7 @@ void qemu_chr_be_update_read_handlers(Chardev *s, * * Send an event from the back end to the front end. */ -void qemu_chr_be_event(Chardev *s, int event); +void qemu_chr_be_event(Chardev *s, QEMUChrEvent event); =20 int qemu_chr_add_client(Chardev *s, int fd); Chardev *qemu_chr_find(const char *name); @@ -273,7 +273,7 @@ typedef struct ChardevClass { void (*chr_accept_input)(Chardev *chr); void (*chr_set_echo)(Chardev *chr, bool echo); void (*chr_set_fe_open)(Chardev *chr, int fe_open); - void (*chr_be_event)(Chardev *s, int event); + void (*chr_be_event)(Chardev *s, QEMUChrEvent event); /* Return 0 if succeeded, 1 if failed */ int (*chr_machine_done)(Chardev *chr); } ChardevClass; --=20 1.8.3.1 From nobody Fri May 17 15:28:08 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578488423; cv=none; d=zohomail.com; s=zohoarc; b=Ml8HeULyY+3z1W/AjQ0rEQ2sxbdSL9WahcttLkoitcTAS7bqV/ROZwGZ60bJGq/ovrUPJ2j61g9XNdGCpdXrWNclvloJkP19KvPOITcItslgY0GtQClMLnuIJh95HUS/XtOZXwWcqES6aGd2JKu+i7CZNV8Bow0owDV9t4zoCO8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578488423; h=Content-Type:Content-Transfer-Encoding:Cc: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=cH7ct5X68dV4J5xr190rAMFwpjfS5nv2os2fFYotpQs=; b=gOkuHg+0I+gNp2X7SwiODp61ZcwkJ3kRFj48PiPfOX0XPwq/8EH5lzHEnm8Nvh6qMrnRwt9WF/XjOW/ZYZTAo/rFI22LVnN+CgW5ovUdpcZz2vWYvDwBK50H5q4uNEv4Q6VoHOT0mkRSLgaoG0oasww2FAG+JMeM1RpzrkFrw3M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578488423214881.9655417829804; Wed, 8 Jan 2020 05:00:23 -0800 (PST) Received: from localhost ([::1]:43166 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAwf-0000wc-SR for importer@patchew.org; Wed, 08 Jan 2020 08:00:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60797) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipAWt-0004Yr-0e for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipAWp-0004eK-JW for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:42 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:38067) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipAWp-0004du-6d for qemu-devel@nongnu.org; Wed, 08 Jan 2020 07:33:39 -0500 Received: by mail-wm1-x32d.google.com with SMTP id u2so2318517wmc.3 for ; Wed, 08 Jan 2020 04:33:39 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id o4sm4037750wrw.97.2020.01.08.04.33.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 04:33:37 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=cH7ct5X68dV4J5xr190rAMFwpjfS5nv2os2fFYotpQs=; b=Ei82SjFZ9zP7yR9oEcuTd4EjEWhJICe4y6vN0ixLGePtR4Gu1knYL2KfFbieHN5SRT xXxQkL6+MYb8EH94pTGnjs0M2R6sE22uhrS6SJhv74bqZHj49KhnCj+JakynD/djwWD7 ikg4CU5+GyFW4qwkrck9KLyoyvY5A7IGLxKhO1/Q1XQjnuf4oLFiHAhrFM7wDGu4BHNB epriJHqqth7uKZAr9Pyu3XvJTQzszqhyLTmBMVe+yDCrdTSwGjLyjLEmeshrSzpKMzz4 qX2R2WyqUlXqB28suAdJxDZgYWK2S6fpWhhr+TMuozKLwn2XOl1uDa3p8+RMolqSDgT5 0rlA== 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:mime-version:content-transfer-encoding; bh=cH7ct5X68dV4J5xr190rAMFwpjfS5nv2os2fFYotpQs=; b=uRKIGMalfcDrchDCURhn3CfOA/INl/aeKRBiq1zU9aeed9sN2ud17oRZivwgBBTBbS 66V0I833tG138la8dlc1vT1hovJLD5xfm655YDyBUpyGZ79XwBca+rB+meI9hzZwQD7y fOHe/ka5ylvvQ6PkMWL75BuSq9qsdMUk/r87JgSKqPECjctWVa131R6bdN1TDgw9OIkC 8xSyiy84hp7xQNuZm3noiMeR18peoC4lGiUZJFzkeA2Pz9hW5opj/d5L8mCZCSku6mlf KD6jBnIZyiCwx+8irkrIjxkewGL1S5ykdJ7sUM2HSAkCka2UE8dqshbmhkB4AyR7bNkL BNXw== X-Gm-Message-State: APjAAAXVvv2M5Uu0Iu+Kmzdd6LDBizfEllSHp9U0qK30IvM9o6SfQsrb udKRqvWl3HobiR57DVtXqBlXKDBf X-Google-Smtp-Source: APXvYqyExXy/iWaTjEA8EaVCZoUflLl5eoO9R6Ndk8akGQas80KaaGzGf2LSN+xhdkirT3nR3wOi5A== X-Received: by 2002:a7b:c4c5:: with SMTP id g5mr3728446wmk.85.1578486817826; Wed, 08 Jan 2020 04:33:37 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 38/38] chardev: Use QEMUChrEvent enum in IOEventHandler typedef Date: Wed, 8 Jan 2020 13:32:55 +0100 Message-Id: <1578486775-52247-39-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> References: <1578486775-52247-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32d X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 The Chardev events are listed in the QEMUChrEvent enum. By using the enum in the IOEventHandler typedef we: - make the IOEventHandler type more explicit (this handler process out-of-band information, while the IOReadHandler is in-band), - help static code analyzers. This patch was produced with the following spatch script: @match@ expression backend, opaque, context, set_open; identifier fd_can_read, fd_read, fd_event, be_change; @@ qemu_chr_fe_set_handlers(backend, fd_can_read, fd_read, fd_event, be_change, opaque, context, set_open); @depends on match@ identifier opaque, event; identifier match.fd_event; @@ static -void fd_event(void *opaque, int event) +void fd_event(void *opaque, QEMUChrEvent event) { ... } Then the typedef was modified manually in include/chardev/char-fe.h. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Corey Minyard Acked-by: Cornelia Huck Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <20191218172009.8868-15-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- backends/cryptodev-vhost-user.c | 2 +- chardev/char-mux.c | 2 +- gdbstub.c | 2 +- hw/arm/pxa2xx.c | 2 +- hw/arm/strongarm.c | 2 +- hw/block/vhost-user-blk.c | 2 +- hw/char/cadence_uart.c | 2 +- hw/char/digic-uart.c | 2 +- hw/char/escc.c | 2 +- hw/char/etraxfs_ser.c | 2 +- hw/char/exynos4210_uart.c | 2 +- hw/char/grlib_apbuart.c | 2 +- hw/char/imx_serial.c | 2 +- hw/char/ipoctal232.c | 2 +- hw/char/lm32_juart.c | 2 +- hw/char/lm32_uart.c | 2 +- hw/char/mcf_uart.c | 2 +- hw/char/milkymist-uart.c | 2 +- hw/char/nrf51_uart.c | 2 +- hw/char/pl011.c | 2 +- hw/char/serial.c | 2 +- hw/char/sh_serial.c | 2 +- hw/char/terminal3270.c | 2 +- hw/char/virtio-console.c | 2 +- hw/char/xilinx_uartlite.c | 2 +- hw/ipmi/ipmi_bmc_extern.c | 2 +- hw/mips/boston.c | 2 +- hw/mips/mips_malta.c | 2 +- hw/riscv/riscv_htif.c | 2 +- hw/riscv/sifive_uart.c | 2 +- hw/usb/ccid-card-passthru.c | 2 +- hw/usb/dev-serial.c | 2 +- hw/usb/redirect.c | 2 +- include/chardev/char-fe.h | 2 +- monitor/hmp.c | 2 +- monitor/qmp.c | 2 +- net/filter-mirror.c | 2 +- net/vhost-user.c | 4 ++-- qtest.c | 2 +- tests/test-char.c | 6 +++--- tests/vhost-user-test.c | 2 +- 41 files changed, 44 insertions(+), 44 deletions(-) diff --git a/backends/cryptodev-vhost-user.c b/backends/cryptodev-vhost-use= r.c index f1b4079..6edada8 100644 --- a/backends/cryptodev-vhost-user.c +++ b/backends/cryptodev-vhost-user.c @@ -152,7 +152,7 @@ cryptodev_vhost_claim_chardev(CryptoDevBackendVhostUser= *s, return chr; } =20 -static void cryptodev_vhost_user_event(void *opaque, int event) +static void cryptodev_vhost_user_event(void *opaque, QEMUChrEvent event) { CryptoDevBackendVhostUser *s =3D opaque; CryptoDevBackend *b =3D CRYPTODEV_BACKEND(s); diff --git a/chardev/char-mux.c b/chardev/char-mux.c index 2675ae0..46c44af 100644 --- a/chardev/char-mux.c +++ b/chardev/char-mux.c @@ -247,7 +247,7 @@ void mux_chr_send_all_event(Chardev *chr, QEMUChrEvent = event) } } =20 -static void mux_chr_event(void *opaque, int event) +static void mux_chr_event(void *opaque, QEMUChrEvent event) { mux_chr_send_all_event(CHARDEV(opaque), event); } diff --git a/gdbstub.c b/gdbstub.c index 4cf8af3..ce304ff 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -3171,7 +3171,7 @@ static void gdb_chr_receive(void *opaque, const uint8= _t *buf, int size) } } =20 -static void gdb_chr_event(void *opaque, int event) +static void gdb_chr_event(void *opaque, QEMUChrEvent event) { int i; GDBState *s =3D (GDBState *) opaque; diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c index cdafde2..950ff42 100644 --- a/hw/arm/pxa2xx.c +++ b/hw/arm/pxa2xx.c @@ -1955,7 +1955,7 @@ static void pxa2xx_fir_rx(void *opaque, const uint8_t= *buf, int size) pxa2xx_fir_update(s); } =20 -static void pxa2xx_fir_event(void *opaque, int event) +static void pxa2xx_fir_event(void *opaque, QEMUChrEvent event) { } =20 diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c index 6bee034..c6776e8 100644 --- a/hw/arm/strongarm.c +++ b/hw/arm/strongarm.c @@ -1093,7 +1093,7 @@ static void strongarm_uart_receive(void *opaque, cons= t uint8_t *buf, int size) strongarm_uart_update_int_status(s); } =20 -static void strongarm_uart_event(void *opaque, int event) +static void strongarm_uart_event(void *opaque, QEMUChrEvent event) { StrongARMUARTState *s =3D opaque; if (event =3D=3D CHR_EVENT_BREAK) { diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c index ccaf2ad..98b383f 100644 --- a/hw/block/vhost-user-blk.c +++ b/hw/block/vhost-user-blk.c @@ -361,7 +361,7 @@ static gboolean vhost_user_blk_watch(GIOChannel *chan, = GIOCondition cond, return true; } =20 -static void vhost_user_blk_event(void *opaque, int event) +static void vhost_user_blk_event(void *opaque, QEMUChrEvent event) { DeviceState *dev =3D opaque; VirtIODevice *vdev =3D VIRTIO_DEVICE(dev); diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c index 0e315b2..51791bd 100644 --- a/hw/char/cadence_uart.c +++ b/hw/char/cadence_uart.c @@ -348,7 +348,7 @@ static void uart_receive(void *opaque, const uint8_t *b= uf, int size) } } =20 -static void uart_event(void *opaque, int event) +static void uart_event(void *opaque, QEMUChrEvent event) { CadenceUARTState *s =3D opaque; uint8_t buf =3D '\0'; diff --git a/hw/char/digic-uart.c b/hw/char/digic-uart.c index 974a261..033eba0 100644 --- a/hw/char/digic-uart.c +++ b/hw/char/digic-uart.c @@ -131,7 +131,7 @@ static void uart_rx(void *opaque, const uint8_t *buf, i= nt size) s->reg_rx =3D *buf; } =20 -static void uart_event(void *opaque, int event) +static void uart_event(void *opaque, QEMUChrEvent event) { } =20 diff --git a/hw/char/escc.c b/hw/char/escc.c index 8f7bf32..c40c1d2 100644 --- a/hw/char/escc.c +++ b/hw/char/escc.c @@ -634,7 +634,7 @@ static void serial_receive1(void *opaque, const uint8_t= *buf, int size) serial_receive_byte(s, buf[0]); } =20 -static void serial_event(void *opaque, int event) +static void serial_event(void *opaque, QEMUChrEvent event) { ESCCChannelState *s =3D opaque; if (event =3D=3D CHR_EVENT_BREAK) diff --git a/hw/char/etraxfs_ser.c b/hw/char/etraxfs_ser.c index 15ac12e..f34f767 100644 --- a/hw/char/etraxfs_ser.c +++ b/hw/char/etraxfs_ser.c @@ -202,7 +202,7 @@ static int serial_can_receive(void *opaque) return sizeof(s->rx_fifo) - s->rx_fifo_len; } =20 -static void serial_event(void *opaque, int event) +static void serial_event(void *opaque, QEMUChrEvent event) { =20 } diff --git a/hw/char/exynos4210_uart.c b/hw/char/exynos4210_uart.c index d6b6b62..7e5c5ce 100644 --- a/hw/char/exynos4210_uart.c +++ b/hw/char/exynos4210_uart.c @@ -528,7 +528,7 @@ static void exynos4210_uart_receive(void *opaque, const= uint8_t *buf, int size) } =20 =20 -static void exynos4210_uart_event(void *opaque, int event) +static void exynos4210_uart_event(void *opaque, QEMUChrEvent event) { Exynos4210UartState *s =3D (Exynos4210UartState *)opaque; =20 diff --git a/hw/char/grlib_apbuart.c b/hw/char/grlib_apbuart.c index fe3cbf4..8e59c3b 100644 --- a/hw/char/grlib_apbuart.c +++ b/hw/char/grlib_apbuart.c @@ -155,7 +155,7 @@ static void grlib_apbuart_receive(void *opaque, const u= int8_t *buf, int size) } } =20 -static void grlib_apbuart_event(void *opaque, int event) +static void grlib_apbuart_event(void *opaque, QEMUChrEvent event) { trace_grlib_apbuart_event(event); } diff --git a/hw/char/imx_serial.c b/hw/char/imx_serial.c index fddde9b..d09c210 100644 --- a/hw/char/imx_serial.c +++ b/hw/char/imx_serial.c @@ -323,7 +323,7 @@ static void imx_receive(void *opaque, const uint8_t *bu= f, int size) imx_put_data(opaque, *buf); } =20 -static void imx_event(void *opaque, int event) +static void imx_event(void *opaque, QEMUChrEvent event) { if (event =3D=3D CHR_EVENT_BREAK) { imx_put_data(opaque, URXD_BRK | URXD_FRMERR | URXD_ERR); diff --git a/hw/char/ipoctal232.c b/hw/char/ipoctal232.c index 66c163b..80e9dff 100644 --- a/hw/char/ipoctal232.c +++ b/hw/char/ipoctal232.c @@ -503,7 +503,7 @@ static void hostdev_receive(void *opaque, const uint8_t= *buf, int size) } } =20 -static void hostdev_event(void *opaque, int event) +static void hostdev_event(void *opaque, QEMUChrEvent event) { SCC2698Channel *ch =3D opaque; switch (event) { diff --git a/hw/char/lm32_juart.c b/hw/char/lm32_juart.c index e0b1bd6..da9dd56 100644 --- a/hw/char/lm32_juart.c +++ b/hw/char/lm32_juart.c @@ -104,7 +104,7 @@ static int juart_can_rx(void *opaque) return !(s->jrx & JRX_FULL); } =20 -static void juart_event(void *opaque, int event) +static void juart_event(void *opaque, QEMUChrEvent event) { } =20 diff --git a/hw/char/lm32_uart.c b/hw/char/lm32_uart.c index 32f29c4..8d7a475 100644 --- a/hw/char/lm32_uart.c +++ b/hw/char/lm32_uart.c @@ -235,7 +235,7 @@ static int uart_can_rx(void *opaque) return !(s->regs[R_LSR] & LSR_DR); } =20 -static void uart_event(void *opaque, int event) +static void uart_event(void *opaque, QEMUChrEvent event) { } =20 diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c index 58323ba..2de3680 100644 --- a/hw/char/mcf_uart.c +++ b/hw/char/mcf_uart.c @@ -256,7 +256,7 @@ static void mcf_uart_push_byte(mcf_uart_state *s, uint8= _t data) mcf_uart_update(s); } =20 -static void mcf_uart_event(void *opaque, int event) +static void mcf_uart_event(void *opaque, QEMUChrEvent event) { mcf_uart_state *s =3D (mcf_uart_state *)opaque; =20 diff --git a/hw/char/milkymist-uart.c b/hw/char/milkymist-uart.c index c358ca0..1c7b614 100644 --- a/hw/char/milkymist-uart.c +++ b/hw/char/milkymist-uart.c @@ -180,7 +180,7 @@ static int uart_can_rx(void *opaque) return !(s->regs[R_STAT] & STAT_RX_EVT); } =20 -static void uart_event(void *opaque, int event) +static void uart_event(void *opaque, QEMUChrEvent event) { } =20 diff --git a/hw/char/nrf51_uart.c b/hw/char/nrf51_uart.c index 2777afe..b67fd21 100644 --- a/hw/char/nrf51_uart.c +++ b/hw/char/nrf51_uart.c @@ -245,7 +245,7 @@ static int uart_can_receive(void *opaque) return s->rx_started ? (UART_FIFO_LENGTH - s->rx_fifo_len) : 0; } =20 -static void uart_event(void *opaque, int event) +static void uart_event(void *opaque, QEMUChrEvent event) { NRF51UARTState *s =3D NRF51_UART(opaque); =20 diff --git a/hw/char/pl011.c b/hw/char/pl011.c index 84ad8ff..23cd544 100644 --- a/hw/char/pl011.c +++ b/hw/char/pl011.c @@ -280,7 +280,7 @@ static void pl011_receive(void *opaque, const uint8_t *= buf, int size) pl011_put_fifo(opaque, *buf); } =20 -static void pl011_event(void *opaque, int event) +static void pl011_event(void *opaque, QEMUChrEvent event) { if (event =3D=3D CHR_EVENT_BREAK) pl011_put_fifo(opaque, 0x400); diff --git a/hw/char/serial.c b/hw/char/serial.c index b4aa250..992b5ee 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -634,7 +634,7 @@ static void serial_receive1(void *opaque, const uint8_t= *buf, int size) serial_update_irq(s); } =20 -static void serial_event(void *opaque, int event) +static void serial_event(void *opaque, QEMUChrEvent event) { SerialState *s =3D opaque; DPRINTF("event %x\n", event); diff --git a/hw/char/sh_serial.c b/hw/char/sh_serial.c index 07dc16b..167f4d8 100644 --- a/hw/char/sh_serial.c +++ b/hw/char/sh_serial.c @@ -358,7 +358,7 @@ static void sh_serial_receive1(void *opaque, const uint= 8_t *buf, int size) } } =20 -static void sh_serial_event(void *opaque, int event) +static void sh_serial_event(void *opaque, QEMUChrEvent event) { sh_serial_state *s =3D opaque; if (event =3D=3D CHR_EVENT_BREAK) diff --git a/hw/char/terminal3270.c b/hw/char/terminal3270.c index 2aab04f..f7aba12 100644 --- a/hw/char/terminal3270.c +++ b/hw/char/terminal3270.c @@ -142,7 +142,7 @@ static void terminal_read(void *opaque, const uint8_t *= buf, int size) } } =20 -static void chr_event(void *opaque, int event) +static void chr_event(void *opaque, QEMUChrEvent event) { Terminal3270 *t =3D opaque; CcwDevice *ccw_dev =3D CCW_DEVICE(t); diff --git a/hw/char/virtio-console.c b/hw/char/virtio-console.c index cbb304d..a7d34fe 100644 --- a/hw/char/virtio-console.c +++ b/hw/char/virtio-console.c @@ -145,7 +145,7 @@ static void chr_read(void *opaque, const uint8_t *buf, = int size) virtio_serial_write(port, buf, size); } =20 -static void chr_event(void *opaque, int event) +static void chr_event(void *opaque, QEMUChrEvent event) { VirtConsole *vcon =3D opaque; VirtIOSerialPort *port =3D VIRTIO_SERIAL_PORT(vcon); diff --git a/hw/char/xilinx_uartlite.c b/hw/char/xilinx_uartlite.c index 2c47275..aa6bf02 100644 --- a/hw/char/xilinx_uartlite.c +++ b/hw/char/xilinx_uartlite.c @@ -206,7 +206,7 @@ static int uart_can_rx(void *opaque) return s->rx_fifo_len < sizeof(s->rx_fifo); } =20 -static void uart_event(void *opaque, int event) +static void uart_event(void *opaque, QEMUChrEvent event) { =20 } diff --git a/hw/ipmi/ipmi_bmc_extern.c b/hw/ipmi/ipmi_bmc_extern.c index adf2afe..16a4117 100644 --- a/hw/ipmi/ipmi_bmc_extern.c +++ b/hw/ipmi/ipmi_bmc_extern.c @@ -379,7 +379,7 @@ static void receive(void *opaque, const uint8_t *buf, i= nt size) handle_hw_op(ibe, hw_op); } =20 -static void chr_event(void *opaque, int event) +static void chr_event(void *opaque, QEMUChrEvent event) { IPMIBmcExtern *ibe =3D opaque; IPMIInterface *s =3D ibe->parent.intf; diff --git a/hw/mips/boston.c b/hw/mips/boston.c index ca7d813..29b476b 100644 --- a/hw/mips/boston.c +++ b/hw/mips/boston.c @@ -98,7 +98,7 @@ enum boston_plat_reg { PLAT_SYS_CTL =3D 0x48, }; =20 -static void boston_lcd_event(void *opaque, int event) +static void boston_lcd_event(void *opaque, QEMUChrEvent event) { BostonState *s =3D opaque; if (event =3D=3D CHR_EVENT_OPENED && !s->lcd_inited) { diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 783cd99..72c03ba 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -545,7 +545,7 @@ static void malta_fpga_reset(void *opaque) snprintf(s->display_text, 9, " "); } =20 -static void malta_fgpa_display_event(void *opaque, int event) +static void malta_fgpa_display_event(void *opaque, QEMUChrEvent event) { MaltaFPGAState *s =3D opaque; =20 diff --git a/hw/riscv/riscv_htif.c b/hw/riscv/riscv_htif.c index 4f7b11d..ca87a5c 100644 --- a/hw/riscv/riscv_htif.c +++ b/hw/riscv/riscv_htif.c @@ -96,7 +96,7 @@ static void htif_recv(void *opaque, const uint8_t *buf, i= nt size) * Called by the char dev to supply special events to the HTIF console. * Not used for HTIF. */ -static void htif_event(void *opaque, int event) +static void htif_event(void *opaque, QEMUChrEvent event) { =20 } diff --git a/hw/riscv/sifive_uart.c b/hw/riscv/sifive_uart.c index a403ae9..9350482 100644 --- a/hw/riscv/sifive_uart.c +++ b/hw/riscv/sifive_uart.c @@ -162,7 +162,7 @@ static int uart_can_rx(void *opaque) return s->rx_fifo_len < sizeof(s->rx_fifo); } =20 -static void uart_event(void *opaque, int event) +static void uart_event(void *opaque, QEMUChrEvent event) { } =20 diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c index e53696c..3d40b70 100644 --- a/hw/usb/ccid-card-passthru.c +++ b/hw/usb/ccid-card-passthru.c @@ -307,7 +307,7 @@ static void ccid_card_vscard_read(void *opaque, const u= int8_t *buf, int size) } } =20 -static void ccid_card_vscard_event(void *opaque, int event) +static void ccid_card_vscard_event(void *opaque, QEMUChrEvent event) { PassthruState *card =3D opaque; =20 diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c index 2ba6870..9646fe7 100644 --- a/hw/usb/dev-serial.c +++ b/hw/usb/dev-serial.c @@ -461,7 +461,7 @@ static void usb_serial_read(void *opaque, const uint8_t= *buf, int size) s->recv_used +=3D size; } =20 -static void usb_serial_event(void *opaque, int event) +static void usb_serial_event(void *opaque, QEMUChrEvent event) { USBSerialState *s =3D opaque; =20 diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index ddc1a59..0068aa8 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -1354,7 +1354,7 @@ static void usbredir_chardev_read(void *opaque, const= uint8_t *buf, int size) usbredirparser_do_write(dev->parser); } =20 -static void usbredir_chardev_event(void *opaque, int event) +static void usbredir_chardev_event(void *opaque, QEMUChrEvent event) { USBRedirDevice *dev =3D opaque; =20 diff --git a/include/chardev/char-fe.h b/include/chardev/char-fe.h index 67601dc..a553843 100644 --- a/include/chardev/char-fe.h +++ b/include/chardev/char-fe.h @@ -4,7 +4,7 @@ #include "chardev/char.h" #include "qemu/main-loop.h" =20 -typedef void IOEventHandler(void *opaque, int event); +typedef void IOEventHandler(void *opaque, QEMUChrEvent event); typedef int BackendChangeHandler(void *opaque); =20 /* This is the backend as seen by frontend, the actual backend is diff --git a/monitor/hmp.c b/monitor/hmp.c index 706ebe7..944fa96 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -1322,7 +1322,7 @@ static void monitor_read(void *opaque, const uint8_t = *buf, int size) cur_mon =3D old_mon; } =20 -static void monitor_event(void *opaque, int event) +static void monitor_event(void *opaque, QEMUChrEvent event) { Monitor *mon =3D opaque; MonitorHMP *hmp_mon =3D container_of(mon, MonitorHMP, common); diff --git a/monitor/qmp.c b/monitor/qmp.c index 6c46be4..54c06ba 100644 --- a/monitor/qmp.c +++ b/monitor/qmp.c @@ -337,7 +337,7 @@ static QDict *qmp_greeting(MonitorQMP *mon) ver, cap_list); } =20 -static void monitor_qmp_event(void *opaque, int event) +static void monitor_qmp_event(void *opaque, QEMUChrEvent event) { QDict *data; MonitorQMP *mon =3D opaque; diff --git a/net/filter-mirror.c b/net/filter-mirror.c index 8d36009..d83e815 100644 --- a/net/filter-mirror.c +++ b/net/filter-mirror.c @@ -132,7 +132,7 @@ static void redirector_chr_read(void *opaque, const uin= t8_t *buf, int size) } } =20 -static void redirector_chr_event(void *opaque, int event) +static void redirector_chr_event(void *opaque, QEMUChrEvent event) { NetFilterState *nf =3D opaque; MirrorState *s =3D FILTER_REDIRECTOR(nf); diff --git a/net/vhost-user.c b/net/vhost-user.c index c54c9c7..17532da 100644 --- a/net/vhost-user.c +++ b/net/vhost-user.c @@ -218,7 +218,7 @@ static gboolean net_vhost_user_watch(GIOChannel *chan, = GIOCondition cond, return TRUE; } =20 -static void net_vhost_user_event(void *opaque, int event); +static void net_vhost_user_event(void *opaque, QEMUChrEvent event); =20 static void chr_closed_bh(void *opaque) { @@ -249,7 +249,7 @@ static void chr_closed_bh(void *opaque) } } =20 -static void net_vhost_user_event(void *opaque, int event) +static void net_vhost_user_event(void *opaque, QEMUChrEvent event) { const char *name =3D opaque; NetClientState *ncs[MAX_QUEUE_NUM]; diff --git a/qtest.c b/qtest.c index 8b50e27..12432f9 100644 --- a/qtest.c +++ b/qtest.c @@ -722,7 +722,7 @@ static int qtest_can_read(void *opaque) return 1024; } =20 -static void qtest_event(void *opaque, int event) +static void qtest_event(void *opaque, QEMUChrEvent event) { int i; =20 diff --git a/tests/test-char.c b/tests/test-char.c index 45e42af..3afc9b1 100644 --- a/tests/test-char.c +++ b/tests/test-char.c @@ -54,7 +54,7 @@ static void fe_read(void *opaque, const uint8_t *buf, int= size) quit =3D true; } =20 -static void fe_event(void *opaque, int event) +static void fe_event(void *opaque, QEMUChrEvent event) { FeHandler *h =3D opaque; bool new_open_state; @@ -633,7 +633,7 @@ typedef struct { =20 =20 static void -char_socket_event(void *opaque, int event) +char_socket_event(void *opaque, QEMUChrEvent event) { CharSocketTestData *data =3D opaque; data->event =3D event; @@ -1006,7 +1006,7 @@ static void char_socket_client_test(gconstpointer opa= que) } =20 static void -count_closed_event(void *opaque, int event) +count_closed_event(void *opaque, QEMUChrEvent event) { int *count =3D opaque; if (event =3D=3D CHR_EVENT_CLOSED) { diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c index 91ea373..2324b96 100644 --- a/tests/vhost-user-test.c +++ b/tests/vhost-user-test.c @@ -499,7 +499,7 @@ static TestServer *test_server_new(const gchar *name) return server; } =20 -static void chr_event(void *opaque, int event) +static void chr_event(void *opaque, QEMUChrEvent event) { TestServer *s =3D opaque; =20 --=20 1.8.3.1