From patchwork Wed Jul 1 13:56:14 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: 192137 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp519202ilg; Wed, 1 Jul 2020 06:59:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwa8rtqV6rQ7jsKCsWf1bKwCezdm0YcwA0j8gxxB9M0cLXKr7pv5FvPZfFtzS64dRPaxjYR X-Received: by 2002:a25:392:: with SMTP id 140mr44689693ybd.270.1593611996153; Wed, 01 Jul 2020 06:59:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593611996; cv=none; d=google.com; s=arc-20160816; b=ZBX2wZGyI8fh/Lv2zuikSOAttbcZ/9Vhoz65n1MSl4MWhMvAvzXrUmiGWO+rKAF2hf fY78/cGEAPdE9QzX232oF5z9RxyUBVMuKrWkAJPE3FVGfTSHn56TTPBx5ZcEz/M6xzh2 +7MnXDzkDt+troS1IeWIb50L2tQ3VH7YhQrP9t1tzJkwqs0s/ayS028GrnJkxEep8slS TfnFU6MGIAWgkqxdBKTanA9eHNk+hLsj09mTuk610oib6NwEZxKI/ixiziZcpn3TdbY9 pgg9MG/1UiuhXYI96gQ2d3VGUk9pMtUGZsjJ8OSTO5Pqfig9oqsZ7DInpG5zsFD7AoZ/ 4AjA== 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=jrAJ7f1ECkAFyK0EpZbp5Q6hKIHHXmNyDhz3mYDau5L0YpgrCk7dZVRJN0BnWG0wgF DXwM4+v51MSGEPsRG8Wjogu0YUZ0EWN/6ypQOt9SvYH+/wRaI64lr1KZwb6xGG/70Rhr qKoi2NJ3LxrN+c04s5NkbKCCWYu6z4M3Kgi0m0J2c3B91JUw2hjdAbQvECLohJbGbSKJ DYy6K4KlV5hk7IEBlqAEma/d3YWeE5AondYe/BlRkx3DsY7MV9c3az39gKiB6ZlTqV7a XLDTq9BtZ7Wibpznkft3drfYYHVJneJXymih9MWWglimHXlD5zYy7j3JukuGWTI9K6B2 h5sA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fGXJWryQ; 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 x16si6748543ybk.399.2020.07.01.06.59.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jul 2020 06:59:56 -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=fGXJWryQ; 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]:34754 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdHG-0005l5-IW for patch@linaro.org; Wed, 01 Jul 2020 09:59:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58768) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdES-00028H-CS for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:00 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:40557) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdEQ-0005oP-MT for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:00 -0400 Received: by mail-wr1-x429.google.com with SMTP id h5so23945925wrc.7 for ; Wed, 01 Jul 2020 06:56:58 -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=fGXJWryQ2lB2psc9eeFMRSIN3DKGiQetKXI7zlHAk6i90uos8tgDmFBc3E2OOmEc7w m+ogh+EBgA1bYyzlxWR4aZlFLHcUNvdDlpMpQs/Z1p/W6cIsNFR6dcX+mj9ilrCHkTtB l8xb4VoyPkZC1SVe8n10Y4y8bIaPOXsn+htsf5NruypcjVGvxf6idP3wWN7GD3nj3ZPs sBntT076sltLoBv8pAfsxcLosKg6tCnvHBPvgxRv9PalLwS1ioTbJpTLkrOrVk27VpPT 8U/wg/AaGzO815ER6H+NqhaPhRCjzk43k+03egQpvTupMgMkLzbDN2LQowvagd5+Au5L UQAQ== 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=OvU02tgZblIcuAV2iobvr2+sS633RHUVV5rgNK6OxnH2UOdL7kDm3g9j8N1EkB9TOI Lb/KGLQUTMBpHUduF4IvW8n+RbLWaNK6AjMTgRS7ZP8ZBcC4K+rw+gXIGOMi8bu3ode1 IcVe7bz4YVEZXrrtyZChvi41TUVr95vDPNlRURWTQ+f8iBKSST+Hg4p8wRYZnvt5YzEm /ac+aPi6F7AYGdw2HNmPk8jw15bsB20SirpJ0HlFEvuYOruzPCglKZseqTqBcO+hHdIw 21okgcvc/GWCEpC/frSVyX1h7i23jqWhdOo6nHE0dW1rewXFkDwnugwx+u8+94sqCBzl UV3w== X-Gm-Message-State: AOAM532bGmXrF+TbBxUXeuyol2vzY3HIE4FhTEuqQt9dV4ZblQyQgYWk VoX4CBuiuAkqQl5Q+vijNg1Lcg== X-Received: by 2002:a5d:4bd2:: with SMTP id l18mr26230996wrt.119.1593611817031; Wed, 01 Jul 2020 06:56:57 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v24sm9082410wrd.92.2020.07.01.06.56.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 06:56:53 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0D3341FF8C; Wed, 1 Jul 2020 14:56:53 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 02/40] iotests: Fix 051 output after qdev_init_nofail() removal Date: Wed, 1 Jul 2020 14:56:14 +0100 Message-Id: <20200701135652.1366-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.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