From nobody Thu May 2 17:15:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594377067; cv=none; d=zohomail.com; s=zohoarc; b=mUdl5VVpeoTDPWSqXKn2ublc2gBuG43rB7SJZu+HKOpB/y8PRpWXkNLA0d7D2LqLKF+hpxU2ES/YN+BKN504ljKLZ+HIgR/XGYJ1EbBwbsF+4EglSNkE5yX6ZfM0GYcvkNqwfzJ+RHbQW/B1rKrnyNLZ6bEhlV9jVytBdELAOTY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594377067; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/fJgJ+YEVj15/dxSbSEb4bGg9SC3KiKWNqy8JWSxJMg=; b=E5TWJWA0nGMzguDEsjGgX8xrUQd1Y0GFW2QKNyKgYFn6+OIEUss12XVs0qqz+SKVVkwypKG4X3hZzANBH9NgBoOwSZqUoGiqj0m9sw7o066DtTwCcKZph5ohfFujTT6ue2dFeoBLCiCkRyWXmsxy4YNZDElDHLhaNhhc6Gf2E+U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1594377067144399.25180587957254; Fri, 10 Jul 2020 03:31:07 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-414-F_FW8vKkOMWyH5krbFcSog-1; Fri, 10 Jul 2020 06:28:53 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C5DF11902EA4; Fri, 10 Jul 2020 10:28:47 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 228D57EF92; Fri, 10 Jul 2020 10:28:47 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id E8D7C84374; Fri, 10 Jul 2020 10:28:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06AAPB1C009357 for ; Fri, 10 Jul 2020 06:25:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id 762E674F52; Fri, 10 Jul 2020 10:25:11 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id E23A374F44 for ; Fri, 10 Jul 2020 10:25:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594377065; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=/fJgJ+YEVj15/dxSbSEb4bGg9SC3KiKWNqy8JWSxJMg=; b=GaloTe8xKQAGWI+oNGKMn3PGUUylwjxkRFEKFtCW/3mQGgjdIm/QWC4tzy1+7q/Wfx/5bE 73HVOimG31LFMiyXnAkLO2+q5KW5egX8nmEG5gLZvPvxayjPmDkd08S5HgCAZtXzDfxtnY 7kz6mBBHU2WyqZ5hCUYmmJvK6Q0vOfA= X-MC-Unique: F_FW8vKkOMWyH5krbFcSog-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH v2 1/5] docs: drop %.png: %.fig rule Date: Fri, 10 Jul 2020 12:25:02 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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) convert bin is part of ImageMagick package and uses uniconvertor to create png file from fig files. Unfortunately uniconvertor is python2 only and not available in most recent distributions which makes the convert command fail with: sh: uniconvertor: command not found /usr/bin/mv: cannot stat '/tmp/magick-1397138DRT8Pzx4Qmoc.svg': No such fil= e or directory convert: delegate failed `'uniconvertor' '%i' '%o.svg'; /usr/bin/mv '%o.svg= ' '%o'' @ error/delegate.c/InvokeDelegate/1958. convert: unable to open file `/tmp/magick-1397138S8ARueJXLXkc': No such fil= e or directory @ error/constitute.c/ReadImage/605. convert: no images defined `docs/migration-managed-direct.png' @ error/conv= ert.c/ConvertImageCommand/3226. It looks like that there are plans to somehow port uniconvertor into python3 but as part of different project color-picker but the job is far from complete. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- docs/Makefile.am | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 07a7d7a369c..3fd8256e668 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -406,9 +406,6 @@ hvsupport.html.in: $(top_srcdir)/scripts/hvsupport.py $= (api_DATA) \ $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/hvsupport.py \ $(top_srcdir) $(top_builddir) > $@ || { rm $@ && exit 1; } =20 -%.png: %.fig - convert -rotate 90 $< $@ - manpages/%.html.in: manpages/%.rst $(AM_V_GEN)$(MKDIR_P) `dirname $@` && \ grep -v '^:Manual ' < $< | \ --=20 2.26.2 From nobody Thu May 2 17:15:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594376890; cv=none; d=zohomail.com; s=zohoarc; b=AnOmE4vGC95I79n3sDqc3RJZ/CONAexL2RgbCLlg8Bzh4t3u1UsSCaKFsf9grroFeKeZp4HBZTZe61xK9XtdoH6OyYujfrtyjzoogyPW23HkwvWNdNjUbI1tckl/XZ9CTNXcPzJ6/g5yojyEcbPuvqcYxPo8KjHgmG4WX0LD5Is= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594376890; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8WZZVi1FQC1wmaBNedXz3NFCxAk4GXnQ0H4TrRQH/8E=; b=d57SKsuLyLR9dvDCpGWuh/3lMd+3rhRaPYxQoP9XqsZT4A6uXpxwZbzyR2HsWjkckpz0/khErmPLZDh42R+CjDSsz6WdWelHJfuza7H3jwlAw6J530r0GTwJ4iMLGKUUiHgVYwDu1NOkESwNX2terEw9crg804VcXu4KOh5UqU8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1594376890725925.3370304532737; Fri, 10 Jul 2020 03:28:10 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-7-tKZ1QDJiNkGnRMCSd8Qb6A-1; Fri, 10 Jul 2020 06:28:06 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 477DC80BCB3; Fri, 10 Jul 2020 10:28:01 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2783578A3C; Fri, 10 Jul 2020 10:28:01 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id E81AE84356; Fri, 10 Jul 2020 10:28:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06AAPCgZ009368 for ; Fri, 10 Jul 2020 06:25:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id BE30474F44; Fri, 10 Jul 2020 10:25:12 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id CF9DB74F56 for ; Fri, 10 Jul 2020 10:25:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594376889; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=8WZZVi1FQC1wmaBNedXz3NFCxAk4GXnQ0H4TrRQH/8E=; b=MvInaAkY/H9EnJKqJGQX6i63v4y7r2bFxYC5uOoMIhfw9Y7+n1jjiEejMHmZ+fN6kRfy+O xmZAKm8fw/jdLIIsOOyYjJhMdFMzY8LljSyuXoyB9vvBBoS8H6yQ3Tw7Ut0GHkzxMvUYHt svtdyysR5JfesJcBs6z/i400DsrgN24= X-MC-Unique: tKZ1QDJiNkGnRMCSd8Qb6A-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH v2 2/5] docs: convert FIG files into SVG format Date: Fri, 10 Jul 2020 12:25:03 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Converted by using: fig2dev -L svg Signed-off-by: Pavel Hrdina Reviewed-by: Daniel P. Berrang=C3=A9 --- docs/architecture.fig | 87 ---------- docs/architecture.svg | 239 ++++++++++++++++++++++++++++ docs/libvirt-daemon-arch.fig | 114 ------------- docs/libvirt-daemon-arch.svg | 185 +++++++++++++++++++++ docs/libvirt-driver-arch.fig | 62 -------- docs/libvirt-driver-arch.svg | 94 +++++++++++ docs/libvirt-object-model.fig | 61 ------- docs/libvirt-object-model.svg | 138 ++++++++++++++++ docs/libvirt-virConnect-example.fig | 58 ------- docs/libvirt-virConnect-example.svg | 138 ++++++++++++++++ docs/migration-managed-direct.fig | 58 ------- docs/migration-managed-direct.svg | 107 +++++++++++++ docs/migration-managed-p2p.fig | 58 ------- docs/migration-managed-p2p.svg | 107 +++++++++++++ docs/migration-native.fig | 43 ----- docs/migration-native.svg | 68 ++++++++ docs/migration-tunnel.fig | 49 ------ docs/migration-tunnel.svg | 92 +++++++++++ docs/migration-unmanaged-direct.fig | 58 ------- docs/migration-unmanaged-direct.svg | 107 +++++++++++++ docs/node.fig | 30 ---- docs/node.svg | 36 +++++ docs/structures.fig | 72 --------- docs/structures.svg | 187 ++++++++++++++++++++++ 24 files changed, 1498 insertions(+), 750 deletions(-) delete mode 100644 docs/architecture.fig create mode 100644 docs/architecture.svg delete mode 100644 docs/libvirt-daemon-arch.fig create mode 100644 docs/libvirt-daemon-arch.svg delete mode 100644 docs/libvirt-driver-arch.fig create mode 100644 docs/libvirt-driver-arch.svg delete mode 100644 docs/libvirt-object-model.fig create mode 100644 docs/libvirt-object-model.svg delete mode 100644 docs/libvirt-virConnect-example.fig create mode 100644 docs/libvirt-virConnect-example.svg delete mode 100644 docs/migration-managed-direct.fig create mode 100644 docs/migration-managed-direct.svg delete mode 100644 docs/migration-managed-p2p.fig create mode 100644 docs/migration-managed-p2p.svg delete mode 100644 docs/migration-native.fig create mode 100644 docs/migration-native.svg delete mode 100644 docs/migration-tunnel.fig create mode 100644 docs/migration-tunnel.svg delete mode 100644 docs/migration-unmanaged-direct.fig create mode 100644 docs/migration-unmanaged-direct.svg delete mode 100644 docs/node.fig create mode 100644 docs/node.svg delete mode 100644 docs/structures.fig create mode 100644 docs/structures.svg diff --git a/docs/architecture.fig b/docs/architecture.fig deleted file mode 100644 index 37ac719cfd1..00000000000 --- a/docs/architecture.fig +++ /dev/null @@ -1,87 +0,0 @@ -#FIG 3.2 -Landscape -Center -Inches -Letter -100.00 -Single --2 -1200 2 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 1050 7500 9375 7500 9375 8700 1050 8700 1050 7500 -2 4 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5 - 3525 7275 3525 4125 1050 4125 1050 7275 3525 7275 -2 1 1 2 0 7 50 -1 -1 6.000 0 0 -1 0 0 2 - 1050 6540 3540 6525 -2 4 0 1 0 7 50 -1 -1 4.000 0 0 7 0 0 5 - 1590 6900 1590 6645 1140 6645 1140 6900 1590 6900 -2 4 0 1 0 7 50 -1 -1 4.000 0 0 7 0 0 5 - 1590 7185 1590 6930 1140 6930 1140 7185 1590 7185 -2 1 0 4 0 7 50 -1 -1 0.000 0 0 -1 1 1 2 - 1 1 2.00 120.00 240.00 - 1 1 2.00 120.00 240.00 - 1875 7725 8625 7725 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 1650 5625 3000 5625 3000 6375 1650 6375 1650 5625 -2 1 0 4 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 - 1 1 2.00 120.00 240.00 - 2850 7725 2850 6375 -2 4 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5 - 6450 7275 6450 4125 3975 4125 3975 7275 6450 7275 -2 4 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5 - 9300 7275 9300 4125 6825 4125 6825 7275 9300 7275 -2 1 1 2 0 7 50 -1 -1 6.000 0 0 -1 0 0 2 - 3975 6540 6465 6525 -2 1 1 2 0 7 50 -1 -1 6.000 0 0 -1 0 0 2 - 6825 6540 9315 6525 -2 1 0 4 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 - 1 1 2.00 120.00 240.00 - 5400 7725 5400 7050 -2 1 0 4 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 - 1 1 2.00 120.00 240.00 - 8025 7725 8025 7050 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 1050 8925 9375 8925 9375 9900 1050 9900 1050 8925 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 2100 4575 3450 4575 3450 5325 2100 5325 2100 4575 -2 1 1 3 0 7 50 -1 -1 2.000 0 0 -1 1 0 2 - 1 1 2.00 120.00 240.00 - 3225 5325 3225 8325 -2 1 1 3 0 7 50 -1 -1 2.000 0 0 -1 1 0 2 - 1 1 2.00 120.00 240.00 - 6225 6900 6225 8250 -2 1 1 3 0 7 50 -1 -1 2.000 0 0 -1 1 0 2 - 1 1 2.00 120.00 240.00 - 8925 6900 8925 8250 -2 1 1 3 0 7 50 -1 -1 2.000 0 0 -1 1 0 2 - 1 1 2.00 120.00 240.00 - 1725 7125 1725 8325 -2 1 0 4 0 7 50 -1 -1 0.000 0 0 -1 1 1 2 - 1 1 2.00 120.00 240.00 - 1 1 2.00 120.00 240.00 - 2850 5850 2850 5025 -2 1 1 3 0 7 50 -1 -1 2.000 0 0 -1 1 0 2 - 1 1 2.00 120.00 240.00 - 5175 8475 5175 9375 -2 1 1 3 0 7 50 -1 -1 2.000 0 0 -1 1 0 2 - 1 1 2.00 120.00 240.00 - 1350 7125 1350 9450 -2 1 0 4 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 - 1 1 2.00 120.00 240.00 - 2325 7725 2325 7200 -2 1 1 1 0 7 50 -1 -1 4.000 0 0 -1 0 0 1 - 900 3975 -2 1 1 1 0 7 50 -1 -1 4.000 0 0 -1 0 0 1 - 9525 9975 -4 0 0 50 -1 0 18 0.0000 4 195 870 4350 7980 XenBus\001 -4 0 0 50 -1 0 18 0.0000 4 195 780 1680 6870 drivers\001 -4 0 0 50 -1 0 18 0.0000 4 195 1050 1800 6075 XenStore\001 -4 0 0 50 -1 0 18 0.0000 4 195 900 1875 7125 Kernel0\001 -4 0 0 50 -1 0 18 0.0000 4 195 960 4875 6975 KernelU\001 -4 0 0 50 -1 0 18 0.0000 4 195 960 7650 6975 KernelU\001 -4 0 0 50 -1 0 18 0.0000 4 255 1740 4050 8400 Xen Hypervisor\001 -4 0 0 50 -1 0 18 0.0000 4 195 585 2325 4950 Xend\001 -4 0 0 50 -1 0 18 0.0000 4 195 690 1200 4725 Dom0\001 -4 0 0 50 -1 0 18 0.0000 4 195 750 4875 5325 DomU\001 -4 0 0 50 -1 0 18 0.0000 4 195 750 7650 5325 DomU\001 -4 0 0 50 -1 0 18 0.0000 4 195 1080 3750 9450 Hardware\001 diff --git a/docs/architecture.svg b/docs/architecture.svg new file mode 100644 index 00000000000..1e1555156b2 --- /dev/null +++ b/docs/architecture.svg @@ -0,0 +1,239 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +XenBus + +drivers + +XenStore + +Kernel0 + +KernelU + +KernelU + +Xen Hypervisor + +Xend + +Dom0 + +DomU + +DomU + +Hardware + + diff --git a/docs/libvirt-daemon-arch.fig b/docs/libvirt-daemon-arch.fig deleted file mode 100644 index 53e9c6dfcd2..00000000000 --- a/docs/libvirt-daemon-arch.fig +++ /dev/null @@ -1,114 +0,0 @@ -#FIG 3.2 Produced by xfig version 3.2.5 -Landscape -Center -Inches -Letter -100.00 -Single --2 -1200 2 -6 75 150 13050 5100 -6 4425 764 5938 1150 -2 2 0 1 0 7 50 -1 -1 4.000 0 0 7 0 0 5 - 4425 764 5938 764 5938 1150 4425 1150 4425 764 -4 0 0 50 -1 16 15 0.0000 4 131 415 4519 1053 xen\001 --6 -6 4425 1246 5938 1631 -2 2 0 1 0 7 50 -1 -1 4.000 0 0 7 0 0 5 - 4425 1246 5938 1246 5938 1631 4425 1631 4425 1246 -4 0 0 50 -1 16 15 0.0000 4 178 640 4519 1535 qemu\001 --6 -6 4425 1728 5938 2113 -2 2 0 1 0 7 50 -1 -1 4.000 0 0 7 0 0 5 - 4425 1728 5938 1728 5938 2113 4425 2113 4425 1728 -4 0 0 50 -1 16 15 0.0000 4 178 829 4519 2017 openvz\001 --6 -6 4425 2210 5938 2595 -2 2 0 1 0 7 50 -1 -1 4.000 0 0 7 0 0 5 - 4425 2210 5938 2210 5938 2595 4425 2595 4425 2210 -4 0 0 50 -1 16 15 0.0000 4 178 320 4519 2499 lxc\001 --6 -6 4425 2691 5938 3077 -2 2 0 1 0 7 50 -1 -1 4.000 0 0 7 0 0 5 - 4425 2691 5938 2691 5938 3077 4425 3077 4425 2691 -4 0 0 50 -1 16 15 0.0000 4 166 415 4519 2980 test\001 --6 -6 4425 3173 5938 3559 -2 2 0 1 0 7 50 -1 -1 4.000 0 0 7 0 0 5 - 4425 3173 5938 3173 5938 3559 4425 3559 4425 3173 -4 0 0 50 -1 16 15 0.0000 4 166 794 4519 3462 remote\001 --6 -6 11328 764 12842 1150 -2 2 0 1 0 7 50 -1 -1 4.000 0 0 7 0 0 5 - 11328 764 12842 764 12842 1150 11328 1150 11328 764 -4 0 0 50 -1 16 15 0.0000 4 131 415 11423 1053 xen\001 --6 -6 11328 1246 12842 1631 -2 2 0 1 0 7 50 -1 -1 4.000 0 0 7 0 0 5 - 11328 1246 12842 1246 12842 1631 11328 1631 11328 1246 -4 0 0 50 -1 16 15 0.0000 4 178 640 11423 1535 qemu\001 --6 -6 11328 1728 12842 2113 -2 2 0 1 0 7 50 -1 -1 4.000 0 0 7 0 0 5 - 11328 1728 12842 1728 12842 2113 11328 2113 11328 1728 -4 0 0 50 -1 16 15 0.0000 4 178 829 11423 2017 openvz\001 --6 -6 11328 2210 12842 2595 -2 2 0 1 0 7 50 -1 -1 4.000 0 0 7 0 0 5 - 11328 2210 12842 2210 12842 2595 11328 2595 11328 2210 -4 0 0 50 -1 16 15 0.0000 4 178 320 11423 2499 lxc\001 --6 -6 11328 2691 12842 3077 -2 2 0 1 0 7 50 -1 -1 4.000 0 0 7 0 0 5 - 11328 2691 12842 2691 12842 3077 11328 3077 11328 2691 -4 0 0 50 -1 16 15 0.0000 4 166 415 11423 2980 test\001 --6 -6 11328 3173 12842 3559 -2 2 0 1 0 7 50 -1 -1 4.000 0 0 7 0 0 5 - 11328 3173 12842 3173 12842 3559 11328 3559 11328 3173 -4 0 0 50 -1 16 15 0.0000 4 166 794 11423 3462 remote\001 --6 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 75 1342 1587 1342 1587 2113 75 2113 75 1342 -2 1 0 1 0 7 50 -1 -1 4.000 0 0 -1 1 0 2 - 0 0 1.00 76.37 152.74 - 1587 1728 3101 1728 -2 1 0 1 0 7 50 -1 -1 4.000 0 0 -1 1 0 4 - 0 0 1.00 76.37 152.74 - 5938 3365 6883 3365 7262 1728 7640 1728 -2 1 0 1 0 7 50 -1 -1 4.000 0 0 -1 1 0 4 - 0 0 1.00 76.37 152.74 - 3101 1728 3858 1728 4141 3365 4425 3365 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 3101 572 6127 572 6127 3751 3101 3751 3101 572 -2 1 0 5 0 7 50 -1 -1 12.000 0 0 -1 0 0 2 - 3101 572 3101 3751 -2 1 2 5 0 7 50 -1 -1 3.000 0 0 -1 0 0 2 - 3858 572 3858 3751 -2 1 0 1 0 7 50 -1 -1 4.000 0 0 -1 1 0 2 - 0 0 1.00 76.37 152.74 - 9154 1728 10004 1728 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 7640 1342 9154 1342 9154 2113 7640 2113 7640 1342 -2 1 0 1 0 7 50 -1 -1 4.000 0 0 -1 1 0 4 - 0 0 1.00 76.37 152.74 - 10004 1728 10760 1728 10950 2402 11328 2402 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 10004 572 13030 572 13030 3751 10004 3751 10004 572 -2 1 0 5 0 7 50 -1 -1 12.000 0 0 -1 0 0 2 - 10004 572 10004 3751 -2 1 2 5 0 7 50 -1 -1 3.000 0 0 -1 0 0 2 - 10760 572 10760 3751 -4 0 0 50 -1 16 15 0.0000 4 225 1256 170 1728 Application\001 -4 0 0 50 -1 16 13 0.0000 4 154 367 1966 1631 URI\001 -4 0 0 50 -1 16 15 5.3233 4 178 1149 3763 4040 Driver API\001 -4 0 0 50 -1 16 15 5.3233 4 178 1173 3101 4040 Public API\001 -4 0 0 50 -1 16 15 5.3233 4 225 1233 4992 4040 Driver Impl\001 -4 0 0 50 -1 16 18 0.0000 4 213 652 3763 379 libvirt\001 -4 0 0 50 -1 16 13 0.0000 4 154 901 1966 2017 lxc://host/\001 -4 0 0 50 -1 16 15 0.0000 4 178 747 7734 1728 libvirtd\001 -4 0 0 50 -1 16 15 5.3233 4 178 1149 10666 4040 Driver API\001 -4 0 0 50 -1 16 15 5.3233 4 178 1173 10004 4040 Public API\001 -4 0 0 50 -1 16 15 5.3233 4 225 1233 11896 4040 Driver Impl\001 -4 0 0 50 -1 16 18 0.0000 4 213 652 10666 379 libvirt\001 --6 diff --git a/docs/libvirt-daemon-arch.svg b/docs/libvirt-daemon-arch.svg new file mode 100644 index 00000000000..12def9612db --- /dev/null +++ b/docs/libvirt-daemon-arch.svg @@ -0,0 +1,185 @@ + + + + + + + + + +xen + + + +qemu + + + +openvz + + + +lxc + + + +test + + + +remote + + + +xen + + + +qemu + + + +openvz + + + +lxc + + + +test + + + +remote + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Application + +URI + + +Driver API + + +Public API + + +Driver Impl + +libvirt + +lxc://host/ + +libvirtd + + +Driver API + + +Public API + + +Driver Impl + +libvirt + + diff --git a/docs/libvirt-driver-arch.fig b/docs/libvirt-driver-arch.fig deleted file mode 100644 index f512b67f84f..00000000000 --- a/docs/libvirt-driver-arch.fig +++ /dev/null @@ -1,62 +0,0 @@ -#FIG 3.2 Produced by xfig version 3.2.5 -Landscape -Center -Inches -Letter -100.00 -Single --2 -1200 2 -6 1200 225 10950 8147 -6 8208 1291 10646 1900 -2 2 0 1 0 7 50 -1 -1 4.000 0 0 7 0 0 5 - 8208 1291 10646 1291 10646 1900 8208 1900 8208 1291 -4 0 0 50 -1 16 24 0.0000 4 214 639 8360 1748 xen\001 --6 -6 8208 2054 10646 2662 -2 2 0 1 0 7 50 -1 -1 4.000 0 0 7 0 0 5 - 8208 2054 10646 2054 10646 2662 8208 2662 8208 2054 -4 0 0 50 -1 16 24 0.0000 4 305 975 8360 2510 qemu\001 --6 -6 8208 2815 10646 3424 -2 2 0 1 0 7 50 -1 -1 4.000 0 0 7 0 0 5 - 8208 2815 10646 2815 10646 3424 8208 3424 8208 2815 -4 0 0 50 -1 16 24 0.0000 4 305 1280 8360 3272 openvz\001 --6 -6 8208 3577 10646 4187 -2 2 0 1 0 7 50 -1 -1 4.000 0 0 7 0 0 5 - 8208 3577 10646 3577 10646 4187 8208 4187 8208 3577 -4 0 0 50 -1 16 24 0.0000 4 304 518 8360 4033 lxc\001 --6 -6 8208 4339 10646 4948 -2 2 0 1 0 7 50 -1 -1 4.000 0 0 7 0 0 5 - 8208 4339 10646 4339 10646 4948 8208 4948 8208 4339 -4 0 0 50 -1 16 24 0.0000 4 274 670 8360 4795 test\001 --6 -6 8208 5100 10646 5710 -2 2 0 1 0 7 50 -1 -1 4.000 0 0 7 0 0 5 - 8208 5100 10646 5100 10646 5710 8208 5710 8208 5100 -4 0 0 50 -1 16 24 0.0000 4 274 1219 8360 5557 remote\001 --6 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 1200 2206 3637 2206 3637 3424 1200 3424 1200 2206 -2 1 0 1 0 7 50 -1 -1 4.000 0 0 -1 1 0 2 - 0 0 1.00 121.88 243.75 - 3637 2815 6075 2815 -2 1 0 1 0 7 50 -1 -1 4.000 0 0 -1 1 0 4 - 0 0 1.00 121.88 243.75 - 6075 2815 7294 2815 7598 3881 8208 3881 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 6075 987 10950 987 10950 6014 6075 6014 6075 987 -2 1 0 5 0 7 50 -1 -1 12.000 0 0 -1 0 0 2 - 6075 987 6075 6014 -2 1 2 5 0 7 50 -1 -1 3.000 0 0 -1 0 0 2 - 7294 987 7294 6014 -4 0 0 50 -1 16 24 0.0000 4 395 1950 1352 2815 Application\001 -4 0 0 50 -1 16 20 0.0000 4 244 579 4246 2662 URI\001 -4 0 0 50 -1 16 20 0.0000 4 244 792 4246 3272 lxc:///\001 -4 0 0 50 -1 16 24 5.3233 4 304 1828 7142 6472 Driver API\001 -4 0 0 50 -1 16 24 5.3233 4 304 1889 6075 6472 Public API\001 -4 0 0 50 -1 16 24 5.3233 4 395 1920 9121 6472 Driver Impl\001 -4 0 0 50 -1 16 28 0.0000 4 366 1157 7142 682 libvirt\001 --6 diff --git a/docs/libvirt-driver-arch.svg b/docs/libvirt-driver-arch.svg new file mode 100644 index 00000000000..9565ed739a2 --- /dev/null +++ b/docs/libvirt-driver-arch.svg @@ -0,0 +1,94 @@ + + + + + + + + + +xen + + + +qemu + + + +openvz + + + +lxc + + + +test + + + +remote + + + + + + + + + + + + + + + + + + + + + + + + + + + +Application + +URI + +lxc:/// + + +Driver API + + +Public API + + +Driver Impl + +libvirt + + diff --git a/docs/libvirt-object-model.fig b/docs/libvirt-object-model.fig deleted file mode 100644 index 2776998203c..00000000000 --- a/docs/libvirt-object-model.fig +++ /dev/null @@ -1,61 +0,0 @@ -#FIG 3.2 Produced by xfig version 3.2.5 -Landscape -Center -Inches -Letter -100.00 -Single --2 -1200 2 -6 1200 1200 10274 6975 -6 4500 1200 6974 2025 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 4500 1200 6974 1200 6974 2025 4500 2025 4500 1200 -4 0 0 50 -1 16 17 0.0000 4 202 1679 4603 1613 virConnectPtr\001 --6 -6 1200 3675 3675 4500 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 1200 3675 3675 3675 3675 4500 1200 4500 1200 3675 -4 0 0 50 -1 16 17 0.0000 4 202 1595 1303 4087 virDomainPtr\001 --6 -6 1200 6150 3675 6975 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 1200 6150 3675 6150 3675 6975 1200 6975 1200 6150 -4 0 0 50 -1 16 17 0.0000 4 202 1667 1303 6562 virNetworkPtr\001 --6 -6 7799 3675 10274 4500 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 7799 3675 10274 3675 10274 4500 7799 4500 7799 3675 -4 0 0 50 -1 16 17 0.0000 4 262 2155 7902 4087 virStoragePoolPtr\001 --6 -6 7799 6150 10274 6975 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 7799 6150 10274 6150 10274 6975 7799 6975 7799 6150 -4 0 0 50 -1 16 17 0.0000 4 262 2000 7902 6562 virStorageVolPtr\001 --6 -3 0 0 1 0 7 50 -1 -1 0.000 0 1 0 3 - 0 0 1.00 82.50 164.99 - 4706 2025 4706 4087 3675 4087 - 0.000 1.000 0.000 -3 0 0 1 0 7 50 -1 -1 0.000 0 1 0 3 - 0 0 1.00 82.50 164.99 - 6768 2025 6768 4087 7799 4087 - 0.000 1.000 0.000 -3 0 0 1 0 7 50 -1 -1 0.000 0 1 0 3 - 0 0 1.00 82.50 164.99 - 6562 2025 6562 6562 7799 6562 - 0.000 1.000 0.000 -3 0 0 1 0 7 50 -1 -1 0.000 0 1 0 3 - 0 0 1.00 82.50 164.99 - 4912 2025 4912 6562 3675 6562 - 0.000 1.000 0.000 -3 0 0 1 0 7 50 -1 -1 0.000 0 1 0 2 - 0 0 1.00 82.50 164.99 - 8933 4500 8933 6150 - 0.000 0.000 -4 0 0 50 -1 16 17 0.0000 4 143 155 3881 3985 n\001 -4 0 0 50 -1 16 17 0.0000 4 143 155 3881 6459 n\001 -4 0 0 50 -1 16 17 0.0000 4 143 155 7387 6459 n\001 -4 0 0 50 -1 16 17 0.0000 4 143 155 7387 3985 n\001 -4 0 0 50 -1 16 17 0.0000 4 143 155 8727 5944 n\001 --6 diff --git a/docs/libvirt-object-model.svg b/docs/libvirt-object-model.svg new file mode 100644 index 00000000000..21439fb7e57 --- /dev/null +++ b/docs/libvirt-object-model.svg @@ -0,0 +1,138 @@ + + + + + + + + + +virConnectPtr + + + +virDomainPtr + + + +virNetworkPtr + + + +virStoragePoolPtr + + + +virStorageVolPtr + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +n + +n + +n + +n + +n + + diff --git a/docs/libvirt-virConnect-example.fig b/docs/libvirt-virConnect-= example.fig deleted file mode 100644 index 3d58411f5e4..00000000000 --- a/docs/libvirt-virConnect-example.fig +++ /dev/null @@ -1,58 +0,0 @@ -#FIG 3.2 Produced by xfig version 3.2.5b -Landscape -Center -Inches -Letter -100.00 -Single --2 -1200 2 -2 2 0 2 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 450 375 4575 375 4575 1725 450 1725 450 375 -2 2 0 2 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 1125 2475 4950 2475 4950 3600 1125 3600 1125 2475 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 - 1 0 1.00 60.00 120.00 - 1725 1725 2175 2475 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 3150 5700 6525 5700 6525 6900 3150 6900 3150 5700 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 7875 6825 10125 6825 10125 7725 7875 7725 7875 6825 -2 2 0 2 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 2550 4725 10350 4725 10350 7800 2550 7800 2550 4725 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5 - 8850 1950 11550 1950 11550 3360 8850 3360 8850 1950 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 - 1 0 1.00 60.00 120.00 - 3975 3600 5025 4425 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 - 1 0 1.00 60.00 120.00 - 8925 3225 5400 4425 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 - 1 0 1.00 60.00 120.00 - 5625 6900 7875 7425 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 3 - 1 0 1.00 60.00 120.00 - 11400 3375 11400 7575 10125 7575 -2 2 0 2 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 8400 975 12450 975 12450 4125 8400 4125 8400 975 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 6 - 1 0 1.00 60.00 120.00 - 10125 7125 10725 7125 10725 4425 7725 4425 7725 2700 8850 2700 -4 0 0 50 -1 16 12 0.0000 4 180 2430 1350 2895 virConnectOpenReadOnly(uri)\= 001 -4 0 0 50 -1 16 12 0.0000 4 180 3240 1350 3090 virConnectOpenAuth(uri, auth= , flags)\001 -4 0 0 50 -1 0 12 0.0000 4 165 1350 3300 5850 virConnectOpen:\001 -4 0 0 50 -1 0 12 0.0000 4 165 2070 3300 6045 virConnectOpenReadOnly:\001 -4 0 0 50 -1 0 12 0.0000 4 165 1710 3300 6240 virConnectOpenAuth:\001 -4 0 0 50 -1 0 12 0.0000 4 180 900 3975 6600 do_open():\001 -4 0 0 50 -1 0 14 0.0000 4 135 1260 8025 7125 Rremote driver\001 -4 0 0 50 -1 16 24 0.0000 4 135 630 5025 4650 libvirt\001 -4 0 0 50 -1 0 14 0.0000 4 180 1890 9000 2175 remoteDispatchOpen():\001 -4 0 0 50 -1 0 12 0.0000 4 45 270 9300 2475 ...\001 -4 0 0 50 -1 0 12 0.0000 4 180 1440 9300 2670 virConnectOpen()\001 -4 0 0 50 -1 0 12 0.0000 4 180 2160 9300 2865 virConnectOpenReadOnly()\001 -4 0 0 50 -1 0 12 0.0000 4 45 270 9300 3060 ...\001 -4 0 0 50 -1 0 12 0.0000 4 180 1080 8250 7350 remoteOpen()\001 -4 0 0 50 -1 16 16 0.0000 4 165 3240 600 1050 "virsh -c qemu:///system list= --all"\001 -4 0 0 50 -1 16 12 0.0000 4 180 1710 1350 2700 virConnectOpen(uri)\001 -4 0 0 50 -1 16 24 0.0000 4 135 720 9750 825 libvirtd\001 diff --git a/docs/libvirt-virConnect-example.svg b/docs/libvirt-virConnect-= example.svg new file mode 100644 index 00000000000..45b820c3b84 --- /dev/null +++ b/docs/libvirt-virConnect-example.svg @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +virConnectOpenReadOnly(uri) + +virConnectOpenAuth(uri, auth, flags) + +virConnectOpen: + +virConnectOpenReadOnly: + +virConnectOpenAuth: + +do_open(): + +Rremote driver + +libvirt + +remoteDispatchOpen(): + +... + +virConnectOpen() + +virConnectOpenReadOnly() + +... + +remoteOpen() + +"virsh -c qemu:///system list --all" + +virConnectOpen(uri) + +libvirtd + + diff --git a/docs/migration-managed-direct.fig b/docs/migration-managed-dir= ect.fig deleted file mode 100644 index bdbf26d07e8..00000000000 --- a/docs/migration-managed-direct.fig +++ /dev/null @@ -1,58 +0,0 @@ -#FIG 3.2 Produced by xfig version 3.2.5b -Landscape -Center -Inches -Letter -100.00 -Single --2 -1200 2 -6 2775 2400 3675 2850 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5 - 2775 2400 3675 2400 3675 2850 2775 2850 2775 2400 -4 0 0 50 -1 16 12 0.0000 4 150 570 2925 2700 libvirtd\001 --6 -6 5400 2400 6300 2850 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5 - 5400 2400 6300 2400 6300 2850 5400 2850 5400 2400 -4 0 0 50 -1 16 12 0.0000 4 150 570 5550 2700 libvirtd\001 --6 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 1200 1200 3825 1200 3825 3000 1200 3000 1200 1200 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 5250 1200 7875 1200 7875 3000 5250 3000 5250 1200 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 5400 1350 6075 1350 6075 1950 5400 1950 5400 1350 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 6225 1350 6900 1350 6900 1950 6225 1950 6225 1350 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 3000 1350 3675 1350 3675 1950 3000 1950 3000 1350 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 2175 1350 2850 1350 2850 1950 2175 1950 2175 1350 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 1350 1350 2025 1350 2025 1950 1350 1950 1350 1350 -2 1 0 3 0 7 50 -1 -1 0.000 0 0 -1 1 0 4 - 1 1 1.00 135.00 180.00 - 4350 4275 4350 3600 3300 3600 3300 2850 -2 1 0 3 0 7 50 -1 -1 0.000 0 0 -1 1 0 4 - 1 1 1.00 135.00 180.00 - 4800 4275 4800 3600 5775 3600 5775 2850 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 3225 4125 5850 4125 5850 6000 3225 6000 3225 4125 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5 - 3375 5100 5700 5100 5700 5550 3375 5550 3375 5100 -2 1 0 3 0 7 50 -1 -1 0.000 0 0 -1 1 0 3 - 1 1 1.00 135.00 180.00 - 3750 5100 3750 4500 4050 4500 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5 - 4050 4275 5100 4275 5100 4725 4050 4725 4050 4275 -4 0 0 50 -1 16 12 0.0000 4 150 870 6825 2850 Dest Host\001 -4 0 0 50 -1 16 12 0.0000 4 150 1080 1350 2850 Source Host\001 -4 0 0 50 -1 16 12 0.0000 4 150 495 1425 1725 VM-A\001 -4 0 0 50 -1 16 12 0.0000 4 150 495 2250 1725 VM-B\001 -4 0 0 50 -1 16 12 0.0000 4 150 495 3075 1725 VM-C\001 -4 0 0 50 -1 16 12 0.0000 4 150 495 5475 1725 VM-C\001 -4 0 0 50 -1 16 12 0.0000 4 150 495 6300 1725 VM-D\001 -4 0 0 50 -1 16 12 0.0000 4 150 960 4725 5850 Client Host\001 -4 0 0 50 -1 16 12 0.0000 4 180 1500 3525 5400 management app\001 -4 0 0 50 -1 16 12 0.0000 4 150 735 4200 4575 libvirt.so\001 diff --git a/docs/migration-managed-direct.svg b/docs/migration-managed-dir= ect.svg new file mode 100644 index 00000000000..1ef2374b521 --- /dev/null +++ b/docs/migration-managed-direct.svg @@ -0,0 +1,107 @@ + + + + + + + + + +libvirtd + + + +libvirtd + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Dest Host + +Source Host + +VM-A + +VM-B + +VM-C + +VM-C + +VM-D + +Client Host + +management app + +libvirt.so + + diff --git a/docs/migration-managed-p2p.fig b/docs/migration-managed-p2p.fig deleted file mode 100644 index 1d665c6f9d4..00000000000 --- a/docs/migration-managed-p2p.fig +++ /dev/null @@ -1,58 +0,0 @@ -#FIG 3.2 Produced by xfig version 3.2.5b -Landscape -Center -Inches -Letter -100.00 -Single --2 -1200 2 -6 2775 2400 3675 2850 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5 - 2775 2400 3675 2400 3675 2850 2775 2850 2775 2400 -4 0 0 50 -1 16 12 0.0000 4 150 570 2925 2700 libvirtd\001 --6 -6 5400 2400 6300 2850 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5 - 5400 2400 6300 2400 6300 2850 5400 2850 5400 2400 -4 0 0 50 -1 16 12 0.0000 4 150 570 5550 2700 libvirtd\001 --6 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 1200 1200 3825 1200 3825 3000 1200 3000 1200 1200 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 5250 1200 7875 1200 7875 3000 5250 3000 5250 1200 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 5400 1350 6075 1350 6075 1950 5400 1950 5400 1350 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 6225 1350 6900 1350 6900 1950 6225 1950 6225 1350 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 3000 1350 3675 1350 3675 1950 3000 1950 3000 1350 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 2175 1350 2850 1350 2850 1950 2175 1950 2175 1350 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 1350 1350 2025 1350 2025 1950 1350 1950 1350 1350 -2 1 0 3 0 7 50 -1 -1 0.000 0 0 -1 1 0 4 - 1 1 1.00 135.00 180.00 - 4350 4275 4350 3600 3300 3600 3300 2850 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 3225 4125 5850 4125 5850 6000 3225 6000 3225 4125 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5 - 3375 5100 5700 5100 5700 5550 3375 5550 3375 5100 -2 1 0 3 0 7 50 -1 -1 0.000 0 0 -1 1 0 3 - 1 1 1.00 135.00 180.00 - 3750 5100 3750 4500 4050 4500 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5 - 4050 4275 5100 4275 5100 4725 4050 4725 4050 4275 -2 1 0 3 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 - 1 1 1.00 135.00 180.00 - 3675 2625 5400 2625 -4 0 0 50 -1 16 12 0.0000 4 150 870 6825 2850 Dest Host\001 -4 0 0 50 -1 16 12 0.0000 4 150 1080 1350 2850 Source Host\001 -4 0 0 50 -1 16 12 0.0000 4 150 495 1425 1725 VM-A\001 -4 0 0 50 -1 16 12 0.0000 4 150 495 2250 1725 VM-B\001 -4 0 0 50 -1 16 12 0.0000 4 150 495 3075 1725 VM-C\001 -4 0 0 50 -1 16 12 0.0000 4 150 495 5475 1725 VM-C\001 -4 0 0 50 -1 16 12 0.0000 4 150 495 6300 1725 VM-D\001 -4 0 0 50 -1 16 12 0.0000 4 150 960 4725 5850 Client Host\001 -4 0 0 50 -1 16 12 0.0000 4 180 1500 3525 5400 management app\001 -4 0 0 50 -1 16 12 0.0000 4 150 735 4200 4575 libvirt.so\001 diff --git a/docs/migration-managed-p2p.svg b/docs/migration-managed-p2p.svg new file mode 100644 index 00000000000..200283adc54 --- /dev/null +++ b/docs/migration-managed-p2p.svg @@ -0,0 +1,107 @@ + + + + + + + + + +libvirtd + + + +libvirtd + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Dest Host + +Source Host + +VM-A + +VM-B + +VM-C + +VM-C + +VM-D + +Client Host + +management app + +libvirt.so + + diff --git a/docs/migration-native.fig b/docs/migration-native.fig deleted file mode 100644 index a7a710bc23a..00000000000 --- a/docs/migration-native.fig +++ /dev/null @@ -1,43 +0,0 @@ -#FIG 3.2 Produced by xfig version 3.2.5b -Landscape -Center -Inches -Letter -100.00 -Single --2 -1200 2 -6 2775 2400 3675 2850 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5 - 2775 2400 3675 2400 3675 2850 2775 2850 2775 2400 -4 0 0 50 -1 16 12 0.0000 4 150 570 2925 2700 libvirtd\001 --6 -6 5400 2400 6300 2850 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5 - 5400 2400 6300 2400 6300 2850 5400 2850 5400 2400 -4 0 0 50 -1 16 12 0.0000 4 150 570 5550 2700 libvirtd\001 --6 -2 1 0 3 0 7 50 -1 -1 0.000 0 0 7 1 0 4 - 1 1 1.00 135.00 180.00 - 3375 1350 3375 825 5700 825 5700 1350 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 1200 1200 3825 1200 3825 3000 1200 3000 1200 1200 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 5250 1200 7875 1200 7875 3000 5250 3000 5250 1200 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 6225 1350 6900 1350 6900 1950 6225 1950 6225 1350 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 5400 1350 6075 1350 6075 1950 5400 1950 5400 1350 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 3000 1350 3675 1350 3675 1950 3000 1950 3000 1350 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 2175 1350 2850 1350 2850 1950 2175 1950 2175 1350 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 1350 1350 2025 1350 2025 1950 1350 1950 1350 1350 -4 0 0 50 -1 16 12 0.0000 4 150 495 1425 1725 VM-A\001 -4 0 0 50 -1 16 12 0.0000 4 150 495 2250 1725 VM-B\001 -4 0 0 50 -1 16 12 0.0000 4 150 495 3075 1725 VM-C\001 -4 0 0 50 -1 16 12 0.0000 4 150 495 5475 1725 VM-C\001 -4 0 0 50 -1 16 12 0.0000 4 150 495 6300 1725 VM-D\001 -4 0 0 50 -1 16 12 0.0000 4 150 1080 1350 2850 Source Host\001 -4 0 0 50 -1 16 12 0.0000 4 150 870 6825 2850 Dest Host\001 diff --git a/docs/migration-native.svg b/docs/migration-native.svg new file mode 100644 index 00000000000..31a46fa76c9 --- /dev/null +++ b/docs/migration-native.svg @@ -0,0 +1,68 @@ + + + + + + + + + +libvirtd + + + +libvirtd + + + + + + + + + + + + + + + + + + + + + + + + +VM-A + +VM-B + +VM-C + +VM-C + +VM-D + +Source Host + +Dest Host + + diff --git a/docs/migration-tunnel.fig b/docs/migration-tunnel.fig deleted file mode 100644 index 1159c7c3756..00000000000 --- a/docs/migration-tunnel.fig +++ /dev/null @@ -1,49 +0,0 @@ -#FIG 3.2 Produced by xfig version 3.2.5b -Landscape -Center -Inches -Letter -100.00 -Single --2 -1200 2 -6 2775 2400 3675 2850 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5 - 2775 2400 3675 2400 3675 2850 2775 2850 2775 2400 -4 0 0 50 -1 16 12 0.0000 4 150 570 2925 2700 libvirtd\001 --6 -6 5400 2400 6300 2850 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5 - 5400 2400 6300 2400 6300 2850 5400 2850 5400 2400 -4 0 0 50 -1 16 12 0.0000 4 150 570 5550 2700 libvirtd\001 --6 -2 1 0 3 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 - 1 1 1.00 135.00 180.00 - 3375 1950 3375 2400 -2 1 0 3 0 7 50 -1 -1 0.000 0 0 7 1 0 4 - 1 1 1.00 135.00 180.00 - 3375 2850 3375 3375 5700 3375 5700 2850 -2 1 0 3 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 - 1 1 1.00 135.00 180.00 - 5700 2400 5700 1950 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 1200 1200 3825 1200 3825 3000 1200 3000 1200 1200 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 5250 1200 7875 1200 7875 3000 5250 3000 5250 1200 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 5400 1350 6075 1350 6075 1950 5400 1950 5400 1350 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 6225 1350 6900 1350 6900 1950 6225 1950 6225 1350 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 3000 1350 3675 1350 3675 1950 3000 1950 3000 1350 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 2175 1350 2850 1350 2850 1950 2175 1950 2175 1350 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 1350 1350 2025 1350 2025 1950 1350 1950 1350 1350 -4 0 0 50 -1 16 12 0.0000 4 150 870 6825 2850 Dest Host\001 -4 0 0 50 -1 16 12 0.0000 4 150 1080 1350 2850 Source Host\001 -4 0 0 50 -1 16 12 0.0000 4 150 495 1425 1725 VM-A\001 -4 0 0 50 -1 16 12 0.0000 4 150 495 2250 1725 VM-B\001 -4 0 0 50 -1 16 12 0.0000 4 150 495 3075 1725 VM-C\001 -4 0 0 50 -1 16 12 0.0000 4 150 495 5475 1725 VM-C\001 -4 0 0 50 -1 16 12 0.0000 4 150 495 6300 1725 VM-D\001 diff --git a/docs/migration-tunnel.svg b/docs/migration-tunnel.svg new file mode 100644 index 00000000000..4c1affd9881 --- /dev/null +++ b/docs/migration-tunnel.svg @@ -0,0 +1,92 @@ + + + + + + + + + +libvirtd + + + +libvirtd + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Dest Host + +Source Host + +VM-A + +VM-B + +VM-C + +VM-C + +VM-D + + diff --git a/docs/migration-unmanaged-direct.fig b/docs/migration-unmanaged= -direct.fig deleted file mode 100644 index 6dfd041aac9..00000000000 --- a/docs/migration-unmanaged-direct.fig +++ /dev/null @@ -1,58 +0,0 @@ -#FIG 3.2 Produced by xfig version 3.2.5b -Landscape -Center -Inches -Letter -100.00 -Single --2 -1200 2 -6 2775 2400 3675 2850 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5 - 2775 2400 3675 2400 3675 2850 2775 2850 2775 2400 -4 0 0 50 -1 16 12 0.0000 4 150 630 2925 2700 HV Ctrl\001 --6 -6 5400 2400 6300 2850 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5 - 5400 2400 6300 2400 6300 2850 5400 2850 5400 2400 -4 0 0 50 -1 16 12 0.0000 4 150 630 5550 2700 HV Ctrl\001 --6 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 1200 1200 3825 1200 3825 3000 1200 3000 1200 1200 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 5250 1200 7875 1200 7875 3000 5250 3000 5250 1200 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 5400 1350 6075 1350 6075 1950 5400 1950 5400 1350 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 6225 1350 6900 1350 6900 1950 6225 1950 6225 1350 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 3000 1350 3675 1350 3675 1950 3000 1950 3000 1350 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 2175 1350 2850 1350 2850 1950 2175 1950 2175 1350 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 1350 1350 2025 1350 2025 1950 1350 1950 1350 1350 -2 1 0 3 0 7 50 -1 -1 0.000 0 0 -1 1 0 4 - 1 1 1.00 135.00 180.00 - 4350 4275 4350 3600 3300 3600 3300 2850 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 3225 4125 5850 4125 5850 6000 3225 6000 3225 4125 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5 - 3375 5100 5700 5100 5700 5550 3375 5550 3375 5100 -2 1 0 3 0 7 50 -1 -1 0.000 0 0 -1 1 0 3 - 1 1 1.00 135.00 180.00 - 3750 5100 3750 4500 4050 4500 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5 - 4050 4275 5100 4275 5100 4725 4050 4725 4050 4275 -2 1 0 3 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 - 1 1 1.00 135.00 180.00 - 3675 2625 5400 2625 -4 0 0 50 -1 16 12 0.0000 4 150 870 6825 2850 Dest Host\001 -4 0 0 50 -1 16 12 0.0000 4 150 1080 1350 2850 Source Host\001 -4 0 0 50 -1 16 12 0.0000 4 150 495 1425 1725 VM-A\001 -4 0 0 50 -1 16 12 0.0000 4 150 495 2250 1725 VM-B\001 -4 0 0 50 -1 16 12 0.0000 4 150 495 3075 1725 VM-C\001 -4 0 0 50 -1 16 12 0.0000 4 150 495 5475 1725 VM-C\001 -4 0 0 50 -1 16 12 0.0000 4 150 495 6300 1725 VM-D\001 -4 0 0 50 -1 16 12 0.0000 4 150 960 4725 5850 Client Host\001 -4 0 0 50 -1 16 12 0.0000 4 180 1500 3525 5400 management app\001 -4 0 0 50 -1 16 12 0.0000 4 150 735 4200 4575 libvirt.so\001 diff --git a/docs/migration-unmanaged-direct.svg b/docs/migration-unmanaged= -direct.svg new file mode 100644 index 00000000000..e836a1d03a2 --- /dev/null +++ b/docs/migration-unmanaged-direct.svg @@ -0,0 +1,107 @@ + + + + + + + + + +HV Ctrl + + + +HV Ctrl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Dest Host + +Source Host + +VM-A + +VM-B + +VM-C + +VM-C + +VM-D + +Client Host + +management app + +libvirt.so + + diff --git a/docs/node.fig b/docs/node.fig deleted file mode 100644 index 457e07b42dc..00000000000 --- a/docs/node.fig +++ /dev/null @@ -1,30 +0,0 @@ -#FIG 3.2 -Landscape -Center -Inches -Letter -100.00 -Single --2 -1200 2 -6 1275 1800 2550 2250 -2 4 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5 - 2550 2250 2550 1800 1275 1800 1275 2250 2550 2250 -4 0 0 50 -1 0 20 0.0000 4 195 930 1500 2100 Domain\001 --6 -6 1275 2325 2550 2775 -2 4 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5 - 2550 2775 2550 2325 1275 2325 1275 2775 2550 2775 -4 0 0 50 -1 0 20 0.0000 4 195 930 1500 2625 Domain\001 --6 -6 1275 2850 2550 3300 -2 4 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5 - 2550 3300 2550 2850 1275 2850 1275 3300 2550 3300 -4 0 0 50 -1 0 20 0.0000 4 195 930 1500 3150 Domain\001 --6 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 975 1500 3375 1500 3375 4125 975 4125 975 1500 -2 4 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5 - 3225 3975 3225 3450 1125 3450 1125 3975 3225 3975 -4 0 0 50 -1 0 20 0.0000 4 255 1260 1500 3825 Hypervisor\001 -4 0 0 50 -1 0 20 0.0000 4 195 600 2700 2850 Node\001 diff --git a/docs/node.svg b/docs/node.svg new file mode 100644 index 00000000000..4069d43d7f1 --- /dev/null +++ b/docs/node.svg @@ -0,0 +1,36 @@ + + + + + + + + + +Domain + + + +Domain + + + +Domain + + + + + +Hypervisor + +Node + + diff --git a/docs/structures.fig b/docs/structures.fig deleted file mode 100644 index 67993667af7..00000000000 --- a/docs/structures.fig +++ /dev/null @@ -1,72 +0,0 @@ -#FIG 3.2 -Landscape -Center -Inches -Letter -100.00 -Single --2 -1200 2 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 1125 825 2400 825 2400 2850 1125 2850 1125 825 -2 1 0 1 0 7 50 -1 -1 4.000 0 0 -1 1 0 2 - 1 1 1.00 60.00 120.00 - 2400 1200 5175 1200 -2 1 0 1 0 7 50 -1 -1 4.000 0 0 -1 1 0 2 - 1 1 1.00 60.00 120.00 - 2400 1200 5175 2025 -2 4 0 1 0 7 50 -1 -1 4.000 0 0 7 0 0 5 - 5925 1500 5925 975 5175 975 5175 1500 5925 1500 -2 4 0 1 0 7 50 -1 -1 4.000 0 0 7 0 0 5 - 5925 2400 5925 1875 5175 1875 5175 2400 5925 2400 -2 4 0 1 0 7 50 -1 -1 4.000 0 0 7 0 0 5 - 2400 5250 2400 4500 1500 4500 1500 5250 2400 5250 -2 1 0 1 0 7 50 -1 -1 4.000 0 0 -1 1 0 2 - 1 1 1.00 60.00 120.00 - 1875 4725 1875 2850 -2 1 0 1 0 7 50 -1 -1 4.000 0 0 -1 1 0 2 - 1 1 1.00 60.00 120.00 - 5175 2175 2400 4500 -2 1 0 1 0 7 50 -1 -1 4.000 0 0 -1 1 0 2 - 1 1 1.00 60.00 120.00 - 5175 1350 2400 4500 -2 1 0 1 0 7 50 -1 -1 4.000 0 0 -1 1 0 2 - 1 1 1.00 60.00 120.00 - 5925 1200 6825 1200 -2 1 0 1 0 7 50 -1 -1 4.000 0 0 -1 1 0 2 - 1 1 1.00 60.00 120.00 - 5925 2100 6825 2100 -2 2 0 1 0 7 50 -1 -1 4.000 0 0 -1 0 0 5 - 3900 4650 6750 4650 6750 4875 3900 4875 3900 4650 -2 1 0 1 0 7 50 -1 -1 4.000 0 0 -1 0 0 2 - 4200 4650 4200 4875 -2 1 0 1 0 7 50 -1 -1 4.000 0 0 -1 0 0 2 - 4500 4650 4500 4875 -2 1 0 1 0 7 50 -1 -1 4.000 0 0 -1 0 0 2 - 4725 4650 4725 4875 -2 1 0 1 0 7 50 -1 -1 4.000 0 0 -1 0 0 2 - 6450 4650 6450 4875 -2 1 0 1 0 7 50 -1 -1 4.000 0 0 -1 0 0 2 - 6150 4650 6150 4875 -2 1 0 1 0 7 50 -1 -1 4.000 0 0 -1 1 0 2 - 1 1 1.00 60.00 120.00 - 4050 4725 5250 1500 -2 1 0 1 0 7 50 -1 -1 4.000 0 0 -1 1 0 2 - 1 1 1.00 60.00 120.00 - 4350 4725 5250 2400 -2 1 0 1 0 7 50 -1 -1 4.000 0 0 -1 1 0 2 - 1 1 1.00 60.00 120.00 - 2250 4800 3900 4800 -4 0 0 50 -1 0 18 0.0000 4 195 1005 1275 1125 Domains\001 -4 0 0 50 -1 0 18 0.0000 4 195 585 1275 1440 hash \001 -4 0 0 50 -1 0 18 0.0000 4 195 1650 4725 750 virDomainPtr\001 -4 0 0 50 -1 0 18 0.0000 4 195 2055 975 5700 virConnectionPtr\001 -4 0 0 50 -1 0 18 0.0000 4 195 945 900 4200 domains\001 -4 0 0 50 -1 0 18 0.0000 4 135 555 3450 2475 conn\001 -4 0 0 50 -1 0 18 0.0000 4 135 615 6075 1050 name\001 -4 0 0 50 -1 0 18 0.0000 4 195 1365 6975 1275 "Domain-0"\001 -4 0 0 50 -1 0 18 0.0000 4 195 585 6975 2175 "fc4"\001 -4 0 0 50 -1 0 18 0.0000 4 195 540 1275 1755 table\001 -4 0 0 50 -1 0 18 0.0000 4 135 615 1275 2385 name\001 -4 0 0 50 -1 0 18 0.0000 4 195 960 1275 2070 based on\001 -4 0 0 50 -1 0 18 0.0000 4 195 315 2850 5100 ids\001 diff --git a/docs/structures.svg b/docs/structures.svg new file mode 100644 index 00000000000..e52d606ae3e --- /dev/null +++ b/docs/structures.svg @@ -0,0 +1,187 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Domains + +hash + +virDomainPtr + +virConnectionPtr + +domains + +conn + +name + +"Domain-0" + +"fc4" + +table + +name + +based on + +ids + + --=20 2.26.2 From nobody Thu May 2 17:15:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594376946; cv=none; d=zohomail.com; s=zohoarc; b=NRQSfz6aqpIFfY0w2ujjXGmv8fksZwvmK/AWKkqxliLKWmhVaxLPODeKq9ez20IvZCHtFcZJeSHWSMDzkB+HUBhF3cyOA5mA2JBNSzzsj2uniD9Av53L+v3/rJvF1EDrBOhzv/sXGRfV5kRrZ5j06R40XJI2d3+Qs6Y+bhdcgtU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594376946; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=znALihyKb5c6FsewvkauiBC779roL5VIj/oMjZCB+Hk=; b=ca/vc+34G2/x3VB9s2lYDMwL4euDBzHR1R71EzD4KS2CeKEu+MP5MmtWPc3sZ7ICOvvK4sQKVboZU3EGQD/wZxtlBLJnaS5E8dqTxG/OvLmCINr/tBGeyd7HPBqdyRKBeADoYq/DQ9FDZf3OdzCDSmjU8FFHEgv92eoSG8R0sK8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594376946958693.6788414295863; Fri, 10 Jul 2020 03:29:06 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-105-X4U8_7gxOymgGt-2-7SvxQ-1; Fri, 10 Jul 2020 06:28:09 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9B6D7106B24E; Fri, 10 Jul 2020 10:28:03 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 784F510016DA; Fri, 10 Jul 2020 10:28:03 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 4749A1809557; Fri, 10 Jul 2020 10:28:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06AAPDVQ009376 for ; Fri, 10 Jul 2020 06:25:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id A679474F52; Fri, 10 Jul 2020 10:25:13 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 200E774F44 for ; Fri, 10 Jul 2020 10:25:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594376945; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=znALihyKb5c6FsewvkauiBC779roL5VIj/oMjZCB+Hk=; b=UWIs2AXx+hDUk5UN23YPZvN4c8oxgbQXqdl2GSfiWEUgYuomyXppYbEBhY7sDX8hSVR9hs ZWKdhXldr1yAf1JCBOL9Vh2gFUvHB8gfgE/Cg67MIlr+9taC83BOZS70sLuSF7vWGpv5vz CNm/Ebq73xU0sP7GOD5Lh9088ac8gEQ= X-MC-Unique: X4U8_7gxOymgGt-2-7SvxQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH v2 3/5] m4: virt-secdriver-selinux: drop obsolete function checks Date: Fri, 10 Jul 2020 12:25:04 +0200 Message-Id: <3fd1cdcf143c3a8372466a808979b2b4bb473cdd.1594376575.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" All of the listed functions are available in libselinux version 2.2. Our supported OSes start with version 2.5 so there is no need to check it. Signed-off-by: Pavel Hrdina Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: J=C3=A1n Tomko --- m4/virt-secdriver-selinux.m4 | 24 ++---------------------- src/security/security_selinux.c | 18 +++--------------- tests/securityselinuxhelper.c | 6 ------ 3 files changed, 5 insertions(+), 43 deletions(-) diff --git a/m4/virt-secdriver-selinux.m4 b/m4/virt-secdriver-selinux.m4 index a48569fc33a..4174249a510 100644 --- a/m4/virt-secdriver-selinux.m4 +++ b/m4/virt-secdriver-selinux.m4 @@ -32,28 +32,8 @@ AC_DEFUN([LIBVIRT_SECDRIVER_CHECK_SELINUX], [ AC_MSG_ERROR([You must install the libselinux development package an= d enable SELinux with the --with-selinux=3Dyes in order to compile libvirt = --with-secdriver-selinux=3Dyes]) fi elif test "$with_secdriver_selinux" !=3D "no"; then - old_CFLAGS=3D"$CFLAGS" - old_LIBS=3D"$LIBS" - CFLAGS=3D"$CFLAGS $SELINUX_CFLAGS" - LIBS=3D"$CFLAGS $SELINUX_LIBS" - - fail=3D0 - AC_CHECK_FUNC([selinux_virtual_domain_context_path], [], [fail=3D1]) - AC_CHECK_FUNC([selinux_virtual_image_context_path], [], [fail=3D1]) - AC_CHECK_FUNCS([selinux_lxc_contexts_path]) - CFLAGS=3D"$old_CFLAGS" - LIBS=3D"$old_LIBS" - - if test "$fail" =3D "1" ; then - if test "$with_secdriver_selinux" =3D "check" ; then - with_secdriver_selinux=3Dno - else - AC_MSG_ERROR([You must install libselinux development package >=3D= 2.0.82 in order to compile libvirt --with-secdriver-selinux=3Dyes]) - fi - else - with_secdriver_selinux=3Dyes - AC_DEFINE_UNQUOTED([WITH_SECDRIVER_SELINUX], 1, [whether SELinux sec= urity driver is available]) - fi + with_secdriver_selinux=3Dyes + AC_DEFINE_UNQUOTED([WITH_SECDRIVER_SELINUX], 1, [whether SELinux secur= ity driver is available]) fi AM_CONDITIONAL([WITH_SECDRIVER_SELINUX], [test "$with_secdriver_selinux"= !=3D "no"]) ]) diff --git a/src/security/security_selinux.c b/src/security/security_selinu= x.c index f8c1a0a2f1a..67dc6ce09a4 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -639,7 +639,6 @@ virSecuritySELinuxGenNewContext(const char *basecontext, } =20 =20 -#ifdef HAVE_SELINUX_LXC_CONTEXTS_PATH static int virSecuritySELinuxLXCInitialize(virSecurityManagerPtr mgr) { @@ -702,15 +701,6 @@ virSecuritySELinuxLXCInitialize(virSecurityManagerPtr = mgr) virHashFree(data->mcs); return -1; } -#else -static int -virSecuritySELinuxLXCInitialize(virSecurityManagerPtr mgr G_GNUC_UNUSED) -{ - virReportSystemError(ENOSYS, "%s", - _("libselinux does not support LXC contexts path"= )); - return -1; -} -#endif =20 =20 static int @@ -1018,11 +1008,9 @@ virSecuritySELinuxDriverProbe(const char *virtDriver) if (is_selinux_enabled() <=3D 0) return SECURITY_DRIVER_DISABLE; =20 - if (virtDriver && STREQ(virtDriver, "LXC")) { -#if HAVE_SELINUX_LXC_CONTEXTS_PATH - if (!virFileExists(selinux_lxc_contexts_path())) -#endif - return SECURITY_DRIVER_DISABLE; + if (virtDriver && STREQ(virtDriver, "LXC") && + !virFileExists(selinux_lxc_contexts_path())) { + return SECURITY_DRIVER_DISABLE; } =20 return SECURITY_DRIVER_ENABLE; diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c index 0556241fd55..c3d7f8c1cee 100644 --- a/tests/securityselinuxhelper.c +++ b/tests/securityselinuxhelper.c @@ -48,9 +48,7 @@ static int (*real_is_selinux_enabled)(void); static const char *(*real_selinux_virtual_domain_context_path)(void); static const char *(*real_selinux_virtual_image_context_path)(void); =20 -#ifdef HAVE_SELINUX_LXC_CONTEXTS_PATH static const char *(*real_selinux_lxc_contexts_path)(void); -#endif =20 static struct selabel_handle *(*real_selabel_open)(unsigned int backend, const struct selinux_opt= *opts, @@ -73,9 +71,7 @@ static void init_syms(void) VIR_MOCK_REAL_INIT(selinux_virtual_domain_context_path); VIR_MOCK_REAL_INIT(selinux_virtual_image_context_path); =20 -#ifdef HAVE_SELINUX_LXC_CONTEXTS_PATH VIR_MOCK_REAL_INIT(selinux_lxc_contexts_path); -#endif =20 VIR_MOCK_REAL_INIT(selabel_open); VIR_MOCK_REAL_INIT(selabel_close); @@ -273,7 +269,6 @@ const char *selinux_virtual_image_context_path(void) return abs_srcdir "/securityselinuxhelperdata/virtual_image_context"; } =20 -#ifdef HAVE_SELINUX_LXC_CONTEXTS_PATH const char *selinux_lxc_contexts_path(void) { init_syms(); @@ -283,7 +278,6 @@ const char *selinux_lxc_contexts_path(void) =20 return abs_srcdir "/securityselinuxhelperdata/lxc_contexts"; } -#endif =20 struct selabel_handle * selabel_open(unsigned int backend, --=20 2.26.2 From nobody Thu May 2 17:15:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594377067; cv=none; d=zohomail.com; s=zohoarc; b=ezPky/gxdKLA2f0tftWji43MJVdPxLXPPXP4/E1MVHE8jj7QcT/1m4qB5CAN1Z7MIx54svKeAqLAse3IPFaE23U1uluhR5prDs8Oftk7ZXOx7l822wFgv+xzPBR9RjhX4eWqupYyv6Fx8jPLq8vWGJ7DSJ4HfbpHbYiT4PPAQ5c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594377067; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gaYCpjCjfe7gzVs9MDrNbkgo2fDYvO9FMhxLsyhk/sA=; b=Xnqmq/Hwn5X7HCqY7zYB1rAR3XPDpxdN/J6c4jcgGtkMX/Y0eB9bpVd6h1Ymt0KH0VHt68lEccUFA+uAxoBILjmFVyUu4Dv/ZNvibHi/srjng3UkWR+Z5KkxLsUwPDzlImCgLVIwmttOlrSCjW3Z9Q458HPpw3Subjt6QCvZtK0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1594377067468394.75656523769715; Fri, 10 Jul 2020 03:31:07 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-306-yWDWo68BNCStHDmv7fllCA-1; Fri, 10 Jul 2020 06:28:56 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 77CBC10059B1; Fri, 10 Jul 2020 10:28:49 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 54E906FEF4; Fri, 10 Jul 2020 10:28:49 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 231F91806B0B; Fri, 10 Jul 2020 10:28:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06AAPEnp009387 for ; Fri, 10 Jul 2020 06:25:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8E6A674F44; Fri, 10 Jul 2020 10:25:14 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 089F174F56 for ; Fri, 10 Jul 2020 10:25:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594377066; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=gaYCpjCjfe7gzVs9MDrNbkgo2fDYvO9FMhxLsyhk/sA=; b=Nd3zl+0KMdZmtOrkJCtNHarC4rteQXfuTZasoC/HARl7nHcHsxC0xeJohdy8SVHYe2r8PY Du5NfEAOGYWmmOQ8W0yu1vtGg8U3SKtNTHfhIDwf6esAjiLz2CHyR9FFR86Kqbvtm/NUCF n83vUXPcSG1JOYBvgWuIEoZfFBERTaI= X-MC-Unique: yWDWo68BNCStHDmv7fllCA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH v2 4/5] m4: virt-xdr: rewrite XDR check Date: Fri, 10 Jul 2020 12:25:05 +0200 Message-Id: <217649e560f644188fef1707a4f922b1ddb421bd.1594376575.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The current code to check XDR support was obsolete and way to complicated. On linux we can use pkg-config to check for libtirpc and have the CFLAGS and LIBS configured by it as well. On MinGW there is portablexdr library which installs header files directly into system include directory. On FreeBSD and macOS XDR functions are part of libc so there is no library needed, we just need to call AM_CONDITIONAL to silence configure which otherwise complains about missing WITH_XDR. Signed-off-by: Pavel Hrdina --- libvirt.spec.in | 4 ++++ m4/virt-xdr.m4 | 39 +++++++++++-------------------------- src/Makefile.am | 4 +++- src/admin/Makefile.inc.am | 1 + src/locking/Makefile.inc.am | 2 ++ src/logging/Makefile.inc.am | 1 + src/remote/Makefile.inc.am | 1 + 7 files changed, 23 insertions(+), 29 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 9f24e06aa46..6413d0e4e7a 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -406,8 +406,12 @@ BuildRequires: wireshark-devel >=3D 2.4.0 BuildRequires: libssh-devel >=3D 0.7.0 %endif =20 +# On RHEL-7 rpcgen is still part of glibc-common package %if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: rpcgen +%endif + +%if 0%{?fedora} || 0%{?rhel} BuildRequires: libtirpc-devel %endif =20 diff --git a/m4/virt-xdr.m4 b/m4/virt-xdr.m4 index 83754157d9a..09d0c2ba2f4 100644 --- a/m4/virt-xdr.m4 +++ b/m4/virt-xdr.m4 @@ -18,37 +18,20 @@ dnl . dnl =20 AC_DEFUN([LIBVIRT_CHECK_XDR], [ - with_xdr=3D"no" if test x"$with_remote" =3D x"yes" || test x"$with_libvirtd" =3D x"yes";= then - dnl Where are the XDR functions? - dnl If portablexdr is installed, prefer that. - dnl Otherwise try -lxdr (some MinGW) - dnl -ltirpc (glibc 2.13.90 or newer) or none (most Unix) - AC_CHECK_LIB([portablexdr],[xdrmem_create],[],[ - AC_SEARCH_LIBS([xdrmem_create],[xdr tirpc],[], - [AC_MSG_ERROR([Cannot find a XDR library])]) - ]) + dnl On MinGW portablexdr provides XDR functions, on linux they are + dnl provided by libtirpc and on FreeBSD/macOS there is no need to + dnl use extra library as it's provided by libc directly. + with_xdr=3D"yes" =20 - dnl Recent glibc requires -I/usr/include/tirpc for - old_CFLAGS=3D$CFLAGS - AC_CACHE_CHECK([where to find ], [lv_cv_xdr_cflags], [ - for add_CFLAGS in '' '-I/usr/include/tirpc' 'missing'; do - if test x"$add_CFLAGS" =3D xmissing; then - lv_cv_xdr_cflags=3Dmissing; break - fi - CFLAGS=3D"$old_CFLAGS $add_CFLAGS" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include - ]])], [lv_cv_xdr_cflags=3D${add_CFLAGS:-none}; break]) - done - ]) - CFLAGS=3D$old_CFLAGS - case $lv_cv_xdr_cflags in - none) XDR_CFLAGS=3D ;; - missing) AC_MSG_ERROR([Unable to find ]) ;; - *) XDR_CFLAGS=3D$lv_cv_xdr_cflags ;; - esac - AC_SUBST([XDR_CFLAGS]) + if test "$with_win" =3D "yes"; then + LIBVIRT_CHECK_LIB([XDR], [portablexdr], [xdrmem_create], [rpc/rpc.h]) + elif test "$with_linux" =3D "yes"; then + LIBVIRT_CHECK_PKG([XDR], [libtirpc], [0.1.10]) + else + AM_CONDITIONAL([WITH_XDR], [test "x$with_xdr" =3D "xyes"]) + fi fi ]) =20 diff --git a/src/Makefile.am b/src/Makefile.am index 57e1d4d95b3..834e356b68b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -434,7 +434,9 @@ libvirt_la_LDFLAGS =3D \ $(AM_LDFLAGS) \ $(NULL) libvirt_la_LIBADD +=3D \ - $(DLOPEN_LIBS) + $(DLOPEN_LIBS) \ + $(XDR_LIBS) \ + $(NULL) libvirt_la_CFLAGS =3D -DIN_LIBVIRT $(AM_CFLAGS) # Because we specify libvirt_la_DEPENDENCIES for $(LIBVIRT_SYMBOL_FILE), we # lose automake's automatic dependencies on an appropriate subset of diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am index 0a9717adec6..8556a3b8523 100644 --- a/src/admin/Makefile.inc.am +++ b/src/admin/Makefile.inc.am @@ -72,6 +72,7 @@ libvirt_admin_la_LDFLAGS =3D \ =20 libvirt_admin_la_LIBADD =3D \ libvirt.la \ + $(XDR_LIBS) \ $(CAPNG_LIBS) \ $(YAJL_LIBS) \ $(DEVMAPPER_LIBS) \ diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index d1bf49cd3fb..ab01d8e0482 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -120,6 +120,7 @@ lockd_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) lockd_la_LIBADD =3D \ libvirt.la \ $(GLIB_LIBS) \ + $(XDR_LIBS) \ $(NULL) augeas_DATA +=3D locking/libvirt_lockd.aug if WITH_DTRACE_PROBES @@ -161,6 +162,7 @@ virtlockd_CFLAGS =3D \ virtlockd_LDFLAGS =3D \ $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ + $(XDR_LIBS) \ $(NO_UNDEFINED_LDFLAGS) \ $(NULL) virtlockd_LDADD =3D \ diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am index 64023aa672c..873e6029dd5 100644 --- a/src/logging/Makefile.inc.am +++ b/src/logging/Makefile.inc.am @@ -98,6 +98,7 @@ virtlogd_CFLAGS =3D \ virtlogd_LDFLAGS =3D \ $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ + $(XDR_LIBS) \ $(NO_UNDEFINED_LDFLAGS) \ $(NULL) virtlogd_LDADD =3D \ diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 5b8eb59bab3..80f4aad7828 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -64,6 +64,7 @@ REMOTE_DAEMON_LD_ADD =3D \ $(LIBXML_LIBS) \ $(GNUTLS_LIBS) \ $(SASL_LIBS) \ + $(XDR_LIBS) \ $(DBUS_LIBS) \ $(LIBNL_LIBS) \ $(NULL) --=20 2.26.2 From nobody Thu May 2 17:15:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594376947; cv=none; d=zohomail.com; s=zohoarc; b=e9G5sX5+QoXAXt/WEjUKP6gy3gohYO3/MV/gqfoPOS3/17+qswlZwQDlCahdtxn7+ZfawG/UZ1XyfsE44ZgJmQwuzaG9OSVpue/xX7+aonPJnNeHfO3kVLHqAKAQQhZjZMDowMSQr4V9uLmVbPS1yp/U2n2lqHHB9OO9li1PojU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594376947; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mii2kz1UKOB7rZyxMZOX7Wou2nbd+iHmTR3aIqBUoEc=; b=A5NxLlvVyQ2/UflWxEzgCqQXfKynLNxeY3hI3jZ8wOPkqzj+iJJmv8FtOYzzKlJ+/FDeH+Fq4nEMP6ps2RoNFXSRG7WzseL5Ft7rPoW1oGxUDVRkOsdjnU0pYsff5PeQBh1LyQo+rcgUlwMguzL7L5r77p0OASn39fLQZd9gyCg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594376947348464.7300032575023; Fri, 10 Jul 2020 03:29:07 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-462-6hmKnrSNOJ2VqvEw5tXfUQ-1; Fri, 10 Jul 2020 06:28:30 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3210B10059B0; Fri, 10 Jul 2020 10:28:24 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 119E278A3C; Fri, 10 Jul 2020 10:28:24 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D624893F8F; Fri, 10 Jul 2020 10:28:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06AAPFlg009394 for ; Fri, 10 Jul 2020 06:25:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7FF4274F52; Fri, 10 Jul 2020 10:25:15 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id E44EA74F44 for ; Fri, 10 Jul 2020 10:25:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594376946; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=mii2kz1UKOB7rZyxMZOX7Wou2nbd+iHmTR3aIqBUoEc=; b=Gqp1wYMc6Istt8tDkWdd4pnsEytpwH6u/KCl1GgiAO4bM+7rFbmkoC7NwkyOpcOT3pC1RM 2s5M6zYWRtT5I2RV2lW00Gszn6Fk+xrpsA52pCqWgGP+A4J4yg19ODdHAtoYRECwX/ZSDD bwBklJSFavNYPbt0S9SLtm0joLxLGgk= X-MC-Unique: 6hmKnrSNOJ2VqvEw5tXfUQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH v2 5/5] wireshark: fix compilation errors Date: Fri, 10 Jul 2020 12:25:06 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" With meson introduction which is using the same CFLAGS for the whole project some compilation errors were discovered. The wireshark plugin library is the only one in tools directory that is not using AM_CFLAGS. With the AM_CFLAGS we get these errors: ../../tools/wireshark/src/packet-libvirt.c: In function 'dissect_libvirt_fd= s': ../../tools/wireshark/src/packet-libvirt.c:348:31: error: unused parameter = 'tvb' [-Werror=3Dunused-parameter] 348 | dissect_libvirt_fds(tvbuff_t *tvb, gint start, gint32 nfds) | ~~~~~~~~~~^~~ ../../tools/wireshark/src/packet-libvirt.c:348:41: error: unused parameter = 'start' [-Werror=3Dunused-parameter] 348 | dissect_libvirt_fds(tvbuff_t *tvb, gint start, gint32 nfds) | ~~~~~^~~~~ ../../tools/wireshark/src/packet-libvirt.c:348:55: error: unused parameter = 'nfds' [-Werror=3Dunused-parameter] 348 | dissect_libvirt_fds(tvbuff_t *tvb, gint start, gint32 nfds) | ~~~~~~~^~~~ At top level: ../../tools/wireshark/src/packet-libvirt.c:64:5: error: 'dissect_xdr_bool' = defined but not used [-Werror=3Dunused-function] 64 | dissect_xdr_##xtype(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs,= int hf) \ | ^~~~~~~~~~~~ ../../tools/wireshark/src/packet-libvirt.c:88:1: note: in expansion of macr= o 'XDR_PRIMITIVE_DISSECTOR' 88 | XDR_PRIMITIVE_DISSECTOR(bool, bool_t, boolean) | ^~~~~~~~~~~~~~~~~~~~~~~ ../../tools/wireshark/src/packet-libvirt.c:64:5: error: 'dissect_xdr_float'= defined but not used [-Werror=3Dunused-function] 64 | dissect_xdr_##xtype(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs,= int hf) \ | ^~~~~~~~~~~~ ../../tools/wireshark/src/packet-libvirt.c:86:1: note: in expansion of macr= o 'XDR_PRIMITIVE_DISSECTOR' 86 | XDR_PRIMITIVE_DISSECTOR(float, gfloat, float) | ^~~~~~~~~~~~~~~~~~~~~~~ ../../tools/wireshark/src/packet-libvirt.c:64:5: error: 'dissect_xdr_short'= defined but not used [-Werror=3Dunused-function] 64 | dissect_xdr_##xtype(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs,= int hf) \ | ^~~~~~~~~~~~ ../../tools/wireshark/src/packet-libvirt.c:80:1: note: in expansion of macr= o 'XDR_PRIMITIVE_DISSECTOR' 80 | XDR_PRIMITIVE_DISSECTOR(short, gint16, int) | ^~~~~~~~~~~~~~~~~~~~~~~ ../../tools/wireshark/src/packet-libvirt.c: In function 'dissect_libvirt_me= ssage': ../../tools/wireshark/src/packet-libvirt.c:423:34: error: null pointer dere= ference [-Werror=3Dnull-dereference] 423 | vir_xdr_dissector_t xd =3D find_payload_dissector(proc, typ= e, get_program_data(prog, VIR_PROGRAM_DISSECTORS), | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~= ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 424 | *(gsize *)g= et_program_data(prog, VIR_PROGRAM_DISSECTORS_LEN)); | ~~~~~~~~~~~= ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- src/internal.h | 4 ++++ tools/Makefile.am | 2 +- tools/wireshark/src/packet-libvirt.c | 17 ++++++++++++++--- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/internal.h b/src/internal.h index c054e3ce96f..3bab6b4bfe0 100644 --- a/src/internal.h +++ b/src/internal.h @@ -174,6 +174,10 @@ _Pragma ("GCC diagnostic push") #endif =20 +#define VIR_WARNINGS_NO_UNUSED_FUNCTION \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wunused-function\"") + /* Workaround bogus GCC 6.0 for logical 'or' equal expression warnings. * (GCC bz 69602) */ #if BROKEN_GCC_WLOGICALOP_EQUAL_EXPR diff --git a/tools/Makefile.am b/tools/Makefile.am index 53df930e0ac..eb8f269b486 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -378,7 +378,7 @@ if WITH_WIRESHARK_DISSECTOR =20 ws_plugin_LTLIBRARIES =3D wireshark/src/libvirt.la wireshark_src_libvirt_la_CFLAGS =3D \ - -I wireshark/src $(WIRESHARK_DISSECTOR_CFLAGS) $(XDR_CFLAGS) + -I wireshark/src $(WIRESHARK_DISSECTOR_CFLAGS) $(XDR_CFLAGS) $(AM_CFLAGS) wireshark_src_libvirt_la_LDFLAGS =3D -avoid-version -module wireshark_src_libvirt_la_SOURCES =3D \ wireshark/src/packet-libvirt.h \ diff --git a/tools/wireshark/src/packet-libvirt.c b/tools/wireshark/src/pac= ket-libvirt.c index 20b7a3ec812..2b499d2cf29 100644 --- a/tools/wireshark/src/packet-libvirt.c +++ b/tools/wireshark/src/packet-libvirt.c @@ -75,6 +75,8 @@ static gint ett_libvirt_stream_hole =3D -1; } \ } =20 +VIR_WARNINGS_NO_UNUSED_FUNCTION + XDR_PRIMITIVE_DISSECTOR(int, gint32, int) XDR_PRIMITIVE_DISSECTOR(u_int, guint32, uint) XDR_PRIMITIVE_DISSECTOR(short, gint16, int) @@ -87,6 +89,8 @@ XDR_PRIMITIVE_DISSECTOR(float, gfloat, float) XDR_PRIMITIVE_DISSECTOR(double, gdouble, double) XDR_PRIMITIVE_DISSECTOR(bool, bool_t, boolean) =20 +VIR_WARNINGS_RESET + typedef gboolean (*vir_xdr_dissector_t)(tvbuff_t *tvb, proto_tree *tree, X= DR *xdrs, int hf); =20 typedef struct vir_dissector_index vir_dissector_index_t; @@ -345,7 +349,9 @@ dissect_libvirt_num_of_fds(tvbuff_t *tvb, proto_tree *t= ree) } =20 static void -dissect_libvirt_fds(tvbuff_t *tvb, gint start, gint32 nfds) +dissect_libvirt_fds(tvbuff_t *tvb G_GNUC_UNUSED, + gint start G_GNUC_UNUSED, + gint32 nfds G_GNUC_UNUSED) { /* TODO: NOP for now */ } @@ -420,8 +426,13 @@ dissect_libvirt_payload(tvbuff_t *tvb, proto_tree *tre= e, return; /* No payload */ =20 if (status =3D=3D VIR_NET_OK) { - vir_xdr_dissector_t xd =3D find_payload_dissector(proc, type, get_= program_data(prog, VIR_PROGRAM_DISSECTORS), - *(gsize *)get_prog= ram_data(prog, VIR_PROGRAM_DISSECTORS_LEN)); + const vir_dissector_index_t *pds =3D get_program_data(prog, VIR_PR= OGRAM_DISSECTORS); + const gsize *len =3D get_program_data(prog, VIR_PROGRAM_DISSECTORS= _LEN); + + if (!len) + goto unknown; + + vir_xdr_dissector_t xd =3D find_payload_dissector(proc, type, pds,= *len); if (xd =3D=3D NULL) goto unknown; dissect_libvirt_payload_xdr_data(tvb, tree, payload_length, status= , xd); --=20 2.26.2