From patchwork Fri Jan 12 09:01:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Klim Kireev X-Patchwork-Id: 859672 Return-Path: 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=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="gAppMb8L"; 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 3zHxkQ0l4Bz9s75 for ; Fri, 12 Jan 2018 20:08:46 +1100 (AEDT) Received: from localhost ([::1]:55218 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZvKO-0008Mj-1O for incoming@patchwork.ozlabs.org; Fri, 12 Jan 2018 04:08:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43190) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZvDd-0003Dp-FM for qemu-devel@nongnu.org; Fri, 12 Jan 2018 04:01:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eZvDZ-0000IX-Ed for qemu-devel@nongnu.org; Fri, 12 Jan 2018 04:01:45 -0500 Received: from mail-eopbgr60112.outbound.protection.outlook.com ([40.107.6.112]:3712 helo=EUR01-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eZvDZ-0000F6-8h; Fri, 12 Jan 2018 04:01:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=Ee/m45CBvsRSIXqIrtRwfxuPYG1FQu4hyrBuhhMaC30=; b=gAppMb8LXLsyoSFjTeBq74y5gIgKmZArh0UDwj8ZZky0y4ke2sHiINHnKqZNPW+hd7AOBUKoyuGVzS1zF7D1owgVyhjAzmYG3snPipaAsXiEmZKRbPr4PybpUDRheTUfArMlqIiWQVYlFfYo7CLZ5LlpHu550Ou1JvvtII90TLU= Received: from localhost.sw.ru (195.214.232.6) by DB6PR0801MB2070.eurprd08.prod.outlook.com (2603:10a6:4:77::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.386.5; Fri, 12 Jan 2018 09:01:37 +0000 From: Klim Kireev To: qemu-devel@nongnu.org Date: Fri, 12 Jan 2018 12:01:19 +0300 Message-Id: <20180112090122.1702-3-klim.kireev@virtuozzo.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180112090122.1702-1-klim.kireev@virtuozzo.com> References: <20180112090122.1702-1-klim.kireev@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR05CA0269.eurprd05.prod.outlook.com (2603:10a6:3:fc::21) To DB6PR0801MB2070.eurprd08.prod.outlook.com (2603:10a6:4:77::11) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5aaeac6d-35b4-484b-1f26-08d5599b1702 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020079)(4652020)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:DB6PR0801MB2070; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB2070; 3:nCB23cias7LPnwXSOIkqKO+r1pt4ArF1G7oWKaMgWiACWJ6GsvA/iS83b22Pg/jFfYRTSvXemc5PgisBIvA0kX4XvLUIHB83LbNdidsgI20M3lX1jTel61BoL+7X7UbdEc6xVt5pTRd9ZrpqfVYPiW0ZnPwGU6Ybz10a+1nji0x82APicpRP9HDCD/d5VHzv7OBG4hZxZvpngKheEMBetaGyaXN6928G+CIDceS0mUGYlyeCbnFFhMtL8lHir0b3; 25:4dysLvUeV7zysIbxc/l65KEc/Zh7ihBcoL8YuGJADYXYZOeRDmfALe8n0odXnlP/if61HpIuI5ZUEsRfYfET1fl5SDo9uar8NK9Fz4xT79BHdUL/JrO4TYFw0yboV81aPVB+78WjDpfhVIaImS8R2UZ6eAjhHZ6+1ZFxN7bAExoNSG/GKBC3vl5/luB+KpgeRR83S2rilk9cGxDGUx5wPjuct9IkXS3e0v0ZR847ZvQjXlU5iZPiD/rfAAxLeah/j+EfjJHQL0CTBhVZPSQOSsNrTTmf3aYxuD17wYeC8Vdm8cBjV4KNJNQmhpbyBcyPsZah+BYL3MXcgkdCX9wJjQ==; 31:hl5nCrRmR5Fdy46T51HuEsobPgzb2w6IOULeQo0uzgN0dKfsywD43ie33G0N5vhUj0Ipsc3IVXXKodY+eZulB7C4gjio911ntuLJsgZrb+zrtdXFVXJlFsyIokPMkKvGjq1q3zcYK9CAcARt8vWbhiQu0nHC9ATSVEP9txhvr6+8Lib1GruKo/caVGuSj9Jmtja+WSM4UMbkmKj4XE9H5EHRf7NT5wY8phQ5izQzTD0= X-MS-TrafficTypeDiagnostic: DB6PR0801MB2070: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=klim.kireev@virtuozzo.com; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB2070; 20:P9uZEtqde5VAfJwIlDtDMjIhA3vk6Fbhd1QwFXDbB67fd+/B0m39dLAjE0OQzWgC0PPUb3Vdi13NM7nPstATzZbbH9Ve0LnqUXqcDlveq7IO46h3qyptjDabj32vwiAXy5ixMfFlozR/L22oQsbx1FzscKmKyLH2RdbpUt4kO7ebk/gRqLyyWnmKOye2GTSAthKIhCXNqcDaVva8nGXuNp1hvM5Ad79e/d/wfajpXxtSxbCa3YCVzD8DSmllMgfZp7JjGMNOdG3lIt8vB5UyDisUKrdyca/4zC0LyGDblIHodoO/+Ug01FX15GZ9EiE931HSEUOFhNaJZX6+OGRtbT11gln/sJDHzq0DXYGKjAQZdMYjw8Wxl8AnVDjK6Q4a00XLgr0DCgaf8xsUWjTD0V3WYjF3d8tWUYZ7UGy+whc=; 4:jENn5TXnyU6dsgAcZb9Bx3nJLwKP4G54KmyQ6kSPdAVaNetG3hM65801MmMOXZyHfcpaA9AmQNiDfSr0a/Cwkx0PNBMoSmPwY1uMmh6oJAIe/bUAAEc9agdIvP58l+xqOUbVo9i2XvFIq36I4Xzhvc/E63Fe0gPvXzWc+yvX11J61Byao6bYiHHofd6WrmvH6Sz/kDoEusGtJYRlaNWKG10UYTfo9TGZlU675004PuK0uniQpqxLdDgaIyU8aHaQKyez6PXx4LV+zP5qnsiY8fh+15dZiXVTPO0l51TN5Z5mf5m7bcQs/xgPpLNmUJjY X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(17755550239193); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(3231023)(944501141)(10201501046)(6041268)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123564045)(6072148)(201708071742011); SRVR:DB6PR0801MB2070; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:DB6PR0801MB2070; X-Forefront-PRVS: 0550778858 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6069001)(366004)(376002)(396003)(39850400004)(39380400002)(346002)(199004)(189003)(1076002)(386003)(69596002)(2351001)(66066001)(7736002)(6486002)(305945005)(2361001)(76176011)(51416003)(25786009)(36756003)(59450400001)(2906002)(52116002)(6506007)(47776003)(4326008)(6666003)(2950100002)(97736004)(5660300001)(6916009)(16586007)(50466002)(8936002)(81166006)(16526018)(81156014)(8676002)(48376002)(50226002)(316002)(76506005)(106356001)(6512007)(86362001)(53416004)(6116002)(53936002)(3846002)(68736007)(478600001)(105586002); DIR:OUT; SFP:1102; SCL:1; SRVR:DB6PR0801MB2070; H:localhost.sw.ru; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB6PR0801MB2070; 23:Te11CoYMMmqzGHTFrL5I4qjWAXLJWIqpYzdfHYz?= WSOUSy7DkjuT/U/MDcQaNBH1I834Pyfe5JXrmCeue5QbQcCBL5uuigr1ZmKTdZ88G8nvh/r4vC4LVqPYrR8Fk3bUWh1KXNEBKk4TYsaCcORMxV+gN3nPLyjKMvfmO6EnLEOvUDJZyYAjS9M7P3/XG4zq6QQ656oDy1MuAdyVDyaoMjGmJEc2H7MfBWw/ozMmyfbJEVHoIdXo3h47NMcG6KyJ7GmDvXHpm5CNXyJfTerl/UoSN/+USMy4ru21j3RQwTd4Qyi6K//U55oe9BknwMCPECvKXKYFyjEiOCISQcq+Mqmnjc8gZNcZuyJmds26zbIrtsD77pqO6RFENE25FrLAt0G+RC7ZQSU+GluSE7keX7CzBzZQlyFJ65blNMhAtYll7ECDbh0Y5hDUkuljg8UWm9qeMUF5448BGCBxCYYDPNndPJvNat512h352HmCdlV43WOuMhSVnKUCUQ4ofdRl4bUEaTd+k15tr/a4DinLYMZ5W3dpWoo0f+hoPPEqMDh303vAIh1njhoA2CcAecmKajs1B4zWWBTQUvrwRGJri2H+04adYoM5yHVBxptd4r4d4ctg1n+TF3mRoDFmajBGfXB7aiPDtESNjrPQwoTcIzoGWCvPx+H3Lfd9H4O2yftvOBVwP2x8k7KsGn6FObRPZlqF3SJ+xPBs08b5EovGrkQvZdSy61TXG1xL2WfcVtATSlORWh50hkiTZ0BMxgl6ww4KcLluhsbDFPV5zWr0/qj8XO+ZQGVCdqG0t7lNl52UlQoK6TN92cpf4ZbsUmMYnlm0NRXBsrQleVPeTV1qnTVmOhEJD/gvLyb/z/coVukW6hPaNRLbDfieKkUfqKLB0FfDrS9hPewIomAE83A2it7FRwVQrQTKIXdK4yO+jhNceAivyILoz7QM2DbhsGtVsWBQZu8KlHCHpkAz1XEPZ39iRyuVrXojsuxcIaoznOvyxUxhANMEduCBhrgqiCvQQVnCeeqrKYGcYp6yMFvdZdPhTVae7Z+OFXHwzc98UMCLubhOV9HNNlGpUlPOmA9aCzmfSBp9P8Yg/XHIyMcV86uJi/HSxPY7mLYRPwOh7LSPI43TqLgZDsJ/GjjFvVU7hyPP1oGnLvYhzkE7YRYad90Bw+ekOEzu8/+SO7HLAoAsjc7n9yDn34+lMjowlokp0ijgJUcL/4aIh5D+CwYJrcg== X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB2070; 6:MUUG2gBZKNPbl22CBERhyl3mr48bcylTLNqCkWkPw5nQrRuT1aRf9MexsucVL5h5y3T/ul5r/gJ0YYNe3tG62T1yxLxX2kUDVr8EMrDekR/cMuBdmE2iESURqPaU49bK0zMHPMqROQ4jMQYBIxAWTXRYbphbW9WW9qltjgzr5kAEGCiZWuN3xy0pMc5m/dlXva9UmPAYxbXr4kUDQ5e4lg9R1k/QTXJNsbOoob9Gk4ogwGjHkfJMqMGIHpbOvX1bJaRT2xnpy4uSYkpxoG/GQ4o+OxEL1XtNg9YjoJgvRu7Y9pX5bdBP0hmQDXsxqY+sx5a3ONaXadFbdDVY980kr7Vlrm9fWBB7cuWxFG9FMQI=; 5:jcCzyXz830Qj1Nnay4wtnponax5BRm4qsloHrGrNtB1k5JbbgluVcBactZ2fIA7fgKodjT4NRx0mCqw3dqM3CiIS5+warpC6y0hjgo5fZ+EHq5AJX2V7qvTxWjvlpqTSBbFBjO7xQmc1XBLPcX9BpoKCt2jrUdmA5CeeURxaTJ4=; 24:dcABuwq2nRLFWPQlwXVHKgMBbzIFxamvtJ0QgyIbw6Wad0VlPFZJ6PDwMalBQzON8l3GH2+fFVAPk2CJD4g6AuyKWyc48mALeVUiQN2cc0o=; 7:Dm9nAWmMblTnRFMFylioJW7w4MaIYSxSTHu0N8eMdl3rv8cHz66MjhN3PP0ckvpmvFwFigX19Se9zyT+BhYtFm6eUB1j6veNOQZRzXHNGPHwvQ68ZUX6+UtInYhVFQ/NvtEy+i+rw2t1D2sWLNKWA4OJBcD3YghbPRO/sbZmTuj6gKgzxO72DV8lAmmo1z0yVhA2ynhvFaEW1b2p+57ytS9oRgH8agMJzB6XhF5ExsZb1mAFQxF7358VABPCvvO0 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB2070; 20:a9eqjv0j0rErwmV1Svg2qxxoevJSwjXMSju5AiCFmtz7OSInlWl1GESSwKKqsJ0mh0sQitKOmT5KnvDZa0+dg/bCfYXq80sR1VH6ZgUfeRvTmiHNKL9NeAIr34/5sX06i8lRV/wZ7s1xVRm4XJBEUl9yD8ftJJrHFp1k0PkDPTI= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2018 09:01:37.7517 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5aaeac6d-35b4-484b-1f26-08d5599b1702 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0801MB2070 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.6.112 Subject: [Qemu-devel] [PATCH 2/5] configure: add dependency X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, den@openvz.org, stefanha@redhat.com, qemu-block@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This dependency is required for adequate Parallels images support. Typically the disk consists of several images which are glued by XML disk descriptor. Also XML hides inside several important parameters which are not available in the image header. The patch also adds clause to checkpatch.pl to understand libxml2 types. Signed-off-by: Denis V. Lunev Signed-off-by: Klim Kireev Signed-off-by: Edgar Kaziakhmedov CC: Stefan Hajnoczi --- block/Makefile.objs | 2 ++ configure | 27 +++++++++++++++++++++++++++ scripts/checkpatch.pl | 1 + 3 files changed, 30 insertions(+) diff --git a/block/Makefile.objs b/block/Makefile.objs index 6eaf78a046..a73387f1bf 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -47,3 +47,5 @@ block-obj-$(if $(CONFIG_BZIP2),m,n) += dmg-bz2.o dmg-bz2.o-libs := $(BZIP2_LIBS) qcow.o-libs := -lz linux-aio.o-libs := -laio +parallels.o-cflags := $(LIBXML2_CFLAGS) +parallels.o-libs := $(LIBXML2_LIBS) diff --git a/configure b/configure index 6a040821c6..790fa635d1 100755 --- a/configure +++ b/configure @@ -435,6 +435,7 @@ tcmalloc="no" jemalloc="no" replication="yes" vxhs="" +libxml2="" supported_cpu="no" supported_os="no" @@ -1298,6 +1299,10 @@ for opt do ;; --enable-numa) numa="yes" ;; + --disable-libxml2) libxml2="no" + ;; + --enable-libxml2) libxml2="yes" + ;; --disable-tcmalloc) tcmalloc="no" ;; --enable-tcmalloc) tcmalloc="yes" @@ -1573,6 +1578,7 @@ disabled with --disable-FEATURE, default is enabled if available: tpm TPM support libssh2 ssh block device support numa libnuma support + libxml2 for Parallels image format tcmalloc tcmalloc support jemalloc jemalloc support replication replication support @@ -3747,6 +3753,20 @@ EOF fi fi +########################################## +# libxml2 probe +if test "$libxml2" != "no" ; then + if $pkg_config --exists libxml-2.0; then + libxml2="yes" + libxml2_cflags=$($pkg_config --cflags libxml-2.0) + libxml2_libs=$($pkg_config --libs libxml-2.0) + else + if test "$libxml2" = "yes"; then + feature_not_found "libxml2" "Install libxml2 devel" + fi + libxml2="no" + fi +fi ########################################## # glusterfs probe @@ -5618,6 +5638,7 @@ echo "lzo support $lzo" echo "snappy support $snappy" echo "bzip2 support $bzip2" echo "NUMA host support $numa" +echo "libxml2 $libxml2" echo "tcmalloc support $tcmalloc" echo "jemalloc support $jemalloc" echo "avx2 optimization $avx2_opt" @@ -6281,6 +6302,12 @@ if test "$have_rtnetlink" = "yes" ; then echo "CONFIG_RTNETLINK=y" >> $config_host_mak fi +if test "$libxml2" = "yes" ; then + echo "CONFIG_LIBXML2=y" >> $config_host_mak + echo "LIBXML2_CFLAGS=$libxml2_cflags" >> $config_host_mak + echo "LIBXML2_LIBS=$libxml2_libs" >> $config_host_mak +fi + if test "$replication" = "yes" ; then echo "CONFIG_REPLICATION=y" >> $config_host_mak fi diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 3dc27d9656..9bfe2b58e1 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -265,6 +265,7 @@ our @typeList = ( qr{${Ident}_handler_fn}, qr{target_(?:u)?long}, qr{hwaddr}, + qr{xml${Ident}}, ); # This can be modified by sub possible. Since it can be empty, be careful