On 12/1/23 10:57, Akihiko Odaki wrote:
Some definitions in the header files are invalid for igb so extract
them to new header files to keep igb from referring to them.
Signed-off-by: Gal Hammer <[email protected]>
Signed-off-by: Marcel Apfelbaum <[email protected]>
Signed-off-by: Akihiko Odaki <[email protected]>
---
hw/net/e1000.c | 2 +-
hw/net/e1000_common.h | 104 +++++
hw/net/e1000_regs.h | 927 +---------------------------------------
hw/net/e1000e.c | 4 +-
hw/net/e1000e_core.c | 2 +-
hw/net/e1000x_common.c | 2 +-
hw/net/e1000x_common.h | 74 ----
hw/net/e1000x_regs.h | 940 +++++++++++++++++++++++++++++++++++++++++
8 files changed, 1051 insertions(+), 1004 deletions(-)
create mode 100644 hw/net/e1000_common.h
create mode 100644 hw/net/e1000x_regs.h
diff --git a/hw/net/e1000_common.h b/hw/net/e1000_common.h
new file mode 100644
index 0000000000..56afad3feb
--- /dev/null
+++ b/hw/net/e1000_common.h
@@ -0,0 +1,104 @@
+/*
+ * QEMU e1000(e) emulation - shared code
s/code/definitions/
+ *
+ * Copyright (c) 2008 Qumranet
+ *
+ * Based on work done by:
+ * Nir Peleg, Tutis Systems Ltd. for Qumranet Inc.
+ * Copyright (c) 2007 Dan Aloni
+ * Copyright (c) 2004 Antony T Curtis
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef HW_NET_E1000_COMMON_H
+#define HW_NET_E1000_COMMON_H
...
+#include "e1000x_common.h"
No need to include this header here. Can we restrict it to the units
requiring access to these declarations? Otherwise:
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
+#endif
