From patchwork Fri Jun 26 18:13:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 191878 Delivered-To: patch@linaro.org Received: by 2002:a54:3249:0:0:0:0:0 with SMTP id g9csp644968ecs; Fri, 26 Jun 2020 11:15:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzhnKaDEdRwiUdwr+jIFYYBF3T/95rnnHmNcyCXIK4XdjpGV7L3AxAl3slVZi5P27ejgzjw X-Received: by 2002:a25:3752:: with SMTP id e79mr1571586yba.263.1593195302555; Fri, 26 Jun 2020 11:15:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593195302; cv=none; d=google.com; s=arc-20160816; b=CM40D+R70FMI3t7bCAJtYlGjS/5DbiQP7jlZd4h/N1xi+tUJ4QH9wsRlAC1EAWxwux 2Kk4RKvLRyQpqZNDz7UBkEc7zQs026Mdb84Lc1ryDt3JxlR8Qj7LmFpqNYS3vdl1V03e IfWPo04CvMifm4Z8vxXzk+NuU5B/9igvgCNwDJ9juA0PFaB+Y+rkKCPZwqAJ2cKlxOV7 2OdqDUme7YIsDsJ7vPK6YEopvdp0ADocPDeimjpg4nXrumo0OWCEzqXwG31cDrep/Q3Q qniIFtiXrFPJd7zcrlrKKIQ3QDFPD7Y4wNvEI3rHWZgl6vik8JLXYG54pwKxRRkxO9C5 irBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=KLxxBVgESg8+q++r/+fvnKLfCmcpFTynVpvVjZzQTYc=; b=KcIbxWoQI0EYwq/wi3mw9M40KZ4EqOE8bwwqoIYliTpPo3csciYtziTMfBnEmoav4U ZZ8oFKotHRDUQ5m+ysMSaaiFD/D/58kRd4GtuWMEsPAEKPuzTuX4z0trRGx1quE6CQQ+ /oaEhuoI5vig21dXdE8+ri7hoCuvso6XxcGi+0iI2seBqUivl+2hYxe4rwAy8JuHhgpq F8WnWyaJO1we/JBRT3xQieyADNeuLP17k0UXCNU7omtC8evXbEZM+XOvpB6g9t0jVRNc aXTGUiwAnuzLOgsqeN38sofNqBBDUkZJPFeD3Qqxc2iNKSqi/EHWyarcSLUJzTkQh/+a fTVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="d/3+7NNk"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f65si26203130ybi.147.2020.06.26.11.15.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Jun 2020 11:15:02 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="d/3+7NNk"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39324 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jossP-0007N2-R3 for patch@linaro.org; Fri, 26 Jun 2020 14:15:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55878) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1josrV-0007JF-Cs for qemu-devel@nongnu.org; Fri, 26 Jun 2020 14:14:05 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:37431) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1josrS-0001F6-S7 for qemu-devel@nongnu.org; Fri, 26 Jun 2020 14:14:05 -0400 Received: by mail-wr1-x432.google.com with SMTP id a6so10367983wrm.4 for ; Fri, 26 Jun 2020 11:14:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KLxxBVgESg8+q++r/+fvnKLfCmcpFTynVpvVjZzQTYc=; b=d/3+7NNk/ECbJJCQpyDHdZ46ZLQHsWBXgG4yXVGpMhzCHzzP9JBYrkil4hsDuslnvM Q+rsl40kejeRCatacHyJzK/2+kv+HrNM3DKh45N+5MkmnAHNy2tX+2wyVMnSHlbVsqrD hvFnbp5X6rzhVLYLZiqr9Kq0z6Nv29sBM0vrIJA2WMvkgrWqed+9XdAcB2MB7V7Byw1p 1u4AwgjfQ/qZ89cYoxyC0tsSZ5RHePbGwegnWRqnu1eJul7uCY7Ls2OvvGWghXaOen9/ E3GZ91nexNpU5sXOKV5YnukrDIzZIwcUQFA4kVQiRvwAUw6EwZo4Q3gWazNqvHQyW0g2 b8cw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=KLxxBVgESg8+q++r/+fvnKLfCmcpFTynVpvVjZzQTYc=; b=D6x57fGUf710CvsoCfR6vu1hQKdGXAZE0B27nsYC5dbYGoX1HfMridu5BfsHe5Snyx 7O+68odufbT0I/+JahZQUOq7hnWqA0/vez0wFeq9pYc5RaGfgiQE7aeMIuN14p9Te2vx KS3Q7b7NXxEM6t6n+nby6O+jfkdfz71jV0q8i+SvUT1SX+7lREE9JYW0141C8V14lvzm f9CjkJKhEvhC9PFwn5JrmgtII6Vm2SFYN6Sjs5VwxsWx/rZ1CffQjNXZeMN7NByus9kX xm7cagFNxWLlJ+DEXzErhAZd83uotaYcMwpXMpQOT66LMDsPseUSx8qAy+0hJFI1Xp9H Rl4w== X-Gm-Message-State: AOAM531tSY7Rb9tQwzCjueX9Ox4vRAjJ/F29T4dxGK2bTp28Mv9aGw5d xTwwwM1mRrjuVjvdDQ2JphOi3w== X-Received: by 2002:adf:f5ce:: with SMTP id k14mr4804457wrp.234.1593195241045; Fri, 26 Jun 2020 11:14:01 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k11sm35759589wrd.23.2020.06.26.11.13.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 11:13:58 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E160E1FF87; Fri, 26 Jun 2020 19:13:57 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 01/30] iotests: Fix 051 output after qdev_init_nofail() removal Date: Fri, 26 Jun 2020 19:13:28 +0100 Message-Id: <20200626181357.26211-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200626181357.26211-1-alex.bennee@linaro.org> References: <20200626181357.26211-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: fam@euphon.net, Kevin Wolf , Thomas Huth , berrange@redhat.com, "open list:Block layer core" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , richard.henderson@linaro.org, f4bug@amsat.org, Max Reitz , =?utf-8?q?Alex_Benn=C3=A9e?= , cota@braap.org, John Snow , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Commit 96927c744 replaced qdev_init_nofail() call by isa_realize_and_unref() which has a different error message. Update the test output accordingly. Gitlab CI error after merging b77b5b3dc7: https://gitlab.com/qemu-project/qemu/-/jobs/597414772#L4375 Reported-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Reviewed-by: John Snow Reviewed-by: Thomas Huth Message-Id: <20200616154949.6586-1-philmd@redhat.com> --- tests/qemu-iotests/051.pc.out | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/tests/qemu-iotests/051.pc.out b/tests/qemu-iotests/051.pc.out index 0ea80d35f0e..da8ad871876 100644 --- a/tests/qemu-iotests/051.pc.out +++ b/tests/qemu-iotests/051.pc.out @@ -142,7 +142,7 @@ QEMU X.Y.Z monitor - type 'help' for more information Testing: -drive if=ide QEMU X.Y.Z monitor - type 'help' for more information -(qemu) QEMU_PROG: Initialization of device ide-hd failed: Device needs media, but drive is empty +(qemu) QEMU_PROG: Device needs media, but drive is empty Testing: -drive if=virtio QEMU X.Y.Z monitor - type 'help' for more information @@ -214,7 +214,7 @@ QEMU X.Y.Z monitor - type 'help' for more information Testing: -drive file=TEST_DIR/t.qcow2,if=ide,readonly=on QEMU X.Y.Z monitor - type 'help' for more information -(qemu) QEMU_PROG: Initialization of device ide-hd failed: Block node is read-only +(qemu) QEMU_PROG: Block node is read-only Testing: -drive file=TEST_DIR/t.qcow2,if=virtio,readonly=on QEMU X.Y.Z monitor - type 'help' for more information