diff --git a/0001-redhat-Adding-slirp-to-the-exploded-tree.patch b/0001-redhat-Adding-slirp-to-the-exploded-tree.patch index 9d73fb7..632d69e 100644 --- a/0001-redhat-Adding-slirp-to-the-exploded-tree.patch +++ b/0001-redhat-Adding-slirp-to-the-exploded-tree.patch @@ -1,4 +1,4 @@ -From 6527eafb590d72354bb02662f95d7603cd3a3fd3 Mon Sep 17 00:00:00 2001 +From effec13a9f842205be3526bcfb15e2068c0067b0 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Thu, 23 Apr 2020 05:26:54 +0200 Subject: redhat: Adding slirp to the exploded tree diff --git a/0005-Initial-redhat-build.patch b/0005-Initial-redhat-build.patch index 7a562ab..696916e 100644 --- a/0005-Initial-redhat-build.patch +++ b/0005-Initial-redhat-build.patch @@ -1,4 +1,4 @@ -From b9d95992b85d3667c13df3a321933c44c7157d0b Mon Sep 17 00:00:00 2001 +From 9f51ea3d645d7da3eaf55f3e5cedc4cd42981efc Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Fri, 12 Oct 2018 07:31:11 +0200 Subject: Initial redhat build @@ -11,7 +11,7 @@ several issues are fixed in QEMU tree: - Man page renamed from qemu to qemu-kvm - man page is installed using make install so we have to fix it in qemu tree -This rebase includes changes up to qemu-kvm-4.2.0-28.el8 +This rebase includes changes up to qemu-kvm-4.2.0-29.el8 Rebase notes (3.1.0): - added new configure options @@ -133,13 +133,13 @@ Merged patches (weekly-200617): redhat/Makefile | 86 + redhat/Makefile.common | 53 + redhat/README.tests | 39 + - redhat/qemu-kvm.spec.template | 2956 +++++++++++++++++++++++++++++++++++ + redhat/qemu-kvm.spec.template | 2961 +++++++++++++++++++++++++++++++++++ redhat/qemu-pr-helper.service | 2 +- redhat/scripts/extract_build_cmd.py | 2 +- redhat/scripts/process-patches.sh | 7 +- tests/check-block.sh | 2 + ui/vnc.c | 2 +- - 12 files changed, 3145 insertions(+), 9 deletions(-) + 12 files changed, 3150 insertions(+), 9 deletions(-) create mode 100644 redhat/Makefile create mode 100644 redhat/Makefile.common create mode 100644 redhat/README.tests @@ -167,10 +167,10 @@ index b1b8a5a..88b7565 100644 $(INSTALL_DATA) docs/interop/qemu-qmp-ref.7 "$(DESTDIR)$(mandir)/man7" $(INSTALL_DATA) $(MANUAL_BUILDDIR)/system/qemu-block-drivers.7 "$(DESTDIR)$(mandir)/man7" diff --git a/configure b/configure -index 4a22dcd..53979dc 100755 +index ee6c3c6..bd957a5 100755 --- a/configure +++ b/configure -@@ -2596,6 +2596,7 @@ if test "$seccomp" != "no" ; then +@@ -2610,6 +2610,7 @@ if test "$seccomp" != "no" ; then seccomp="no" fi fi @@ -192,10 +192,10 @@ index 8e29c86..e9bcb5a 100755 ret=0 diff --git a/ui/vnc.c b/ui/vnc.c -index 12a1271..89fb616 100644 +index 527ad25..8099c0e 100644 --- a/ui/vnc.c +++ b/ui/vnc.c -@@ -3972,7 +3972,7 @@ void vnc_display_open(const char *id, Error **errp) +@@ -3970,7 +3970,7 @@ void vnc_display_open(const char *id, Error **errp) #ifdef CONFIG_VNC_SASL if (sasl) { diff --git a/0006-Enable-disable-devices-for-RHEL.patch b/0006-Enable-disable-devices-for-RHEL.patch index 50eb1de..0ea7715 100644 --- a/0006-Enable-disable-devices-for-RHEL.patch +++ b/0006-Enable-disable-devices-for-RHEL.patch @@ -1,4 +1,4 @@ -From b1e6c8e2a9b58d215042adbd0fffdf102ac9a9d7 Mon Sep 17 00:00:00 2001 +From c956c1d145adb87a8a830bf6091dac80b7925054 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Mon, 11 Jan 2016 11:53:33 +0100 Subject: Enable/disable devices for RHEL @@ -572,7 +572,7 @@ index fa5c3fa..854094c 100644 smartcard.mo-libs := $(SMARTCARD_LIBS) endif diff --git a/qemu-options.hx b/qemu-options.hx -index 196f468..43b0dbc 100644 +index fa1b19d..b969944 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2248,10 +2248,6 @@ ERST @@ -587,7 +587,7 @@ index 196f468..43b0dbc 100644 DEF("acpitable", HAS_ARG, QEMU_OPTION_acpitable, "-acpitable [sig=str][,rev=n][,oem_id=str][,oem_table_id=str][,oem_rev=n][,asl_compiler_id=str][,asl_compiler_rev=n][,{data|file}=file1[:file2]...]\n" diff --git a/softmmu/vl.c b/softmmu/vl.c -index 3e15ee2..3693dfb 100644 +index 9da2e23..6509057 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -145,7 +145,7 @@ static Chardev **serial_hds; diff --git a/0007-Machine-type-related-general-changes.patch b/0007-Machine-type-related-general-changes.patch index 9933847..5117133 100644 --- a/0007-Machine-type-related-general-changes.patch +++ b/0007-Machine-type-related-general-changes.patch @@ -1,4 +1,4 @@ -From 1266dec11bec3867e8eda3062384b07986a89d3b Mon Sep 17 00:00:00 2001 +From cbbdd67535fc6da1b77b2fa9f5368f72c211eeb1 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Fri, 11 Jan 2019 09:54:45 +0100 Subject: Machine type related general changes @@ -101,7 +101,7 @@ index 7ead029..3b8501f 100644 &pm->disable_s3, OBJ_PROP_FLAG_READWRITE); object_property_add_uint8_ptr(obj, ACPI_PM_PROP_S4_DISABLED, diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c -index 630ca6e..715bc17 100644 +index 283422e..f664201 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -276,6 +276,7 @@ static const VMStateDescription vmstate_acpi = { @@ -124,7 +124,7 @@ index 630ca6e..715bc17 100644 DEFINE_PROP_BOOL("acpi-pci-hotplug-with-bridge-support", PIIX4PMState, use_acpi_hotplug_bridge, true), diff --git a/hw/arm/virt.c b/hw/arm/virt.c -index cd0834c..2e3efd3 100644 +index 7d9f715..e30b837 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1450,7 +1450,7 @@ static void virt_build_smbios(VirtMachineState *vms) @@ -386,7 +386,7 @@ index 3aaeeec..d88f52a 100644 }; diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c -index 1d832b2..82a33b4 100644 +index fae487f..18815e8 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -179,6 +179,8 @@ static void pc_init1(MachineState *machine, @@ -399,7 +399,7 @@ index 1d832b2..82a33b4 100644 } diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c -index 047ea8d..1818d31 100644 +index acd6d40..a1131e6 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -204,6 +204,8 @@ static void pc_q35_init(MachineState *machine) @@ -716,10 +716,10 @@ index 28a5318..ff4a672 100644 #define ACPI_PM_PROP_TCO_ENABLED "enable_tco" diff --git a/include/hw/boards.h b/include/hw/boards.h -index 18815d9..2224fbc 100644 +index 426ce5f..1062df9 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h -@@ -372,4 +372,28 @@ extern const size_t hw_compat_2_2_len; +@@ -373,4 +373,28 @@ extern const size_t hw_compat_2_2_len; extern GlobalProperty hw_compat_2_1[]; extern const size_t hw_compat_2_1_len; @@ -792,7 +792,7 @@ index e29a376..35ac38c 100644 + #endif diff --git a/migration/migration.c b/migration/migration.c -index 481a590..a5a64f9 100644 +index 92e44e0..67d3b75 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -128,6 +128,8 @@ enum mig_rp_message_type { diff --git a/0008-Add-aarch64-machine-types.patch b/0008-Add-aarch64-machine-types.patch index 2d1ab2a..fff091f 100644 --- a/0008-Add-aarch64-machine-types.patch +++ b/0008-Add-aarch64-machine-types.patch @@ -1,4 +1,4 @@ -From 9506867ddf6d00d2dc502f69cfc0d274a2f1040c Mon Sep 17 00:00:00 2001 +From 1f0568a29b004dd3557d5405fddc6979ac5ff911 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Fri, 19 Oct 2018 12:53:31 +0200 Subject: Add aarch64 machine types @@ -49,7 +49,7 @@ Merged patches (4.1.0): 2 files changed, 182 insertions(+), 1 deletion(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c -index 2e3efd3..abbc7d5 100644 +index e30b837..5a45677 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -79,6 +79,7 @@ @@ -127,7 +127,7 @@ index 2e3efd3..abbc7d5 100644 static bool virt_get_highmem(Object *obj, Error **errp) { VirtMachineState *vms = VIRT_MACHINE(obj); -@@ -2339,6 +2384,7 @@ static int virt_kvm_type(MachineState *ms, const char *type_str) +@@ -2367,6 +2412,7 @@ static int virt_kvm_type(MachineState *ms, const char *type_str) return requested_pa_size > 40 ? requested_pa_size : 0; } @@ -135,7 +135,7 @@ index 2e3efd3..abbc7d5 100644 static void virt_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); -@@ -2604,3 +2650,127 @@ static void virt_machine_2_6_options(MachineClass *mc) +@@ -2637,3 +2683,127 @@ static void virt_machine_2_6_options(MachineClass *mc) vmc->no_pmu = true; } DEFINE_VIRT_MACHINE(2, 6) @@ -264,10 +264,10 @@ index 2e3efd3..abbc7d5 100644 +} +DEFINE_RHEL_MACHINE_AS_LATEST(8, 2, 0) diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h -index 31878dd..5582fba 100644 +index 54bcf17..5fdabd8 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h -@@ -157,6 +157,7 @@ typedef struct { +@@ -165,6 +165,7 @@ typedef struct { #define VIRT_ECAM_ID(high) (high ? VIRT_HIGH_PCIE_ECAM : VIRT_PCIE_ECAM) @@ -275,7 +275,7 @@ index 31878dd..5582fba 100644 #define TYPE_VIRT_MACHINE MACHINE_TYPE_NAME("virt") #define VIRT_MACHINE(obj) \ OBJECT_CHECK(VirtMachineState, (obj), TYPE_VIRT_MACHINE) -@@ -165,6 +166,16 @@ typedef struct { +@@ -173,6 +174,16 @@ typedef struct { #define VIRT_MACHINE_CLASS(klass) \ OBJECT_CLASS_CHECK(VirtMachineClass, klass, TYPE_VIRT_MACHINE) diff --git a/0009-Add-ppc64-machine-types.patch b/0009-Add-ppc64-machine-types.patch index 779ee5d..9be23b5 100644 --- a/0009-Add-ppc64-machine-types.patch +++ b/0009-Add-ppc64-machine-types.patch @@ -1,4 +1,4 @@ -From d27b53512182f6aa6d9ccfcaf64e7aab1a064146 Mon Sep 17 00:00:00 2001 +From 59c55f3104aa650b5b2a31150a34646cc7018b77 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Fri, 19 Oct 2018 13:27:13 +0200 Subject: Add ppc64 machine types @@ -42,7 +42,7 @@ Merged patches (weekly-200226): 5 files changed, 307 insertions(+), 1 deletion(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c -index 4c185bc..2fa25b1 100644 +index f6f034d..f30618e 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4530,6 +4530,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) diff --git a/0010-Add-s390x-machine-types.patch b/0010-Add-s390x-machine-types.patch index 8c76c93..bd769c9 100644 --- a/0010-Add-s390x-machine-types.patch +++ b/0010-Add-s390x-machine-types.patch @@ -1,4 +1,4 @@ -From bf565781e2deb548173e7530e29d886f6c1eaad8 Mon Sep 17 00:00:00 2001 +From 92594368e1369e85d1b87dd1a65408a4f594cf09 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Fri, 19 Oct 2018 13:47:32 +0200 Subject: Add s390x machine types @@ -25,10 +25,10 @@ Merged patches (4.2.0): 1 file changed, 70 insertions(+), 1 deletion(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c -index b111406..f1b1722 100644 +index 023fd25..0e8dd62 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c -@@ -774,7 +774,7 @@ bool css_migration_enabled(void) +@@ -778,7 +778,7 @@ bool css_migration_enabled(void) { \ MachineClass *mc = MACHINE_CLASS(oc); \ ccw_machine_##suffix##_class_options(mc); \ @@ -37,7 +37,7 @@ index b111406..f1b1722 100644 if (latest) { \ mc->alias = "s390-ccw-virtio"; \ mc->is_default = true; \ -@@ -798,6 +798,7 @@ bool css_migration_enabled(void) +@@ -802,6 +802,7 @@ bool css_migration_enabled(void) } \ type_init(ccw_machine_register_##suffix) @@ -45,7 +45,7 @@ index b111406..f1b1722 100644 static void ccw_machine_5_1_instance_options(MachineState *machine) { } -@@ -1050,6 +1051,74 @@ static void ccw_machine_2_4_class_options(MachineClass *mc) +@@ -1054,6 +1055,74 @@ static void ccw_machine_2_4_class_options(MachineClass *mc) compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); } DEFINE_CCW_MACHINE(2_4, "2.4", false); diff --git a/0011-Add-x86_64-machine-types.patch b/0011-Add-x86_64-machine-types.patch index c245d3d..4b98372 100644 --- a/0011-Add-x86_64-machine-types.patch +++ b/0011-Add-x86_64-machine-types.patch @@ -1,4 +1,4 @@ -From 04955c10da93ce94d73693a0be07b2a4c81246fe Mon Sep 17 00:00:00 2001 +From 31a74446c5312b248bbc6093f21aee3500b96fca Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Fri, 19 Oct 2018 13:10:31 +0200 Subject: Add x86_64 machine types @@ -42,9 +42,6 @@ Merged patches (weekly-200122): Merged patches (weekly-200318): - e6c3fbf hw/smbios: set new default SMBIOS fields for Windows driver support (partialy) - -Conflicts: - hw/i386/pc_piix.c --- hw/i386/acpi-build.c | 3 + hw/i386/pc.c | 265 ++++++++++++++++++++++++++++++++++++++++++++++++++- @@ -71,10 +68,10 @@ index b7bcbbb..fe815c5 100644 } diff --git a/hw/i386/pc.c b/hw/i386/pc.c -index 4af9679..d17d6f8 100644 +index 61acc9e..fe37bde 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c -@@ -345,6 +345,263 @@ GlobalProperty pc_compat_1_4[] = { +@@ -346,6 +346,263 @@ GlobalProperty pc_compat_1_4[] = { }; const size_t pc_compat_1_4_len = G_N_ELEMENTS(pc_compat_1_4); @@ -338,7 +335,7 @@ index 4af9679..d17d6f8 100644 GSIState *pc_gsi_create(qemu_irq **irqs, bool pci_enabled) { GSIState *s; -@@ -1010,7 +1267,8 @@ void pc_memory_init(PCMachineState *pcms, +@@ -1011,7 +1268,8 @@ void pc_memory_init(PCMachineState *pcms, option_rom_mr = g_malloc(sizeof(*option_rom_mr)); memory_region_init_ram(option_rom_mr, NULL, "pc.rom", PC_ROM_SIZE, &error_fatal); @@ -348,7 +345,7 @@ index 4af9679..d17d6f8 100644 memory_region_set_readonly(option_rom_mr, true); } memory_region_add_subregion_overlap(rom_memory, -@@ -1960,6 +2218,8 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) +@@ -1969,6 +2227,8 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) pcmc->linuxboot_dma_enabled = true; pcmc->pvh_enabled = true; assert(!mc->get_hotplug_handler); @@ -357,7 +354,7 @@ index 4af9679..d17d6f8 100644 mc->get_hotplug_handler = pc_get_hotplug_handler; mc->hotplug_allowed = pc_hotplug_allowed; mc->cpu_index_to_instance_props = x86_cpu_index_to_props; -@@ -1971,7 +2231,8 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) +@@ -1981,7 +2241,8 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) mc->hot_add_cpu = pc_hot_add_cpu; mc->smp_parse = pc_smp_parse; mc->block_default_type = IF_IDE; @@ -368,7 +365,7 @@ index 4af9679..d17d6f8 100644 mc->wakeup = pc_machine_wakeup; hc->pre_plug = pc_machine_device_pre_plug_cb; diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c -index 82a33b4..b195f26 100644 +index 18815e8..eeadd89 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -54,6 +54,7 @@ @@ -398,7 +395,7 @@ index 82a33b4..b195f26 100644 static void pc_compat_2_3_fn(MachineState *machine) { X86MachineState *x86ms = X86_MACHINE(machine); -@@ -991,3 +993,207 @@ static void xenfv_3_1_machine_options(MachineClass *m) +@@ -992,3 +994,207 @@ static void xenfv_3_1_machine_options(MachineClass *m) DEFINE_PC_MACHINE(xenfv, "xenfv-3.1", pc_xen_hvm_init, xenfv_3_1_machine_options); #endif @@ -607,7 +604,7 @@ index 82a33b4..b195f26 100644 +DEFINE_PC_MACHINE(rhel700, "pc-i440fx-rhel7.0.0", pc_init_rhel700, + pc_machine_rhel700_options); diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c -index 1818d31..6c49a50 100644 +index a1131e6..1cd4e15 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -201,8 +201,8 @@ static void pc_q35_init(MachineState *machine) @@ -629,7 +626,7 @@ index 1818d31..6c49a50 100644 static void pc_q35_machine_options(MachineClass *m) { PCMachineClass *pcmc = PC_MACHINE_CLASS(m); -@@ -564,3 +565,160 @@ static void pc_q35_2_4_machine_options(MachineClass *m) +@@ -565,3 +566,160 @@ static void pc_q35_2_4_machine_options(MachineClass *m) DEFINE_Q35_MACHINE(v2_4, "pc-q35-2.4", NULL, pc_q35_2_4_machine_options); @@ -791,13 +788,13 @@ index 1818d31..6c49a50 100644 +DEFINE_PC_MACHINE(q35_rhel730, "pc-q35-rhel7.3.0", pc_q35_init_rhel730, + pc_q35_machine_rhel730_options); diff --git a/include/hw/boards.h b/include/hw/boards.h -index 2224fbc..24c1348 100644 +index 1062df9..c357731 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h -@@ -207,6 +207,8 @@ struct MachineClass { - const char **valid_cpu_types; +@@ -208,6 +208,8 @@ struct MachineClass { strList *allowed_dynamic_sysbus_devices; bool auto_enable_numa_with_memhp; + bool auto_enable_numa_with_memdev; + /* RHEL only */ + bool async_pf_vmexit_disable; void (*numa_auto_assign_ram)(MachineClass *mc, NodeInfo *nodes, diff --git a/0012-Enable-make-check.patch b/0012-Enable-make-check.patch index f12db32..ae2533d 100644 --- a/0012-Enable-make-check.patch +++ b/0012-Enable-make-check.patch @@ -1,4 +1,4 @@ -From 8704d7b6ca7438f10d162caf70572b62509b6341 Mon Sep 17 00:00:00 2001 +From 93f9f7beccd34102c5c8e25c3b2b3888c61aa063 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Fri, 19 Oct 2018 13:48:41 +0200 Subject: Enable make check @@ -82,7 +82,7 @@ index 034d3a3..aadc413 100755 *) ;; diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group -index d886fa0..37dd761 100644 +index 9b07a7e..c678d91 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -92,7 +92,7 @@ diff --git a/0013-vfio-cap-number-of-devices-that-can-be-assigned.patch b/0013-vfio-cap-number-of-devices-that-can-be-assigned.patch index baa4aef..1445da6 100644 --- a/0013-vfio-cap-number-of-devices-that-can-be-assigned.patch +++ b/0013-vfio-cap-number-of-devices-that-can-be-assigned.patch @@ -1,4 +1,4 @@ -From a7132dd3a148a8990ef18b38baa2fb2aa89484b4 Mon Sep 17 00:00:00 2001 +From ac9ff21203ff07854c232464d96e1f35741af8a6 Mon Sep 17 00:00:00 2001 From: Bandan Das Date: Tue, 3 Dec 2013 20:05:13 +0100 Subject: vfio: cap number of devices that can be assigned @@ -41,7 +41,7 @@ Merged patches (2.9.0): 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c -index 6838bcc..ac109b4 100644 +index d020ea9..e4292ea 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -47,6 +47,9 @@ diff --git a/0014-Add-support-statement-to-help-output.patch b/0014-Add-support-statement-to-help-output.patch index 3eadb83..3f8f0ff 100644 --- a/0014-Add-support-statement-to-help-output.patch +++ b/0014-Add-support-statement-to-help-output.patch @@ -1,4 +1,4 @@ -From b87487f40dcc351fb7c31a37b6facbdaab285b0c Mon Sep 17 00:00:00 2001 +From 0f0f3ab53bc61fbf66e546ab6bd22d1a60102b79 Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Wed, 4 Dec 2013 18:53:17 +0100 Subject: Add support statement to -help output @@ -23,7 +23,7 @@ Signed-off-by: Eduardo Habkost 1 file changed, 9 insertions(+) diff --git a/softmmu/vl.c b/softmmu/vl.c -index 3693dfb..9d2e2d3 100644 +index 6509057..8453de5 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -1674,9 +1674,17 @@ static void version(void) diff --git a/0015-globally-limit-the-maximum-number-of-CPUs.patch b/0015-globally-limit-the-maximum-number-of-CPUs.patch index c457bbd..38b9095 100644 --- a/0015-globally-limit-the-maximum-number-of-CPUs.patch +++ b/0015-globally-limit-the-maximum-number-of-CPUs.patch @@ -1,4 +1,4 @@ -From 0aa24293cae6e15d483b9aa34f5c27ace53e478c Mon Sep 17 00:00:00 2001 +From 47faf13d999995693d505074ee73d4908356888b Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Tue, 21 Jan 2014 10:46:52 +0100 Subject: globally limit the maximum number of CPUs @@ -80,10 +80,10 @@ This commit matches the limit to current KVM_CAP_NR_VCPUS value. 2 files changed, 30 insertions(+) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c -index d54a870..aa562c2 100644 +index ab36fbf..6f6bb47 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c -@@ -2089,6 +2089,18 @@ static int kvm_init(MachineState *ms) +@@ -2088,6 +2088,18 @@ static int kvm_init(MachineState *ms) soft_vcpus_limit = kvm_recommended_vcpus(s); hard_vcpus_limit = kvm_max_vcpus(s); @@ -103,7 +103,7 @@ index d54a870..aa562c2 100644 if (nc->num > soft_vcpus_limit) { warn_report("Number of %s cpus requested (%d) exceeds " diff --git a/softmmu/vl.c b/softmmu/vl.c -index 9d2e2d3..accccd8 100644 +index 8453de5..ea6e9e4 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -116,6 +116,8 @@ diff --git a/0016-Add-support-for-simpletrace.patch b/0016-Add-support-for-simpletrace.patch index d42323a..d9e4626 100644 --- a/0016-Add-support-for-simpletrace.patch +++ b/0016-Add-support-for-simpletrace.patch @@ -1,4 +1,4 @@ -From dbf4ed3ddf5439d9563eb408bb95396b3b2c650f Mon Sep 17 00:00:00 2001 +From bc118b0038083bcd54a970ed0a6c92f9d55759e2 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Thu, 8 Oct 2015 09:50:17 +0200 Subject: Add support for simpletrace diff --git a/0017-Use-qemu-kvm-in-documentation-instead-of-qemu-system.patch b/0017-Use-qemu-kvm-in-documentation-instead-of-qemu-system.patch index b0c7b3c..c63c892 100644 --- a/0017-Use-qemu-kvm-in-documentation-instead-of-qemu-system.patch +++ b/0017-Use-qemu-kvm-in-documentation-instead-of-qemu-system.patch @@ -1,6 +1,6 @@ -From 9c4bcb1912ff003bc74c0bb3d49c78b1aca995d9 Mon Sep 17 00:00:00 2001 +From cc88b2746e9e8cfa6816e871ca282cddb07a0146 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina -Date: Wed, 29 Jan 2020 09:30:03 +0100 +Date: Wed, 8 Jul 2020 08:35:50 +0200 Subject: Use qemu-kvm in documentation instead of qemu-system- Patchwork-id: 62380 @@ -20,3682 +20,130 @@ Signed-off-by: Miroslav Rezanina --- Rebase notes (weekly-200129): -- qemu-block-drivers.texi converted to qemu-block-drivers.rst (upstream) + - qemu-block-drivers.texi converted to qemu-block-drivers.rst (upstream) -Conflicts: - docs/qemu-cpu-models.texi - docs/system/qemu-block-drivers.rst - qemu-doc.texi - qemu-options.hx +Rebase notes (weekly-200708 + - rewrite patch to new docs structure --- - docs/qemu-cpu-models.texi | 677 +++++++++++ - qemu-doc.texi | 2967 +++++++++++++++++++++++++++++++++++++++++++++ - qemu-options.hx | 10 +- - 3 files changed, 3649 insertions(+), 5 deletions(-) - create mode 100644 docs/qemu-cpu-models.texi - create mode 100644 qemu-doc.texi + docs/defs.rst.inc | 4 ++-- + docs/interop/live-block-operations.rst | 4 ++-- + docs/tools/qemu-trace-stap.rst | 14 +++++++------- + docs/tools/virtiofsd.rst | 2 +- + qemu-options.hx | 10 +++++----- + 5 files changed, 17 insertions(+), 17 deletions(-) -diff --git a/docs/qemu-cpu-models.texi b/docs/qemu-cpu-models.texi -new file mode 100644 -index 0000000..c82cf8f ---- /dev/null -+++ b/docs/qemu-cpu-models.texi -@@ -0,0 +1,677 @@ -+@c man begin SYNOPSIS -+QEMU / KVM CPU model configuration -+@c man end -+ -+@set qemu_system_x86 qemu-kvm -+ -+@c man begin DESCRIPTION -+ -+@menu -+* recommendations_cpu_models_x86:: Recommendations for KVM CPU model configuration on x86 hosts -+* recommendations_cpu_models_MIPS:: Supported CPU model configurations on MIPS hosts -+* cpu_model_syntax_apps:: Syntax for configuring CPU models -+@end menu -+ -+QEMU / KVM virtualization supports two ways to configure CPU models -+ -+@table @option -+ -+@item Host passthrough -+ -+This passes the host CPU model features, model, stepping, exactly to the -+guest. Note that KVM may filter out some host CPU model features if they -+cannot be supported with virtualization. Live migration is unsafe when -+this mode is used as libvirt / QEMU cannot guarantee a stable CPU is -+exposed to the guest across hosts. This is the recommended CPU to use, -+provided live migration is not required. -+ -+@item Named model -+ -+QEMU comes with a number of predefined named CPU models, that typically -+refer to specific generations of hardware released by Intel and AMD. -+These allow the guest VMs to have a degree of isolation from the host CPU, -+allowing greater flexibility in live migrating between hosts with differing -+hardware. -+@end table -+ -+In both cases, it is possible to optionally add or remove individual CPU -+features, to alter what is presented to the guest by default. -+ -+Libvirt supports a third way to configure CPU models known as "Host model". -+This uses the QEMU "Named model" feature, automatically picking a CPU model -+that is similar the host CPU, and then adding extra features to approximate -+the host model as closely as possible. This does not guarantee the CPU family, -+stepping, etc will precisely match the host CPU, as they would with "Host -+passthrough", but gives much of the benefit of passthrough, while making -+live migration safe. -+ -+@node recommendations_cpu_models_x86 -+@subsection Recommendations for KVM CPU model configuration on x86 hosts -+ -+The information that follows provides recommendations for configuring -+CPU models on x86 hosts. The goals are to maximise performance, while -+protecting guest OS against various CPU hardware flaws, and optionally -+enabling live migration between hosts with heterogeneous CPU models. -+ -+@menu -+* preferred_cpu_models_intel_x86:: Preferred CPU models for Intel x86 hosts -+* important_cpu_features_intel_x86:: Important CPU features for Intel x86 hosts -+* preferred_cpu_models_amd_x86:: Preferred CPU models for AMD x86 hosts -+* important_cpu_features_amd_x86:: Important CPU features for AMD x86 hosts -+* default_cpu_models_x86:: Default x86 CPU models -+* other_non_recommended_cpu_models_x86:: Other non-recommended x86 CPUs -+@end menu -+ -+@node preferred_cpu_models_intel_x86 -+@subsubsection Preferred CPU models for Intel x86 hosts -+ -+The following CPU models are preferred for use on Intel hosts. Administrators / -+applications are recommended to use the CPU model that matches the generation -+of the host CPUs in use. In a deployment with a mixture of host CPU models -+between machines, if live migration compatibility is required, use the newest -+CPU model that is compatible across all desired hosts. -+ -+@table @option -+@item @code{Skylake-Server} -+@item @code{Skylake-Server-IBRS} -+ -+Intel Xeon Processor (Skylake, 2016) -+ -+ -+@item @code{Skylake-Client} -+@item @code{Skylake-Client-IBRS} -+ -+Intel Core Processor (Skylake, 2015) -+ -+ -+@item @code{Broadwell} -+@item @code{Broadwell-IBRS} -+@item @code{Broadwell-noTSX} -+@item @code{Broadwell-noTSX-IBRS} -+ -+Intel Core Processor (Broadwell, 2014) -+ -+ -+@item @code{Haswell} -+@item @code{Haswell-IBRS} -+@item @code{Haswell-noTSX} -+@item @code{Haswell-noTSX-IBRS} -+ -+Intel Core Processor (Haswell, 2013) -+ -+ -+@item @code{IvyBridge} -+@item @code{IvyBridge-IBRS} -+ -+Intel Xeon E3-12xx v2 (Ivy Bridge, 2012) -+ -+ -+@item @code{SandyBridge} -+@item @code{SandyBridge-IBRS} -+ -+Intel Xeon E312xx (Sandy Bridge, 2011) -+ -+ -+@item @code{Westmere} -+@item @code{Westmere-IBRS} -+ -+Westmere E56xx/L56xx/X56xx (Nehalem-C, 2010) -+ -+ -+@item @code{Nehalem} -+@item @code{Nehalem-IBRS} -+ -+Intel Core i7 9xx (Nehalem Class Core i7, 2008) -+ -+ -+@item @code{Penryn} -+ -+Intel Core 2 Duo P9xxx (Penryn Class Core 2, 2007) -+ -+ -+@item @code{Conroe} -+ -+Intel Celeron_4x0 (Conroe/Merom Class Core 2, 2006) -+ -+@end table -+ -+@node important_cpu_features_intel_x86 -+@subsubsection Important CPU features for Intel x86 hosts -+ -+The following are important CPU features that should be used on Intel x86 -+hosts, when available in the host CPU. Some of them require explicit -+configuration to enable, as they are not included by default in some, or all, -+of the named CPU models listed above. In general all of these features are -+included if using "Host passthrough" or "Host model". -+ -+ -+@table @option -+ -+@item @code{pcid} -+ -+Recommended to mitigate the cost of the Meltdown (CVE-2017-5754) fix -+ -+Included by default in Haswell, Broadwell & Skylake Intel CPU models. -+ -+Should be explicitly turned on for Westmere, SandyBridge, and IvyBridge -+Intel CPU models. Note that some desktop/mobile Westmere CPUs cannot -+support this feature. -+ -+ -+@item @code{spec-ctrl} -+ -+Required to enable the Spectre v2 (CVE-2017-5715) fix. -+ -+Included by default in Intel CPU models with -IBRS suffix. -+ -+Must be explicitly turned on for Intel CPU models without -IBRS suffix. -+ -+Requires the host CPU microcode to support this feature before it -+can be used for guest CPUs. -+ -+ -+@item @code{stibp} -+ -+Required to enable stronger Spectre v2 (CVE-2017-5715) fixes in some -+operating systems. -+ -+Must be explicitly turned on for all Intel CPU models. -+ -+Requires the host CPU microcode to support this feature before it -+can be used for guest CPUs. -+ -+ -+@item @code{ssbd} -+ -+Required to enable the CVE-2018-3639 fix -+ -+Not included by default in any Intel CPU model. -+ -+Must be explicitly turned on for all Intel CPU models. -+ -+Requires the host CPU microcode to support this feature before it -+can be used for guest CPUs. -+ -+ -+@item @code{pdpe1gb} -+ -+Recommended to allow guest OS to use 1GB size pages -+ -+Not included by default in any Intel CPU model. -+ -+Should be explicitly turned on for all Intel CPU models. -+ -+Note that not all CPU hardware will support this feature. -+ -+@item @code{md-clear} -+ -+Required to confirm the MDS (CVE-2018-12126, CVE-2018-12127, CVE-2018-12130, -+CVE-2019-11091) fixes. -+ -+Not included by default in any Intel CPU model. -+ -+Must be explicitly turned on for all Intel CPU models. -+ -+Requires the host CPU microcode to support this feature before it -+can be used for guest CPUs. -+@end table -+ -+ -+@node preferred_cpu_models_amd_x86 -+@subsubsection Preferred CPU models for AMD x86 hosts -+ -+The following CPU models are preferred for use on Intel hosts. Administrators / -+applications are recommended to use the CPU model that matches the generation -+of the host CPUs in use. In a deployment with a mixture of host CPU models -+between machines, if live migration compatibility is required, use the newest -+CPU model that is compatible across all desired hosts. -+ -+@table @option -+ -+@item @code{EPYC} -+@item @code{EPYC-IBPB} -+ -+AMD EPYC Processor (2017) -+ -+ -+@item @code{Opteron_G5} -+ -+AMD Opteron 63xx class CPU (2012) -+ -+ -+@item @code{Opteron_G4} -+ -+AMD Opteron 62xx class CPU (2011) -+ -+ -+@item @code{Opteron_G3} -+ -+AMD Opteron 23xx (Gen 3 Class Opteron, 2009) -+ -+ -+@item @code{Opteron_G2} -+ -+AMD Opteron 22xx (Gen 2 Class Opteron, 2006) -+ -+ -+@item @code{Opteron_G1} -+ -+AMD Opteron 240 (Gen 1 Class Opteron, 2004) -+@end table -+ -+@node important_cpu_features_amd_x86 -+@subsubsection Important CPU features for AMD x86 hosts -+ -+The following are important CPU features that should be used on AMD x86 -+hosts, when available in the host CPU. Some of them require explicit -+configuration to enable, as they are not included by default in some, or all, -+of the named CPU models listed above. In general all of these features are -+included if using "Host passthrough" or "Host model". -+ -+ -+@table @option -+ -+@item @code{ibpb} -+ -+Required to enable the Spectre v2 (CVE-2017-5715) fix. -+ -+Included by default in AMD CPU models with -IBPB suffix. -+ -+Must be explicitly turned on for AMD CPU models without -IBPB suffix. -+ -+Requires the host CPU microcode to support this feature before it -+can be used for guest CPUs. -+ -+ -+@item @code{stibp} -+ -+Required to enable stronger Spectre v2 (CVE-2017-5715) fixes in some -+operating systems. -+ -+Must be explicitly turned on for all AMD CPU models. -+ -+Requires the host CPU microcode to support this feature before it -+can be used for guest CPUs. -+ -+ -+@item @code{virt-ssbd} -+ -+Required to enable the CVE-2018-3639 fix -+ -+Not included by default in any AMD CPU model. -+ -+Must be explicitly turned on for all AMD CPU models. -+ -+This should be provided to guests, even if amd-ssbd is also -+provided, for maximum guest compatibility. -+ -+Note for some QEMU / libvirt versions, this must be force enabled -+when when using "Host model", because this is a virtual feature -+that doesn't exist in the physical host CPUs. -+ -+ -+@item @code{amd-ssbd} -+ -+Required to enable the CVE-2018-3639 fix -+ -+Not included by default in any AMD CPU model. -+ -+Must be explicitly turned on for all AMD CPU models. -+ -+This provides higher performance than virt-ssbd so should be -+exposed to guests whenever available in the host. virt-ssbd -+should none the less also be exposed for maximum guest -+compatibility as some kernels only know about virt-ssbd. -+ -+ -+@item @code{amd-no-ssb} -+ -+Recommended to indicate the host is not vulnerable CVE-2018-3639 -+ -+Not included by default in any AMD CPU model. -+ -+Future hardware generations of CPU will not be vulnerable to -+CVE-2018-3639, and thus the guest should be told not to enable -+its mitigations, by exposing amd-no-ssb. This is mutually -+exclusive with virt-ssbd and amd-ssbd. -+ -+ -+@item @code{pdpe1gb} -+ -+Recommended to allow guest OS to use 1GB size pages -+ -+Not included by default in any AMD CPU model. -+ -+Should be explicitly turned on for all AMD CPU models. -+ -+Note that not all CPU hardware will support this feature. -+@end table -+ -+ -+@node default_cpu_models_x86 -+@subsubsection Default x86 CPU models -+ -+The default QEMU CPU models are designed such that they can run on all hosts. -+If an application does not wish to do perform any host compatibility checks -+before launching guests, the default is guaranteed to work. -+ -+The default CPU models will, however, leave the guest OS vulnerable to various -+CPU hardware flaws, so their use is strongly discouraged. Applications should -+follow the earlier guidance to setup a better CPU configuration, with host -+passthrough recommended if live migration is not needed. -+ -+@table @option -+@item @code{qemu32} -+@item @code{qemu64} -+ -+QEMU Virtual CPU version 2.5+ (32 & 64 bit variants) -+ -+qemu64 is used for x86_64 guests and qemu32 is used for i686 guests, when no -+-cpu argument is given to QEMU, or no is provided in libvirt XML. -+@end table -+ -+ -+@node other_non_recommended_cpu_models_x86 -+@subsubsection Other non-recommended x86 CPUs -+ -+The following CPUs models are compatible with most AMD and Intel x86 hosts, but -+their usage is discouraged, as they expose a very limited featureset, which -+prevents guests having optimal performance. -+ -+@table @option -+ -+@item @code{kvm32} -+@item @code{kvm64} -+ -+Common KVM processor (32 & 64 bit variants) -+ -+Legacy models just for historical compatibility with ancient QEMU versions. -+ -+ -+@item @code{486} -+@item @code{athlon} -+@item @code{phenom} -+@item @code{coreduo} -+@item @code{core2duo} -+@item @code{n270} -+@item @code{pentium} -+@item @code{pentium2} -+@item @code{pentium3} -+ -+Various very old x86 CPU models, mostly predating the introduction of -+hardware assisted virtualization, that should thus not be required for -+running virtual machines. -+@end table -+ -+@node recommendations_cpu_models_MIPS -+@subsection Supported CPU model configurations on MIPS hosts -+ -+QEMU supports variety of MIPS CPU models: -+ -+@menu -+* cpu_models_MIPS32:: Supported CPU models for MIPS32 hosts -+* cpu_models_MIPS64:: Supported CPU models for MIPS64 hosts -+* cpu_models_nanoMIPS:: Supported CPU models for nanoMIPS hosts -+* preferred_cpu_models_MIPS:: Preferred CPU models for MIPS hosts -+@end menu -+ -+@node cpu_models_MIPS32 -+@subsubsection Supported CPU models for MIPS32 hosts -+ -+The following CPU models are supported for use on MIPS32 hosts. Administrators / -+applications are recommended to use the CPU model that matches the generation -+of the host CPUs in use. In a deployment with a mixture of host CPU models -+between machines, if live migration compatibility is required, use the newest -+CPU model that is compatible across all desired hosts. -+ -+@table @option -+@item @code{mips32r6-generic} -+ -+MIPS32 Processor (Release 6, 2015) -+ -+ -+@item @code{P5600} -+ -+MIPS32 Processor (P5600, 2014) -+ -+ -+@item @code{M14K} -+@item @code{M14Kc} -+ -+MIPS32 Processor (M14K, 2009) -+ -+ -+@item @code{74Kf} -+ -+MIPS32 Processor (74K, 2007) -+ -+ -+@item @code{34Kf} -+ -+MIPS32 Processor (34K, 2006) -+ -+ -+@item @code{24Kc} -+@item @code{24KEc} -+@item @code{24Kf} -+ -+MIPS32 Processor (24K, 2003) -+ -+ -+@item @code{4Kc} -+@item @code{4Km} -+@item @code{4KEcR1} -+@item @code{4KEmR1} -+@item @code{4KEc} -+@item @code{4KEm} -+ -+MIPS32 Processor (4K, 1999) -+@end table -+ -+@node cpu_models_MIPS64 -+@subsubsection Supported CPU models for MIPS64 hosts -+ -+The following CPU models are supported for use on MIPS64 hosts. Administrators / -+applications are recommended to use the CPU model that matches the generation -+of the host CPUs in use. In a deployment with a mixture of host CPU models -+between machines, if live migration compatibility is required, use the newest -+CPU model that is compatible across all desired hosts. -+ -+@table @option -+@item @code{I6400} -+ -+MIPS64 Processor (Release 6, 2014) -+ -+ -+@item @code{Loongson-2F} -+ -+MIPS64 Processor (Loongson 2, 2008) -+ -+ -+@item @code{Loongson-2E} -+ -+MIPS64 Processor (Loongson 2, 2006) -+ -+ -+@item @code{mips64dspr2} -+ -+MIPS64 Processor (Release 2, 2006) -+ -+ -+@item @code{MIPS64R2-generic} -+@item @code{5KEc} -+@item @code{5KEf} -+ -+MIPS64 Processor (Release 2, 2002) -+ -+ -+@item @code{20Kc} -+ -+MIPS64 Processor (20K, 2000) -+ -+ -+@item @code{5Kc} -+@item @code{5Kf} -+ -+MIPS64 Processor (5K, 1999) -+ -+ -+@item @code{VR5432} -+ -+MIPS64 Processor (VR, 1998) -+ -+ -+@item @code{R4000} -+ -+MIPS64 Processor (MIPS III, 1991) -+@end table -+ -+@node cpu_models_nanoMIPS -+@subsubsection Supported CPU models for nanoMIPS hosts -+ -+The following CPU models are supported for use on nanoMIPS hosts. Administrators / -+applications are recommended to use the CPU model that matches the generation -+of the host CPUs in use. In a deployment with a mixture of host CPU models -+between machines, if live migration compatibility is required, use the newest -+CPU model that is compatible across all desired hosts. -+ -+@table @option -+@item @code{I7200} -+ -+MIPS I7200 (nanoMIPS, 2018) -+ -+@end table -+ -+@node preferred_cpu_models_MIPS -+@subsubsection Preferred CPU models for MIPS hosts -+ -+The following CPU models are preferred for use on different MIPS hosts: -+ -+@table @option -+@item @code{MIPS III} -+R4000 -+ -+@item @code{MIPS32R2} -+34Kf -+ -+@item @code{MIPS64R6} -+I6400 -+ -+@item @code{nanoMIPS} -+I7200 -+@end table -+ -+@node cpu_model_syntax_apps -+@subsection Syntax for configuring CPU models -+ -+The example below illustrate the approach to configuring the various -+CPU models / features in QEMU and libvirt -+ -+@menu -+* cpu_model_syntax_qemu:: QEMU command line -+* cpu_model_syntax_libvirt:: Libvirt guest XML -+@end menu -+ -+@node cpu_model_syntax_qemu -+@subsubsection QEMU command line -+ -+@table @option -+ -+@item Host passthrough -+ -+@example -+ $ @value{qemu_system_x86} -cpu host -+@end example -+ -+With feature customization: -+ -+@example -+ $ @value{qemu_system_x86} -cpu host,-vmx,... -+@end example -+ -+@item Named CPU models -+ -+@example -+ $ @value{qemu_system_x86} -cpu Westmere -+@end example -+ -+With feature customization: -+ -+@example -+ $ @value{qemu_system_x86} -cpu Westmere,+pcid,... -+@end example -+ -+@end table -+ -+@node cpu_model_syntax_libvirt -+@subsubsection Libvirt guest XML -+ -+@table @option -+ -+@item Host passthrough -+ -+@example -+ -+@end example -+ -+With feature customization: -+ -+@example -+ -+ -+ ... -+ -+@end example -+ -+@item Host model -+ -+@example -+ -+@end example -+ -+With feature customization: -+ -+@example -+ -+ -+ ... -+ -+@end example -+ -+@item Named model -+ -+@example -+ -+ -+ -+@end example -+ -+With feature customization: -+ -+@example -+ -+ -+ -+ ... -+ -+@end example -+ -+@end table -+ -+@c man end -+ -+@ignore -+ -+@setfilename qemu-cpu-models -+@settitle QEMU / KVM CPU model configuration -+ -+@c man begin SEEALSO -+The HTML documentation of QEMU for more precise information and Linux -+user mode emulator invocation. -+@c man end -+ -+@c man begin AUTHOR -+Daniel P. Berrange -+@c man end -+ -+@end ignore -diff --git a/qemu-doc.texi b/qemu-doc.texi -new file mode 100644 -index 0000000..10cd1de ---- /dev/null -+++ b/qemu-doc.texi -@@ -0,0 +1,2967 @@ -+\input texinfo @c -*- texinfo -*- -+@c %**start of header -+@setfilename qemu-doc.info -+@include version.texi -+ -+@documentlanguage en -+@documentencoding UTF-8 -+ -+@settitle QEMU version @value{VERSION} User Documentation -+@exampleindent 0 -+@paragraphindent 0 -+@c %**end of header -+ -+@set qemu_system qemu-kvm -+@set qemu_system_x86 qemu-kvm -+ -+@ifinfo -+@direntry -+* QEMU: (qemu-doc). The QEMU Emulator User Documentation. -+@end direntry -+@end ifinfo -+ -+@iftex -+@titlepage -+@sp 7 -+@center @titlefont{QEMU version @value{VERSION}} -+@sp 1 -+@center @titlefont{User Documentation} -+@sp 3 -+@end titlepage -+@end iftex -+ -+@ifnottex -+@node Top -+@top -+ -+@menu -+* Introduction:: -+* QEMU PC System emulator:: -+* QEMU System emulator for non PC targets:: -+* QEMU User space emulator:: -+* System requirements:: -+* Security:: -+* Implementation notes:: -+* Deprecated features:: -+* Recently removed features:: -+* Supported build platforms:: -+* License:: -+* Index:: -+@end menu -+@end ifnottex -+ -+@contents -+ -+@node Introduction -+@chapter Introduction -+ -+@menu -+* intro_features:: Features -+@end menu -+ -+@node intro_features -+@section Features -+ -+QEMU is a FAST! processor emulator using dynamic translation to -+achieve good emulation speed. -+ -+@cindex operating modes -+QEMU has two operating modes: -+ -+@itemize -+@cindex system emulation -+@item Full system emulation. In this mode, QEMU emulates a full system (for -+example a PC), including one or several processors and various -+peripherals. It can be used to launch different Operating Systems -+without rebooting the PC or to debug system code. -+ -+@cindex user mode emulation -+@item User mode emulation. In this mode, QEMU can launch -+processes compiled for one CPU on another CPU. It can be used to -+launch the Wine Windows API emulator (@url{https://www.winehq.org}) or -+to ease cross-compilation and cross-debugging. -+ -+@end itemize -+ -+QEMU has the following features: -+ -+@itemize -+@item QEMU can run without a host kernel driver and yet gives acceptable -+performance. It uses dynamic translation to native code for reasonable speed, -+with support for self-modifying code and precise exceptions. -+ -+@item It is portable to several operating systems (GNU/Linux, *BSD, Mac OS X, -+Windows) and architectures. -+ -+@item It performs accurate software emulation of the FPU. -+@end itemize -+ -+QEMU user mode emulation has the following features: -+@itemize -+@item Generic Linux system call converter, including most ioctls. -+ -+@item clone() emulation using native CPU clone() to use Linux scheduler for threads. -+ -+@item Accurate signal handling by remapping host signals to target signals. -+@end itemize -+ -+QEMU full system emulation has the following features: -+@itemize -+@item -+QEMU uses a full software MMU for maximum portability. -+ -+@item -+QEMU can optionally use an in-kernel accelerator, like kvm. The accelerators -+execute most of the guest code natively, while -+continuing to emulate the rest of the machine. -+ -+@item -+Various hardware devices can be emulated and in some cases, host -+devices (e.g. serial and parallel ports, USB, drives) can be used -+transparently by the guest Operating System. Host device passthrough -+can be used for talking to external physical peripherals (e.g. a -+webcam, modem or tape drive). -+ -+@item -+Symmetric multiprocessing (SMP) support. Currently, an in-kernel -+accelerator is required to use more than one host CPU for emulation. -+ -+@end itemize -+ -+ -+@node QEMU PC System emulator -+@chapter QEMU PC System emulator -+@cindex system emulation (PC) -+ -+@menu -+* pcsys_introduction:: Introduction -+* pcsys_quickstart:: Quick Start -+* sec_invocation:: Invocation -+* pcsys_keys:: Keys in the graphical frontends -+* mux_keys:: Keys in the character backend multiplexer -+* pcsys_monitor:: QEMU Monitor -+* cpu_models:: CPU models -+* disk_images:: Disk Images -+* pcsys_network:: Network emulation -+* pcsys_other_devs:: Other Devices -+* direct_linux_boot:: Direct Linux Boot -+* pcsys_usb:: USB emulation -+* vnc_security:: VNC security -+* network_tls:: TLS setup for network services -+* gdb_usage:: GDB usage -+* pcsys_os_specific:: Target OS specific information -+@end menu -+ -+@node pcsys_introduction -+@section Introduction -+ -+@c man begin DESCRIPTION -+ -+The QEMU PC System emulator simulates the -+following peripherals: -+ -+@itemize @minus -+@item -+i440FX host PCI bridge and PIIX3 PCI to ISA bridge -+@item -+Cirrus CLGD 5446 PCI VGA card or dummy VGA card with Bochs VESA -+extensions (hardware level, including all non standard modes). -+@item -+PS/2 mouse and keyboard -+@item -+2 PCI IDE interfaces with hard disk and CD-ROM support -+@item -+Floppy disk -+@item -+PCI and ISA network adapters -+@item -+Serial ports -+@item -+IPMI BMC, either and internal or external one -+@item -+Creative SoundBlaster 16 sound card -+@item -+ENSONIQ AudioPCI ES1370 sound card -+@item -+Intel 82801AA AC97 Audio compatible sound card -+@item -+Intel HD Audio Controller and HDA codec -+@item -+Adlib (OPL2) - Yamaha YM3812 compatible chip -+@item -+Gravis Ultrasound GF1 sound card -+@item -+CS4231A compatible sound card -+@item -+PCI UHCI, OHCI, EHCI or XHCI USB controller and a virtual USB-1.1 hub. -+@end itemize -+ -+SMP is supported with up to 255 CPUs. -+ -+QEMU uses the PC BIOS from the Seabios project and the Plex86/Bochs LGPL -+VGA BIOS. -+ -+QEMU uses YM3812 emulation by Tatsuyuki Satoh. -+ -+QEMU uses GUS emulation (GUSEMU32 @url{http://www.deinmeister.de/gusemu/}) -+by Tibor "TS" Schütz. -+ -+Note that, by default, GUS shares IRQ(7) with parallel ports and so -+QEMU must be told to not have parallel ports to have working GUS. -+ -+@example -+@value{qemu_system_x86} dos.img -soundhw gus -parallel none -+@end example -+ -+Alternatively: -+@example -+@value{qemu_system_x86} dos.img -device gus,irq=5 -+@end example -+ -+Or some other unclaimed IRQ. -+ -+CS4231A is the chip used in Windows Sound System and GUSMAX products -+ -+@c man end -+ -+@node pcsys_quickstart -+@section Quick Start -+@cindex quick start -+ -+Download and uncompress a hard disk image with Linux installed (e.g. -+@file{linux.img}) and type: -+ -+@example -+@value{qemu_system} linux.img -+@end example -+ -+Linux should boot and give you a prompt. -+ -+@node sec_invocation -+@section Invocation -+ -+@example -+@c man begin SYNOPSIS -+@command{@value{qemu_system}} [@var{options}] [@var{disk_image}] -+@c man end -+@end example -+ -+@c man begin OPTIONS -+@var{disk_image} is a raw hard disk image for IDE hard disk 0. Some -+targets do not need a disk image. -+ -+@include qemu-options.texi -+ -+@c man end -+ -+@subsection Device URL Syntax -+@c TODO merge this with section Disk Images -+ -+@c man begin NOTES -+ -+In addition to using normal file images for the emulated storage devices, -+QEMU can also use networked resources such as iSCSI devices. These are -+specified using a special URL syntax. -+ -+@table @option -+@item iSCSI -+iSCSI support allows QEMU to access iSCSI resources directly and use as -+images for the guest storage. Both disk and cdrom images are supported. -+ -+Syntax for specifying iSCSI LUNs is -+``iscsi://[:]//'' -+ -+By default qemu will use the iSCSI initiator-name -+'iqn.2008-11.org.linux-kvm[:]' but this can also be set from the command -+line or a configuration file. -+ -+Since version Qemu 2.4 it is possible to specify a iSCSI request timeout to detect -+stalled requests and force a reestablishment of the session. The timeout -+is specified in seconds. The default is 0 which means no timeout. Libiscsi -+1.15.0 or greater is required for this feature. -+ -+Example (without authentication): -+@example -+@value{qemu_system} -iscsi initiator-name=iqn.2001-04.com.example:my-initiator \ -+ -cdrom iscsi://192.0.2.1/iqn.2001-04.com.example/2 \ -+ -drive file=iscsi://192.0.2.1/iqn.2001-04.com.example/1 -+@end example -+ -+Example (CHAP username/password via URL): -+@example -+@value{qemu_system} -drive file=iscsi://user%password@@192.0.2.1/iqn.2001-04.com.example/1 -+@end example -+ -+Example (CHAP username/password via environment variables): -+@example -+LIBISCSI_CHAP_USERNAME="user" \ -+LIBISCSI_CHAP_PASSWORD="password" \ -+@value{qemu_system} -drive file=iscsi://192.0.2.1/iqn.2001-04.com.example/1 -+@end example -+ -+@item NBD -+QEMU supports NBD (Network Block Devices) both using TCP protocol as well -+as Unix Domain Sockets. With TCP, the default port is 10809. -+ -+Syntax for specifying a NBD device using TCP, in preferred URI form: -+``nbd://[:]/[]'' -+ -+Syntax for specifying a NBD device using Unix Domain Sockets; remember -+that '?' is a shell glob character and may need quoting: -+``nbd+unix:///[]?socket='' -+ -+Older syntax that is also recognized: -+``nbd::[:exportname=]'' -+ -+Syntax for specifying a NBD device using Unix Domain Sockets -+``nbd:unix:[:exportname=]'' -+ -+Example for TCP -+@example -+@value{qemu_system} --drive file=nbd:192.0.2.1:30000 -+@end example -+ -+Example for Unix Domain Sockets -+@example -+@value{qemu_system} --drive file=nbd:unix:/tmp/nbd-socket -+@end example -+ -+@item SSH -+QEMU supports SSH (Secure Shell) access to remote disks. -+ -+Examples: -+@example -+@value{qemu_system} -drive file=ssh://user@@host/path/to/disk.img -+@value{qemu_system} -drive file.driver=ssh,file.user=user,file.host=host,file.port=22,file.path=/path/to/disk.img -+@end example -+ -+Currently authentication must be done using ssh-agent. Other -+authentication methods may be supported in future. -+ -+@item Sheepdog -+Sheepdog is a distributed storage system for QEMU. -+QEMU supports using either local sheepdog devices or remote networked -+devices. -+ -+Syntax for specifying a sheepdog device -+@example -+sheepdog[+tcp|+unix]://[host:port]/vdiname[?socket=path][#snapid|#tag] -+@end example -+ -+Example -+@example -+@value{qemu_system} --drive file=sheepdog://192.0.2.1:30000/MyVirtualMachine -+@end example -+ -+See also @url{https://sheepdog.github.io/sheepdog/}. -+ -+@item GlusterFS -+GlusterFS is a user space distributed file system. -+QEMU supports the use of GlusterFS volumes for hosting VM disk images using -+TCP, Unix Domain Sockets and RDMA transport protocols. -+ -+Syntax for specifying a VM disk image on GlusterFS volume is -+@example -+ -+URI: -+gluster[+type]://[host[:port]]/volume/path[?socket=...][,debug=N][,logfile=...] -+ -+JSON: -+'json:@{"driver":"qcow2","file":@{"driver":"gluster","volume":"testvol","path":"a.img","debug":N,"logfile":"...", -+@ "server":[@{"type":"tcp","host":"...","port":"..."@}, -+@ @{"type":"unix","socket":"..."@}]@}@}' -+@end example -+ -+ -+Example -+@example -+URI: -+@value{qemu_system} --drive file=gluster://192.0.2.1/testvol/a.img, -+@ file.debug=9,file.logfile=/var/log/qemu-gluster.log -+ -+JSON: -+@value{qemu_system} 'json:@{"driver":"qcow2", -+@ "file":@{"driver":"gluster", -+@ "volume":"testvol","path":"a.img", -+@ "debug":9,"logfile":"/var/log/qemu-gluster.log", -+@ "server":[@{"type":"tcp","host":"1.2.3.4","port":24007@}, -+@ @{"type":"unix","socket":"/var/run/glusterd.socket"@}]@}@}' -+@value{qemu_system} -drive driver=qcow2,file.driver=gluster,file.volume=testvol,file.path=/path/a.img, -+@ file.debug=9,file.logfile=/var/log/qemu-gluster.log, -+@ file.server.0.type=tcp,file.server.0.host=1.2.3.4,file.server.0.port=24007, -+@ file.server.1.type=unix,file.server.1.socket=/var/run/glusterd.socket -+@end example -+ -+See also @url{http://www.gluster.org}. -+ -+@item HTTP/HTTPS/FTP/FTPS -+QEMU supports read-only access to files accessed over http(s) and ftp(s). -+ -+Syntax using a single filename: -+@example -+://[[:]@@]/ -+@end example -+ -+where: -+@table @option -+@item protocol -+'http', 'https', 'ftp', or 'ftps'. -+ -+@item username -+Optional username for authentication to the remote server. -+ -+@item password -+Optional password for authentication to the remote server. -+ -+@item host -+Address of the remote server. -+ -+@item path -+Path on the remote server, including any query string. -+@end table -+ -+The following options are also supported: -+@table @option -+@item url -+The full URL when passing options to the driver explicitly. -+ -+@item readahead -+The amount of data to read ahead with each range request to the remote server. -+This value may optionally have the suffix 'T', 'G', 'M', 'K', 'k' or 'b'. If it -+does not have a suffix, it will be assumed to be in bytes. The value must be a -+multiple of 512 bytes. It defaults to 256k. -+ -+@item sslverify -+Whether to verify the remote server's certificate when connecting over SSL. It -+can have the value 'on' or 'off'. It defaults to 'on'. -+ -+@item cookie -+Send this cookie (it can also be a list of cookies separated by ';') with -+each outgoing request. Only supported when using protocols such as HTTP -+which support cookies, otherwise ignored. -+ -+@item timeout -+Set the timeout in seconds of the CURL connection. This timeout is the time -+that CURL waits for a response from the remote server to get the size of the -+image to be downloaded. If not set, the default timeout of 5 seconds is used. -+@end table -+ -+Note that when passing options to qemu explicitly, @option{driver} is the value -+of . -+ -+Example: boot from a remote Fedora 20 live ISO image -+@example -+@value{qemu_system_x86} --drive media=cdrom,file=https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/20/Live/x86_64/Fedora-Live-Desktop-x86_64-20-1.iso,readonly -+ -+@value{qemu_system_x86} --drive media=cdrom,file.driver=http,file.url=http://archives.fedoraproject.org/pub/fedora/linux/releases/20/Live/x86_64/Fedora-Live-Desktop-x86_64-20-1.iso,readonly -+@end example -+ -+Example: boot from a remote Fedora 20 cloud image using a local overlay for -+writes, copy-on-read, and a readahead of 64k -+@example -+qemu-img create -f qcow2 -o backing_file='json:@{"file.driver":"http",, "file.url":"http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/20/Images/x86_64/Fedora-x86_64-20-20131211.1-sda.qcow2",, "file.readahead":"64k"@}' /tmp/Fedora-x86_64-20-20131211.1-sda.qcow2 -+ -+@value{qemu_system_x86} -drive file=/tmp/Fedora-x86_64-20-20131211.1-sda.qcow2,copy-on-read=on -+@end example -+ -+Example: boot from an image stored on a VMware vSphere server with a self-signed -+certificate using a local overlay for writes, a readahead of 64k and a timeout -+of 10 seconds. -+@example -+qemu-img create -f qcow2 -o backing_file='json:@{"file.driver":"https",, "file.url":"https://user:password@@vsphere.example.com/folder/test/test-flat.vmdk?dcPath=Datacenter&dsName=datastore1",, "file.sslverify":"off",, "file.readahead":"64k",, "file.timeout":10@}' /tmp/test.qcow2 -+ -+@value{qemu_system_x86} -drive file=/tmp/test.qcow2 -+@end example -+ -+@end table -+ -+@c man end -+ -+@node pcsys_keys -+@section Keys in the graphical frontends -+ -+@c man begin OPTIONS -+ -+During the graphical emulation, you can use special key combinations to change -+modes. The default key mappings are shown below, but if you use @code{-alt-grab} -+then the modifier is Ctrl-Alt-Shift (instead of Ctrl-Alt) and if you use -+@code{-ctrl-grab} then the modifier is the right Ctrl key (instead of Ctrl-Alt): -+ -+@table @key -+@item Ctrl-Alt-f -+@kindex Ctrl-Alt-f -+Toggle full screen -+ -+@item Ctrl-Alt-+ -+@kindex Ctrl-Alt-+ -+Enlarge the screen -+ -+@item Ctrl-Alt-- -+@kindex Ctrl-Alt-- -+Shrink the screen -+ -+@item Ctrl-Alt-u -+@kindex Ctrl-Alt-u -+Restore the screen's un-scaled dimensions -+ -+@item Ctrl-Alt-n -+@kindex Ctrl-Alt-n -+Switch to virtual console 'n'. Standard console mappings are: -+@table @emph -+@item 1 -+Target system display -+@item 2 -+Monitor -+@item 3 -+Serial port -+@end table -+ -+@item Ctrl-Alt -+@kindex Ctrl-Alt -+Toggle mouse and keyboard grab. -+@end table -+ -+@kindex Ctrl-Up -+@kindex Ctrl-Down -+@kindex Ctrl-PageUp -+@kindex Ctrl-PageDown -+In the virtual consoles, you can use @key{Ctrl-Up}, @key{Ctrl-Down}, -+@key{Ctrl-PageUp} and @key{Ctrl-PageDown} to move in the back log. -+ -+@c man end -+ -+@node mux_keys -+@section Keys in the character backend multiplexer -+ -+@c man begin OPTIONS -+ -+During emulation, if you are using a character backend multiplexer -+(which is the default if you are using @option{-nographic}) then -+several commands are available via an escape sequence. These -+key sequences all start with an escape character, which is @key{Ctrl-a} -+by default, but can be changed with @option{-echr}. The list below assumes -+you're using the default. -+ -+@table @key -+@item Ctrl-a h -+@kindex Ctrl-a h -+Print this help -+@item Ctrl-a x -+@kindex Ctrl-a x -+Exit emulator -+@item Ctrl-a s -+@kindex Ctrl-a s -+Save disk data back to file (if -snapshot) -+@item Ctrl-a t -+@kindex Ctrl-a t -+Toggle console timestamps -+@item Ctrl-a b -+@kindex Ctrl-a b -+Send break (magic sysrq in Linux) -+@item Ctrl-a c -+@kindex Ctrl-a c -+Rotate between the frontends connected to the multiplexer (usually -+this switches between the monitor and the console) -+@item Ctrl-a Ctrl-a -+@kindex Ctrl-a Ctrl-a -+Send the escape character to the frontend -+@end table -+@c man end -+ -+@ignore -+ -+@c man begin SEEALSO -+The HTML documentation of QEMU for more precise information and Linux -+user mode emulator invocation. -+@c man end -+ -+@c man begin AUTHOR -+Fabrice Bellard -+@c man end -+ -+@end ignore -+ -+@node pcsys_monitor -+@section QEMU Monitor -+@cindex QEMU monitor -+ -+The QEMU monitor is used to give complex commands to the QEMU -+emulator. You can use it to: -+ -+@itemize @minus -+ -+@item -+Remove or insert removable media images -+(such as CD-ROM or floppies). -+ -+@item -+Freeze/unfreeze the Virtual Machine (VM) and save or restore its state -+from a disk file. -+ -+@item Inspect the VM state without an external debugger. -+ -+@end itemize -+ -+@subsection Commands -+ -+The following commands are available: -+ -+@include qemu-monitor.texi -+ -+@include qemu-monitor-info.texi -+ -+@subsection Integer expressions -+ -+The monitor understands integers expressions for every integer -+argument. You can use register names to get the value of specifics -+CPU registers by prefixing them with @emph{$}. -+ -+@node cpu_models -+@section CPU models -+ -+@include docs/qemu-cpu-models.texi -+ -+@node disk_images -+@section Disk Images -+ -+QEMU supports many disk image formats, including growable disk images -+(their size increase as non empty sectors are written), compressed and -+encrypted disk images. -+ -+@menu -+* disk_images_quickstart:: Quick start for disk image creation -+* disk_images_snapshot_mode:: Snapshot mode -+* vm_snapshots:: VM snapshots -+@end menu -+ -+@node disk_images_quickstart -+@subsection Quick start for disk image creation -+ -+You can create a disk image with the command: -+@example -+qemu-img create myimage.img mysize -+@end example -+where @var{myimage.img} is the disk image filename and @var{mysize} is its -+size in kilobytes. You can add an @code{M} suffix to give the size in -+megabytes and a @code{G} suffix for gigabytes. -+ -+@c When this document is converted to rst we should make this into -+@c a proper linked reference to the qemu-img documentation again: -+See the qemu-img invocation documentation for more information. -+ -+@node disk_images_snapshot_mode -+@subsection Snapshot mode -+ -+If you use the option @option{-snapshot}, all disk images are -+considered as read only. When sectors in written, they are written in -+a temporary file created in @file{/tmp}. You can however force the -+write back to the raw disk images by using the @code{commit} monitor -+command (or @key{C-a s} in the serial console). -+ -+@node vm_snapshots -+@subsection VM snapshots -+ -+VM snapshots are snapshots of the complete virtual machine including -+CPU state, RAM, device state and the content of all the writable -+disks. In order to use VM snapshots, you must have at least one non -+removable and writable block device using the @code{qcow2} disk image -+format. Normally this device is the first virtual hard drive. -+ -+Use the monitor command @code{savevm} to create a new VM snapshot or -+replace an existing one. A human readable name can be assigned to each -+snapshot in addition to its numerical ID. -+ -+Use @code{loadvm} to restore a VM snapshot and @code{delvm} to remove -+a VM snapshot. @code{info snapshots} lists the available snapshots -+with their associated information: -+ -+@example -+(qemu) info snapshots -+Snapshot devices: hda -+Snapshot list (from hda): -+ID TAG VM SIZE DATE VM CLOCK -+1 start 41M 2006-08-06 12:38:02 00:00:14.954 -+2 40M 2006-08-06 12:43:29 00:00:18.633 -+3 msys 40M 2006-08-06 12:44:04 00:00:23.514 -+@end example -+ -+A VM snapshot is made of a VM state info (its size is shown in -+@code{info snapshots}) and a snapshot of every writable disk image. -+The VM state info is stored in the first @code{qcow2} non removable -+and writable block device. The disk image snapshots are stored in -+every disk image. The size of a snapshot in a disk image is difficult -+to evaluate and is not shown by @code{info snapshots} because the -+associated disk sectors are shared among all the snapshots to save -+disk space (otherwise each snapshot would need a full copy of all the -+disk images). -+ -+When using the (unrelated) @code{-snapshot} option -+(@ref{disk_images_snapshot_mode}), you can always make VM snapshots, -+but they are deleted as soon as you exit QEMU. -+ -+VM snapshots currently have the following known limitations: -+@itemize -+@item -+They cannot cope with removable devices if they are removed or -+inserted after a snapshot is done. -+@item -+A few device drivers still have incomplete snapshot support so their -+state is not saved or restored properly (in particular USB). -+@end itemize -+ -+@node pcsys_network -+@section Network emulation -+ -+QEMU can simulate several network cards (e.g. PCI or ISA cards on the PC -+target) and can connect them to a network backend on the host or an emulated -+hub. The various host network backends can either be used to connect the NIC of -+the guest to a real network (e.g. by using a TAP devices or the non-privileged -+user mode network stack), or to other guest instances running in another QEMU -+process (e.g. by using the socket host network backend). -+ -+@subsection Using TAP network interfaces -+ -+This is the standard way to connect QEMU to a real network. QEMU adds -+a virtual network device on your host (called @code{tapN}), and you -+can then configure it as if it was a real ethernet card. -+ -+@subsubsection Linux host -+ -+As an example, you can download the @file{linux-test-xxx.tar.gz} -+archive and copy the script @file{qemu-ifup} in @file{/etc} and -+configure properly @code{sudo} so that the command @code{ifconfig} -+contained in @file{qemu-ifup} can be executed as root. You must verify -+that your host kernel supports the TAP network interfaces: the -+device @file{/dev/net/tun} must be present. -+ -+See @ref{sec_invocation} to have examples of command lines using the -+TAP network interfaces. -+ -+@subsubsection Windows host -+ -+There is a virtual ethernet driver for Windows 2000/XP systems, called -+TAP-Win32. But it is not included in standard QEMU for Windows, -+so you will need to get it separately. It is part of OpenVPN package, -+so download OpenVPN from : @url{https://openvpn.net/}. -+ -+@subsection Using the user mode network stack -+ -+By using the option @option{-net user} (default configuration if no -+@option{-net} option is specified), QEMU uses a completely user mode -+network stack (you don't need root privilege to use the virtual -+network). The virtual network configuration is the following: -+ -+@example -+ -+ guest (10.0.2.15) <------> Firewall/DHCP server <-----> Internet -+ | (10.0.2.2) -+ | -+ ----> DNS server (10.0.2.3) -+ | -+ ----> SMB server (10.0.2.4) -+@end example -+ -+The QEMU VM behaves as if it was behind a firewall which blocks all -+incoming connections. You can use a DHCP client to automatically -+configure the network in the QEMU VM. The DHCP server assign addresses -+to the hosts starting from 10.0.2.15. -+ -+In order to check that the user mode network is working, you can ping -+the address 10.0.2.2 and verify that you got an address in the range -+10.0.2.x from the QEMU virtual DHCP server. -+ -+Note that ICMP traffic in general does not work with user mode networking. -+@code{ping}, aka. ICMP echo, to the local router (10.0.2.2) shall work, -+however. If you're using QEMU on Linux >= 3.0, it can use unprivileged ICMP -+ping sockets to allow @code{ping} to the Internet. The host admin has to set -+the ping_group_range in order to grant access to those sockets. To allow ping -+for GID 100 (usually users group): -+ -+@example -+echo 100 100 > /proc/sys/net/ipv4/ping_group_range -+@end example -+ -+When using the built-in TFTP server, the router is also the TFTP -+server. -+ -+When using the @option{'-netdev user,hostfwd=...'} option, TCP or UDP -+connections can be redirected from the host to the guest. It allows for -+example to redirect X11, telnet or SSH connections. -+ -+@subsection Hubs -+ -+QEMU can simulate several hubs. A hub can be thought of as a virtual connection -+between several network devices. These devices can be for example QEMU virtual -+ethernet cards or virtual Host ethernet devices (TAP devices). You can connect -+guest NICs or host network backends to such a hub using the @option{-netdev -+hubport} or @option{-nic hubport} options. The legacy @option{-net} option -+also connects the given device to the emulated hub with ID 0 (i.e. the default -+hub) unless you specify a netdev with @option{-net nic,netdev=xxx} here. -+ -+@subsection Connecting emulated networks between QEMU instances -+ -+Using the @option{-netdev socket} (or @option{-nic socket} or -+@option{-net socket}) option, it is possible to create emulated -+networks that span several QEMU instances. -+See the description of the @option{-netdev socket} option in the -+@ref{sec_invocation,,Invocation chapter} to have a basic example. -+ -+@node pcsys_other_devs -+@section Other Devices -+ -+@subsection Inter-VM Shared Memory device -+ -+On Linux hosts, a shared memory device is available. The basic syntax -+is: -+ -+@example -+@value{qemu_system_x86} -device ivshmem-plain,memdev=@var{hostmem} -+@end example -+ -+where @var{hostmem} names a host memory backend. For a POSIX shared -+memory backend, use something like -+ -+@example -+-object memory-backend-file,size=1M,share,mem-path=/dev/shm/ivshmem,id=@var{hostmem} -+@end example -+ -+If desired, interrupts can be sent between guest VMs accessing the same shared -+memory region. Interrupt support requires using a shared memory server and -+using a chardev socket to connect to it. The code for the shared memory server -+is qemu.git/contrib/ivshmem-server. An example syntax when using the shared -+memory server is: -+ -+@example -+# First start the ivshmem server once and for all -+ivshmem-server -p @var{pidfile} -S @var{path} -m @var{shm-name} -l @var{shm-size} -n @var{vectors} -+ -+# Then start your qemu instances with matching arguments -+@value{qemu_system_x86} -device ivshmem-doorbell,vectors=@var{vectors},chardev=@var{id} -+ -chardev socket,path=@var{path},id=@var{id} -+@end example -+ -+When using the server, the guest will be assigned a VM ID (>=0) that allows guests -+using the same server to communicate via interrupts. Guests can read their -+VM ID from a device register (see ivshmem-spec.txt). -+ -+@subsubsection Migration with ivshmem -+ -+With device property @option{master=on}, the guest will copy the shared -+memory on migration to the destination host. With @option{master=off}, -+the guest will not be able to migrate with the device attached. In the -+latter case, the device should be detached and then reattached after -+migration using the PCI hotplug support. -+ -+At most one of the devices sharing the same memory can be master. The -+master must complete migration before you plug back the other devices. -+ -+@subsubsection ivshmem and hugepages -+ -+Instead of specifying the using POSIX shm, you may specify -+a memory backend that has hugepage support: -+ -+@example -+@value{qemu_system_x86} -object memory-backend-file,size=1G,mem-path=/dev/hugepages/my-shmem-file,share,id=mb1 -+ -device ivshmem-plain,memdev=mb1 -+@end example -+ -+ivshmem-server also supports hugepages mount points with the -+@option{-m} memory path argument. -+ -+@node direct_linux_boot -+@section Direct Linux Boot -+ -+This section explains how to launch a Linux kernel inside QEMU without -+having to make a full bootable image. It is very useful for fast Linux -+kernel testing. -+ -+The syntax is: -+@example -+@value{qemu_system} -kernel bzImage -hda rootdisk.img -append "root=/dev/hda" -+@end example -+ -+Use @option{-kernel} to provide the Linux kernel image and -+@option{-append} to give the kernel command line arguments. The -+@option{-initrd} option can be used to provide an INITRD image. -+ -+If you do not need graphical output, you can disable it and redirect -+the virtual serial port and the QEMU monitor to the console with the -+@option{-nographic} option. The typical command line is: -+@example -+@value{qemu_system} -kernel bzImage -hda rootdisk.img \ -+ -append "root=/dev/hda console=ttyS0" -nographic -+@end example -+ -+Use @key{Ctrl-a c} to switch between the serial console and the -+monitor (@pxref{pcsys_keys}). -+ -+@node pcsys_usb -+@section USB emulation -+ -+QEMU can emulate a PCI UHCI, OHCI, EHCI or XHCI USB controller. You can -+plug virtual USB devices or real host USB devices (only works with certain -+host operating systems). QEMU will automatically create and connect virtual -+USB hubs as necessary to connect multiple USB devices. -+ -+@menu -+* usb_devices:: -+* host_usb_devices:: -+@end menu -+@node usb_devices -+@subsection Connecting USB devices -+ -+USB devices can be connected with the @option{-device usb-...} command line -+option or the @code{device_add} monitor command. Available devices are: -+ -+@table @code -+@item usb-mouse -+Virtual Mouse. This will override the PS/2 mouse emulation when activated. -+@item usb-tablet -+Pointer device that uses absolute coordinates (like a touchscreen). -+This means QEMU is able to report the mouse position without having -+to grab the mouse. Also overrides the PS/2 mouse emulation when activated. -+@item usb-storage,drive=@var{drive_id} -+Mass storage device backed by @var{drive_id} (@pxref{disk_images}) -+@item usb-uas -+USB attached SCSI device, see -+@url{https://git.qemu.org/?p=qemu.git;a=blob_plain;f=docs/usb-storage.txt,usb-storage.txt} -+for details -+@item usb-bot -+Bulk-only transport storage device, see -+@url{https://git.qemu.org/?p=qemu.git;a=blob_plain;f=docs/usb-storage.txt,usb-storage.txt} -+for details here, too -+@item usb-mtp,rootdir=@var{dir} -+Media transfer protocol device, using @var{dir} as root of the file tree -+that is presented to the guest. -+@item usb-host,hostbus=@var{bus},hostaddr=@var{addr} -+Pass through the host device identified by @var{bus} and @var{addr} -+@item usb-host,vendorid=@var{vendor},productid=@var{product} -+Pass through the host device identified by @var{vendor} and @var{product} ID -+@item usb-wacom-tablet -+Virtual Wacom PenPartner tablet. This device is similar to the @code{tablet} -+above but it can be used with the tslib library because in addition to touch -+coordinates it reports touch pressure. -+@item usb-kbd -+Standard USB keyboard. Will override the PS/2 keyboard (if present). -+@item usb-serial,chardev=@var{id} -+Serial converter. This emulates an FTDI FT232BM chip connected to host character -+device @var{id}. -+@item usb-braille,chardev=@var{id} -+Braille device. This will use BrlAPI to display the braille output on a real -+or fake device referenced by @var{id}. -+@item usb-net[,netdev=@var{id}] -+Network adapter that supports CDC ethernet and RNDIS protocols. @var{id} -+specifies a netdev defined with @code{-netdev @dots{},id=@var{id}}. -+For instance, user-mode networking can be used with -+@example -+@value{qemu_system} [...] -netdev user,id=net0 -device usb-net,netdev=net0 -+@end example -+@item usb-ccid -+Smartcard reader device -+@item usb-audio -+USB audio device -+@end table -+ -+@node host_usb_devices -+@subsection Using host USB devices on a Linux host -+ -+WARNING: this is an experimental feature. QEMU will slow down when -+using it. USB devices requiring real time streaming (i.e. USB Video -+Cameras) are not supported yet. -+ -+@enumerate -+@item If you use an early Linux 2.4 kernel, verify that no Linux driver -+is actually using the USB device. A simple way to do that is simply to -+disable the corresponding kernel module by renaming it from @file{mydriver.o} -+to @file{mydriver.o.disabled}. -+ -+@item Verify that @file{/proc/bus/usb} is working (most Linux distributions should enable it by default). You should see something like that: -+@example -+ls /proc/bus/usb -+001 devices drivers -+@end example -+ -+@item Since only root can access to the USB devices directly, you can either launch QEMU as root or change the permissions of the USB devices you want to use. For testing, the following suffices: -+@example -+chown -R myuid /proc/bus/usb -+@end example -+ -+@item Launch QEMU and do in the monitor: -+@example -+info usbhost -+ Device 1.2, speed 480 Mb/s -+ Class 00: USB device 1234:5678, USB DISK -+@end example -+You should see the list of the devices you can use (Never try to use -+hubs, it won't work). -+ -+@item Add the device in QEMU by using: -+@example -+device_add usb-host,vendorid=0x1234,productid=0x5678 -+@end example -+ -+Normally the guest OS should report that a new USB device is plugged. -+You can use the option @option{-device usb-host,...} to do the same. -+ -+@item Now you can try to use the host USB device in QEMU. -+ -+@end enumerate -+ -+When relaunching QEMU, you may have to unplug and plug again the USB -+device to make it work again (this is a bug). -+ -+@node vnc_security -+@section VNC security -+ -+The VNC server capability provides access to the graphical console -+of the guest VM across the network. This has a number of security -+considerations depending on the deployment scenarios. -+ -+@menu -+* vnc_sec_none:: -+* vnc_sec_password:: -+* vnc_sec_certificate:: -+* vnc_sec_certificate_verify:: -+* vnc_sec_certificate_pw:: -+* vnc_sec_sasl:: -+* vnc_sec_certificate_sasl:: -+* vnc_setup_sasl:: -+@end menu -+@node vnc_sec_none -+@subsection Without passwords -+ -+The simplest VNC server setup does not include any form of authentication. -+For this setup it is recommended to restrict it to listen on a UNIX domain -+socket only. For example -+ -+@example -+@value{qemu_system} [...OPTIONS...] -vnc unix:/home/joebloggs/.qemu-myvm-vnc -+@end example -+ -+This ensures that only users on local box with read/write access to that -+path can access the VNC server. To securely access the VNC server from a -+remote machine, a combination of netcat+ssh can be used to provide a secure -+tunnel. -+ -+@node vnc_sec_password -+@subsection With passwords -+ -+The VNC protocol has limited support for password based authentication. Since -+the protocol limits passwords to 8 characters it should not be considered -+to provide high security. The password can be fairly easily brute-forced by -+a client making repeat connections. For this reason, a VNC server using password -+authentication should be restricted to only listen on the loopback interface -+or UNIX domain sockets. Password authentication is not supported when operating -+in FIPS 140-2 compliance mode as it requires the use of the DES cipher. Password -+authentication is requested with the @code{password} option, and then once QEMU -+is running the password is set with the monitor. Until the monitor is used to -+set the password all clients will be rejected. -+ -+@example -+@value{qemu_system} [...OPTIONS...] -vnc :1,password -monitor stdio -+(qemu) change vnc password -+Password: ******** -+(qemu) -+@end example -+ -+@node vnc_sec_certificate -+@subsection With x509 certificates -+ -+The QEMU VNC server also implements the VeNCrypt extension allowing use of -+TLS for encryption of the session, and x509 certificates for authentication. -+The use of x509 certificates is strongly recommended, because TLS on its -+own is susceptible to man-in-the-middle attacks. Basic x509 certificate -+support provides a secure session, but no authentication. This allows any -+client to connect, and provides an encrypted session. -+ -+@example -+@value{qemu_system} [...OPTIONS...] \ -+ -object tls-creds-x509,id=tls0,dir=/etc/pki/qemu,endpoint=server,verify-peer=no \ -+ -vnc :1,tls-creds=tls0 -monitor stdio -+@end example -+ -+In the above example @code{/etc/pki/qemu} should contain at least three files, -+@code{ca-cert.pem}, @code{server-cert.pem} and @code{server-key.pem}. Unprivileged -+users will want to use a private directory, for example @code{$HOME/.pki/qemu}. -+NB the @code{server-key.pem} file should be protected with file mode 0600 to -+only be readable by the user owning it. -+ -+@node vnc_sec_certificate_verify -+@subsection With x509 certificates and client verification -+ -+Certificates can also provide a means to authenticate the client connecting. -+The server will request that the client provide a certificate, which it will -+then validate against the CA certificate. This is a good choice if deploying -+in an environment with a private internal certificate authority. It uses the -+same syntax as previously, but with @code{verify-peer} set to @code{yes} -+instead. -+ -+@example -+@value{qemu_system} [...OPTIONS...] \ -+ -object tls-creds-x509,id=tls0,dir=/etc/pki/qemu,endpoint=server,verify-peer=yes \ -+ -vnc :1,tls-creds=tls0 -monitor stdio -+@end example -+ -+ -+@node vnc_sec_certificate_pw -+@subsection With x509 certificates, client verification and passwords -+ -+Finally, the previous method can be combined with VNC password authentication -+to provide two layers of authentication for clients. -+ -+@example -+@value{qemu_system} [...OPTIONS...] \ -+ -object tls-creds-x509,id=tls0,dir=/etc/pki/qemu,endpoint=server,verify-peer=yes \ -+ -vnc :1,tls-creds=tls0,password -monitor stdio -+(qemu) change vnc password -+Password: ******** -+(qemu) -+@end example -+ -+ -+@node vnc_sec_sasl -+@subsection With SASL authentication -+ -+The SASL authentication method is a VNC extension, that provides an -+easily extendable, pluggable authentication method. This allows for -+integration with a wide range of authentication mechanisms, such as -+PAM, GSSAPI/Kerberos, LDAP, SQL databases, one-time keys and more. -+The strength of the authentication depends on the exact mechanism -+configured. If the chosen mechanism also provides a SSF layer, then -+it will encrypt the datastream as well. -+ -+Refer to the later docs on how to choose the exact SASL mechanism -+used for authentication, but assuming use of one supporting SSF, -+then QEMU can be launched with: -+ -+@example -+@value{qemu_system} [...OPTIONS...] -vnc :1,sasl -monitor stdio -+@end example -+ -+@node vnc_sec_certificate_sasl -+@subsection With x509 certificates and SASL authentication -+ -+If the desired SASL authentication mechanism does not supported -+SSF layers, then it is strongly advised to run it in combination -+with TLS and x509 certificates. This provides securely encrypted -+data stream, avoiding risk of compromising of the security -+credentials. This can be enabled, by combining the 'sasl' option -+with the aforementioned TLS + x509 options: -+ -+@example -+@value{qemu_system} [...OPTIONS...] \ -+ -object tls-creds-x509,id=tls0,dir=/etc/pki/qemu,endpoint=server,verify-peer=yes \ -+ -vnc :1,tls-creds=tls0,sasl -monitor stdio -+@end example -+ -+@node vnc_setup_sasl -+ -+@subsection Configuring SASL mechanisms -+ -+The following documentation assumes use of the Cyrus SASL implementation on a -+Linux host, but the principles should apply to any other SASL implementation -+or host. When SASL is enabled, the mechanism configuration will be loaded from -+system default SASL service config /etc/sasl2/qemu.conf. If running QEMU as an -+unprivileged user, an environment variable SASL_CONF_PATH can be used to make -+it search alternate locations for the service config file. -+ -+If the TLS option is enabled for VNC, then it will provide session encryption, -+otherwise the SASL mechanism will have to provide encryption. In the latter -+case the list of possible plugins that can be used is drastically reduced. In -+fact only the GSSAPI SASL mechanism provides an acceptable level of security -+by modern standards. Previous versions of QEMU referred to the DIGEST-MD5 -+mechanism, however, it has multiple serious flaws described in detail in -+RFC 6331 and thus should never be used any more. The SCRAM-SHA-1 mechanism -+provides a simple username/password auth facility similar to DIGEST-MD5, but -+does not support session encryption, so can only be used in combination with -+TLS. -+ -+When not using TLS the recommended configuration is -+ -+@example -+mech_list: gssapi -+keytab: /etc/qemu/krb5.tab -+@end example -+ -+This says to use the 'GSSAPI' mechanism with the Kerberos v5 protocol, with -+the server principal stored in /etc/qemu/krb5.tab. For this to work the -+administrator of your KDC must generate a Kerberos principal for the server, -+with a name of 'qemu/somehost.example.com@@EXAMPLE.COM' replacing -+'somehost.example.com' with the fully qualified host name of the machine -+running QEMU, and 'EXAMPLE.COM' with the Kerberos Realm. -+ -+When using TLS, if username+password authentication is desired, then a -+reasonable configuration is -+ -+@example -+mech_list: scram-sha-1 -+sasldb_path: /etc/qemu/passwd.db -+@end example -+ -+The @code{saslpasswd2} program can be used to populate the @code{passwd.db} -+file with accounts. -+ -+Other SASL configurations will be left as an exercise for the reader. Note that -+all mechanisms, except GSSAPI, should be combined with use of TLS to ensure a -+secure data channel. -+ -+ -+@node network_tls -+@section TLS setup for network services -+ -+Almost all network services in QEMU have the ability to use TLS for -+session data encryption, along with x509 certificates for simple -+client authentication. What follows is a description of how to -+generate certificates suitable for usage with QEMU, and applies to -+the VNC server, character devices with the TCP backend, NBD server -+and client, and migration server and client. -+ -+At a high level, QEMU requires certificates and private keys to be -+provided in PEM format. Aside from the core fields, the certificates -+should include various extension data sets, including v3 basic -+constraints data, key purpose, key usage and subject alt name. -+ -+The GnuTLS package includes a command called @code{certtool} which can -+be used to easily generate certificates and keys in the required format -+with expected data present. Alternatively a certificate management -+service may be used. -+ -+At a minimum it is necessary to setup a certificate authority, and -+issue certificates to each server. If using x509 certificates for -+authentication, then each client will also need to be issued a -+certificate. -+ -+Assuming that the QEMU network services will only ever be exposed to -+clients on a private intranet, there is no need to use a commercial -+certificate authority to create certificates. A self-signed CA is -+sufficient, and in fact likely to be more secure since it removes -+the ability of malicious 3rd parties to trick the CA into mis-issuing -+certs for impersonating your services. The only likely exception -+where a commercial CA might be desirable is if enabling the VNC -+websockets server and exposing it directly to remote browser clients. -+In such a case it might be useful to use a commercial CA to avoid -+needing to install custom CA certs in the web browsers. -+ -+The recommendation is for the server to keep its certificates in either -+@code{/etc/pki/qemu} or for unprivileged users in @code{$HOME/.pki/qemu}. -+ -+@menu -+* tls_generate_ca:: -+* tls_generate_server:: -+* tls_generate_client:: -+* tls_creds_setup:: -+* tls_psk:: -+@end menu -+@node tls_generate_ca -+@subsection Setup the Certificate Authority -+ -+This step only needs to be performed once per organization / organizational -+unit. First the CA needs a private key. This key must be kept VERY secret -+and secure. If this key is compromised the entire trust chain of the certificates -+issued with it is lost. -+ -+@example -+# certtool --generate-privkey > ca-key.pem -+@end example -+ -+To generate a self-signed certificate requires one core piece of information, -+the name of the organization. A template file @code{ca.info} should be -+populated with the desired data to avoid having to deal with interactive -+prompts from certtool: -+@example -+# cat > ca.info < server-hostNNN.info < server-hostNNN-key.pem -+# certtool --generate-certificate \ -+ --load-ca-certificate ca-cert.pem \ -+ --load-ca-privkey ca-key.pem \ -+ --load-privkey server-hostNNN-key.pem \ -+ --template server-hostNNN.info \ -+ --outfile server-hostNNN-cert.pem -+@end example -+ -+The @code{dns_name} and @code{ip_address} fields in the template are setting -+the subject alt name extension data. The @code{tls_www_server} keyword is the -+key purpose extension to indicate this certificate is intended for usage in -+a web server. Although QEMU network services are not in fact HTTP servers -+(except for VNC websockets), setting this key purpose is still recommended. -+The @code{encryption_key} and @code{signing_key} keyword is the key usage -+extension to indicate this certificate is intended for usage in the data -+session. -+ -+The @code{server-hostNNN-key.pem} and @code{server-hostNNN-cert.pem} files -+should now be securely copied to the server for which they were generated, -+and renamed to @code{server-key.pem} and @code{server-cert.pem} when added -+to the @code{/etc/pki/qemu} directory on the target host. The @code{server-key.pem} -+file is security sensitive and should be kept protected with file mode 0600 -+to prevent disclosure. -+ -+@node tls_generate_client -+@subsection Issuing client certificates -+ -+The QEMU x509 TLS credential setup defaults to enabling client verification -+using certificates, providing a simple authentication mechanism. If this -+default is used, each client also needs to be issued a certificate. The client -+certificate contains enough metadata to uniquely identify the client with the -+scope of the certificate authority. The client certificate would typically -+include fields for organization, state, city, building, etc. -+ -+Once again on the host holding the CA, create template files containing the -+information for each client, and use it to issue client certificates. -+ -+ -+@example -+# cat > client-hostNNN.info < client-hostNNN-key.pem -+# certtool --generate-certificate \ -+ --load-ca-certificate ca-cert.pem \ -+ --load-ca-privkey ca-key.pem \ -+ --load-privkey client-hostNNN-key.pem \ -+ --template client-hostNNN.info \ -+ --outfile client-hostNNN-cert.pem -+@end example -+ -+The subject alt name extension data is not required for clients, so the -+the @code{dns_name} and @code{ip_address} fields are not included. -+The @code{tls_www_client} keyword is the key purpose extension to indicate -+this certificate is intended for usage in a web client. Although QEMU -+network clients are not in fact HTTP clients, setting this key purpose is -+still recommended. The @code{encryption_key} and @code{signing_key} keyword -+is the key usage extension to indicate this certificate is intended for -+usage in the data session. -+ -+The @code{client-hostNNN-key.pem} and @code{client-hostNNN-cert.pem} files -+should now be securely copied to the client for which they were generated, -+and renamed to @code{client-key.pem} and @code{client-cert.pem} when added -+to the @code{/etc/pki/qemu} directory on the target host. The @code{client-key.pem} -+file is security sensitive and should be kept protected with file mode 0600 -+to prevent disclosure. -+ -+If a single host is going to be using TLS in both a client and server -+role, it is possible to create a single certificate to cover both roles. -+This would be quite common for the migration and NBD services, where a -+QEMU process will be started by accepting a TLS protected incoming migration, -+and later itself be migrated out to another host. To generate a single -+certificate, simply include the template data from both the client and server -+instructions in one. -+ -+@example -+# cat > both-hostNNN.info < both-hostNNN-key.pem -+# certtool --generate-certificate \ -+ --load-ca-certificate ca-cert.pem \ -+ --load-ca-privkey ca-key.pem \ -+ --load-privkey both-hostNNN-key.pem \ -+ --template both-hostNNN.info \ -+ --outfile both-hostNNN-cert.pem -+@end example -+ -+When copying the PEM files to the target host, save them twice, -+once as @code{server-cert.pem} and @code{server-key.pem}, and -+again as @code{client-cert.pem} and @code{client-key.pem}. -+ -+@node tls_creds_setup -+@subsection TLS x509 credential configuration -+ -+QEMU has a standard mechanism for loading x509 credentials that will be -+used for network services and clients. It requires specifying the -+@code{tls-creds-x509} class name to the @code{--object} command line -+argument for the system emulators. Each set of credentials loaded should -+be given a unique string identifier via the @code{id} parameter. A single -+set of TLS credentials can be used for multiple network backends, so VNC, -+migration, NBD, character devices can all share the same credentials. Note, -+however, that credentials for use in a client endpoint must be loaded -+separately from those used in a server endpoint. -+ -+When specifying the object, the @code{dir} parameters specifies which -+directory contains the credential files. This directory is expected to -+contain files with the names mentioned previously, @code{ca-cert.pem}, -+@code{server-key.pem}, @code{server-cert.pem}, @code{client-key.pem} -+and @code{client-cert.pem} as appropriate. It is also possible to -+include a set of pre-generated Diffie-Hellman (DH) parameters in a file -+@code{dh-params.pem}, which can be created using the -+@code{certtool --generate-dh-params} command. If omitted, QEMU will -+dynamically generate DH parameters when loading the credentials. -+ -+The @code{endpoint} parameter indicates whether the credentials will -+be used for a network client or server, and determines which PEM -+files are loaded. -+ -+The @code{verify} parameter determines whether x509 certificate -+validation should be performed. This defaults to enabled, meaning -+clients will always validate the server hostname against the -+certificate subject alt name fields and/or CN field. It also -+means that servers will request that clients provide a certificate -+and validate them. Verification should never be turned off for -+client endpoints, however, it may be turned off for server endpoints -+if an alternative mechanism is used to authenticate clients. For -+example, the VNC server can use SASL to authenticate clients -+instead. -+ -+To load server credentials with client certificate validation -+enabled -+ -+@example -+@value{qemu_system} -object tls-creds-x509,id=tls0,dir=/etc/pki/qemu,endpoint=server -+@end example -+ -+while to load client credentials use -+ -+@example -+@value{qemu_system} -object tls-creds-x509,id=tls0,dir=/etc/pki/qemu,endpoint=client -+@end example -+ -+Network services which support TLS will all have a @code{tls-creds} -+parameter which expects the ID of the TLS credentials object. For -+example with VNC: -+ -+@example -+@value{qemu_system} -vnc 0.0.0.0:0,tls-creds=tls0 -+@end example -+ -+@node tls_psk -+@subsection TLS Pre-Shared Keys (PSK) -+ -+Instead of using certificates, you may also use TLS Pre-Shared Keys -+(TLS-PSK). This can be simpler to set up than certificates but is -+less scalable. -+ -+Use the GnuTLS @code{psktool} program to generate a @code{keys.psk} -+file containing one or more usernames and random keys: -+ -+@example -+mkdir -m 0700 /tmp/keys -+psktool -u rich -p /tmp/keys/keys.psk -+@end example -+ -+TLS-enabled servers such as qemu-nbd can use this directory like so: -+ -+@example -+qemu-nbd \ -+ -t -x / \ -+ --object tls-creds-psk,id=tls0,endpoint=server,dir=/tmp/keys \ -+ --tls-creds tls0 \ -+ image.qcow2 -+@end example -+ -+When connecting from a qemu-based client you must specify the -+directory containing @code{keys.psk} and an optional @var{username} -+(defaults to ``qemu''): -+ -+@example -+qemu-img info \ -+ --object tls-creds-psk,id=tls0,dir=/tmp/keys,username=rich,endpoint=client \ -+ --image-opts \ -+ file.driver=nbd,file.host=localhost,file.port=10809,file.tls-creds=tls0,file.export=/ -+@end example -+ -+@node gdb_usage -+@section GDB usage -+ -+QEMU has a primitive support to work with gdb, so that you can do -+'Ctrl-C' while the virtual machine is running and inspect its state. -+ -+In order to use gdb, launch QEMU with the '-s' option. It will wait for a -+gdb connection: -+@example -+@value{qemu_system} -s -kernel bzImage -hda rootdisk.img -append "root=/dev/hda" -+Connected to host network interface: tun0 -+Waiting gdb connection on port 1234 -+@end example -+ -+Then launch gdb on the 'vmlinux' executable: -+@example -+> gdb vmlinux -+@end example -+ -+In gdb, connect to QEMU: -+@example -+(gdb) target remote localhost:1234 -+@end example -+ -+Then you can use gdb normally. For example, type 'c' to launch the kernel: -+@example -+(gdb) c -+@end example -+ -+Here are some useful tips in order to use gdb on system code: -+ -+@enumerate -+@item -+Use @code{info reg} to display all the CPU registers. -+@item -+Use @code{x/10i $eip} to display the code at the PC position. -+@item -+Use @code{set architecture i8086} to dump 16 bit code. Then use -+@code{x/10i $cs*16+$eip} to dump the code at the PC position. -+@end enumerate -+ -+Advanced debugging options: -+ -+The default single stepping behavior is step with the IRQs and timer service routines off. It is set this way because when gdb executes a single step it expects to advance beyond the current instruction. With the IRQs and timer service routines on, a single step might jump into the one of the interrupt or exception vectors instead of executing the current instruction. This means you may hit the same breakpoint a number of times before executing the instruction gdb wants to have executed. Because there are rare circumstances where you want to single step into an interrupt vector the behavior can be controlled from GDB. There are three commands you can query and set the single step behavior: -+@table @code -+@item maintenance packet qqemu.sstepbits -+ -+This will display the MASK bits used to control the single stepping IE: -+@example -+(gdb) maintenance packet qqemu.sstepbits -+sending: "qqemu.sstepbits" -+received: "ENABLE=1,NOIRQ=2,NOTIMER=4" -+@end example -+@item maintenance packet qqemu.sstep -+ -+This will display the current value of the mask used when single stepping IE: -+@example -+(gdb) maintenance packet qqemu.sstep -+sending: "qqemu.sstep" -+received: "0x7" -+@end example -+@item maintenance packet Qqemu.sstep=HEX_VALUE -+ -+This will change the single step mask, so if wanted to enable IRQs on the single step, but not timers, you would use: -+@example -+(gdb) maintenance packet Qqemu.sstep=0x5 -+sending: "qemu.sstep=0x5" -+received: "OK" -+@end example -+@end table -+ -+@node pcsys_os_specific -+@section Target OS specific information -+ -+@subsection Linux -+ -+To have access to SVGA graphic modes under X11, use the @code{vesa} or -+the @code{cirrus} X11 driver. For optimal performances, use 16 bit -+color depth in the guest and the host OS. -+ -+When using a 2.6 guest Linux kernel, you should add the option -+@code{clock=pit} on the kernel command line because the 2.6 Linux -+kernels make very strict real time clock checks by default that QEMU -+cannot simulate exactly. -+ -+When using a 2.6 guest Linux kernel, verify that the 4G/4G patch is -+not activated because QEMU is slower with this patch. The QEMU -+Accelerator Module is also much slower in this case. Earlier Fedora -+Core 3 Linux kernel (< 2.6.9-1.724_FC3) were known to incorporate this -+patch by default. Newer kernels don't have it. -+ -+@subsection Windows -+ -+If you have a slow host, using Windows 95 is better as it gives the -+best speed. Windows 2000 is also a good choice. -+ -+@subsubsection SVGA graphic modes support -+ -+QEMU emulates a Cirrus Logic GD5446 Video -+card. All Windows versions starting from Windows 95 should recognize -+and use this graphic card. For optimal performances, use 16 bit color -+depth in the guest and the host OS. -+ -+If you are using Windows XP as guest OS and if you want to use high -+resolution modes which the Cirrus Logic BIOS does not support (i.e. >= -+1280x1024x16), then you should use the VESA VBE virtual graphic card -+(option @option{-std-vga}). -+ -+@subsubsection CPU usage reduction -+ -+Windows 9x does not correctly use the CPU HLT -+instruction. The result is that it takes host CPU cycles even when -+idle. You can install the utility from -+@url{https://web.archive.org/web/20060212132151/http://www.user.cityline.ru/~maxamn/amnhltm.zip} -+to solve this problem. Note that no such tool is needed for NT, 2000 or XP. -+ -+@subsubsection Windows 2000 disk full problem -+ -+Windows 2000 has a bug which gives a disk full problem during its -+installation. When installing it, use the @option{-win2k-hack} QEMU -+option to enable a specific workaround. After Windows 2000 is -+installed, you no longer need this option (this option slows down the -+IDE transfers). -+ -+@subsubsection Windows 2000 shutdown -+ -+Windows 2000 cannot automatically shutdown in QEMU although Windows 98 -+can. It comes from the fact that Windows 2000 does not automatically -+use the APM driver provided by the BIOS. -+ -+In order to correct that, do the following (thanks to Struan -+Bartlett): go to the Control Panel => Add/Remove Hardware & Next => -+Add/Troubleshoot a device => Add a new device & Next => No, select the -+hardware from a list & Next => NT Apm/Legacy Support & Next => Next -+(again) a few times. Now the driver is installed and Windows 2000 now -+correctly instructs QEMU to shutdown at the appropriate moment. -+ -+@subsubsection Share a directory between Unix and Windows -+ -+See @ref{sec_invocation} about the help of the option -+@option{'-netdev user,smb=...'}. -+ -+@subsubsection Windows XP security problem -+ -+Some releases of Windows XP install correctly but give a security -+error when booting: -+@example -+A problem is preventing Windows from accurately checking the -+license for this computer. Error code: 0x800703e6. -+@end example -+ -+The workaround is to install a service pack for XP after a boot in safe -+mode. Then reboot, and the problem should go away. Since there is no -+network while in safe mode, its recommended to download the full -+installation of SP1 or SP2 and transfer that via an ISO or using the -+vvfat block device ("-hdb fat:directory_which_holds_the_SP"). -+ -+@subsection MS-DOS and FreeDOS -+ -+@subsubsection CPU usage reduction -+ -+DOS does not correctly use the CPU HLT instruction. The result is that -+it takes host CPU cycles even when idle. You can install the utility from -+@url{https://web.archive.org/web/20051222085335/http://www.vmware.com/software/dosidle210.zip} -+to solve this problem. -+ -+@node QEMU System emulator for non PC targets -+@chapter QEMU System emulator for non PC targets -+ -+QEMU is a generic emulator and it emulates many non PC -+machines. Most of the options are similar to the PC emulator. The -+differences are mentioned in the following sections. -+ -+@menu -+* PowerPC System emulator:: -+* Sparc32 System emulator:: -+* Sparc64 System emulator:: -+* MIPS System emulator:: -+* ARM System emulator:: -+* ColdFire System emulator:: -+* Cris System emulator:: -+* Microblaze System emulator:: -+* SH4 System emulator:: -+* Xtensa System emulator:: -+@end menu -+ -+@node PowerPC System emulator -+@section PowerPC System emulator -+@cindex system emulation (PowerPC) -+ -+Use the executable @file{qemu-system-ppc} to simulate a complete 40P (PREP) -+or PowerMac PowerPC system. -+ -+QEMU emulates the following PowerMac peripherals: -+ -+@itemize @minus -+@item -+UniNorth or Grackle PCI Bridge -+@item -+PCI VGA compatible card with VESA Bochs Extensions -+@item -+2 PMAC IDE interfaces with hard disk and CD-ROM support -+@item -+NE2000 PCI adapters -+@item -+Non Volatile RAM -+@item -+VIA-CUDA with ADB keyboard and mouse. -+@end itemize -+ -+QEMU emulates the following 40P (PREP) peripherals: -+ -+@itemize @minus -+@item -+PCI Bridge -+@item -+PCI VGA compatible card with VESA Bochs Extensions -+@item -+2 IDE interfaces with hard disk and CD-ROM support -+@item -+Floppy disk -+@item -+PCnet network adapters -+@item -+Serial port -+@item -+PREP Non Volatile RAM -+@item -+PC compatible keyboard and mouse. -+@end itemize -+ -+Since version 0.9.1, QEMU uses OpenBIOS @url{https://www.openbios.org/} -+for the g3beige and mac99 PowerMac and the 40p machines. OpenBIOS is a free -+(GPL v2) portable firmware implementation. The goal is to implement a 100% -+IEEE 1275-1994 (referred to as Open Firmware) compliant firmware. -+ -+@c man begin OPTIONS -+ -+The following options are specific to the PowerPC emulation: -+ -+@table @option -+ -+@item -g @var{W}x@var{H}[x@var{DEPTH}] -+ -+Set the initial VGA graphic mode. The default is 800x600x32. -+ -+@item -prom-env @var{string} -+ -+Set OpenBIOS variables in NVRAM, for example: -+ -+@example -+qemu-kvm -prom-env 'auto-boot?=false' \ -+ -prom-env 'boot-device=hd:2,\yaboot' \ -+ -prom-env 'boot-args=conf=hd:2,\yaboot.conf' -+@end example -+ -+@end table -+ -+@c man end -+ -+ -+More information is available at -+@url{http://perso.magic.fr/l_indien/qemu-ppc/}. -+ -+@node Sparc32 System emulator -+@section Sparc32 System emulator -+@cindex system emulation (Sparc32) -+ -+Use the executable @file{qemu-system-sparc} to simulate the following -+Sun4m architecture machines: -+@itemize @minus -+@item -+SPARCstation 4 -+@item -+SPARCstation 5 -+@item -+SPARCstation 10 -+@item -+SPARCstation 20 -+@item -+SPARCserver 600MP -+@item -+SPARCstation LX -+@item -+SPARCstation Voyager -+@item -+SPARCclassic -+@item -+SPARCbook -+@end itemize -+ -+The emulation is somewhat complete. SMP up to 16 CPUs is supported, -+but Linux limits the number of usable CPUs to 4. -+ -+QEMU emulates the following sun4m peripherals: -+ -+@itemize @minus -+@item -+IOMMU -+@item -+TCX or cgthree Frame buffer -+@item -+Lance (Am7990) Ethernet -+@item -+Non Volatile RAM M48T02/M48T08 -+@item -+Slave I/O: timers, interrupt controllers, Zilog serial ports, keyboard -+and power/reset logic -+@item -+ESP SCSI controller with hard disk and CD-ROM support -+@item -+Floppy drive (not on SS-600MP) -+@item -+CS4231 sound device (only on SS-5, not working yet) -+@end itemize -+ -+The number of peripherals is fixed in the architecture. Maximum -+memory size depends on the machine type, for SS-5 it is 256MB and for -+others 2047MB. -+ -+Since version 0.8.2, QEMU uses OpenBIOS -+@url{https://www.openbios.org/}. OpenBIOS is a free (GPL v2) portable -+firmware implementation. The goal is to implement a 100% IEEE -+1275-1994 (referred to as Open Firmware) compliant firmware. -+ -+A sample Linux 2.6 series kernel and ram disk image are available on -+the QEMU web site. There are still issues with NetBSD and OpenBSD, but -+most kernel versions work. Please note that currently older Solaris kernels -+don't work probably due to interface issues between OpenBIOS and -+Solaris. -+ -+@c man begin OPTIONS -+ -+The following options are specific to the Sparc32 emulation: -+ -+@table @option -+ -+@item -g @var{W}x@var{H}x[x@var{DEPTH}] -+ -+Set the initial graphics mode. For TCX, the default is 1024x768x8 with the -+option of 1024x768x24. For cgthree, the default is 1024x768x8 with the option -+of 1152x900x8 for people who wish to use OBP. -+ -+@item -prom-env @var{string} -+ -+Set OpenBIOS variables in NVRAM, for example: -+ -+@example -+qemu-system-sparc -prom-env 'auto-boot?=false' \ -+ -prom-env 'boot-device=sd(0,2,0):d' -prom-env 'boot-args=linux single' -+@end example -+ -+@item -M [SS-4|SS-5|SS-10|SS-20|SS-600MP|LX|Voyager|SPARCClassic] [|SPARCbook] -+ -+Set the emulated machine type. Default is SS-5. -+ -+@end table -+ -+@c man end -+ -+@node Sparc64 System emulator -+@section Sparc64 System emulator -+@cindex system emulation (Sparc64) -+ -+Use the executable @file{qemu-system-sparc64} to simulate a Sun4u -+(UltraSPARC PC-like machine), Sun4v (T1 PC-like machine), or generic -+Niagara (T1) machine. The Sun4u emulator is mostly complete, being -+able to run Linux, NetBSD and OpenBSD in headless (-nographic) mode. The -+Sun4v emulator is still a work in progress. -+ -+The Niagara T1 emulator makes use of firmware and OS binaries supplied in the S10image/ directory -+of the OpenSPARC T1 project @url{http://download.oracle.com/technetwork/systems/opensparc/OpenSPARCT1_Arch.1.5.tar.bz2} -+and is able to boot the disk.s10hw2 Solaris image. -+@example -+qemu-system-sparc64 -M niagara -L /path-to/S10image/ \ -+ -nographic -m 256 \ -+ -drive if=pflash,readonly=on,file=/S10image/disk.s10hw2 -+@end example -+ -+ -+QEMU emulates the following peripherals: -+ -+@itemize @minus -+@item -+UltraSparc IIi APB PCI Bridge -+@item -+PCI VGA compatible card with VESA Bochs Extensions -+@item -+PS/2 mouse and keyboard -+@item -+Non Volatile RAM M48T59 -+@item -+PC-compatible serial ports -+@item -+2 PCI IDE interfaces with hard disk and CD-ROM support -+@item -+Floppy disk -+@end itemize -+ -+@c man begin OPTIONS -+ -+The following options are specific to the Sparc64 emulation: -+ -+@table @option -+ -+@item -prom-env @var{string} -+ -+Set OpenBIOS variables in NVRAM, for example: -+ -+@example -+qemu-system-sparc64 -prom-env 'auto-boot?=false' -+@end example -+ -+@item -M [sun4u|sun4v|niagara] -+ -+Set the emulated machine type. The default is sun4u. -+ -+@end table -+ -+@c man end -+ -+@node MIPS System emulator -+@section MIPS System emulator -+@cindex system emulation (MIPS) -+ -+@menu -+* nanoMIPS System emulator :: -+@end menu -+ -+Four executables cover simulation of 32 and 64-bit MIPS systems in -+both endian options, @file{qemu-system-mips}, @file{qemu-system-mipsel} -+@file{qemu-system-mips64} and @file{qemu-system-mips64el}. -+Five different machine types are emulated: -+ -+@itemize @minus -+@item -+A generic ISA PC-like machine "mips" -+@item -+The MIPS Malta prototype board "malta" -+@item -+An ACER Pica "pica61". This machine needs the 64-bit emulator. -+@item -+MIPS emulator pseudo board "mipssim" -+@item -+A MIPS Magnum R4000 machine "magnum". This machine needs the 64-bit emulator. -+@end itemize -+ -+The generic emulation is supported by Debian 'Etch' and is able to -+install Debian into a virtual disk image. The following devices are -+emulated: -+ -+@itemize @minus -+@item -+A range of MIPS CPUs, default is the 24Kf -+@item -+PC style serial port -+@item -+PC style IDE disk -+@item -+NE2000 network card -+@end itemize -+ -+The Malta emulation supports the following devices: -+ -+@itemize @minus -+@item -+Core board with MIPS 24Kf CPU and Galileo system controller -+@item -+PIIX4 PCI/USB/SMbus controller -+@item -+The Multi-I/O chip's serial device -+@item -+PCI network cards (PCnet32 and others) -+@item -+Malta FPGA serial device -+@item -+Cirrus (default) or any other PCI VGA graphics card -+@end itemize -+ -+The Boston board emulation supports the following devices: -+ -+@itemize @minus -+@item -+Xilinx FPGA, which includes a PCIe root port and an UART -+@item -+Intel EG20T PCH connects the I/O peripherals, but only the SATA bus is emulated -+@end itemize -+ -+The ACER Pica emulation supports: -+ -+@itemize @minus -+@item -+MIPS R4000 CPU -+@item -+PC-style IRQ and DMA controllers -+@item -+PC Keyboard -+@item -+IDE controller -+@end itemize -+ -+The MIPS Magnum R4000 emulation supports: -+ -+@itemize @minus -+@item -+MIPS R4000 CPU -+@item -+PC-style IRQ controller -+@item -+PC Keyboard -+@item -+SCSI controller -+@item -+G364 framebuffer -+@end itemize -+ -+The Fulong 2E emulation supports: -+ -+@itemize @minus -+@item -+Loongson 2E CPU -+@item -+Bonito64 system controller as North Bridge -+@item -+VT82C686 chipset as South Bridge -+@item -+RTL8139D as a network card chipset -+@end itemize -+ -+The mipssim pseudo board emulation provides an environment similar -+to what the proprietary MIPS emulator uses for running Linux. -+It supports: -+ -+@itemize @minus -+@item -+A range of MIPS CPUs, default is the 24Kf -+@item -+PC style serial port -+@item -+MIPSnet network emulation -+@end itemize -+ -+@node nanoMIPS System emulator -+@subsection nanoMIPS System emulator -+@cindex system emulation (nanoMIPS) -+ -+Executable @file{qemu-system-mipsel} also covers simulation of -+32-bit nanoMIPS system in little endian mode: -+ -+@itemize @minus -+@item -+nanoMIPS I7200 CPU -+@end itemize -+ -+Example of @file{qemu-system-mipsel} usage for nanoMIPS is shown below: -+ -+Download @code{} from @url{https://mipsdistros.mips.com/LinuxDistro/nanomips/buildroot/index.html}. -+ -+Download @code{} from @url{https://mipsdistros.mips.com/LinuxDistro/nanomips/kernels/v4.15.18-432-gb2eb9a8b07a1-20180627102142/index.html}. -+ -+Start system emulation of Malta board with nanoMIPS I7200 CPU: -+@example -+qemu-system-mipsel -cpu I7200 -kernel @code{} \ -+ -M malta -serial stdio -m @code{} -hda @code{} \ -+ -append "mem=256m@@0x0 rw console=ttyS0 vga=cirrus vesa=0x111 root=/dev/sda" -+@end example -+ -+ -+@node ARM System emulator -+@section ARM System emulator -+@cindex system emulation (ARM) -+ -+Use the executable @file{qemu-system-arm} to simulate a ARM -+machine. The ARM Integrator/CP board is emulated with the following -+devices: -+ -+@itemize @minus -+@item -+ARM926E, ARM1026E, ARM946E, ARM1136 or Cortex-A8 CPU -+@item -+Two PL011 UARTs -+@item -+SMC 91c111 Ethernet adapter -+@item -+PL110 LCD controller -+@item -+PL050 KMI with PS/2 keyboard and mouse. -+@item -+PL181 MultiMedia Card Interface with SD card. -+@end itemize -+ -+The ARM Versatile baseboard is emulated with the following devices: -+ -+@itemize @minus -+@item -+ARM926E, ARM1136 or Cortex-A8 CPU -+@item -+PL190 Vectored Interrupt Controller -+@item -+Four PL011 UARTs -+@item -+SMC 91c111 Ethernet adapter -+@item -+PL110 LCD controller -+@item -+PL050 KMI with PS/2 keyboard and mouse. -+@item -+PCI host bridge. Note the emulated PCI bridge only provides access to -+PCI memory space. It does not provide access to PCI IO space. -+This means some devices (eg. ne2k_pci NIC) are not usable, and others -+(eg. rtl8139 NIC) are only usable when the guest drivers use the memory -+mapped control registers. -+@item -+PCI OHCI USB controller. -+@item -+LSI53C895A PCI SCSI Host Bus Adapter with hard disk and CD-ROM devices. -+@item -+PL181 MultiMedia Card Interface with SD card. -+@end itemize -+ -+Several variants of the ARM RealView baseboard are emulated, -+including the EB, PB-A8 and PBX-A9. Due to interactions with the -+bootloader, only certain Linux kernel configurations work out -+of the box on these boards. -+ -+Kernels for the PB-A8 board should have CONFIG_REALVIEW_HIGH_PHYS_OFFSET -+enabled in the kernel, and expect 512M RAM. Kernels for The PBX-A9 board -+should have CONFIG_SPARSEMEM enabled, CONFIG_REALVIEW_HIGH_PHYS_OFFSET -+disabled and expect 1024M RAM. -+ -+The following devices are emulated: -+ -+@itemize @minus -+@item -+ARM926E, ARM1136, ARM11MPCore, Cortex-A8 or Cortex-A9 MPCore CPU -+@item -+ARM AMBA Generic/Distributed Interrupt Controller -+@item -+Four PL011 UARTs -+@item -+SMC 91c111 or SMSC LAN9118 Ethernet adapter -+@item -+PL110 LCD controller -+@item -+PL050 KMI with PS/2 keyboard and mouse -+@item -+PCI host bridge -+@item -+PCI OHCI USB controller -+@item -+LSI53C895A PCI SCSI Host Bus Adapter with hard disk and CD-ROM devices -+@item -+PL181 MultiMedia Card Interface with SD card. -+@end itemize -+ -+The XScale-based clamshell PDA models ("Spitz", "Akita", "Borzoi" -+and "Terrier") emulation includes the following peripherals: -+ -+@itemize @minus -+@item -+Intel PXA270 System-on-chip (ARM V5TE core) -+@item -+NAND Flash memory -+@item -+IBM/Hitachi DSCM microdrive in a PXA PCMCIA slot - not in "Akita" -+@item -+On-chip OHCI USB controller -+@item -+On-chip LCD controller -+@item -+On-chip Real Time Clock -+@item -+TI ADS7846 touchscreen controller on SSP bus -+@item -+Maxim MAX1111 analog-digital converter on I@math{^2}C bus -+@item -+GPIO-connected keyboard controller and LEDs -+@item -+Secure Digital card connected to PXA MMC/SD host -+@item -+Three on-chip UARTs -+@item -+WM8750 audio CODEC on I@math{^2}C and I@math{^2}S busses -+@end itemize -+ -+The Palm Tungsten|E PDA (codename "Cheetah") emulation includes the -+following elements: -+ -+@itemize @minus -+@item -+Texas Instruments OMAP310 System-on-chip (ARM 925T core) -+@item -+ROM and RAM memories (ROM firmware image can be loaded with -option-rom) -+@item -+On-chip LCD controller -+@item -+On-chip Real Time Clock -+@item -+TI TSC2102i touchscreen controller / analog-digital converter / Audio -+CODEC, connected through MicroWire and I@math{^2}S busses -+@item -+GPIO-connected matrix keypad -+@item -+Secure Digital card connected to OMAP MMC/SD host -+@item -+Three on-chip UARTs -+@end itemize -+ -+Nokia N800 and N810 internet tablets (known also as RX-34 and RX-44 / 48) -+emulation supports the following elements: -+ -+@itemize @minus -+@item -+Texas Instruments OMAP2420 System-on-chip (ARM 1136 core) -+@item -+RAM and non-volatile OneNAND Flash memories -+@item -+Display connected to EPSON remote framebuffer chip and OMAP on-chip -+display controller and a LS041y3 MIPI DBI-C controller -+@item -+TI TSC2301 (in N800) and TI TSC2005 (in N810) touchscreen controllers -+driven through SPI bus -+@item -+National Semiconductor LM8323-controlled qwerty keyboard driven -+through I@math{^2}C bus -+@item -+Secure Digital card connected to OMAP MMC/SD host -+@item -+Three OMAP on-chip UARTs and on-chip STI debugging console -+@item -+Mentor Graphics "Inventra" dual-role USB controller embedded in a TI -+TUSB6010 chip - only USB host mode is supported -+@item -+TI TMP105 temperature sensor driven through I@math{^2}C bus -+@item -+TI TWL92230C power management companion with an RTC on I@math{^2}C bus -+@item -+Nokia RETU and TAHVO multi-purpose chips with an RTC, connected -+through CBUS -+@end itemize -+ -+The Luminary Micro Stellaris LM3S811EVB emulation includes the following -+devices: -+ -+@itemize @minus -+@item -+Cortex-M3 CPU core. -+@item -+64k Flash and 8k SRAM. -+@item -+Timers, UARTs, ADC and I@math{^2}C interface. -+@item -+OSRAM Pictiva 96x16 OLED with SSD0303 controller on I@math{^2}C bus. -+@end itemize -+ -+The Luminary Micro Stellaris LM3S6965EVB emulation includes the following -+devices: -+ -+@itemize @minus -+@item -+Cortex-M3 CPU core. -+@item -+256k Flash and 64k SRAM. -+@item -+Timers, UARTs, ADC, I@math{^2}C and SSI interfaces. -+@item -+OSRAM Pictiva 128x64 OLED with SSD0323 controller connected via SSI. -+@end itemize -+ -+The Freecom MusicPal internet radio emulation includes the following -+elements: -+ -+@itemize @minus -+@item -+Marvell MV88W8618 ARM core. -+@item -+32 MB RAM, 256 KB SRAM, 8 MB flash. -+@item -+Up to 2 16550 UARTs -+@item -+MV88W8xx8 Ethernet controller -+@item -+MV88W8618 audio controller, WM8750 CODEC and mixer -+@item -+128×64 display with brightness control -+@item -+2 buttons, 2 navigation wheels with button function -+@end itemize -+ -+The Siemens SX1 models v1 and v2 (default) basic emulation. -+The emulation includes the following elements: -+ -+@itemize @minus -+@item -+Texas Instruments OMAP310 System-on-chip (ARM 925T core) -+@item -+ROM and RAM memories (ROM firmware image can be loaded with -pflash) -+V1 -+1 Flash of 16MB and 1 Flash of 8MB -+V2 -+1 Flash of 32MB -+@item -+On-chip LCD controller -+@item -+On-chip Real Time Clock -+@item -+Secure Digital card connected to OMAP MMC/SD host -+@item -+Three on-chip UARTs -+@end itemize -+ -+A Linux 2.6 test image is available on the QEMU web site. More -+information is available in the QEMU mailing-list archive. -+ -+@c man begin OPTIONS -+ -+The following options are specific to the ARM emulation: -+ -+@table @option -+ -+@item -semihosting -+Enable semihosting syscall emulation. -+ -+On ARM this implements the "Angel" interface. -+ -+Note that this allows guest direct access to the host filesystem, -+so should only be used with trusted guest OS. -+ -+@end table -+ -+@c man end -+ -+@node ColdFire System emulator -+@section ColdFire System emulator -+@cindex system emulation (ColdFire) -+@cindex system emulation (M68K) -+ -+Use the executable @file{qemu-system-m68k} to simulate a ColdFire machine. -+The emulator is able to boot a uClinux kernel. -+ -+The M5208EVB emulation includes the following devices: -+ -+@itemize @minus -+@item -+MCF5208 ColdFire V2 Microprocessor (ISA A+ with EMAC). -+@item -+Three Two on-chip UARTs. -+@item -+Fast Ethernet Controller (FEC) -+@end itemize -+ -+The AN5206 emulation includes the following devices: -+ -+@itemize @minus -+@item -+MCF5206 ColdFire V2 Microprocessor. -+@item -+Two on-chip UARTs. -+@end itemize -+ -+@c man begin OPTIONS -+ -+The following options are specific to the ColdFire emulation: -+ -+@table @option -+ -+@item -semihosting -+Enable semihosting syscall emulation. -+ -+On M68K this implements the "ColdFire GDB" interface used by libgloss. -+ -+Note that this allows guest direct access to the host filesystem, -+so should only be used with trusted guest OS. -+ -+@end table -+ -+@c man end -+ -+@node Cris System emulator -+@section Cris System emulator -+@cindex system emulation (Cris) -+ -+TODO -+ -+@node Microblaze System emulator -+@section Microblaze System emulator -+@cindex system emulation (Microblaze) -+ -+TODO -+ -+@node SH4 System emulator -+@section SH4 System emulator -+@cindex system emulation (SH4) -+ -+TODO -+ -+@node Xtensa System emulator -+@section Xtensa System emulator -+@cindex system emulation (Xtensa) -+ -+Two executables cover simulation of both Xtensa endian options, -+@file{qemu-system-xtensa} and @file{qemu-system-xtensaeb}. -+Two different machine types are emulated: -+ -+@itemize @minus -+@item -+Xtensa emulator pseudo board "sim" -+@item -+Avnet LX60/LX110/LX200 board -+@end itemize -+ -+The sim pseudo board emulation provides an environment similar -+to one provided by the proprietary Tensilica ISS. -+It supports: -+ -+@itemize @minus -+@item -+A range of Xtensa CPUs, default is the DC232B -+@item -+Console and filesystem access via semihosting calls -+@end itemize -+ -+The Avnet LX60/LX110/LX200 emulation supports: -+ -+@itemize @minus -+@item -+A range of Xtensa CPUs, default is the DC232B -+@item -+16550 UART -+@item -+OpenCores 10/100 Mbps Ethernet MAC -+@end itemize -+ -+@c man begin OPTIONS -+ -+The following options are specific to the Xtensa emulation: -+ -+@table @option -+ -+@item -semihosting -+Enable semihosting syscall emulation. -+ -+Xtensa semihosting provides basic file IO calls, such as open/read/write/seek/select. -+Tensilica baremetal libc for ISS and linux platform "sim" use this interface. -+ -+Note that this allows guest direct access to the host filesystem, -+so should only be used with trusted guest OS. -+ -+@end table -+ -+@c man end -+ -+@node QEMU User space emulator -+@chapter QEMU User space emulator -+ -+@menu -+* Supported Operating Systems :: -+* Features:: -+* Linux User space emulator:: -+* BSD User space emulator :: -+@end menu -+ -+@node Supported Operating Systems -+@section Supported Operating Systems -+ -+The following OS are supported in user space emulation: -+ -+@itemize @minus -+@item -+Linux (referred as qemu-linux-user) -+@item -+BSD (referred as qemu-bsd-user) -+@end itemize -+ -+@node Features -+@section Features -+ -+QEMU user space emulation has the following notable features: -+ -+@table @strong -+@item System call translation: -+QEMU includes a generic system call translator. This means that -+the parameters of the system calls can be converted to fix -+endianness and 32/64-bit mismatches between hosts and targets. -+IOCTLs can be converted too. -+ -+@item POSIX signal handling: -+QEMU can redirect to the running program all signals coming from -+the host (such as @code{SIGALRM}), as well as synthesize signals from -+virtual CPU exceptions (for example @code{SIGFPE} when the program -+executes a division by zero). -+ -+QEMU relies on the host kernel to emulate most signal system -+calls, for example to emulate the signal mask. On Linux, QEMU -+supports both normal and real-time signals. -+ -+@item Threading: -+On Linux, QEMU can emulate the @code{clone} syscall and create a real -+host thread (with a separate virtual CPU) for each emulated thread. -+Note that not all targets currently emulate atomic operations correctly. -+x86 and ARM use a global lock in order to preserve their semantics. -+@end table -+ -+QEMU was conceived so that ultimately it can emulate itself. Although -+it is not very useful, it is an important test to show the power of the -+emulator. -+ -+@node Linux User space emulator -+@section Linux User space emulator -+ -+@menu -+* Quick Start:: -+* Wine launch:: -+* Command line options:: -+* Other binaries:: -+@end menu -+ -+@node Quick Start -+@subsection Quick Start -+ -+In order to launch a Linux process, QEMU needs the process executable -+itself and all the target (x86) dynamic libraries used by it. -+ -+@itemize -+ -+@item On x86, you can just try to launch any process by using the native -+libraries: -+ -+@example -+qemu-i386 -L / /bin/ls -+@end example -+ -+@code{-L /} tells that the x86 dynamic linker must be searched with a -+@file{/} prefix. -+ -+@item Since QEMU is also a linux process, you can launch QEMU with -+QEMU (NOTE: you can only do that if you compiled QEMU from the sources): -+ -+@example -+qemu-i386 -L / qemu-i386 -L / /bin/ls -+@end example -+ -+@item On non x86 CPUs, you need first to download at least an x86 glibc -+(@file{qemu-runtime-i386-XXX-.tar.gz} on the QEMU web page). Ensure that -+@code{LD_LIBRARY_PATH} is not set: -+ -+@example -+unset LD_LIBRARY_PATH -+@end example -+ -+Then you can launch the precompiled @file{ls} x86 executable: -+ -+@example -+qemu-i386 tests/i386/ls -+@end example -+You can look at @file{scripts/qemu-binfmt-conf.sh} so that -+QEMU is automatically launched by the Linux kernel when you try to -+launch x86 executables. It requires the @code{binfmt_misc} module in the -+Linux kernel. -+ -+@item The x86 version of QEMU is also included. You can try weird things such as: -+@example -+qemu-i386 /usr/local/qemu-i386/bin/qemu-i386 \ -+ /usr/local/qemu-i386/bin/ls-i386 -+@end example -+ -+@end itemize -+ -+@node Wine launch -+@subsection Wine launch -+ -+@itemize -+ -+@item Ensure that you have a working QEMU with the x86 glibc -+distribution (see previous section). In order to verify it, you must be -+able to do: -+ -+@example -+qemu-i386 /usr/local/qemu-i386/bin/ls-i386 -+@end example -+ -+@item Download the binary x86 Wine install -+(@file{qemu-XXX-i386-wine.tar.gz} on the QEMU web page). -+ -+@item Configure Wine on your account. Look at the provided script -+@file{/usr/local/qemu-i386/@/bin/wine-conf.sh}. Your previous -+@code{$@{HOME@}/.wine} directory is saved to @code{$@{HOME@}/.wine.org}. -+ -+@item Then you can try the example @file{putty.exe}: -+ -+@example -+qemu-i386 /usr/local/qemu-i386/wine/bin/wine \ -+ /usr/local/qemu-i386/wine/c/Program\ Files/putty.exe -+@end example -+ -+@end itemize -+ -+@node Command line options -+@subsection Command line options -+ -+@example -+@command{qemu-i386} [@option{-h]} [@option{-d]} [@option{-L} @var{path}] [@option{-s} @var{size}] [@option{-cpu} @var{model}] [@option{-g} @var{port}] [@option{-B} @var{offset}] [@option{-R} @var{size}] @var{program} [@var{arguments}...] -+@end example -+ -+@table @option -+@item -h -+Print the help -+@item -L path -+Set the x86 elf interpreter prefix (default=/usr/local/qemu-i386) -+@item -s size -+Set the x86 stack size in bytes (default=524288) -+@item -cpu model -+Select CPU model (-cpu help for list and additional feature selection) -+@item -E @var{var}=@var{value} -+Set environment @var{var} to @var{value}. -+@item -U @var{var} -+Remove @var{var} from the environment. -+@item -B offset -+Offset guest address by the specified number of bytes. This is useful when -+the address region required by guest applications is reserved on the host. -+This option is currently only supported on some hosts. -+@item -R size -+Pre-allocate a guest virtual address space of the given size (in bytes). -+"G", "M", and "k" suffixes may be used when specifying the size. -+@end table -+ -+Debug options: -+ -+@table @option -+@item -d item1,... -+Activate logging of the specified items (use '-d help' for a list of log items) -+@item -p pagesize -+Act as if the host page size was 'pagesize' bytes -+@item -g port -+Wait gdb connection to port -+@item -singlestep -+Run the emulation in single step mode. -+@end table -+ -+Environment variables: -+ -+@table @env -+@item QEMU_STRACE -+Print system calls and arguments similar to the 'strace' program -+(NOTE: the actual 'strace' program will not work because the user -+space emulator hasn't implemented ptrace). At the moment this is -+incomplete. All system calls that don't have a specific argument -+format are printed with information for six arguments. Many -+flag-style arguments don't have decoders and will show up as numbers. -+@end table -+ -+@node Other binaries -+@subsection Other binaries -+ -+@cindex user mode (Alpha) -+@command{qemu-alpha} TODO. -+ -+@cindex user mode (ARM) -+@command{qemu-armeb} TODO. -+ -+@cindex user mode (ARM) -+@command{qemu-arm} is also capable of running ARM "Angel" semihosted ELF -+binaries (as implemented by the arm-elf and arm-eabi Newlib/GDB -+configurations), and arm-uclinux bFLT format binaries. -+ -+@cindex user mode (ColdFire) -+@cindex user mode (M68K) -+@command{qemu-m68k} is capable of running semihosted binaries using the BDM -+(m5xxx-ram-hosted.ld) or m68k-sim (sim.ld) syscall interfaces, and -+coldfire uClinux bFLT format binaries. -+ -+The binary format is detected automatically. -+ -+@cindex user mode (Cris) -+@command{qemu-cris} TODO. -+ -+@cindex user mode (i386) -+@command{qemu-i386} TODO. -+@command{qemu-x86_64} TODO. -+ -+@cindex user mode (Microblaze) -+@command{qemu-microblaze} TODO. -+ -+@cindex user mode (MIPS) -+@command{qemu-mips} executes 32-bit big endian MIPS binaries (MIPS O32 ABI). -+ -+@command{qemu-mipsel} executes 32-bit little endian MIPS binaries (MIPS O32 ABI). -+ -+@command{qemu-mips64} executes 64-bit big endian MIPS binaries (MIPS N64 ABI). -+ -+@command{qemu-mips64el} executes 64-bit little endian MIPS binaries (MIPS N64 ABI). -+ -+@command{qemu-mipsn32} executes 32-bit big endian MIPS binaries (MIPS N32 ABI). -+ -+@command{qemu-mipsn32el} executes 32-bit little endian MIPS binaries (MIPS N32 ABI). -+ -+@cindex user mode (NiosII) -+@command{qemu-nios2} TODO. -+ -+@cindex user mode (PowerPC) -+@command{qemu-ppc64abi32} TODO. -+@command{qemu-ppc64} TODO. -+@command{qemu-ppc} TODO. -+ -+@cindex user mode (SH4) -+@command{qemu-sh4eb} TODO. -+@command{qemu-sh4} TODO. -+ -+@cindex user mode (SPARC) -+@command{qemu-sparc} can execute Sparc32 binaries (Sparc32 CPU, 32 bit ABI). -+ -+@command{qemu-sparc32plus} can execute Sparc32 and SPARC32PLUS binaries -+(Sparc64 CPU, 32 bit ABI). -+ -+@command{qemu-sparc64} can execute some Sparc64 (Sparc64 CPU, 64 bit ABI) and -+SPARC32PLUS binaries (Sparc64 CPU, 32 bit ABI). -+ -+@node BSD User space emulator -+@section BSD User space emulator -+ -+@menu -+* BSD Status:: -+* BSD Quick Start:: -+* BSD Command line options:: -+@end menu -+ -+@node BSD Status -+@subsection BSD Status -+ -+@itemize @minus -+@item -+target Sparc64 on Sparc64: Some trivial programs work. -+@end itemize -+ -+@node BSD Quick Start -+@subsection Quick Start -+ -+In order to launch a BSD process, QEMU needs the process executable -+itself and all the target dynamic libraries used by it. -+ -+@itemize -+ -+@item On Sparc64, you can just try to launch any process by using the native -+libraries: -+ -+@example -+qemu-sparc64 /bin/ls -+@end example -+ -+@end itemize -+ -+@node BSD Command line options -+@subsection Command line options -+ -+@example -+@command{qemu-sparc64} [@option{-h]} [@option{-d]} [@option{-L} @var{path}] [@option{-s} @var{size}] [@option{-bsd} @var{type}] @var{program} [@var{arguments}...] -+@end example -+ -+@table @option -+@item -h -+Print the help -+@item -L path -+Set the library root path (default=/) -+@item -s size -+Set the stack size in bytes (default=524288) -+@item -ignore-environment -+Start with an empty environment. Without this option, -+the initial environment is a copy of the caller's environment. -+@item -E @var{var}=@var{value} -+Set environment @var{var} to @var{value}. -+@item -U @var{var} -+Remove @var{var} from the environment. -+@item -bsd type -+Set the type of the emulated BSD Operating system. Valid values are -+FreeBSD, NetBSD and OpenBSD (default). -+@end table -+ -+Debug options: -+ -+@table @option -+@item -d item1,... -+Activate logging of the specified items (use '-d help' for a list of log items) -+@item -p pagesize -+Act as if the host page size was 'pagesize' bytes -+@item -singlestep -+Run the emulation in single step mode. -+@end table -+ -+@node System requirements -+@chapter System requirements -+ -+@section KVM kernel module -+ -+On x86_64 hosts, the default set of CPU features enabled by the KVM accelerator -+require the host to be running Linux v4.5 or newer. -+ -+The OpteronG[345] CPU models require KVM support for RDTSCP, which was -+added with Linux 4.5 which is supported by the major distros. And even -+if RHEL7 has kernel 3.10, KVM there has the required functionality there -+to make it close to a 4.5 or newer kernel. -+ -+@include docs/security.texi -+ -+@include qemu-tech.texi -+ -+@include qemu-deprecated.texi -+ -+@node Supported build platforms -+@appendix Supported build platforms -+ -+QEMU aims to support building and executing on multiple host OS platforms. -+This appendix outlines which platforms are the major build targets. These -+platforms are used as the basis for deciding upon the minimum required -+versions of 3rd party software QEMU depends on. The supported platforms -+are the targets for automated testing performed by the project when patches -+are submitted for review, and tested before and after merge. -+ -+If a platform is not listed here, it does not imply that QEMU won't work. -+If an unlisted platform has comparable software versions to a listed platform, -+there is every expectation that it will work. Bug reports are welcome for -+problems encountered on unlisted platforms unless they are clearly older -+vintage than what is described here. -+ -+Note that when considering software versions shipped in distros as support -+targets, QEMU considers only the version number, and assumes the features in -+that distro match the upstream release with the same version. In other words, -+if a distro backports extra features to the software in their distro, QEMU -+upstream code will not add explicit support for those backports, unless the -+feature is auto-detectable in a manner that works for the upstream releases -+too. -+ -+The Repology site @url{https://repology.org} is a useful resource to identify -+currently shipped versions of software in various operating systems, though -+it does not cover all distros listed below. -+ -+@section Linux OS -+ -+For distributions with frequent, short-lifetime releases, the project will -+aim to support all versions that are not end of life by their respective -+vendors. For the purposes of identifying supported software versions, the -+project will look at Fedora, Ubuntu, and openSUSE distros. Other short- -+lifetime distros will be assumed to ship similar software versions. -+ -+For distributions with long-lifetime releases, the project will aim to support -+the most recent major version at all times. Support for the previous major -+version will be dropped 2 years after the new major version is released, -+or when it reaches ``end of life''. For the purposes of identifying -+supported software versions, the project will look at RHEL, Debian, -+Ubuntu LTS, and SLES distros. Other long-lifetime distros will be -+assumed to ship similar software versions. -+ -+@section Windows -+ -+The project supports building with current versions of the MinGW toolchain, -+hosted on Linux. -+ -+@section macOS -+ -+The project supports building with the two most recent versions of macOS, with -+the current homebrew package set available. -+ -+@section FreeBSD -+ -+The project aims to support the all the versions which are not end of life. -+ -+@section NetBSD -+ -+The project aims to support the most recent major version at all times. Support -+for the previous major version will be dropped 2 years after the new major -+version is released. -+ -+@section OpenBSD -+ -+The project aims to support the all the versions which are not end of life. -+ -+@node License -+@appendix License -+ -+QEMU is a trademark of Fabrice Bellard. -+ -+QEMU is released under the -+@url{https://www.gnu.org/licenses/gpl-2.0.txt,GNU General Public License}, -+version 2. Parts of QEMU have specific licenses, see file -+@url{https://git.qemu.org/?p=qemu.git;a=blob_plain;f=LICENSE,LICENSE}. -+ -+@node Index -+@appendix Index -+@menu -+* Concept Index:: -+* Function Index:: -+* Keystroke Index:: -+* Program Index:: -+* Data Type Index:: -+* Variable Index:: -+@end menu -+ -+@node Concept Index -+@section Concept Index -+This is the main index. Should we combine all keywords in one index? TODO -+@printindex cp -+ -+@node Function Index -+@section Function Index -+This index could be used for command line options and monitor functions. -+@printindex fn -+ -+@node Keystroke Index -+@section Keystroke Index -+ -+This is a list of all keystrokes which have a special function -+in system emulation. -+ -+@printindex ky -+ -+@node Program Index -+@section Program Index -+@printindex pg -+ -+@node Data Type Index -+@section Data Type Index -+ -+This index could be used for qdev device names and options. -+ -+@printindex tp -+ -+@node Variable Index -+@section Variable Index -+@printindex vr -+ -+@bye +diff --git a/docs/defs.rst.inc b/docs/defs.rst.inc +index 48d05aa..d74dbde 100644 +--- a/docs/defs.rst.inc ++++ b/docs/defs.rst.inc +@@ -9,7 +9,7 @@ + but the manpages will end up misrendered with following normal text + incorrectly in boldface. + +-.. |qemu_system| replace:: qemu-system-x86_64 +-.. |qemu_system_x86| replace:: qemu_system-x86_64 ++.. |qemu_system| replace:: qemu-kvm ++.. |qemu_system_x86| replace:: qemu-kvm + .. |I2C| replace:: I\ :sup:`2`\ C + .. |I2S| replace:: I\ :sup:`2`\ S +diff --git a/docs/interop/live-block-operations.rst b/docs/interop/live-block-operations.rst +index 48afdc7..6650b2c 100644 +--- a/docs/interop/live-block-operations.rst ++++ b/docs/interop/live-block-operations.rst +@@ -129,7 +129,7 @@ To show some example invocations of command-line, we will use the + following invocation of QEMU, with a QMP server running over UNIX + socket:: + +- $ ./x86_64-softmmu/qemu-system-x86_64 -display none -no-user-config \ ++ $ qemu-kvm -display none -no-user-config \ + -M q35 -nodefaults -m 512 \ + -blockdev node-name=node-A,driver=qcow2,file.driver=file,file.node-name=file,file.filename=./a.qcow2 \ + -device virtio-blk,drive=node-A,id=virtio0 \ +@@ -694,7 +694,7 @@ instance, with the following invocation. (As noted earlier, for + simplicity's sake, the destination QEMU is started on the same host, but + it could be located elsewhere):: + +- $ ./x86_64-softmmu/qemu-system-x86_64 -display none -no-user-config \ ++ $ qemu-kvm -display none -no-user-config \ + -M q35 -nodefaults -m 512 \ + -blockdev node-name=node-TargetDisk,driver=qcow2,file.driver=file,file.node-name=file,file.filename=./target-disk.qcow2 \ + -device virtio-blk,drive=node-TargetDisk,id=virtio0 \ +diff --git a/docs/tools/qemu-trace-stap.rst b/docs/tools/qemu-trace-stap.rst +index fb70445..0d9a783 100644 +--- a/docs/tools/qemu-trace-stap.rst ++++ b/docs/tools/qemu-trace-stap.rst +@@ -45,19 +45,19 @@ The following commands are valid: + any of the listed names. If no *PATTERN* is given, the all possible + probes will be listed. + +- For example, to list all probes available in the ``qemu-system-x86_64`` ++ For example, to list all probes available in the ``qemu-kvm`` + binary: + + :: + +- $ qemu-trace-stap list qemu-system-x86_64 ++ $ qemu-trace-stap list qemu-kvm + + To filter the list to only cover probes related to QEMU's cryptographic + subsystem, in a binary outside ``$PATH`` + + :: + +- $ qemu-trace-stap list /opt/qemu/4.0.0/bin/qemu-system-x86_64 'qcrypto*' ++ $ qemu-trace-stap list /opt/qemu/4.0.0/bin/qemu-kvm 'qcrypto*' + + .. option:: run OPTIONS BINARY PATTERN... + +@@ -89,18 +89,18 @@ The following commands are valid: + Restrict the tracing session so that it only triggers for the process + identified by *PID*. + +- For example, to monitor all processes executing ``qemu-system-x86_64`` ++ For example, to monitor all processes executing ``qemu-kvm`` + as found on ``$PATH``, displaying all I/O related probes: + + :: + +- $ qemu-trace-stap run qemu-system-x86_64 'qio*' ++ $ qemu-trace-stap run qemu-kvm 'qio*' + + To monitor only the QEMU process with PID 1732 + + :: + +- $ qemu-trace-stap run --pid=1732 qemu-system-x86_64 'qio*' ++ $ qemu-trace-stap run --pid=1732 qemu-kvm 'qio*' + + To monitor QEMU processes running an alternative binary outside of + ``$PATH``, displaying verbose information about setup of the +@@ -108,7 +108,7 @@ The following commands are valid: + + :: + +- $ qemu-trace-stap -v run /opt/qemu/4.0.0/qemu-system-x86_64 'qio*' ++ $ qemu-trace-stap -v run /opt/qemu/4.0.0/qemu-kvm 'qio*' + + See also + -------- +diff --git a/docs/tools/virtiofsd.rst b/docs/tools/virtiofsd.rst +index 824e713..8449936 100644 +--- a/docs/tools/virtiofsd.rst ++++ b/docs/tools/virtiofsd.rst +@@ -116,7 +116,7 @@ Export ``/var/lib/fs/vm001/`` on vhost-user UNIX domain socket + :: + + host# virtiofsd --socket-path=/var/run/vm001-vhost-fs.sock -o source=/var/lib/fs/vm001 +- host# qemu-system-x86_64 \ ++ host# qemu-kvm \ + -chardev socket,id=char0,path=/var/run/vm001-vhost-fs.sock \ + -device vhost-user-fs-pci,chardev=char0,tag=myfs \ + -object memory-backend-memfd,id=mem,size=4G,share=on \ diff --git a/qemu-options.hx b/qemu-options.hx -index 43b0dbc..9b14fe8 100644 +index b969944..fe85a0e 100644 --- a/qemu-options.hx +++ b/qemu-options.hx -@@ -2887,11 +2887,11 @@ SRST +@@ -2891,11 +2891,11 @@ SRST :: @@ -3705,13 +153,13 @@ index 43b0dbc..9b14fe8 100644 - -netdev type=vhost-user,id=net0,chardev=chr0 \ - -device virtio-net-pci,netdev=net0 + qemu-kvm -m 512 -object memory-backend-file,id=mem,size=512M,mem-path=/hugetlbfs,share=on \ -+ -numa node,memdev=mem \ -+ -chardev socket,id=chr0,path=/path/to/socket \ -+ -netdev type=vhost-user,id=net0,chardev=chr0 \ -+ -device virtio-net-pci,netdev=net0 ++ -numa node,memdev=mem \ ++ -chardev socket,id=chr0,path=/path/to/socket \ ++ -netdev type=vhost-user,id=net0,chardev=chr0 \ ++ -device virtio-net-pci,netdev=net0 - ``-netdev hubport,id=id,hubid=hubid[,netdev=nd]`` - Create a hub port on the emulated hub with ID hubid. + ``-netdev vhost-vdpa,vhostdev=/path/to/dev`` + Establish a vhost-vdpa netdev. -- 1.8.3.1 diff --git a/0018-usb-xhci-Fix-PCI-capability-order.patch b/0018-usb-xhci-Fix-PCI-capability-order.patch index 4f5c1fc..81a8467 100644 --- a/0018-usb-xhci-Fix-PCI-capability-order.patch +++ b/0018-usb-xhci-Fix-PCI-capability-order.patch @@ -1,4 +1,4 @@ -From 6a0ad69ff5249d19e497ea902cd456c442febb80 Mon Sep 17 00:00:00 2001 +From 1cd3f04262da39a69509435c1db96c0c2a8ebd62 Mon Sep 17 00:00:00 2001 From: "Dr. David Alan Gilbert" Date: Fri, 5 May 2017 19:06:14 +0200 Subject: usb-xhci: Fix PCI capability order diff --git a/0019-virtio-scsi-Reject-scsi-cd-if-data-plane-enabled-RHE.patch b/0019-virtio-scsi-Reject-scsi-cd-if-data-plane-enabled-RHE.patch index 738713e..63a6d18 100644 --- a/0019-virtio-scsi-Reject-scsi-cd-if-data-plane-enabled-RHE.patch +++ b/0019-virtio-scsi-Reject-scsi-cd-if-data-plane-enabled-RHE.patch @@ -1,4 +1,4 @@ -From fed8a416435347899223bbfc260e57d8f8ddd20a Mon Sep 17 00:00:00 2001 +From 766fb0162dea8353a39f6eeff5ba90309cb0338e Mon Sep 17 00:00:00 2001 From: Fam Zheng Date: Wed, 14 Jun 2017 15:37:01 +0200 Subject: virtio-scsi: Reject scsi-cd if data plane enabled [RHEL only] @@ -45,7 +45,7 @@ Signed-off-by: Danilo C. L. de Paula 1 file changed, 9 insertions(+) diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c -index 9b72094..71614b4 100644 +index b497752..d3a64a6 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -814,6 +814,15 @@ static void virtio_scsi_hotplug(HotplugHandler *hotplug_dev, DeviceState *dev, diff --git a/0020-BZ1653590-Require-at-least-64kiB-pages-for-downstrea.patch b/0020-BZ1653590-Require-at-least-64kiB-pages-for-downstrea.patch index 32a70ef..2534964 100644 --- a/0020-BZ1653590-Require-at-least-64kiB-pages-for-downstrea.patch +++ b/0020-BZ1653590-Require-at-least-64kiB-pages-for-downstrea.patch @@ -1,4 +1,4 @@ -From 00aeb546c0f989cf0c4a9623bbac9b187b051d68 Mon Sep 17 00:00:00 2001 +From ff6425248e516c678db5bb85d59b5811c48bedaf Mon Sep 17 00:00:00 2001 From: David Gibson Date: Wed, 6 Feb 2019 03:58:56 +0000 Subject: BZ1653590: Require at least 64kiB pages for downstream guests & hosts diff --git a/0021-block-Versioned-x-blockdev-reopen-API-with-feature-f.patch b/0021-block-Versioned-x-blockdev-reopen-API-with-feature-f.patch index d0a3bd9..cc7fdca 100644 --- a/0021-block-Versioned-x-blockdev-reopen-API-with-feature-f.patch +++ b/0021-block-Versioned-x-blockdev-reopen-API-with-feature-f.patch @@ -1,4 +1,4 @@ -From 79b1a539f271440baa5d3ef4264c761175ca1c9d Mon Sep 17 00:00:00 2001 +From 2ce0d065e712fdfae74a52cfa5188791eaa7f848 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Fri, 13 Mar 2020 12:34:32 +0000 Subject: block: Versioned x-blockdev-reopen API with feature flag @@ -29,7 +29,7 @@ Signed-off-by: Danilo C. L. de Paula 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/qapi/block-core.json b/qapi/block-core.json -index 0e1c6a5..6d94f92 100644 +index b20332e..db4544d 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -4135,10 +4135,17 @@ diff --git a/0022-virtio-net-fix-removal-of-failover-device.patch b/0022-virtio-net-fix-removal-of-failover-device.patch new file mode 100644 index 0000000..8a2b5be --- /dev/null +++ b/0022-virtio-net-fix-removal-of-failover-device.patch @@ -0,0 +1,52 @@ +From 0e4d9f0332efd8417831815a414a5131f85e0a85 Mon Sep 17 00:00:00 2001 +From: Juan Quintela +Date: Fri, 3 Jul 2020 12:37:05 -0400 +Subject: virtio-net: fix removal of failover device + +RH-Author: Juan Quintela +Message-id: <20200703123705.7175-2-quintela@redhat.com> +Patchwork-id: 97901 +O-Subject: [RHEL-AV-8.2.1 qemu-kvm PATCH 1/1] virtio-net: fix removal of failover device +Bugzilla: 1820120 +RH-Acked-by: Stefan Hajnoczi +RH-Acked-by: Laurent Vivier +RH-Acked-by: Dr. David Alan Gilbert + +If you have a networking device and its virtio failover device, and +you remove them in this order: +- virtio device +- the real device + +You get qemu crash. +See bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1820120 + +Bug exist on qemu 4.2 and 5.0. +But in 5.0 don't shows because commit +77b06bba62034a87cc61a9c8de1309ae3e527d97 + +somehow papers over it. + +CC: Jason Wang +CC: Michael S. Tsirkin + +Signed-off-by: Juan Quintela +Signed-off-by: Danilo C. L. de Paula +--- + hw/net/virtio-net.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c +index 1596cb1..f82455b 100644 +--- a/hw/net/virtio-net.c ++++ b/hw/net/virtio-net.c +@@ -3417,6 +3417,7 @@ static void virtio_net_device_unrealize(DeviceState *dev) + g_free(n->vlans); + + if (n->failover) { ++ device_listener_unregister(&n->primary_listener); + g_free(n->primary_device_id); + g_free(n->standby_id); + qobject_unref(n->primary_device_dict); +-- +1.8.3.1 + diff --git a/0023-RHEL-only-Enable-vTPM-for-POWER-in-downstream-config.patch b/0024-RHEL-only-Enable-vTPM-for-POWER-in-downstream-config.patch similarity index 93% rename from 0023-RHEL-only-Enable-vTPM-for-POWER-in-downstream-config.patch rename to 0024-RHEL-only-Enable-vTPM-for-POWER-in-downstream-config.patch index c3e67db..3301702 100644 --- a/0023-RHEL-only-Enable-vTPM-for-POWER-in-downstream-config.patch +++ b/0024-RHEL-only-Enable-vTPM-for-POWER-in-downstream-config.patch @@ -1,6 +1,6 @@ -From c3b099b389455b919b4b22011ed2fa3e7fd49510 Mon Sep 17 00:00:00 2001 +From 34817c44ee8e467df7e9f92b5fffa5679172bb58 Mon Sep 17 00:00:00 2001 From: David Gibson -Date: Wed, 1 Jul 2020 12:24:02 +0200 +Date: Wed, 8 Jul 2020 10:02:25 +0200 Subject: RHEL-only: Enable vTPM for POWER in downstream configs RH-Author: David Gibson diff --git a/0024-redhat-fix-5.0-rebase-missing-ISA-TPM-TIS.patch b/0025-redhat-fix-5.0-rebase-missing-ISA-TPM-TIS.patch similarity index 93% rename from 0024-redhat-fix-5.0-rebase-missing-ISA-TPM-TIS.patch rename to 0025-redhat-fix-5.0-rebase-missing-ISA-TPM-TIS.patch index 1ae7b1a..5924eed 100644 --- a/0024-redhat-fix-5.0-rebase-missing-ISA-TPM-TIS.patch +++ b/0025-redhat-fix-5.0-rebase-missing-ISA-TPM-TIS.patch @@ -1,6 +1,6 @@ -From 7fd82f454755e0c7c68faac76a156c9ddb322124 Mon Sep 17 00:00:00 2001 +From 0de024660bb9c42ca87fd179b6a4122c3a9e0eb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= -Date: Wed, 1 Jul 2020 12:24:02 +0200 +Date: Wed, 8 Jul 2020 10:02:25 +0200 Subject: redhat: fix 5.0 rebase missing ISA TPM TIS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 diff --git a/0025-redhat-define-hw_compat_8_2.patch b/0026-redhat-define-hw_compat_8_2.patch similarity index 91% rename from 0025-redhat-define-hw_compat_8_2.patch rename to 0026-redhat-define-hw_compat_8_2.patch index e565300..eb1a0a1 100644 --- a/0025-redhat-define-hw_compat_8_2.patch +++ b/0026-redhat-define-hw_compat_8_2.patch @@ -1,6 +1,6 @@ -From 3be5878b68235837729f452f0940105505bf4a55 Mon Sep 17 00:00:00 2001 +From 43a29be3b4f2186441067a2f5cd45d4e6035f206 Mon Sep 17 00:00:00 2001 From: "Dr. David Alan Gilbert" -Date: Wed, 1 Jul 2020 12:24:02 +0200 +Date: Wed, 8 Jul 2020 10:02:25 +0200 Subject: redhat: define hw_compat_8_2 RH-Author: Dr. David Alan Gilbert @@ -8,6 +8,7 @@ Message-id: <20200619154227.23845-2-dgilbert@redhat.com> Patchwork-id: 97662 O-Subject: [RHEL-AV 8.3.0 qemu-kvm PATCH 1/2] redhat: define hw_compat_8_2 Bugzilla: 1842902 +RH-Acked-by: Eduardo Habkost RH-Acked-by: Laurent Vivier RH-Acked-by: Stefan Hajnoczi @@ -63,10 +64,10 @@ index ef6b320..b837399 100644 */ GlobalProperty hw_compat_rhel_8_1[] = { diff --git a/include/hw/boards.h b/include/hw/boards.h -index 24c1348..26ac91d 100644 +index c357731..f918a15 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h -@@ -374,6 +374,9 @@ extern const size_t hw_compat_2_2_len; +@@ -375,6 +375,9 @@ extern const size_t hw_compat_2_2_len; extern GlobalProperty hw_compat_2_1[]; extern const size_t hw_compat_2_1_len; diff --git a/0026-x86-Add-8.3.0-x86_64-machine-type.patch b/0027-x86-Add-8.3.0-x86_64-machine-type.patch similarity index 88% rename from 0026-x86-Add-8.3.0-x86_64-machine-type.patch rename to 0027-x86-Add-8.3.0-x86_64-machine-type.patch index 1b490ad..01d528e 100644 --- a/0026-x86-Add-8.3.0-x86_64-machine-type.patch +++ b/0027-x86-Add-8.3.0-x86_64-machine-type.patch @@ -1,6 +1,6 @@ -From 16e1749209e7df15f7ce12418886117c2259dee7 Mon Sep 17 00:00:00 2001 +From 9fc44f5b2b271ea3337f8e5eae3bc3d2f9d857f3 Mon Sep 17 00:00:00 2001 From: "Dr. David Alan Gilbert" -Date: Wed, 1 Jul 2020 12:24:02 +0200 +Date: Wed, 8 Jul 2020 10:02:25 +0200 Subject: x86: Add 8.3.0 x86_64 machine type RH-Author: Dr. David Alan Gilbert @@ -8,6 +8,7 @@ Message-id: <20200619154227.23845-3-dgilbert@redhat.com> Patchwork-id: 97663 O-Subject: [RHEL-AV 8.3.0 qemu-kvm PATCH 2/2] x86: Add 8.3.0 x86_64 machine type Bugzilla: 1842902 +RH-Acked-by: Eduardo Habkost RH-Acked-by: Laurent Vivier RH-Acked-by: Stefan Hajnoczi @@ -25,10 +26,10 @@ Signed-off-by: Miroslav Rezanina 4 files changed, 35 insertions(+) diff --git a/hw/i386/pc.c b/hw/i386/pc.c -index d17d6f8..aaf3ef4 100644 +index fe37bde..94c857e 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c -@@ -359,6 +359,12 @@ GlobalProperty pc_rhel_compat[] = { +@@ -360,6 +360,12 @@ GlobalProperty pc_rhel_compat[] = { }; const size_t pc_rhel_compat_len = G_N_ELEMENTS(pc_rhel_compat); @@ -42,10 +43,10 @@ index d17d6f8..aaf3ef4 100644 GlobalProperty pc_rhel_8_1_compat[] = { }; const size_t pc_rhel_8_1_compat_len = G_N_ELEMENTS(pc_rhel_8_1_compat); diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c -index b195f26..c951107 100644 +index eeadd89..f14ddcb 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c -@@ -1027,6 +1027,10 @@ static void pc_machine_rhel760_options(MachineClass *m) +@@ -1028,6 +1028,10 @@ static void pc_machine_rhel760_options(MachineClass *m) m->smbus_no_migration_support = true; pcmc->pvh_enabled = false; pcmc->default_cpu_version = CPU_VERSION_LEGACY; @@ -57,10 +58,10 @@ index b195f26..c951107 100644 compat_props_add(m->compat_props, pc_rhel_8_1_compat, pc_rhel_8_1_compat_len); compat_props_add(m->compat_props, hw_compat_rhel_8_0, hw_compat_rhel_8_0_len); diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c -index 6c49a50..ef0b6e3 100644 +index 1cd4e15..b9e8dcb 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c -@@ -589,6 +589,23 @@ static void pc_q35_machine_rhel_options(MachineClass *m) +@@ -590,6 +590,23 @@ static void pc_q35_machine_rhel_options(MachineClass *m) compat_props_add(m->compat_props, pc_rhel_compat, pc_rhel_compat_len); } @@ -84,7 +85,7 @@ index 6c49a50..ef0b6e3 100644 static void pc_q35_init_rhel820(MachineState *machine) { pc_q35_init(machine); -@@ -599,8 +616,13 @@ static void pc_q35_machine_rhel820_options(MachineClass *m) +@@ -600,8 +617,13 @@ static void pc_q35_machine_rhel820_options(MachineClass *m) PCMachineClass *pcmc = PC_MACHINE_CLASS(m); pc_q35_machine_rhel_options(m); m->desc = "RHEL-8.2.0 PC (Q35 + ICH9, 2009)"; diff --git a/0027-hw-arm-Changes-to-rhel820-machine.patch b/0028-hw-arm-Changes-to-rhel820-machine.patch similarity index 91% rename from 0027-hw-arm-Changes-to-rhel820-machine.patch rename to 0028-hw-arm-Changes-to-rhel820-machine.patch index 842d73b..419610d 100644 --- a/0027-hw-arm-Changes-to-rhel820-machine.patch +++ b/0028-hw-arm-Changes-to-rhel820-machine.patch @@ -1,6 +1,6 @@ -From b3f4822d380a046220749314c9a05cdb0d5d2718 Mon Sep 17 00:00:00 2001 +From 2717baf34693fc9aa5fa7d1f2a5e8eb1677c1bc2 Mon Sep 17 00:00:00 2001 From: Gavin Shan -Date: Wed, 1 Jul 2020 12:24:02 +0200 +Date: Wed, 8 Jul 2020 10:02:25 +0200 Subject: hw/arm: Changes to rhel820 machine RH-Author: Gavin Shan @@ -24,7 +24,7 @@ Signed-off-by: Miroslav Rezanina 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c -index abbc7d5..07c5c14 100644 +index 5a45677..53f02e0 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2090,6 +2090,7 @@ static void virt_set_acpi(Object *obj, Visitor *v, const char *name, @@ -43,7 +43,7 @@ index abbc7d5..07c5c14 100644 static char *virt_get_gic_version(Object *obj, Error **errp) { -@@ -2727,12 +2729,8 @@ static void rhel820_virt_instance_init(Object *obj) +@@ -2760,12 +2762,8 @@ static void rhel820_virt_instance_init(Object *obj) object_property_set_description(obj, "highmem", "Set on/off to enable/disable using " "physical address space above 32 bits"); @@ -58,7 +58,7 @@ index abbc7d5..07c5c14 100644 object_property_add_str(obj, "gic-version", virt_get_gic_version, virt_set_gic_version); object_property_set_description(obj, "gic-version", -@@ -2759,12 +2757,9 @@ static void rhel820_virt_instance_init(Object *obj) +@@ -2792,12 +2790,9 @@ static void rhel820_virt_instance_init(Object *obj) object_property_set_description(obj, "iommu", "Set the IOMMU type. " "Valid values are none and smmuv3"); diff --git a/0028-hw-arm-Introduce-rhel_virt_instance_init-helper.patch b/0029-hw-arm-Introduce-rhel_virt_instance_init-helper.patch similarity index 84% rename from 0028-hw-arm-Introduce-rhel_virt_instance_init-helper.patch rename to 0029-hw-arm-Introduce-rhel_virt_instance_init-helper.patch index 20ee03d..c982e43 100644 --- a/0028-hw-arm-Introduce-rhel_virt_instance_init-helper.patch +++ b/0029-hw-arm-Introduce-rhel_virt_instance_init-helper.patch @@ -1,6 +1,6 @@ -From 75c705bcd0e6adb903889dd031c6f867a1ca7a63 Mon Sep 17 00:00:00 2001 +From 91449aaf4ad482d9208c8861f549f7fe58af02ac Mon Sep 17 00:00:00 2001 From: Gavin Shan -Date: Wed, 1 Jul 2020 12:24:02 +0200 +Date: Wed, 8 Jul 2020 10:02:25 +0200 Subject: hw/arm: Introduce rhel_virt_instance_init() helper RH-Author: Gavin Shan @@ -21,10 +21,10 @@ Signed-off-by: Miroslav Rezanina 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c -index 07c5c14..c1bc866 100644 +index 53f02e0..f26ae9f 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c -@@ -2713,7 +2713,7 @@ static void rhel_machine_init(void) +@@ -2746,7 +2746,7 @@ static void rhel_machine_init(void) } type_init(rhel_machine_init); @@ -33,7 +33,7 @@ index 07c5c14..c1bc866 100644 { VirtMachineState *vms = VIRT_MACHINE(obj); VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms); -@@ -2764,6 +2764,11 @@ static void rhel820_virt_instance_init(Object *obj) +@@ -2797,6 +2797,11 @@ static void rhel820_virt_instance_init(Object *obj) virt_flash_create(vms); } diff --git a/0029-hw-arm-Add-rhel830-machine-type.patch b/0030-hw-arm-Add-rhel830-machine-type.patch similarity index 85% rename from 0029-hw-arm-Add-rhel830-machine-type.patch rename to 0030-hw-arm-Add-rhel830-machine-type.patch index 7517842..748a6ba 100644 --- a/0029-hw-arm-Add-rhel830-machine-type.patch +++ b/0030-hw-arm-Add-rhel830-machine-type.patch @@ -1,6 +1,6 @@ -From c0c64a417f65d388526c62b2d82f29fc4f5aed76 Mon Sep 17 00:00:00 2001 +From afad5b1cdd3d29cd497cb9987fca3009fa352d40 Mon Sep 17 00:00:00 2001 From: Gavin Shan -Date: Wed, 1 Jul 2020 12:24:02 +0200 +Date: Wed, 8 Jul 2020 10:02:25 +0200 Subject: hw/arm: Add rhel830 machine type RH-Author: Gavin Shan @@ -21,10 +21,10 @@ Signed-off-by: Miroslav Rezanina 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c -index c1bc866..48af222 100644 +index f26ae9f..f1553f3 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c -@@ -2764,6 +2764,17 @@ static void rhel_virt_instance_init(Object *obj) +@@ -2797,6 +2797,17 @@ static void rhel_virt_instance_init(Object *obj) virt_flash_create(vms); } @@ -42,7 +42,7 @@ index c1bc866..48af222 100644 static void rhel820_virt_instance_init(Object *obj) { rhel_virt_instance_init(obj); -@@ -2771,6 +2782,8 @@ static void rhel820_virt_instance_init(Object *obj) +@@ -2804,6 +2815,8 @@ static void rhel820_virt_instance_init(Object *obj) static void rhel820_virt_options(MachineClass *mc) { diff --git a/0031-redhat-define-pseries-rhel8.3.0-machine-type.patch b/0031-redhat-define-pseries-rhel8.3.0-machine-type.patch new file mode 100644 index 0000000..b6d46d5 --- /dev/null +++ b/0031-redhat-define-pseries-rhel8.3.0-machine-type.patch @@ -0,0 +1,74 @@ +From 3ccb92293ca895bc52907b36c8d2e8b6936ed975 Mon Sep 17 00:00:00 2001 +From: Laurent Vivier +Date: Wed, 8 Jul 2020 10:04:09 +0200 +Subject: redhat: define pseries-rhel8.3.0 machine type + +RH-Author: Laurent Vivier +Message-id: <20200706104117.219174-3-lvivier@redhat.com> +Patchwork-id: 97904 +O-Subject: [RHEL-AV-8.3.0 qemu-kvm PATCH v2 2/2] redhat: define pseries-rhel8.3.0 machine type +Bugzilla: 1853265 + +Note: rebase to qemu-5.1 introduces + + 32a354dc6c07 ("numa: forbid '-numa node, mem' for 5.1 and newer machine types") + +and so '-numa node, mem' will not be available with pseries-rhel8.3.0 + +Signed-off-by: Laurent Vivier +Signed-off-by: Miroslav Rezanina +--- + hw/ppc/spapr.c | 30 ++++++++++++++++++++++++++++-- + 1 file changed, 28 insertions(+), 2 deletions(-) + +diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c +index f30618e..dc1e9cb 100644 +--- a/hw/ppc/spapr.c ++++ b/hw/ppc/spapr.c +@@ -4990,15 +4990,41 @@ DEFINE_SPAPR_MACHINE(2_1, "2.1", false); + #endif + + /* ++ * pseries-rhel8.3.0 ++ * like pseries-5.1 ++ */ ++ ++static void spapr_machine_rhel830_class_options(MachineClass *mc) ++{ ++ /* Defaults for the latest behaviour inherited from the base class */ ++} ++ ++DEFINE_SPAPR_MACHINE(rhel830, "rhel8.3.0", true); ++ ++/* + * pseries-rhel8.2.0 ++ * like pseries-4.2 + pseries-5.0 ++ * except SPAPR_CAP_CCF_ASSIST that has been backported to pseries-rhel8.1.0 + */ + + static void spapr_machine_rhel820_class_options(MachineClass *mc) + { +- /* Defaults for the latest behaviour inherited from the base class */ ++ SpaprMachineClass *smc = SPAPR_MACHINE_CLASS(mc); ++ ++ spapr_machine_rhel830_class_options(mc); ++ compat_props_add(mc->compat_props, hw_compat_rhel_8_2, ++ hw_compat_rhel_8_2_len); ++ ++ /* from pseries-4.2 */ ++ smc->default_caps.caps[SPAPR_CAP_FWNMI] = SPAPR_CAP_OFF; ++ smc->rma_limit = 16 * GiB; ++ mc->nvdimm_supported = false; ++ ++ /* from pseries-5.0 */ ++ mc->numa_mem_supported = true; + } + +-DEFINE_SPAPR_MACHINE(rhel820, "rhel8.2.0", true); ++DEFINE_SPAPR_MACHINE(rhel820, "rhel8.2.0", false); + + /* + * pseries-rhel8.1.0 +-- +1.8.3.1 + diff --git a/qemu-kvm.spec b/qemu-kvm.spec index 30d1c07..1d955dd 100644 --- a/qemu-kvm.spec +++ b/qemu-kvm.spec @@ -68,7 +68,7 @@ Obsoletes: %1-rhev Summary: QEMU is a machine emulator and virtualizer Name: qemu-kvm Version: 5.0.0 -Release: 0%{?dist}.wrb200701 +Release: 1%{?dist} # Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped Epoch: 15 License: GPLv2 and GPLv2+ and CC-BY @@ -123,13 +123,15 @@ Patch0018: 0018-usb-xhci-Fix-PCI-capability-order.patch Patch0019: 0019-virtio-scsi-Reject-scsi-cd-if-data-plane-enabled-RHE.patch Patch0020: 0020-BZ1653590-Require-at-least-64kiB-pages-for-downstrea.patch Patch0021: 0021-block-Versioned-x-blockdev-reopen-API-with-feature-f.patch -Patch0023: 0023-RHEL-only-Enable-vTPM-for-POWER-in-downstream-config.patch -Patch0024: 0024-redhat-fix-5.0-rebase-missing-ISA-TPM-TIS.patch -Patch0025: 0025-redhat-define-hw_compat_8_2.patch -Patch0026: 0026-x86-Add-8.3.0-x86_64-machine-type.patch -Patch0027: 0027-hw-arm-Changes-to-rhel820-machine.patch -Patch0028: 0028-hw-arm-Introduce-rhel_virt_instance_init-helper.patch -Patch0029: 0029-hw-arm-Add-rhel830-machine-type.patch +Patch0022: 0022-virtio-net-fix-removal-of-failover-device.patch +Patch0024: 0024-RHEL-only-Enable-vTPM-for-POWER-in-downstream-config.patch +Patch0025: 0025-redhat-fix-5.0-rebase-missing-ISA-TPM-TIS.patch +Patch0026: 0026-redhat-define-hw_compat_8_2.patch +Patch0027: 0027-x86-Add-8.3.0-x86_64-machine-type.patch +Patch0028: 0028-hw-arm-Changes-to-rhel820-machine.patch +Patch0029: 0029-hw-arm-Introduce-rhel_virt_instance_init-helper.patch +Patch0030: 0030-hw-arm-Add-rhel830-machine-type.patch +Patch0031: 0031-redhat-define-pseries-rhel8.3.0-machine-type.patch BuildRequires: wget BuildRequires: rpm-build @@ -1081,6 +1083,19 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog +* Tue Jul 14 2020 Danilo Cesar Lemes de Paula - 5.0.0-1.el8 +- This is an interational rebase, based on the weekly rebase. +- Altough not official yet, It contains fixes for the following BZs: +- Resolves: bz#1781911 +- Resolves: bz#1841529 +- Resolves: bz#1842902 +- Resolves: bz#1818843 + +* Tue Jul 07 2020 Danilo Cesar Lemes de Paula - 4.2.0-29.el8 +- kvm-virtio-net-fix-removal-of-failover-device.patch [bz#1820120] +- Resolves: bz#1820120 + (After hotunplugging the vitrio device and netdev, hotunpluging the failover VF will cause qemu core dump) + * Sun Jun 28 2020 Danilo Cesar Lemes de Paula - 4.2.0-28.el8 - kvm-virtio-blk-Refactor-the-code-that-processes-queued-r.patch [bz#1812765] - kvm-virtio-blk-On-restart-process-queued-requests-in-the.patch [bz#1812765] diff --git a/sources b/sources index ccf796d..13799b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qemu-5.0.0.tar.xz) = d39a728aac20baa56eaa02afb456cff0b220180682f922602428fd45b566e2fb9944142207cb56db68149110df79720137fe1f84d79c0b266b8b23c6eca909e3 +SHA512 (qemu-5.0.0.tar.xz) = 2011fc15747d9d8effcf0af4e1e3af6440eaf801c27948a8bdf97d0cb33cf99ac380f828c1aee02e55e2c2c6c674150a264ce025c99642c8f974fda34be285cd