Message ID | 1516112253-14480-4-git-send-email-pbonzini@redhat.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="sxbzEn+T"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zLXd36kblz9s7M for <incoming@patchwork.ozlabs.org>; Wed, 17 Jan 2018 01:28:07 +1100 (AEDT) Received: from localhost ([::1]:39093 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1ebSDe-0002ro-2B for incoming@patchwork.ozlabs.org; Tue, 16 Jan 2018 09:28:06 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50033) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1ebS3d-0002XX-8V for qemu-devel@nongnu.org; Tue, 16 Jan 2018 09:17:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1ebS3c-0004QZ-2o for qemu-devel@nongnu.org; Tue, 16 Jan 2018 09:17:45 -0500 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:41869) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1ebS3b-0004QL-Sd for qemu-devel@nongnu.org; Tue, 16 Jan 2018 09:17:44 -0500 Received: by mail-wm0-x243.google.com with SMTP id f71so8699289wmf.0 for <qemu-devel@nongnu.org>; Tue, 16 Jan 2018 06:17:43 -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=WuIGzw7hBamMo8s4pHysTbueWGCHrcegxv2oW6BJiuA=; b=sxbzEn+TtoGnZ+ecM+CGlfMBS4ZRWK7FZ7sLfrUk61czGmgMKUr5i27xMUwt31AlZJ /CXJEZbbuw2q38ZjlN/2ckidV7p9nLPaRPCPOkq5D02rUpe1nvLO6BAxwX76X+RIdSqm zuN0nMbPTSulnA8OVwtn1ySk0EsAfSKFbPWDZQVrLLqAc19rRZQb3m6teN634L3P4Md3 hs/QDhUJ+1Gp3IoNSrTrki7dIrD9zzvuUYrMddb6WaYi62HJbUw1x4olIr8/t75H8upi ihPgOio5VKumgBFrSIvVP75we/xu7m3S+a+WZavnem1ruKBA1KlGadg+EaW1/3y/D3ln fkLA== 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=WuIGzw7hBamMo8s4pHysTbueWGCHrcegxv2oW6BJiuA=; b=DLginTaHWlFyQBOPq3XS1yx1BtzARyWfxMBhyXFXfLP9oJRDK9Ibgz0Hs8dJXX1nbw DsPL0yQz9bbq0fjmuB45ID9P0uSnIiidl/Htv7DiYhNWkG9ogEvrKxwqOs9zXwCPv/IX rqQYyXbbZP4aDtjC3rxSzCgzsJ93tkHAs990l59m4nTgIWqmEP62Nlq+Vrw0gJWTh3n+ 3sHDqrF7RYId2mJ6aQoQs+5iVob10etzBorAZeQWZSt60PHo3nYVbeInf2JBLpC0V3PE rSvSNXoprrF682+1loUOdJAsu47LPlGBpxvkwz1hPppn5CVMA0/r7sY4/q/24yRd+Aa1 mIlg== X-Gm-Message-State: AKwxytczhZv89fDzGaKqDmV+ScPyEqQ/eft+xoFqeqrTal7/LhlCu9eI SVgwSyL0EE8ZRPgnKdaad/ii1Cxu X-Google-Smtp-Source: ACJfBouA+e6xd494nTKo/XwjpmQa1hs+WFIc1WNlL0rG9WjSZHyWFqnMbbPE7beKiujGCvE1Wy4pmw== X-Received: by 10.28.191.135 with SMTP id o7mr13097386wmi.143.1516112262546; Tue, 16 Jan 2018 06:17:42 -0800 (PST) Received: from 640k.lan (dynamic-adsl-78-12-229-84.clienti.tiscali.it. [78.12.229.84]) by smtp.gmail.com with ESMTPSA id u10sm1537758wrg.6.2018.01.16.06.17.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jan 2018 06:17:41 -0800 (PST) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Tue, 16 Jan 2018 15:16:45 +0100 Message-Id: <1516112253-14480-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1516112253-14480-1-git-send-email-pbonzini@redhat.com> References: <1516112253-14480-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [PULL 03/51] pc: fail memory hot-plug/unplug with -no-acpi and Q35 machine type X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: Haozhong Zhang <haozhong.zhang@intel.com> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,01/51] scsi-generic: Add share-rw option
|
expand
|
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 3fcf318..55686bf 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1695,9 +1695,14 @@ static void pc_dimm_plug(HotplugHandler *hotplug_dev, align = memory_region_get_alignment(mr); } - if (!pcms->acpi_dev) { + /* + * When -no-acpi is used with Q35 machine type, no ACPI is built, + * but pcms->acpi_dev is still created. Check !acpi_enabled in + * addition to cover this case. + */ + if (!pcms->acpi_dev || !acpi_enabled) { error_setg(&local_err, - "memory hotplug is not enabled: missing acpi device"); + "memory hotplug is not enabled: missing acpi device or acpi disabled"); goto out; } @@ -1729,9 +1734,14 @@ static void pc_dimm_unplug_request(HotplugHandler *hotplug_dev, Error *local_err = NULL; PCMachineState *pcms = PC_MACHINE(hotplug_dev); - if (!pcms->acpi_dev) { + /* + * When -no-acpi is used with Q35 machine type, no ACPI is built, + * but pcms->acpi_dev is still created. Check !acpi_enabled in + * addition to cover this case. + */ + if (!pcms->acpi_dev || !acpi_enabled) { error_setg(&local_err, - "memory hotplug is not enabled: missing acpi device"); + "memory hotplug is not enabled: missing acpi device or acpi disabled"); goto out; }