Skip to contentSkip to conversation

hw/i386: strip AMD IOMMU from Qemu

PATCH In review David Kiarie 1 participant 4 messages Mar 5, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hw/i386: strip AMD IOMMU from Qemu

---
 hw/i386/Makefile.objs |    1 -
 hw/i386/acpi-build.c  |   84 +--
 hw/i386/amd_iommu.c   | 1645 -----------------------------------------
 hw/i386/amd_iommu.h   |  373 ----------
 hw/i386/pc_q35.c      |    2 -
 hw/i386/trace-events  |   43 --
 6 files changed, 1 insertion(+), 2147 deletions(-)
 delete mode 100644 hw/i386/amd_iommu.c
 delete mode 100644 hw/i386/amd_iommu.h
hw/i386/Makefile.objs +0 -1
index 3de7ca2..681f36a 100644
@@ -5,7 +5,6 @@ obj-$(CONFIG_I440FX) += pc_piix.o
 obj-$(CONFIG_Q35) += pc_q35.o
 obj-y += pc_sysfw.o
 obj-$(CONFIG_VTD) += x86-iommu.o intel_iommu.o
-obj-$(CONFIG_AMD_IOMMU) += x86-iommu.o amd_iommu.o
 obj-$(CONFIG_XEN) += ../xenpv/ xen/
 obj-$(CONFIG_VMPORT) += vmport.o
 obj-$(CONFIG_VMMOUSE) += vmmouse.o
hw/i386/acpi-build.c +1 -83

102 lines not on this page · raw message

hw/i386/amd_iommu.c deleted +0 -1645

1,645 lines not on this page · raw message

hw/i386/amd_iommu.h deleted +0 -373

373 lines not on this page · raw message

hw/i386/pc_q35.c +0 -2
index cfb9043..dfb1d6d 100644
@@ -44,7 +44,6 @@
 #include "exec/address-spaces.h"
 #include "hw/i386/pc.h"
 #include "hw/i386/ich9.h"
-#include "hw/i386/amd_iommu.h"
 #include "hw/i386/intel_iommu.h"
 #include "hw/display/ramfb.h"
 #include "hw/firmware/smbios.h"
@@ -359,7 +358,6 @@ static void pc_q35_machine_options(MachineClass *m)
     m->default_display = "std";
     m->default_kernel_irqchip_split = true;
     m->no_floppy = 1;
-    machine_class_allow_dynamic_sysbus_dev(m, TYPE_AMD_IOMMU_DEVICE);
     machine_class_allow_dynamic_sysbus_dev(m, TYPE_INTEL_IOMMU_DEVICE);
     machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE);
     m->max_cpus = 288;
hw/i386/trace-events +0 -43

49 lines not on this page · raw message

Signature · 1 line
2.21.0
#1 lore raw

PATCH 1/1 hw/i386: update copyright notice

---
 hw/i386/amd_iommu.c | 2 +-
 hw/i386/amd_iommu.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
hw/i386/amd_iommu.c +1 -1
index 8ad707a..6eabdf9 100644
@@ -2,7 +2,7 @@
  * QEMU emulation of AMD IOMMU (AMD-Vi)
  *
  * Copyright (C) 2011 Eduard - Gabriel Munteanu
- * Copyright (C) 2015 David Kiarie, <[email protected]>
+ * Copyright (C) 2015, 2016 David Kiarie Kahurani
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
hw/i386/amd_iommu.h +1 -1
index c52886f..1074723 100644
@@ -2,7 +2,7 @@
  * QEMU emulation of an AMD IOMMU (AMD-Vi)
  *
  * Copyright (C) 2011 Eduard - Gabriel Munteanu
- * Copyright (C) 2015 David Kiarie, <[email protected]>
+ * Copyright (C) 2015 David Kiarie Kahurani
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
Signature · 1 line
2.21.0
#2 lore raw

Re: [Qemu-devel] [PATCH] hw/i386: update copyright notice

Quoted 25 lines · David Kiarie
---
 hw/i386/amd_iommu.c | 2 +-
 hw/i386/amd_iommu.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
hw/i386/amd_iommu.c +1 -1
index 8ad707a..6eabdf9 100644
@@ -2,7 +2,7 @@
  * QEMU emulation of AMD IOMMU (AMD-Vi)
  *
  * Copyright (C) 2011 Eduard - Gabriel Munteanu
- * Copyright (C) 2015 David Kiarie, <[email protected]>
+ * Copyright (C) 2015, 2016 David Kiarie Kahurani
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
hw/i386/amd_iommu.h +0 -0
index c52886f..1074723 100644

hw/i386/amd_iommu.h line 8

Quoted 8 lines
hw/i386/amd_iommu.h +1 -1
@@ -2,7 +2,7 @@
  * QEMU emulation of an AMD IOMMU (AMD-Vi)
  *
  * Copyright (C) 2011 Eduard - Gabriel Munteanu
- * Copyright (C) 2015 David Kiarie, <[email protected]>
+ * Copyright (C) 2015 David Kiarie Kahurani
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

don't bother responding either as i should probably be getting rid of email soon.

Quoted 4 lines

--
2.21.0