From nobody Fri May 17 08:39:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1607639712; cv=none; d=zohomail.com; s=zohoarc; b=JtMFmwhgtjcrohMwbYJjVwhbNcHLF7cKWyofQf5KAeuqp7MkZ+A9ydantUF+uWhHl2MIqO19gptPueKmf4nYjr3QyIj168qPemPxQ+4Cy6U7da98yX161U89Pby4YH+T6bvjDcsUL8rmumhSHDCAfJk6iWSPRQGz33heif7fuK8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607639712; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=+KwTndPVgNd8JvS7s43DTp85DD35WUPGDIJytpQmrGU=; b=hJpqQJG/iPg5Tjxg8+JdDN3Rtgi7y/vKm2xlC+Wl/JZrpHy/FywIHdNeSX6izuyAe07Ek3GIVSymO17R7ZHxVwDWBDIca6D/C3HVXKWKdEliHG5bH3POEU0W2gvLraKUcnUPQ2rJRkgek3HrvyPA7XUicT79PloO/LK4Rsm88QE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1607639712875645.2249382861297; Thu, 10 Dec 2020 14:35:12 -0800 (PST) Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-339-YLyTC_yEPNuDYNeTu-tVZQ-1; Thu, 10 Dec 2020 17:35:10 -0500 Received: by mail-ed1-f71.google.com with SMTP id ca7so3083807edb.12 for ; Thu, 10 Dec 2020 14:35:10 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (101.red-88-21-206.staticip.rima-tde.net. [88.21.206.101]) by smtp.gmail.com with ESMTPSA id rl7sm5310282ejb.107.2020.12.10.14.35.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Dec 2020 14:35:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607639711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+KwTndPVgNd8JvS7s43DTp85DD35WUPGDIJytpQmrGU=; b=G35Fzt3TmcLG/vF1A8zTJQJFmB1xy/aDEOxnmRAwixuXEr9pNZPkQiom+0hmuRq/FIdchv aZWda2U2x+tR7BAPxd8i8ElVaISvW6bOyS7e/m74CFrFC3MHqvtdm/5I30sOiNQ/9kMbw1 nsRB80aLTzsjyfTj/u/PvYycNRDBd5Q= X-MC-Unique: YLyTC_yEPNuDYNeTu-tVZQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=+KwTndPVgNd8JvS7s43DTp85DD35WUPGDIJytpQmrGU=; b=I3h/eO8ELPCcbNvTG4rYlpBLlZbSXrJfuHYnGFsW1fpiXgxIAy5PViZ8YP98u0Fi/f A5+BNG6FL9tHZCWo6KxiKYHRF6HVKYxp4gJ0ZaHMpsNJYoYiTg7zSL0rNSbNrWTMn0ol TKEA5uIm91+UfqKIT12G+kfmdMKbDzFW+max+L3SySfbK8Me9L+lIiqiypfabuBaYDRK 2hdLYmgpzFUtkpYMQoFWiGuznYE0CIO7L11hd/bMKNsVLXgohya9Z80qofPilf0gOAyB pwa163jWKCZHlwt/1OFKMI2enRSpf/cvxSQ11VFceOsDuxF4wkAqsszoamAiGABFxWHo 4Zfg== X-Gm-Message-State: AOAM531MyHQYILvQum+YHHV6Fpv2c13UNym641jK0TqcuzPz28ELlNxV mZ1PsLBNWrZ83takmtzHXwoMEFb+RPyMFLGhOXMdRqEeUgFyG8nBco60lGVjKwBNGvfZJgLavjG LTuXRZtI/ThZvFg== X-Received: by 2002:aa7:d459:: with SMTP id q25mr8938600edr.279.1607639709345; Thu, 10 Dec 2020 14:35:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJz1n/3Ha74wxqWt2er5TcOrJXbepmYGGh8CAvZShcy7kW/NaAKcgXNTViZyWQ0wDEa5jMU/bw== X-Received: by 2002:aa7:d459:: with SMTP id q25mr8938593edr.279.1607639709230; Thu, 10 Dec 2020 14:35:09 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann Subject: [PATCH] audio: Simplify audio_bug() removing old code Date: Thu, 10 Dec 2020 23:35:06 +0100 Message-Id: <20201210223506.263709-1-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) This code (introduced in commit 1d14ffa97ea, Oct 2005) is likely unused since years. Time to remove it. If the condition is true, simply call abort(). Suggested-by: Gerd Hoffmann Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau --- audio/audio.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/audio/audio.c b/audio/audio.c index 46578e4a583..b71ab8912c5 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -104,9 +104,6 @@ const struct mixeng_volume nominal_volume =3D { =20 static bool legacy_config =3D true; =20 -#ifdef AUDIO_IS_FLAWLESS_AND_NO_CHECKS_ARE_REQURIED -#error No its not -#else int audio_bug (const char *funcname, int cond) { if (cond) { @@ -119,25 +116,11 @@ int audio_bug (const char *funcname, int cond) AUD_log (NULL, "I am sorry\n"); } AUD_log (NULL, "Context:\n"); - -#if defined AUDIO_BREAKPOINT_ON_BUG -# if defined HOST_I386 -# if defined __GNUC__ - __asm__ ("int3"); -# elif defined _MSC_VER - _asm _emit 0xcc; -# else - abort (); -# endif -# else - abort (); -# endif -#endif + abort(); } =20 return cond; } -#endif =20 static inline int audio_bits_to_index (int bits) { --=20 2.26.2