article: replace more occurences of KVM by QEMU

vincentbernat · Jun 25, 2016 · 78a0bfc · 78a0bfc
1 parent aa65951
commit 78a0bfc
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 20 deletions.
diff --git a/content/en/blog/2012-multicast-vxlan.html b/content/en/blog/2012-multicast-vxlan.html
@@ -1,6 +1,6 @@
 ---
 title: "Network virtualization with VXLAN"
-keywords: "vxlan, network, virtual, sdn, multicast, xorp, linux, kvm"
+keywords: "vxlan, network, virtual, sdn, multicast, xorp, linux, kvm, qemu"
 uuid: 7502d803-3f6a-409f-b590-f8e1eb34eb0a
 attachments:
  "https://github.com/vincentbernat/network-lab/tree/master/lab-vxlan": "GitHub repository"
@@ -54,7 +54,7 @@
 do not make use of PIM-SM. Instead, they have a generic multicast route
 on `eth0`. `E1`, `E2` and `E3` are edge routers while `C1`, `C2` and
 `C3` are core routers. The proposed lab is not resilient but
-convenient to explain how things work. It is built on top of KVM
+convenient to explain how things work. It is built on top of QEMU
 hosts. Have a look at my [previous article][] for more details on
 this.
 
@@ -67,7 +67,7 @@
 you need a recent version of `ip`.
 
     ::console
-    $ sudo apt-get install screen vde2 kvm iproute xorp git
+    $ sudo apt-get install screen vde2 qemu-system-x86 iproute xorp git
     $ git clone git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git
     $ cd iproute2
     $ ./configure && make
@@ -402,7 +402,7 @@
 [xorp-pimsm]: http://xorp.run.montefiore.ulg.ac.be/latex2wiki/user_manual/pim_sparse_mode "XORP documentation on PIM-SM"
 [xorp-igmp]: http://xorp.run.montefiore.ulg.ac.be/latex2wiki/user_manual/igmp_and_mld "XORP documentation on IGMP and MLD"
 [GitHub]: https://github.com/vincentbernat/network-lab/tree/master/lab-vxlan "VXLAN lab"
-[previous article]: [[en/blog/2012-network-lab-kvm.html]] "Network lab with KVM"
+[previous article]: [[en/blog/2012-network-lab-kvm.html]] "Network lab with QEMU"
 [XORP]: http://www.xorp.org/ "XORP: Extensible open source routing platform"
 [upa-vxlan]: https://github.com/upa/vxlan/ "VXLAN implementation using Linux tap interfaces"
 [vxlan-ipv6]: http://www.spinics.net/lists/netdev/msg214956.html "Plan for adding IPv6 support for VXLAN in Linux"

diff --git a/content/en/blog/2012-network-lab-kvm.html b/content/en/blog/2012-network-lab-kvm.html
@@ -78,7 +78,7 @@
 (`$LINUX` is the appropriate `bzImage`):
 
     ::sh
-    kvm \
+    qemu-system-x86_64 \
       -m 256m \
       -display none \
       -nodefconfig -no-user-config -nodefaults \
@@ -157,7 +157,7 @@
 the guest:
 
     ::sh
-    kvm \
+    qemu-system-x86_64 \
       ${PREVIOUS_ARGS} \
       -fsdev local,security_model=passthrough,id=fsdev-root,path=${ROOT},readonly \
       -device virtio-9p-pci,id=fs-root,fsdev=fsdev-root,mount_tag=rootshare
@@ -233,7 +233,7 @@
 You have to export your `${HOME}` and the lab directory from host:
 
     ::sh
-    kvm \
+    qemu-system-x86_64 \
       ${PREVIOUS_ARGS} \
       -fsdev local,security_model=passthrough,id=fsdev-root,path=${ROOT},readonly \
       -device virtio-9p-pci,id=fs-root,fsdev=fsdev-root,mount_tag=rootshare \
@@ -263,7 +263,7 @@
     ::sh
     mac=$(echo $name-$net | sha1sum | \
                 awk '{print "52:54:" substr($1,0,2) ":" substr($1, 2, 2) ":" substr($1, 4, 2) ":" substr($1, 6, 2)}')
-    kvm \
+    qemu-system-x86_64 \
       ${PREVIOUS_ARGS} \
       -net nic,model=virtio,macaddr=$mac,vlan=$net \
       -net vde,sock=$TMP/switch-$net.sock,vlan=$net
@@ -286,7 +286,7 @@
 QEMU.
 
     ::sh
-    kvm \
+    qemu-system-x86_64 \
       ${PREVIOUS_ARGS} \
       -gdb unix:$TMP/vm-$name-gdb.pipe,server,nowait
 
@@ -323,7 +323,7 @@
 debugging, that's quite easy. Add a new serial port to QEMU:
 
     ::sh
-    kvm \
+    qemu-system-x86_64 \
       ${PREVIOUS_ARGS} \
       -chardev socket,id=charserial1,path=$TMP/vm-$name-serial.pipe,server,nowait \
       -device isa-serial,chardev=charserial1,id=serial1

diff --git a/content/fr/blog/2012-lab-reseau-kvm.html b/content/fr/blog/2012-lab-reseau-kvm.html
@@ -80,7 +80,7 @@
 Il est ensuite possible de faire démarrer ce noyau :
 
     ::sh
-    kvm \
+    qemu-system-x86_64 \
       -m 256m \
       -display none \
       -nodefconfig -no-user-config -nodefaults \
@@ -162,7 +162,7 @@
 l'hôte au système invité :
 
     ::sh
-    kvm \
+    qemu-system-x86_64 \
       ${PREVIOUS_ARGS} \
       -fsdev local,security_model=passthrough,id=fsdev-root,path=${ROOT},readonly \
       -device virtio-9p-pci,id=fs-root,fsdev=fsdev-root,mount_tag=rootshare
@@ -235,7 +235,7 @@
 contenant le labo :
 
     ::sh
-    kvm \
+    qemu-system-x86_64 \
       ${PREVIOUS_ARGS} \
       -fsdev local,security_model=passthrough,id=fsdev-root,path=${ROOT},readonly \
       -device virtio-9p-pci,id=fs-root,fsdev=fsdev-root,mount_tag=rootshare \
@@ -265,7 +265,7 @@
     ::sh
     mac=$(echo $name-$net | sha1sum | \
                 awk '{print "52:54:" substr($1,0,2) ":" substr($1, 2, 2) ":" substr($1, 4, 2) ":" substr($1, 6, 2)}')
-    kvm \
+    qemu-system-x86_64 \
       ${PREVIOUS_ARGS} \
       -net nic,model=virtio,macaddr=$mac,vlan=$net \
       -net vde,sock=$TMP/switch-$net.sock,vlan=$net
@@ -288,7 +288,7 @@
 d'utilisation.
 
     ::sh
-    kvm \
+    qemu-system-x86_64 \
       ${PREVIOUS_ARGS} \
       -gdb unix:$TMP/vm-$name-gdb.pipe,server,nowait
 
@@ -327,7 +327,7 @@
 distance. Ajoutons un port série à QEMU :
 
     ::sh
-    kvm \
+    qemu-system-x86_64 \
       ${PREVIOUS_ARGS} \
       -chardev socket,id=charserial1,path=$TMP/vm-$name-serial.pipe,server,nowait \
       -device isa-serial,chardev=charserial1,id=serial1

diff --git a/content/fr/blog/2012-multicast-vxlan.html b/content/fr/blog/2012-multicast-vxlan.html
@@ -1,6 +1,6 @@
 ---
 title: "Réseaux virtuels avec VXLAN"
-keywords: "vxlan, réseau, virtualisation, sdn, multicast, xorp, linux, kvm"
+keywords: "vxlan, réseau, virtualisation, sdn, multicast, xorp, linux, kvm, qemu"
 uuid: 7502d803-3f6a-409f-b590-f8e1eb34eb0a
 attachments:
  "https://github.com/vincentbernat/network-lab/tree/master/lab-vxlan": "Dépôt GitHub"
@@ -63,7 +63,7 @@
 que `C1`, `C2` et `C3` sont les routeurs de cœur. Le réseau ainsi
 construit n'est pas résilient mais il est assez pratique pour
 expliquer les concepts essentiels. Le labo s'appuie sur des machines
-KVM. Mon [article précédent][] contient plus de détails à ce sujet.
+QEMU. Mon [article précédent][] contient plus de détails à ce sujet.
 
 ![Labo VXLAN][1]
 [1]: [[!!images/vxlan/lab.png]] "Topologie du labo VXLAN"
@@ -75,7 +75,7 @@
 récente de la commande `ip`.
 
     ::console
-    $ sudo apt-get install screen vde2 kvm iproute xorp git
+    $ sudo apt-get install screen vde2 qemu-system-x86 iproute xorp git
     $ git clone git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git
     $ cd iproute2
     $ ./configure && make
@@ -417,7 +417,7 @@
 [xorp-pimsm]: http://xorp.run.montefiore.ulg.ac.be/latex2wiki/user_manual/pim_sparse_mode "Documentation de XORP pour PIM-SM"
 [xorp-igmp]: http://xorp.run.montefiore.ulg.ac.be/latex2wiki/user_manual/igmp_and_mld "Documentation de XORP pour IGMP et MLD"
 [GitHub]: https://github.com/vincentbernat/network-lab/tree/master/lab-vxlan "Lab VXLAN"
-[article précédent]: [[fr/blog/2012-lab-reseau-kvm.html]] "Labo virtuel avec KVM"
+[article précédent]: [[fr/blog/2012-lab-reseau-kvm.html]] "Labo virtuel avec QEMU"
 [XORP]: http://www.xorp.org/ "XORP: Extensible open source routing platform"
 [upa-vxlan]: https://github.com/upa/vxlan/ "VXLAN implementation using Linux tap interfaces"
 [vxlan-ipv6]: http://www.spinics.net/lists/netdev/msg214956.html "Plan for adding IPv6 support for VXLAN in Linux"